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

src/views/dataCenter/ConctructSystem/index.vue

@@ -42,6 +42,7 @@
                     :percentage="citys.municipalnum"
                     :width="iswidth"
                     :show-text="false"
+                    :stroke-width="10"
                   ></el-progress>
                 </div>
                 <div class="Progress">
@@ -53,6 +54,7 @@
                     :percentage="citys.countynum"
                     color="#fac858"
                     :width="iswidth"
+                    :stroke-width="10"
                     :show-text="false"
                   ></el-progress>
                 </div>
@@ -99,7 +101,7 @@ export default defineComponent({
   },
   data() {
     return {
-      iswidth: 82,
+      iswidth: 100,
     };
   },
 });
@@ -116,7 +118,7 @@ export default defineComponent({
 //   font-size: 20px;
 // }
 .card-item {
-  background-color: #0d417140;
+  background-color: #197ded15;
   border: 1px solid #125ba3;
   border-radius: 5px;
   padding: 15px 20px;
@@ -139,7 +141,7 @@ export default defineComponent({
   .xbox-content {
     height: 150px;
     box-sizing: border-box;
-    background-color: #0e4785;
+    background-color: #197ded15;
     border-radius: 4px;
     display: flex;
     justify-content: space-around;
@@ -152,22 +154,22 @@ export default defineComponent({
       p {
         color: #fff;
         position: absolute;
-        top: 10px;
-        right: 20%;
+        top: 25px;
+        right: 16%;
         font-size: 14px;
       }
       .percent {
         color: #4198ff;
         position: absolute;
-        top: 40px;
-        right: 18%;
+        top: 60px;
+        right: 14%;
         font-size: 16px;
       }
       .yellow {
         color: #fac858;
         position: absolute;
-        top: 40px;
-        right: 18%;
+        top: 60px;
+        right: 14%;
         font-size: 16px;
       }
     }

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

@@ -89,6 +89,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           formatter: (params) => {
             let html = ``;
@@ -231,7 +234,7 @@ export default defineComponent({
   line-height: 50px;
   border-radius: 4px;
   color: #fff;
-  background: #0e4785;
+  background: #197ded15;
   display: flex;
   justify-content: space-between;
   padding: 0 10px 0 14px;

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

@@ -69,6 +69,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           textStyle: {},
           className: "target-bar-tooltip",
@@ -111,7 +114,7 @@ export default defineComponent({
             },
             label: {
               show: true,
-              color: "#00dbf6",
+              color: "#fff",
               position: "top",
               formatter: "{c} 分",
             },

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

@@ -90,6 +90,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           formatter: (params) => {
             let html = ``;
@@ -198,7 +201,7 @@ export default defineComponent({
         flex: 1;
         padding: 8px 15px;
         margin-right: 15px;
-        background: #0e4785;
+        background: #197ded15;
         border-radius: 5px;
         font-size: 14px;
         color: #fff;

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

@@ -168,7 +168,7 @@ export default defineComponent({
           {
             name: "Access From",
             type: "pie",
-            radius: ["48%", "80%"],
+            radius: ["40%", "80%"],
 
             data: pieData,
           },
@@ -242,7 +242,7 @@ export default defineComponent({
         flex: 1;
         padding: 8px 15px;
         margin-right: 15px;
-        background: #0e4785;
+        background: #197ded15;
         border-radius: 5px;
         font-size: 14px;
         color: #fff;

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

@@ -150,6 +150,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           className: "economic-echart",
           formatter: (params) => {

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

@@ -127,6 +127,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           className: "munition-echart",
           formatter: (params) => {
@@ -261,6 +264,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           formatter: (params) => {
             let html = `<span class="name">${params[0].axisValue}</span>`;

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

@@ -122,6 +122,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           className: "person-echart",
           formatter: (params) => {

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

@@ -65,6 +65,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           textStyle: {},
           className: "target-bar-tooltip",

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

@@ -100,6 +100,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           className: "income-echart",
           formatter: (params) => {

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

@@ -123,6 +123,13 @@ export default defineComponent({
         tooltip: {
           trigger: "axis",
           className: "extend-tooltip",
+          axisPointer: {
+			                        type: 'line',
+			                        lineStyle: {
+			                            type: 'solid',      //  打开就是实线类型
+			                            color: '#4198ff',
+			                        },
+			                    },
           formatter:
             "<span class='title'>{b0}</span>: <br /> <span class='bar-text'>{c0}</span> 亿元",
         },

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

@@ -141,6 +141,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           className: "industry-tooltip-des",
           formatter: (params) => {

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

@@ -72,6 +72,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           textStyle: {},
           className: "target-bar-tooltip",

src/views/dataCenter/innovation/index.vue

@@ -145,6 +145,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           formatter: (params) => {
             let html = ``;
@@ -234,7 +237,7 @@ export default defineComponent({
 }
 
 .card-item {
-  background-color: #0d417140;
+  background-color: #197ded15;
   border: 1px solid #125ba3;
   border-radius: 5px;
   padding: 15px 20px;
@@ -262,7 +265,7 @@ export default defineComponent({
         flex: 1;
         padding: 8px 15px;
         margin-right: 15px;
-        background: #0d488d;
+        background: #197ded15;
         border-radius: 5px;
         font-size: 14px;
         color: #fff;

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

@@ -101,6 +101,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           formatter: (params) => {
             let html = ``;
@@ -237,7 +240,7 @@ export default defineComponent({
   line-height: 50px;
   border-radius: 4px;
   color: #fff;
-  background: #0e4785;
+  background: #197ded15;
   display: flex;
   justify-content: space-between;
   padding: 0 10px 0 10px;

src/views/dataCenter/innovation/model/Outline/index.vue

@@ -73,6 +73,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           textStyle: {},
           className: "target-bar-tooltip",
@@ -115,10 +118,11 @@ export default defineComponent({
             },
             label: {
               show: true,
-              color: "#00dbf6",
+              color: "#fff",
               position: "top",
               formatter: "{c}分",
             },
+
             barWidth: 20,
             data: this.seriesData,
           },

src/views/dataCenter/innovation/model/Platform/index.vue

@@ -86,6 +86,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           formatter: (params) => {
             let html = ``;

src/views/dataCenter/innovation/model/ScientificInvestment/index.vue

@@ -102,7 +102,9 @@ export default defineComponent({
             color: PieColor[`level_${index + 1}`],
           },
           tooltip: {
-            borderColor: "none",
+            // borderColor: "none",
+            // extraCssText: "z-index:99999;",
+            confine: true,
             className: "business-pie-tooltip",
             formatter: `<div class="business-pie-tooltip">
                 <span class='title'>${item.label}</span>：
@@ -162,6 +164,10 @@ export default defineComponent({
 });
 </script>
 <style>
+/* .scientific-research-input .business-pie-tooltip {
+  z-index: 999;
+} */
+
 .scientific-research-input .business-pie-tooltip .title {
   color: #333;
   font-weight: bold;
@@ -198,7 +204,7 @@ export default defineComponent({
 
         padding: 10px 15px;
         margin-right: 15px;
-        background: #0d488d;
+        background: #197ded15;
         border-radius: 5px;
         font-size: 14px;
         color: #333;
@@ -238,14 +244,12 @@ export default defineComponent({
       color: #fff;
     }
     .pie-value {
-      margin-top: 5px;
+      margin-top: 8px;
       padding-left: 20px;
-      font-size: 12px;
-      color: #999;
       display: flex;
       align-items: center;
       color: #19ecff;
-      font-size: 20px;
+      font-size: 18px;
       span {
         font-size: 12px;
         color: #fff;

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

@@ -81,6 +81,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           className: "tooltip-income",
           formatter: (params) => {

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

@@ -92,6 +92,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           className: "tooltip-progress",
           formatter: (params) => {

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

@@ -88,6 +88,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+           shadowStyle: {
+              color: "#1881e120",
+            },
           },
           className: "per-formance-echart",
           formatter: (params) => {
@@ -149,7 +152,6 @@ export default defineComponent({
             },
           },
         },
-
         series: seriesList,
       };
     },

src/views/dataCenter/resourceShare/index.vue

@@ -73,7 +73,7 @@ export default defineComponent({
 </script>
 <style lang="scss" scoped>
 .card-item {
-  background-color: #0d417140;
+  background-color: #197ded15;
   border: 1px solid #125ba3;
   border-radius: 5px;
   padding: 16px;

src/views/dataCenter/resourceShare/model/Activity/index.vue

@@ -231,7 +231,7 @@ export default defineComponent({
     line-height: 50px;
     border-radius: 4px;
     color: #fff;
-    background: #0d488d;
+    background: #197ded15;
     display: flex;
     justify-content: space-between;
     padding: 0 10px 0 10px;

src/views/dataCenter/resourceShare/model/Facility/index.vue

@@ -75,6 +75,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           className: "facility-echart-tooltip",
           formatter: (params) => {

src/views/dataCenter/resourceShare/model/PlatformInfo/index.vue

@@ -91,6 +91,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           formatter: (params) => {
             let html = ``;
@@ -225,7 +228,7 @@ export default defineComponent({
     line-height: 50px;
     border-radius: 4px;
     color: #fff;
-    background: #0d488d;
+    background: #197ded15;
     display: flex;
     justify-content: space-between;
     padding: 0 10px 0 10px;

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

@@ -72,6 +72,9 @@ export default defineComponent({
           trigger: "axis",
           axisPointer: {
             type: "shadow",
+            shadowStyle: {
+              color: "#1881e120",
+            },
           },
           textStyle: {},
           className: "resource-share-target-tooltip",
@@ -117,7 +120,7 @@ export default defineComponent({
             barWidth: 20,
             label: {
               show: true,
-              color: "#00dbf6",
+              color: "#fff",
               position: "top",
               formatter: "{c}分",
             },

src/views/dataCenter/resourceShare/model/TotalContrac/index.vue

@@ -199,14 +199,15 @@ export default defineComponent({
   background: #47d6ad;
 }
 .resource-share-tooltip .level_6::before {
-  background: #6fdef7;
+  background: #f78a77;
 }
 .resource-share-tooltip .level_7::before {
-  background: #f78a77;
+  background: #8a8aa8;
 }
 .resource-share-tooltip .level_8::before {
-  background: #8a8aa8;
+  background: #6fdef7;
 }
+
 .resource-share-tooltip .level_9::before {
   background: #634cf0;
 }
@@ -243,7 +244,7 @@ export default defineComponent({
     line-height: 50px;
     border-radius: 4px;
     color: #fff;
-    background: #0d488d;
+    background: #197ded15;
     display: flex;
     justify-content: space-between;
     padding: 0 10px 0 10px;