Merge branch 'plus1.1.0' of https://git.yfzx.zjtys.com.cn/cold-coffee/cxsfjx_project into plus1.1.0

src/views/dataCenter/army/model/EconomicConstruct/index.vue

@@ -189,7 +189,7 @@ export default defineComponent({
             lineStyle: {
               // 使用深浅的间隔色
               type: 'dashed',
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
             axisLine: {
@@ -218,10 +218,16 @@ export default defineComponent({
         xAxis: {
           type: "category",
           data: xAxisValue,
+           axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
           axisLine: {
+            show: true,
             lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },
@@ -513,7 +519,7 @@ export default defineComponent({
             margin-bottom: 8px;
           }
           .title {
-            font-weight: bold;
+            // font-weight: bold;
             color: #d4f7ff;
             font-size: 14px;
             position: relative;
@@ -555,7 +561,11 @@ export default defineComponent({
   .el-divider {
     margin: 15% auto;
     height: 70%;
-    background: #f3f3f3;
+    // position: relative;
+    // width: 20px;
+    // display: none;
+    // border-right: 1px dashed #197ded;
+    background: #197ded;
   }
 }
 
@@ -568,6 +578,6 @@ export default defineComponent({
   min-height: 150px;
   height: calc(100% - 200px);
   box-sizing: border-box;
-  margin-top: 10px;
+  margin-top: 20px;
 }
 </style>

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

@@ -168,7 +168,7 @@ export default defineComponent({
             lineStyle: {
               // 使用深浅的间隔色
               type: 'dashed',
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
             axisLine: {
@@ -187,7 +187,7 @@ export default defineComponent({
             lineStyle: {
               // 使用深浅的间隔色
               type: 'dashed',
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
             axisLine: {
@@ -201,10 +201,16 @@ export default defineComponent({
         xAxis: {
           type: "category",
           data: xAxisCountry,
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
           axisLine: {
+            show: true,
             lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },
@@ -295,7 +301,7 @@ export default defineComponent({
             lineStyle: {
               // 使用深浅的间隔色
               type: 'dashed',
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
            axisLine: {
@@ -320,7 +326,7 @@ export default defineComponent({
             lineStyle: {
               // 使用深浅的间隔色
               type: 'dashed',
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
           },
@@ -328,10 +334,16 @@ export default defineComponent({
         xAxis: {
           type: "category",
           data: xAxisCity,
-           axisLine: {
+           axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
+          axisLine: {
+            show: true,
             lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },

src/views/dataCenter/army/model/Person/index.vue

@@ -169,7 +169,7 @@ export default defineComponent({
             lineStyle: {
               // 使用深浅的间隔色
               type: 'dashed',
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
           },
@@ -188,7 +188,7 @@ export default defineComponent({
             lineStyle: {
               // 使用深浅的间隔色
               type: 'dashed',
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
           },
@@ -196,10 +196,16 @@ export default defineComponent({
         xAxis: {
           type: "category",
           data: xAxisCity,
-           axisLine: {
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
+          axisLine: {
+            show: true,
             lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },
@@ -293,7 +299,7 @@ export default defineComponent({
       flex: 1;
       padding: 8px 15px;
       margin-right: 15px;
-      background: #0d4479;
+      background: rgba(25, 125, 237, 15%);
       border-radius: 5px;
       font-size: 14px;
       color: #d4f7ff;

src/views/dataCenter/army/model/Science/index.vue

@@ -161,10 +161,16 @@ export default defineComponent({
         xAxis: {
           type: "category",
           data: xAxisValue,
-           axisLine: {
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
+          axisLine: {
+            show: true,
             lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },
@@ -239,7 +245,7 @@ export default defineComponent({
     color: #d4f7ff;
     padding: 8px 15px;
     box-sizing: border-box;
-    background: rgba(25, 125, 237, 0.2);
+    background: rgba(25, 125, 237, 0.15);
     border-radius: 5px;
     margin-bottom: 8px;
     &:last-of-type {

src/views/dataCenter/army/model/StrongArmy/index.vue

@@ -85,10 +85,16 @@ export default defineComponent({
         xAxis: {
           type: "category",
           data: xAxisValue,
-            axisLine: {
+            axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
+          axisLine: {
+            show: true,
             lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },
@@ -101,7 +107,8 @@ export default defineComponent({
             label: {
               show: true,
               position: "top",
-              color:"#19ecff",
+              color:"#ffffff",
+              formatter: "{c}分",
             },
             barWidth: 20,
             data: this.seriesData,

src/views/dataCenter/industrial/index.vue

@@ -82,7 +82,7 @@ export default defineComponent({
 </script>
 <style lang="scss" scoped>
 .card-item {
-      background-color: rgba(25, 125, 237, 0.1);
+      background-color: rgba(25, 125, 237, 15%);
   border-radius: 5px;
   padding: 16px;
   overflow: hidden;

src/views/dataCenter/industrial/model/BusinessIncome/index.vue

@@ -191,15 +191,16 @@ export default defineComponent({
 .echarts-circular {
   position: relative;
   .money-logo {
-    top: 40%;
-    left: 37%;
+    top: 43%;
+    left: 39%;
     position: absolute;
     text-align: center;
     transform: scale(1.2);
     div {
       display: flex;
       align-items: center;
-      font-size: 22px;
+      // justify-content: center;
+      font-size: 18px;
       color: #d4f7ff;
       span {
         font-size: 16px;
@@ -210,7 +211,7 @@ export default defineComponent({
       }
     }
     .mony-number {
-      font-size: 36px;
+      font-size: 30px;
       color: #19ecff;
     }
   }
@@ -228,7 +229,7 @@ export default defineComponent({
     padding: 10px 15px;
     border-radius: 5px;
     // background: #f8f9fb;
-    background: rgba(25, 125, 237, 0.2);
+    background: rgba(25, 125, 237, 0.15);
     .el-row {
       font-size: 14px;
       color: #d4f7ff;

src/views/dataCenter/industrial/model/IncomDistribution/index.vue

@@ -141,7 +141,7 @@ export default defineComponent({
             lineStyle: {
               // 使用深浅的间隔色
               type: 'dashed',
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
              axisLine: {
@@ -160,7 +160,7 @@ export default defineComponent({
             lineStyle: {
               // 使用深浅的间隔色
               type: 'dashed',
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
              axisLine: {
@@ -174,10 +174,17 @@ export default defineComponent({
         xAxis: {
           type: "category",
           data: xAxisValue,
-           axisLine: {
+           //横坐标轴文字颜色
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
+          axisLine: {
+            show: true,
             lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },

src/views/dataCenter/industrial/model/IncomExtendLine/index.vue

@@ -141,10 +141,17 @@ export default defineComponent({
         xAxis: {
           type: "category",
           data: xAxisValue,
-              axisLine: {
+           //横坐标轴文字颜色
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
+          axisLine: {
+            show: true,
             lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },

src/views/dataCenter/industrial/model/Industrial/index.vue

@@ -6,7 +6,7 @@
         <span>{{ item.label }}</span>
         <div class="value-des">
           <span class="value-des-val">{{ item.value || "--" }}</span>
-          <span v-if="index===0"> 亿元</span>
+          <span v-if="index===0">亿元</span>
         </div>
       </div>
     </div>
@@ -168,55 +168,62 @@ export default defineComponent({
         },
         legend: {
           right: "2%",
-           textStyle:{
-                color:"#d4f7ff"
-            }
+          textStyle: {
+            color: "#d4f7ff",
+          },
         },
         yAxis: [
           {
             type: "value",
             name: "金额(亿元)",
             splitLine: {
-            lineStyle: {
-              // 使用深浅的间隔色
-              type: 'dashed',
-              color: ["#0087ED"],
+              lineStyle: {
+                // 使用深浅的间隔色
+                type: "dashed",
+                color: ["#125ba3"],
+              },
             },
-          },
-           axisLine: {
-            lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+            axisLine: {
+              lineStyle: {
+                color: "#d4f7ff",
+                // width: 1, //这里是为了突出显示加上的
+              },
             },
           },
-          },
           {
             type: "value",
             name: "增长率%",
             min: -10,
             max: 100,
             splitLine: {
-            lineStyle: {
-              // 使用深浅的间隔色
-              type: 'dashed',
-              color: ["#0087ED"],
+              lineStyle: {
+                // 使用深浅的间隔色
+                type: "dashed",
+                color: ["#125ba3"],
+              },
             },
-          },
-           axisLine: {
-            lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+            axisLine: {
+              lineStyle: {
+                color: "#d4f7ff",
+                // width: 1, //这里是为了突出显示加上的
+              },
             },
           },
-          },
         ],
         xAxis: {
           type: "category",
           data: xAxisValue,
-           axisLine: {
+          //横坐标轴文字颜色
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
+          axisLine: {
+            show: true,
             lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },
@@ -322,8 +329,7 @@ export default defineComponent({
 
       padding: 10px 15px;
       margin-right: 15px;
-      // background: #f8f9fb;
-          background: rgba(25, 125, 237, 0.2);
+      background: rgba(25, 125, 237, 0.2);
       border-radius: 5px;
       font-size: 14px;
       color: #d4f7ff;
@@ -340,7 +346,7 @@ export default defineComponent({
           margin-right: 5px;
           color: #19ecff;
         }
-        .value-des-unit{
+        .value-des-unit {
           color: #4198ff;
         }
       }

src/views/dataCenter/industrial/model/TargetBar/index.vue

@@ -94,10 +94,17 @@ export default defineComponent({
         xAxis: {
           type: "category",
           data: xAxisValue,
-           axisLine: {
+           //横坐标轴文字颜色
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
+          axisLine: {
+            show: true,
             lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },
@@ -111,8 +118,8 @@ export default defineComponent({
             label: {
               show: true,
               position: "top",
-              color:"#19ecff",
-              // formatter: "{c}亿元"
+              color:"#ffffff",
+              formatter: "{c}分"
             },
             data: this.seriesData,
           },

src/views/dataCenter/map/index.vue

@@ -87,7 +87,7 @@ export default defineComponent({
 <style lang="scss" scoped>
 .card-item {
   // background: #fff;
-  background-color: rgba(25, 125, 237, 10%);
+  background-color: rgba(25, 125, 237, 15%);
   border-radius: 5px;
   padding: 16px;
   overflow: hidden;

src/views/dataCenter/map/model/CardList/common.css

@@ -14,12 +14,12 @@
     color: #d4f7ff;
 }
 .color-pramiry{
-    color: #4198ff;
+    color: #19ecff;
     margin-right:5px;
 }
 .item-bg {
     padding:  8px;
-    background: rgba(25, 125, 237, 0.2);
+    background: rgba(25, 125, 237, 0.1);
     border-radius: 5px;
 }
 .flex-row {

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

@@ -111,7 +111,7 @@ export default defineComponent({
 @import url("./common.css");
 .item-bg {
   padding: 12px 8px;
-  background-color: rgba(25, 125, 237, 20%);
+  background-color: rgba(25, 125, 237, 10%);
 }
 .info {
   padding: 10px 0;

src/views/dataCenter/map/model/Income/index.vue

@@ -122,7 +122,7 @@ export default defineComponent({
             lineStyle: {
               // 使用深浅的间隔色
               type: 'dashed',
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
               axisLine: {
@@ -141,7 +141,7 @@ export default defineComponent({
             lineStyle: {
               // 使用深浅的间隔色
               type: 'dashed',
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
               axisLine: {
@@ -150,18 +150,23 @@ export default defineComponent({
               // width: 1, //这里是为了突出显示加上的
             },
           },
-            splitLine: {
-              show: false,
-            },
+           
           },
         ],
         xAxis: {
           type: "category",
           data: xAxisValue,
-            axisLine: {
+            //横坐标轴文字颜色
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
+          axisLine: {
+            show: true,
             lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },

src/views/dataCenter/map/model/InvestmentProgress/index.vue

@@ -137,7 +137,7 @@ export default defineComponent({
             lineStyle: {
               type: 'dashed',
               // 使用深浅的间隔色
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
           },
@@ -149,7 +149,7 @@ export default defineComponent({
             lineStyle: {
               // 使用深浅的间隔色
               type: 'dashed',
-              color: ["#0087ED"],
+              color: ["#125ba3"],
             },
           },
               axisLine: {
@@ -165,10 +165,17 @@ export default defineComponent({
         xAxis: {
           type: "category",
           data: xAxisValue,
-           axisLine: {
+           //横坐标轴文字颜色
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
+          axisLine: {
+            show: true,
             lineStyle: {
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },

src/views/dataCenter/map/model/Performance/index.vue

@@ -15,11 +15,11 @@ import { mapState } from "vuex";
 
 let MAP_ECHARTS = null;
 enum Bar_Enum {
-  level_1 = "#4f5d81",
-  level_2 = "#429a9d",
-  level_3 = "#007fb2",
+  level_1 = "#23bcf9",
+  level_2 = "#67bbf9",
+  level_3 = "#0ecedd",
   level_4 = "#eca933",
-  level_5 = "#4191ff",
+  level_5 = "#4198ff",
 }
 
 const xAxisValue = [
@@ -105,9 +105,9 @@ export default defineComponent({
           },
         },
         legend: {
-            textStyle:{
-                color:"#fff"
-            }
+          textStyle: {
+            color: "#fff",
+          },
         },
         grid: {
           left: "0%",
@@ -127,19 +127,25 @@ export default defineComponent({
           splitLine: {
             lineStyle: {
               // 使用深浅的间隔色
-              type: 'dashed',
-              color: ["#0087ED"],
+              type: "dashed",
+              color: ["#125ba3"],
             },
           },
         },
         xAxis: {
           type: "category",
           data: xAxisValue,
+          //横坐标轴文字颜色
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#d4f7ff", //更改坐标轴文字颜色
+            },
+          },
           axisLine: {
+            show: true,
             lineStyle: {
-              
-              color: "#d4f7ff",
-              // width: 1, //这里是为了突出显示加上的
+              color: "#125ba3",
             },
           },
         },

src/views/dataCenter/map/model/RankList/index.vue

@@ -75,22 +75,19 @@ export default defineComponent({
   font-weight: bold;
   font-size: 14px;
 }
-/* .el-scrollbar__wrap {
-  background: #0e4780 !important;
-} */
 .el-table__body tr:hover > td {
   background-color: #134087 !important;
 }
 .el-table tr {
-  background: #0c3a65 !important;
+  background: #093971 !important;
 }
 .el-table td.el-table__cell,
 .el-table th.el-table__cell.is-leaf {
-  border-bottom: 1px dashed #197ded;
+  border-bottom: 1px dashed #125ba3;
 }
 .el-scrollbar {
   height: 86%;
-  border-bottom: 1px dashed #197ded;
+  border-bottom: 1px dashed #125ba3;
 }
 .el-table .cell {
   color: #d4f7ff;
@@ -99,7 +96,6 @@ export default defineComponent({
 <style lang="scss" scoped>
 .el-scrollbar {
   margin-top: 10px;
-  // background: red;
 }
 .tab-other-index {
   text-align: center;
@@ -111,7 +107,6 @@ export default defineComponent({
   justify-content: center;
   width: 22px;
   height: 22px;
-  // border: 1px solid;
   color: #fff;
   font-size: 16px;
   font-family: tabTypeFace;