From 416606ddee1e1e506fcc451183fc4723599c8445 Mon Sep 17 00:00:00 2001
From: hexiaoyong <hexiaoyong@wodcloud.com>
Date: Fri, 18 Mar 2022 14:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .beagle.yml                                      |  1 +
 src/components/menu.vue                          |  1 +
 src/components/message-steps/select-service.vue  | 12 ++++++------
 src/components/service-list/service_list-new.vue |  4 ++--
 src/components/topology.vue                      | 16 ++++++++--------
 src/pages/data-analysis/org-service.vue          |  8 ++++----
 src/pages/data-analysis/super-service.vue        |  8 ++++----
 src/pages/example/example_table.vue              |  8 ++++----
 .../recommended/recommended-eidt.vue             |  6 +++---
 src/pages/service_shop/shop_list-new.vue         | 12 ++++++------
 src/pages/service_shop/shop_list-old.vue         | 12 ++++++------
 src/pages/service_shop/sjfwDetail.vue            |  2 +-
 .../workbench/fwgl/apply_service_detail.vue      |  2 +-
 src/pages/workbench/fwgl/serviceDetail.vue       | 12 ++++++------
 src/pages/workbench/yygl/apply_app_detail.vue    |  2 +-
 15 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/.beagle.yml b/.beagle.yml
index 1432043..0b3741a 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -274,3 +274,4 @@ pipeline:
       branch: 
         - dev
 
