Merge remote-tracking branch 'origin/master'

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TDetectorReportController.java

@@ -303,51 +303,46 @@ public class TDetectorReportController extends BaseController
         return AjaxResult.success();
     }
 
-    @ApiOperation(value = "泽宏报警器更新数据推送接口")
-    @PostMapping("/reportZHDeviceStatus")
-    public AjaxResult reportZHDeviceStatus(@RequestBody List<TDetectorInfoDTO> tDetectorInfoDTOList){
-
-        log.info(tDetectorInfoDTOList.toString());
-
-        List<TDetectorInfo> list = new ArrayList<>();
-
-        try {
-            for(TDetectorInfoDTO dto : tDetectorInfoDTOList){
-                TDetectorInfo tDetectorInfo = new TDetectorInfo();
-                tDetectorInfo.setDetectorCode(dto.getDeviceCode());
-
-                // 1探测器
-                if(!StringUtils.isEmpty(dto.getDeviceType()) && dto.getDeviceType().equals("1")) {
-                    if (!StringUtils.isEmpty(dto.getDeviceStatus()) && dto.getDeviceStatus().equals("1")) {
-                        tDetectorInfo.setDetectorStatus("0");
-                        tDetectorInfo.setAlarmTime(null);
-                    } else if (new ArrayList<String>(Arrays.asList("7", "9")).contains(dto.getDeviceStatus())) {
-                        tDetectorInfo.setDetectorStatus("1");
-                        tDetectorInfo.setAlarmTime(dto.getAlarmTime());
-                    } else {
-                        tDetectorInfo.setDetectorStatus("2");
-                        tDetectorInfo.setAlarmTime(dto.getAlarmTime());
-                    }
-                    tDetectorInfo.setUpdateTime(new Date());
-                }
-//                else{
-//                    if(!StringUtils.isEmpty(dto.getDetectorStatus()) && dto.getDetectorStatus().equals("0")){
+//    @ApiOperation(value = "泽宏报警器更新数据推送接口")
+//    @PostMapping("/reportZHDeviceStatus")
+//    public AjaxResult reportZHDeviceStatus(@RequestBody List<TDetectorInfoDTO> tDetectorInfoDTOList){
+//
+//        log.info(tDetectorInfoDTOList.toString());
+//
+//        List<TDetectorInfo> list = new ArrayList<>();
+//
+//        try {
+//            for(TDetectorInfoDTO dto : tDetectorInfoDTOList){
+//                TDetectorInfo tDetectorInfo = new TDetectorInfo();
+//                tDetectorInfo.setDetectorCode(dto.getDeviceCode());
+//
+//                // 1探测器
+//                if(!StringUtils.isEmpty(dto.getDeviceType()) && dto.getDeviceType().equals("1")) {
+//                    if (!StringUtils.isEmpty(dto.getDeviceStatus()) && dto.getDeviceStatus().equals("1")) {
+//                        tDetectorInfo.setDetectorStatus("0");
 //                        tDetectorInfo.setAlarmTime(null);
+//                    } else if (new ArrayList<String>(Arrays.asList("7", "9")).contains(dto.getDeviceStatus())) {
+//                        tDetectorInfo.setDetectorStatus("1");
+//                        tDetectorInfo.setAlarmTime(dto.getAlarmTime());
+//                    } else {
+//                        tDetectorInfo.setDetectorStatus("2");
+//                        tDetectorInfo.setAlarmTime(dto.getAlarmTime());
 //                    }
+//                    tDetectorInfo.setUpdateTime(new Date());
 //                }
-
-                list.add(tDetectorInfo);
-            }
-
-            tDetectorInfoService.updateBatch(list);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("【泽宏设备状态】操作出错,error={}",e.getMessage());
-            throw new IOCException(ResultEnum.OPERATION_FAIL);
-        }
-
-        return AjaxResult.success();
-    }
+//
+//                list.add(tDetectorInfo);
+//            }
+//
+//            tDetectorInfoService.updateBatch(list);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            log.error("【泽宏设备状态】操作出错,error={}",e.getMessage());
+//            throw new IOCException(ResultEnum.OPERATION_FAIL);
+//        }
+//
+//        return AjaxResult.success();
+//    }
 
     @ApiOperation(value = "泽宏设备预警数据推送接口")
     @PostMapping("/reportZHDeviceAlarmData")

gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData/Cg.vue

@@ -112,16 +112,16 @@ export default {
       visible: true,
       addStartNum: 3,
       filterList: [
-        { value: "全部", count: 100, state: "all" },
-        { value: "正常", count: 100, state: 1 },
-        { value: "报警", count: 100, state: 2 },
-        { value: "离线", count: 100, state: 3 },
+        { value: "全部", count: 17, state: "all" },
+        { value: "正常", count: 16, state: 1 },
+        { value: "报警", count: 0, state: 2 },
+        { value: "离线", count: 1, state: 3 },
       ],
       typeState: ["正常", "报警", "离线"],
       deviceTypeArr: [1, 2, 3],
       czList: [
         {
-          companyName: "河北泽宏股份储罐",
+          companyName: "中诚燃气门站储罐1",
           state: 1,
           a: 25,
           b: 56,
@@ -133,8 +133,8 @@ export default {
           popoVidible: true,
         },
         {
-          companyName: "河北泽宏股份储罐",
-          state: 2,
+          companyName: "中诚燃气门站储罐2",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -142,11 +142,11 @@ export default {
           e: 56,
           image: "",
           show: true,
-          popoVidible: false,
+          popoVidible: true,
         },
         {
-          companyName: "河北泽宏股份储罐",
-          state: 3,
+          companyName: "平山中燃气站储罐1",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -154,10 +154,10 @@ export default {
           e: 56,
           image: "",
           show: true,
-          popoVidible: false,
+          popoVidible: true,
         },
         {
-          companyName: "河北泽宏股份储罐",
+          companyName: "平山中燃气站储罐2",
           state: 1,
           a: 25,
           b: 56,
@@ -166,11 +166,11 @@ export default {
           e: 56,
           image: "",
           show: true,
-          popoVidible: false,
+          popoVidible: true,
         },
         {
-          companyName: "河北泽宏股份储罐",
-          state: 2,
+          companyName: "隆和气化站储罐1",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -178,10 +178,11 @@ export default {
           e: 56,
           image: "",
           show: true,
+          popoVidible: true,
         },
         {
-          companyName: "河北泽宏股份储罐",
-          state: 3,
+          companyName: "隆和气化站储罐2",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -189,9 +190,10 @@ export default {
           e: 56,
           image: "",
           show: true,
+          popoVidible: true,
         },
         {
-          companyName: "河北泽宏股份储罐",
+          companyName: "温塘气化站储罐1",
           state: 1,
           a: 25,
           b: 56,
@@ -200,10 +202,11 @@ export default {
           e: 56,
           image: "",
           show: true,
+          popoVidible: true,
         },
         {
-          companyName: "河北泽宏股份储罐",
-          state: 2,
+          companyName: "温塘气化站储罐2",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -211,10 +214,11 @@ export default {
           e: 56,
           image: "",
           show: true,
+          popoVidible: true,
         },
         {
-          companyName: "河北泽宏股份储罐",
-          state: 3,
+          companyName: "93701部队气化站储罐1",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -222,9 +226,10 @@ export default {
           e: 56,
           image: "",
           show: true,
+          popoVidible: true,
         },
         {
-          companyName: "河北泽宏股份储罐",
+          companyName: "93701部队气化站储罐2",
           state: 1,
           a: 25,
           b: 56,
@@ -233,10 +238,71 @@ export default {
           e: 56,
           image: "",
           show: true,
+          popoVidible: true,
         },
         {
-          companyName: "河北泽宏股份储罐",
-          state: 2,
+          companyName: "隆城绿都气化站储罐1",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: true,
+        },
+        {
+          companyName: "隆城绿都气化站储罐2",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: true,
+        },
+        {
+          companyName: "中诚燃气罐车1",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: false,
+        },
+        {
+          companyName: "中诚燃气罐车2",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: false,
+        },
+        {
+          companyName: "中诚燃气罐车3",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: false,
+        },
+        {
+          companyName: "中诚燃气罐车4",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -246,7 +312,7 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份储罐",
+          companyName: "中诚燃气罐车5",
           state: 3,
           a: 25,
           b: 56,
@@ -465,4 +531,4 @@ $active: #06d7b1 !important;
 .paddingnone {
   padding: 0;
 }
-</style>
+</style>
\ No newline at end of file

gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData/CzCard.vue

@@ -52,99 +52,135 @@ export default {
       carHide: true,
       addStartNum: 3,
       filterList: [
-        { value: "全部", count: 100, type: "all" },
-        { value: "加气站", count: 100, type: 1 },
-        { value: "门站", count: 100, type: 2 },
-        { value: "调压站", count: 100, type: 3 },
-        { value: "储备站", count: 100, type: 4 },
-        { value: "气化站", count: 100, type: 5 },
+        { value: "全部", count: 6, type: "all" },
+        { value: "加气站", count: 2, type: 1 },
+        { value: "门站", count: 0, type: 2 },
+        { value: "调压站", count: 0, type: 3 },
+        { value: "储备站", count: 0, type: 4 },
+        { value: "气化站", count: 4, type: 5 },
       ],
-      deviceTypeArr: [1, 2, 3, 4, 5],
+      deviceTypeArr: [1, 2, 3, 4],
       czList: [
         {
-          deviceName: "加气站",
+          deviceName: "中诚燃气门站",
           state: 1,
           a: 25,
           b: 56,
           c: 54,
           d: 15,
-          e: 56,
+          // e: 56,
           image: "",
           show: true,
           type: 1,
         },
         {
-          deviceName: "门站",
-          state: 2,
-          a: 25,
-          b: 56,
-          c: 54,
-          d: 15,
-          e: 56,
-          image: "",
-          show: true,
-          type: 2,
-        },
-        {
-          deviceName: "调压站",
+          deviceName: "平山中燃气站",
           state: 1,
           a: 25,
           b: 56,
           c: 54,
           d: 15,
-          e: 56,
+          // e: 56,
           image: "",
           show: true,
-          type: 3,
+          type: 1,
         },
+        // {
+        //   deviceName: "门站",
+        //   state: 2,
+        //   a: 25,
+        //   b: 56,
+        //   c: 54,
+        //   d: 15,
+        //   e: 56,
+        //   image: "",
+        //   show: true,
+        //   type: 2,
+        // },
+        // {
+        //   deviceName: "调压站",
+        //   state: 1,
+        //   a: 25,
+        //   b: 56,
+        //   c: 54,
+        //   d: 15,
+        //   e: 56,
+        //   image: "",
+        //   show: true,
+        //   type: 3,
+        // },
+        // {
+        //   deviceName: "储备站",
+        //   state: 1,
+        //   a: 25,
+        //   b: 56,
+        //   c: 54,
+        //   d: 15,
+        //   e: 56,
+        //   image: "",
+        //   show: true,
+        //   type: 4,
+        // },
         {
-          deviceName: "储备站",
+          deviceName: "隆和气化站",
           state: 1,
           a: 25,
           b: 56,
           c: 54,
           d: 15,
-          e: 56,
+          // e: 56,
           image: "",
           show: true,
-          type: 4,
+          type: 5,
         },
         {
-          deviceName: "气化站",
+          deviceName: "温塘气化站",
           state: 1,
           a: 25,
           b: 56,
           c: 54,
           d: 15,
-          e: 56,
+          // e: 56,
           image: "",
           show: true,
           type: 5,
         },
         {
-          deviceName: "气化站",
+          deviceName: "93701部队气化站",
           state: 1,
           a: 25,
           b: 56,
           c: 54,
           d: 15,
-          e: 56,
+          // e: 56,
           image: "",
           show: true,
           type: 5,
         },
         {
-          deviceName: "储备站",
+          deviceName: "隆城绿都气化站",
           state: 1,
           a: 25,
           b: 56,
           c: 54,
           d: 15,
-          e: 56,
+          // e: 56,
           image: "",
           show: true,
-          type: 4,
+          type: 5,
         },
+        // {
+        //   deviceName: "储备站",
+        //   state: 1,
+        //   a: 25,
+        //   b: 56,
+        //   c: 54,
+        //   d: 15,
+        //   e: 56,
+        //   image: "",
+        //   show: true,
+        //   type: 4,
+        // },
       ],
     };
   },
@@ -235,4 +271,4 @@ export default {
   display: flex;
   justify-content: space-between;
 }
-</style>
+</style>
\ No newline at end of file

gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData/CzItem.vue

@@ -33,9 +33,9 @@
       <div>
         湿度：<span :class="{ active: list.d > 50 }">{{ list.d }}°C</span>
       </div>
-      <div>
+      <!--<div>
         水温：<span :class="{ active: list.e > 50 }">{{ list.e }}°C</span>
-      </div>
+      </div>-->
     </div>
   </div>
 </template>
@@ -133,4 +133,4 @@ export default {
   padding-bottom:0 !important;
   min-height:170px;
 }
-</style>
+</style>
\ No newline at end of file

gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData/Fmj.vue

@@ -112,16 +112,16 @@ export default {
       visible: true,
       addStartNum: 3,
       filterList: [
-        { value: "全部", count: 100, state: "all" },
-        { value: "正常", count: 100, state: 1 },
-        { value: "报警", count: 100, state: 2 },
-        { value: "离线", count: 100, state: 3 },
+        { value: "全部", count: 20, state: "all" },
+        { value: "正常", count: 20, state: 1 },
+        { value: "报警", count: 0, state: 2 },
+        { value: "离线", count: 0, state: 3 },
       ],
       typeState: ["正常", "报警", "离线"],
       deviceTypeArr: [1, 2, 3],
       czList: [
         {
-          companyName: "河北泽宏股份阀门井",
+          companyName: "恒盛小区门口",
           state: 1,
           a: 25,
           b: 56,
@@ -133,8 +133,104 @@ export default {
           popoVidible: true,
         },
         {
-          companyName: "河北泽宏股份阀门井",
-          state: 2,
+          companyName: "建安小区阀门井",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: true,
+        },
+        {
+          companyName: "金辉花园4号阀门井",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: true,
+        },
+        {
+          companyName: "金水家园1号阀门井",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: true,
+        },
+        {
+          companyName: "上东区阀门井",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: true,
+        },
+        {
+          companyName: "圣地汇金港3号楼阀门井",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: true,
+        },
+        {
+          companyName: "圣地汇金港9号楼阀门井",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: true,
+        },
+        {
+          companyName: "舒房静居1期阀门井",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: true,
+        },
+        {
+          companyName: "舒房静居2期阀门井",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: true,
+        },
+        {
+          companyName: "文昌苑小区阀门井",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -145,8 +241,8 @@ export default {
           popoVidible: false,
         },
         {
-          companyName: "河北泽宏股份阀门井",
-          state: 3,
+          companyName: "花城小区阀门井",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -157,7 +253,7 @@ export default {
           popoVidible: false,
         },
         {
-          companyName: "河北泽宏股份阀门井",
+          companyName: "御景国际阀门井",
           state: 1,
           a: 25,
           b: 56,
@@ -169,8 +265,8 @@ export default {
           popoVidible: false,
         },
         {
-          companyName: "河北泽宏股份阀门井",
-          state: 2,
+          companyName: "龙博园小区阀门井",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -180,8 +276,8 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份阀门井",
-          state: 3,
+          companyName: "隆城绿都阀门井",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -191,7 +287,7 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份阀门井",
+          companyName: "隆和大酒店阀门井",
           state: 1,
           a: 25,
           b: 56,
@@ -202,8 +298,8 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份阀门井",
-          state: 2,
+          companyName: "西石桥阀门井",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -213,8 +309,8 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份阀门井",
-          state: 3,
+          companyName: "烟堡村1号阀门井",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -224,7 +320,7 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份阀门井",
+          companyName: "烟堡村2号阀门井",
           state: 1,
           a: 25,
           b: 56,
@@ -235,8 +331,8 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份阀门井",
-          state: 2,
+          companyName: "烟堡村3号阀门井",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -246,8 +342,8 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份阀门井",
-          state: 3,
+          companyName: "烟堡村4号阀门井",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -466,4 +562,4 @@ $active: #06d7b1 !important;
 .paddingnone {
   padding: 0;
 }
-</style>
+</style>
\ No newline at end of file

gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData/TopCard.vue

@@ -42,16 +42,22 @@
         </div>
 
         <div class="bottom flex">
-          <div class="first">1234</div>
+          <div class="first" v-if="index != 2">8</div>
+          <div class="first" v-if="index == 2">1238</div>
           <!-- 2是探测器，探测器只有报警，没有高低报 -->
-          <template v-if="index != 2">
-            <div>123321</div>
-            <div>12321</div>
+          <template v-if="index == 0">
+            <div>2</div>
+            <div>1</div>
           </template>
-          <template v-else>
-            <div>12312</div>
+          <template v-if="index == 1">
+            <div>0</div>
+            <div>0</div>
+          </template>
+          <template v-if="index == 2">
+            <div>0</div>
           </template>
-          <div class="last">534534</div>
+          <div class="last" v-if="index != 1">0</div>
+          <div class="last" v-if="index == 1">1</div>
         </div>
       </div>
     </div>
@@ -152,4 +158,4 @@ export default {
   display: flex;
   justify-content: space-between;
 }
-</style>
+</style>
\ No newline at end of file

gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData/index.vue

@@ -34,9 +34,9 @@ export default {
   data() {
     return {
       cardList: [
-        { deviceName: "压力表", count: 123123 },
-        { deviceName: "流量计", count: 123123 },
-        { deviceName: "探测器", count: 123123 },
+        { deviceName: "压力表", count: 11 },
+        { deviceName: "流量计", count: 9 },
+        { deviceName: "探测器", count: 1238 },
       ],
       deviceIconList: ["ylb", "llj", "tcq"],
     };
@@ -50,4 +50,4 @@ export default {
   padding: 20px;
   padding-right: 50px;
 }
-</style>
+</style>
\ No newline at end of file

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
@@ -52,13 +52,13 @@ export default {
       ],
     };
   },
- 
+
   mounted() {
     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;
       }
     }
   }