From fc532ca55141a8e97cb35b4723c8a54c259a7e9a Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Fri, 31 Jul 2020 10:25:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/apass-table.vue                |  10 +-
 src/pages/workbench/fwgl/serviceEdit.vue      |   8 +-
 src/pages/workbench/yygl/app_edit.vue         |   2 +-
 src/pages/workbench/yygl/apply_app_detail.vue | 118 +-----------------
 4 files changed, 13 insertions(+), 125 deletions(-)

diff --git a/src/components/apass-table.vue b/src/components/apass-table.vue
index 447010f..62db136 100644
--- a/src/components/apass-table.vue
+++ b/src/components/apass-table.vue
@@ -115,12 +115,18 @@
                 :styles="item.prop == 'cpu' ? spCurveStyles2 : spCurveStyles3"
               />
             </sparkline>
-            <span class="use" v-if="item.prop == 'cpu'"
+            <span class="use" v-if="item.prop == 'cpu'&&scope.row.cpu_use"
               >{{ scope.row["cpu_use"] }}.00mm</span
             >
-            <span class="use" v-if="item.prop == 'mermoy'"
+            <span class="use" v-if="item.prop == 'cpu'&&!scope.row.cpu_use"
+              >0mm</span
+            >
+            <span class="use" v-if="item.prop == 'mermoy'&&scope.row.memory_use"
               >{{ scope.row["memory_use"] }}Mi</span
             >
+            <span class="use" v-if="item.prop == 'mermoy'&&!scope.row.memory_use"
+              >0Mi</span
+            >
           </div>
           <div v-else-if="item.type === 'image'" class="img_content">
             <img
diff --git a/src/pages/workbench/fwgl/serviceEdit.vue b/src/pages/workbench/fwgl/serviceEdit.vue
index 2be84b2..18ae70a 100644
--- a/src/pages/workbench/fwgl/serviceEdit.vue
+++ b/src/pages/workbench/fwgl/serviceEdit.vue
@@ -221,11 +221,6 @@ export default {
     open(){
       this.maxline = ''
     },
-    open1(){
-      this.maxline1 = ''
-      this.usetime1 = ''
-      this.timevalue = ''
-    },
   },
   computed: {
     ...mapGetters([
@@ -385,6 +380,9 @@ export default {
       }else{
         this.open1 = 1
       }
+      this.maxline1 = ''
+      this.usetime1 = ''
+      this.timevalue = ''
     },
     openstart2(){
       if(this.open2){
diff --git a/src/pages/workbench/yygl/app_edit.vue b/src/pages/workbench/yygl/app_edit.vue
index bf6d87f..9b2f4f5 100644
--- a/src/pages/workbench/yygl/app_edit.vue
+++ b/src/pages/workbench/yygl/app_edit.vue
@@ -273,7 +273,7 @@ export default {
       getNewList(val) {
         console.log(val);
         this.form.fileList = ""
-        this.form.fileList = [val].map((v,k)=>{
+        this.form.fileList = val.map((v,k)=>{
           return v.url
         }).join(';')
         console.log(this.form.fileList)
diff --git a/src/pages/workbench/yygl/apply_app_detail.vue b/src/pages/workbench/yygl/apply_app_detail.vue
index c9d73c8..6314a14 100644
--- a/src/pages/workbench/yygl/apply_app_detail.vue
+++ b/src/pages/workbench/yygl/apply_app_detail.vue
@@ -53,122 +53,6 @@ export default {
   data() {
     return {
       now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员
-      approval_arr: [
-        {
-          title: "一级审批",
-          result: "审批通过",
-          arr: [
-            {
-              title: "审批时间：",
-              info: "2020-02-28 15:23:45",
-            },
-            {
-              title: "审批单位：",
-              info: "某某某城管局",
-            },
-            {
-              title: "审批人：",
-              info: "张先生",
-            },
-            {
-              title: "审批意见：",
-              info: "同意",
-            },
-          ],
-        },
-        {
-          title: "二级审批",
-          result: "审批通过",
-          arr: [
-            {
-              title: "审批时间：",
-              info: "2020-02-28 15:23:45",
-            },
-            {
-              title: "审批单位：",
-              info: "某某某城管局",
-            },
-            {
-              title: "审批人：",
-              info: "张先生",
-            },
-            {
-              title: "审批意见：",
-              info: "同意",
-            },
-          ],
-        },
-      ],
-      approval_arr1: [
-        {
-          title: "一级审批",
-          result: "审批通过",
-          arr: [
-            {
-              title: "审批时间：",
-              info: "2020-02-28 15:23:45",
-            },
-            {
-              title: "审批单位：",
-              info: "某某某城管局",
-            },
-            {
-              title: "审批人：",
-              info: "张先生",
-            },
-            {
-              title: "审批意见：",
-              info: "同意",
-            },
-          ],
-        },
-        {
-          title: "二级审批",
-          result: "审批未通过",
-          arr: [
-            {
-              title: "审批时间：",
-              info: "2020-02-28 15:23:45",
-            },
-            {
-              title: "审批单位：",
-              info: "某某某城管局",
-            },
-            {
-              title: "审批人：",
-              info: "张先生",
-            },
-            {
-              title: "审批意见：",
-              info: "不同意，驳回。",
-            },
-          ],
-        },
-      ],
-      approval_arr2: [
-        {
-          title: "一级审批",
-          result: "审批未通过",
-          arr: [
-            {
-              title: "审批时间：",
-              info: "2020-02-28 15:23:45",
-            },
-            {
-              title: "审批单位：",
-              info: "某某某城管局",
-            },
-            {
-              title: "审批人：",
-              info: "张先生",
-            },
-            {
-              title: "审批意见：",
-              info: "不同意，驳回。",
-            },
-          ],
-        },
-      ],
       approval_arr3:[],
       service_arr: ["基本信息", "申请审批信息"],
       service_header_arr: {
@@ -204,7 +88,7 @@ export default {
             "text": "2020-02-28 17:59:30"
           }
         ],
-        aqdetail: true,
+        // aqdetail: true,
       },
       now_service: 0,
       list_arr:[
-- 
2.26.0