fix(合并代码): 合并master

src/route/dataCenter.ts

@@ -75,7 +75,7 @@ export default [
                     },
                     label: "五大建设体系",
                 },
-                component: () => import("@/views/dataCenter/ConctructSystem/index.vue")
+                component: () => import("@/views/dataCenter/conctructSystem/index.vue")
             }
         ],
 

src/views/dataCenter/ConctructSystem/model/Munitions/index.vue

@@ -45,7 +45,7 @@ const xAxisCity = [
   "丽水",
 ];
 const cityData = {
-  value: [40.4, 40.4, 40, 40, 40, 40, 40, 40, 40, 40, 40],
+  value: [40, 40.40, 40, 40, 40, 40, 40, 40, 40, 40, 40],
 };
 
 /**
@@ -119,7 +119,7 @@ export default defineComponent({
         legend: {},
         grid: {
           top: "10%",
-          left: "5%",
+          left: "0.8%",
           right: "2%",
           bottom: "3%",
           containLabel: true,
@@ -215,7 +215,7 @@ export default defineComponent({
   background: rgba(248, 249, 251, 1);
   display: flex;
   justify-content: space-between;
-  padding: 0 10px 0 10px;
+  padding: 0 10px 0 14px;
   box-sizing: border-box;
   margin-top: 10px;
 }
@@ -278,6 +278,7 @@ export default defineComponent({
       margin-top: 15px;
       font-size: 16px;
       color: #4198ff;
+      padding-left: 5px;
     }
   }
 }

src/views/dataCenter/map/model/CardList/industrial.vue

@@ -75,7 +75,6 @@ export default defineComponent({
   },
   methods: {
     detailsHandle() {
-      console.log("--DataCenterRouter-sssss-", DataCenterRouter);
       this.$router.push(DataCenterRouter.DATA_INDUSTRIAL);
     },
   },