From e336c754681bd0468861d4bc6535f95e26985404 Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Thu, 16 Jul 2020 16:11:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop-car-apply/apply_service_state.vue    |  8 +-
 src/pages/workbench/fwgl/serviceDetail.vue    |  8 +-
 src/pages/workbench/workPlace.vue             | 10 +--
 .../workbench/yygl/deploy_app_detail.vue      | 74 ++++++-------------
 4 files changed, 34 insertions(+), 66 deletions(-)

diff --git a/src/components/shop-car-apply/apply_service_state.vue b/src/components/shop-car-apply/apply_service_state.vue
index 0831775..0edefe2 100644
--- a/src/components/shop-car-apply/apply_service_state.vue
+++ b/src/components/shop-car-apply/apply_service_state.vue
@@ -93,25 +93,25 @@ export default {
       headers: [
         {
           label: "字段编码",
-          prop: "code",
+          prop: "name",
           align: "left",
           minWidth: "20%"
         },
         {
           label: "字段名称",
-          prop: "name",
+          prop: "label",
           align: "left",
           minWidth: "20%"
         },
         {
           label: "字段类型",
-          prop: "type",
+          prop: "show_type",
           align: "center",
           width: "150"
         },
         {
           label: "字段描述",
-          prop: "desc",
+          prop: "descript",
           align: "left",
           minWidth: "50%"
         }
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index 527cec9..bcec062 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -219,14 +219,14 @@ export default {
       header_arr: [
         {
           prop: "name",
-          label: "字段名称",
+          label: "字段编码",
           minWidth: "20%",
           align: "left"
         },
         {
-          prop: "field_type",
-          label: "字段编码",
-          width: "100px",
+          prop: "label",
+          label: "字段名称",
+          minWidth: "20%",
           align: "center"
         },
         {
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index e714478..ea202cb 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -156,8 +156,8 @@
         <p
           style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
         >
-          数据资产看板
-          <img style="vertical-align:-9px;" src="@/assets/imgs/home_btn_enter.png" alt />
+          数据分析中心
+          <img style="vertical-align:-9px;cursor:pointer;"  @click="$router.push('/data_analysis')" src="@/assets/imgs/home_btn_enter.png" alt />
         </p>
         <div class="data_charts" style="width:100%;">
           <div class="data_charts_left">
@@ -197,8 +197,8 @@
         <p
           style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
         >
-          数据资产看板
-          <img style="vertical-align:-9px;" src="@/assets/imgs/home_btn_enter.png" alt />
+          数据分析中心
+          <img style="vertical-align:-9px;cursor:pointer;"  @click="$router.push('/data_analysis')" src="@/assets/imgs/home_btn_enter.png" alt />
         </p>
         <div class="data_charts" style="width:100%;">
           <div class="data_charts_left" style="width:590px;">
@@ -281,7 +281,7 @@
           {{ now_user == 0||now_user == 4 ? "我的应用" : "平台应用" }}
           <img
             @click="gotoyy"
-            style="vertical-align:-9px;"
+            style="vertical-align:-9px;cursor: pointer;"
             src="@/assets/imgs/home_btn_enter.png"
             alt
           />
diff --git a/src/pages/workbench/yygl/deploy_app_detail.vue b/src/pages/workbench/yygl/deploy_app_detail.vue
index 2ac8e10..3bb5864 100644
--- a/src/pages/workbench/yygl/deploy_app_detail.vue
+++ b/src/pages/workbench/yygl/deploy_app_detail.vue
@@ -98,10 +98,10 @@
               <nor-card title="应用状态" class="service_card">
                 <template>
                   <div style="height:115px;padding-top:10px;">
-                    <waveIcon :state="yx_state.state" style="margin:10px auto;"></waveIcon>
+                    <waveIcon :state="yx_state.state=='running'?'运行中':'停止'" style="margin:10px auto;"></waveIcon>
                     <p
                       style="color: #58617a;font-size: 16px;text-align:center;"
-                    >{{ yx_state.state }}</p>
+                    >{{ yx_state.state=='running'?'运行中':'停止' }}</p>
                   </div>
                 </template>
               </nor-card>
@@ -144,10 +144,10 @@
                         <p
                           style="color: #707693;font-size: 16px;text-align:center;"
                         >服务状态</p>
-                        <waveIcon :state="micor_state.state" style="margin:10px auto;"></waveIcon>
+                        <waveIcon :state="micor_state.state=='running'?'运行中':'停止'" style="margin:10px auto;"></waveIcon>
                         <p
                           style="color: #58617a;font-size: 16px;text-align:center;"
-                        >{{ micor_state.state }}</p>
+                        >{{ micor_state.state=='running'?'运行中':'停止' }}</p>
                       </div>
 
                       <div style="height:115px;" class="service_num service_card_box">
@@ -236,9 +236,9 @@
                 <el-select v-model="publicForm.area" placeholder="请选择服务领域">
                   <el-option
                       v-for="item in area_arr"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
                   ></el-option>
                 </el-select>
               </el-form-item>
@@ -334,52 +334,7 @@ export default {
       public_flag:false,
       now_micor_service:0,
       image_arr: [],
-      area_arr: [
-        {
-          label: "经济建设",
-          value: 0
-        },
-        {
-          label: "城市管理",
-          value: 1
-        },
-        {
-          label: "城市建设",
-          value: 2
-        },
-        {
-          label: "道路交通",
-          value: 3
-        },
-        {
-          label: "环境资源",
-          value: 4
-        },
-        {
-          label: "民生服务",
-          value: 5
-        },
-        {
-          label: "空间地理",
-          value: 6
-        },
-        {
-          label: "文化休闲",
-          value: 7
-        },
-        {
-          label: "社会团体",
-          value: 8
-        },
-        {
-          label: "教育机构",
-          value: 9
-        },
-        {
-          label: "其他",
-          value: 10
-        }
-      ],
+      area_arr: [],
       now_image_version:[],
       form: {
         name: "",
@@ -576,6 +531,7 @@ export default {
     this.getServiceBaseInfo();
     this.get_service_list();
     this.get_app_generl();
+    this.get_service_arae();
     if (this.$route.query.showstate) {
       this.now_service = 1;
     }
@@ -584,6 +540,17 @@ export default {
     
   },
   methods: {
+    get_service_arae(){
+      this.$http
+            .get('/apaas/service/v3/service/manager/servarea')
+            .then(response => {
+                let data = response.data.data
+                this.area_arr = data
+            })
+            .catch(function(response) {
+                
+            });
+    },
     public_service(){
       this.$refs.actiondialog.show();
     },
@@ -1217,6 +1184,7 @@ background:khaki;
 .imagebox {
   overflow: hidden;
   margin-bottom: 20px;
+  padding-left: 40px;
 }
 .imagebox span {
   width: 165px;
-- 
2.26.0