Merge remote-tracking branch 'origin/master'

gassafetyprogress-web/src/views/statistic/overview/conponents/Left/CharBoxA.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-19 14:38:28
- * @LastEditTime: 2022-04-21 17:25:12
+ * @LastEditTime: 2022-04-28 13:34:42
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/statistic/overview/conponents/Left/CharBoxA.vue
@@ -79,6 +79,8 @@ export default {
       this.options = {
         color: colors,
         tooltip: {
+          // show:false,
+          formatter: "{a}: {c}(件)",
           // trigger: "axis",
           // axisPointer: {
           //   type: "cross",
@@ -144,7 +146,7 @@ export default {
         ],
         series: [
           {
-            name: "Evaporation",
+            name: "隐患数量",
             type: "bar",
             data: this.charData[0],
             yAxisIndex: 0,
@@ -158,7 +160,7 @@ export default {
             barGap: "0%",
           },
           {
-            name: "Temperature",
+            name: "已整改",
             type: "bar",
             data: this.charData[1],
             yAxisIndex: 0,
@@ -186,7 +188,6 @@ export default {
     font-size: 16px;
     margin: 22px 0 11px 19px;
     font-weight: 600;
-
   }
   .btn-wrapper {
     display: flex;

gassafetyprogress-web/src/views/statistic/overview/conponents/Left/CharBoxB.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-19 14:38:28
- * @LastEditTime: 2022-04-21 17:24:56
+ * @LastEditTime: 2022-04-28 13:35:16
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/statistic/overview/conponents/Left/CharBoxA.vue
@@ -74,6 +74,8 @@ export default {
           // axisPointer: {
           //   type: "cross",
           // },
+          formatter: "{b}: {c}(个)",
+
         },
         grid: {
           top: "30",

gassafetyprogress-web/src/views/statistic/overview/conponents/Right/CharBoxC.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-19 14:38:28
- * @LastEditTime: 2022-04-21 17:25:10
+ * @LastEditTime: 2022-04-28 13:41:12
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/statistic/overview/conponents/Left/CharBoxA.vue
@@ -102,6 +102,14 @@ export default {
           rich[`dataIndex${index}`] = item;
         });
       this.options = {
+        tooltip: {
+          // show:false,
+          formatter: "{b}: {c}(件)",
+          // trigger: "axis",
+          // axisPointer: {
+          //   type: "cross",
+          // },
+        },
         series: {
           type: "pie",
           radius: ["68%", "80%"],
@@ -113,6 +121,7 @@ export default {
             borderRadius: 10,
             borderColor: "#fff",
           },
+
           label: {
             alignTo: "edge",
             // formatter: "{name|{b}}\n{num|{c} 个}",
@@ -145,7 +154,6 @@ export default {
     font-size: 16px;
     margin: 22px 0 11px 19px;
     font-weight: 600;
-
   }
   .btn-wrapper {
     display: flex;

gassafetyprogress-web/src/views/statistic/overview/conponents/Right/CharBoxD.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-19 14:38:28
- * @LastEditTime: 2022-04-21 17:25:21
+ * @LastEditTime: 2022-04-28 13:40:47
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/statistic/overview/conponents/Left/CharBoxA.vue
@@ -57,8 +57,8 @@ export default {
     this.bottomOptions();
   },
   methods: {
-    active(index){
-      return "active"+index
+    active(index) {
+      return "active" + index;
     },
     btnClick(index) {
       const ind = this.activeArr.indexOf(index);
@@ -80,7 +80,7 @@ export default {
       this.options = {
         color: colors,
         tooltip: {
-          show:false,
+          show: false,
           // trigger: "axis",
           // axisPointer: {
           //   type: "cross",
@@ -94,6 +94,14 @@ export default {
           containLabel: true,
         },
         toolbox: {},
+        tooltip: {
+          // show:false,
+          formatter: "{a}: {c}(起)",
+          // trigger: "axis",
+          // axisPointer: {
+          //   type: "cross",
+          // },
+        },
         legend: {
           // data: ['Evaporation', 'Temperature'],
           // left: 'right'
@@ -242,6 +250,14 @@ export default {
             },
             barWidth: 6,
             barGap: "0%",
+            tooltip: {
+              // show:false,
+              formatter: "{a}: {c}(个)",
+              // trigger: "axis",
+              // axisPointer: {
+              //   type: "cross",
+              // },
+            },
           },
         ],
       };
@@ -275,15 +291,15 @@ export default {
       //   background-color: red;
       // }
       cursor: pointer;
-      &.active0:hover{
-        background:#4e9de7 !important;
-        border-color:#4e9de7;
-        color:#fff
+      &.active0:hover {
+        background: #4e9de7 !important;
+        border-color: #4e9de7;
+        color: #fff;
       }
-       &.active1:hover{
-        background:#f0cb6d !important;
-        border-color:#f0cb6d;
-        color:#fff
+      &.active1:hover {
+        background: #f0cb6d !important;
+        border-color: #f0cb6d;
+        color: #fff;
       }
     }
   }