Skip to content

A
apaas-ui
Commit 225b17c6 authored by 张俊's avatar 张俊
Browse files
Options

一键部署新增字段

parent 32e3860a
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 84 deletions
src/components/app-list/app-card.vue
View file @ 225b17c6
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
this.$router.push( this.$router.push(
`${this.detailsUrl}${ `${this.detailsUrl}${
this.cardType == 0 this.cardType == 0
? this.data.app_id ? this.data.app_id+`?source=${this.data.source}`
: this.data.deploy_id + `?app_id=${this.data.app_id}` : this.data.deploy_id + `?app_id=${this.data.app_id}`
}` }`
); );
......
src/components/service-header.vue
View file @ 225b17c6
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
subevent(val){ subevent(val){
if(val == 0){ if(val == 0){
// this.$emit('deploy',this.data) // this.$emit('deploy',this.data)
this.$router.push(`/yygl/${this.$route.params.level}/${this.$route.params.type}/deployment/${this.$route.params.id}`) this.$router.push(`/yygl/${this.$route.params.level}/${this.$route.params.type}/deployment/${this.$route.params.id}?source=${this.$route.query.source}`)
console.log(this.$route); console.log(this.$route);
}else if(val == 1){ }else if(val == 1){
this.$emit('editapp') this.$emit('editapp')
......
src/pages/workbench/fwgl/serviceEdit.vue
View file @ 225b17c6
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
]" ]"
> >
<p class="formname">所属组织：</p> <p class="formname">所属组织：</p>
<el-select v-model="form.origin" placeholder="请选择"> <el-select v-model="form.origin" placeholder="请选择" disabled="true">
<el-option <el-option
v-for="item in origin_arr" v-for="item in origin_arr"
:key="item.department_id" :key="item.department_id"
......
src/pages/workbench/workPlace.vue
View file @ 225b17c6
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
: 'menu_box2' : 'menu_box2'
" "
v-for="(item, index) in menu_arr[now_user]" v-for="(item, index) in menu_arr[now_user]"
:style="{backgroundColor:item.bg}"
:key="index + 100" :key="index + 100"
> >
<img :src="item.pic" alt /> <img :src="item.pic" alt />
...@@ -508,17 +509,17 @@ export default { ...@@ -508,17 +509,17 @@ export default {
[ [
"/apaas/service/v3/service/manager/list", "/apaas/service/v3/service/manager/list",
"/apaas/service/v3/service/apply/service/list", "/apaas/service/v3/service/apply/service/list",
"/apaas/service/v3/service/manager/list" "/apaas/service/v3/resource/user/apply/list"
], ],
[ [
"/apaas/service/v3/service/manager/list", "/apaas/service/v3/service/manager/list",
"/apaas/service/v3/service/approval/applied/list", "/apaas/service/v3/service/approval/applied/list",
"nor_cloud" "/apaas/service/v3/resource/user/apply/list"
], ],
[ [
"/apaas/service/v3/service/manager/list", "/apaas/service/v3/service/manager/list",
"/apaas/service/v3/service/approval/applied/list", "/apaas/service/v3/service/approval/applied/list",
"nor_cloud_manage" "/apaas/service/v3/resource/user/apply/list"
] ]
], ],
service_head: [ service_head: [
...@@ -581,33 +582,7 @@ export default { ...@@ -581,33 +582,7 @@ export default {
], ],
[ [
{ {
prop: "fwmc", prop: "name_space",
label: "服务名称",
width: "250px",
align: "left"
},
{
prop: "fwlx",
label: "服务类型",
width: "120px",
align: "center"
},
{
prop: "spsj",
label: "审批时间",
width: "200px",
align: "center"
},
{
prop: "spzt",
label: "审批状态",
width: "110px",
align: "center"
}
],
[
{
prop: "gzqy",
label: "工作区域", label: "工作区域",
width: "150px", width: "150px",
align: "left" align: "left"
...@@ -625,7 +600,7 @@ export default { ...@@ -625,7 +600,7 @@ export default {
align: "center" align: "center"
}, },
{ {
prop: "ncgb", prop: "memory",
label: "内存(GB)", label: "内存(GB)",
width: "90px", width: "90px",
align: "center" align: "center"
...@@ -637,7 +612,7 @@ export default { ...@@ -637,7 +612,7 @@ export default {
align: "center" align: "center"
}, },
{ {
prop: "sqzt", prop: "approve_state_name",
label: "申请状态", label: "申请状态",
width: "110px", width: "110px",
align: "center" align: "center"
...@@ -703,7 +678,7 @@ export default { ...@@ -703,7 +678,7 @@ export default {
], ],
[ [
{ {
prop: "gzqy", prop: "name_space",
label: "工作区域", label: "工作区域",
width: "100px", width: "100px",
align: "left" align: "left"
...@@ -721,7 +696,7 @@ export default { ...@@ -721,7 +696,7 @@ export default {
align: "center" align: "center"
}, },
{ {
prop: "ncgb", prop: "memory",
label: "内存(GB)", label: "内存(GB)",
width: "80px", width: "80px",
align: "center" align: "center"
...@@ -809,7 +784,7 @@ export default { ...@@ -809,7 +784,7 @@ export default {
], ],
[ [
{ {
prop: "sszz", prop: "department_name ",
label: "所属组织", label: "所属组织",
width: "170px", width: "170px",
align: "left" align: "left"
...@@ -821,7 +796,7 @@ export default { ...@@ -821,7 +796,7 @@ export default {
align: "center" align: "center"
}, },
{ {
prop: "ncgb", prop: "memory",
label: "内存使用量(GB)", label: "内存使用量(GB)",
width: "130px", width: "130px",
align: "center" align: "center"
...@@ -1123,7 +1098,7 @@ export default { ...@@ -1123,7 +1098,7 @@ export default {
.get( .get(
`${this.service_url_arr[this.now_user][this.now_type]}?page=${ `${this.service_url_arr[this.now_user][this.now_type]}?page=${
this.currentPage this.currentPage
}&size=${this.pageSize}` }&size=${this.pageSize}&limit=${this.pageSize}`
) )
.then(response => { .then(response => {
console.log(response); console.log(response);
...@@ -1131,47 +1106,53 @@ export default { ...@@ -1131,47 +1106,53 @@ export default {
return; return;
} }
let data = response.data.data; let data = response.data.data;
this.service_data = data.data; if(this.now_type==2){
this.service_data.forEach(e => { this.service_data = data.cloud_apply_list
if (e.create_time) { this.listTotal = response.data.total;
e.create_time = e.create_time.split("+")[0].replace("T", " "); }else{
} this.service_data = data.data;
this.service_data.forEach(e => {
if (e.create_time) {
e.create_time = e.create_time.split("+")[0].replace("T", " ");
}
if (e.service_apply_info && e.service_apply_info.approval_time) { if (e.service_apply_info && e.service_apply_info.approval_time) {
e.approval_time = helper.dateStringTransform( e.approval_time = helper.dateStringTransform(
e.service_apply_info.approval_time e.service_apply_info.approval_time
); );
} else { } else {
e.approval_time = ""; e.approval_time = "";
} }
if (e.service_apply_info && e.service_apply_info.apply_time) { if (e.service_apply_info && e.service_apply_info.apply_time) {
e.apply_time = helper.dateStringTransform( e.apply_time = helper.dateStringTransform(
e.service_apply_info.apply_time e.service_apply_info.apply_time
); );
} else { } else {
e.apply_time = ""; e.apply_time = "";
} }
if (e.service_apply_info && e.service_apply_info.approval_status) { if (e.service_apply_info && e.service_apply_info.approval_status) {
if (this.now_user !== 0 && this.now_user !== 4) { if (this.now_user !== 0 && this.now_user !== 4) {
e.approval_status = ["-", "已审批", "待审批"][ e.approval_status = ["-", "已审批", "待审批"][
e.service_apply_info.approval_status e.service_apply_info.approval_status
]; ];
} else {
e.approval_status = [
"-",
"待审批",
"审批中",
"审批通过",
"审批未通过"
][e.service_apply_info.approval_status];
}
} else { } else {
e.approval_status = [ e.approval_status = "";
"-",
"待审批",
"审批中",
"审批通过",
"审批未通过"
][e.service_apply_info.approval_status];
} }
} else { });
e.approval_status = ""; this.listTotal = data.total;
} }
});
this.listTotal = data.total;
}) })
.catch(function(response) {}); .catch(function(response) {});
}, },
......
src/pages/workbench/yygl/app_edit.vue
View file @ 225b17c6
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
]" ]"
> >
<p class="formname">所属组织：</p> <p class="formname">所属组织：</p>
<el-select v-model="form.origin" placeholder="请选择"> <el-select v-model="form.origin" placeholder="请选择" disabled="true">
<el-option <el-option
v-for="item in origin_arr" v-for="item in origin_arr"
:key="item.id" :key="item.id"
......
src/pages/workbench/yygl/deploy_app_detail.vue
View file @ 225b17c6
...@@ -417,7 +417,7 @@ export default { ...@@ -417,7 +417,7 @@ export default {
text: "" text: ""
}, },
{ {
name: "部署区域", name: "工作区域",
text: "" text: ""
}, },
{ {
...@@ -643,7 +643,6 @@ export default { ...@@ -643,7 +643,6 @@ export default {
this.get_micro_service() this.get_micro_service()
}, },
compare(property){ compare(property){
debugger
return function(a,b){ return function(a,b){
var value1 = a[property]; var value1 = a[property];
var value2 = b[property]; var value2 = b[property];
...@@ -820,7 +819,7 @@ export default { ...@@ -820,7 +819,7 @@ export default {
this.$set( this.$set(
this.service_header_arr["second"][1], this.service_header_arr["second"][1],
"text", "text",
data.namespace data.namespace+'('+data.workpalce+')'
); );
this.$set(this.service_header_arr["second"][2], "text", data.created); this.$set(this.service_header_arr["second"][2], "text", data.created);
}) })
......
src/pages/workbench/yygl/deployment.vue
View file @ 225b17c6
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<div class="cloud_save_box" v-if="item.check_type==1"> <div class="cloud_save_box" v-if="item.check_type==1">
<el-radio-group v-model="item.value"> <el-radio-group v-model="item.value">
<p v-for="(it,idx) in pvc_list" :key="idx+589000"> <p v-for="(it,idx) in pvc_list" :key="idx+589000">
<el-radio :label="it.disk_serial_number">{{it.disk_serial_number}}&nbsp;({{'用量：'+it.disk_cap+'Gi'+' '+' ' +'类型：'+it.store_type}})</el-radio> <el-radio :label="it.disk_serial_number+';'+it.id">{{it.disk_serial_number}}&nbsp;({{'用量：'+it.disk_cap+'Gi'+' '+' ' +'类型：'+it.store_type}})</el-radio>
</p> </p>
</el-radio-group> </el-radio-group>
</div> </div>
...@@ -277,6 +277,7 @@ export default { ...@@ -277,6 +277,7 @@ export default {
namespace: "", namespace: "",
name: "", name: "",
}, },
select_volumn:'',
app_set: {}, app_set: {},
app_set_info: {}, app_set_info: {},
area_options: [ area_options: [
...@@ -369,7 +370,9 @@ export default { ...@@ -369,7 +370,9 @@ export default {
e["cpu"] = parseInt(cpu); e["cpu"] = parseInt(cpu);
// this.deal_key_value(this.app_set_info,e.name,'resource',[memory,cpu]) // this.deal_key_value(this.app_set_info,e.name,'resource',[memory,cpu])
} else if(e.type == "volume") { } else if(e.type == "volume") {
this.select_volumn=''
e['check_type'] = 0 e['check_type'] = 0
console.log(this.pvc_list);
e['value'] = this.pvc_list[0].disk_serial_number e['value'] = this.pvc_list[0].disk_serial_number
// this.deal_key_value(this.app_set_info,e.name,e.type,e.value) // this.deal_key_value(this.app_set_info,e.name,e.type,e.value)
}else{ }else{
...@@ -430,8 +433,9 @@ export default { ...@@ -430,8 +433,9 @@ export default {
} }
}else{//云存储 }else{//云存储
temp[e] = { temp[e] = {
claimName:value[0] claimName:value[0].split(';')[0]
} }
this.select_volumn = value[0].split(';')[1]
} }
}else{ }else{
temp[e] = value; temp[e] = value;
...@@ -471,9 +475,10 @@ export default { ...@@ -471,9 +475,10 @@ export default {
up_userid: this.$store.state.userInfo.user_id, up_userid: this.$store.state.userInfo.user_id,
name: this.baseInfoForm.name, name: this.baseInfoForm.name,
namespace: this.baseInfoForm.namespace, namespace: this.baseInfoForm.namespace,
uu: this.evtUuid, uu: this.evtUuid,
values: this.app_set_info, values: this.app_set_info,
source: this.$route.query.source == "apply" ? "apply" : "" source: this.$route.query.source == "apply" ? "apply" : "",
pvc_id: parseInt(this.select_volumn)
}; };
} else { } else {
//编辑提交 //编辑提交
......
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