Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress into 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/assets/images/cz-cz.svg

+<svg width="28" height="31" viewBox="0 0 28 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 659">
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M21.27 12.4812C21.27 16.5018 18.0106 19.7612 13.99 19.7612C9.96933 19.7612 6.70996 16.5018 6.70996 12.4812C6.70996 8.46054 9.96933 5.20117 13.99 5.20117C18.0106 5.20117 21.27 8.46054 21.27 12.4812ZM13.8781 14.3685H14.4618V16.7277H13.8781V14.3685ZM12.5744 14.3685H13.158V16.7277H12.5744V14.3685ZM17.5887 8.58069V16.034H18.2366V16.7277H14.9751V14.1405C14.9751 13.9494 14.8157 13.7937 14.6203 13.7937H12.0497C11.8543 13.7937 11.6944 13.9499 11.6944 14.1405V16.7277H9.74326V16.0336H10.3911V11.7043C10.3925 11.6113 10.4306 11.5226 10.4972 11.4576C10.5638 11.3926 10.6534 11.3566 10.7464 11.3575H12.8499V10.6323C12.8512 10.5392 12.8893 10.4504 12.9558 10.3853C13.0224 10.3202 13.1121 10.2841 13.2052 10.285H14.5632C14.6563 10.2841 14.746 10.3202 14.8126 10.3853C14.8792 10.4504 14.9173 10.5392 14.9185 10.6323V11.358H15.4829V8.58116C15.4842 8.48813 15.5224 8.39943 15.5889 8.33444C15.6555 8.26945 15.7451 8.23347 15.8382 8.23435H17.2334C17.3264 8.23346 17.4159 8.26939 17.4825 8.33427C17.549 8.39916 17.5872 8.48774 17.5887 8.58069ZM11.7991 13.285H14.8723H14.8742V12.5914H11.7991V13.285Z" fill="#0F6FFF"/>
+<path id="Ellipse 95" d="M7.44827 5.83351C3.8372 9.44459 3.82479 15.2913 7.42594 18.8924C7.81329 19.2798 8.35775 20.0322 8.98156 20.9872C9.59775 21.9305 10.2673 23.0332 10.9036 24.0936C11.0451 24.3294 11.1851 24.5632 11.3224 24.7928C11.8004 25.5915 12.2471 26.3378 12.6167 26.9281C12.8543 27.3074 13.0662 27.6323 13.2384 27.8697C13.3237 27.9873 13.407 28.0941 13.4842 28.1781C13.5225 28.2198 13.5675 28.2648 13.6172 28.3047C13.6582 28.3376 13.7441 28.4018 13.8631 28.4328C14.0425 28.4794 14.1911 28.4243 14.2649 28.3887C14.3445 28.3503 14.4088 28.2999 14.4546 28.2597C14.5478 28.178 14.6402 28.0704 14.7268 27.9595C14.9037 27.7327 15.1175 27.4117 15.3531 27.0362C15.7859 26.3464 16.3229 25.4232 16.891 24.4465C16.9442 24.355 16.9977 24.263 17.0514 24.1707C17.6813 23.0882 18.343 21.9571 18.9522 20.9915C19.5699 20.0124 20.106 19.2489 20.4848 18.8701C24.0959 15.259 24.1083 9.41233 20.5072 5.81118C16.906 2.21002 11.0594 2.22243 7.44827 5.83351Z" stroke="#0F6FFF"/>
+<g id="Polygon 4" filter="url(#filter0_f_247_864)">
+<path d="M14 29L16.5981 24.5H11.4019L14 29Z" fill="#0F6FFF"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_247_864" x="9.40198" y="22.5" width="9.19604" height="8.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1" result="effect1_foregroundBlur_247_864"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/images/cz-fmj.svg

+<svg width="28" height="31" viewBox="0 0 28 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 650">
+<path id="Ellipse 95" d="M7.44827 5.83351C3.8372 9.44459 3.82479 15.2913 7.42594 18.8924C7.81329 19.2798 8.35775 20.0322 8.98156 20.9872C9.59775 21.9305 10.2673 23.0332 10.9036 24.0936C11.0451 24.3294 11.1851 24.5632 11.3224 24.7928C11.8004 25.5915 12.2471 26.3378 12.6167 26.9281C12.8543 27.3074 13.0662 27.6323 13.2384 27.8697C13.3237 27.9873 13.407 28.0941 13.4842 28.1781C13.5225 28.2198 13.5675 28.2648 13.6172 28.3047C13.6582 28.3376 13.7441 28.4018 13.8631 28.4328C14.0425 28.4794 14.1911 28.4243 14.2649 28.3887C14.3445 28.3503 14.4088 28.2999 14.4546 28.2597C14.5478 28.178 14.6402 28.0704 14.7268 27.9595C14.9037 27.7327 15.1175 27.4117 15.3531 27.0362C15.7859 26.3464 16.3229 25.4232 16.891 24.4465C16.9442 24.355 16.9977 24.263 17.0514 24.1707C17.6813 23.0882 18.343 21.9571 18.9522 20.9915C19.5699 20.0124 20.106 19.2489 20.4848 18.8701C24.0959 15.259 24.1083 9.41233 20.5072 5.81118C16.906 2.21002 11.0594 2.22243 7.44827 5.83351Z" stroke="#0F6FFF"/>
+<path id="Vector" d="M21.2167 11.421C20.9613 9.69245 20.0919 8.11321 18.7672 6.97139C17.4425 5.82957 15.7508 5.20129 14.0007 5.20117C12.0665 5.20117 10.2116 5.96828 8.84391 7.33374C7.47624 8.6992 6.70789 10.5512 6.70789 12.4822C6.70789 14.4133 7.47624 16.2652 8.84391 17.6307C10.2116 18.9961 12.0665 19.7632 14.0007 19.7632C15.7508 19.7631 17.4425 19.1348 18.7672 17.993C20.0919 16.8512 20.9613 15.272 21.2167 13.5434L21.27 12.4822L21.2167 11.421ZM8.41395 11.9709C8.53354 10.6709 9.1041 9.45346 10.0271 8.52876C10.9501 7.60405 12.1676 7.0302 13.4693 6.9063V8.01779C12.4623 8.1375 11.5253 8.5929 10.8098 9.3103C10.0943 10.0277 9.64217 10.9651 9.52657 11.9709H8.41395ZM13.4693 18.0583C12.1742 17.935 10.9623 17.3664 10.0409 16.4496C9.11941 15.5328 8.5456 14.3249 8.4176 13.0324H9.53135C9.65507 14.0303 10.1102 14.9581 10.824 15.6675C11.5378 16.3769 12.4691 16.827 13.4693 16.9459V18.0583ZM13.2806 12.7912V15.213H12.3824V9.7409H16.12V10.5072H13.2796V12.0246H15.9588V12.791L13.2806 12.7912ZM14.5322 18.0583V16.9466C15.5323 16.8277 16.4636 16.3775 17.1774 15.6681C17.8912 14.9587 18.3464 14.031 18.4701 13.0331H19.5838C19.4556 14.3254 18.8817 15.5331 17.9602 16.4497C17.0388 17.3663 15.827 17.935 14.5322 18.0583ZM18.4749 11.9709C18.3593 10.9651 17.9071 10.0277 17.1916 9.3103C16.4761 8.5929 15.5391 8.1375 14.5322 8.01779V6.9063C15.8338 7.03025 17.0512 7.60413 17.9742 8.52882C18.8971 9.45352 19.4677 10.671 19.5873 11.9709H18.4749Z" fill="#0F6FFF"/>
+<g id="Polygon 4" filter="url(#filter0_f_247_774)">
+<path d="M14 29L16.5981 24.5H11.4019L14 29Z" fill="#0F6FFF"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_247_774" x="9.40198" y="22.5" width="9.19604" height="8.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1" result="effect1_foregroundBlur_247_774"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/images/cz-jk.svg

