From 0ae7581630120055c5d1514d6b8c4d05abe5902f Mon Sep 17 00:00:00 2001 From: zhangjun1 Date: Tue, 14 Jul 2020 18:13:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=B8=8A=E7=BA=BF=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/service-header.vue | 24 ++- src/pages/workbench/fwgl/serviceDetail.vue | 7 + src/pages/workbench/fwgl/serviceEdit.vue | 2 +- src/pages/workbench/yygl/app_detail.vue | 170 +++++++++++++----- .../workbench/yygl/deploy_app_detail.vue | 21 +-- 5 files changed, 160 insertions(+), 64 deletions(-) diff --git a/src/components/service-header.vue b/src/components/service-header.vue index 188a934..6500334 100644 --- a/src/components/service-header.vue +++ b/src/components/service-header.vue @@ -23,15 +23,17 @@ {{ data.xxdetail }}{{ get_strd(data.xxdetail)[1] }} {{ data.yydetail }}{{ get_strd(data.yydetail)[1] }}

- 我的服务 / 注册发布的服务 / + 我的服务 / {{now_user==0||now_user==4?'注册发布的服务':'平台服务管理'}} / 服务编辑

diff --git a/src/pages/workbench/yygl/app_detail.vue b/src/pages/workbench/yygl/app_detail.vue index 3b04fd4..85e4d58 100644 --- a/src/pages/workbench/yygl/app_detail.vue +++ b/src/pages/workbench/yygl/app_detail.vue @@ -34,14 +34,6 @@

镜像列表：

