diff --git a/src/components/e-charts/dashboard.vue b/src/components/e-charts/dashboard.vue index e18ac05045700f4378ca4470d467c6d5b01ed491..74fc47c07a578f49c0a77b186bbfbbd1284b9ce2 100644 --- a/src/components/e-charts/dashboard.vue +++ b/src/components/e-charts/dashboard.vue @@ -162,6 +162,10 @@ export default { ? self.data.data >= 80 ? "#f7f1d5" : "#d5f7e8" + :self.dangerousValue == "workplace" + ? self.data.data >= 80 + ? "#f7f1d5" + : "#e6ebfe" : self.data.data > 75 ? "#d5f7e8" : self.data.data > 50 @@ -177,6 +181,10 @@ export default { ? self.data.data >= 80 ? "#da4251" // red : "#00beb2" //green + :self.dangerousValue == "workplace" + ? self.data.data >= 80 + ? "#da4251" + : "#515fe7" : self.data.data > 75 ? "#00beb2" //green : self.data.data > 50 diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue index c334ddfb87f55f550f538d61601a631f49b7c024..81f9f81201a27a3907d3b428bcc67fcaaf4419b5 100644 --- a/src/pages/workbench/workPlace.vue +++ b/src/pages/workbench/workPlace.vue @@ -63,10 +63,10 @@
-

+

云资源概况分析 - +

- +

物理总量{{cpu_data.all}}核

剩余量{{cpu_data.remaining}}核

- +

物理总量{{memory_data.all}}GB

剩余量{{memory_data.remaining}}GB

- +

物理总量{{pan_data.all}}GB

剩余量{{pan_data.remaining}}GB未知

- +

物理总量{{pod_data.all}}

剩余量{{pod_data.remaining}}

@@ -1237,44 +1237,26 @@ export default { .get("/apaas/service/v3/workplace/statistics/resource/basic?work_id="+this.work_value) .then(response => { if(response.data.success){ - // this.work_options=response.data.data - // this.work_value=response.data.data[0].id - // "container": { 工作组 - // "total": 12, 总量 - // "used": 0 使用量 - // }, - // "cpu": { cpu - // "total": 8, - // "used": 0 - // }, - // "disk": { 磁盘 - // "total": 0, - // "used": -1 -1表示未知,和产品沟通过直接显示未知 - // }, - // "memory": { 内存 - // "total": 8, - // "used": 0 - // } this.cpu_data={ - data: parseInt(response.data.data.cpu.used/response.data.data.cpu.total), + data: parseInt(response.data.data.cpu.used/response.data.data.cpu.total*100), text: "CPU已使用", all:response.data.data.cpu.total, remaining:response.data.data.cpu.total-response.data.data.cpu.used } this.memory_data={ - data: parseInt(response.data.data.memory.used/response.data.data.memory.total), + data: parseInt(response.data.data.memory.used/response.data.data.memory.total*100), text: "内存已使用", all:response.data.data.memory.total, remaining:response.data.data.memory.total-response.data.data.memory.used } this.pan_data={ - data: response.data.data.disk.used==-1?0:parseInt(response.data.data.disk.used/response.data.data.disk.total), + data: response.data.data.disk.used==-1?0:parseInt(response.data.data.disk.used/response.data.data.disk.total*100), text: "数据盘已使用", all:response.data.data.disk.total, remaining:response.data.data.disk.used==-1?-1:response.data.data.disk.total-response.data.data.disk.used } this.pod_data={ - data: parseInt(response.data.data.container.used/response.data.data.container.total), + data: parseInt(response.data.data.container.used/response.data.data.container.total*100), text: "容器组已使用", all:response.data.data.container.total, remaining:response.data.data.container.total-response.data.data.container.used @@ -1828,6 +1810,12 @@ export default { line-height: 28px; font-size: 12px; } +.data_charts_left .cloud_asy .el-input__inner { + width: 150px; + height: 28px; + line-height: 28px; + font-size: 12px; +} .data_charts_left .el-input__icon { line-height: 28px; } diff --git a/src/pages/workbench/yygl/app_debugger.vue b/src/pages/workbench/yygl/app_debugger.vue index bfb0722594c705b24073d8505fcb67e86dddf922..982e5080fa6014c531811c45ee968f86d06f23ab 100644 --- a/src/pages/workbench/yygl/app_debugger.vue +++ b/src/pages/workbench/yygl/app_debugger.vue @@ -7,7 +7,7 @@
- + @@ -108,12 +108,12 @@ export default { }, created() { console.log(json,yaml); - this.get_namespace_list() - this.get_app_list() this.formInline={ area:this.$route.query.namespace, name:this.$route.query.app } + this.get_namespace_list() + this.get_app_list() this.get_list_pod() }, mounted() { @@ -216,9 +216,12 @@ export default { } }) }, - get_app_list(){ + get_app_list(flag=true){ + if(!flag){ + this.$set(this.formInline,'name','') + } this.$http - .get(`/apaas/hubApi/cloud/podApps/${this.$route.query.namespace}`) + .get(`/apaas/hubApi/cloud/podApps/${this.formInline.area}`) .then(response => { if(response.data.success){ this.app_arr = response.data.data