+<svg width="28" height="31" viewBox="0 0 28 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 658">
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M13.99 19.7612C18.0106 19.7612 21.27 16.5018 21.27 12.4812C21.27 8.46054 18.0106 5.20117 13.99 5.20117C9.96933 5.20117 6.70996 8.46054 6.70996 12.4812C6.70996 16.5018 9.96933 19.7612 13.99 19.7612ZM8.78705 12.7408C8.64559 12.6815 8.52994 12.7533 8.52994 12.8998V16.5479C8.52994 16.6946 8.64559 16.7659 8.78705 16.7071L9.87531 16.2523C10.017 16.1933 10.1324 16.0255 10.1324 15.8788V15.2873H12.3375C12.451 15.2874 12.5621 15.2567 12.6579 15.1987C12.7536 15.1407 12.8299 15.0579 12.8778 14.9601L13.3875 13.9126L12.3094 13.436L11.957 14.1601H10.1329V13.5686C10.1329 13.4221 10.0173 13.2541 9.8758 13.1951L8.78705 12.7408ZM18.0537 14.45L18.797 12.9396L16.9903 13.9801L18.0537 14.45ZM19.2313 11.5482L11.8448 8.2839C11.7097 8.22453 11.5555 8.21829 11.4155 8.26654C11.2756 8.31479 11.1614 8.41362 11.0978 8.54153L9.81525 11.1485C9.75289 11.2767 9.74651 11.4231 9.79749 11.5558C9.84847 11.6884 9.95266 11.7965 10.0872 11.8563L14.9582 14.0088C15.2384 14.1325 15.6836 14.1094 15.9477 13.9574L19.2601 12.0497C19.5242 11.8978 19.511 11.6722 19.2313 11.5482Z" fill="#0F6FFF"/>
+<path id="Ellipse 95" d="M7.44827 5.83351C3.8372 9.44459 3.82479 15.2913 7.42594 18.8924C7.81329 19.2798 8.35775 20.0322 8.98156 20.9872C9.59775 21.9305 10.2673 23.0332 10.9036 24.0936C11.0451 24.3294 11.1851 24.5632 11.3224 24.7928C11.8004 25.5915 12.2471 26.3378 12.6167 26.9281C12.8543 27.3074 13.0662 27.6323 13.2384 27.8697C13.3237 27.9873 13.407 28.0941 13.4842 28.1781C13.5225 28.2198 13.5675 28.2648 13.6172 28.3047C13.6582 28.3376 13.7441 28.4018 13.8631 28.4328C14.0425 28.4794 14.1911 28.4243 14.2649 28.3887C14.3445 28.3503 14.4088 28.2999 14.4546 28.2597C14.5478 28.178 14.6402 28.0704 14.7268 27.9595C14.9037 27.7327 15.1175 27.4117 15.3531 27.0362C15.7859 26.3464 16.3229 25.4232 16.891 24.4465C16.9442 24.355 16.9977 24.263 17.0514 24.1707C17.6813 23.0882 18.343 21.9571 18.9522 20.9915C19.5699 20.0124 20.106 19.2489 20.4848 18.8701C24.0959 15.259 24.1083 9.41233 20.5072 5.81118C16.906 2.21002 11.0594 2.22243 7.44827 5.83351Z" stroke="#0F6FFF"/>
+<g id="Polygon 4" filter="url(#filter0_f_247_834)">
+<path d="M14 29L16.5981 24.5H11.4019L14 29Z" fill="#0F6FFF"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_247_834" x="9.40198" y="22.5" width="9.19604" height="8.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1" result="effect1_foregroundBlur_247_834"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/images/cz-tyx.svg

+<svg width="28" height="31" viewBox="0 0 28 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 671">
+<path id="Vector" d="M13.99 5.19922C12.0592 5.19922 10.2075 5.96622 8.84222 7.33148C7.47696 8.69675 6.70996 10.5484 6.70996 12.4792C6.70996 14.41 7.47696 16.2617 8.84222 17.627C10.2075 18.9922 12.0592 19.7592 13.99 19.7592C15.9207 19.7592 17.7724 18.9922 19.1377 17.627C20.503 16.2617 21.27 14.41 21.27 12.4792C21.27 10.5484 20.503 8.69675 19.1377 7.33148C17.7724 5.96622 15.9207 5.19922 13.99 5.19922V5.19922ZM18.358 15.0272H17.63V16.1192H16.538V16.8472H15.082V16.1192H13.262V16.8472H11.806V16.1192H10.714V15.0272H9.98596V9.93122H10.714V8.83922H11.806V8.47522H12.898V8.83922H13.626V8.47522H14.718V8.83922H15.446V8.47522H16.538V8.83922H17.63V9.93122H18.358V15.0272ZM11.078 15.0272H17.266V9.56722H11.078V15.0272ZM16.538 9.93122H16.902V14.6632H16.538V9.93122ZM15.81 9.93122H16.174V14.6632H15.81V9.93122ZM15.082 9.93122H15.446V14.6632H15.082V9.93122ZM14.354 9.93122H14.718V14.6632H14.354V9.93122ZM13.626 9.93122H13.99V14.6632H13.626V9.93122ZM12.898 9.93122H13.262V14.6632H12.898V9.93122ZM12.17 9.93122H12.534V14.6632H12.17V9.93122ZM11.442 9.93122H11.806V14.6632H11.442V9.93122Z" fill="#0F6FFF"/>
+<path id="Ellipse 95" d="M7.44827 5.83351C3.8372 9.44459 3.82479 15.2913 7.42594 18.8924C7.81329 19.2798 8.35775 20.0322 8.98156 20.9872C9.59775 21.9305 10.2673 23.0332 10.9036 24.0936C11.0451 24.3294 11.1851 24.5632 11.3224 24.7928C11.8004 25.5915 12.2471 26.3378 12.6167 26.9281C12.8543 27.3074 13.0662 27.6323 13.2384 27.8697C13.3237 27.9873 13.407 28.0941 13.4842 28.1781C13.5225 28.2198 13.5675 28.2648 13.6172 28.3047C13.6582 28.3376 13.7441 28.4018 13.8631 28.4328C14.0425 28.4794 14.1911 28.4243 14.2649 28.3887C14.3445 28.3503 14.4088 28.2999 14.4546 28.2597C14.5478 28.178 14.6402 28.0704 14.7268 27.9595C14.9037 27.7327 15.1175 27.4117 15.3531 27.0362C15.7859 26.3464 16.3229 25.4232 16.891 24.4465C16.9442 24.355 16.9977 24.263 17.0514 24.1707C17.6813 23.0882 18.343 21.9571 18.9522 20.9915C19.5699 20.0124 20.106 19.2489 20.4848 18.8701C24.0959 15.259 24.1083 9.41233 20.5072 5.81118C16.906 2.21002 11.0594 2.22243 7.44827 5.83351Z" stroke="#0F6FFF"/>
+<g id="Polygon 4" filter="url(#filter0_f_247_822)">
+<path d="M14 29L16.5981 24.5H11.4019L14 29Z" fill="#0F6FFF"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_247_822" x="9.40198" y="22.5" width="9.19604" height="8.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1" result="effect1_foregroundBlur_247_822"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/images/cz-yh.svg

+<svg width="28" height="31" viewBox="0 0 28 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 668">
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M21.27 12.4812C21.27 16.5018 18.0106 19.7612 13.99 19.7612C9.96933 19.7612 6.70996 16.5018 6.70996 12.4812C6.70996 8.46054 9.96933 5.20117 13.99 5.20117C18.0106 5.20117 21.27 8.46054 21.27 12.4812ZM16.5344 10.671C16.5344 12.0646 15.4046 13.1947 14.0107 13.1947C12.6168 13.1947 11.487 12.0649 11.487 10.671C11.487 9.27734 12.6168 8.14727 14.0107 8.14727C15.4046 8.14727 16.5344 9.27707 16.5344 10.671ZM14.0107 14.0327C14.7766 14.0327 15.5055 13.7748 16.0936 13.3105V13.3108C17.62 13.8895 18.3209 15.8731 18.3209 16.7774H9.65662C9.65662 15.865 10.3521 13.8673 11.9092 13.2957C12.5 13.7689 13.2359 14.0327 14.0107 14.0327Z" fill="#0F6FFF"/>
+<path id="Ellipse 95" d="M7.44827 5.83351C3.8372 9.44459 3.82479 15.2913 7.42594 18.8924C7.81329 19.2798 8.35775 20.0322 8.98156 20.9872C9.59775 21.9305 10.2673 23.0332 10.9036 24.0936C11.0451 24.3294 11.1851 24.5632 11.3224 24.7928C11.8004 25.5915 12.2471 26.3378 12.6167 26.9281C12.8543 27.3074 13.0662 27.6323 13.2384 27.8697C13.3237 27.9873 13.407 28.0941 13.4842 28.1781C13.5225 28.2198 13.5675 28.2648 13.6172 28.3047C13.6582 28.3376 13.7441 28.4018 13.8631 28.4328C14.0425 28.4794 14.1911 28.4243 14.2649 28.3887C14.3445 28.3503 14.4088 28.2999 14.4546 28.2597C14.5478 28.178 14.6402 28.0704 14.7268 27.9595C14.9037 27.7327 15.1175 27.4117 15.3531 27.0362C15.7859 26.3464 16.3229 25.4232 16.891 24.4465C16.9442 24.355 16.9977 24.263 17.0514 24.1707C17.6813 23.0882 18.343 21.9571 18.9522 20.9915C19.5699 20.0124 20.106 19.2489 20.4848 18.8701C24.0959 15.259 24.1083 9.41233 20.5072 5.81118C16.906 2.21002 11.0594 2.22243 7.44827 5.83351Z" stroke="#0F6FFF"/>
+<g id="Polygon 4" filter="url(#filter0_f_247_806)">
+<path d="M14 29L16.5981 24.5H11.4019L14 29Z" fill="#0F6FFF"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_247_806" x="9.40198" y="22.5" width="9.19604" height="8.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1" result="effect1_foregroundBlur_247_806"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/components/emergency/Timeline.vue

@@ -8,12 +8,13 @@
         <div class="long-line"></div>
       </div>
       <div class="timeline-content">
+        <div class="timeline-title" style="font-weight: bolder">事件发布：</div>
         <div class="timeline-date el-form-div">
-          <div style="width: 180px">{{nowItem.createTime}}</div>
-          <div class="classType">事件发布</div>
+          <div style="margin-left: 32px">时间：{{nowItem.createTime}}</div>
+          <!--<div class="classType">事件发布</div>-->
         </div>
-        <div class="timeline-title">{{ nowItem.eventName}}</div>
-        <div class="timeline-title">地址：{{ nowItem.address}}</div>
+        <div class="timeline-title">事件名称：<span style="color: red">{{ nowItem.eventName}}</span></div>
+        <div class="timeline-title" style="margin-left: 32px" >位置：{{ nowItem.address}}</div>
       </div>
     </li>
     <li class="timeline-item" v-for="t in timelineList" :key="t.id">
