From 97f04542975395a6c62b055c6663fc095e3508e0 Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Mon, 13 Jul 2020 15:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=88=E7=BB=86=E8=8A=82=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/serviceEdit.vue       | 2 +-
 src/pages/workbench/yygl/app_detail.vue        | 8 ++++++--
 src/pages/workbench/yygl/app_edit.vue          | 2 +-
 src/pages/workbench/yygl/deploy_app_detail.vue | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/pages/workbench/fwgl/serviceEdit.vue b/src/pages/workbench/fwgl/serviceEdit.vue
index c5d027f..c73bd49 100644
--- a/src/pages/workbench/fwgl/serviceEdit.vue
+++ b/src/pages/workbench/fwgl/serviceEdit.vue
@@ -40,7 +40,7 @@
         ]"
          >
           <p class="formname">所属组织：</p>
-          <el-select v-model="form.origin" placeholder="请选择" disabled="true">
+          <el-select v-model="form.origin" placeholder="请选择" :disabled="true">
             <el-option
               v-for="item in origin_arr"
               :key="item.department_id"
diff --git a/src/pages/workbench/yygl/app_detail.vue b/src/pages/workbench/yygl/app_detail.vue
index 27083fd..9a1980f 100644
--- a/src/pages/workbench/yygl/app_detail.vue
+++ b/src/pages/workbench/yygl/app_detail.vue
@@ -445,7 +445,7 @@ export default {
     },
     get_image_list(){
       this.image_loading = true;
-      this.$http.get(`/apaas/hubApi/image/imageUpList?page=${this.now_page}&size=5`)
+      this.$http.get(`/apaas/hubApi/image/imageUpList?page=${this.now_page}&size=5&app_id=${this.$route.params.id}`)
       .then((response)=>{
         if(response.data.success==1){
           console.log(response);
@@ -587,7 +587,11 @@ export default {
             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);
-            this.$set(this.service_header_arr['second'][0], "text", data.apply_type_name);
+            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);
diff --git a/src/pages/workbench/yygl/app_edit.vue b/src/pages/workbench/yygl/app_edit.vue
index 360334c..bf6d87f 100644
--- a/src/pages/workbench/yygl/app_edit.vue
+++ b/src/pages/workbench/yygl/app_edit.vue
@@ -60,7 +60,7 @@
         ]"
          >
           <p class="formname">所属组织：</p>
-          <el-select v-model="form.origin" placeholder="请选择" disabled="true">
+          <el-select v-model="form.origin" placeholder="请选择" :disabled="true">
             <el-option
               v-for="item in origin_arr"
               :key="item.id"
diff --git a/src/pages/workbench/yygl/deploy_app_detail.vue b/src/pages/workbench/yygl/deploy_app_detail.vue
index 9a2508d..7a35f4e 100644
--- a/src/pages/workbench/yygl/deploy_app_detail.vue
+++ b/src/pages/workbench/yygl/deploy_app_detail.vue
@@ -819,7 +819,7 @@ export default {
           this.$set(
             this.service_header_arr["second"][1],
             "text",
-            data.namespace+'('+data.workpalce+')'
+            data.namespace+'('+data.workplace+')'
           );
           this.$set(this.service_header_arr["second"][2], "text", data.created);
         })
-- 
2.26.0