diff --git a/.beagle.yml b/.beagle.yml
index 1432043a38078321ec4d6e7d56d169cb25b62233..0b3741a45f83df4d6e05a041b9dd7f99b6a3adf5 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 90bfd96a8e706f3ffdefb44af19176b051d87e19..1297c214e989b2c7ca27a90e278bdd1c95ac6201 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 1160c5585dfb57d33643d7e2558a4cfae5c507bc..894aca4313ddc6a5c0ef738884152d93cfb806ac 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 93b1137cb008bbfd263b946604a61a0d94fd73f7..02323cbeaefc06bde93e3dafc9b7bc42d5981442 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 c565c8a210d0120aabf910974f211f1d46c13a2b..b8f2f0b5188cc74427cd4a77f11df781f22ebce5 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 2788a80b1950aa5de3c011d1e2bc5acce49036a4..7e9f6003064ae940f9b9e7876f2d50e9d59cc3b0 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 221ac3c6502ad5adfedb02eb619596f054eb9613..16adb1e5a57b7b8052baf22257dbbbc2d8fcb3d1 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 b4d2e0d13bcbe27ab5fd2bce02147cce4b0b33ef..01194bb0439cb698b89a36b208bb7b45073a4e15 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 fc9d3c16bbf9da213d0cc50a11f110bd07a44769..3106d3171e9bae61955edfed13cbafe800ff8f28 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 adf51b27e1754a439039764f841a6a856c10359f..91418de31e284d27ed444306c136b02ac4c634e9 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 4a14af99b9002ef71451efbe4e6b5b19b446c924..67bf00d8a68e40f80ccf8e0a45fead7add6a2709 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 3d1c9bcca3c7761fb1b17a0b98b5673a146f9c07..dd2c425909a93505ac35da32cbaa40bcb170f4f8 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 c73f3e7dd05f6f32a473820f848a62f9f0029352..b0accaa711c3178bf734e9d99567f759a3ab2412 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 36d22f10f0f2d2bb0b15e6dcdd776ba19a614508..e2398c6f478e6930c4be3cdf23f741e6f74b1334 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 3e22fad541512db708741af13858691bcdbd8e29..bc83b5421794342d5d1334d3248f950f45a4677d 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": "业务领域",