From 9477fc87c948dd9ee9fabeea29cb896702a4f75b Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Tue, 14 Jul 2020 11:18:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=B0=83=E8=AF=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/apass-table.vue              |  8 +++++---
 src/components/e-charts/multiple_circle.vue |  4 ++--
 src/pages/workbench/workPlace.vue           |  7 +++++--
 src/pages/workbench/yygl/app_debugger.vue   |  8 ++++----
 src/pages/workbench/yygl/deployment.vue     | 17 ++++++++++++-----
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/components/apass-table.vue b/src/components/apass-table.vue
index 42f8218..c47f76c 100644
--- a/src/components/apass-table.vue
+++ b/src/components/apass-table.vue
@@ -63,7 +63,7 @@
               <sparklineCurve :refLineStyles="spRefLineStyles3" :refLineType="false" :data="scope.row[item.prop]" :limit="scope.row[item.prop].length" :styles="item.prop=='cpu'?spCurveStyles2:spCurveStyles3" />
             </sparkline>
             <span class="use" v-if="item.prop=='cpu'">{{scope.row['cpu_use']}}.00mm</span>
-            <span class="use" v-if="item.prop=='mermoy'">{{scope.row['memory_use']}}.00Mi</span>
+            <span class="use" v-if="item.prop=='mermoy'">{{scope.row['memory_use']}}Mi</span>
           </div>  
           <div v-else-if="item.type === 'image'" class="img_content">
             <img
@@ -129,11 +129,13 @@ export default {
       tag_flag_arr:[],
       spCurveStyles2: {
         stroke: '#515fe7',
-        fill: '#d2d6f8'
+        fill: '#515fe7'
+        // fill: '#d2d6f8'
       },
       spCurveStyles3: {
         stroke: '#37c299',
-        fill: '#c8ebe4'
+        fill: '#37c299'
+        // fill: '#c8ebe4'
       },
       // 指示器样式
       spIndicatorStyles1: false,
diff --git a/src/components/e-charts/multiple_circle.vue b/src/components/e-charts/multiple_circle.vue
index 1e9a818..c111349 100644
--- a/src/components/e-charts/multiple_circle.vue
+++ b/src/components/e-charts/multiple_circle.vue
@@ -65,9 +65,9 @@ export default {
             itemStyle: {
               normal: {
                 borderWidth: 5,
-                shadowBlur: 20,
+                // shadowBlur: 20,
                 borderColor: color[i],
-                shadowColor: color[i],
+                // shadowColor: color[i],
               },
             },
           },
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index f6bf814..23b583c 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -1083,6 +1083,9 @@ export default {
               if (e.create_date) {
                 e.create_date = e.create_date.split(".")[0].replace("T", " ");
               }
+              if (e.time) {
+                e.time = e.time.split(".")[0].replace("T", " ");
+              }
             });
             this.listTotal1 = response.data.total;
           }
@@ -1467,9 +1470,9 @@ export default {
             itemStyle: {
               normal: {
                 borderWidth: 5,
-                shadowBlur: 20,
+                // shadowBlur: 20,
                 borderColor: color[i],
-                shadowColor: color[i]
+                // shadowColor: color[i]
               }
             }
           },
diff --git a/src/pages/workbench/yygl/app_debugger.vue b/src/pages/workbench/yygl/app_debugger.vue
index 9336499..32dd795 100644
--- a/src/pages/workbench/yygl/app_debugger.vue
+++ b/src/pages/workbench/yygl/app_debugger.vue
@@ -264,10 +264,10 @@ export default {
                 node:e.nodeName,
                 state:e.podStatus.status,
                 times:e.restartCount,
-                cpu:this.cpu_deal(e.metrics.cpuUsageHistory),
-                cpu_use:e.metrics.cpuUsage,
-                mermoy:this.cpu_deal(e.metrics.memoryUsageHistory),
-                memory_use:e.metrics.memoryUsage,
+                cpu:e.metrics&&e.metrics.cpuUsageHistory?this.cpu_deal(e.metrics.cpuUsageHistory):'',
+                cpu_use:e.metrics.cpuUsage&&e.metrics?e.metrics.cpuUsage:'',
+                mermoy:e.metrics.memoryUsageHistory&&e.metrics?this.cpu_deal(e.metrics.memoryUsageHistory):'',
+                memory_use:e.metrics.memoryUsage&&e.metrics?e.metrics.memoryUsage:'',
                 time:temp_time,
                 namespace:this.formInline.area
               })
diff --git a/src/pages/workbench/yygl/deployment.vue b/src/pages/workbench/yygl/deployment.vue
index 8f8a7ab..1c52297 100644
--- a/src/pages/workbench/yygl/deployment.vue
+++ b/src/pages/workbench/yygl/deployment.vue
@@ -277,7 +277,7 @@ export default {
       namespace: "",
       name: "",
     },
-    select_volumn:'',
+    select_volumn:[],
     app_set: {},
     app_set_info: {},
     area_options: [
@@ -370,10 +370,10 @@ export default {
               e["cpu"] = parseInt(cpu);
               // this.deal_key_value(this.app_set_info,e.name,'resource',[memory,cpu])
             } else if(e.type == "volume") {
-              this.select_volumn=''
+              this.select_volumn=[]
               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.pvc_list[0].id
               // this.deal_key_value(this.app_set_info,e.name,e.type,e.value)
             }else{
 
@@ -435,7 +435,7 @@ export default {
               temp[e] = {
                 claimName:value[0].split(';')[0]
               }
-              this.select_volumn = value[0].split(';')[1]
+              this.select_volumn.push(value[0].split(';')[1])
             }
           }else{
             temp[e] = value;
@@ -466,6 +466,13 @@ export default {
       }
       this.senior_flag = false;
     },
+    parseInt_arr(arr){
+      var temp = []
+      arr.forEach(e => {
+        temp.push(parseInt(e))
+      });
+      return temp
+    },
     change_form_aploy(n) {
       this.is_loading = true;
       if (n == 1) {
@@ -478,7 +485,7 @@ export default {
           uu: this.evtUuid,                                         
           values: this.app_set_info,
           source: this.$route.query.source == "apply" ? "apply" : "",
-          pvc_id: parseInt(this.select_volumn)
+          pvc_id: this.parseInt_arr(this.select_volumn)
         };
       } else {
         //编辑提交
-- 
2.26.0