@@ -24,13 +25,15 @@
         <div class="long-line"></div>
       </div>
       <div class="timeline-content">
+        <div  v-if="t.eventType==2" class="timeline-title" style="font-weight: bolder">预案指引：</div>
+        <div  v-if="t.eventType==1" class="timeline-title" style="font-weight: bolder">信息处置：</div>
         <div class="timeline-date el-form-div">
-          <div style="width: 180px">{{t.createTime}}</div>
-          <div class="classType"  v-if="t.eventType==2">预案指引</div>
-          <div class="classType" v-if="t.eventType==1">信息处置</div>
+          <div style="margin-left: 32px">时间：{{t.createTime}}</div>
+          <!--<div class="classType"  v-if="t.eventType==2">预案指引</div>-->
+          <!--<div class="classType" v-if="t.eventType==1">信息处置</div>-->
         </div>
-        <div class="timeline-title">{{ t.management}}</div>
-        <div class="timeline-desc">
+        <div class="timeline-title" style="margin-left: 32px">内容：{{ t.management}}</div>
+        <div class="timeline-desc" style="margin-left: 32px">
             <span
               class="dbtn"
               @click="checkFile(t.managementEvent)"
@@ -99,8 +102,8 @@
         align-items: center;
 
         .in-circle {
-          width: 8px;
-          height: 8px;
+          width: 5px;
+          height: 5px;
           margin: 0 auto;
           background: rgba(14, 116, 218, 1);
           border-radius: 50%;
@@ -111,7 +114,7 @@
       .long-line {
         width: 1px;
         min-height: 98px;
-        background: #000000;
+        background: #20ffff;
         box-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.1);
         opacity: 0.5;
         margin-left: 8px;
@@ -120,11 +123,11 @@
 
     .timeline-content {
       box-sizing: border-box;
-      margin-left: 20px;
       min-height: 86px;
-      padding: 6px 0 0 20px;
+      padding: 0 0 0 20px;
       text-align: left;
       margin-bottom: 10px;
+      margin-left: 5px;
 
       .timeline-title {
         font-size: 15px;
@@ -136,7 +139,7 @@
       }
 
       .timeline-date {
-        font-size: 13px;
+        font-size: 14px;
         color: #000000;
         font-weight: 500;
         margin-bottom: 5px;
@@ -158,7 +161,7 @@
     border-radius: 3px;
     border-style: solid;
     border-width: 0;
-    color: rgb(48, 180, 107);
+    color: #20FFFF;
   }
   .timeline-item:last-of-type .timeline-content {
     margin-bottom: 0;

gassafetyprogress-web/src/components/emergency/rightBar.vue

@@ -2,10 +2,10 @@
   <div class="test-5" style="height: 100%;overflow:auto;overflow-x:hidden">
     <!-- 预警信息 -->
     <div>
-      <div class="item1">
-        <span class="dot">
-          <span class="dot-inner"></span>
-        </span>
+      <div class="item1" >
+        <!--<span class="dot">-->
+          <!--<span class="dot-inner"></span>-->
+        <!--</span>-->
         <span
           style="letter-spacing: 3px; color: #000000; cursor: pointer"
           >事件接报列表</span
@@ -13,25 +13,30 @@
       </div>
       <div style="width: 100%" v-for="item in receiveList">
         <div class="el-form-div title-div">
-          <div v-if="item.status==1" style="width: 80%;margin-left: 5px;">未指派</div>
-          <div v-if="item.status==2" style="width: 80%;margin-left: 5px;">待处置<span
-            v-if="(item.governmentRead==0&&userType==-2)||(item.companyRead==0&&userType!=-2)" class="massage"> (您有新消息)</span>
+          <div style="width: 80%;margin-left: 5px;">
+            <img v-if="(item.governmentRead==0&&userType==-2)||(item.companyRead==0&&userType!=-2)" style="vertical-align:middle;"  src="@/assets/images/new.png" alt="" />
+            事件名称：{{item.eventName}}
           </div>
-          <div v-if="item.status==3" style="width: 80%;margin-left: 5px;">已处置<span
-            v-if="(item.governmentRead==0&&userType==-2)||(item.companyRead==0&&userType!=-2)" class="massage"> (您有新消息)</span>
-          </div>
-          <div v-if="item.status==4" style="width: 80%;margin-left: 5px;">已完结</div>
-          <div style="height:30px;color: red;cursor:pointer;" v-if="userType==-2" @click="handleDelete(item.id)">关闭事件</div>
+          <!--<div v-if="item.status==2" style="width: 80%;margin-left: 5px;">待处置<span-->
+            <!--v-if="(item.governmentRead==0&&userType==-2)||(item.companyRead==0&&userType!=-2)" class="massage"> (您有新消息)</span>-->
+          <!--</div>-->
+          <!--<div v-if="item.status==3" style="width: 80%;margin-left: 5px;">已处置<span-->
+            <!--v-if="(item.governmentRead==0&&userType==-2)||(item.companyRead==0&&userType!=-2)" class="massage"> (您有新消息)</span>-->
+          <!--</div>-->
+          <!--<div v-if="item.status==4" style="width: 80%;margin-left: 5px;">已完结</div>-->
+          <!--<div style="height:30px;color: red;cursor:pointer;" v-if="userType==-2" @click="handleDelete(item.id)">关闭事件</div>-->
         </div>
         <div class="content-div el-form-div" style="margin-top: 10px;overflow:hidden;">
-            <div style="width: 65%; white-space:nowrap;
-            text-overflow:ellipsis;
-            -o-text-overflow:ellipsis;
-            overflow: hidden;">事件名称：{{item.eventName}}</div>
+            <div style="width: 60%; ">事件状态：
+              <span style="color: #ff0000" v-if="item.status==1">未指派</span>
+              <span style="color: #ff0000" v-if="item.status==2">待处置</span>
+              <span style="color: #ff0000" v-if="item.status==3">处理中</span>
+              <span v-if="item.status==4">已完结</span>
+            </div>
             <div>事件分类：{{item.eventTypeName}}</div>
         </div>
         <div class="content-div el-form-div">
-          <div style="width: 65%">发生时间：{{item.inforTime}}</div>
+          <div style="width: 60%">发生时间：{{item.inforTime}}</div>
           <div>事件级别：{{item.eventGradeName}}</div>
         </div>
         <div class="content-div">事件地点：{{item.address}}</div>
@@ -42,15 +47,16 @@
           <div v-if="item.status==3 && userType==-2" class="button-div" @click="endevent(item.id)">事件结案</div>
           <div v-if="userType!=-2" class="button-div" @click="showList(item)">信息处置</div>
           <div  class="button-div" @click="showDetail(item.id,item.eventName)">详情</div>
+          <div  class="button-div" style="background: #FA6767;" v-if="userType==-2" @click="handleDelete(item.id)">关闭事件</div>
         </div>
       </div>
 
       <div id = "detail" class="show-detail" style="display: none;margin-top: 15px;margin-bottom: 20px;position:fixed;right: 470px;width: 300px;
                                                       background: #ffffff;top: 110px;border-right:1px solid #99a9bf">
-        <div class="el-form-div" style="height: 30px;">
-            <div class="detail-title">事件详情</div>
+        <div class="el-form-div detail-back" style="height: 30px;">
+            <div class="detail-title" >事件详情</div>
           <div style="cursor: pointer;" @click="closeDetail()">
-            <img style="width: 20px;height: 20px;margin-top: 5px;" src="@/assets/mapImages/close.png" alt="" />
+            <img style="width: 14px;height: 14px;margin-top: 7px;" src="@/assets/mapImages/close.png" alt="" />
           </div>
         </div>
         <timeline :timeline-list="handleList" :nowItem="nowItem"></timeline>
@@ -371,9 +377,18 @@ export default {
         }
         this.total = response.total;
         this.loading = false;
-      //document.getElementsByClassName("num-div")[this.handleList.length].setAttribute("class","num-div2")
+        this.$nextTick(() => {
+          this.showlast();
+        })
+
     });
     },
