Skip to content

A
apaas-ui
Commit 4ae59482 authored by 张俊's avatar 张俊
Browse files
Options

Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

parents 399607ff a798437c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1022 additions and 739 deletions
src/assets/css/index.css
View file @ 4ae59482
......@@ -541,6 +541,11 @@ width: 620px!important;
background-color: #e1e4fb;
border-color: #e1e4fb;
}
.apass_button .el-button--danger {
color: #fff;
background-color: #e15260;
border-color: #e15260;
}
.apass_button .el-button.is-disabled,
.apass_button .el-button.is-disabled:focus,
.apass_button .el-button.is-disabled:hover {
......
src/components/apass-dialog.vue
View file @ 4ae59482
......@@ -24,14 +24,15 @@
</div>
<div slot="footer" class="dialog_action apass_button" v-else>
<el-button
type="defalut"
v-if="!cancelHide"
:type="cancelType"
size="mini"
v-text="cancelText || '取消'"
@click="hide"
@click="dialogCancel"
>
</el-button>
<el-button
type="primary"
:type="sunbmitType"
size="mini"
v-text="sunbmitText || '确定'"
:disabled="submitDisable"
......@@ -63,16 +64,32 @@ export default {
type: String,
default: () => "",
},
cancelType: {
type: String,
default: () => "defalut",
},
cancelHide: {
type: Boolean,
default: () => false,
},
cancel: {
type: Function,
default: () => null,
},
sunbmitText: {
type: String,
default: () => "",
},
sunbmitType: {
type: String,
default: () => "primary",
},
submitDisable: {
type: Boolean,
default: () => false,
},
submit: {
type: [Function,String],
type: Function,
default: () => null,
},
},
......@@ -86,12 +103,18 @@ export default {
hide() {
this.showDialog = false;
},
dialogCancel() {
if (typeof this.cancel === "function") {
this.cancel();
}
this.$emit("cancel");
this.hide();
},
dialogSubmit() {
if (typeof this.submit === "function") {
this.submit();
} else {
this.$emit("submit");
}
this.$emit("submit");
this.hide();
},
},
......
src/components/e-charts/dashboard.vue
View file @ 4ae59482
......@@ -101,18 +101,24 @@ export default {
roundCap: true,
itemStyle: {
normal: {
color:
self.dangerousValue == "high"
? self.data.data >= 80
? "#e15260"
: "#515fe7"
: self.data.data > 75
? "#00cfc6"
: self.data.data > 50
? "#54cefd"
: self.data.data > 25
? "#54cefd"
: "#25bdb1"
color: new graphic.LinearGradient(0, 0, 1, 0, [
{ offset: 0, color: "#fff" },
{
offset: 1,
color:
self.dangerousValue == "high"
? self.data.data >= 80
? "#e15260"
: "#515fe7"
: self.data.data > 75
? "#00cfc6"
: self.data.data > 50
? "#54cefd"
: self.data.data > 25
? "#54cefd"
: "#25bdb1"
}
])
}
},
barGap: "-100%"
......
src/components/order-list/order-list-cell.vue
View file @ 4ae59482
......@@ -7,18 +7,31 @@
</div>
<el-row class="cell_row">
<el-col :span="10" class="cell_msg">
<img :src="cellItem.cover" class="cell_msg_img" />
<img v-if="cellItem.order_type != 3" :src="cellItem.cover" class="cell_msg_img" />
<img v-else :src="require('@/assets/imgs/img_yunziyuan.png')" class="cell_msg_img" />
<div class="cell_msg_right">
<div class="cell_name">
<div v-if="cellItem.order_type != 3" class="cell_name">
<span>{{ cellItem.name }}</span>
<span v-if="cellItem.mapService" class="tags map_service">mapService</span>
<span v-if="cellItem.openness == 1" class="tags shared">共享</span>
<span v-else-if="cellItem.openness == 2" class="tags restricted">受限</span>
<span v-else-if="cellItem.openness == 3" class="tags sensitive">敏感</span>
</div>
<div v-else class="cell_name">
<span>云资源申请</span>
</div>
<div class="cell_msg_other">
<div class="cell_type">{{ cellItem.sector }}</div>
<div class="cell_creator">{{ cellItem.src_organization }}</div>
<div
class="cell_type"
>{{ cellItem.order_type != 3 ? cellItem.sector : cellItem.namespace }}</div>
<div
v-if="cellItem.order_type != 3"
class="cell_creator"
>{{ cellItem.src_organization }}</div>
<div
v-else
class="cell_creator"
>{{ cellItem.apply_type == 0 ? "申请新的工作区域" : "升级现有工作区域" }}</div>
</div>
</div>
</el-col>
......@@ -33,8 +46,13 @@
<div>规格：{{ cellItem.spec_app == 0 ? "申请获取应用镜像部署权限" : "申请获取应用镜像开发权限" }}</div>
</div>
<div v-else-if="cellItem.order_type == 3">
<div>规格：CPU 2核，内存 4GB，容器组 8个；数据盘 3块，每块数据盘容量 2GB</div>
<div class="cell_specification_type">单个容器组：CPU最高 4核，默认 2核；内存最高 8 GB，默认 4GB</div>
<div>
规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个；
<span v-if="cellItem.disk_num != 0">{{ cellItem.disk_num }}数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB</span>
</div>
<div
class="cell_specification_type"
>单个容器组：CPU最高 {{ cellItem.one_cpu_max }}核，默认 {{ cellItem.one_cpu_min }}核；内存最高 {{ cellItem.one_memory_max }}GB，默认 {{ cellItem.one_memory_min }}GB</div>
</div>
</el-col>
<el-col :span="4" class="approval_status">
......@@ -93,7 +111,7 @@
class="cell_option_btn"
@click="viewDetail(cellItem.order_id)"
>查看详情</el-button>
<div class="cell_option_spec" @click="nextApply">再次申请</div>
<div v-if="cellItem.approval_second_level == 1 && cellItem.pay_status != -1" class="cell_option_spec" @click="nextApply">再次申请</div>
</div>
</el-col>
<el-collapse-transition>
......@@ -220,6 +238,10 @@ export default {
duration: this.cellItem.duration,
duration_unit: this.cellItem.duration_unit
};
this.$router.push({
path: "/shop/shop_car_apply",
query: query
});
} else if (this.cellItem.order_type == 2) {
query = {
app_id: parseFloat(this.cellItem.app_id),
......@@ -227,11 +249,15 @@ export default {
duration: this.cellItem.duration,
duration_unit: this.cellItem.duration_unit
};
this.$router.push({
path: "/shop/shop_car_apply",
query: query
});
} else if (this.cellItem.order_type == 2) {
this.$router.push({
path: "/shop/shop_cloud"
});
}
this.$router.push({
path: "/shop/shop_car_apply",
query: query
});
},
getMessage() {
if (this.cellItem.order_type == 1) {
......@@ -310,6 +336,7 @@ export default {
width: 118px;
height: 118px;
border-radius: 8px;
border: 3px #f4f7fc solid;
}
.cell_msg_right {
width: calc(100% - 140px);
......
src/components/service-list/commodity-cell.vue
View file @ 4ae59482
......@@ -30,7 +30,7 @@
<span class="com_cell_item_title">服务类型：</span>
<span
class="com_cell_data"
>{{ cellData.data_service_type1_name }}&nbsp;&nbsp;{{ cellData.data_service_type2_str }}&nbsp;&nbsp;{{ cellData.data_service_type3_str }}</span>
>{{ cellData.data_service_type1_name }}&nbsp;&nbsp;{{ cellData.data_service_type2_name }}&nbsp;&nbsp;{{ cellData.data_service_type3_name }}</span>
</div>
<div class="com_cell_item">
<span class="com_cell_item_title">更新时间：</span>
......@@ -89,6 +89,7 @@ export default {
height: 166px;
border-radius: 12px;
overflow: hidden;
border: 4px #f4f7fc solid;
}
.com_cell_img {
width: 100%;
......@@ -100,12 +101,13 @@ export default {
}
.com_cell_msg_title {
color: #0d1847;
font-size: 22px;
font-size: 18px;
line-height: 30px;
font-weight: 700;
margin-bottom: 6px;
}
.com_cell_item {
font-size: 16px;
font-size: 14px;
line-height: 26px;
margin-top: 1px;
color: #8890a7;
......@@ -124,12 +126,12 @@ export default {
white-space: nowrap;
}
.com_cell_right {
width: 250px;
width: 300px;
padding: 25px 0 0 50px;
}
.com_cell_right_text {
font-size: 14px;
margin-top: 15px;
font-size: 16px;
margin-top: 25px;
}
.com_cell_right_time_tit {
color: #8890a7;
......@@ -140,10 +142,10 @@ export default {
.com_cell_right_btn {
background-color: #0f2683;
color: #f8f9fd;
width: 160px;
width: 220px;
height: 40px;
border-radius: 20px;
margin-top: 35px;
margin-top: 25px;
}
.tags {
display: inline-block;
......@@ -181,10 +183,10 @@ export default {
.com_cell_right .el-rate__text {
display: inline-block;
margin-left: 10px;
font-size: 22px;
font-size: 32px;
font-weight: 700;
}
.com_cell_right .el-rate__icon {
font-size: 20px;
font-size: 28px;
}
</style>
\ No newline at end of file
src/components/service-list/service_list.vue
View file @ 4ae59482
......@@ -223,7 +223,11 @@ export default {
time_app: null,
times: null
}),
mounted() {},
mounted() {
window.onresize = () => {
this.judgeHeight();
};
},
watch: {
urlFilter: {
handler(val) {
......@@ -335,7 +339,7 @@ export default {
this.time_app = setInterval(() => {
if (this.refresh_app_1 && this.refresh_app_2 && this.refresh_app_3) {
this.judgeHeight();
clearInterval(this.time_app)
clearInterval(this.time_app);
}
}, 50);
} else {
......@@ -377,7 +381,7 @@ export default {
}
}
}
this.$set((this.filterLists = list));
this.filterLists = [...list];
},
clickOpen(index) {
let list = this.openList;
......
src/components/shop-cloud/shop-cloud.vue
View file @ 4ae59482
......@@ -104,30 +104,42 @@
<div class="input_right">个</div>
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item class="form_item">
<div class="form_item_title">数据盘（可选）：</div>
<el-select v-model="formNew.store_type" placeholder="请选择数据盘类型">
<el-option
v-for="item in options_store_type"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">数据盘（可选）：</div>
<el-input-number
v-model="formNew.dataDisk"
controls-position="right"
:min="0"
placeholder="请选择数量"
placeholder="请选择增加数据盘的数量"
></el-input-number>
<div class="input_right">块</div>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">每块数据盘容量：</div>
<el-input-number
v-model="formNew.perDataDisk"
controls-position="right"
:min="0"
placeholder="请选择容量"
placeholder="请选择每块数据盘的容量"
></el-input-number>
<div class="input_right">GB</div>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="form_title">单个容器组规格</div>
</el-col>
......@@ -330,24 +342,37 @@
></table-um>
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item class="form_item">
<div class="form_item_title">增加数据盘：</div>
<el-select v-model="formOld.store_type" placeholder="请选择数据盘类型">
<el-option
v-for="item in options_store_type"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">增加数据盘：</div>
<el-input-number
v-model="formOld.dataDisk"
controls-position="right"
:min="0"
placeholder="请选择增加数据盘的数量"
></el-input-number>
<div class="input_right">块</div>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item class="form_item input_has_right">
<div class="form_item_title">每块数据盘容量：</div>
<el-input-number
v-model="formOld.perDataDisk"
controls-position="right"
:min="0"
placeholder="请选择每块数据盘的容量"
></el-input-number>
<div class="input_right">GB</div>
</el-form-item>
......@@ -562,12 +587,16 @@
<span class="dia_block_item_title">容器组：</span>
<span class="dia_block_item_val">{{ diaForm.containerGroup }}个</span>
</div>
<div class="dia_block_item_in">
<div class="dia_block_item_in" v-if="diaForm.dataDisk != 0">
<span class="dia_block_item_title">数据盘：</span>
<span
class="dia_block_item_val"
>{{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB</span>
</div>
<div class="dia_block_item_in" v-if="diaForm.dataDisk != 0">
<span class="dia_block_item_title">数据盘类型：</span>
<span class="dia_block_item_val">{{ diaForm.store_type }}</span>
</div>
</div>
<span class="dia_item_all_title">单个容器组规格：</span>
<div class="dia_block_item">
......@@ -753,7 +782,8 @@ export default {
appDuration: undefined,
durType: 1,
apply_file: "",
apply_file_name: ""
apply_file_name: "",
store_type: "nfs-client"
},
ruleNew: {
namespace: [
......@@ -803,6 +833,10 @@ export default {
{ value: "16", label: "16" },
{ value: "32", label: "32" }
],
options_store_type: [
{ value: "nfs-client", label: "nfs-client" },
{ value: "rook-ceph-block", label: "rook-ceph-block" }
],
formShow: false,
specArr: [
{ title: "CPU", val: "4", src: "ic_CPU" },
......@@ -834,23 +868,10 @@ export default {
appDuration: undefined,
durType: 1,
apply_file: "",
apply_file_name: ""
},
paramsOld: {
cpu: "",
memory: "",
containerGroup: undefined,
dataDisk: undefined,
perDataDisk: undefined,
perCPUs: undefined,
perCPU: undefined,
perRAMs: undefined,
perRAM: undefined,
appDuration: undefined,
durType: 1,
apply_file: "",
apply_file_name: ""
apply_file_name: "",
store_type: "nfs-client"
},
paramsOld: {},
ruleOld: {
namespace: [
{ required: true, message: "请输入工作区域名称", trigger: "blur" }
......@@ -944,7 +965,8 @@ export default {
this.formOld.perCPU = paramsOld.one_cpu_min;
this.formOld.perRAMs = paramsOld.one_memory_max;
this.formOld.perRAM = paramsOld.one_memory_min;
this.dataDiskList = paramsOld.disk_list;
this.formOld.store_type = paramsOld.store_type;
this.dataDiskList = paramsOld.disk_list || [];
this.formShow = true;
} else {
this.formShow = false;
......@@ -999,7 +1021,14 @@ export default {
one_cpu_max: this.formNew.perCPUs,
one_memory_min: this.formNew.perRAM,
one_memory_max: this.formNew.perRAMs
}
},
disks: [
{
disk_num: this.formNew.dataDisk,
disk_cap: this.formNew.perDataDisk,
store_type: this.formNew.store_type
}
]
};
this.$api.serviceShop.applicationCloud(query).then(response => {
console.log(response);
......@@ -1016,13 +1045,18 @@ export default {
apply_connect_mobile: this.form.phone,
memory: Number(this.formOld.memory),
containers: this.formOld.containerGroup,
disk_num: this.formOld.dataDisk,
disk_cap: this.formOld.perDataDisk,
one_cpu_min: this.formOld.perCPU,
one_cpu_max: this.formOld.perCPUs,
one_memory_min: this.formOld.perRAM,
one_memory_max: this.formOld.perRAMs
}
},
disks: [
{
disk_num: this.formOld.dataDisk,
disk_cap: this.formOld.perDataDisk,
store_type: this.formOld.store_type
}
]
};
this.$api.serviceShop.updateCloud(query).then(response => {
console.log(response);
......
src/components/table/table-filter.vue
View file @ 4ae59482
......@@ -95,7 +95,7 @@ export default {
20 - // 距左侧标题的边距
110; // 折叠按钮的宽度
this.filterLength = Math.floor(width / 110);
this.filterLength = Math.floor(width / 150);
// console.log("每行最多可容纳" + this.filterLength + "个filter");
});
}
......@@ -188,7 +188,7 @@ export default {
.ces_filter_data > li > a {
display: block;
height: 30px;
width: 90px;
width: 130px;
box-sizing: border-box;
border-radius: 12px;
text-align: center;
......
src/pages/user/order/order_detail.vue
View file @ 4ae59482
......@@ -10,22 +10,22 @@
<div class="detail_head_cell detail_head_status border_right">
<p class="detail_head_cell_title">申请状态</p>
<p
class="detail_head_cell_val blue"
class="detail_head_cell_val text_yellow"
v-if="orderDetail.approval_first_level == 0 && orderDetail.pay_status != -1"
>待审核</p>
<p
class="detail_head_cell_val blue"
class="detail_head_cell_val text_yellow"
v-if="orderDetail.approval_first_level == 1&& orderDetail.approval_second_level == 0 && orderDetail.pay_status != -1"
>审核中</p>
<p
class="detail_head_cell_val blue"
class="detail_head_cell_val text_blue"
v-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1"
>审核通过</p>
<p
class="detail_head_cell_val blue"
class="detail_head_cell_val text_red"
v-if="orderDetail.approval_first_level == -1 && orderDetail.pay_status != -1"
>审核未通过</p>
<p class="detail_head_cell_val blue" v-if="orderDetail.pay_status == -1">订单已取消</p>
<p class="detail_head_cell_val text_blackblue" v-if="orderDetail.pay_status == -1">订单已取消</p>
</div>
<div class="detail_head_cell detail_head_no border_right">
<p class="detail_head_cell_title">订单编号</p>
......@@ -118,10 +118,10 @@
</div>
</el-col>
<el-col :span="10" v-else-if="orderDetail.order_type == 3" class="detail_service_msg">
<img :src="orderDetail.cover" class="detail_service_msg_img" />
<img :src="require('@/assets/imgs/img_yunziyuan.png')" class="detail_service_msg_img" />
<div class="detail_service_msg_right">
<div class="detail_service_name_cloud">
<span>{{ orderDetail.name }}</span>
<span>{{ orderDetail.namespace }}（云资源申请）</span>
</div>
</div>
</el-col>
......@@ -195,7 +195,9 @@
</div>
<div class="params_block_item_in">
<span class="params_block_item_title">数据盘：</span>
<span class="params_block_item_val">{{ orderDetail.disk_num}}块，每块{{orderDetail.disk_cap }}GB</span>
<span
class="params_block_item_val"
>{{ orderDetail.disk_num}}块，每块{{orderDetail.disk_cap }}GB</span>
</div>
</div>
<span class="params_block_title margin_top_20">单个容器组规格：</span>
......@@ -222,7 +224,7 @@
</div>
<div class="detail_title">申请人信息</div>
<info-list @download="download" :list_arr="list_arr" class="detail_s_val"></info-list>
<process-card :data="approval_arr1" class="detail_s_val"></process-card>
<process-card v-if="orderDetail.order_type != 3" :data="approval_arr1" class="detail_s_val"></process-card>
</block-radius>
</div>
</template>
......@@ -506,9 +508,18 @@ export default {
line-height: 28px;
color: #242c43;
}
.blue {
.text_blue {
color: #515fe7;
}
.text_yellow {
color: #ef9433;
}
.text_blackblue {
color: #242c43;
}
.text_red {
color: #e15260;
}
.btn_group {
position: absolute;
right: 20px;
......@@ -579,6 +590,7 @@ export default {
width: 118px;
height: 118px;
border-radius: 8px;
border: 3px #f4f7fc solid;
}
.detail_service_msg_right {
width: calc(100% - 140px);
......
src/pages/user/user_info.vue
View file @ 4ae59482
......@@ -288,6 +288,7 @@ export default {
: this.user_data.userType == 3
? "普通用户"
: "普通用户开发者";
this.imgList = [];
this.imgList.push(data.picture_path);
this.formBusiness.businessSystemName = data.system_name;
this.formBusiness.domainName = data.domain_name;
......
src/pages/workbench/app_build.vue
View file @ 4ae59482
This diff is collapsed.
src/pages/workbench/fwgl/approveWorkspace.vue
View file @ 4ae59482
......@@ -24,8 +24,11 @@
<apass-dialog
ref="dialog"
:title="dialogInfo.title"
:msg="dialogInfo.msg"
:cancel-text="dialogInfo.cancelText"
:cancel-type="dialogInfo.cancelType"
:cancel="dialogInfo.cancel"
:sunbmit-text="dialogInfo.sunbmitText"
:submit="dialogInfo.submit"
></apass-dialog>
</div>
......@@ -49,8 +52,11 @@ export default {
listData: [],
listTotal: 0,
dialogInfo: {
title: "",
msg: "",
cancelText: "",
cancelType: "",
cancel: null,
sunbmitText: "",
submit: null,
},
}),
......@@ -84,10 +90,28 @@ export default {
console.log("detailAction");
},
approveAction(item) {
console.log("approveAction");
this.dialogInfo.msg = "该工作区域的申请通过还是拒绝？";
this.dialogInfo.cancelText = "拒绝";
this.dialogInfo.cancelType = "danger";
this.dialogInfo.cancel = () => {
console.log("approveAction - false");
};
this.dialogInfo.sunbmitText = "通过";
this.dialogInfo.submit = () => {
console.log("approveAction - true");
};
this.showDialog();
},
deleteAction(item) {
console.log("deleteAction");
this.dialogInfo.msg = "确认要删除这条申请记录吗？";
this.dialogInfo.cancelText = "";
this.dialogInfo.cancelType = "";
this.dialogInfo.cancel = null;
this.dialogInfo.sunbmitText = "";
this.dialogInfo.submit = () => {
console.log("deleteAction");
};
this.showDialog();
},
},
created() {
......
src/pages/workbench/fwgl/cloud-detail.vue
View file @ 4ae59482
<template>
<!--
apply_id
user_id
apply_type
use_uid
id
-->
<div>
<el-breadcrumb separator="/" class="bread_crumb1 bread_left">
<el-breadcrumb-item
......@@ -21,17 +28,11 @@
<span class="head_right_msg_item">{{ cloudData.phone }}</span>
资源申请状态：
<span
v-if="apply_type == 0 && approve_state == 0 || apply_type != 0 && approve_update_state == 0"
v-if="apply_type == 0"
class="head_right_msg_item apply_wait"
>待审批</span>
<span
v-if="apply_type == 0 && approve_state == 1 || apply_type != 0 && approve_update_state == 1"
class="head_right_msg_item apply_success"
>审批通过</span>
<span
v-if="apply_type == 0 && approve_state == -1 || apply_type != 0 && approve_update_state == -1"
class="head_right_msg_item apply_refuse"
>审批未通过</span>
<span v-if="apply_type == 1" class="head_right_msg_item apply_success">审批通过</span>
<span v-if="apply_type == -1" class="head_right_msg_item apply_refuse">审批未通过</span>
</p>
<p class="head_right_msg_p">
业务系统名：
......@@ -66,7 +67,13 @@
<div class="params_block_item_in">
<span class="params_block_item_title">数据盘：</span>
<div class="params_block_item_val">
<div>{{ cloudDteail.disk}}</div>
<div>{{ cloudDteail.disk }}</div>
</div>
</div>
<div class="params_block_item_in">
<span class="params_block_item_title">数据盘类型：</span>
<div class="params_block_item_val">
<div>{{ cloudDteail.store_type }}</div>
</div>
</div>
<div class="params_block_item_in">
......@@ -113,6 +120,12 @@
<div>{{ cloudDetailNew.adjust_disk}}</div>
</div>
</div>
<div class="params_block_item_in">
<span class="params_block_item_title">数据盘类型：</span>
<div class="params_block_item_val">
<div>{{ cloudDetailNew.store_type }}</div>
</div>
</div>
<div class="params_block_item_in">
<span class="params_block_item_title">续期时长：</span>
<span class="params_block_item_val">{{ cloudDetailNew.adjust_duration_time }}核</span>
......@@ -223,11 +236,36 @@
</div>
</InfoList>
</div>
<div class="btn_footer">
<el-button class="submit" @click="submit">提交资源申请</el-button>
<el-button class="adjustment" @click="adjustment">资源调整</el-button>
<el-button class="adjustment" @click="distribution">分配</el-button>
<el-button class="refuse" @click="refuse">拒绝</el-button>
<div
class="btn_footer"
v-if="now_user != 0 || (now_user == 0 && apploy_msg.second_level != 0)"
>
<el-button
v-if="now_user == 1 && apploy_msg.first_level == 0"
class="submit"
@click="submit"
>提交资源申请</el-button>
<el-button
v-if="now_user == 0 && apploy_msg.second_level != 0"
class="adjustment"
@click="adjustment"
>资源调整</el-button>
<el-button
class="adjustment"
v-if="now_user == 1 && apploy_msg.second_level == 1 && use_uid == ''"
@click="distribution"
>分配</el-button>
<el-button
v-if="now_user == 2 && apploy_msg.second_level == 0 || now_user == 1 && apploy_msg.first_level == 0"
class="refuse"
@click="refuse"
>拒绝</el-button>
<el-button
v-if="now_user == 2 && apploy_msg.second_level == 0"
class="adjustment"
@click="pass"
>通过</el-button>
<el-button v-if="now_user == 2 && use_uid != ''" class="refuse" @click="deleteItem">删除</el-button>
</div>
</BlockRadius>
<AllotInfoConfirm ref="allotConfirm"></AllotInfoConfirm>
......@@ -443,7 +481,14 @@ export default {
},
apply_type: 0,
approve_state: 1,
approve_update_state: 1
approve_update_state: 1,
apploy_msg: {
first_level: null,
second_level: null
},
use_uid: "",
could_delete: false,
apply_id: ""
};
},
watch: {},
......@@ -485,8 +530,9 @@ export default {
}
});
},
submit() {},
refuse() {},
pass() {},
deleteItem() {},
getCurrentUser() {
this.$api.user.getNowUser().then(({ data }) => {
if (data.success == 1) {
......@@ -497,21 +543,52 @@ export default {
}
});
},
submit(item) {
this.$refs.allotConfirm.getDetail(item.apply_id);
submit() {
this.$refs.allotConfirm.getDetail(this.apply_id);
},
clickTab() {},
setListWithRole() {
console.log(this.now_user);
if (this.now_user == 0) {
let index = this.list_arr.findIndex(
item => item.title == "资源使用情况："
);
this.list_arr.splice(index);
this.tabShow = false;
// 普通用户
if (this.apply_type == 0) {
// 申请类型0
let index = this.list_arr.findIndex(
item => item.title == "资源使用情况："
);
this.list_arr.splice(index);
this.tabShow = false;
} else if (this.apply_type != 0) {
// 申请类型1
this.tabShow = false;
}
} else if (this.now_user == 1) {
this.tabShow = true;
// 组织
if (this.apply_type == 0) {
// 申请类型
let index = this.list_arr.findIndex(
item => item.title == "资源使用情况："
);
this.list_arr.splice(index);
} else if (this.apply_type != 0) {
}
if (this.apploy_msg.first_level == 0) {
// 没分配
this.tabShow = false;
} else if (this.apploy_msg.first_level != 0) {
// 分配
this.tabShow = true;
}
} else if (this.now_user == 2) {
// 超管
if (this.apply_type == 0) {
let index = this.list_arr.findIndex(
item => item.title == "资源使用情况："
);
this.list_arr.splice(index);
this.tabShow = false;
} else if (this.apply_type != 0) {
this.tabShow = false;
}
}
this.activeName = "0";
},
......@@ -524,7 +601,9 @@ export default {
this.$api.workbench.getCloudDetail(query).then(response => {
let data = response.data.data;
console.log(data);
this.list_arr[3].info = helper.downloadFileFormat(data.apply_file); // application file name
this.list_arr[3].info = helper.downloadFileFormat(
data.apply_file ? data.apply_file : ""
); // application file name
this.list_arr[3].url = data.apply_file; // application file url
this.list_arr[6].info = data.bgn_time; // get time
this.list_arr[7].info = data.time_remaining; // remaining days
......@@ -573,13 +652,15 @@ export default {
this.cloudDteail.adjust_one_cpu_min = data.adjust_one_cpu_min;
this.cloudDteail.adjust_one_memory_max = data.adjust_one_memory_max;
this.cloudDteail.adjust_one_memory_min = data.adjust_one_memory_min;
this.apploy_msg.first_level = data.first_level;
this.apploy_msg.second_level = data.second_level;
this.setListWithRole();
});
}
}
};
</script>
<style>
<style scoped>
.in_cloud_block {
margin: 0 20px;
}
......
src/pages/workbench/fwgl/organizationCloudResource.vue
View file @ 4ae59482
......@@ -53,6 +53,7 @@
ref="dialog"
:title="dialogInfo.title"
:msg="dialogInfo.msg"
:cancel-hide="dialogInfo.cancelHide"
:submit="dialogInfo.submit"
></apass-dialog>
</div>
......@@ -78,8 +79,8 @@ export default {
listTotal: 0,
dashboardList: [],
dialogInfo: {
title: "",
msg: "",
cancelHide: false,
submit: null,
},
}),
......@@ -320,7 +321,30 @@ export default {
console.log("detailAction");
},
stateAction(item) {
console.log("stateAction");
this.dialogInfo.msg = "您确认要禁用该工作区域吗？";
this.dialogInfo.cancelHide = false;
this.dialogInfo.submit = () => {
console.log("deleteAction");
setTimeout(() => {
this.dialogInfo.msg = `该工作区域已被禁用，普通用户与组织管理员依旧能查看该工作区域，但无法做任何操作。`;
this.dialogInfo.cancelHide = true;
this.dialogInfo.submit = null;
this.showDialog();
}, 500);
};
this.showDialog();
},
deleteAction(item) {
this.dialogInfo.msg = `
您确认要移除该工作区域吗？</br>
<span style='color: #e15260;'>移除操作无法撤销</span>，您还要继续吗？
`;
this.dialogInfo.cancelHide = false;
this.dialogInfo.submit = () => {
console.log("deleteAction");
};
this.showDialog();
},
},
created() {
......@@ -403,7 +427,7 @@ export default {
label: "操作",
type: "buttons",
align: "center",
width: 80,
width: 160,
actionList: [
{
getLabel(item) {
......@@ -411,6 +435,11 @@ export default {
},
callback: this.stateAction,
},
{
label: "移除",
class: "warn",
callback: this.deleteAction,
},
],
},
];
......
src/pages/workbench/yygl/app_debugger_detail.vue
View file @ 4ae59482
......@@ -73,7 +73,6 @@
title="下载日志文件"
sunbmitText="保存"
:submitDisable="download_flag"
submit="file"
@submit="save_file"
>
<template slot="content">
......
src/pages/workbench/yygl/yyglList.vue
View file @ 4ae59482
This diff is collapsed.
src/request/api/workbench.js
View file @ 4ae59482
......@@ -34,7 +34,7 @@ const workbench = {
},
// cloud resource approval
setCloudApproval(params) {
return axios.put(`/apaas/service/v3/resource/apply/approve?apply_id=${params.applyId}&apply_state=${params.applyState}&apply_type=${params.applyType}&cloud_id=${params.applyCloudId}`, params)
return axios.put(`/apaas/service/v3/resource/apply/approve?apply_id=${params.applyId}&apply_state=${params.applyState}&apply_type=${params.applyType}&cloud_id=${params.applyCloudId}&namespace=${params.namespace}`, params)
},
// cloud resource allocation
setCloudAllocation(params) {
......@@ -48,6 +48,10 @@ const workbench = {
disabledCloud(params) {
return axios.put(`/apaas/service/v3/resource/apply/disable?id=${params.id}&type=${params.type}`)
},
// get cloud's application
getCloudApplication(params) {
return axios.get(`/apaas/hubApi/market/deployList?page=1&limit=10000&namespaces=${params.namespace}`)
},
}
export default workbench;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment