Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress into master

# Conflicts:
#	gassafetyprogress-web/src/views/bigWindow/index.vue

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

@@ -99,6 +99,11 @@ public class PipeInterfaceController {
         List<TvideoManagerData> tvideoManagerData = iPipeInterfaceService.selectTvideoManagerData();
         for (int i=0;i<tvideoManagerData.size();i++){
             tvideoManagerData.get(i).setIconType(5);
+            if("999".equals(tvideoManagerData.get(i).getCompanyType())){
+                tvideoManagerData.get(i).setCompanyType(null);
+            }else if("0".equals(tvideoManagerData.get(i).getCompanyType())){
+                tvideoManagerData.get(i).setCompanyType(null);
+            }
         }
         return tvideoManagerData;
     }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/vo/TDetectorUserVO.java

@@ -18,6 +18,9 @@ public class TDetectorUserVO
     /** 用户id */
     private Long userId;
 
+    /** 图标类型 */
+    private String iconType;
+
     /** 用户账号 */
     private String username;
 

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

@@ -84,6 +84,7 @@ public class TDetectorUserServiceImpl implements ITDetectorUserService
             userVO.setHistoryAlarmNum(historyAlarmNum);
             userVO.setCancelAlarmNum(cancelAlarmNum);
             userVO.setProcessingAlarmNum(Math.abs(historyAlarmNum - cancelAlarmNum));
+            userVO.setIconType("6");
 
             list.add(userVO);
         }

gassafetyprogress-web/package.json

@@ -50,6 +50,7 @@
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
+    "velocity-animate": "^1.5.2",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",

gassafetyprogress-web/src/api/detector/detectorInfo.js

-import request from '@/utils/request'
+/*
+ * @Author: your name
+ * @Date: 2022-02-26 16:01:37
+ * @LastEditTime: 2022-02-26 21:11:12
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /gassafety-progress/gassafetyprogress-web/src/api/detector/detectorInfo.js
+ */
+import request from "@/utils/request";
 
 // 查询探测器列表
 export function listDetectorInfo(query) {
   return request({
-    url: '/detector/detectorInfo/list',
-    method: 'get',
-    params: query
-  })
+    url: "/detector/detectorInfo/list",
+    method: "get",
+    params: {
+      pageNum: 1,
+      pageSize: 20,
+      ...query,
+    },
+  });
 }
 
 // 探测器列表
 export function detectorInfoList(query) {
   return request({
-    url: '/detector/detectorInfo/detectorInfoList',
-    method: 'get',
-    params: query
-  })
+    url: "/detector/detectorInfo/detectorInfoList",
+    method: "get",
+
+    params: query,
+  });
 }
 
 // 新增探测器
 export function addDetectorInfo(data) {
   return request({
-    url: '/detector/detectorInfo',
-    method: 'post',
-    data: data
-  })
+    url: "/detector/detectorInfo",
+    method: "post",
+    data: data,
+  });
 }
 
 // 修改探测器
 export function updateDetectorInfo(data) {
   return request({
-    url: '/detector/detectorInfo',
-    method: 'put',
-    data: data
-  })
+    url: "/detector/detectorInfo",
+    method: "put",
+    data: data,
+  });
 }
 
 // 删除探测器
 export function delDetectorInfo(detectorId) {
   return request({
-    url: '/detector/detectorInfo/' + detectorId,
-    method: 'delete'
-  })
+    url: "/detector/detectorInfo/" + detectorId,
+    method: "delete",
+  });
 }
 
 // 导出探测器
 export function exportDetectorInfo(query) {
   return request({
-    url: '/detector/detectorInfo/export',
-    method: 'get',
-    params: query
-  })
+    url: "/detector/detectorInfo/export",
+    method: "get",
+    params: query,
+  });
 }
 
 // 右上角的综合列表
 export function alarmData(query) {
   return request({
-    url: '/detector/detectorInfo/getAlarmData',
-    method: 'get',
-    params: query
-  })
+    url: "/detector/detectorInfo/getAlarmData",
+    method: "get",
+    params: query,
+  });
 }

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

@@ -114,7 +114,7 @@ export default {
       this.pageCurrent = val;
     },
     close() {
-      this.$parent.centerShow(false);
+      this.$parent.myCenterShow(false);
     },
   },
 };

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

 <!--
  * @Author: your name
  * @Date: 2022-01-26 20:07:52
- * @LastEditTime: 2022-02-26 14:16:23
+ * @LastEditTime: 2022-02-26 23:06:21
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 
@@ -26,7 +26,7 @@
       <div class="group">
         <div class="left">设备类型：</div>
         <div class="right zzz">
-          {{ deviceType[deviceData.type] }}
+          {{ deviceType[deviceData.iconType] }}
         </div>
       </div>
       <div class="group">
@@ -45,6 +45,7 @@
         >
           {{ deviceData.stationAddr || "-" }}
         </div>
+        <div v-else>-</div>
       </div>
     </div>
 

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

 <!--
  * @Author: your name
- * @Date: 2022-01-27 14:25:45
- * @LastEditTime: 2022-02-26 14:16:16
+ * @Date: 2022-01-26 20:07:52
+ * @LastEditTime: 2022-02-26 21:27:45
  * @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
+
+ * @FilePath: /test/hello-world/src/views/components/deviceA.vue
 -->
 <template>
-  <div class="user-wrapper">
-    <div class="title">{{ deviceData.usrName }}</div>
+  <div class="devicea-wrapper">
+    <div class="title">
+      {{ deviceData.nickName }}
+    </div>
     <div class="close" @click="close">
       <img src="@/assets/mapImages/closeBtn.png" alt="" />
     </div>
 
-    <div class="group flex first">
-      <div class="left">用户姓名：</div>
-      <div :title="deviceData.usrName" class="right zzz">
-        {{ deviceData.usrName }}
+    <div class="top flex">
+      <div class="group">
+        <div class="left">联系人：</div>
+        <div class="right zzz">{{ deviceData.nickName }}</div>
+      </div>
+      <div class="group">
+        <div class="left">联系电话:</div>
+        <div class="right zzz">
+          {{ deviceData.phone }}
+        </div>
+      </div>
+      <div class="group">
+        <div class="left">联系地址：</div>
+        <div :title="deviceData.address" class="right last zzz">
+          {{ deviceData.address || "-" }}
+        </div>
       </div>
     </div>
 
-    <div class="group flex">
-      <div class="left">联系方式：</div>
-      <div v-unValue class="right">{{ deviceData.phone }}</div>
+    <div class="foot">
+      <div class="thead flex">
+        <div class="first">设备类型</div>
+        <div>设备数量</div>
+        <div>在线设备</div>
+        <div>离线设备</div>
+        <div>历史报警</div>
+        <div>已处理报警</div>
+        <div class="last">报警中</div>
+      </div>
+      <div class="tbody flex">
+        <div class="first zzz">{{ 123 }}</div>
+        <div class="">{{ deviceData.detectorCount }}</div>
+        <div v-unValue class="">
+          {{ deviceData.onLineNum }}
+        </div>
+        <div v-unValue class="">
+          {{ deviceData.offLineNum }}
+        </div>
+        <div v-unValue class="">
+          {{ deviceData.historyAlarmNum }}
+        </div>
+        <div v-unValue class="">
+          {{ deviceData.cancelAlarmNum }}
+        </div>
+        <div v-unValue class="last zzz">
+          {{ deviceData.processingAlarmNum }}
+        </div>
+      </div>
     </div>
 
-    <div class="group flex">
-      <div class="left">用户地址：</div>
-      <div :title="deviceData.address" class="right zzz">
-        {{ deviceData.address }}
-      </div>
+    <div class="btn">
+      <div @click="btnClick">感知设备</div>
     </div>
 
-    <!-- <div class="group flex">
-      <div class="left">所属公司：</div>
-      <div class="right">{{ companyType[deviceData.companyType] }}</div>
-    </div> -->
   </div>
 </template>
 
 <script>
-import { companyType } from "@/utils/mapClass/config.js";
-
+import { companyType, deviceType } from "@/utils/mapClass/config.js";
 export default {
   data() {
     return {
       companyType,
+      deviceType,
     };
   },
   computed: {
@@ -64,22 +98,29 @@ export default {
         this.companyType[item.conpanyId] = item.companyName;
       });
     }
+    console.log(this.deviceData);
   },
   methods: {
     close() {
       this.mapClass.infowindowClose();
     },
+    btnClick() {
+      // this.vueRoot.centerDataFunc(this.deviceData.pressureFlows);
+      this.vueRoot.getDetectorInfoList({ userId: this.deviceData.userId },this.deviceData.nickName);
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.user-wrapper {
+.devicea-wrapper {
   background-color: rgba(9, 18, 32, 0.6);
   padding: 10px;
   position: relative;
-  width: 300px;
+  width: 700px;
   .title {
+    // padding-top: 10px;
+    // padding-left: 10px;
     font-size: 14px;
     line-height: 14px;
     color: #ffffff;
@@ -90,29 +131,95 @@ export default {
     top: 5px;
     cursor: pointer;
   }
-  .group {
+
+  .top {
+    margin-top: 10px;
+    margin-bottom: 10px;
     border: 1px solid #cccccc;
-    border-top: none;
-    height: 28px;
+    box-sizing: border-box;
+    .group {
+      height: 30px;
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      box-sizing: border-box;
+      div {
+        flex: 1;
+        box-sizing: border-box;
+        border-right: 1px solid #cccccc;
+        text-align: center;
+        font-size: 14px;
+        color: #ffffff;
+        line-height: 30px;
+        padding: 0 5px;
+        &.last {
+          border-right: none;
+        }
+      }
+      .left {
+        text-align: right;
+        background-color: rgba(255, 255, 255, 0.1);
+      }
+    }
+  }
+  .middle {
+    width: 100%;
+    padding: 5px;
+    border: 1px solid #ffffff;
+    box-sizing: border-box;
+    font-size: 14px;
+    color: #ffffff;
+    text-indent: 2em;
+    margin-bottom: 10px;
+  }
+  .foot {
     font-size: 14px;
-    line-height: 28px;
     color: #ffffff;
-    &.first {
-      border-top: 1px solid #cccccc;
-      margin-top: 10px;
+    .thead,
+    .tbody {
+      border: 1px solid #cccccc;
+      div {
+        flex: 1;
+        text-align: left;
+        border-right: 1px solid #cccccc;
+        box-sizing: border-box;
+        padding: 0 5px;
+      }
+      .first {
+        flex: 2;
+      }
+      .last {
+        border-right: none;
+      }
     }
-    div {
-      flex: 1;
+    .tbody {
+      border-top: none;
     }
-    .left {
-      border-right: 1px solid #cccccc;
-      background-color: rgba(255, 255, 255, 0.1);
-      text-align: right;
+    .thead {
+      div {
+        background-color: rgba(255, 255, 255, 0.1);
+      }
     }
-    .right {
+  }
+
+  .btn {
+    position: relative;
+    margin-top: 10px;
+    text-align: right;
+    div {
+      font-size: 14px;
+      color: #ffffff;
+      padding: 2px 4px;
       box-sizing: border-box;
-      text-align: left;
-      padding: 0 1em;
+      display: inline-block;
+      cursor: pointer;
+      border: 1px solid #cccccc;
+      background-color: #1890ff;
+
+      &:hover {
+        // background: rgba(9, 18, 32, 0.6);
+        background-color: #18baff;
+      }
     }
   }
   .flex {

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

 <template>
   <transition
-    v-on:before-enter="beforeEnter"
-    v-on:enter="enter"
-    v-on:before-leave="beforeLeave"
-    v-on:leave="leave"
-    v-bind:css="false"
   >
-    <div v-show="show" class="wrapper center">
+    <div v-show="show" class="wrapper myCenter">
       <div class="left">
         <div class="title-wrapper">
-          <div class="title">{{title}}报警器列表</div>
+          <div class="title">{{ title }}报警器列表</div>
           <div class="close" @click="close">
-            <img src="@/assets/images/closeBtn.png" alt="" />
+            <img src="@/assets/mapImages/closeBtn.png" alt="" />
           </div>
-        </div>detectorInfo.
+        </div>
         <div class="bottom right-bottom-data-left">
           <el-table
             size="mini"
             :data="tableData"
             style="width: 100%"
-            :height="tableHeight"
+
             class="el-bottom"
             :key="Math.random()"
           >
             <!-- :height="tableHeight" -->
             <el-table-column prop="detectorCode" label="设备编号" width="180">
               <template slot-scope="scope">
-                <div :title="scope.row.detectorCode" class="ddd" v-un-content>
+                <div :title="scope.row.detectorCode" class="ddd" v-unValue>
                   {{ scope.row.detectorCode }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column prop="detectorName" label="设备名称" width="100">
               <template slot-scope="scope">
-                <div :title="scope.row.detectorName" class="ddd" v-un-content>
+                <div :title="scope.row.detectorName" class="ddd" v-unValue>
                   {{ scope.row.detectorName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column prop="medium" label="监测介质" width="">
               <template slot-scope="scope">
-                <div v-un-content>{{ scope.row.medium }}</div>
+                <div v-unValue>{{ scope.row.medium }}</div>
               </template>
             </el-table-column>
             <el-table-column prop="linkman" label="联系人" width="100">
@@ -51,16 +46,7 @@
             </el-table-column>
             <el-table-column prop="alarmTime" label="报警时间" width="200">
               <template slot-scope="scope">
-                <div v-un-content>{{ scope.row.alarmTime }}</div>
-              </template>
-            </el-table-column>
-            <el-table-column prop="alarmValue" label="定位" width="50">
-              <template slot-scope="scope">
-                <div
-                  @click="createDetector(scope)"
-                  class="iconfont icon-bjqdw"
-                ></div>
-                <!-- {{ scope.row.userId }} -->
+                <div v-unValue>{{ scope.row.alarmTime }}</div>
               </template>
             </el-table-column>
           </el-table>
@@ -71,7 +57,7 @@
               layout="prev, pager, next, jumper"
               :total="total"
               :hide-on-single-page="total <= pageSize"
-              :key="total+''+pageSize"
+              :key="total + '' + pageSize"
             >
             </el-pagination>
           </div>
@@ -82,13 +68,14 @@
 </template>
 
 <script>
-import Velocity from "velocity-animate";
-import { listDeviceAlarm } from "@/api/dataMonitoring/deviceAlarm";
+// import Velocity from "velocity-animate";
+// import { listDeviceAlarm } from "@/api/dataMonitoring/deviceAlarm";
 
 export default {
   props: {
     detcetorList: {
       type: Array,
+      default:()=>[],
     },
     show: {
       type: Boolean,
@@ -109,9 +96,7 @@ export default {
   data() {
     return {
       // 动画效果的切换
-      animateChange: 0,
-      fade: "fade",
-      tableHeight: 600,
+      // tableHeight: 600,
       tableData: [
         // {
         //   deviceCode: "2016-05-05",
@@ -121,8 +106,7 @@ export default {
         //   address: "上海市普陀区金沙江路",
         // },
       ],
-      moveX: 0,
-      moveY: 0,
+
     };
   },
   created() {
@@ -136,6 +120,7 @@ export default {
       // if (bol) {
       console.log(newData);
       this.tableData = [...newData];
+
       // }
     },
   },
@@ -145,115 +130,18 @@ export default {
       console.log(val);
     },
     handleCurrentChangvale(val) {
-      this.$parent.getDetectorInfoList({
-        userId: this.userId,
-        pageNum: val,
-        pageSize: this.pageSize,
-      },this.title);
+      this.$parent.getDetectorInfoList(
+        {
+          userId: this.userId,
+          pageNum: val,
+          pageSize: this.pageSize,
+        },
+        this.title
+      );
     },
     close() {
-      this.fade = "fade";
+      // this.fade = "fade";
       this.$parent.centerShow = false;
-      this.$parent.circleShow = false;
-    },
-
-    // 点击创建点并且定位过去
-    createDetector(data) {
-      // 如果有经纬度才能走通，没有套弹框提示
-      if (data.row.latitude && data.row.longitude) {
-        this.fade = "scale";
-        this.$parent.centerShow = false;
-        this.$parent.circleShow = true;
-        this.$parent.gaoMap.addMarker("detector_only", data.row);
-      } else {
-        this.msgError("数据不完善，无法定位");
-      }
-    },
-
-    beforeEnter: function (el) {
-      //  如果点的是关闭
-      if (this.fade == "fade") {
-        // 如果点的是定位
-        el.style.opacity = 0;
-
-        console.log(el);
-      } else {
-        el.style.transfrom = `translate(${this.moveX},${this.moveY})`;
-        el.style.transfrom = "scale(0,0)";
-      }
-    },
-    enter: function (el, done) {
-      if (this.fade == "fade") {
-        Velocity(
-          el,
-          {
-            opacity: 1,
-            translateX: "0px",
-            translateY: "0px",
-            scaleX: 1,
-            scaleY: 1,
-            // scaleX:1,
-            // scaleY:1
-          },
-          { duration: 0, complete: done }
-        );
-      } else {
-        Velocity(
-          el,
-          {
-            translateX: "0px",
-            translateY: "0px",
-            scaleX: 1,
-            scaleY: 1,
-          },
-          { duration: 300, complete: done }
-        );
-      }
-    },
-    beforeLeave(el) {
-      if (this.fade == "fade") {
-        el.style.opacity = 1;
-      } else {
-        el.style.transfrom = "translate(0px,0px)";
-        el.style.transfrom = "scale(1,1)";
-      }
-    },
-    leave: function (el, done) {
-      if (this.fade == "fade") {
-        Velocity(
-          el,
-          {
-            opacity: 0,
-          },
-          { duration: 0, complete: done }
-        );
-      } else {
-        // 列表的位置参数
-        const { top, left, height, width } = el.getBoundingClientRect();
-        // 当列表缩下去的右下角的位置参数
-        const {
-          top: topC,
-          left: leftC,
-          height: heightC,
-          width: widthC,
-        } = this.$parent.$refs.circle.getBoundingClientRect();
-
-        const moveX = Math.abs(leftC - left) - width / 2 + heightC / 2 + "px";
-        const moveY = Math.abs(topC - top) - height / 2 + heightC / 2 + "px";
-        this.moveX = moveX;
-        this.moveY = moveY;
-
-        Velocity(
-          el,
-          {
-            translateX: moveX,
-            translateY: moveY,
-            scaleX: 0,
-            scaleY: 0,
-          },
-          { duration: 300, complete: done }
-        );
-      }
     },
   },
 };

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

@@ -450,7 +450,7 @@
                 this.timerAni();
             },
             timerAni() {
-                console.log("zhix")
+
                 const selectWrap = this.$refs.table.$el.querySelector(
                 ".el-table__body-wrapper"
                 );
@@ -685,43 +685,43 @@
                         },
                     ]
                 });
-                myChart32.setOption({
-                    title: {
-                        text: '设备数量:'+data.deviceNum,
-                        left: 'center',
-                        textStyle: {
-                            color: "#0ff"
-                        }
-                    },
-                    tooltip: {
-                        trigger: 'item'
-                    },
-                    series: [
-                        {
-                            name: '设备概况',
-                            type: 'pie',
-                            radius: ['50%', '70%'],
-                            center: ['50%', '60%'],
-                            avoidLabelOverlap: false,
-                            label: {
-                                show: false,
-                                position: 'center'
-                            },
-                            emphasis: {
-                                label: {
-                                    show: true,
-                                    fontSize: '40',
-                                    fontWeight: 'bold'
-                                }
-                            },
-                            labelLine: {
-                                show: false
-                            },
-                            data:data.divice,
-                            color:["#188df0","#ffff00","#FF4040"]
-                        }
-                    ]
-                });
+                // myChart32.setOption({
+                //     title: {
+                //         text: '设备数量:'+data.deviceNum,
+                //         left: 'center',
+                //         textStyle: {
+                //             color: "#0ff"
+                //         }
+                //     },
+                //     tooltip: {
+                //         trigger: 'item'
+                //     },
+                //     series: [
+                //         {
+                //             name: '设备概况',
+                //             type: 'pie',
+                //             radius: ['50%', '70%'],
+                //             center: ['50%', '60%'],
+                //             avoidLabelOverlap: false,
+                //             label: {
+                //                 show: false,
+                //                 position: 'center'
+                //             },
+                //             emphasis: {
+                //                 label: {
+                //                     show: true,
+                //                     fontSize: '40',
+                //                     fontWeight: 'bold'
+                //                 }
+                //             },
+                //             labelLine: {
+                //                 show: false
+                //             },
+                //             data:data.divice,
+                //             color:["#188df0","#ffff00","#FF4040"]
+                //         }
+                //     ]
+                // });
             }
         }
     }

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

 /*
  * @Author: your name
  * @Date: 2022-02-25 17:07:40
- * @LastEditTime: 2022-02-25 17:15:54
+ * @LastEditTime: 2022-02-26 20:59:40
  * @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
@@ -13,7 +13,6 @@
 
  export default {
   inserted(el, binding, vnode) {
-    console.log("el",el)
     el.innerHTML = el.innerHTML.replace(/\s+/g, "") ? el.innerHTML : "-";
   }
 };

gassafetyprogress-web/src/main.js

 /*
  * @Author: your name
  * @Date: 2022-01-07 11:29:13
- * @LastEditTime: 2022-02-18 17:29:27
+ * @LastEditTime: 2022-02-26 20:59:19
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/main.js
@@ -85,7 +85,7 @@ Element.Dialog.props.closeOnPressEscape = false;
 Vue.use(Element, {
   size: Cookies.get("size") || "medium", // set element-ui default size
 });
-console.log(Element);
+
 
 Vue.config.productionTip = false;
 

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

 /*
  * @Author: your name
  * @Date: 2022-01-11 13:45:12
- * @LastEditTime: 2022-02-26 13:59:03
+ * @LastEditTime: 2022-02-26 23:40:59
  * @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
@@ -349,7 +349,6 @@ export class EditorMap {
   // 地图上add管道
   addPipeLine(objData, component) {
     const { path, pipePressure, iconType } = objData;
-    console.log(path);
     // 根据压力获取颜色
     const color = pipeColor[pipePressure + 1];
     const pipe = this.createPipeLine({
@@ -361,7 +360,6 @@ export class EditorMap {
     });
 
     this.map.add(pipe);
-    console.log(pipe.getExtData());
     // pipe.hide();
     if (!Array.isArray(this.pipeArr[iconType])) {
       this.pipeArr[iconType] = [];
@@ -445,7 +443,7 @@ export class EditorMap {
     this.infowindow.close();
   }
 
-  allilter(companyArr, typeArr) {
+  allfilter(companyArr, typeArr) {
     for (let pipeItem in this.pipeArr) {
       this.pipeArr[pipeItem].forEach((pipe) => {
         const data = pipe.getExtData();
@@ -463,7 +461,8 @@ export class EditorMap {
         // 燃气没有公司，所以没有device.companyType不收到公司的控制
         const companyHas = companyArr.indexOf(data.companyType + "") >= 0;
         // 设备存在
-        const deviceHas = typeArr.indexOf(data.iconType + "") >= 0;
+        const deviceHas = typeArr.indexOf(+data.iconType ) >= 0;
+        console.log(deviceHas)
         // 必须设备存在数组里，才会显示设备 !data.companyType代表用户不受公司制约
         if (deviceHas && (companyHas || !data.companyType)) {
           device.show();