+     
\ No newline at end of file
diff --git a/src/components/menu.vue b/src/components/menu.vue
index 90bfd96..1297c21 100644
--- a/src/components/menu.vue
+++ b/src/components/menu.vue
@@ -359,6 +359,7 @@ export default {
 .logo_text {
   color: #fff;
   padding-left: 5px;
+  font-size: 20px;
 }
 .user {
   float: right;
diff --git a/src/components/message-steps/select-service.vue b/src/components/message-steps/select-service.vue
index 1160c55..894aca4 100644
--- a/src/components/message-steps/select-service.vue
+++ b/src/components/message-steps/select-service.vue
@@ -38,15 +38,15 @@ export default {
         arr: [
           {
             id: 5,
-            name: "数据服务",
+            name: "基础支撑服务",
           },
           {
             id: 6,
-            name: "时空服务",
+            name: "基础地图服务",
           },
           {
             id: 7,
-            name: "视频服务",
+            name: "视频图像服务",
           },
           {
             id: 10,
@@ -54,7 +54,7 @@ export default {
           },
           {
             id: 21,
-            name: "融合服务",
+            name: "执法办案服务",
           },
         ],
       },
@@ -87,8 +87,8 @@ export default {
     getFilterList() {
       let serviceType = this.serviceType;
       let serviceTypeInfo = {
-        5: "数据服务类型",
-        6: "时空服务类型",
+        5: "基础支撑服务类型",
+        6: "基础地图服务类型",
         7: "服务类型",
         10: "服务类型",
         21: "服务类型",
diff --git a/src/components/service-list/service_list-new.vue b/src/components/service-list/service_list-new.vue
index 93b1137..02323cb 100644
--- a/src/components/service-list/service_list-new.vue
+++ b/src/components/service-list/service_list-new.vue
@@ -35,7 +35,7 @@
             class="classification_line_if"
             v-if="item.childDomains && item.childDomains.length != 0"
           >
-            <div class="classification_line_title">{{ item.name }}<span class="maohao">：</span></div>
+            <div class="classification_line_title">{{ item.name }}<span class="maohao">:</span></div>
             <!-- <div
               :class="
                 index == filterLists.length - 1
@@ -663,7 +663,7 @@ export default {
 }
 .classification_line_title {
   display: inline-block;
-  width: 90px;
+  width: 100px;
   padding: 12px 0;
   text-align: left;
   color: #8890a7;
diff --git a/src/components/topology.vue b/src/components/topology.vue
index c565c8a..b8f2f0b 100644
--- a/src/components/topology.vue
+++ b/src/components/topology.vue
@@ -50,17 +50,17 @@ export default {
       self.datas.nodes.map((node) => {
         node.id = node.data.id;
         switch (node.data.svcType) {
-          case "数据服务":
+          case "基础支撑服务":
             node.type = "image";
             node.img = require("@/assets/svg/topology_ic_shujufw.svg");
             node.size = [15, 15];
             break;
-          case "时空服务":
+          case "基础地图服务":
             node.type = "image";
             node.img = require("@/assets/svg/topology_ic_shikongfw.svg");
             node.size = [15, 15];
             break;
-          case "视频服务":
+          case "视频图像服务":
             node.type = "image";
             node.img = require("@/assets/svg/topology_ic_shipinfw.svg");
             node.size = [15, 15];
@@ -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];
@@ -277,7 +277,7 @@ export default {
             type: "image",
             img: require("@/assets/svg/topology_ic_shujufw.svg"),
             size: [15, 15],
-            label: "数据服务",
+            label: "基础支撑服务",
           },
           {
             id: "level2",
@@ -286,7 +286,7 @@ export default {
             type: "image",
             img: require("@/assets/svg/topology_ic_shikongfw.svg"),
             size: [15, 15],
-            label: "时空服务",
+            label: "基础地图服务",
           },
           {
             id: "level3",
@@ -295,7 +295,7 @@ export default {
             type: "image",
             img: require("@/assets/svg/topology_ic_shipinfw.svg"),
             size: [15, 15],
-            label: "视频服务",
+            label: "视频图像服务",
           },
           {
             id: "level4",
@@ -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/data-analysis/org-service.vue b/src/pages/data-analysis/org-service.vue
index 2788a80..7e9f600 100644
--- a/src/pages/data-analysis/org-service.vue
+++ b/src/pages/data-analysis/org-service.vue
@@ -404,11 +404,11 @@ export default {
       { name: "警告", value: 0 },
     ],
     mult_data: [
-      { name: "数据服务", value: 0 },
-      { name: "时空服务", value: 0 },
-      { name: "视频服务", value: 0 },
+      { name: "基础支撑服务", value: 0 },
+      { name: "基础地图服务", value: 0 },
+      { name: "视频图像服务", value: 0 },
       { name: "感知服务", value: 0 },
-      { name: "融合服务", value: 0 },
+      { name: "执法办案服务", value: 0 },
     ],
     fwsp_data: [
       { name: "已审批", value: 0 },
diff --git a/src/pages/data-analysis/super-service.vue b/src/pages/data-analysis/super-service.vue
index 221ac3c..16adb1e 100644
--- a/src/pages/data-analysis/super-service.vue
+++ b/src/pages/data-analysis/super-service.vue
@@ -402,11 +402,11 @@ export default {
       { name: "警告", value: 0 },
     ],
     mult_data: [
-      { name: "数据服务", value: 0 },
-      { name: "时空服务", value: 0 },
-      { name: "视频服务", value: 0 },
+      { name: "基础支撑服务", value: 0 },
+      { name: "基础地图服务", value: 0 },
+      { name: "视频图像服务", value: 0 },
       { name: "感知服务", value: 0 },
-      { name: "融合服务", value: 0 },
+      { name: "执法办案服务", value: 0 },
     ],
     fwsp_data: [
       { name: "已审批", value: 0 },
diff --git a/src/pages/example/example_table.vue b/src/pages/example/example_table.vue
index b4d2e0d..01194bb 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/message-management/recommended/recommended-eidt.vue b/src/pages/message-management/recommended/recommended-eidt.vue
index fc9d3c1..3106d31 100644
--- a/src/pages/message-management/recommended/recommended-eidt.vue
+++ b/src/pages/message-management/recommended/recommended-eidt.vue
@@ -64,7 +64,7 @@ export default {
       filter_name_arr: {
         organizations: "数据来源机构",
         serviceDomain: "数据领域",
-        serviceTypeInfo: "数据服务类型",
+        serviceTypeInfo: "基础支撑服务类型",
       },
       select_able_arr: [],
       selected_arr: [],
@@ -174,14 +174,14 @@ export default {
         this.filter_name_arr = {
           organizations: "数据来源机构",
           serviceDomain: "数据领域",
-          serviceTypeInfo: "数据服务类型",
+          serviceTypeInfo: "基础支撑服务类型",
         }
       }else{
         var temp = 6
         this.filter_name_arr = {
           organizations: "服务来源组织",
           serviceDomain: "服务领域",
-          serviceTypeInfo: "时空服务类型",
+          serviceTypeInfo: "基础地图服务类型",
         }
       }
       this.$http
diff --git a/src/pages/service_shop/shop_list-new.vue b/src/pages/service_shop/shop_list-new.vue
index adf51b2..91418de 100644
--- a/src/pages/service_shop/shop_list-new.vue
+++ b/src/pages/service_shop/shop_list-new.vue
@@ -41,19 +41,19 @@ export default {
       uri = uri.substring(0, uri.indexOf("/"));
       switch (uri) {
         case "data_service_list":
-          this.name = "数据服务";
+          this.name = "基础支撑服务";
           this.urlFilter = "5";
           this.url = "/shop/sjfwDetail";
-          this.filterNames = ["数据服务类型", "服务领域", "数据来源机构"];
+          this.filterNames = ["基础支撑服务类型", "服务领域", "数据来源机构"];
           break;
         case "space_time_service_list":
-          this.name = "时空服务";
+          this.name = "基础地图服务";
           this.urlFilter = "6";
           this.url = "/shop/skfwDetail";
-          this.filterNames = ["时空服务类型", "服务领域", "服务来源组织"];
+          this.filterNames = ["基础地图服务类型", "服务领域", "服务来源组织"];
           break;
         case "video_service_list":
-          this.name = "视频服务";
+          this.name = "视频图像服务";
           this.urlFilter = "7";
           this.url = "/shop/spfwDetail";
           this.filterNames = ["", "服务领域", "服务来源组织"];
@@ -65,7 +65,7 @@ export default {
           this.filterNames = ["", "服务领域", "服务来源组织"];
           break;
         case "comprehensive_app_list":
-          this.name = "融合服务";
+          this.name = "执法办案服务";
           this.urlFilter = "21";
           this.url = "/shop/zhfwDetail";
           this.filterNames = ["服务类型", "服务领域", "服务来源组织"];
diff --git a/src/pages/service_shop/shop_list-old.vue b/src/pages/service_shop/shop_list-old.vue
index 4a14af9..67bf00d 100644
--- a/src/pages/service_shop/shop_list-old.vue
+++ b/src/pages/service_shop/shop_list-old.vue
@@ -42,19 +42,19 @@ export default {
       uri = uri.substring(0, uri.indexOf("/"));
       switch (uri) {
         case "data_service_list":
-          this.name = "数据服务";
+          this.name = "基础支撑服务";
           this.urlFilter = "5";
           this.url = "/shop/sjfwDetail";
-          this.filterNames = ["数据服务类型", "服务领域", "数据来源机构"];
+          this.filterNames = ["基础支撑服务类型", "服务领域", "数据来源机构"];
           break;
         case "space_time_service_list":
-          this.name = "时空服务";
+          this.name = "基础地图服务";
           this.urlFilter = "6";
           this.url = "/shop/skfwDetail";
-          this.filterNames = ["时空服务类型", "服务领域", "服务来源组织"];
+          this.filterNames = ["基础地图服务类型", "服务领域", "服务来源组织"];
           break;
         case "video_service_list":
-          this.name = "视频服务";
+          this.name = "视频图像服务";
           this.urlFilter = "7";
           this.url = "/shop/spfwDetail";
           this.filterNames = ["", "服务领域", "服务来源组织"];
@@ -66,7 +66,7 @@ export default {
           this.filterNames = ["", "服务领域", "服务来源组织"];
           break;
         case "comprehensive_app_list":
-          this.name = "融合服务";
+          this.name = "执法办案服务";
           this.urlFilter = "21";
           this.url = "/shop/zhfwDetail";
           this.filterNames = ["服务类型", "服务领域", "服务来源组织"];
diff --git a/src/pages/service_shop/sjfwDetail.vue b/src/pages/service_shop/sjfwDetail.vue
index 3d1c9bc..dd2c425 100644
--- a/src/pages/service_shop/sjfwDetail.vue
+++ b/src/pages/service_shop/sjfwDetail.vue
@@ -4,7 +4,7 @@
       <el-breadcrumb separator="/">
         <el-breadcrumb-item to="/shop">服务超市</el-breadcrumb-item>
         <el-breadcrumb-item to="/shop/data_service_list/5">
-          数据服务
+          基础支撑服务
         </el-breadcrumb-item>
         <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
       </el-breadcrumb>
diff --git a/src/pages/workbench/fwgl/apply_service_detail.vue b/src/pages/workbench/fwgl/apply_service_detail.vue
index c73f3e7..b0accaa 100644
--- a/src/pages/workbench/fwgl/apply_service_detail.vue
+++ b/src/pages/workbench/fwgl/apply_service_detail.vue
@@ -1120,7 +1120,7 @@ export default {
             this.$set(this.servicead_arr[5], "type", "");
             this.$set(this.servicead_arr[5], "info", "无响应示例");
           }
-          if (data.data_service_type1_name != "数据服务") {
+          if (data.data_service_type1_name != "基础支撑服务") {
             this.servicead_arr = this.servicead_arr.slice(0, 4);
           }
           console.log(data.service_apply_info);
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index 36d22f1..e2398c6 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -1162,11 +1162,11 @@ export default {
       ],
       port_options: [],
       service_type_arr: [
-        "数据服务",
-        "时空服务",
-        "视频服务",
+        "基础支撑服务",
+        "基础地图服务",
+        "视频图像服务",
         "感知服务",
-        "融合服务",
+        "执法办案服务",
       ],
       scrvice_area_arr: [
         "经济建设",
@@ -1443,12 +1443,12 @@ export default {
             } else {
               this.workflows_id = false;
             }
-            this.$set(this.service_header_arr, "portal_id", data.portal_id); // 时空服务id
+            this.$set(this.service_header_arr, "portal_id", data.portal_id); // 基础地图服务id
             this.$set(
               this.service_header_arr,
               "workflows_id",
               data.workflows_id
-            ); // 时空服务id
+            ); // 基础地图服务id
             this.$set(
               this.service_header_arr,
               "isMap",
diff --git a/src/pages/workbench/yygl/apply_app_detail.vue b/src/pages/workbench/yygl/apply_app_detail.vue
index 3e22fad..bc83b54 100644
--- a/src/pages/workbench/yygl/apply_app_detail.vue
+++ b/src/pages/workbench/yygl/apply_app_detail.vue
@@ -62,7 +62,7 @@ export default {
         first: [
           {
             "name": "应用类型",
-            "text": "数据服务"
+            "text": "基础支撑服务"
           },
           {
             "name": "业务领域",
-- 
2.26.0