From 2b75160607ad8dae6514fdbf133e31689f4e5e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Mon, 21 Dec 2020 19:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/topology.vue                    | 4 ++--
 src/pages/example/example_table.vue            | 8 ++++----
 src/pages/service_shop/services_shop.vue       | 4 ++--
 src/pages/workbench/fwgl/serviceDetail.vue     | 2 +-
 src/pages/workbench/yygl/deploy_app_detail.vue | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/topology.vue b/src/components/topology.vue
index 25ff6b2..c565c8a 100644
--- a/src/components/topology.vue
+++ b/src/components/topology.vue
@@ -70,7 +70,7 @@ export default {
             node.img = require("@/assets/svg/topology_ic_ganzhifw.svg");
             node.size = [15, 15];
             break;
-          case "综合应用":
+          case "融合服务":
             node.type = "image";
             node.img = require("@/assets/svg/topology_ic_zonghefw.svg");
             node.size = [15, 15];
@@ -313,7 +313,7 @@ export default {
             type: "image",
             img: require("@/assets/svg/topology_ic_zonghefw.svg"),
             size: [15, 15],
-            label: "综合应用",
+            label: "融合服务",
           },
         ],
       };
diff --git a/src/pages/example/example_table.vue b/src/pages/example/example_table.vue
index 4e6dd39..b4d2e0d 100644
--- a/src/pages/example/example_table.vue
+++ b/src/pages/example/example_table.vue
@@ -161,22 +161,22 @@ export default {
       {
         name: "服务类型",
         prop: "fwlx",
-        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
+        data: ["数据服务", "时空服务", "视频服务", "感知服务", "融合服务"]
       },
       {
         name: "服务领域",
         prop: "fwly",
-        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
+        data: ["数据服务", "时空服务", "视频服务", "感知服务", "融合服务"]
       },
       {
         name: "开放程度",
         prop: "kfcd",
-        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
+        data: ["数据服务", "时空服务", "视频服务", "感知服务", "融合服务"]
       },
       {
         name: "服务状态",
         prop: "fwzt",
-        data: ["数据服务", "时空服务", "视频服务", "感知服务", "综合应用"]
+        data: ["数据服务", "时空服务", "视频服务", "感知服务", "融合服务"]
       }
     ],
     params: {
diff --git a/src/pages/service_shop/services_shop.vue b/src/pages/service_shop/services_shop.vue
index 4eccee0..f54b30e 100644
--- a/src/pages/service_shop/services_shop.vue
+++ b/src/pages/service_shop/services_shop.vue
@@ -45,9 +45,9 @@
       :showSummary="false"
     ></shop-list>
 
-    <!-- 综合应用 -->
+    <!-- 融合服务 -->
     <shop-list
-      name="综合应用"
+      name="融合服务"
       to="/shop/comprehensive_app_list/21"
       detail-path="/shop/zhfwDetail/"
       :data="comprehensive_datas"
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index a403c39..6dc68e4 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -1041,7 +1041,7 @@ export default {
         "时空服务",
         "视频服务",
         "感知服务",
-        "综合应用",
+        "融合服务",
       ],
       scrvice_area_arr: [
         "经济建设",
diff --git a/src/pages/workbench/yygl/deploy_app_detail.vue b/src/pages/workbench/yygl/deploy_app_detail.vue
index 8667211..93d3c82 100644
--- a/src/pages/workbench/yygl/deploy_app_detail.vue
+++ b/src/pages/workbench/yygl/deploy_app_detail.vue
@@ -199,7 +199,7 @@
           </div>
         </div>
       </div>
-      <apass-dialog ref="actiondialog" title="综合应用服务发布" width="520px">
+      <apass-dialog ref="actiondialog" title="融合服务发布" width="520px">
         <template slot="content">
           <div class="dialog-content">
             <el-form :model="publicForm" :rules="public_rules" ref="publicForm" class="demo-ruleForm">
-- 
2.26.0