+    showlast(){
+      if(document.getElementsByClassName("num-div2").length>0){
+        document.getElementsByClassName("num-div2")[0].setAttribute("class","num-div")
+      }
+      document.getElementsByClassName("num-div")[this.handleList.length].setAttribute("class","num-div2")
+    },
     showList(item) {
       this.closeDetail();
       item.eventType=3;
@@ -494,7 +509,7 @@ export default {
     cancel() {
       this.display2="";
       this.display="display:none";
-      this.reset();
+      //this.reset();
       this.getHandleList();
     },
     endevent(id){
@@ -618,20 +633,14 @@ export default {
 
 <style lang="scss" scoped>
 .item1 {
-  width: 93%;
   height: 30px;
-  font-size: 18px;
+  font-size: 15px;
   line-height: 30px;
-  padding-left: 10px;
   font-weight: 700;
-  font-style: italic;
-  margin-left: 10px;
-  background-image: linear-gradient(
-    to left,
-    #fff,
-    rgb(49 151 195 / 70%) 50%,
-    #fff
-  );
+  background: url(../../assets/images/chuzhilist.png) repeat-x 50px 10px;
+  background-size:360px 7px;
+  background-repeat: no-repeat;
+  text-align: center;
 }
 .dot {
   display: inline-block;
@@ -660,10 +669,10 @@ export default {
 }
   .content-div{
     color: #000000;
-    font-size: 30;
-    height: 30px;
-    line-height: 30px;
-    margin-left: 10px;
+    font-size: 14px;
+    height: 25px;
+    line-height: 25px;
+    margin-left: 15px;
   }
 .el-form-div{
   display:flex;
@@ -674,28 +683,30 @@ export default {
   .button-div{
     cursor:pointer;
     color: #ffffff;
-    margin-bottom: 5px;
+    margin-bottom: 8px;
     border-radius: 2px;
-    width: 100px;
-    border: 1px solid #339CC9;
-    height: 25px;
-    line-height: 25px;
+    width: 88px;
+    height: 32px;
+    line-height: 32px;
     text-align: center;
-    font-size: 15;
-    margin-left: 10%;
+    font-size: 14px;
+    margin-left: 22px;
     margin-top: 10px;
-    background: #1c84c6;
+    background: #4091F7;
   }
   .title-div{
     width: 100%;
-    margin-left: 10px;
-    border-left: 5px solid #e6a700;
-    border-bottom: 2px solid #1c84c6;
-    border-top: 1px solid #1c84c6;
+    margin-left: 12px;
     height: 30px;
     color: #ffffff;
     line-height: 30px;
-    background: #74BCFF;
+    background: url(../../assets/images/yjcz.png);
+    background-size:450px 30px;
+    background-repeat: no-repeat;
+  }
+  .detail-back{
+    background: url(../../assets/images/yjcz.png);
+    background-size:300px 30px;
   }
 .test-5::-webkit-scrollbar {
   /*滚动条整体样式*/
@@ -731,14 +742,9 @@ export default {
 .detail-title{
   height: 100%;
   width: 270px;
-  color: #000000;
-  text-align: center;
-  background-image: linear-gradient(
-      to left,
-      #fff,
-      rgb(49 151 195 / 70%) 50%,
-      #fff
-  );
+  color: #ffffff;
+  margin-top: 3px;
+  margin-left: 10px;
 }
 .massage{
   color: #00ffff;

gassafetyprogress-web/src/utils/mapClass/yjmap.js

@@ -7,7 +7,23 @@
  * @FilePath: /test/hello-world/src/utils/mapClass.js
  */
 import { pipeColor, svgUrl, svgAlarm } from "@/utils/mapClass/config.js";
-
+export const svgUrl2 = {
+  // 地图的设备
+  2: require("@/assets/images/cz-tyx.svg"),
+  3: require("@/assets/images/cz-fmj.svg"),
+  4: require("@/assets/images/cz-cz.svg"),
+  5: require("@/assets/images/cz-jk.svg"),
+  6: require("@/assets/images/cz-yh.svg"),
+  7: require("@/assets/image/zrxk.svg"),
+  8: require("@/assets/image/zcrq.svg"),
+  //应急设备,应急处置 emergency/emergency
+  10: require("@/assets/image/yj-jydw.png"),
+  11: require("@/assets/image/yj-wz.png"),
+  12: require("@/assets/image/yj-cl.png"),
+  13: require("@/assets/image/yj-yy.png"),
+  15: require("@/assets/image/yj-xf.png"),
+  16: require("@/assets/image/yj-xj.png"),
+};
 // 编辑类
 // 在地图上新增的设备可以直接编辑，
 // 已经保存完成的设备需要点编辑才可以编辑
@@ -487,7 +503,7 @@ export class EditorMap {
    */
   addDevice(deviceData, compontent) {
     const { longitude: lng, latitude: lat, iconType } = deviceData;
-    const icon = svgUrl[iconType];
+    const icon = svgUrl2[iconType];
     console.log("icon", icon);
     let device = this.createMarker({
       map: this.map,

gassafetyprogress-web/src/views/emergency/index.vue

@@ -52,8 +52,10 @@
         <!--</div>-->
       <!--</div>-->
     <!--</div>-->
-    <div class="event_div" @click="handleAdd">
-        事件接报
+    <div class="event_div"  @click="handleAdd">
+     <img style="vertical-align:middle;margin-top: -5px"  src="@/assets/images/Frame.png" alt="" />
+      添加事件接报
+        <!--<img src="@/assets/imgages/Frame.png"/>添加事件接报-->
     </div>
     <!--<div class="mouseToolBtn">-->
       <!--<button class="serBtn" @click="openDraw()" id="mouseToolBtn">画图</button>-->
@@ -93,12 +95,12 @@
         class="list"
         v-for="(item, index) in arr"
         :key="index"
-        :class="selarr1.indexOf(item.val) >= 0 ? 'active' : ''"
+        :class="selarr1.indexOf(item.val) >= 0 ? 'active' : 'active2'"
         @click="sel1(index, item)"
       >
         <img
           :src="item.imgurl"
-          style="margin-top: 2px; float: left; margin-right: 3px"
+          style=" float: left; margin-right: 3px;"
         />
         {{ item.name }}
       </div>
@@ -106,7 +108,7 @@
     <div class="typelist-div2">
       <div
         class="list"
-        style="width: 146px;height: 35px;line-height: 35px;"
+        style="width: 148px;height: 35px;line-height: 35px;"
         v-for="(item, index) in arr2"
         :key="index"
         :class="selarr1.indexOf(item.val) >= 0 ? 'active' : ''"
@@ -116,7 +118,9 @@
           :src="item.imgurl"
           style="margin-top: 8px;float: left; margin-right: 3px;width: 18px;height: 18px;margin-left: 10px;"
         />
-        {{ item.name }} ({{ item.num }})
+        {{ item.name }}
+         <span v-if="index==3" style="margin-left: 50px">{{item.num}}</span>
+          <span v-if="index!=3" style="margin-left: 25px">{{item.num}}</span>
       </div>
     </div>
 
@@ -220,6 +224,67 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="任务指派" :visible.sync="open2" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules2" label-width="100px">
+        <el-form-item label="所属企业：" prop="enterpriseId">
+          <el-select v-model="form.enterpriseName" placeholder="请选择预案等级"  @change="qiyechang" >
+            <el-option
+              v-for = "dict in enterpriseList"
+              :key = "dict.enterpriseId"
+              :label = "dict.enterpriseName"
+              :value = "dict.enterpriseId"
+            />
+          </el-select>
+          <!--<el-input v-model="form.beyondEnterpriseId" placeholder="请输入所属企业" />-->
+        </el-form-item>
+        <div class="el-form-div">
+          <div style="width: 50%">
+            <el-form-item label="事件名称：" >
+              {{form.eventName}}
+            </el-form-item>
+            <el-form-item label="事件类型：" >
+              {{form.eventTypeName}}
+            </el-form-item>
+            <el-form-item label="事件等级：">
+              {{form.eventGradeName}}
+            </el-form-item>
+          </div>
+          <div style="width: 50%">
+            <el-form-item label="报案人："  >
+              {{form.informant}}
+            </el-form-item>
+            <el-form-item label="案发时间："  >
+              {{form.inforTime}}
+
+            </el-form-item>
+            <el-form-item label="报案人电话：" >
+              {{form.informantPhone}}
+            </el-form-item>
+          </div>
+        </div>
+
+
+        <el-form-item label="事发地点：" >
+         {{form.address}}
+        </el-form-item>
+        <el-form-item label="经纬度：" >
+          {{form.longitude}}、{{form.latitude}}
+
+        </el-form-item>
+
+        <el-form-item label="事件描述：" >
+          {{form.describe}}
+        </el-form-item>
+
+        <el-form-item label="备注：" prop="remarks">
+          {{form.remarks}}
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
     <GetPos
       :dialogVisible.sync="dialogTableVisible"
       device=""
@@ -287,6 +352,7 @@ export default {
     return {
       // 是否显示弹出层
       open: false,
+      open2: false,
       // 事件类型 1水灾 2火灾 3突发字典
       eventTypeOptions: [],
       // 事件等级 1级 2级 3级字典
@@ -335,31 +401,31 @@ export default {
         {
           val: 2,
           ischeck: false,
-          imgurl: require("@/assets/image/tyxsub.svg"),
+          imgurl: require("@/assets/images/cz1.png"),
           name: "调压箱",
         },
         {
           val: 3,
           ischeck: false,
-          imgurl: require("@/assets/image/fmjsub.svg"),
+          imgurl: require("@/assets/images/cz2.png"),
           name: "阀门井",
         },
         {
           val: 4,
           ischeck: false,
-          imgurl: require("@/assets/image/czsub.svg"),
+          imgurl: require("@/assets/images/cz3.png"),
           name: "场 站",
         },
         {
           val: 6,
           ischeck: false,
-          imgurl: require("@/assets/image/usersub.svg"),
+          imgurl: require("@/assets/images/cz4.png"),
           name: "用 户",
         },
         {
           val: 5,
           ischeck: false,
-          imgurl: require("@/assets/image/jksub.svg"),
+          imgurl: require("@/assets/images/cz5.png"),
           name: "监 控",
         },
       ],
@@ -425,7 +491,12 @@ export default {
       markNum:0,
       // 表单参数
       form: {},
-      // 表单校验
+      // 表单校验list
+      rules2:{
+        enterpriseId:[
+          { required: true, message: "请选择指派公司", trigger: "blur" }
+        ],
+      },
       rules: {
         eventName: [
           { required: true, message: "请输入事件名称", trigger: "blur" }
@@ -575,16 +646,19 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      console.log(row)
       this.readonly=true;
       this.buttonstyle="display:none";
       this.reset();
       const id = row.id || this.ids
       getReceive(id).then(response => {
         this.form = response.data;
-      this.open = true;
-      this.title = "修改事件接报";
-      document.getElementById("jingwei").style.display="none";
-    });
+        this.form.eventGradeName = row.eventGradeName;
+        this.form.eventTypeName = row.eventTypeName;
+        this.open2 = true;
+        this.title = "修改事件接报";
+        document.getElementById("jingwei").style.display="none";
+      });
     },
     /** 提交按钮 */
     submitForm() {
@@ -595,6 +669,7 @@ export default {
             updateReceive(this.form).then(response => {
               this.msgSuccess("修改成功");
             this.open = false;
+            this.open2 = false;
             this.$refs.mychild.choice(0);
           });
           } else {
@@ -624,6 +699,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.open2 = false;
       this.reset();
     },
     // 表单重置
@@ -763,11 +839,11 @@ export default {
       } else {
         this.selarr1.push(item.val);
         //找中心点
-        console.log(item.val);
+        //console.log(item.val);
         if(item.val>=10){
           for(var i=0;i<this.deviceList.length;i++){
             if(this.deviceList[i].iconType==item.val){
-              console.log(this.deviceList[i])
+              //console.log(this.deviceList[i])
               this.map.setZoomAndCenter(this.deviceList[i].longitude,this.deviceList[i].latitude);
               break;
             }
@@ -942,9 +1018,9 @@ export default {
 }
 .rightbar {
   width: 470px;
-  height: 93%;
+  height:calc(100vh - 100px);
   position: fixed;
-  top: 50px;
+  top: 100px;
   right: 0;
   background: #ffffff;
 }
@@ -964,16 +1040,17 @@ export default {
 }
 .event_div{
   position: fixed;
-  margin-left: 20%;
+  right: 0px;
   z-index:999;
-  width: 100px;
+  width: 470px;
   height: 50px;
   color: white;
-  background: #053b6a;
+  background: #4091F7 ;
+  top: 50px;
   line-height: 50px;
-  bottom: 50px;
   text-align: center;
   cursor:pointer;
+  font-size: 24px;
 }
 .listingsSty {
   /* height: 25px; */
@@ -1001,10 +1078,10 @@ export default {
   // font-family: 'arialbd';
 }
 .active {
-  color: #2ee7e7;
-  background: url(../../assets/mapinages/background.png);
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
+  /*color: #2ee7e7;*/
+  /*background: url(../../assets/mapinages/background.png);*/
+  /*background-repeat: no-repeat;*/
+  /*background-size: 100% 100%;*/
   font-size: 18px;
 
   /*position:relative;*/
@@ -1051,8 +1128,8 @@ export default {
   right: 450px;
 }
 .typelist-div2{
-  width: 150px;
-  height: 230px;
+  width: 155px;
+  height: 220px;
   z-index: 999;
   position: fixed;
   margin-top: 80px;
@@ -1076,7 +1153,10 @@ export default {
   background: #ffffff;
   box-shadow: inset 0px 1px 2px 1px #ffffff;
   color: #1890ff;
-  font-size: 14px;
+}
+.list.active2 {
+  filter: grayscale(100%);
+
 }
 .mouseToolBtn {
   position: fixed;
@@ -1116,7 +1196,6 @@ export default {
   display:flex;
   flex-direction:row;
   justify-content:flex-start;
-  justify-content:flex-start;
   width: 100%;
 }
 .detail-title{

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

 <!--
  * @Author: your name
  * @Date: 2022-03-25 17:15:31
- * @LastEditTime: 2022-03-29 11:11:54
+ * @LastEditTime: 2022-04-26 15:06:57
  * @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/operationMonitor/monitorData/component/charsData/CzCard.vue
@@ -15,7 +15,7 @@
       :listNum="czList.filter((item) => item.show).length"
     >
       <template v-slot:chackbox>
-       <FilterVue2
+        <FilterVue2
           :filterList="filterList"
           @fliterTypeChange="fliterTypeChange"
         />
@@ -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,
@@ -383,6 +449,7 @@ $active: #06d7b1 !important;
   width: 100%;
   flex-wrap: wrap;
   margin-left: 35px;
+  justify-content: flex-start;
 
   &.start {
     // justify-content: flex-start;
@@ -464,4 +531,4 @@ $active: #06d7b1 !important;
 .paddingnone {
   padding: 0;
 }
-</style>
\ No newline at end of file
+</style>

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,
+          a: 12,
+          b: 57.7,
+          c: 0.46,
+          d: 54.2,
+          // 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,
+          a: 13.1,
+          b: 64.3,
+          c: 0.51,
+          d: 48.2,
+          // 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,
+          a: 15.2,
+          b: 52.9,
+          c: 0.49,
+          d: 54,
+          // e: 56,
           image: "",
           show: true,
-          type: 4,
+          type: 5,
         },
         {
-          deviceName: "气化站",
+          deviceName: "温塘气化站",
           state: 1,
-          a: 25,
-          b: 56,
-          c: 54,
-          d: 15,
-          e: 56,
+          a: 12.6,
+          b: 61.8,
+          c: 0.47,
+          d: 49,
+          // e: 56,
           image: "",
           show: true,
           type: 5,
         },
         {
-          deviceName: "气化站",
+          deviceName: "93701部队气化站",
           state: 1,
-          a: 25,
-          b: 56,
-          c: 54,
-          d: 15,
-          e: 56,
+          a: 14.6,
+          b: 56.5,
+          c: 0.58,
+          d: 47.6,
+          // e: 56,
           image: "",
           show: true,
           type: 5,
         },
         {
-          deviceName: "储备站",
+          deviceName: "隆城绿都气化站",
           state: 1,
-          a: 25,
-          b: 56,
-          c: 54,
-          d: 15,
-          e: 56,
+          a: 12.5,
+          b: 54,
+          c: 0.52,
+          d: 50,
+          // 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>
\ No newline at end of file
+</style>

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

@@ -28,14 +28,14 @@
         水温：<span :class="{ active: list.b > 50 }">{{ list.b }}°C</span>
       </div>
       <div>
-        压力：<span :class="{ active: list.c > 50 }">{{ list.c }}Pa</span>
+        压力：<span :class="{ active: list.c > 50 }">{{ list.c }}MPa</span>
       </div>
       <div>
-        湿度：<span :class="{ active: list.d > 50 }">{{ list.d }}°C</span>
+        湿度：<span :class="{ active: list.d > 50 }">{{ list.d }}%</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>
\ No newline at end of file
+</style>

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

 <!--
  * @Author: your name
  * @Date: 2022-03-25 17:15:31
- * @LastEditTime: 2022-03-29 11:12:39
+ * @LastEditTime: 2022-04-26 15:08:48
  * @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/operationMonitor/monitorData/component/charsData/CzCard.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,
@@ -383,6 +479,8 @@ $active: #06d7b1 !important;
   width: 100%;
   flex-wrap: wrap;
   margin-left: 35px;
+  justify-content: flex-start;
+
 
   &.start {
     // justify-content: flex-start;
@@ -464,4 +562,4 @@ $active: #06d7b1 !important;
 .paddingnone {
   padding: 0;
 }
-</style>
\ No newline at end of file
+</style>

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

 <!--
  * @Author: your name
  * @Date: 2022-03-25 17:15:31
- * @LastEditTime: 2022-03-29 10:12:49
+ * @LastEditTime: 2022-04-28 16:02:51
  * @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/operationMonitor/monitorData/component/charsData/CzCard.vue
@@ -130,6 +130,7 @@ export default {
         color: #666666;
         font-weight: 500;
         margin-right: 62px;
+        width: 60px;
       }
     }
     .right {

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

 <!--
  * @Author: your name
  * @Date: 2022-03-25 13:46:23
- * @LastEditTime: 2022-04-09 10:38:14
+ * @LastEditTime: 2022-04-28 15:59:44
  * @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/operationMonitor/monitorData/component/charsData.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>
@@ -86,10 +92,12 @@ export default {
     border-radius: 4px 4px 4px 4px;
     border: 1px solid #e6ebf5;
     box-sizing: border-box;
-    padding: 34px 40px 38px;
+    // padding: 34px 40px 38px;
+    padding: 34px 0 38px;
     .top {
       font-size: 20px;
       margin-bottom: 46px;
+      padding: 0 40px;
 
       .top-left {
         color: #1890ff;
@@ -132,11 +140,12 @@ export default {
       // flex: 1;
       text-align: center;
       font-size: 16px;
+      flex: 1;
       &.first {
-        text-align: left;
+        // text-align: left;
       }
       &.last {
-        text-align: right;
+        // text-align: right;
       }
     }
   }
@@ -152,4 +161,4 @@ export default {
   display: flex;
   justify-content: space-between;
 }
-</style>
\ No newline at end of file
+</style>

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

 <!--
  * @Author: your name
  * @Date: 2022-03-25 17:15:31
- * @LastEditTime: 2022-03-29 11:12:33
+ * @LastEditTime: 2022-04-26 15:09:02
  * @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/operationMonitor/monitorData/component/charsData/CzCard.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: 47, state: "all" },
+        { value: "正常", count: 45, state: 1 },
+        { value: "报警", count: 0, state: 2 },
+        { value: "离线", count: 2, state: 3 },
       ],
       typeState: ["正常", "报警", "离线"],
       deviceTypeArr: [1, 2, 3],
       czList: [
         {
-          companyName: "河北泽宏股份调压箱",
+          companyName: "紫竹苑20号西墙",
           state: 1,
           a: 25,
           b: 56,
@@ -133,8 +133,8 @@ export default {
           popoVidible: true,
         },
         {
-          companyName: "河北泽宏股份调压箱",
-          state: 2,
+          companyName: "河村小学路口东墙",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -145,8 +145,8 @@ export default {
           popoVidible: false,
         },
         {
-          companyName: "河北泽宏股份调压箱",
-          state: 3,
+          companyName: "天圣华庭9#东墙",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -157,7 +157,7 @@ export default {
           popoVidible: false,
         },
         {
-          companyName: "河北泽宏股份调压箱",
+          companyName: "交通东院3#西墙",
           state: 1,
           a: 25,
           b: 56,
@@ -169,8 +169,8 @@ export default {
           popoVidible: false,
         },
         {
-          companyName: "河北泽宏股份调压箱",
-          state: 2,
+          companyName: "团结小区1#东墙",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -180,8 +180,8 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份调压箱",
-          state: 3,
+          companyName: "博学园西墙",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -191,7 +191,7 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份调压箱",
+          companyName: "健康小区门口南侧",
           state: 1,
           a: 25,
           b: 56,
@@ -202,8 +202,8 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份调压箱",
-          state: 2,
+          companyName: "观澜御景小区正北侧",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -213,8 +213,64 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份调压箱",
-          state: 3,
+          companyName: "中天神韵二期门口",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "金迪家园9#西墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "幸福苑10#楼东侧",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "聚贤居4#东墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "康宁家园3#西墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: true,
+        },
+        {
+          companyName: "康宁家园7#西墙",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -222,9 +278,10 @@ export default {
           e: 56,
           image: "",
           show: true,
+          popoVidible: false,
         },
         {
-          companyName: "河北泽宏股份调压箱",
+          companyName: "冶河花园2#东墙",
           state: 1,
           a: 25,
           b: 56,
@@ -233,10 +290,45 @@ export default {
           e: 56,
           image: "",
           show: true,
+          popoVidible: false,
         },
         {
-          companyName: "河北泽宏股份调压箱",
-          state: 2,
+          companyName: "馨和小区门口",
+          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,
+        },
+        {
+          companyName: "滨河雅苑5#东墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "敬业花园15#楼西侧",
+          state: 1,
           a: 25,
           b: 56,
           c: 54,
@@ -246,7 +338,86 @@ export default {
           show: true,
         },
         {
-          companyName: "河北泽宏股份调压箱",
+          companyName: "费城国际2号",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "安居小区阀门井",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "东方明珠阀门井",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "东水碾居民楼阀门井",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "费城国际5号楼",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "时尚花园",
+          state: 3,
+          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: false,
+        },
+        {
+          companyName: "金地城1期",
           state: 3,
           a: 25,
           b: 56,
@@ -255,6 +426,232 @@ export default {
           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: "金辉家园1号楼东墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "金辉庄园8号楼东墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "丽水湾碧水园1号楼东墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "丽水湾金水园17号楼东墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "丽水湾神水园2号楼",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "丽水湾圣水园6号东墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "龙城花园4号楼东墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "茗秀园6井西墙",
+          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: false,
+        },
+        {
+          companyName: "润山花园1号楼东墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+          popoVidible: false,
+        },
+        {
+          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,
+        },
+        {
+          companyName: "胜佛新村4号楼",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "胜佛新村5号楼",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "书香苑5号楼东墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "音韵国际1号楼东墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "中天神韵二期3号楼东墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "紫园小区1号楼西墙",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
+        },
+        {
+          companyName: "费城国际8号",
+          state: 1,
+          a: 25,
+          b: 56,
+          c: 54,
+          d: 15,
+          e: 56,
+          image: "",
+          show: true,
         },
       ],
       stateType: {
@@ -383,6 +780,8 @@ $active: #06d7b1 !important;
   width: 100%;
   flex-wrap: wrap;
   margin-left: 35px;
+  justify-content: flex-start;
+
 
   &.start {
     // justify-content: flex-start;
@@ -464,4 +863,4 @@ $active: #06d7b1 !important;
 .paddingnone {
   padding: 0;
 }
-</style>
\ No newline at end of file
+</style>

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>
\ No newline at end of file
+</style>

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-05-05 11:16:06
  * @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
@@ -22,10 +22,14 @@
     </div>
     <div class="num-wrapper">
       <div class="left">
-        <span class="text">隐患总数</span><span class="num">12</span>件
+        <span class="text">{{ textData[0].text }}</span
+        ><span class="num">{{ textData[0].num }}</span
+        >{{ textData[0].unit }}
       </div>
       <div class="right">
-        <span class="text">已整改</span><span class="num">10</span>件
+        <span class="text">{{ textData[1].text }}</span
+        ><span class="num">{{ textData[1].num }}</span
+        >{{ textData[1].unit }}
       </div>
     </div>
 
@@ -48,9 +52,13 @@ export default {
       btnArr: ["隐患处置", "事故数量"],
       btnV: 0,
       options: null,
+      textData: [
+        { text: "隐患总数", num: 192, unit: "件" },
+        { text: "已整改", num: 182, unit: "件" },
+      ],
       charData: [
         [10, 30, 10, 20, 30, 10, 30, 10, 30, 50, 10, 20],
-        [10, 20, 30, 40, 50, 10, 20, 30, 40, 50, 10, 20],
+        [10, 20, 5, 10, 20, 10, 30, 10, 20, 40, 7, 20],
       ],
     };
   },
@@ -64,12 +72,36 @@ export default {
       if (index === 0) {
         this.charData = [
           [10, 30, 10, 20, 30, 10, 30, 10, 30, 50, 10, 20],
-          [10, 20, 30, 40, 50, 10, 20, 30, 40, 50, 10, 20],
+          [10, 20, 5, 10, 20, 10, 30, 10, 20, 40, 7, 20],
+        ];
+        const num1 = this.charData[0].reduce(function (prev, cur, index, arr) {
+          return prev + cur;
+        }, 0);
+        const num2 = this.charData[1].reduce(function (prev, cur, index, arr) {
+          return prev + cur;
+        }, 0);
+        // 更改按钮下的文字
+        this.textData = [
+          { text: "隐患总数", num: num1, unit: "件" },
+          { text: "已整改", num: num2, unit: "件" },
         ];
       } else {
         this.charData = [
           [20, 10, 20, 30, 20, 40, 10, 20, 20, 10, 30, 60],
-          [20, 30, 10, 20, 30, 20, 10, 30, 40, 40, 20, 20],
+          [2, 1, 3, 1, 2, 3, 1, 1, 1, 1, 1, 1],
+        ];
+
+        const num1 = this.charData[0].reduce(function (prev, cur, index, arr) {
+          return prev + cur;
+        }, 0);
+        const num2 = this.charData[1].reduce(function (prev, cur, index, arr) {
+          return prev + cur;
+        }, 0);
+
+        // 更改按钮下的文字
+        this.textData = [
+          { text: "事故数量", num: num1, unit: "件" },
+          { text: "伤亡人数", num: num2, unit: "人" },
         ];
       }
       this.bottomOptions();
@@ -79,6 +111,14 @@ export default {
       this.options = {
         color: colors,
         tooltip: {
+          // show:false,
+          // formatter: "{a}: {c}(件)",
+          formatter: (parm) => {
+            console.log(parm);
+            return `${parm.seriesName}：${parm.value}(${
+              this.textData[parm.seriesIndex].unit
+            })`;
+          },
           // trigger: "axis",
           // axisPointer: {
           //   type: "cross",
@@ -140,11 +180,12 @@ export default {
             },
             min: 0,
             max: 60,
+            max: Math.max.apply(null, this.charData[0]) + 10,
           },
         ],
         series: [
           {
-            name: "Evaporation",
+            name: this.textData[0].text,
             type: "bar",
             data: this.charData[0],
             yAxisIndex: 0,
@@ -158,7 +199,7 @@ export default {
             barGap: "0%",
           },
           {
-            name: "Temperature",
+            name: this.textData[1].text,
             type: "bar",
             data: this.charData[1],
             yAxisIndex: 0,
@@ -186,7 +227,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-05-05 11:36:25
  * @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
 -->
 <template>
   <div class="chars-box all-flex-h">
-    <div class="title">燃气事故排名</div>
+    <div class="title">隐患/事故排名</div>
     <div class="btn-wrapper">
       <div
         v-for="(item, index) in btnArr"
@@ -48,23 +48,157 @@ export default {
       btnArr: ["隐患处置", "事故数量"],
       btnV: 0,
       options: null,
-      charData: [[50, 40, 20, 40, 10, 10, 30, 10, 30, 50]],
+      // charData: [50, 40, 20, 40, 10, 10, 30, 10, 30, 50],
+      // xData:['营里乡', '下槐镇', '宅北乡', '合河口乡', '蛟潭庄镇', '孟家庄镇', '苏家庄乡', '东王坡乡', '上观音堂乡', '杨家桥乡'],
+      arr: [
+        {
+          name: "营里乡",
+          value: 50,
+        },
+        {
+          name: "下槐镇",
+          value: 40,
+        },
+        {
+          name: "宅北乡",
+          value: 20,
+        },
+        {
+          name: "合河口乡",
+          value: 40,
+        },
+        {
+          name: "蛟潭庄镇",
+          value: 10,
+        },
+        {
+          name: "孟家庄镇",
+          value: 10,
+        },
+        {
+          name: "苏家庄乡",
+          value: 30,
+        },
+        {
+          name: "东王坡乡",
+          value: 10,
+        },
+        {
+          name: "上观音堂乡",
+          value: 30,
+        },
+        {
+          name: "杨家桥乡",
+          value: 50,
+        },
+      ],
     };
   },
+  computed: {},
   mounted() {
     this.bottomOptions();
   },
+  computed: {
+    charsArr() {
+      return (this.arr = this.arr.sort((a, b) => {
+        return b.value - a.value;
+      }));
+    },
+  },
   methods: {
     btnClick(index) {
       if (this.btnV == index) return;
       this.btnV = index;
       if (index === 0) {
-        this.charData = [[50, 40, 20, 40, 10, 10, 30, 10, 30, 50]];
+        this.arr = [
+          {
+            name: "营里乡",
+            value: 50,
+          },
+          {
+            name: "下槐镇",
+            value: 40,
+          },
+          {
+            name: "宅北乡",
+            value: 20,
+          },
+          {
+            name: "合河口乡",
+            value: 40,
+          },
+          {
+            name: "蛟潭庄镇",
+            value: 10,
+          },
+          {
+            name: "孟家庄镇",
+            value: 10,
+          },
+          {
+            name: "苏家庄乡",
+            value: 30,
+          },
+          {
+            name: "东王坡乡",
+            value: 10,
+          },
+          {
+            name: "上观音堂乡",
+            value: 30,
+          },
+          {
+            name: "杨家桥乡",
+            value: 50,
+          },
+        ];
       } else {
-        this.charData = [[20, 10, 40, 30, 20, 20, 20, 10, 20, 10]];
+        this.arr = [
+          {
+            name: "营里乡",
+            value: 50,
+          },
+          {
+            name: "下槐镇",
+            value: 40,
+          },
+          {
+            name: "宅北乡",
+            value: 20,
+          },
+          {
+            name: "合河口乡",
+            value: 40,
+          },
+          {
+            name: "蛟潭庄镇",
+            value: 10,
+          },
+          {
+            name: "孟家庄镇",
+            value: 10,
+          },
+          {
+            name: "苏家庄乡",
+            value: 10,
+          },
+          {
+            name: "东王坡乡",
+            value: 20,
+          },
+          {
+            name: "上观音堂乡",
+            value: 30,
+          },
+          {
+            name: "杨家桥乡",
+            value: 20,
+          },
+        ];
       }
       this.bottomOptions();
     },
+
     bottomOptions() {
       const colors = ["#1890FF"];
       this.options = {
@@ -74,6 +208,7 @@ export default {
           // axisPointer: {
           //   type: "cross",
           // },
+          formatter: "{b}: {c}(个)",
         },
         grid: {
           top: "30",
@@ -105,9 +240,9 @@ export default {
               color: "#333",
               // },
             },
-
+            max:"dataMax",
             // prettier-ignore
-            data: ['营里乡', '下槐镇', '宅北乡', '合河口乡', '蛟潭庄镇', '孟家庄镇', '苏家庄乡', '东王坡乡', '上观音堂乡', '杨家桥乡'],
+            data: this.charsArr.map(item=>item.name),
           },
         ],
         yAxis: [
@@ -135,14 +270,14 @@ export default {
               // },
             },
             min: 0,
-            max: 60,
+            max: "dataMax"
           },
         ],
         series: [
           {
             name: "Evaporation",
             type: "bar",
-            data: this.charData[0],
+            data: this.charsArr.map((item) => item.value),
             yAxisIndex: 0,
             itemStyle: {
               color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -168,7 +303,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/Scound.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-19 10:17:05
- * @LastEditTime: 2022-04-21 17:24:15
+ * @LastEditTime: 2022-05-05 10:40:44
  * @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/Scound.vue
@@ -13,7 +13,7 @@
       <div class="left ">
         <div class="top ">{{ left.text }}</div>
         <div class="bottom">
-          <div class="number" v-for="item in left.numArr" :key="item">
+          <div class="number" v-for="item in left.numArr" :key="item.text">
             {{ item }}
           </div>
           <div class="unit">{{ left.unit }}</div>
@@ -22,7 +22,7 @@
       <div class="right">
         <div class="top">{{ right.text }}</div>
         <div class="bottom">
-          <div class="number" v-for="item in right.numArr" :key="item">
+          <div class="number" v-for="item in right.numArr" :key="item.text">
             {{ item }}
           </div>
           <div class="unit">{{ right.unit }}</div>
@@ -43,7 +43,7 @@ export default {
       type: Object,
       default: () => ({
         text: "驻村安全员",
-        numArr: [1, 2],
+        numArr: "397",
         unit: "名",
       }),
     },
@@ -51,7 +51,7 @@ export default {
       type: Object,
       default: () => ({
         text: "燃气协管员",
-        numArr: [1, 9],
+        numArr: "472",
         unit: "名",
       }),
     },

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

 <!--
  * @Author: your name
  * @Date: 2022-04-18 18:00:22
- * @LastEditTime: 2022-04-19 17:20:50
+ * @LastEditTime: 2022-05-05 10:38:23
  * @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.vue
@@ -40,12 +40,12 @@ export default {
       two: {
         left: {
           text: "电代煤",
-          numArr: [1,8],
+          numArr: "442",
           unit: "个",
         },
         right:{
           text: "气代煤",
-          numArr: [1, 6],
+          numArr: "393",
           unit: "个",
         }
       },

gassafetyprogress-web/src/views/statistic/overview/conponents/Middle/CharBoxE.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-21 09:47:01
- * @LastEditTime: 2022-04-21 16:56:49
+ * @LastEditTime: 2022-04-24 09:29:53
  * @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/Middle/CharBoxE.vue
@@ -15,12 +15,11 @@
 <script>
 import Chars from "@/components/allCharsCom/Chars";
 import Infowindow from "./Infowindow";
-
+import { pingshanArr } from "@/utils/echarsMap/pingshan";
 import axios from "axios";
 const data = [
   {
-    name: "中西区",
-    value: 20057.34,
+    name: "古月镇",
     index: 0,
     a: 1,
     b: 1,
@@ -33,8 +32,7 @@ const data = [
     i: "1/2",
   },
   {
-    name: "湾仔",
-    value: 15477.48,
+    name: "西柏坡镇",
     index: 1,
     a: 2,
     b: 2,
@@ -47,8 +45,7 @@ const data = [
     i: "2/3",
   },
   {
-    name: "东区",
-    value: 31686.1,
+    name: "温塘镇",
     index: 2,
     a: 3,
     b: 3,
@@ -61,8 +58,7 @@ const data = [
     i: "3/4",
   },
   {
-    name: "南区",
-    value: 6992.6,
+    name: "平山镇",
     index: 3,
     a: 4,
     b: 4,
@@ -75,8 +71,7 @@ const data = [
     i: "4/5",
   },
   {
-    name: "油尖旺",
-    value: 44045.49,
+    name: "东回舍镇",
     index: 4,
     a: 5,
     b: 5,
@@ -89,8 +84,7 @@ const data = [
     i: "5/6",
   },
   {
-    name: "深水埗",
-    value: 40689.64,
+    name: "西大吴乡",
     index: 5,
     a: 6,
     b: 6,
@@ -103,8 +97,7 @@ const data = [
     i: "6/7",
   },
   {
-    name: "九龙城",
-    value: 37659.78,
+    name: "岗南镇",
     index: 6,
     a: 7,
     b: 7,
@@ -117,8 +110,7 @@ const data = [
     i: "7/8",
   },
   {
-    name: "黄大仙",
-    value: 45180.97,
+    name: "杨家桥乡",
     index: 7,
     a: 8,
     b: 8,
@@ -131,8 +123,7 @@ const data = [
     i: "8/9",
   },
   {
-    name: "观塘",
-    value: 55204.26,
+    name: "下口镇",
     index: 8,
     a: 9,
     b: 9,
@@ -145,8 +136,7 @@ const data = [
     i: "9/10",
   },
   {
-    name: "葵青",
-    value: 21900.9,
+    name: "北冶乡",
     index: 9,
     a: 10,
     b: 10,
@@ -159,8 +149,7 @@ const data = [
     i: "10/11",
   },
   {
-    name: "荃湾",
-    value: 4918.26,
+    name: "小觉镇",
     index: 10,
     a: 11,
     b: 11,
@@ -173,8 +162,7 @@ const data = [
     i: "11/12",
   },
   {
-    name: "屯门",
-    value: 5881.84,
+    name: "下槐镇",
     index: 11,
     a: 12,
     b: 12,
@@ -187,8 +175,7 @@ const data = [
     i: "12/13",
   },
   {
-    name: "元朗",
-    value: 4178.01,
+    name: "上三汲乡",
     index: 12,
     a: 13,
     b: 13,
@@ -201,8 +188,7 @@ const data = [
     i: "13/14",
   },
   {
-    name: "北区",
-    value: 2227.92,
+    name: "两河乡",
     index: 13,
     a: 14,
     b: 14,
@@ -215,8 +201,7 @@ const data = [
     i: "14/15",
   },
   {
-    name: "大埔",
-    value: 2180.98,
+    name: "南甸镇",
     index: 14,
     a: 15,
     b: 15,
@@ -229,8 +214,7 @@ const data = [
     i: "15/16",
   },
   {
-    name: "沙田",
-    value: 9172.94,
+    name: "东王坡乡",
     index: 15,
     a: 16,
     b: 16,
@@ -243,8 +227,7 @@ const data = [
     i: "16/17",
   },
   {
-    name: "西贡",
-    value: 3368,
+    name: "苏家庄乡",
     index: 16,
     a: 17,
     b: 17,
@@ -257,8 +240,7 @@ const data = [
     i: "17/18",
   },
   {
-    name: "离岛",
-    value: 806.98,
+    name: "合河口乡",
     index: 17,
     a: 18,
     b: 18,
@@ -270,6 +252,71 @@ const data = [
     h: "18/19",
     i: "18/19",
   },
+  {
+    name: "蛟潭庄镇",
+    index: 18,
+    a: 19,
+    b: 19,
+    c: 19,
+    d: 19,
+    e: 19,
+    f: 19,
+    g: "19/20",
+    h: "19/20",
+    i: "19/20",
+  },
+  {
+    name: "上观音堂乡",
+    index: 19,
+    a: 20,
+    b: 20,
+    c: 20,
+    d: 20,
+    e: 20,
+    f: 20,
+    g: "20/21",
+    h: "20/21",
+    i: "20/21",
+  },
+  {
+    name: "营里乡",
+    index: 20,
+    a: 21,
+    b: 21,
+    c: 21,
+    d: 21,
+    e: 21,
+    f: 21,
+    g: "21/22",
+    h: "21/22",
+    i: "21/22",
+  },
+  {
+    name: "孟家庄乡",
+    index: 21,
+    a: 22,
+    b: 22,
+    c: 22,
+    d: 22,
+    e: 22,
+    f: 22,
+    g: "22/23",
+    h: "22/23",
+    i: "22/23",
+  },
+  {
+    name: "宅北乡",
+    index: 22,
+    a: 23,
+    b: 23,
+    c: 23,
+    d: 23,
+    e: 23,
+    f: 23,
+    g: "23/24",
+    h: "23/24",
+    i: "23/24",
+  },
 ];
 
 export default {
@@ -294,10 +341,11 @@ export default {
   },
   methods: {
     async getPath() {
-      const res = await axios(
-        "https://cdn.jsdelivr.net/gh/apache/echarts-website@asf-site/examples/data/asset/geo/HK.json"
-      );
-      const geoJson = res.data;
+      // const res = await axios(
+      //   "https://cdn.jsdelivr.net/gh/apache/echarts-website@asf-site/examples/data/asset/geo/HK.json"
+      // );
+      const geoJson = { features: pingshanArr, type: "FeatureCollection" };
+      console.log(geoJson);
       this.$echarts.registerMap("HK", geoJson);
       this.options = {
         roam: true,
@@ -308,7 +356,7 @@ export default {
           // alwaysShowContent: true,
           // transitionDuration:0,
           formatter: (p) => {
-            console.log("p",p)
+            console.log("p", p);
             const dom = this.createDom(p.data, this);
             return dom;
           },
@@ -365,26 +413,26 @@ export default {
             },
             data,
             // 自定义名称映射
-            nameMap: {
-              "Central and Western": "中西区",
-              Eastern: "东区",
-              Islands: "离岛",
-              "Kowloon City": "九龙城",
-              "Kwai Tsing": "葵青",
-              "Kwun Tong": "观塘",
-              North: "北区",
-              "Sai Kung": "西贡",
-              "Sha Tin": "沙田",
-              "Sham Shui Po": "深水埗",
-              Southern: "南区",
-              "Tai Po": "大埔",
-              "Tsuen Wan": "荃湾",
-              "Tuen Mun": "屯门",
-              "Wan Chai": "湾仔",
-              "Wong Tai Sin": "黄大仙",
-              "Yau Tsim Mong": "油尖旺",
-              "Yuen Long": "元朗",
-            },
+            // nameMap: {
+            //   "Central and Western": "中西区",
+            //   Eastern: "东区",
+            //   Islands: "离岛",
+            //   "Kowloon City": "九龙城",
+            //   "Kwai Tsing": "葵青",
+            //   "Kwun Tong": "观塘",
+            //   North: "北区",
+            //   "Sai Kung": "西贡",
+            //   "Sha Tin": "沙田",
+            //   "Sham Shui Po": "深水埗",
+            //   Southern: "南区",
+            //   "Tai Po": "大埔",
+            //   "Tsuen Wan": "荃湾",
+            //   "Tuen Mun": "屯门",
+            //   "Wan Chai": "湾仔",
+            //   "Wong Tai Sin": "黄大仙",
+            //   "Yau Tsim Mong": "油尖旺",
+            //   "Yuen Long": "元朗",
+            // },
           },
         ],
       };

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-05-05 13:45:13
  * @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
 -->
 <template>
   <div class="chars-box all-flex-h">
-    <div class="title">燃气事故排名</div>
+    <div class="title">燃气事故占比</div>
     <div class="btn-wrapper">
       <div
         v-for="(item, index) in btnArr"
@@ -66,29 +66,33 @@ export default {
       this.btnV = index;
       if (index === 2) {
         this.bottomData = [
-          { name: "裂缝", value: 10, color: "#604AFF" },
-          { name: "管道称重", value: 20, color: "#FFC337" },
-          { name: "其他", value: 100, color: "#86FF5B" },
-          { name: "腐蚀", value: 99, color: "#03C4F1" },
-          { name: "漏气", value: 18, color: "#1F8DF3" },
+          { name: "安检", value: 20, color: "#604AFF" },
+          { name: "巡检", value: 30, color: "#FFC337" },
+          { name: "专项检查", value: 40, color: "#86FF5B" },
+          { name: "大排查整治", value: 99, color: "#03C4F1" },
+          { name: "工程事故隐患", value: 18, color: "#1F8DF3" },
+          { name: "其他", value: 18, color: "pink" },
         ];
       } else if (index === 1) {
+        // 居民用气、工商用气、场站、加气站
         this.bottomData = [
-          { name: "裂缝", value: 40, color: "#604AFF" },
-          { name: "管道称重", value: 30, color: "#FFC337" },
-          { name: "其他", value: 20, color: "#86FF5B" },
-          { name: "腐蚀", value: 19, color: "#03C4F1" },
-          { name: "漏气", value: 50, color: "#1F8DF3" },
+          { name: "居民用气", value: 40, color: "#604AFF" },
+          { name: "工商用气", value: 30, color: "#FFC337" },
+          { name: "场站", value: 20, color: "#86FF5B" },
+          { name: "加气站", value: 19, color: "#03C4F1" },
         ];
       } else {
         this.bottomData = [
-          { name: "裂缝", value: 20, color: "#604AFF" },
-          { name: "管道称重", value: 30, color: "#FFC337" },
-          { name: "其他", value: 40, color: "#86FF5B" },
+          { name: "裂缝", value: 10, color: "#604AFF" },
+          { name: "管道称重", value: 20, color: "#FFC337" },
+          { name: "其他", value: 100, color: "#86FF5B" },
           { name: "腐蚀", value: 99, color: "#03C4F1" },
           { name: "漏气", value: 18, color: "#1F8DF3" },
         ];
       }
+      // this.bottomData.sort((a,b)=>{
+      //   return Math.random()-0.5
+      // })
       this.bottomOptions();
     },
     bottomOptions() {
@@ -102,6 +106,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 +125,7 @@ export default {
             borderRadius: 10,
             borderColor: "#fff",
           },
+
           label: {
             alignTo: "edge",
             // formatter: "{name|{b}}\n{num|{c} 个}",
@@ -145,7 +158,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-05-05 11:46:58
  * @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
 -->
 <template>
   <div class="chars-box all-flex-h">
-    <div class="title">隐患处理和事故数量</div>
+    <div class="title">隐患、事故趋势</div>
     <div class="btn-wrapper">
       <!-- <div @click="btnClick(0)">燃气事故</div> -->
       <div
@@ -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;
       }
     }
   }

gassafetyprogress-web/src/views/statistic/overview/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-18 17:21:51
- * @LastEditTime: 2022-04-19 10:08:56
+ * @LastEditTime: 2022-05-05 10:36:25
  * @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/index.vue
@@ -11,8 +11,8 @@
     <div class="left">
       <Left />
     </div>
-    <div class="middle"><Middle/></div>
-    <div class="right"><Right/></div>
+    <div class="middle"><Middle /></div>
+    <div class="right"><Right /></div>
   </div>
 </template>
 
@@ -24,7 +24,7 @@ export default {
   components: {
     Left,
     Right,
-    Middle
+    Middle,
   },
 };
 </script>
@@ -34,16 +34,16 @@ export default {
   width: 100%;
   height: calc(100vh - 50px) !important;
   > div {
-    flex:1;
+    flex: 1;
     // background-color: red;
     height: 100%;
-    margin-right:3px;
+    margin-right: 3px;
     &.middle {
       width: 40%;
-      flex:none;
+      flex: none;
       // background-color: blue;
     }
-    &.right{
+    &.right {
       margin-right: 0px;
     }
   }