-
{ this.$refs['upload'].submit() this.$message.success('开始上传') this.$refs['form'].resetFields(); - this.addImageFlag = false + // this.addImageFlag = false }) } else { console.log('error submit!!'); @@ -424,6 +417,7 @@ export default { }, upload_success(response, file, fileList){ if(response.success == 1){ + this.addImageFlag = false this.$message.success('上传成功') this.get_image_list() }else{ @@ -531,21 +525,21 @@ export default { btnCancelText: "", position: "", } - if(val.xxdetail == '申请下线'){ + if(val.xxdetail == '申请下线'||val.xxdetail == '申请下线d'){ this.tipsOptions.message="该操作会将该应用从应用商店的平台应用区域下线至开发者应用区域，下线前需向超级管理员发送通知，超级管理员通过后此应用将下线至开发者应用区域。" this.tipsOptions.btnSubmitText="发送通知" } - if(val.xxdetail == '申请上线'){ + if(val.xxdetail == '申请上线'||val.xxdetail == '申请上线d'){ this.tipsOptions.message="该操作会将该应用从应用商店开发者应用上线至平台应用" this.tipsOptions.btnSubmitText="确认" } this.tipsOptions.position="left" this.tipsOptions.confirmSubmit = () => { console.log("deleteItem - "); - if(val.xxdetail == '申请下线'){ + if(val.xxdetail == '申请下线'||val.xxdetail == '申请下线d'){ this.change_up_state('/apaas/hubApi/market/platformStatus',3) } - if(val.xxdetail == '申请上线'){ + if(val.xxdetail == '申请上线'||val.xxdetail == '申请上线d'){ this.change_up_state('/apaas/hubApi/market/platformStatus',1) } this.$refs.myConfirm.hideModel(); @@ -561,20 +555,20 @@ export default { btnCancelText: "", position: "", } - if(val.yydetail == '申请下架'){ + if(val.yydetail == '申请下架'||val.yydetail == '申请下架d'){ this.tipsOptions.message="申请下架应用需要向组织管理员发送通知，组织管理员通过下架请求后该应用将从应用商店下架。" this.tipsOptions.btnSubmitText="发送通知" } - if(val.yydetail == '申请上架'){ + if(val.yydetail == '申请上架'||val.yydetail == '申请上架d'){ this.tipsOptions.message="申请下架应用需要向组织管理员发送通知，组织管理员通过上架请求后该应用将在应用商店上架。" this.tipsOptions.btnSubmitText="确认" } this.tipsOptions.confirmSubmit = () => { console.log("deleteItem - "); - if(val.yydetail == '申请下架'){ + if(val.yydetail == '申请下架'||val.yydetail == '申请下架d'){ this.change_up_state('/apaas/hubApi/market/deployStatus',3) } - if(val.yydetail == '申请上架'){ + if(val.yydetail == '申请上架'||val.yydetail == '申请上架d'){ this.change_up_state('/apaas/hubApi/market/deployStatus',1) } this.$refs.myConfirm.hideModel(); @@ -587,46 +581,126 @@ export default { .then((response) => { if(response.data.success){ let data = response.data.data; - this.$set(this.service_header_arr, "name", data.app_name+'V'+data.version); - this.$set(this.service_header_arr['first'][0], "text", data.online_state_name); - this.$set(this.service_header_arr['first'][1], "text", data.type_name); - this.$set(this.service_header_arr['first'][2], "text", data.ywly_name); + var temp_info = { + name: data.app_name+'V'+data.version, + first: [ + { + "name": "在线状态", + "text": data.online_state_name + }, + { + "name": "应用类型", + "text": data.type_name + }, + { + "name": "业务领域", + "text": data.ywly_name + } + ], + second: [ + { + "name": "申请类型", + "text": data.apply_type_name + }, + { + "name": "申请开发次数", + "text": data.apply_times+'次' + }, + { + "name": "申请部署次数", + "text": data.deploy_times+'次' + }, + { + "name":"创建时间", + "text":data.create_date + } + ], + yydetail: '', + xxdetail:'', + aqdetail: true, + fxdetail:false, + url:'', + } if(data.apply_type_name){ - this.$set(this.service_header_arr['second'][0], "text", data.apply_type_name); + }else{ - this.service_header_arr['second'].splice(0,1) - } - this.$set(this.service_header_arr['second'][1], "text", data.apply_times+'次'); - this.$set(this.service_header_arr['second'][2], "text", data.deploy_times+'次'); - this.$set(this.service_header_arr['second'][3], "text", data.create_date); - this.$set(this.service_header_arr, "yydetail", ''); - this.$set(this.service_header_arr, "xxdetail", ''); - if(data.up_deploy_status==0){ - this.$set(this.service_header_arr, "yydetail", '申请上架'); - }else if(data.up_deploy_status==2){ - this.$set(this.service_header_arr, "yydetail", '申请下架'); + temp_info['second'].splice(0,1) } - if(data.up_platform_status==0){ - this.$set(this.service_header_arr, "xxdetail", '申请上线'); - }else if(data.up_platform_status==2){ - this.$set(this.service_header_arr, "xxdetail", '申请下线'); + var show_arr = [ + [ + [ + ['申请上架'] + ], + [ + ['申请上架d'] + ], + ], + [ + '', + '', + [ + [ + '申请下架', + '申请上线' + ], + [ + '申请上线d', + ] + ], + [ + [ + '申请上架d' + ] + ], + ], + [ + '', + '', + [ + '', + '', + [ + '申请下线' + ], + [ + '申请下线d' + ] + ] + ] + ] + var temp_str = show_arr[data.online_state][data.up_deploy_status][data.up_platform_status] + if(this.$route.query.source=='apply'){ + + }else{ + if(temp_str&&temp_str[0]&&temp_str[0].indexOf('架')!==-1){ + temp_info.yydetail = temp_str[0] + } + if(temp_str&&temp_str[1]&&temp_str[1].indexOf('架')!==-1){ + temp_info.yydetail = temp_str[1] + } + if(temp_str&&temp_str[0]&&temp_str[0].indexOf('线')!==-1){ + temp_info.xxdetail = temp_str[0] + } + if(temp_str&&temp_str[1]&&temp_str[1].indexOf('线')!==-1){ + temp_info.xxdetail = temp_str[1] + } } if(this.now_user == 0){ - this.$set(this.service_header_arr, "fxdetail", true); + temp_info.fxdetail = true } if(this.now_user == 1){ - this.$set(this.service_header_arr, "xxdetail", ''); - this.$set(this.service_header_arr, "yydetail", ''); - this.$set(this.service_header_arr, "fxdetail", ''); - this.$set(this.service_header_arr, "aqdetail", false); + temp_info.xxdetail = '' + temp_info.yydetail = '' + temp_info.fxdetail = '' + temp_info.aqdetail = false } if(this.now_user == 2){ - this.$set(this.service_header_arr, "xxdetail", ''); - this.$set(this.service_header_arr, "yydetail", ''); - this.$set(this.service_header_arr, "aqdetail", true); + temp_info.xxdetail = '' + temp_info.yydetail = '' + temp_info.aqdetail = true } - - this.$set(this.service_header_arr, "url", data.logo); + temp_info.url = data.logo + this.service_header_arr = temp_info } }) .catch(function(response) {}); diff --git a/src/pages/workbench/yygl/deploy_app_detail.vue b/src/pages/workbench/yygl/deploy_app_detail.vue index 2636267..82a85fa 100644 --- a/src/pages/workbench/yygl/deploy_app_detail.vue +++ b/src/pages/workbench/yygl/deploy_app_detail.vue @@ -108,23 +108,23 @@ @@ -152,19 +152,19 @@
服务平均响应时间 -

{{ micor_state.averageTime }}

-

最大响应时间：{{ micor_state.maxTime }}

+

{{ micor_state.averageTime }}ms

+

最大响应时间：{{ micor_state.maxTime }}ms

吞吐率 -

{{ micor_state.averageTraffic }}

-

最大吞吐率：{{ micor_state.maxTraffic }}

+

{{ micor_state.averageTraffic }}dps

+

最大吞吐率：{{ micor_state.maxTraffic }}dps

内存使用 -

{{ micor_state.memory }}

+

{{ micor_state.memory }}MB

@@ -1191,6 +1191,7 @@ background:khaki; .service_num p:nth-of-type(1) { font-size: 36px; color: #3f4f9c; + font-weight: 600; margin-bottom: 10px; } .service_num p:nth-of-type(2) { -- 2.26.0