Merge remote-tracking branch 'origin/master'

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

@@ -38,7 +38,7 @@ public class PipeInterfaceController {
                 //判断如果名称一样就一组
                 if (pipeDatesGroup.get(i).getPowerCompany().equals(pipeDates.get(n).getPowerCompany())){
 //                    //设置分组类型
-                    pipeDates.get(n).setCompanyType(Integer.parseInt(pipeDates.get(n).getPipeId()));
+//                    pipeDates.get(n).setCompanyType(Integer.parseInt(pipeDates.get(n).getPipeId()));
                     pipeDates.get(n).setIconType(1);
                 }
             }
@@ -108,13 +108,15 @@ public class PipeInterfaceController {
      */
     @RequestBody
     @RequestMapping("/selectTdetectorUser")
-    public List<TdetectorUserData> selectTdetectorUser(){
+    public TenterpriseInfoDataList selectTdetectorUser(){
+        TenterpriseInfoDataList tenterpriseInfoDataList=new TenterpriseInfoDataList();
        //燃气用户信息查询方法
         List<TdetectorUserData> tdetectorUserData = iPipeInterfaceService.selectTdetectorUser();
         for (int i=0;i<tdetectorUserData.size();i++){
             tdetectorUserData.get(i).setIconType(6);
         }
-        return tdetectorUserData;
+        tenterpriseInfoDataList.setData(tdetectorUserData);
+        return tenterpriseInfoDataList;
     }
 
     /**
@@ -133,13 +135,15 @@ public class PipeInterfaceController {
      */
     @RequestBody
     @RequestMapping("/selectvalveData")
-    public List<PipeDate> selectvalveData(){
+    public DeviceDataList selectvalveData(){
+        DeviceDataList deviceDataList=new DeviceDataList();
         //查询阀门井数据
-        List<PipeDate> pipeDates = iPipeInterfaceService.selectvalveData();
+        List<DeviceData> pipeDates = iPipeInterfaceService.selectvalveData();
         for (int i=0;i<pipeDates.size();i++){
             pipeDates.get(i).setIconType(3);
         }
-        return pipeDates;
+        deviceDataList.setData(pipeDates);
+        return deviceDataList;
     }
 
 }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/DeviceDataList.java

+package com.zehong.system.domain;
+
+import java.util.List;
+
+public class DeviceDataList {
+
+
+    private List<DeviceData> data;
+
+    public List<DeviceData> getData() {
+        return data;
+    }
+
+    public void setData(List<DeviceData> data) {
+        this.data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "DeviceDataList{" +
+                "data=" + data +
+                '}';
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/PipeDate.java

@@ -43,6 +43,8 @@ public class PipeDate extends BaseEntity {
 
     private int iconType;
 
+
+
     public String getPipeId() {
         return pipeId;
     }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TPipeInfo.java

@@ -25,11 +25,11 @@ public class TPipeInfo extends BaseEntity
 
     /** 管径 */
     @Excel(name = "管径")
-    private BigDecimal pipeDiameter;
+    private String pipeDiameter;
 
     /** 压力 */
     @Excel(name = "压力")
-    private BigDecimal pipePressure;
+    private String pipePressure;
 
     /** 材质 */
     @Excel(name = "材质")
@@ -41,7 +41,7 @@ public class TPipeInfo extends BaseEntity
 
     /** 埋深 */
     @Excel(name = "埋深")
-    private BigDecimal buriedDepth;
+    private String buriedDepth;
 
     /** 走向 */
     @Excel(name = "走向")
@@ -103,55 +103,50 @@ public class TPipeInfo extends BaseEntity
         this.pipeLength = pipeLength;
     }
 
-    public BigDecimal getPipeLength()
-    {
+    public BigDecimal getPipeLength() {
         return pipeLength;
     }
-    public void setPipeDiameter(BigDecimal pipeDiameter)
-    {
-        this.pipeDiameter = pipeDiameter;
-    }
 
-    public BigDecimal getPipeDiameter()
-    {
+    public String getPipeDiameter() {
         return pipeDiameter;
     }
-    public void setPipePressure(BigDecimal pipePressure)
-    {
-        this.pipePressure = pipePressure;
+
+    public void setPipeDiameter(String pipeDiameter) {
+        this.pipeDiameter = pipeDiameter;
     }
 
-    public BigDecimal getPipePressure()
-    {
+    public String getPipePressure() {
         return pipePressure;
     }
-    public void setPipeMaterial(String pipeMaterial)
-    {
-        this.pipeMaterial = pipeMaterial;
+
+    public void setPipePressure(String pipePressure) {
+        this.pipePressure = pipePressure;
     }
 
-    public String getPipeMaterial()
-    {
+    public String getPipeMaterial() {
         return pipeMaterial;
     }
-    public void setPipeAddr(String pipeAddr)
-    {
-        this.pipeAddr = pipeAddr;
+
+    public void setPipeMaterial(String pipeMaterial) {
+        this.pipeMaterial = pipeMaterial;
     }
 
-    public String getPipeAddr()
-    {
+    public String getPipeAddr() {
         return pipeAddr;
     }
-    public void setBuriedDepth(BigDecimal buriedDepth)
-    {
-        this.buriedDepth = buriedDepth;
+
+    public void setPipeAddr(String pipeAddr) {
+        this.pipeAddr = pipeAddr;
     }
 
-    public BigDecimal getBuriedDepth()
-    {
+    public String getBuriedDepth() {
         return buriedDepth;
     }
+
+    public void setBuriedDepth(String buriedDepth) {
+        this.buriedDepth = buriedDepth;
+    }
+
     public void setPipeTrend(String pipeTrend)
     {
         this.pipeTrend = pipeTrend;

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TSiteStationInfoData.java

@@ -28,6 +28,16 @@ public class TSiteStationInfoData {
 
     private int iconType;
 
+    private String companyType;
+
+    public String getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(String companyType) {
+        this.companyType = companyType;
+    }
+
     public int getIconType() {
         return iconType;
     }
@@ -139,6 +149,7 @@ public class TSiteStationInfoData {
                 ", powerCompany='" + powerCompany + '\'' +
                 ", pressureFlows=" + pressureFlows +
                 ", iconType=" + iconType +
+                ", companyType='" + companyType + '\'' +
                 '}';
     }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TenterpriseInfoDataList.java

+package com.zehong.system.domain;
+
+import java.util.List;
+
+public class TenterpriseInfoDataList {
+
+    private List<TdetectorUserData> data;
+
+    public List<TdetectorUserData> getData() {
+        return data;
+    }
+
+    public void setData(List<TdetectorUserData> data) {
+        this.data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "TenterpriseInfoDataList{" +
+                "data=" + data +
+                '}';
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/PipeInterfaceMapper.java

@@ -71,5 +71,5 @@ public interface PipeInterfaceMapper {
      * 查询阀门井数据
      * @return
      */
-    List<PipeDate> selectvalveData();
+    List<DeviceData> selectvalveData();
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/IPipeInterfaceService.java

@@ -68,5 +68,5 @@ public interface IPipeInterfaceService {
      * 查询阀门井数据
      * @return
      */
-    List<PipeDate> selectvalveData();
+    List<DeviceData> selectvalveData();
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/PipeInterfaceServiceImpl.java

@@ -112,8 +112,8 @@ public class PipeInterfaceServiceImpl implements IPipeInterfaceService {
      * @return
      */
     @Override
-    public List<PipeDate> selectvalveData() {
-        List<PipeDate> pipeDates = pipeInterfaceMapper.selectvalveData();
+    public List<DeviceData> selectvalveData() {
+        List<DeviceData> pipeDates = pipeInterfaceMapper.selectvalveData();
         return pipeDates;
     }
 }

gassafetyprogress-system/src/main/resources/mapper/system/PipeInterfaceMapper.xml

@@ -15,6 +15,7 @@
         <result property="path"   column="coordinates"   />
         <result property="buildCompany"   column="build_unit"   />
         <result property="powerCompany"   column="beyond_enterprise_name"   />
+        <result property="companyType"   column="beyond_enterprise_id"   />
     </resultMap>
 
     <!--调压箱-->
@@ -28,6 +29,7 @@
         <result property="latitude"   column="latitude"   />
         <result property="companyType"   column="device_id"   />
         <result property="beyondEnterpriseName"   column="beyond_enterprise_name"   />
+        <result property="companyType"   column="beyond_enterprise_id"   />
     </resultMap>
 
     <!--下级设备数据-->
@@ -48,6 +50,7 @@
         <result property="buildyear"   column="create_time"   />
         <result property="buildCompany"   column="build_unit"   />
         <result property="powerCompany"   column="beyond_enterprise_name"   />
+        <result property="companyType"   column="beyond_enterprise_id"   />
     </resultMap>
 
     <!--监控数据-->
@@ -60,6 +63,7 @@
         <result property="latitude"   column="latitude"   />
         <result property="videoAddress"   column="video_address"   />
         <result property="type"   column="type"   />
+        <result property="companyType"   column="beyond_enterprise_id"   />
     </resultMap>
 
     <!--燃气用户数据-->
@@ -70,7 +74,6 @@
         <result property="latitude"   column="latitude"   />
         <result property="phone"   column="phone"   />
         <result property="address"   column="address"   />
-        <result property="companyType"   column="user_id"   />
     </resultMap>
 
     <!--查询企业名称id-->
@@ -81,20 +84,20 @@
 
     <!--查询管道数据列表-->
     <select id="selectPipeData" parameterType="PipeDate" resultMap="PipeDateResult">
-        select pipe_id,pipe_diameter,pipe_material,buried_depth,pipe_trend,build_date,pipe_addr,coordinates,remarks,build_unit,beyond_enterprise_name from t_pipe_info
+        select beyond_enterprise_id,pipe_id,pipe_diameter,pipe_material,buried_depth,pipe_trend,build_date,pipe_addr,coordinates,remarks,build_unit,beyond_enterprise_name from t_pipe_info
         where is_del='0'
     </select>
 
     <!--获取分组数据-->
     <select id="selectGroupPipeData" parameterType="PipeDate" resultMap="PipeDateResult">
-        select pipe_id,pipe_diameter,pipe_material,buried_depth,pipe_trend,build_date,pipe_addr,coordinates,remarks,build_unit,beyond_enterprise_name from t_pipe_info
+        select beyond_enterprise_id,pipe_id,pipe_diameter,pipe_material,buried_depth,pipe_trend,build_date,pipe_addr,coordinates,remarks,build_unit,beyond_enterprise_name from t_pipe_info
         where is_del='0'
 		group by beyond_enterprise_name
     </select>
 
     <!--调压箱数据查询方法-->
     <select id="selectDeviceData" resultMap="DeviceDateResult">
-       select device_id,device_type,device_name,device_code,device_addr,longitude,latitude,beyond_enterprise_name from t_device_info
+       select beyond_enterprise_id,device_id,device_type,device_name,device_code,device_addr,longitude,latitude,beyond_enterprise_name from t_device_info
        where device_type='2' and is_del='0'
     </select>
 
@@ -106,7 +109,7 @@
 
     <!--场站信息查询方法-->
     <select id="selectTSiteStationInfoData" resultMap="TSiteStationInfoDataResult">
-       select site_station_id,site_station_name,site_station_type,longitude,latitude,create_time,build_unit,beyond_enterprise_name
+       select beyond_enterprise_id,site_station_id,site_station_name,site_station_type,longitude,latitude,create_time,build_unit,beyond_enterprise_name
        from t_site_station_info where is_del='0'
     </select>
 
@@ -118,13 +121,13 @@
 
     <!--监控信息查询-->
     <select id="selectTvideoManagerData" resultMap="TvideoManagerDataResult">
-        select video_manager_id,video_name,resource_id,longitude,latitude,video_address,type from  t_video_manager
+        select beyond_enterprise_id,video_manager_id,video_name,resource_id,longitude,latitude,video_address,type from  t_video_manager
         where is_del='0'
     </select>
 
     <!--燃气用户信息查询接口-->
     <select id="selectTdetectorUser"  resultMap="TdetectorUserDataResult">
-        select nick_name,user_type,longitude,latitude,phone,address,user_id from t_detector_user
+        select nick_name,user_type,longitude,latitude,phone,address from t_detector_user
         where is_del='0'
     </select>
 
@@ -135,7 +138,7 @@
 
     <!--查询阀门井数据-->
     <select id="selectvalveData" resultMap="DeviceDateResult">
-       select device_id,device_type,device_name,device_code,device_addr,longitude,latitude,beyond_enterprise_name from t_device_info
+       select beyond_enterprise_id,device_id,device_type,device_name,device_code,device_addr,longitude,latitude,beyond_enterprise_name from t_device_info
        where device_type='1' and is_del='0'
     </select>
 

gassafetyprogress-web/src/api/bigWindow/getDevice.js

+/*
+ * @Author: your name
+ * @Date: 2022-02-23 15:28:07
+ * @LastEditTime: 2022-02-25 18:43:58
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /newDev/gassafety-progress/gassafetyprogress-web/src/api/bigWindow/getdevice.js
+ */
+import request from '@/utils/request'
+
+// 查询管道
+export function getPipe(query) {
+  return request({
+    url: '/pipe/pipe/selectPipeData',
+    method: 'get',
+    params: query
+  })
+}
+
+// 调压箱
+export function getTyx(query) {
+  return request({
+    url: '/pipe/pipe/selectDeviceData',
+    method: 'get',
+    params: query
+  })
+}
+
+// 是阀门
+export function getFm(query) {
+  return request({
+    url: '/pipe/pipe/selectvalveData',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 厂站
+export function getCz(query) {
+  return request({
+    url: '/pipe/pipe/selectTSiteStationInfoData',
+    method: 'get',
+    params: query
+  })
+}
+// 监控
+export function getVideo(query) {
+  return request({
+    url: '/pipe/pipe/selectTvideoManagerData',
+    method: 'get',
+    params: query
+  })
+}
+// 燃气用户接口
+export function getUser(query) {
+  return request({
+    url: '/pipe/pipe/selectTdetectorUser',
+    method: 'get',
+    params: query
+  })
+}
+// 获取公司名称以及id
+export function getCompany(query) {
+  return request({
+    url: '/pipe/pipe/selectTenterpriseInfoData',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

gassafetyprogress-web/src/assets/image/changzhan1.svg

+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6552 9.77278C16.6552 12.9211 14.103 15.4733 10.9547 15.4733C7.80636 15.4733 5.25415 12.9211 5.25415 9.77278C5.25415 6.62447 7.80636 4.07227 10.9547 4.07227C14.103 4.07227 16.6552 6.62447 16.6552 9.77278ZM10.867 11.2506H11.324V13.098H10.867V11.2506ZM9.84612 11.2506H10.3032V13.098H9.84612V11.2506ZM13.7726 6.71854V12.5548H14.2799V13.0979H11.726V11.0721C11.726 10.9225 11.6011 10.8005 11.4482 10.8005H9.43527C9.2823 10.8005 9.15705 10.9228 9.15705 11.0721V13.0979H7.62926V12.5544H8.13655V9.16448C8.13763 9.09164 8.16749 9.02218 8.21963 8.97129C8.27176 8.9204 8.34192 8.89223 8.41477 8.89292H10.0619V8.32503C10.0629 8.25212 10.0927 8.18257 10.1448 8.1316C10.197 8.08063 10.2672 8.0524 10.3401 8.0531H11.4035C11.4764 8.0524 11.5466 8.08063 11.5987 8.1316C11.6509 8.18257 11.6807 8.25212 11.6817 8.32503V8.89329H12.1236V6.71891C12.1247 6.64607 12.1545 6.57661 12.2067 6.52572C12.2588 6.47483 12.3289 6.44666 12.4018 6.44735H13.4943C13.5671 6.44666 13.6372 6.47478 13.6894 6.52559C13.7415 6.5764 13.7714 6.64576 13.7726 6.71854ZM9.23907 10.4022H11.6455H11.647V9.8591H9.23907V10.4022Z" fill="#F0C41B"/>
+<path d="M5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.66499 19.2892 8.77248 19.4688C9.14688 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115Z" stroke="#F0C41B"/>
+<g filter="url(#filter0_f_194_268)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#F0C41B"/>
+</g>
+<defs>
+<filter id="filter0_f_194_268" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_194_268"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/image/famen1.svg

+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.66499 19.2892 8.77248 19.4688C9.14688 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115Z" stroke="#FA8167"/>
+<path d="M16.6134 8.94262C16.4134 7.58911 15.7326 6.3525 14.6954 5.45841C13.6581 4.56433 12.3334 4.07236 10.963 4.07227C9.44847 4.07227 7.99596 4.67294 6.92503 5.74214C5.85409 6.81135 5.25244 8.2615 5.25244 9.77359C5.25244 11.2857 5.85409 12.7358 6.92503 13.805C7.99596 14.8742 9.44847 15.4749 10.963 15.4749C12.3334 15.4748 13.6581 14.9828 14.6954 14.0888C15.7326 13.1947 16.4134 11.9581 16.6134 10.6046L16.6551 9.77359L16.6134 8.94262ZM6.58836 9.37325C6.682 8.3553 7.12877 7.40197 7.85151 6.67789C8.57425 5.95381 9.52758 5.50446 10.5468 5.40744V6.27779C9.75838 6.37152 9.02466 6.72811 8.46439 7.28987C7.90413 7.85162 7.55009 8.58567 7.45957 9.37325H6.58836ZM10.5468 14.1399C9.5328 14.0434 8.58385 13.5981 7.8623 12.8802C7.14075 12.1623 6.69144 11.2165 6.59121 10.2044H7.46332C7.5602 10.9858 7.91657 11.7123 8.47551 12.2678C9.03445 12.8233 9.76372 13.1757 10.5468 13.2689V14.1399ZM10.3991 10.0155V11.9119H9.69579V7.62704H12.6225V8.2271H10.3984V9.4153H12.4963V10.0154L10.3991 10.0155ZM11.3792 14.1399V13.2694C12.1623 13.1762 12.8915 12.8238 13.4505 12.2683C14.0094 11.7128 14.3658 10.9863 14.4627 10.2049H15.3348C15.2344 11.2169 14.785 12.1625 14.0635 12.8803C13.3419 13.598 12.3931 14.0434 11.3792 14.1399ZM14.4664 9.37325C14.3759 8.58567 14.0219 7.85162 13.4616 7.28987C12.9013 6.72811 12.1676 6.37152 11.3792 6.27779V5.40744C12.3984 5.5045 13.3517 5.95387 14.0744 6.67794C14.7971 7.40202 15.2438 8.35533 15.3375 9.37325H14.4664Z" fill="#FA8167"/>
+<g filter="url(#filter0_f_194_248)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#FA8167"/>
+</g>
+<defs>
+<filter id="filter0_f_194_248" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_194_248"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/image/jiankong1.svg

+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.9547 15.4733C14.103 15.4733 16.6552 12.9211 16.6552 9.77278C16.6552 6.62447 14.103 4.07227 10.9547 4.07227C7.80636 4.07227 5.25415 6.62447 5.25415 9.77278C5.25415 12.9211 7.80636 15.4733 10.9547 15.4733ZM6.88066 9.97604C6.76989 9.92967 6.67933 9.98583 6.67933 10.1006V12.9572C6.67933 13.0721 6.76989 13.1279 6.88066 13.0819L7.73281 12.7257C7.84377 12.6795 7.93413 12.5481 7.93413 12.4332V11.9701H9.66077C9.74965 11.9702 9.83669 11.9461 9.91164 11.9007C9.9866 11.8553 10.0463 11.7905 10.0838 11.7139L10.483 10.8936L9.63881 10.5205L9.36286 11.0874H7.93452V10.6243C7.93452 10.5096 7.84396 10.378 7.73319 10.3318L6.88066 9.97604ZM14.1368 11.3145L14.7188 10.1318L13.3041 10.9465L14.1368 11.3145ZM15.0589 9.04219L9.27502 6.48616C9.16924 6.43967 9.04843 6.43478 8.93887 6.47256C8.82932 6.51035 8.7399 6.58774 8.69008 6.68789L7.68578 8.72924C7.63695 8.82962 7.63195 8.94429 7.67187 9.04816C7.71179 9.15204 7.79337 9.23664 7.89877 9.28346L11.7129 10.969C11.9323 11.0658 12.281 11.0477 12.4877 10.9287L15.0815 9.43494C15.2882 9.31597 15.2779 9.13936 15.0589 9.04219Z" fill="#36E7C7"/>
+<path d="M10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.665 19.2892 8.7725 19.4688C9.14689 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689Z" stroke="#36E7C7"/>
+<g filter="url(#filter0_f_175_404)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#36E7C7"/>
+</g>
+<defs>
+<filter id="filter0_f_175_404" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_175_404"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/image/tiaoyaxiang1.svg

+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.9547 4.07031C9.44279 4.07031 7.99285 4.6709 6.92379 5.73995C5.85474 6.80901 5.25415 8.25896 5.25415 9.77083C5.25415 11.2827 5.85474 12.7326 6.92379 13.8017C7.99285 14.8708 9.44279 15.4713 10.9547 15.4713C12.4665 15.4713 13.9165 14.8708 14.9855 13.8017C16.0546 12.7326 16.6552 11.2827 16.6552 9.77083C16.6552 8.25896 16.0546 6.80901 14.9855 5.73995C13.9165 4.6709 12.4665 4.07031 10.9547 4.07031V4.07031ZM14.375 11.766H13.8049V12.6211H12.9498V13.1911H11.8097V12.6211H10.3846V13.1911H9.24451V12.6211H8.38943V11.766H7.81938V7.77565H8.38943V6.92057H9.24451V6.63554H10.0996V6.92057H10.6696V6.63554H11.5247V6.92057H12.0948V6.63554H12.9498V6.92057H13.8049V7.77565H14.375V11.766ZM8.67446 11.766H13.5199V7.49062H8.67446V11.766ZM12.9498 7.77565H13.2349V11.481H12.9498V7.77565ZM12.3798 7.77565H12.6648V11.481H12.3798V7.77565ZM11.8097 7.77565H12.0948V11.481H11.8097V7.77565ZM11.2397 7.77565H11.5247V11.481H11.2397V7.77565ZM10.6696 7.77565H10.9547V11.481H10.6696V7.77565ZM10.0996 7.77565H10.3846V11.481H10.0996V7.77565ZM9.52954 7.77565H9.81456V11.481H9.52954V7.77565ZM8.95948 7.77565H9.24451V11.481H8.95948V7.77565Z" fill="#74C5FF"/>
+<path d="M5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.66499 19.2892 8.77248 19.4688C9.14688 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115Z" stroke="#74C5FF"/>
+<g filter="url(#filter0_f_194_260)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#74C5FF"/>
+</g>
+<defs>
+<filter id="filter0_f_194_260" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_194_260"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/image/user1.svg

+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6552 9.77473C16.6552 12.923 14.103 15.4752 10.9547 15.4752C7.80636 15.4752 5.25415 12.923 5.25415 9.77473C5.25415 6.62643 7.80636 4.07422 10.9547 4.07422C14.103 4.07422 16.6552 6.62643 16.6552 9.77473ZM12.9472 8.3569C12.9472 9.44817 12.0625 10.3331 10.971 10.3331C9.87956 10.3331 8.99488 9.44838 8.99488 8.3569C8.99488 7.26563 9.87956 6.38074 10.971 6.38074C12.0625 6.38074 12.9472 7.26542 12.9472 8.3569ZM10.9711 10.9893C11.5708 10.9893 12.1416 10.7873 12.6021 10.4238V10.424C13.7973 10.8771 14.3461 12.4304 14.3461 13.1384H7.56167C7.56167 12.424 8.10625 10.8598 9.32553 10.4122C9.78815 10.7827 10.3644 10.9893 10.9711 10.9893Z" fill="#00FFFF"/>
+<path d="M5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.66499 19.2892 8.77248 19.4688C9.14688 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115Z" stroke="#00FFFF"/>
+<g filter="url(#filter0_f_194_252)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#00FFFF"/>
+</g>
+<defs>
+<filter id="filter0_f_194_252" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_194_252"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/mapinages/changzhan.svg

-<svg id="组_2445" data-name="组 2445" xmlns="http://www.w3.org/2000/svg" width="18" height="25" viewBox="0 0 23 34.049">
-  <path id="路径_169" data-name="路径 169" d="M-2160.2,287.287a9.537,9.537,0,0,1,9.538,9.537,9.537,9.537,0,0,1-9.538,9.537,9.538,9.538,0,0,1-9.537-9.537A9.538,9.538,0,0,1-2160.2,287.287Zm0,1.467a8.069,8.069,0,0,0-8.069,8.07,8.069,8.069,0,0,0,8.069,8.07,8.069,8.069,0,0,0,8.07-8.07A8.069,8.069,0,0,0-2160.2,288.754Zm-.109,1.485a6.691,6.691,0,0,1,6.681,6.68,6.691,6.691,0,0,1-6.681,6.68,6.691,6.691,0,0,1-6.68-6.68A6.691,6.691,0,0,1-2160.309,290.239Zm.144,11.685h-.276v1.1h.276Zm-3.65-1.433-.771.772.2.2.772-.772-.2-.2Zm6.748,0-.2.2.771.772.2-.2Zm-1.874-6.328-1.808,2.094a.671.671,0,0,0-.265.286.825.825,0,0,0,.375,1.081.831.831,0,0,0,1.08-.375.723.723,0,0,0,.089-.375l.529-2.711Z" transform="translate(2171.7 -284.903)" fill="#7bf8f4"/>
-  <g id="路径_188" data-name="路径 188" fill="none">
-    <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
-    <path d="M 11.5 0.9999980926513672 C 5.71027946472168 0.9999980926513672 1 5.710289001464844 1 11.50002861022949 C 1 15.44052600860596 6.295671463012695 22.62869071960449 11.47669506072998 28.3024730682373 C 12.68497657775879 26.95182228088379 15.33078575134277 23.97880554199219 17.65543937683105 20.72857856750488 C 19.63740921020508 17.95747756958008 22 14.10697841644287 22 11.50002861022949 C 22 5.710289001464844 17.28972053527832 0.9999980926513672 11.5 0.9999980926513672 M 11.5 -1.9073486328125e-06 C 17.85127067565918 -1.9073486328125e-06 23 5.148738861083984 23 11.50002861022949 C 23 17.82768249511719 11.48916530609131 29.63789749145508 11.49940204620361 29.80171585083008 C 11.36462783813477 29.63818168640137 0 17.7873649597168 0 11.50002861022949 C 0 5.148738861083984 5.14872932434082 -1.9073486328125e-06 11.5 -1.9073486328125e-06 Z M 11.49940204620361 29.80171585083008 C 11.50076866149902 29.80337524414062 11.50098419189453 29.8038387298584 11.5 29.80305862426758 C 11.49963855743408 29.80277252197266 11.49944019317627 29.80232810974121 11.49940204620361 29.80171585083008 Z" stroke="none" fill="#7bf8f4"/>
-  </g>
-  <path id="多边形_35" data-name="多边形 35" d="M4.524,0,9.049,6.033H0Z" transform="translate(16.59 29.951) rotate(180)" fill="#7bf8f4"/>
+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6552 9.77278C16.6552 12.9211 14.103 15.4733 10.9547 15.4733C7.80636 15.4733 5.25415 12.9211 5.25415 9.77278C5.25415 6.62447 7.80636 4.07227 10.9547 4.07227C14.103 4.07227 16.6552 6.62447 16.6552 9.77278ZM10.867 11.2506H11.324V13.098H10.867V11.2506ZM9.84612 11.2506H10.3032V13.098H9.84612V11.2506ZM13.7726 6.71854V12.5548H14.2799V13.0979H11.726V11.0721C11.726 10.9225 11.6011 10.8005 11.4482 10.8005H9.43527C9.2823 10.8005 9.15705 10.9228 9.15705 11.0721V13.0979H7.62926V12.5544H8.13655V9.16448C8.13763 9.09164 8.16749 9.02218 8.21963 8.97129C8.27176 8.9204 8.34192 8.89223 8.41477 8.89292H10.0619V8.32503C10.0629 8.25212 10.0927 8.18257 10.1448 8.1316C10.197 8.08063 10.2672 8.0524 10.3401 8.0531H11.4035C11.4764 8.0524 11.5466 8.08063 11.5987 8.1316C11.6509 8.18257 11.6807 8.25212 11.6817 8.32503V8.89329H12.1236V6.71891C12.1247 6.64607 12.1545 6.57661 12.2067 6.52572C12.2588 6.47483 12.3289 6.44666 12.4018 6.44735H13.4943C13.5671 6.44666 13.6372 6.47478 13.6894 6.52559C13.7415 6.5764 13.7714 6.64576 13.7726 6.71854ZM9.23907 10.4022H11.6455H11.647V9.8591H9.23907V10.4022Z" fill="#F0C41B"/>
+<path d="M5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.66499 19.2892 8.77248 19.4688C9.14688 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115Z" stroke="#F0C41B"/>
+<g filter="url(#filter0_f_194_268)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#F0C41B"/>
+</g>
+<defs>
+<filter id="filter0_f_194_268" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_194_268"/>
+</filter>
+</defs>
 </svg>

gassafetyprogress-web/src/assets/mapinages/changzhan1.svg

+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6552 9.77278C16.6552 12.9211 14.103 15.4733 10.9547 15.4733C7.80636 15.4733 5.25415 12.9211 5.25415 9.77278C5.25415 6.62447 7.80636 4.07227 10.9547 4.07227C14.103 4.07227 16.6552 6.62447 16.6552 9.77278ZM10.867 11.2506H11.324V13.098H10.867V11.2506ZM9.84612 11.2506H10.3032V13.098H9.84612V11.2506ZM13.7726 6.71854V12.5548H14.2799V13.0979H11.726V11.0721C11.726 10.9225 11.6011 10.8005 11.4482 10.8005H9.43527C9.2823 10.8005 9.15705 10.9228 9.15705 11.0721V13.0979H7.62926V12.5544H8.13655V9.16448C8.13763 9.09164 8.16749 9.02218 8.21963 8.97129C8.27176 8.9204 8.34192 8.89223 8.41477 8.89292H10.0619V8.32503C10.0629 8.25212 10.0927 8.18257 10.1448 8.1316C10.197 8.08063 10.2672 8.0524 10.3401 8.0531H11.4035C11.4764 8.0524 11.5466 8.08063 11.5987 8.1316C11.6509 8.18257 11.6807 8.25212 11.6817 8.32503V8.89329H12.1236V6.71891C12.1247 6.64607 12.1545 6.57661 12.2067 6.52572C12.2588 6.47483 12.3289 6.44666 12.4018 6.44735H13.4943C13.5671 6.44666 13.6372 6.47478 13.6894 6.52559C13.7415 6.5764 13.7714 6.64576 13.7726 6.71854ZM9.23907 10.4022H11.6455H11.647V9.8591H9.23907V10.4022Z" fill="#F0C41B"/>
+<path d="M5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.66499 19.2892 8.77248 19.4688C9.14688 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115Z" stroke="#F0C41B"/>
+<g filter="url(#filter0_f_194_268)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#F0C41B"/>
+</g>
+<defs>
+<filter id="filter0_f_194_268" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_194_268"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/mapinages/famen.svg

-<svg id="组_2447" data-name="组 2447" xmlns="http://www.w3.org/2000/svg" width="18" height="25" viewBox="0 0 23.304 34.295">
-  <path id="路径_168" data-name="路径 168" d="M-1603.123-57.691a9.445,9.445,0,0,0-9.234-8.255,9.5,9.5,0,0,0-9.333,9.663,9.5,9.5,0,0,0,9.333,9.663,9.445,9.445,0,0,0,9.234-8.255h.76v-2.817Zm-16.383.73a7.312,7.312,0,0,1,6.469-6.722v1.475a5.871,5.871,0,0,0-5.045,5.246Zm6.469,8.079a7.311,7.311,0,0,1-6.465-6.67h1.425a5.869,5.869,0,0,0,5.039,5.2Zm-.242-6.99v3.214h-1.149v-7.262h4.784V-58.9h-3.635v2.014h3.429v1.017Zm1.6,6.99v-1.475a5.869,5.869,0,0,0,5.039-5.2h1.425A7.311,7.311,0,0,1-1611.677-48.883Zm5.045-8.079a5.871,5.871,0,0,0-5.045-5.246v-1.475a7.313,7.313,0,0,1,6.469,6.722Z" transform="translate(1624.104 68.362)" fill="#7bf8f4"/>
-  <g id="路径_185" data-name="路径 185" fill="none">
-    <path d="M11.652,0A11.652,11.652,0,0,1,23.3,11.652c0,6.435-11.75,18.467-11.652,18.545S0,18.087,0,11.652A11.652,11.652,0,0,1,11.652,0Z" stroke="none"/>
-    <path d="M 11.65185546875 0.9999942779541016 C 5.77839469909668 0.9999942779541016 0.9999961853027344 5.778413772583008 0.9999961853027344 11.65188407897949 C 0.9999961853027344 15.65063667297363 6.374073028564453 22.94361305236816 11.62834739685059 28.69588470458984 C 12.84814071655273 27.33243751525879 15.5371789932251 24.3126106262207 17.89928436279297 21.01001358032227 C 19.90856552124023 18.20073509216309 22.3037052154541 14.29677486419678 22.3037052154541 11.65188407897949 C 22.3037052154541 5.778413772583008 17.52530479431152 0.9999942779541016 11.65185546875 0.9999942779541016 M 11.65185546875 -5.7220458984375e-06 C 18.08699607849121 -5.7220458984375e-06 23.3037052154541 5.216724395751953 23.3037052154541 11.65188407897949 C 23.3037052154541 18.06309509277344 11.64087867736816 30.02925682067871 11.65124988555908 30.19523429870605 C 11.5146951675415 30.02953720092773 -3.814697265625e-06 18.02224731445312 -3.814697265625e-06 11.65188407897949 C -3.814697265625e-06 5.216724395751953 5.216714859008789 -5.7220458984375e-06 11.65185546875 -5.7220458984375e-06 Z M 11.65124988555908 30.19523429870605 C 11.65263366699219 30.19691467285156 11.65285301208496 30.19738388061523 11.65185546875 30.19659423828125 C 11.6514892578125 30.19630432128906 11.65128803253174 30.19585609436035 11.65124988555908 30.19523429870605 Z" stroke="none" fill="#7bf8f4"/>
-  </g>
-  <path id="多边形_32" data-name="多边形 32" d="M4.53,0l4.53,6.039H0Z" transform="translate(16.306 30.197) rotate(180)" fill="#7bf8f4"/>
+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.66499 19.2892 8.77248 19.4688C9.14688 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115Z" stroke="#FA8167"/>
+<path d="M16.6134 8.94262C16.4134 7.58911 15.7326 6.3525 14.6954 5.45841C13.6581 4.56433 12.3334 4.07236 10.963 4.07227C9.44847 4.07227 7.99596 4.67294 6.92503 5.74214C5.85409 6.81135 5.25244 8.2615 5.25244 9.77359C5.25244 11.2857 5.85409 12.7358 6.92503 13.805C7.99596 14.8742 9.44847 15.4749 10.963 15.4749C12.3334 15.4748 13.6581 14.9828 14.6954 14.0888C15.7326 13.1947 16.4134 11.9581 16.6134 10.6046L16.6551 9.77359L16.6134 8.94262ZM6.58836 9.37325C6.682 8.3553 7.12877 7.40197 7.85151 6.67789C8.57425 5.95381 9.52758 5.50446 10.5468 5.40744V6.27779C9.75838 6.37152 9.02466 6.72811 8.46439 7.28987C7.90413 7.85162 7.55009 8.58567 7.45957 9.37325H6.58836ZM10.5468 14.1399C9.5328 14.0434 8.58385 13.5981 7.8623 12.8802C7.14075 12.1623 6.69144 11.2165 6.59121 10.2044H7.46332C7.5602 10.9858 7.91657 11.7123 8.47551 12.2678C9.03445 12.8233 9.76372 13.1757 10.5468 13.2689V14.1399ZM10.3991 10.0155V11.9119H9.69579V7.62704H12.6225V8.2271H10.3984V9.4153H12.4963V10.0154L10.3991 10.0155ZM11.3792 14.1399V13.2694C12.1623 13.1762 12.8915 12.8238 13.4505 12.2683C14.0094 11.7128 14.3658 10.9863 14.4627 10.2049H15.3348C15.2344 11.2169 14.785 12.1625 14.0635 12.8803C13.3419 13.598 12.3931 14.0434 11.3792 14.1399ZM14.4664 9.37325C14.3759 8.58567 14.0219 7.85162 13.4616 7.28987C12.9013 6.72811 12.1676 6.37152 11.3792 6.27779V5.40744C12.3984 5.5045 13.3517 5.95387 14.0744 6.67794C14.7971 7.40202 15.2438 8.35533 15.3375 9.37325H14.4664Z" fill="#FA8167"/>
+<g filter="url(#filter0_f_194_248)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#FA8167"/>
+</g>
+<defs>
+<filter id="filter0_f_194_248" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_194_248"/>
+</filter>
+</defs>
 </svg>

gassafetyprogress-web/src/assets/mapinages/famen1.svg

+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.66499 19.2892 8.77248 19.4688C9.14688 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115Z" stroke="#FA8167"/>
+<path d="M16.6134 8.94262C16.4134 7.58911 15.7326 6.3525 14.6954 5.45841C13.6581 4.56433 12.3334 4.07236 10.963 4.07227C9.44847 4.07227 7.99596 4.67294 6.92503 5.74214C5.85409 6.81135 5.25244 8.2615 5.25244 9.77359C5.25244 11.2857 5.85409 12.7358 6.92503 13.805C7.99596 14.8742 9.44847 15.4749 10.963 15.4749C12.3334 15.4748 13.6581 14.9828 14.6954 14.0888C15.7326 13.1947 16.4134 11.9581 16.6134 10.6046L16.6551 9.77359L16.6134 8.94262ZM6.58836 9.37325C6.682 8.3553 7.12877 7.40197 7.85151 6.67789C8.57425 5.95381 9.52758 5.50446 10.5468 5.40744V6.27779C9.75838 6.37152 9.02466 6.72811 8.46439 7.28987C7.90413 7.85162 7.55009 8.58567 7.45957 9.37325H6.58836ZM10.5468 14.1399C9.5328 14.0434 8.58385 13.5981 7.8623 12.8802C7.14075 12.1623 6.69144 11.2165 6.59121 10.2044H7.46332C7.5602 10.9858 7.91657 11.7123 8.47551 12.2678C9.03445 12.8233 9.76372 13.1757 10.5468 13.2689V14.1399ZM10.3991 10.0155V11.9119H9.69579V7.62704H12.6225V8.2271H10.3984V9.4153H12.4963V10.0154L10.3991 10.0155ZM11.3792 14.1399V13.2694C12.1623 13.1762 12.8915 12.8238 13.4505 12.2683C14.0094 11.7128 14.3658 10.9863 14.4627 10.2049H15.3348C15.2344 11.2169 14.785 12.1625 14.0635 12.8803C13.3419 13.598 12.3931 14.0434 11.3792 14.1399ZM14.4664 9.37325C14.3759 8.58567 14.0219 7.85162 13.4616 7.28987C12.9013 6.72811 12.1676 6.37152 11.3792 6.27779V5.40744C12.3984 5.5045 13.3517 5.95387 14.0744 6.67794C14.7971 7.40202 15.2438 8.35533 15.3375 9.37325H14.4664Z" fill="#FA8167"/>
+<g filter="url(#filter0_f_194_248)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#FA8167"/>
+</g>
+<defs>
+<filter id="filter0_f_194_248" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_194_248"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/mapinages/jiankong.svg

-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="25" viewBox="0 0 23 34.049">
-  <g id="组_2451" data-name="组 2451" transform="translate(7189 23993)">
-    <g id="路径_188" data-name="路径 188" transform="translate(-7189 -23993)" fill="none">
-      <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
-      <path d="M 11.5 0.9999980926513672 C 5.71027946472168 0.9999980926513672 1 5.710289001464844 1 11.50002861022949 C 1 15.44052600860596 6.295671463012695 22.62869071960449 11.47669506072998 28.3024730682373 C 12.68497657775879 26.95182228088379 15.33078575134277 23.97880554199219 17.65543937683105 20.72857856750488 C 19.63740921020508 17.95747756958008 22 14.10697841644287 22 11.50002861022949 C 22 5.710289001464844 17.28972053527832 0.9999980926513672 11.5 0.9999980926513672 M 11.5 -1.9073486328125e-06 C 17.85127067565918 -1.9073486328125e-06 23 5.148738861083984 23 11.50002861022949 C 23 17.82768249511719 11.48916530609131 29.63789749145508 11.49940204620361 29.80171585083008 C 11.36462783813477 29.63818168640137 0 17.7873649597168 0 11.50002861022949 C 0 5.148738861083984 5.14872932434082 -1.9073486328125e-06 11.5 -1.9073486328125e-06 Z M 11.49940204620361 29.80171585083008 C 11.50076866149902 29.80337524414062 11.50098419189453 29.8038387298584 11.5 29.80305862426758 C 11.49963855743408 29.80277252197266 11.49944019317627 29.80232810974121 11.49940204620361 29.80171585083008 Z" stroke="none" fill="#7bf8f4"/>
-    </g>
-    <path id="多边形_35" data-name="多边形 35" d="M4.524,0,9.049,6.033H0Z" transform="translate(-7172.411 -23963.049) rotate(180)" fill="#7bf8f4"/>
-    <path id="路径_1298" data-name="路径 1298" d="M21.1,8.659v7.97l-2.46-.621V13.532l-5.534-1.863V9.8h-.613V8.563l-3.428.807,1.315-1.4-.129-.791c-.1.323-.282.54-.508.573-.476.081-.992-.67-1.154-1.67-.145-.928.065-1.75.484-1.92L7.742,2.577l-.1-.04-1.888.307.016.452,1.3-.21L7.4,5.191l-.694.1L5.168,3.593,5.12,2.327,6.5,2.109l.9-.145.791-.129L16.51.512l.976.371,1.452,2.549L10.025,4.86a3.109,3.109,0,0,1,.21.549L18.2,4.134,18.624,6.8,17.285,8.062l-2.323.508V9.813h-.613v1.242L18.656,12.3V9.2ZM9.323,5.175c-.21.032-.315.411-.25.839s.29.758.5.726.315-.411.25-.839S9.532,5.142,9.323,5.175ZM7.943,8.119l-.411-2.6-.6.1.46,2.864,1.549.96.46-.419Z" transform="translate(-7191.327 -23989.652)" fill="#7bf8f4"/>
-  </g>
+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.9547 15.4733C14.103 15.4733 16.6552 12.9211 16.6552 9.77278C16.6552 6.62447 14.103 4.07227 10.9547 4.07227C7.80636 4.07227 5.25415 6.62447 5.25415 9.77278C5.25415 12.9211 7.80636 15.4733 10.9547 15.4733ZM6.88066 9.97604C6.76989 9.92967 6.67933 9.98583 6.67933 10.1006V12.9572C6.67933 13.0721 6.76989 13.1279 6.88066 13.0819L7.73281 12.7257C7.84377 12.6795 7.93413 12.5481 7.93413 12.4332V11.9701H9.66077C9.74965 11.9702 9.83669 11.9461 9.91164 11.9007C9.9866 11.8553 10.0463 11.7905 10.0838 11.7139L10.483 10.8936L9.63881 10.5205L9.36286 11.0874H7.93452V10.6243C7.93452 10.5096 7.84396 10.378 7.73319 10.3318L6.88066 9.97604ZM14.1368 11.3145L14.7188 10.1318L13.3041 10.9465L14.1368 11.3145ZM15.0589 9.04219L9.27502 6.48616C9.16924 6.43967 9.04843 6.43478 8.93887 6.47256C8.82932 6.51035 8.7399 6.58774 8.69008 6.68789L7.68578 8.72924C7.63695 8.82962 7.63195 8.94429 7.67187 9.04816C7.71179 9.15204 7.79337 9.23664 7.89877 9.28346L11.7129 10.969C11.9323 11.0658 12.281 11.0477 12.4877 10.9287L15.0815 9.43494C15.2882 9.31597 15.2779 9.13936 15.0589 9.04219Z" fill="#36E7C7"/>
+<path d="M10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.665 19.2892 8.7725 19.4688C9.14689 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689Z" stroke="#36E7C7"/>
+<g filter="url(#filter0_f_175_404)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#36E7C7"/>
+</g>
+<defs>
+<filter id="filter0_f_175_404" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_175_404"/>
+</filter>
+</defs>
 </svg>

gassafetyprogress-web/src/assets/mapinages/jiankong1.svg

+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.9547 15.4733C14.103 15.4733 16.6552 12.9211 16.6552 9.77278C16.6552 6.62447 14.103 4.07227 10.9547 4.07227C7.80636 4.07227 5.25415 6.62447 5.25415 9.77278C5.25415 12.9211 7.80636 15.4733 10.9547 15.4733ZM6.88066 9.97604C6.76989 9.92967 6.67933 9.98583 6.67933 10.1006V12.9572C6.67933 13.0721 6.76989 13.1279 6.88066 13.0819L7.73281 12.7257C7.84377 12.6795 7.93413 12.5481 7.93413 12.4332V11.9701H9.66077C9.74965 11.9702 9.83669 11.9461 9.91164 11.9007C9.9866 11.8553 10.0463 11.7905 10.0838 11.7139L10.483 10.8936L9.63881 10.5205L9.36286 11.0874H7.93452V10.6243C7.93452 10.5096 7.84396 10.378 7.73319 10.3318L6.88066 9.97604ZM14.1368 11.3145L14.7188 10.1318L13.3041 10.9465L14.1368 11.3145ZM15.0589 9.04219L9.27502 6.48616C9.16924 6.43967 9.04843 6.43478 8.93887 6.47256C8.82932 6.51035 8.7399 6.58774 8.69008 6.68789L7.68578 8.72924C7.63695 8.82962 7.63195 8.94429 7.67187 9.04816C7.71179 9.15204 7.79337 9.23664 7.89877 9.28346L11.7129 10.969C11.9323 11.0658 12.281 11.0477 12.4877 10.9287L15.0815 9.43494C15.2882 9.31597 15.2779 9.13936 15.0589 9.04219Z" fill="#36E7C7"/>
+<path d="M10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.665 19.2892 8.7725 19.4688C9.14689 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689Z" stroke="#36E7C7"/>
+<g filter="url(#filter0_f_175_404)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#36E7C7"/>
+</g>
+<defs>
+<filter id="filter0_f_175_404" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_175_404"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/mapinages/tiaoyaxiang.svg

-<svg id="组_2448" data-name="组 2448" xmlns="http://www.w3.org/2000/svg" width="18" height="25" viewBox="0 0 23 33.9">
-  <path id="路径_173" data-name="路径 173" d="M-1877.09-49.461a9.537,9.537,0,0,0-9.537,9.537,9.537,9.537,0,0,0,9.537,9.537,9.537,9.537,0,0,0,9.537-9.537A9.537,9.537,0,0,0-1877.09-49.461Zm5.722,12.875h-.954v1.431h-1.43v.954h-1.907v-.954h-2.384v.954h-1.907v-.954h-1.431v-1.431h-.954v-6.676h.954v-1.431h1.431v-.477h1.431v.477h.953v-.477h1.431v.477h.954v-.477h1.431v.477h1.43v1.431h.954Zm-9.537,0h8.107v-7.153h-8.107Zm7.153-6.676h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Zm-.953,0h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Zm-.953,0h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Zm-.954,0h.477v6.2h-.477Z" transform="translate(1888.59 51.845)" fill="#7bf8f4"/>
-  <g id="路径_186" data-name="路径 186" fill="none">
-    <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
-    <path d="M 11.5 0.9999942779541016 C 5.71027946472168 0.9999942779541016 1 5.710294723510742 1 11.50003433227539 C 1 15.44047451019287 6.295700073242188 22.62868881225586 11.47670364379883 28.30246925354004 C 12.68497562408447 26.95181846618652 15.33078575134277 23.97880172729492 17.65543937683105 20.72857475280762 C 19.63740921020508 17.95747375488281 22 14.10698509216309 22 11.50003433227539 C 22 5.710294723510742 17.28972053527832 0.9999942779541016 11.5 0.9999942779541016 M 11.5 -5.7220458984375e-06 C 17.85128021240234 -5.7220458984375e-06 23 5.148744583129883 23 11.50003433227539 C 23 17.82767868041992 11.48916530609131 29.63789367675781 11.49940204620361 29.80171203613281 C 11.36462783813477 29.63816833496094 0 17.78736114501953 0 11.50003433227539 C 0 5.148744583129883 5.14872932434082 -5.7220458984375e-06 11.5 -5.7220458984375e-06 Z M 11.49940204620361 29.80171203613281 C 11.50076866149902 29.80337142944336 11.50098419189453 29.80383491516113 11.5 29.80305480957031 C 11.49963855743408 29.80276870727539 11.49944019317627 29.80232429504395 11.49940204620361 29.80171203613281 Z" stroke="none" fill="#7bf8f4"/>
-  </g>
-  <path id="多边形_33" data-name="多边形 33" d="M4.471,0,8.941,5.961H0Z" transform="translate(16.094 29.803) rotate(180)" fill="#7bf8f4"/>
+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.9547 4.07031C9.44279 4.07031 7.99285 4.6709 6.92379 5.73995C5.85474 6.80901 5.25415 8.25896 5.25415 9.77083C5.25415 11.2827 5.85474 12.7326 6.92379 13.8017C7.99285 14.8708 9.44279 15.4713 10.9547 15.4713C12.4665 15.4713 13.9165 14.8708 14.9855 13.8017C16.0546 12.7326 16.6552 11.2827 16.6552 9.77083C16.6552 8.25896 16.0546 6.80901 14.9855 5.73995C13.9165 4.6709 12.4665 4.07031 10.9547 4.07031V4.07031ZM14.375 11.766H13.8049V12.6211H12.9498V13.1911H11.8097V12.6211H10.3846V13.1911H9.24451V12.6211H8.38943V11.766H7.81938V7.77565H8.38943V6.92057H9.24451V6.63554H10.0996V6.92057H10.6696V6.63554H11.5247V6.92057H12.0948V6.63554H12.9498V6.92057H13.8049V7.77565H14.375V11.766ZM8.67446 11.766H13.5199V7.49062H8.67446V11.766ZM12.9498 7.77565H13.2349V11.481H12.9498V7.77565ZM12.3798 7.77565H12.6648V11.481H12.3798V7.77565ZM11.8097 7.77565H12.0948V11.481H11.8097V7.77565ZM11.2397 7.77565H11.5247V11.481H11.2397V7.77565ZM10.6696 7.77565H10.9547V11.481H10.6696V7.77565ZM10.0996 7.77565H10.3846V11.481H10.0996V7.77565ZM9.52954 7.77565H9.81456V11.481H9.52954V7.77565ZM8.95948 7.77565H9.24451V11.481H8.95948V7.77565Z" fill="#74C5FF"/>
+<path d="M5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.66499 19.2892 8.77248 19.4688C9.14688 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115Z" stroke="#74C5FF"/>
+<g filter="url(#filter0_f_194_260)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#74C5FF"/>
+</g>
+<defs>
+<filter id="filter0_f_194_260" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_194_260"/>
+</filter>
+</defs>
 </svg>

gassafetyprogress-web/src/assets/mapinages/tiaoyaxiang1.svg

+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.9547 4.07031C9.44279 4.07031 7.99285 4.6709 6.92379 5.73995C5.85474 6.80901 5.25415 8.25896 5.25415 9.77083C5.25415 11.2827 5.85474 12.7326 6.92379 13.8017C7.99285 14.8708 9.44279 15.4713 10.9547 15.4713C12.4665 15.4713 13.9165 14.8708 14.9855 13.8017C16.0546 12.7326 16.6552 11.2827 16.6552 9.77083C16.6552 8.25896 16.0546 6.80901 14.9855 5.73995C13.9165 4.6709 12.4665 4.07031 10.9547 4.07031V4.07031ZM14.375 11.766H13.8049V12.6211H12.9498V13.1911H11.8097V12.6211H10.3846V13.1911H9.24451V12.6211H8.38943V11.766H7.81938V7.77565H8.38943V6.92057H9.24451V6.63554H10.0996V6.92057H10.6696V6.63554H11.5247V6.92057H12.0948V6.63554H12.9498V6.92057H13.8049V7.77565H14.375V11.766ZM8.67446 11.766H13.5199V7.49062H8.67446V11.766ZM12.9498 7.77565H13.2349V11.481H12.9498V7.77565ZM12.3798 7.77565H12.6648V11.481H12.3798V7.77565ZM11.8097 7.77565H12.0948V11.481H11.8097V7.77565ZM11.2397 7.77565H11.5247V11.481H11.2397V7.77565ZM10.6696 7.77565H10.9547V11.481H10.6696V7.77565ZM10.0996 7.77565H10.3846V11.481H10.0996V7.77565ZM9.52954 7.77565H9.81456V11.481H9.52954V7.77565ZM8.95948 7.77565H9.24451V11.481H8.95948V7.77565Z" fill="#74C5FF"/>
+<path d="M5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.66499 19.2892 8.77248 19.4688C9.14688 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115Z" stroke="#74C5FF"/>
+<g filter="url(#filter0_f_194_260)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#74C5FF"/>
+</g>
+<defs>
+<filter id="filter0_f_194_260" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_194_260"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/mapinages/user.svg

-<svg id="组_2446" data-name="组 2446" xmlns="http://www.w3.org/2000/svg" width="18" height="25" viewBox="0 0 23 33.9">
-  <path id="路径_170" data-name="路径 170" d="M-1583.57,295.955a3.719,3.719,0,0,0-3.714,3.713,3.719,3.719,0,0,0,3.714,3.713,3.719,3.719,0,0,0,3.713-3.713,3.719,3.719,0,0,0-3.713-3.713Zm2.287,4.15a.608.608,0,0,1-.437.184h-1.862a.618.618,0,0,1-.621-.621V297.2a.618.618,0,0,1,.621-.621.608.608,0,0,1,.437.184.608.608,0,0,1,.184.437v1.862h1.242a.618.618,0,0,1,.621.621.6.6,0,0,1-.184.425Zm-8.966-5.047a4.143,4.143,0,0,0,4.161,0,4.166,4.166,0,0,0,2.081-3.61,4.161,4.161,0,0,0-4.162-4.161,4.16,4.16,0,0,0-4.161,4.161A4.179,4.179,0,0,0-1590.249,295.058Zm1.724,4.61a4.872,4.872,0,0,1,.391-1.931,5.639,5.639,0,0,1,.54-.966,4.67,4.67,0,0,1-.575.035,5.145,5.145,0,0,1-2.081-.425,5.006,5.006,0,0,1-.943-.517,1.2,1.2,0,0,0-1.345-.011,7.8,7.8,0,0,0-3.414,6.265v.069a.6.6,0,0,0,.6.575h7.92a5.215,5.215,0,0,1-.7-1.161,5.035,5.035,0,0,1-.391-1.931Z" transform="translate(1599.528 -284.903)" fill="#7bf8f4" opacity="0.996"/>
-  <g id="路径_190" data-name="路径 190" fill="none">
-    <path d="M11.5,0A11.5,11.5,0,0,1,23,11.5c0,6.351-11.6,18.226-11.5,18.3S0,17.851,0,11.5A11.5,11.5,0,0,1,11.5,0Z" stroke="none"/>
-    <path d="M 11.5 1.000003814697266 C 5.71027946472168 1.000003814697266 1 5.710294723510742 1 11.50003433227539 C 1 15.44052124023438 6.295677185058594 22.62869262695312 11.47670078277588 28.30246353149414 C 12.68496322631836 26.95182609558105 15.33070659637451 23.97891044616699 17.65538024902344 20.72865295410156 C 19.63738059997559 17.95753479003906 22 14.10700416564941 22 11.50003433227539 C 22 5.710294723510742 17.28972053527832 1.000003814697266 11.5 1.000003814697266 M 11.5 3.814697265625e-06 C 17.85128021240234 3.814697265625e-06 23 5.148744583129883 23 11.50003433227539 C 23 17.82767677307129 11.48916530609131 29.63790130615234 11.49940204620361 29.80170249938965 C 11.36462783813477 29.63816833496094 0 17.78736114501953 0 11.50003433227539 C 0 5.148744583129883 5.14872932434082 3.814697265625e-06 11.5 3.814697265625e-06 Z M 11.49940204620361 29.80170249938965 C 11.50076866149902 29.80335998535156 11.50098419189453 29.80382347106934 11.5 29.80304336547852 C 11.49963855743408 29.80275726318359 11.49944019317627 29.80231475830078 11.49940204620361 29.80170249938965 Z" stroke="none" fill="#7bf8f4"/>
-  </g>
-  <path id="多边形_37" data-name="多边形 37" d="M4.471,0,8.941,5.961H0Z" transform="translate(16.094 29.803) rotate(180)" fill="#7bf8f4"/>
+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6552 9.77473C16.6552 12.923 14.103 15.4752 10.9547 15.4752C7.80636 15.4752 5.25415 12.923 5.25415 9.77473C5.25415 6.62643 7.80636 4.07422 10.9547 4.07422C14.103 4.07422 16.6552 6.62643 16.6552 9.77473ZM12.9472 8.3569C12.9472 9.44817 12.0625 10.3331 10.971 10.3331C9.87956 10.3331 8.99488 9.44838 8.99488 8.3569C8.99488 7.26563 9.87956 6.38074 10.971 6.38074C12.0625 6.38074 12.9472 7.26542 12.9472 8.3569ZM10.9711 10.9893C11.5708 10.9893 12.1416 10.7873 12.6021 10.4238V10.424C13.7973 10.8771 14.3461 12.4304 14.3461 13.1384H7.56167C7.56167 12.424 8.10625 10.8598 9.32553 10.4122C9.78815 10.7827 10.3644 10.9893 10.9711 10.9893Z" fill="#00FFFF"/>
+<path d="M5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.66499 19.2892 8.77248 19.4688C9.14688 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115Z" stroke="#00FFFF"/>
+<g filter="url(#filter0_f_194_252)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#00FFFF"/>
+</g>
+<defs>
+<filter id="filter0_f_194_252" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_194_252"/>
+</filter>
+</defs>
 </svg>

gassafetyprogress-web/src/assets/mapinages/user1.svg

+<svg width="22" height="25" viewBox="0 0 22 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6552 9.77473C16.6552 12.923 14.103 15.4752 10.9547 15.4752C7.80636 15.4752 5.25415 12.923 5.25415 9.77473C5.25415 6.62643 7.80636 4.07422 10.9547 4.07422C14.103 4.07422 16.6552 6.62643 16.6552 9.77473ZM12.9472 8.3569C12.9472 9.44817 12.0625 10.3331 10.971 10.3331C9.87956 10.3331 8.99488 9.44838 8.99488 8.3569C8.99488 7.26563 9.87956 6.38074 10.971 6.38074C12.0625 6.38074 12.9472 7.26542 12.9472 8.3569ZM10.9711 10.9893C11.5708 10.9893 12.1416 10.7873 12.6021 10.4238V10.424C13.7973 10.8771 14.3461 12.4304 14.3461 13.1384H7.56167C7.56167 12.424 8.10625 10.8598 9.32553 10.4122C9.78815 10.7827 10.3644 10.9893 10.9711 10.9893Z" fill="#00FFFF"/>
+<path d="M5.7556 4.49115C2.88589 7.36086 2.87565 12.0077 5.73811 14.8702C6.03244 15.1645 6.45323 15.7447 6.94211 16.4931C7.42337 17.2298 7.94668 18.0917 8.44496 18.922C8.55553 19.1063 8.66499 19.2892 8.77248 19.4688C9.14688 20.0944 9.49738 20.6801 9.78744 21.1433C9.97373 21.4407 10.1413 21.6977 10.2784 21.8867C10.3462 21.9801 10.4142 22.0676 10.4788 22.1379C10.5108 22.1728 10.5501 22.2123 10.5949 22.2483C10.6309 22.2772 10.7126 22.3389 10.8281 22.3689C11.0039 22.4146 11.1483 22.3604 11.2172 22.3271C11.2918 22.2911 11.3505 22.2447 11.3901 22.21C11.4707 22.1392 11.548 22.0487 11.6172 21.9601C11.7593 21.7779 11.9291 21.5227 12.114 21.2281C12.454 20.6862 12.8754 19.9616 13.3199 19.1974C13.3616 19.1256 13.4036 19.0535 13.4457 18.9811C13.939 18.1333 14.4562 17.2492 14.9321 16.495C15.4164 15.7273 15.8303 15.1395 16.1171 14.8527C18.9868 11.983 18.9971 7.33612 16.1346 4.47366C13.2722 1.6112 8.62531 1.62144 5.7556 4.49115Z" stroke="#00FFFF"/>
+<g filter="url(#filter0_f_194_252)">
+<path d="M10.9626 22.709L12.997 19.1853H8.92825L10.9626 22.709Z" fill="#00FFFF"/>
+</g>
+<defs>
+<filter id="filter0_f_194_252" x="6.92822" y="17.1855" width="8.06885" height="7.52344" 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_194_252"/>
+</filter>
+</defs>
+</svg>

gassafetyprogress-web/src/components/bigWindow/DeviceA.vue

 <!--
  * @Author: your name
  * @Date: 2022-01-26 20:07:52
- * @LastEditTime: 2022-02-17 10:13:02
+ * @LastEditTime: 2022-02-25 18:34:00
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 
@@ -62,22 +62,22 @@
       </div>
       <div class="tbody flex">
         <div class="first zzz">{{ "流量计与压力表" }}</div>
-        <div class="">{{ deviceData.pressureFlow.length }}</div>
+        <div class="">{{ deviceData.pressureFlows.length }}</div>
         <div class="">
-          {{ (Math.random() * deviceData.pressureFlow.length) >> 1 }}
+          {{ (Math.random() * deviceData.pressureFlows.length) >> 1 }}
         </div>
         <div class="">
-          {{ (Math.random() * deviceData.pressureFlow.length) >> 1 }}
+          {{ (Math.random() * deviceData.pressureFlows.length) >> 1 }}
         </div>
         <div class="">
-          {{ (Math.random() * deviceData.pressureFlow.length) >> 1 }}
+          {{ (Math.random() * deviceData.pressureFlows.length) >> 1 }}
         </div>
         <div class="">
-          {{ (Math.random() * deviceData.pressureFlow.length) >> 1 }}
+          {{ (Math.random() * deviceData.pressureFlows.length) >> 1 }}
         </div>
         <div class="last zzz">
           {{
-            deviceData.pressureFlow.filter((item) => {
+            deviceData.pressureFlows.filter((item) => {
               return item.deviceState == 2;
             }).length
           }}
@@ -102,12 +102,29 @@ export default {
         "公司位于长江三角洲经济快速增长、风景秀丽的太湖之畔——无锡。 公司自1984年成立至今，已经过了3次跨越式的发展。2004年至今公司投入5000多万元资金建设新的生产基地，目前已竣工并投入生产，占地面积达40000m2，厂房面积近15000m2。公司2004年的年产值达4350多万元，并且每年以平均30%的速度快速增长。",
     };
   },
+  computed: {
+    prodTest() {
+      return this.vueRoot.$store.state.user.systemSetting.prod_test;
+    },
+    company() {
+      return this.vueRoot.$store.state.bigWindowCompany.company;
+    },
+  },
+  mounted() {
+    // 如果不是测试，而是真数据，就要用帧数据的东西
+    if (this.prodTest != "test") {
+      this.companyType = {};
+      this.company.forEach((item) => {
+        this.companyType[item.conpanyId] = item.companyName;
+      });
+    }
+  },
   methods: {
     close() {
       this.mapClass.infowindowClose();
     },
     btnClick() {
-      this.vueRoot.centerDataFunc(this.deviceData.pressureFlow);
+      this.vueRoot.centerDataFunc(this.deviceData.pressureFlows);
     },
   },
 };

gassafetyprogress-web/src/components/bigWindow/Line.vue

 <!--
  * @Author: your name
  * @Date: 2022-01-27 14:25:45
- * @LastEditTime: 2022-02-17 10:11:42
+ * @LastEditTime: 2022-02-25 17:53:43
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /hello-world/src/views/components/User.vue
@@ -26,8 +26,8 @@
 
     <div class="group flex">
       <div class="left first">管道压力：</div>
-      <div :title="deviceData.address" class="right zzz">
-        {{ pipePressure[deviceData.pipePressure] }}
+      <div :title="deviceData.pipePressure" class="right zzz">
+        {{ pipePressure[deviceData.pipePressure + 1] }}
       </div>
       <div class="left">所属公司：</div>
       <div class="right last">{{ companyType[deviceData.companyType] }}</div>
@@ -44,7 +44,9 @@
       <div class="left first">管道走向：</div>
       <div class="right">{{ deviceData.pipeTrend }}</div>
       <div class="left">权属单位：</div>
-      <div :title="deviceData.powerCompany" class="right last zzz">{{ deviceData.powerCompany }}</div>
+      <div :title="deviceData.powerCompany" class="right last zzz">
+        {{ deviceData.powerCompany }}
+      </div>
     </div>
     <div class="group flex">
       <div class="first left">建设年代：</div>
@@ -53,10 +55,13 @@
       <div class="last right">{{ deviceData.buildCompany }}</div>
     </div>
 
-
     <div class="group flex">
       <div class="first once left">管道位置：</div>
-      <div :title="deviceData.pipeAddr" class=" last pipeAddr right zzz">
+      <div
+        v-unValue
+        :title="deviceData.pipeAddr"
+        class="last pipeAddr right zzz"
+      >
         {{ deviceData.pipeAddr }}
       </div>
     </div>
@@ -65,7 +70,6 @@
 
 <script>
 import { companyType, pipePressure } from "@/utils/mapClass/config.js";
-
 export default {
   data() {
     return {
@@ -73,6 +77,24 @@ export default {
       pipePressure,
     };
   },
+  computed:{
+    prodTest(){
+      return this.vueRoot.$store.state.user.systemSetting.prod_test
+    },
+    company(){
+       return this.vueRoot.$store.state.bigWindowCompany.company;
+    }
+
+  },
+  mounted(){
+    // 如果不是测试，而是真数据，就要用帧数据的东西
+    if(this.prodTest !="test"){
+      this.companyType={};
+      this.company.forEach(item=>{
+        this.companyType[item.conpanyId] = item.companyName;
+      })
+    }
+  },
   methods: {
     close() {
       this.mapClass.infowindowClose();
@@ -125,12 +147,12 @@ export default {
     .last {
       border: none;
     }
-    .once{
-      flex:1;
+    .once {
+      flex: 1;
     }
-    .pipeAddr{
-      flex:3;
-      padding:0 3em 0 1em;
+    .pipeAddr {
+      flex: 3;
+      padding: 0 3em 0 1em;
     }
   }
   .flex {

gassafetyprogress-web/src/components/bigWindow/PipeColor.vue

@@ -59,16 +59,8 @@
       </div>
 
     <div class="mapChange">
-      <div class="qiehuan">
-        <div :class="{ active: !mapStyle }" @click="mapChange(1)">
-          <img src="../../assets/image/weixing.png" alt="" v-show="!downIcon">
-          <div class="mapqh2" v-show="!downIcon">卫星</div>
-        </div>
-        <div :class="{ active: mapStyle }" @click="mapChange(2)">
-          <img src="../../assets/image/quanxi.png" alt="" v-show="downIcon">
-          <div class="mapqh3" v-show="downIcon">全景</div>
-        </div>
-      </div>
+      <div :class="{ active: mapStyle }" @click="mapChange(2)">全景地图</div>
+        <div :class="{ active: !mapStyle }" @click="mapChange(1)">卫星地图</div>
     </div>
   </div>
 </template>
@@ -86,7 +78,6 @@ export default {
     methods: {
       // 更改卫星图
       mapChange(num) {
-        this.downIcon = !this.downIcon
         if (num == 1) {
           this.mapStyle = false;
         } else {
@@ -126,107 +117,27 @@ export default {
   width: 14px;
 }
 .mapChange {
-  left: 460px;
-  top: 76px;
+  left: 10px;
+  top: 45px;
   color: #fff;
   padding: 5px;
   position: absolute;
   display: flex;
+  z-index: 9999;
   div {
+    border: 1px solid #339CC9;
+    padding: 3px 6px;
+    margin-left: 8px;
+    color: #339CC9;
     cursor: pointer;
-    &.active
+    font-size: 14px;
+    &.active,
+    &:hover
     {
-      .mapqh2{
-        color: #fff;
-        background: #09f;
-      }
-      .mapqh3{
-        color: #fff;
-        background: #09f;
-      }
+      background-color: #053B6A ;
+      color: #2CD5DB;
     }
   }
 }
-.qiehuan{
-  height: 40px;
-  display: block;
-  float: right;
-  &:hover{
-    .divfirst{
-      display: none;
-    }
-    .mapqh1{
-      display: none;
-    }
-    .qiehuanlog{
-      padding: 3px 3px 3px 3px;
-      img{
-        height: 34px;
-      }
-      background-color: #bac7d0;
-    }
-  }
-}
-
-.qiehuan img{
-  width: 56px;
-  height: 38px;
-}
-.divsecond{
-  margin-left: 8px;
-}
-.qiehuanlog{
-  display: flex;
-  float: right;
-  height: 100%;
-  margin-left: 8px;
-}
-.mapqh1{
-  position: fixed;
-  margin-top: -23px;
-  font-size: 14px;
-  color: #838280;
-  background-color: #fff;
-}
-.mapqh2{
-  position: fixed;
-  margin-top: -21px;
-  font-size: 12px;
-  color: #838280;
-  background-color: #fff;
-}
-.mapqh3{
-  position: fixed;
-  margin-top: -21px;
-  font-size: 12px;
-  color: #838280;
-  background-color: #fff;
-}
-@keyframes show {
-    0%{
-        transform: translateX(-10%);
-        opacity: 0;
-    }
-    100%{
-        transform: translateX(0);
-    }
-}
-@keyframes hide {
-    0%{
-        transform: translateX(0)
-    }
-    100%{
-        transform: translateX(-100%)
-    }
-}
 
-.show-enter-active {
-      animation: show 0.6s;
-  }
-  .show-leave-active {
-      animation: hide 0.6s;
-  }
-  .show-enter, .show-leave-to {
-      opacity: 0;
-  }
 </style>

gassafetyprogress-web/src/components/bigWindow/User.vue

@@ -15,7 +15,9 @@
 
     <div class="group flex first">
       <div class="left">用户姓名：</div>
-      <div :title="deviceData.usrName" class="right zzz">{{ deviceData.usrName }}</div>
+      <div :title="deviceData.usrName" class="right zzz">
+        {{ deviceData.usrName }}
+      </div>
     </div>
 
     <div class="group flex">
@@ -39,6 +41,7 @@
 
 <script>
 import { companyType } from "@/utils/mapClass/config.js";
+import { mapGetters } from "vuex";
 
 export default {
   data() {
@@ -46,6 +49,23 @@ export default {
       companyType,
     };
   },
+  computed: {
+    prodTest() {
+      return this.vueRoot.$store.state.user.systemSetting.prod_test;
+    },
+    company() {
+      return this.vueRoot.$store.state.bigWindowCompany.company;
+    },
+  },
+  mounted() {
+    // 如果不是测试，而是真数据，就要用帧数据的东西
+    if (this.prodTest != "test") {
+      this.companyType = {};
+      this.company.forEach((item) => {
+        this.companyType[item.conpanyId] = item.companyName;
+      });
+    }
+  },
   methods: {
     close() {
       this.mapClass.infowindowClose();
@@ -73,18 +93,17 @@ export default {
   }
   .group {
     border: 1px solid #cccccc;
-    border-top:none;
+    border-top: none;
     height: 28px;
     font-size: 14px;
     line-height: 28px;
     color: #ffffff;
     &.first {
-      border-top:1px solid #cccccc;
+      border-top: 1px solid #cccccc;
       margin-top: 10px;
     }
     div {
       flex: 1;
-      
     }
     .left {
       border-right: 1px solid #cccccc;
@@ -94,7 +113,7 @@ export default {
     .right {
       box-sizing: border-box;
       text-align: left;
-      padding:0 1em;
+      padding: 0 1em;
     }
   }
   .flex {

gassafetyprogress-web/src/components/bigWindow/leftBar.vue

 <template>
   <div> 
-    <div class="left-top" style="margin-top: 70px;width: 430px;margin-left: 10px;display: flex;justify-content: space-around;">
-      <div style="width: 40%;text-align: center;color: #00ffff;">
-        <p>从业人员数</p>
-        <span style="font-family: 'arialbd';font-size: 30px;background-image:-webkit-linear-gradient(bottom,#f0c41b,#e4dbb7);-webkit-background-clip:text;-webkit-text-fill-color:transparent;  ">{{datanow.congyeNum}}</span>
+    <div>
+      <div class="item1">
+        <span class="dot">
+          <span class="dot-inner"></span>
+        </span>
+        <span style="letter-spacing :3px;color:#cddbe4">基本信息</span>
+        <div class="fong-div" style="width: 8px;height: 12px;background-color: #2c888899;float: right;margin-top: 10px;transform: skewX(-25deg)"></div> 
+        <div class="fong-div" style="width: 8px;height: 12px;background-color: #24b1b1b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div> 
+        <div class="fong-div" style="width: 8px;height: 12px;background-color: #11e9e9b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div> 
+      </div>
+  </div>
+    <div class="left-top" style="margin-top: 40px;width: 430px;margin-left: 10px;display: flex;justify-content: space-around;">
+      <div style="width: 40%;text-align: center;color: #339CC9;">
+        <div class="div-p">从业人员数</div>
+        <span style="font-family: 'arialbd';font-size: 35px;background-image:-webkit-linear-gradient(bottom,#f0c41b,#e4dbb7);-webkit-background-clip:text;-webkit-text-fill-color:transparent;  ">{{datanow.congyeNum}}</span>
       </div>
-      <div style="width: 40%;text-align: center;color: #00ffff;">
-        <p>管道长度(m)</p>
-        <span style="font-family: 'arialbd';font-size: 30px;background-image:-webkit-linear-gradient(bottom,#f86742,#f0c41b);-webkit-background-clip:text;-webkit-text-fill-color:transparent;  ">{{datanow.guandaoNum}}</span>
+      <div style="width: 40%;text-align: center;color: #339CC9;">
+        <div class="div-p">管道长度(m)</div>
+        <span style="font-family: 'arialbd';font-size: 35px;background-image:-webkit-linear-gradient(bottom,#f86742,#f0c41b);-webkit-background-clip:text;-webkit-text-fill-color:transparent;  ">{{datanow.guandaoNum}}</span>
       </div>
     </div>
     
     <div>
-      <div class="item1" style="margin-top: 40px;">
+      <div class="item1" style="margin-top: 30px;">
         <span class="dot">
           <span class="dot-inner"></span>
         </span>
@@ -35,12 +46,28 @@
           <div class="fong-div" style="width: 8px;height: 12px;background-color: #11e9e9b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div> 
         </div>
       </div>
-      <div id="myCharttwo" :style="{width: '450px', height: '270px'}"></div>
+      <!-- <div id="myCharttwo" :style="{width: '450px', height: '270px'}"></div>
       <div class="titleTex" style="height: 20px;margin-top: 0px;font-size: 15px;">
         ● 已完成数量:{{datanow.renwu[1]}}
       </div>
       <div class="titleTex" style="height: 20px;margin-top: 0px;font-size: 15px;color: #0099ff">
         ● 未成数量:{{datanow.renwu[0]}}
+      </div> -->
+      <div class="div-el">
+        <div class="el-left">入户安检</div>
+        <el-progress class="el-progress_text" :text-inside="true" :stroke-width="18" :percentage="63"></el-progress>
+      </div>
+      <div class="div-el">
+        <div class="el-left">巡查</div>
+        <el-progress class="el-progress_text" :text-inside="true" :stroke-width="18" :percentage="50" status="success"></el-progress>
+      </div>
+      <div class="div-el">
+        <div class="el-left">报警巡查</div>
+        <el-progress class="el-progress_text" :text-inside="true" :stroke-width="18" :percentage="80" status="warning"></el-progress>
+      </div>
+      <div class="div-el">
+        <div class="el-left">其他</div>
+        <el-progress class="el-progress_text" :text-inside="true" :stroke-width="18" :percentage="50" status="exception"></el-progress>
       </div>
     </div>
   </div>
@@ -319,11 +346,10 @@
     line-height: 30px;
     color: #ffffff;
     padding-left: 10px;
-    margin-top: 10px;
     font-weight: 700;
     font-style: italic;
     margin-left: 10px;
-    background-image: linear-gradient(to left, #122033, rgb(49 151 195 / 70%) 50%, #111a22);
+    background-image: linear-gradient(to left, #112238, rgb(49 151 195 / 70%) 50%, #112238);
 }
 .dot {
         display: inline-block;
@@ -374,4 +400,67 @@
             transform: scale(2.4)
         }
     }
+.div-p{
+  width: 60%;
+  height: 35px;
+  line-height: 35px;
+  margin-left: 20%;
+  margin-bottom: 20px;
+  background: url('../../assets/mapImages/div-p.png');
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+}
+
+.div-el{
+  margin-top: 30px;
+  width: 100%;
+  height: 18px;
+}
+.el-left{
+  color: #96a4ad;
+  width: 20%;
+  height: 100%;
+  float: left;
+  font-size: 14px;
+  text-align: right;
+}
+::v-deep .el-progress {
+  width: 65%;float: left;
+  margin-left: 25px;
+}
+::v-deep .el-progress-bar__outer {
+    height: 6px;
+    border-radius: 0px;
+    background-color: #1e506e80;
+    background: linear-gradient(to left,#123456,#112238);
+}
+::v-deep .el-progress-bar__inner {
+    position: absolute;
+    left: 0;
+    top: 0;
+    height: 100%;
+    /* background-color: #198EF0; */
+    background: linear-gradient(to left,#198EF0,#112238);
+    text-align: right;
+    border-radius: 0px 5px 5px 0px;
+    line-height: 1;
+    white-space: nowrap;
+    -webkit-transition: width 0.6s ease;
+    transition: width 0.6s ease;
+}
+::v-deep .el-progress.is-success .el-progress-bar__inner {
+    /* background-color: #00FFFF; */
+    background: linear-gradient(to left,#00FFFF,#112238);
+}
+::v-deep .el-progress.is-warning .el-progress-bar__inner {
+    background-color: #198EF0;
+    background: linear-gradient(to left,#198EF0,#112238);
+}
+::v-deep .el-progress.is-exception .el-progress-bar__inner {
+    /* background-color: #00FFFF; */
+    background: linear-gradient(to left,#00FFFF,#112238);
+}
+::v-deep .el-progress-bar__innerText {
+    color: #1e516f;
+}
 </style>

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

@@ -2,7 +2,7 @@
 
     <div style="height: 100%">
         <div>
-            <div class="item1" style="margin-top: 60px;">
+            <div class="item1">
               <span class="dot">
                 <span class="dot-inner"></span>
               </span>
@@ -12,8 +12,56 @@
               <div class="fong-div" style="width: 8px;height: 12px;background-color: #11e9e9b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
             </div>
         </div>
-        <div class="divfen" style="width: 100%;height: 30%;">
-            <div class ="divall" style="width: 50%">
+        <div class="divfen" style="width: 95%;height: 30%;margin-left: 35px;">
+            <div class="left">
+                <div
+                  class="bottom right-bottom-data-left"
+                  @mouseover="tableEnter"
+                  @mouseout="timerAni"
+                >
+                  <el-table
+                    size="mini"
+                    :data="tableData"
+                    style="width: 93%"
+                    :height="tableHeight"
+                    class="el-bottom"
+                    ref="table"
+                  >
+                    <el-table-column prop="unitName" label="所在单位" width="80">
+                      <!-- <template slot-scope="scope">
+                        <div class="ddd" :title="scope.row.unitName">
+                          {{ scope.row.unitName }}
+                        </div>
+                      </template> -->
+                    </el-table-column>
+                    <el-table-column prop="detectorType" label="设备类型" width="80">
+                      <!-- <template slot-scope="scope">
+                        <div class="ddd" :title="scope.row.detectorType">
+                          {{ scope.row.detectorType }}
+                        </div>
+                      </template> -->
+                    </el-table-column>
+                    <el-table-column prop="statusName" label="预警信息" width="80">
+                      <!-- <template slot-scope="scope">
+                        <div class="ddd" :title="scope.row.statusName">
+                          {{ scope.row.statusName }}
+                        </div>
+                      </template> -->
+                    </el-table-column>
+                    <el-table-column prop="alarmTime" label="预警时间" width="120">
+                    </el-table-column>
+                    <el-table-column prop="handledStatus" label="状态" width="">
+                      <!-- <template slot-scope="scope">
+                        <div class="ddd" :title="scope.row.handledStatus">
+                          {{ scope.row.handledStatus }}
+                        </div>
+                      </template> -->
+                    </el-table-column>
+                  </el-table>
+                </div>
+              </div>
+            <!-- <RightPic></RightPic> -->
+            <!-- <div class ="divall" style="width: 50%">
                 <div class="titleTex">属地巡查</div>
                 <div class="titleTex divfen" style="height: 50px;margin-top: 0px">
                     <div class="numdiv">{{datanow.xunchaAllOne1}}</div>
@@ -50,8 +98,35 @@
                 <div class="titleTex" style="height: 20px;margin-top: 0px;font-size: 10px;color: #f0c41b">
                     ● 发现问题数：{{datanow.xuntwoevery2}}
                 </div>
-            </div>
+            </div> -->
         </div>
+
+<!-- <div style="width: 100%;height: 200px;background-color: #44d7dc;">
+    <el-table
+          size="mini"
+          :data="tableData"
+          style="width: 100%"
+          :height="tableHeight"
+          class="el-bottom"
+          ref="table"
+        >
+          <el-table-column prop="unitName" label="所在单位" width="100">
+            
+          </el-table-column>
+          <el-table-column prop="detectorType" label="设备类型" width="">
+            
+          </el-table-column>
+          <el-table-column prop="statusName" label="预警信息" width="">
+            
+          </el-table-column>
+          <el-table-column prop="alarmTime" label="预警时间" width="160">
+          </el-table-column>
+          <el-table-column prop="handledStatus" label="状态" width="">
+            
+          </el-table-column>
+        </el-table>
+</div> -->
+        
         <div class="echarts-one" style="margin-top: 10px;width: 430px;margin-left: 10px;">
             <div>
               <div class="item1">
@@ -66,7 +141,7 @@
             </div>
             <div id="myChartone" :style="{width: '420px', height: '250px'}"></div>
           </div>
-        <div>
+        <!-- <div>
             <div class="item1">
               <span class="dot">
                 <span class="dot-inner"></span>
@@ -99,6 +174,49 @@
                     ● 报警数量：{{datanow.deviceevery3}}
                 </div>
             </div>
+        </div> -->
+        <div>
+            <div class="item1">
+              <span class="dot">
+                <span class="dot-inner"></span>
+              </span>
+              <span>用户安全监控设备</span>
+              <div class="fong-div" style="width: 8px;height: 12px;background-color: #2c888899;float: right;margin-top: 10px;transform: skewX(-25deg)"></div>
+              <div class="fong-div" style="width: 8px;height: 12px;background-color: #24b1b1b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
+              <div class="fong-div" style="width: 8px;height: 12px;background-color: #11e9e9b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
+            </div>
+        </div>
+        <div class="outuser">
+            <div class="outuserone">
+                <p>燃气用户数量</p>
+                <span class="outuserspan">12345</span>
+            </div>
+            <div class="outusertwo">
+                <p>安全设备数量</p>
+                <span class="outuserspan">12345</span>
+            </div>
+        </div>
+        <div id="huan" style="width: 450px;height: 170px;"></div>
+        <div class="inyuan">
+            <div style="letter-spacing:2px;">设备总数</div>
+            <span style="font-family: 'arialbd';letter-spacing:2px;color: #00FFFF;font-size: 20px;">12345</span>
+        </div>
+        <div class="usernum">
+            <div class="usernumin in1">
+                 <span> ● </span>
+                 <span style="color: #fff;">在线数量 </span>
+                 <span style="font-family: 'arialbd';letter-spacing:2px;"> : 1234</span>
+            </div>
+            <div class="usernumin in2">
+                <span> ● </span>
+                <span style="color: #fff;">离线数量 </span>
+                <span style="font-family: 'arialbd';letter-spacing:2px;"> : 1234</span>
+           </div>
+           <div class="usernumin in3">
+                <span> ● </span>
+                <span style="color: #fff;">报警数量 </span>
+                <span style="font-family: 'arialbd';letter-spacing:2px;"> : 1234</span>
+            </div>
         </div>
     </div>
 </template>
@@ -106,9 +224,37 @@
 <script>
     // 引入基本模板
     import * as echarts from 'echarts';
+    // import RightPic from "Rightpic.vue";
     export default {
+        // components: {
+        //     RightPic,
+        // },
         data () {
             return {
+                timer: null,
+        repeatFinshed: false,
+        tableHeight: 202,
+        tableData: [],
+        scrollHeight: 0,
+                tableData: [{
+                    unitName: '2016-05-02',
+                    detectorType: '王小虎',
+                    statusName: '上海市普陀区金沙江路 1518 弄',
+                    alarmTime: '王小虎',
+                    handledStatus: '王小虎',
+        }, {
+                    unitName: '2016-05-02',
+                    detectorType: '王小虎',
+                    statusName: '上海市普陀区金沙江路 1518 弄',
+                    alarmTime: '王小虎',
+                    handledStatus: '王小虎',
+        },{
+                    unitName: '2016-05-02',
+                    detectorType: '王小虎',
+                    statusName: '上海市普陀区金沙江路 1518 弄',
+                    alarmTime: '王小虎',
+                    handledStatus: '王小虎',
+        }],
                 dataall:{
                     xunchaAllOne1: 1,
                     xunchaAllOne2: 3,
@@ -313,8 +459,40 @@
             this.drawLine(this.datanow);
             this.drawLine2(this.datanow);
             this.drawLine3(this.datanow);
+            this.getScrollHeight();
         },
         methods: {
+            getScrollHeight() {
+        const selectWrap = this.$refs.table.$el.querySelector(
+          ".el-table__body-wrapper"
+        );
+        // 列表
+        const select = this.$refs.table.$el
+          .querySelector(".el-table__body-wrapper")
+          .querySelector(".el-table__body");
+        // 列表容器高度
+        const { height: heightWrapper } = selectWrap.getBoundingClientRect();
+        // 列表高度
+        const { height: heightSelect } = select.getBoundingClientRect();
+        // 滚动条的高度 = 列表高度-列表容器高度
+        this.scrollHeight = heightSelect - heightWrapper;
+        this.timerAni();
+      },
+      timerAni() {
+        const selectWrap = this.$refs.table.$el.querySelector(
+          ".el-table__body-wrapper"
+        );
+        this.timer = setInterval(() => {
+          if (selectWrap.scrollTop == this.scrollHeight) {
+            selectWrap.scrollTop = 1;
+          }
+          selectWrap.scrollTop += 1;
+        }, 100);
+      },
+      tableEnter() {
+        console.log(123);
+        clearInterval(this.timer);
+      },
             choice(index){
                 console.log("===="+index)
                 if(index==0){
@@ -361,7 +539,7 @@
                   // data: category,
                   splitLine: {show: false},
                   axisLine: {
-                      show: true,
+                      show: false,
                       lineStyle:{
                           color: '#bbb6b6'
                       }
@@ -377,9 +555,9 @@
                yAxis: {
                   type: 'value',
                   axisLine: {
-                      show: true,
+                      show: false,
                       lineStyle:{
-                          color: '#bbb6b6'
+                          color: '#688AB6'
                       }
                   },
                   axisTick: {
@@ -400,17 +578,35 @@
                       showSymbol: false,
                       hoverAnimation: false,
                       data: data.zhuzhuang,
-                      barWidth: 10, //柱图宽度
+                      barWidth: 18, //柱图宽度
                       // barCategoryGap:'60%',
-                      itemStyle: { //左面
-                      normal: {
-                          color:new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                              { offset: 0, color: '#49bbbb' },
-                              //   { offset: 0.5, color: '#188df0' },
-                              { offset: 1, color: '#188df0' }
-                              ]),
-                          barBorderRadius:[4,0,0,100],
-                      }
+                      itemStyle:{
+            　　　　　　　　normal:{
+                            label:{
+                                show: true, //开启显示
+                                position: 'top', //在上方显示
+                                textStyle: { //数值样式
+                                    color: '#688AB6',
+                                    fontSize: 12
+                                }
+                            },
+                              barBorderRadius: [5,5,0,0],
+            　　　　　　　　　　//每个柱子的颜色即为colorList数组里的每一项,如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+            　　　　　　　　　　color: function (params){
+            　　　　　　　　　　　　//我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
+            　　　　　　　　　　　　  var colorList = [['#00ffff','#00fbfb80','#112238'],['#198EF0','#198ef099','#112238']];
+                                    var index=params.dataIndex;
+                                    if(params.dataIndex >= colorList.length){
+                                    index=params.dataIndex-colorList.length;
+                                    }
+
+            　　　　　　　　　　　  return new echarts.graphic.LinearGradient(0, 0, 0, 1,[
+            　　　　　　　　　　　　　　       {offset: 0, color: colorList[index][0]},
+            　　　　　　　　　　　　　　       {offset: 0.5, color: colorList[index][1]},
+            　　　　　　　　　　　　　　       {offset: 1, color: colorList[index][2]}
+            　　　　　　　　　　　　　     ]);
+            　　　　　　　　　　}
+                        }
                       }
                   },{
                       name:'资源数量统计',
@@ -419,84 +615,16 @@
                       },
                       type: 'bar',
                       barWidth:10,
-                      // barCategoryGap:'60%',
-                      itemStyle:{       //右面
-                          normal:{
-                              color:new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                              { offset: 0, color: '#49bbbb' },
-                              //   { offset: 0.5, color: '#188df0' },
-                              { offset: 1, color: '#188df0' }
-                              ]),
-                          borderWidth:0.1,
-                          barBorderRadius:[0,5,100,0]
-                          }
-                      },
-                      data: data.zhuzhuang,
-                      barGap:0
                   },{
                       name:'b',
                       tooltip:{
                       show:false
                       },
-                      type: 'pictorialBar',
-                      itemStyle: {  //顶部
-                          normal: {
-                          color:function(params) {
-                          let colorList = ["#48D9F5"];
-                          return colorList[0];
-                          },
-                          borderColor:'#000',
-                          borderWidth:0.1,
-                          label: {
-                          show: true, //开启显示
-                          position: 'top', //在上方显示
-                          textStyle: { //数值样式
-                              color :'#bbb6b6',
-                              fontSize: 14,
-                              fontFamily:'微软雅黑',
-                          },
-                          offset:[0,-2]
-                          }
-                      }
-                      },
-                      symbol: 'diamond',
-                      symbolSize: ['20.5','13'],
-                      symbolOffset:[0,'-38%'],
-                      symbolPosition: 'end',
-                      data: data.zhuzhuang,
-                      z:3
                   },{
                       name:'d',
                       tooltip:{
                       show:false
                       },
-                      type: 'pictorialBar',
-                      itemStyle: {  //底部
-                          normal: {
-                          color:function(params) {
-                          let colorList = ["#48D9F5"];
-                          return colorList[0];
-                          },
-                          borderColor:'#000',
-                          borderWidth:0.1,
-                          label: {
-                          show: false, //开启显示
-                          position: 'top', //在上方显示
-                          textStyle: { //数值样式
-                              color :'#bbb6b6',
-                              fontSize: 14,
-                              fontFamily:'微软雅黑',
-                          },
-                          offset:[0,-2]
-                          }
-                      }
-                      },
-                      symbol: 'diamond',
-                      symbolSize: ['20.5','17'],
-                      symbolOffset:[0,'2.5'],
-                      symbolPosition: 'start',
-                      data: data.zhuzhuang,
-                      z:0
                   }
               ]
           });
@@ -579,44 +707,84 @@
             },
             drawLine3(data){
                 // 基于准备好的dom，初始化echarts实例
-                let myChart31 = echarts.init(document.getElementById('main31'))
-                let myChart32 = echarts.init(document.getElementById('main32'))
+                let myChart31 = echarts.init(document.getElementById('huan'))
+                // let myChart32 = echarts.init(document.getElementById('main32'))
                 // 绘制图表
                 myChart31.setOption({
-                    title: {
-                        text: '投诉统计:'+data.tousuNum,
-                        left: 'center',
-                        textStyle: {
-                            color: "#0ff"
-                        }
-                    },
-                    tooltip: {
-                        trigger: 'item'
+                    color: ['#FF4040', '#F0C41B', '#188DF0'],
+                    grid: {
+                        left: 0,
+                        // right: 0,
+                        bottom: 0,
+                        top:0,
+                        containLabel: true
                     },
+                    // grid: {
+                    //     bottom: 150,
+                    //     left: 100,
+                    //     right: '10%'
+                    // },
+                    
                     series: [
+                        // 主要展示层的
                         {
-                            name: '投诉统计',
+                            radius: ['75%', '65%'],
+                            center: ['50%', '50%'],
                             type: 'pie',
-                            radius: ['50%', '70%'],
-                            center: ['50%', '60%'],
-                            avoidLabelOverlap: false,
-                            label: {
-                                show: false,
-                                position: 'center'
+                            itemStyle: {
+                                borderRadius: 20,
                             },
-                            emphasis: {
-                                label: {
-                                    show: true,
-                                    fontSize: '40',
-                                    fontWeight: 'bold'
+                            label: {
+                                normal: {
+                                    show: false,
+                                    textStyle: {
+                                        fontSize: 13,
+                                    },
+                                    position: 'outside'
+                                },
+                                emphasis: {
+                                    show: false
                                 }
                             },
                             labelLine: {
-                                show: false
+                                normal: {
+                                    show: false,
+                                    length: 20,
+                                    length2: 35
+                                },
+                                emphasis: {
+                                    show: true
+                                }
                             },
-                            data: data.tousu,
-                            color:["#00ffff","#FF4040"]
-                        }
+                            name: "民警训练总量",
+                            data: [{"name": "报警数量","value": 10}, 
+                                {"name": "离线数量","value": 30}, 
+                                { "name": "在线数量","value": 100},  ],
+                        },
+                        // 边框的设置
+                        {
+                            name: '外边框',
+                            type: 'pie',
+                            clockWise: false, //顺时加载
+                            hoverAnimation: false, //鼠标移入变大
+                            center: ['50%', '50%'],
+                            radius: ['80%', '80%'],
+                            label: {
+                                normal: {
+                                    show: false
+                                }
+                            },
+                            data: [{
+                                value: 9,
+                                name: '',
+                                itemStyle: {
+                                    normal: {
+                                        borderWidth: 2,
+                                        borderColor: '#61bad3'
+                                    }
+                                }
+                            }]
+                        },
                     ]
                 });
                 myChart32.setOption({
@@ -692,11 +860,10 @@
     line-height: 30px;
     color: #ffffff;
     padding-left: 10px;
-    margin-top: 10px;
     font-weight: 700;
     font-style: italic;
     margin-left: 10px;
-    background-image: linear-gradient(to left, #121a22, rgb(49 151 195 / 70%) 50%, #112238);
+    background-image: linear-gradient(to left, #112238, rgb(49 151 195 / 70%) 50%, #112238);
 }
 .dot {
         display: inline-block;
@@ -746,4 +913,70 @@
             transform: scale(2.4)
         }
     }
+    .outuser{
+        width: 450px;
+        height: 60px;
+    }
+    .outuserone{
+        width: 50%;
+        height: 100%;
+        text-align: center;
+        float: left;
+        color: #E8F2FF;
+    }
+    .outusertwo{
+        width: 50%;
+        height: 100%;
+        text-align: center;
+        float: right;
+        color: #E8F2FF;
+    }
+    .outuserspan{
+        font-family: 'arialbd';
+        font-size: 28px;
+        color: #00FFFF;
+        letter-spacing:8px;
+    }
+    .usernum{
+        width: 100%;
+        height: 20px;
+    }
+    .usernumin{
+        float: left;
+        margin-left: 15px;
+        font-size: 15px;
+    }
+    .in1{
+        color: #188DF0;
+    }
+    .in2{
+        color: #F0C41B;
+    }
+    .in3{
+        color: #FF4040;
+    }
+    .inyuan{
+        width: 106px;
+        height: 106px;
+        border-radius: 50%;
+        border: 2px solid #125c9b;
+        position: fixed;
+        margin-bottom: 10px;
+        margin-top: -138px;
+        margin-left: 172px;
+        font-size: 15px;
+        color: #fff;
+        text-align: center;
+        line-height: 25px;
+        padding: 28px 0px 0px 0px;
+        background-image: linear-gradient(to left, #112238, #003E8D, #112238);
+    }
+    .b_list{
+        height: 100%;
+        overflow: hidden;
+    }
+.el-table__body-wrapper {
+    overflow-x: hidden !important;
+    overflow-y: hidden !important;
+  }
 </style>

gassafetyprogress-web/src/directive/permission/index.js

+/*
+ * @Author: your name
+ * @Date: 2022-01-07 11:29:13
+ * @LastEditTime: 2022-02-25 17:17:17
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /newDev/gassafety-progress/gassafetyprogress-web/src/directive/permission/index.js
+ */
 import hasRole from './hasRole'
 import hasPermi from './hasPermi'
+import unValue from './unValue'
 
 const install = function(Vue) {
   Vue.directive('hasRole', hasRole)
   Vue.directive('hasPermi', hasPermi)
+  Vue.directive('unValue', unValue)
 }
 
 if (window.Vue) {

gassafetyprogress-web/src/directive/permission/unValue.js

+/*
+ * @Author: your name
+ * @Date: 2022-02-25 17:07:40
+ * @LastEditTime: 2022-02-25 17:15:54
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /newDev/gassafety-progress/gassafetyprogress-web/src/directive/permission/hasValue.js
+ */
+/**
+ * 无内容显示-
+ * Copyright (c) 2021 gassafety
+ */
+
+ export default {
+  inserted(el, binding, vnode) {
+    console.log("el",el)
+    el.innerHTML = el.innerHTML.replace(/\s+/g, "") ? el.innerHTML : "-";
+  }
+};

gassafetyprogress-web/src/store/getters.js

+/*
+ * @Author: your name
+ * @Date: 2022-01-07 11:29:13
+ * @LastEditTime: 2022-02-25 15:36:12
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /newDev/gassafety-progress/gassafetyprogress-web/src/store/getters.js
+ */
 const getters = {
   sidebar: state => state.app.sidebar,
   size: state => state.app.size,
@@ -10,9 +18,11 @@ const getters = {
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,
+  systemSetting: state => state.user.systemSetting,
   permission_routes: state => state.permission.routes,
   topbarRouters:state => state.permission.topbarRouters,
   defaultRoutes:state => state.permission.defaultRoutes,
   sidebarRouters:state => state.permission.sidebarRouters,
+  company:state=>state.bigWindowCompany.company,
 }
 export default getters

gassafetyprogress-web/src/store/index.js

+/*
+ * @Author: your name
+ * @Date: 2022-01-07 11:29:13
+ * @LastEditTime: 2022-02-25 15:36:22
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /newDev/gassafety-progress/gassafetyprogress-web/src/store/index.js
+ */
 import Vue from 'vue'
 import Vuex from 'vuex'
 import app from './modules/app'
 import user from './modules/user'
+import bigWindowCompany from './modules/bigWindowCompany'
+
 import tagsView from './modules/tagsView'
 import permission from './modules/permission'
 import settings from './modules/settings'
@@ -15,7 +25,8 @@ const store = new Vuex.Store({
     user,
     tagsView,
     permission,
-    settings
+    settings,
+    bigWindowCompany
   },
   getters
 })

gassafetyprogress-web/src/store/modules/bigWindowCompany.js

+/*
+ * @Author: your name
+ * @Date: 2022-02-25 13:53:11
+ * @LastEditTime: 2022-02-25 15:01:59
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /newDev/gassafety-progress/gassafetyprogress-web/src/store/modules/bigWindowDevice.js
+ */
+import { getCompany } from "@/api/bigWindow/getDevice";
+
+const state = {
+  // 公司名称
+  company: {},
+};
+
+const mutations = {
+  SET_COMPANY: (state, company) => {
+    state.company = company.map((item) => ({
+      conpanyId: item.enterpriseId,
+      companyName: item.enterpriseName,
+    }));
+    console.log(state.company);
+  },
+};
+
+const actions = {
+  // 登录
+  GetCompany({ commit }) {
+    getCompany().then((res) => {
+      commit("SET_COMPANY", res);
+    });
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

gassafetyprogress-web/src/store/modules/user.js

@@ -57,9 +57,8 @@ const user = {
         })
       })
     },
-
     // 获取用户信息
-    GetInfo({ commit, state }) {
+    GetInfo({ commit, state,dispatch}) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.user
@@ -77,6 +76,12 @@ const user = {
           commit('SET_SYSTEMSETTING', res.systemSetting)
           commit('SET_POSTS',res.posts)
           commit('SET_ENTERPRISEID',user.deptId)
+
+          // 大屏公司获取 
+          // 第一个参数是其他模块的 actions 路径, 
+          // 第二个是传给 actions 的数据, 如果不需要传数据, 也必须预留, 
+          // 第三个参数是配置选项, 申明这个 acitons 不是当前模块的
+          dispatch("bigWindowCompany/GetCompany",{},{root:true})
          console.log(res.systemSetting)
           resolve(res)
         }).catch(error => {

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

 /*
  * @Author: your name
  * @Date: 2022-01-26 10:47:44
- * @LastEditTime: 2022-02-17 10:20:02
+ * @LastEditTime: 2022-02-25 11:19:55
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/utils/config.js
  */
+import store from '@/store'
 
 export const pipeColor = {
   1: "#2EE7E7",
@@ -20,11 +21,11 @@ export const pipePressure = {
   4: "高压",
 };
 export const svgUrl = {
-  2: require("@/assets/image/smalltyx.svg"),
-  3: require("@/assets/image/smallfmj.svg"),
-  4: require("@/assets/image/smallcz.svg"),
-  5: require("@/assets/image/smalljk.svg"),
-  6: require("@/assets/image/smalluser.svg"),
+  2: require("@/assets/image/tiaoyaxiang1.svg"),
+  3: require("@/assets/image/famen1.svg"),
+  4: require("@/assets/image/changzhan1.svg"),
+  5: require("@/assets/image/jiankong1.svg"),
+  6: require("@/assets/image/user1.svg"),
 };
 export const deviceType = {
   1:"管道",
@@ -33,13 +34,11 @@ export const deviceType = {
   4:"厂站",
   5:"监控",
   6:"用户",
-
-
 };
 
 
 export const companyType = {
-  1: "中燃详科技",
+  1: "中燃翔科",
   2: "中诚燃气",
   3: "中燃韵科",
 };
@@ -55,7 +54,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "平山医院起南至北泽营村西转至联谊小区",
       coordinates:
         "[['114.165756','38.270519'],['114.16394','38.259056'],['114.173441','38.261087'],['114.181729','38.260066'],['114.181353','38.258139']]",
@@ -80,7 +79,7 @@ export const pipeData = {
 	  buildyear: "2019-03-05",
 	  buildCompany: "通达管道",
 	  powerCompany: "河北泽宏科技",
-	  type: "1",
+	  iconType: "1",
 	  pipeAddr: "主管道至小区",
 	  coordinates:
 	    "[['114.165756','38.270519'],['114.16394','38.259056'],['114.173441','38.261087'],['114.181729','38.260066'],['114.181353','38.258139']]",
@@ -105,7 +104,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "县标附近",
       coordinates:
         "[['114.230778','38.245679'],['114.2247','38.250897'],['114.224562','38.261364']]",
@@ -131,7 +130,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "万寿路",
       coordinates:
         "[['114.164962','38.267811'],['114.176895','38.265525'],['114.176841','38.266408'],['114.177005','38.2655'],['114.177525','38.265473'],['114.176736','38.260898']]",
@@ -156,7 +155,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "万寿路北至君越新城",
       coordinates: "[['114.169352','38.267135'],['114.169884','38.272885']]",
       pipeLength: 1566,
@@ -180,7 +179,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "县标附近",
       coordinates: "[['114.214022','38.258963'],['114.215367','38.25898']]",
       pipeLength: 2222,
@@ -204,7 +203,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "平山职教",
       coordinates: "[['114.214073','38.260813'],['114.22451','38.260829']]",
       pipeLength: 3333,
@@ -231,7 +230,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "县标北街",
       coordinates: "[['114.218693','38.260779'],['114.218611','38.256284']]",
       pipeLength: 4444,
@@ -258,7 +257,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "冶河西路",
       coordinates:
         "[['114.18219','38.260066'],['114.19217','38.259316'],['114.197248','38.257486'],['114.196603','38.252102']]",
@@ -285,7 +284,7 @@ export const pipeData = {
 	  buildyear: "2019-03-05",
 	  buildCompany: "通达管道",
 	  powerCompany: "河北泽宏科技",
-	  type: "1",
+	  iconType: "1",
 	  pipeAddr: "冶河西路至县政府",
 	  coordinates:
 	    "[['114.18219','38.260066'],['114.19217','38.259316'],['114.197248','38.257486'],['114.196603','38.252102']]",
@@ -313,7 +312,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "农业发展银行",
       coordinates: "[['114.218713','38.258906'],['114.224584','38.258835']]",
       pipeLength: 5555,
@@ -342,7 +341,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "东川街",
       coordinates:
         "[['114.214054','38.260844'],['114.213974','38.254076'],['114.213408','38.254092'],['114.213469','38.254361'],['114.212581','38.25444']]",
@@ -373,7 +372,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "冶河东路县标路",
       coordinates: "[['114.214047','38.255516'],['114.224573','38.25477']]",
       pipeLength: 7777,
@@ -400,7 +399,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "柏坡路西管道",
       coordinates:
         "[['114.192016','38.259428'],['114.192084','38.262565'],['114.185358','38.264907'],['114.182205','38.267273']]",
@@ -425,7 +424,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "冶河东路",
       coordinates:
         "[['114.213893','38.255564'],['114.210696','38.255975'],['114.210782','38.256901']]",
@@ -450,7 +449,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "补充管道",
       coordinates: "[['114.17755','38.265569'],['114.183482','38.264881']]",
       pipeLength: 1020,
@@ -474,7 +473,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "冶河东路",
       coordinates:
         "[['114.213714','38.255604'],['114.210617','38.255911'],['114.210816','38.256907'],['114.210297','38.256942']]",
@@ -504,7 +503,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "康乐街",
       coordinates:
         "[['114.198561','38.26075'],['114.197173','38.257331'],['114.195376','38.241776']]",
@@ -531,7 +530,7 @@ export const pipeData = {
 	  buildyear: "2019-03-05",
 	  buildCompany: "通达管道",
 	  powerCompany: "河北泽宏科技",
-	  type: "1",
+	  iconType: "1",
 	  pipeAddr: "康乐街岔口",
 	  coordinates:
 	    "[['114.198561','38.26075'],['114.197173','38.257331'],['114.195376','38.241776']]",
@@ -558,7 +557,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "平逛大街管道",
       coordinates:
         "[['114.206898','38.259072'],['114.20675','38.25672'],['114.20636','38.256667'],['114.206091','38.254336'],['114.203067','38.254602'],['114.206031','38.254312'],['114.204425','38.242844']]",
@@ -584,7 +583,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "建材路",
       coordinates:
         "[['114.196617','38.250493'],['114.20038','38.250411'],['114.200407','38.249479'],['114.200471','38.250448'],['114.212646','38.249688']]",
@@ -611,7 +610,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "育才路",
       coordinates:
         "[['114.204944','38.246514'],['114.200095','38.246834'],['114.200009','38.246312'],['114.200095','38.246919'],['114.196061','38.24702']]",
@@ -644,7 +643,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "县标南街",
       coordinates:
         "[['114.219113','38.255163'],['114.21852','38.254677'],['114.21848','38.253932'],['114.218508','38.253723']]",
@@ -670,7 +669,7 @@ export const pipeData = {
 	  buildyear: "2019-03-05",
 	  buildCompany: "通达管道",
 	  powerCompany: "河北泽宏科技",
-	  type: "1",
+	  iconType: "1",
 	  pipeAddr: "主管道至高村",
 	  coordinates:
 	    "[['114.219113','38.255163'],['114.21852','38.254677'],['114.21848','38.253932'],['114.218508','38.253723']]",
@@ -696,7 +695,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "县标南街",
       coordinates:
         "[['114.21848','38.253942'],['114.218745','38.25395'],['114.21881','38.253812']]",
@@ -725,7 +724,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "馨园小区",
       coordinates:
         "[['114.218635','38.257154'],['114.218743','38.257137'],['114.218851','38.25712']]",
@@ -754,7 +753,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "平安2期",
       coordinates: "[['114.223146','38.260833'],['114.223162','38.261592']]",
       pipeLength: 1313,
@@ -781,7 +780,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "蒲胜大街胜佛完全小学",
       coordinates:
         "[['114.224161','38.260852'],['114.224245','38.258921'],['114.224898','38.258927'],['114.224866','38.259535']]",
@@ -811,7 +810,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "蒲胜大街",
       coordinates: "[['114.22426','38.25881'],['114.224261','38.258908']]",
       pipeLength: 1515,
@@ -838,7 +837,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "县标北街宏鹏公司",
       coordinates: "[['114.219001','38.258896'],['114.218975','38.258319']]",
       pipeLength: 1616,
@@ -865,7 +864,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "电大街石上流名苑",
       coordinates: "[['114.22432','38.254788'],['114.224201','38.253337']]",
       pipeLength: 1717,
@@ -889,7 +888,7 @@ export const pipeData = {
           buildyear: "2019-03-05",
           buildCompany: "通达管道",
           powerCompany: "河北泽宏科技",
-          type: "1",
+          iconType: "1",
           pipeAddr: "电大街石上流名苑1",
           coordinates: "[['114.22432','38.254788'],['114.224201','38.253337']]",
           pipeLength: 1717,
@@ -913,7 +912,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "河北盛源纺织厂",
       coordinates: "[['114.224519','38.254773'],['114.22561','38.254644']]",
       pipeLength: 1818,
@@ -940,7 +939,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "东街二小",
       coordinates:
         "[['114.207004','38.259314'],['114.212714','38.258958'],['114.214018','38.258981']]",
@@ -969,7 +968,7 @@ export const pipeData = {
       buildyear: "2019-03-05",
       buildCompany: "通达管道",
       powerCompany: "河北泽宏科技",
-      type: "1",
+      iconType: "1",
       pipeAddr: "东街二小",
       coordinates: "[['114.212656','38.258981'],['114.212534','38.25764']]",
       pipeLength: 2020,
@@ -995,7 +994,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 171,
       enterpriseId: 3,
-      type: "2",
+      iconType: "2",
       deviceName: "河北骐进汽车贸易有限公司食堂",
       deviceCode: "HBS11b-III0001005",
       deviceAddr: "河北骐进汽车贸易有限公司食堂",
@@ -1077,7 +1076,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 172,
       enterpriseId: 1,
-      type: "2",
+      iconType: "2",
       deviceName: "胡家大厨",
       deviceCode: "HBS11C0002002",
       deviceAddr: "胡家大厨",
@@ -1138,7 +1137,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 173,
       enterpriseId: 1,
-      type: "2",
+      iconType: "2",
       deviceName: "财政局食堂",
       deviceCode: "HBS11b-III0001007",
       deviceAddr: "财政局",
@@ -1202,7 +1201,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 174,
       enterpriseId: 1,
-      type: "2",
+      iconType: "2",
       deviceName: "平山县供热局",
       deviceCode: "HBS11b-III0001015",
       deviceAddr: "平山县供热局",
@@ -1229,7 +1228,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 175,
       enterpriseId: 1,
-      type: "2",
+      iconType: "2",
       deviceName: "圣源纺织有限公司",
       deviceCode: "HBS11b-III0001011",
       deviceAddr: "圣源纺织有限公司",
@@ -1263,7 +1262,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 176,
       enterpriseId: 1,
-      type: "2",
+      iconType: "2",
       deviceName: "老干部局",
       deviceCode: "HBS11b-III0001008",
       deviceAddr: "老干部局",
@@ -1347,7 +1346,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 177,
       enterpriseId: 2,
-      type: "2",
+      iconType: "2",
       deviceName: "二军美食",
       deviceCode: "HBS11b-III0001009",
       deviceAddr: "二军美食",
@@ -1422,7 +1421,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 178,
       enterpriseId: 1,
-      type: "2",
+      iconType: "2",
       deviceName: "川府玉龙火锅城",
       deviceCode: "HBS11b-III0001016",
       deviceAddr: "川府玉龙火锅城",
@@ -1483,7 +1482,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 179,
       enterpriseId: 3,
-      type: "2",
+      iconType: "2",
       deviceName: "平山特殊教育学校",
       deviceCode: "HBS11b-III0021001",
       deviceAddr: "平山特殊教育学校",
@@ -1503,7 +1502,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 180,
       enterpriseId: 2,
-      type: "2",
+      iconType: "2",
       deviceName: "国税局食堂",
       deviceCode: "HBS11b-III0001002",
       deviceAddr: "国税局",
@@ -1578,7 +1577,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 181,
       enterpriseId: 1,
-      type: "2",
+      iconType: "2",
       deviceName: "尚客优",
       deviceCode: "HBS11b-III0022001",
       deviceAddr: "尚客优",
@@ -1640,7 +1639,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 182,
       enterpriseId: 1,
-      type: "2",
+      iconType: "2",
       deviceName: "平山县幼儿园",
       deviceCode: "HBS11b-III0024001",
       deviceAddr: "平山县幼儿园",
@@ -1681,7 +1680,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 183,
       enterpriseId: 2,
-      type: "2",
+      iconType: "2",
       deviceName: "外国语学校",
       deviceCode: "HBS11C0004001",
       deviceAddr: "平山县外国语学校",
@@ -1729,7 +1728,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 184,
       enterpriseId: 1,
-      type: "2",
+      iconType: "2",
       deviceName: "平山第二中学",
       deviceCode: "HBS11C0005001",
       deviceAddr: "平山第二中学",
@@ -1783,7 +1782,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 185,
       enterpriseId: 2,
-      type: "2",
+      iconType: "2",
       deviceName: "地税局食堂",
       deviceCode: "HBS11b-III0001003",
       deviceAddr: "地税局食堂",
@@ -1831,7 +1830,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 186,
       enterpriseId: 1,
-      type: "2",
+      iconType: "2",
       deviceName: "人民政府办公室食堂",
       deviceCode: "HBS11b-III0001019",
       deviceAddr: "人民政府办公室食堂",
@@ -1885,7 +1884,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 187,
       enterpriseId: 2,
-      type: "2",
+      iconType: "2",
       deviceName: "柏东购物广场",
       deviceCode: "HBS11b-III0001017",
       deviceAddr: "柏东购物广场",
@@ -1954,7 +1953,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 188,
       enterpriseId: 2,
-      type: "2",
+      iconType: "2",
       deviceName: "平山中学",
       deviceCode: "HBS11C0006001",
       deviceAddr: "平山中学",
@@ -2002,7 +2001,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 189,
       enterpriseId: 2,
-      type: "2",
+      iconType: "2",
       deviceName: "实验中学",
       deviceCode: "HBS11C0003003",
       deviceAddr: "实验中学",
@@ -2084,7 +2083,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 190,
       enterpriseId: 2,
-      type: "2",
+      iconType: "2",
       deviceName: "手切羊肉",
       deviceCode: "HBS11b-III0001012",
       deviceAddr: "手切羊肉",
@@ -2159,7 +2158,7 @@ export const tiaoyaxiang = {
     {
       deviceId: 191,
       enterpriseId: 2,
-      type: "2",
+      iconType: "2",
       deviceName: "爱心幼儿园",
       deviceCode: "HBS11b-III0023001",
       deviceAddr: "爱心幼儿园",
@@ -2214,7 +2213,7 @@ export const famen = {
       enterpriseId: 1,
       pipeName: "县标附近",
       deviceName: "球阀",
-      type: "3",
+      iconType: "3",
       deviceAddr: "县标附近",
       longitude: 114.218928,
       latitude: 38.257105,
@@ -2298,7 +2297,7 @@ export const famen = {
       enterpriseId: 3,
       pipeName: "蒲胜大街",
       deviceName: "球阀",
-      type: "3",
+      iconType: "3",
       deviceAddr: "电厂街金水家园",
       longitude: 114.233671,
       latitude: 38.239385,
@@ -2375,7 +2374,7 @@ export const famen = {
       pipeId: 151,
       pipeName: "蒲胜大街",
       deviceName: "球阀",
-      type: "3",
+      iconType: "3",
       deviceAddr: "蒲胜大街蒲吾村卫生室",
       longitude: 114.225102,
       latitude: 38.251989,
@@ -2424,7 +2423,7 @@ export const famen = {
       enterpriseId: 3,
       pipeName: "蒲胜大街",
       deviceName: "球阀",
-      type: "3",
+      iconType: "3",
       deviceAddr: "蒲胜大街县标路",
       longitude: 114.223456,
       latitude: 38.254096,
@@ -2471,7 +2470,7 @@ export const famen = {
       enterpriseId: 1,
       pipeName: "平山农业发展银行",
       deviceName: "球阀",
-      type: "3",
+      iconType: "3",
       deviceAddr: "蒲胜大街光荣路公园首府北门",
       longitude: 114.223296,
       latitude: 38.25857,
@@ -2518,7 +2517,7 @@ export const famen = {
       enterpriseId: 3,
       pipeName: "蒲胜大街",
       deviceName: "球阀",
-      type: "3",
+      iconType: "3",
       deviceAddr: "蒲胜大街逸格小区",
       longitude: 114.224964,
       latitude: 38.258138,
@@ -2565,7 +2564,7 @@ export const famen = {
       enterpriseId: 1,
       pipeName: "平山农业发展银行",
       deviceName: "球阀",
-      type: "3",
+      iconType: "3",
       deviceAddr: "光荣路农业银行附近",
       longitude: 114.220892,
       latitude: 38.258482,
@@ -2629,7 +2628,7 @@ export const famen = {
       enterpriseId: 1,
       pipeName: "县标北街",
       deviceName: "球阀",
-      type: "3",
+      iconType: "3",
       deviceAddr: "县标北街上海花朵国际幼儿园",
       longitude: 114.218296,
       latitude: 38.249633,
@@ -2691,7 +2690,7 @@ export const famen = {
       enterpriseId: 3,
       pipeName: "蒲胜大街",
       deviceName: "球阀",
-      type: "3",
+      iconType: "3",
       deviceAddr: "蒲胜大街平山县维赢培训学校",
       longitude: 114.22492,
       latitude: 38.257326,
@@ -2767,7 +2766,7 @@ export const famen = {
       enterpriseId: 1,
       pipeName: "冶和西路",
       deviceName: "阀门井",
-      type: "3",
+      iconType: "3",
       deviceAddr: "也和西路",
       longitude: 114.169366,
       latitude: 38.262576,
@@ -2815,7 +2814,7 @@ export const famen = {
       enterpriseId: 1,
       pipeName: "冶和西路",
       deviceName: "阀门井",
-      type: "3",
+      iconType: "3",
       deviceAddr: "冶河西路",
       longitude: 114.179455,
       latitude: 38.260659,
@@ -2873,7 +2872,7 @@ export const changzhan = {
     {
       stationName: "平山加气站",
       stationType: "1",
-      type: "4",
+      iconType: "4",
       stationAddr: "建材路加气站",
       longitude: 114.214268,
       latitude: 38.255332,
@@ -2957,7 +2956,7 @@ export const changzhan = {
     {
       stationName: "南区储备站",
       stationType: "4",
-      type: "4",
+      iconType: "4",
       stationAddr: "黄壁庄水库储备站",
       longitude: 114.219268,
       latitude: 38.265332,
@@ -2972,7 +2971,7 @@ export const changzhan = {
     {
       stationName: "门站",
       stationType: "2",
-      type: "4",
+      iconType: "4",
       stationAddr: "天圣华庭东南角",
       longitude: 114.200191,
       latitude: 38.239509,
@@ -3055,7 +3054,7 @@ export const changzhan = {
     {
       stationName: "工业路储备站",
       stationType: "4",
-      type: "4",
+      iconType: "4",
       stationAddr: "工业路东头",
       longitude: 114.217268,
       latitude: 38.245332,
@@ -3131,7 +3130,7 @@ export const changzhan = {
     {
       stationName: "东区调压站",
       stationType: "3",
-      type: "4",
+      iconType: "4",
       stationAddr: "调压站",
       longitude: 114.217268,
       latitude: 38.252332,
@@ -3173,7 +3172,7 @@ export const changzhan = {
     {
       stationName: "储备站",
       stationType: "4",
-      type: "4",
+      iconType: "4",
       stationAddr: "天圣华庭东",
       longitude: 114.219268,
       latitude: 38.254332,
@@ -3237,7 +3236,7 @@ export const changzhan = {
     {
       stationName: "东关小学东调压站",
       stationType: "3",
-      type: "4",
+      iconType: "4",
       stationAddr: "平山镇东关小学东",
       longitude: 114.217268,
       latitude: 38.258332,
@@ -3272,7 +3271,7 @@ export const changzhan = {
     {
       stationName: "北外环储备站",
       stationType: "4",
-      type: "4",
+      iconType: "4",
       stationAddr: "东北外环西南侧",
       longitude: 114.164342,
       latitude: 38.262435,
@@ -3465,7 +3464,7 @@ export const jiankong = {
       longitude: 114.218268,
       latitude: 38.255332,
       videoAddress: "县标",
-      type: "5", //分类
+      iconType: "5", //分类
     },
   ],
   company2: [
@@ -3478,7 +3477,7 @@ export const jiankong = {
       longitude: 114.203785,
       latitude: 38.2576,
       videoAddress: "中山广场",
-      type: "5",
+      iconType: "5",
     },
   ],
   company3: [
@@ -3491,7 +3490,7 @@ export const jiankong = {
       longitude: 114.203785,
       latitude: 38.2596,
       videoAddress: "中山广场",
-      type: "5",
+      iconType: "5",
     },
   ],
 };
@@ -3501,7 +3500,7 @@ export const user = {
     {
       usrName: "燕恒服装有限公司",
       usrType: "2",
-      type: "6",
+      iconType: "6",
       longitude: 114.231107,
       latitude: 38.263602,
       phone: "18230055268",
@@ -3511,7 +3510,7 @@ export const user = {
     {
       usrName: "正兴钢圈",
       usrType: "1",
-      type: "6",
+      iconType: "6",
       longitude: 114.173669,
       latitude: 38.281955,
       phone: "15600044233",
@@ -3523,7 +3522,7 @@ export const user = {
     {
       usrName: "敬业宾馆",
       usrType: "2",
-      type: "6",
+      iconType: "6",
       longitude: 114.221158,
       latitude: 38.264802,
       phone: "15233048268",
@@ -3535,7 +3534,7 @@ export const user = {
     {
       usrName: "张小娴",
       usrType: "1",
-      type: "6",
+      iconType: "6",
       longitude: 114.211766,
       latitude: 38.265589,
       phone: "13363022635",
@@ -3545,7 +3544,7 @@ export const user = {
     {
       usrName: "李小迪",
       usrType: "1",
-      type: "6",
+      iconType: "6",
       longitude: 114.190207,
       latitude: 38.271492,
       phone: "13363022635",

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

 /*
  * @Author: your name
  * @Date: 2022-01-11 13:45:12
- * @LastEditTime: 2022-02-17 10:12:27
+ * @LastEditTime: 2022-02-26 09:55:44
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/utils/mapClass.js
@@ -31,7 +31,7 @@ export class EditorMap {
   mouseToolPolineOptions = null;
 
   // 存放所有的设备的数组集合，这是一个对象，对象里面是各种设备的数组
-  allDevic = {};
+  allDevice = {};
   // 存放所有的管道
   pipeArr = {};
   // 当前的infowindow的组件
@@ -247,8 +247,8 @@ export class EditorMap {
    * @return {*}
    */
   addDevice(deviceData, compontent) {
-    const { longitude: lng, latitude: lat, type, companyType } = deviceData;
-    const icon = svgUrl[type];
+    const { longitude: lng, latitude: lat, iconType } = deviceData;
+    const icon = svgUrl[iconType];
     let device = this.createMarker({
       map: this.map,
       anchor: "bottom-center",
@@ -258,10 +258,10 @@ export class EditorMap {
     });
     // device.hide();
     // 如果没有有这个公司的数组，就创建，有就直接push
-    if (!Array.isArray(this.allDevic[companyType])) {
-      this.allDevic[companyType] = [];
+    if (!Array.isArray(this.allDevice[iconType])) {
+      this.allDevice[iconType] = [];
     }
-    this.allDevic[companyType].push(device);
+    this.allDevice[iconType].push(device);
 
     // 设备的事件函数
     this.deviceEvent(device, compontent);
@@ -287,7 +287,9 @@ export class EditorMap {
    */
   markerClick(target, compontent) {
     const deviceExtData = target.getExtData();
+
     const { longitude: lng, latitude: lat } = deviceExtData;
+
     // 创建一个可以控制的组件，将其dom插入infowindow
     this.infowindowComponent = this.createInfowindowDom(
       this.vue,
@@ -295,6 +297,7 @@ export class EditorMap {
       deviceExtData,
       compontent
     );
+
     // 没恩么用，控制台测试的时候用着玩的
     window.func = () => {
       const { longitude: lng, latitude: lat } = target.getExtData();
@@ -316,6 +319,7 @@ export class EditorMap {
       anchor: "middle-left",
       offset: [20, -10],
     });
+
     this.infowindow.open(this.map);
   }
   // 创建要加入到infowindow里的
@@ -344,22 +348,25 @@ export class EditorMap {
   }
   // 地图上add管道
   addPipeLine(objData, component) {
-    const { path, pipePressure, companyType } = objData;
+    const { path, pipePressure, iconType } = objData;
+    console.log(path);
     // 根据压力获取颜色
-    const color = pipeColor[pipePressure];
+    const color = pipeColor[pipePressure + 1];
     const pipe = this.createPipeLine({
-      path,
+      path: eval(path),
       strokeWeight: 4,
       strokeColor: color,
       extData: objData,
       cursor: "pointer",
     });
+
     this.map.add(pipe);
+    console.log(pipe.getExtData());
     // pipe.hide();
-    if (!Array.isArray(this.pipeArr[companyType])) {
-      this.pipeArr[companyType] = [];
+    if (!Array.isArray(this.pipeArr[iconType])) {
+      this.pipeArr[iconType] = [];
     }
-    this.pipeArr[companyType].push(pipe);
+    this.pipeArr[iconType].push(pipe);
     // console.log(this.pipeArr);
     // this.map.panTo([path[0][0], path[0][1]]);
     this.pipeEvent(pipe, component);
@@ -380,7 +387,7 @@ export class EditorMap {
       const target = e.target;
       // 根据管道压力获取颜色
       const { pipePressure } = target.getExtData();
-      const color = pipeColor[pipePressure];
+      const color = pipeColor[pipePressure + 1];
       // 获取当前颜色
       const options = target.getOptions();
       options.strokeColor = color;
@@ -434,33 +441,56 @@ export class EditorMap {
     this.infowindow.open(this.map);
   }
   infowindowClose() {
-      if(!this.infowindow) return;
+    if (!this.infowindow) return;
     this.infowindow.close();
   }
   // 根据公司过滤是否显示 公司由一个数组传过来
   companyFilter(companyArr) {
     for (let pipeItem in this.pipeArr) {
       // 如果item属于数组说明要显示，凑则就是隐藏
-      if (companyArr.indexOf(+pipeItem) >= 0) {
-        this.pipeArr[pipeItem].forEach((pipe) => {
+      // if (companyArr.indexOf(+pipeItem+'') >= 0) {
+      //   this.pipeArr[pipeItem].forEach((pipe) => {
+      //     pipe.show();
+      //   });
+      // } else {
+      //   this.pipeArr[pipeItem].forEach((pipe) => {
+      //     pipe.hide();
+      //   });
+      // }
+      this.pipeArr[pipeItem].forEach((pipe) => {
+        const data = pipe.getExtData();
+        if (companyArr.indexOf(data.companyType + "") >= 0) {
           pipe.show();
-        });
-      } else {
-        this.pipeArr[pipeItem].forEach((pipe) => {
+        } else {
           pipe.hide();
-        });
-      }
+        }
+      });
     }
-    for (let deviceItem in this.allDevic) {
-      if (companyArr.indexOf(+deviceItem) >= 0) {
-        this.allDevic[deviceItem].forEach((device) => {
+    for (let deviceItem in this.allDevice) {
+      // if (companyArr.indexOf(+deviceItem+'') >= 0) {
+      //   this.allDevice[deviceItem].forEach((device) => {
+      //     device.show();
+      //   });
+      // } else {
+      //   this.allDevice[deviceItem].forEach((device) => {
+      //     device.hide();
+      //   });
+      // }
+      console.log(this.allDevice);
+      this.allDevice[deviceItem].forEach((device) => {
+        const data = device.getExtData();
+
+        // 燃气没有公司，所以没有device.companyType不收到公司的控制
+
+        if (
+          companyArr.indexOf(data.companyType + "") >= 0 ||
+          !data.companyType
+        ) {
           device.show();
-        });
-      } else {
-        this.allDevic[deviceItem].forEach((device) => {
+        } else {
           device.hide();
-        });
-      }
+        }
+      });
     }
   }
   // 卫星图切换

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

 <!--
  * @Author: your name
  * @Date: 2022-01-11 13:44:17
- * @LastEditTime: 2022-02-22 15:09:22
+ * @LastEditTime: 2022-02-26 10:08:49
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/views/Home.vue
@@ -13,15 +13,11 @@
     <Center :show="show" :centerData="centerData" />
     <PipeColor />
     <div class="home-div">
-      <img
-        src="@/assets/mapinages/bottombanner.png"
-        alt=""
-        style="width: 100%; height: 100%; z-index: 999"
-      />
+      <img src="@/assets/mapinages/bottombanner.png" alt="" style="" />
       <div class="listingsSty fangy">
         <div
           @click="allCompany"
-          :class="selarr.length == 3 ? 'active' : ''"
+          :class="selarr.length == companyLength ? 'active' : ''"
           class="firsty"
         >
           全部
@@ -66,21 +62,21 @@
       style="
         position: fixed;
         top: 0;
-        margin-top: 5px;
-        margin-left: 10px;
+        margin-top: 10px;
+        margin-left: 15px;
         left: 0;
         z-index: 999;
-        width: 100px;
+        width: 300px;
         height: 50px;
       "
     >
       <!-- <iframe src="../../static/weather.html" frameborder="0"></iframe> -->
       <iframe
         scrolling="no"
-        src="https://yiketianqi.com/api.php?style=ty&skin=pitaya&color=a8a5a5"
+        src="https://tianqiapi.com/api.php?style=tz&skin=pitaya&color=339CC9"
         frameborder="0"
-        width="200"
-        height="55"
+        width="400"
+        height="30"
         allowtransparency="true"
       ></iframe>
       <!-- <iframe scrolling="no" src="https://yiketianqi.com/api.php?style=ty&skin=pitaya" frameborder="0" width="300" height="75" allowtransparency="true"></iframe> -->
@@ -93,31 +89,25 @@
         position: fixed;
         top: 0;
         margin-top: 10px;
-        margin-right: 5px;
+        margin-right: 15px;
         right: 0;
         z-index: 999;
-        width: 190px;
+        width: 200px;
         height: 50px;
-        color: #a8a5a5;
+        color: #339CC9;
       "
     >
-      <div style="height: 50px; width: 49%; float: right; font-size: 14px">
-        <div>{{ nowweek }}</div>
-        <div>{{ nowDate }}</div>
-      </div>
-      <div style="height: 50px; width: 45%; line-height: 47px; font-size: 20px">
-        {{ nowtime }}
+      <div style="height: 20px; width: 100%; float: right; font-size: 14px;">
+        {{ nowDate }}&nbsp;{{ nowtime }}&nbsp;{{ nowweek }}
       </div>
     </div>
-    <div style="height: 50px; width: 45%; line-height: 47px; font-size: 20px">
-      {{ nowtime }}
-    </div>
   </div>
 </template>
 
 <script>
 // @ is an alias to /src
 import { EditorMap } from "@/utils/mapClass/map";
+import { mapGetters, mapActions } from "vuex";
 import {
   pipeData,
   tiaoyaxiang,
@@ -126,6 +116,14 @@ import {
   jiankong,
   user,
 } from "@/utils/mapClass/config.js";
+import {
+  getPipe,
+  getTyx,
+  getFm,
+  getCz,
+  getVideo,
+  getUser,
+} from "@/api/bigWindow/getDevice";
 import Line from "@/components/bigWindow/Line.vue";
 import VideoView from "@/components/bigWindow/VideoView.vue";
 import DeviceA from "@/components/bigWindow/DeviceA.vue";
@@ -160,7 +158,7 @@ export default {
       typeList: [
         {
           val: 1,
-          name: "中燃祥科",
+          name: "中燃翔科",
         },
         {
           val: 2,
@@ -173,41 +171,80 @@ export default {
       ],
     };
   },
+  computed: {
+    ...mapGetters(["company", "systemSetting"]),
+    companyLength() {
+      return this.typeList.length;
+    },
+  },
   watch: {
     selarr(newValue) {
-      if (newValue.length == 3) {
+      if (newValue.length == this.companyLength) {
         this.$refs.mychild.choice(0);
         this.$refs.mychild2.choice(0);
       }
     },
   },
   mounted() {
-    const path = eval(this.$store.state.user.systemSetting.map_center);
+    // console.log(99999999999999)
+    //   getPipe().then(res=>{
+    //   console.log("成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功",res)
+    // }).catch(res=>{
+    //   console.log(123)
+    // })
+    // return;
+
+    const path = eval(this.systemSetting.map_center);
     this.map = new EditorMap(
       "map",
       {
-        center:path,
+        center: path,
         mapStyle: "amap://styles/f71d3a3d73e14f5b2bf5508bf1411758",
         zoom: 14.5,
       },
       this
     );
-    this.addPipeLine();
-    this.addDevice(tiaoyaxiang, DeviceA);
-    this.addDevice(famen, DeviceA);
-    this.addDevice(changzhan, DeviceA);
-    this.addDevice(user, User);
-    this.addDevice(jiankong, VideoView);
+    // 这是测试，用本地数据
+    if (this.systemSetting.prod_test === "test") {
+      this.addPipeLine(pipeData, Line);
+      this.addDevice(tiaoyaxiang, DeviceA);
+      this.addDevice(famen, DeviceA);
+      this.addDevice(changzhan, DeviceA);
+      this.addDevice(user, User);
+      this.addDevice(jiankong, VideoView);
+    } else {
+      // 调用状态管理器方法获取公司信息每次都要调取,因为每次进来都是更新的
+      this.GetCompany();
+      this.typeList = this.company.map((item) => ({
+        val: item.conpanyId,
+        name: item.companyName,
+      }));
+      this.selarr = this.company.map((item) => item.conpanyId);
+      // getPipe() getTyx() getFm() getCz() getVideo() getUser()
+      this.goMap(getPipe, this.addPipeLine, Line);
+      this.goMap(getTyx, this.addDevice, DeviceA);
+      this.goMap(getFm, this.addDevice, DeviceA);
+      this.goMap(getCz, this.addDevice, DeviceA);
+      this.goMap(getVideo, this.addDevice, VideoView);
+      this.goMap(getUser, this.addDevice, User);
+      // getVideo().then((res) => {
+      //   console.log("getVideo", res);
+      // });
+    }
 
     this.currentTime();
     this.$refs.mychild.choice(0);
     this.$refs.mychild2.choice(0);
   },
   methods: {
-    addPipeLine() {
-      for (let comp in pipeData) {
-        pipeData[comp].forEach((pipe) => {
-          this.map.addPipeLine(pipe, Line);
+    ...mapActions({
+      GetCompany: "bigWindowCompany/GetCompany",
+    }),
+    // 管道上图
+    addPipeLine(data, component) {
+      for (let comp in data) {
+        data[comp].forEach((pipe) => {
+          this.map.addPipeLine(pipe, component);
         });
       }
     },
@@ -219,6 +256,20 @@ export default {
         });
       }
     },
+    goMap(httpFunc, addFunc, component) {
+      httpFunc().then((res) => {
+        console.log("resresres", res);
+        // 根据数据格式不同，赋值不同，如果是个数组，就用res，如果不是就用res.data
+        let config = {};
+        if (Array.isArray(res)) {
+          config = { data: res };
+        } else {
+          config = { data: res.data };
+        }
+        addFunc(config, component);
+      });
+    },
+
     centerShow(boolean) {
       this.show = boolean;
     },
@@ -229,10 +280,10 @@ export default {
     },
 
     allCompany() {
-      if (this.selarr.length == 3) {
+      if (this.selarr.length == this.companyLength) {
         this.selarr = [];
       } else {
-        this.selarr = [1, 2, 3];
+        this.selarr = this.company.map((item) => item.conpanyId);
       }
 
       this.map.companyFilter(this.selarr);
@@ -287,7 +338,7 @@ export default {
       second = second < 10 ? "0" + second : second; // 如果只有一位，则前面补零
       this.nowtime = `${hour}:${minute}:${second}`;
       this.nowweek = `${weekArr[week]}`;
-      this.nowDate = `${year}/${month}/${day}`;
+      this.nowDate = `${year}年${month}月${day}`;
     },
   },
   // 销毁定时器
@@ -306,13 +357,17 @@ export default {
 .goSystem {
   position: fixed;
   z-index: 9999;
-  top: 20px;
-  right: 210px;
-  font-size: 18px;
+  top: 50px;
+  right: 20px;
+  font-size: 14px;
   color: #18baff;
   cursor: pointer;
+  padding: 3px 5px;
+  border: 1px solid #339CC9;
+  color: #339CC9;
   &:hover {
-    color: #1890ff;
+    background-color: #053B6A ;
+    color: #2CD5DB;
   }
 }
 #map {
@@ -335,31 +390,19 @@ export default {
 
 .leftbar {
   width: 450px;
-  height: 100%;
+  height: 90%;
   position: fixed;
-  top: 0;
+  top: 10%;
   left: 0;
-  background-image: -webkit-gradient(
-    linear,
-    right top,
-    left top,
-    color-stop(20%, rgb(17 34 56 / 90%)),
-    color-stop(80%, rgb(18 24 29))
-  );
+  background: #112238;
 }
 .rightbar {
   width: 450px;
-  height: 100%;
+  height: 90%;
   position: fixed;
-  top: 0;
+  top: 10%;
   right: 0;
-  background-image: -webkit-gradient(
-    linear,
-    left top,
-    right top,
-    color-stop(20%, rgb(17 34 56 / 90%)),
-    color-stop(80%, rgb(18 24 29))
-  );
+  background: #112238;
 }
 .home-div {
   width: 50%;
@@ -367,28 +410,36 @@ export default {
   position: fixed;
   bottom: 0;
   margin-left: 25%;
-  z-index: 1000;
+  // z-index: 1000;
+  img {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    z-index: -1;
+  }
 }
 .listingsSty {
   /* height: 25px; */
-  position: fixed;
+  // position: fixed;
   /* border: 1px solid #fff; */
-  bottom: 0;
-  margin-bottom: 10px;
-  width: 30%;
-  margin-left: 10%;
-    // font-family: 'arialbd';
+  margin-left: 25%;
+  width: 50%;
+  display: flex;
+  justify-content: space-between;
+  padding-top: 25px;
+  // font-family: 'arialbd';
 }
 .firsty {
-  width: 15%;
+  // width: 15%;
+  min-width: 80px;
   height: 35px;
   text-align: center;
   line-height: 35px;
   /* border: 1px solid #fff; */
   color: #fff;
   font-size: 16px;
-  float: left;
-  margin-left: 8%;
+  // float: left;
+  // margin-left: 8%;
   cursor: pointer;
   // font-family: 'arialbd';
 }