上传master

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/rightBar.vue

@@ -450,7 +450,7 @@
                 this.timerAni();
             },
             timerAni() {
-                console.log("zhix")
+
                 const selectWrap = this.$refs.table.$el.querySelector(
                 ".el-table__body-wrapper"
                 );

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:23:01
  * @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
@@ -445,7 +445,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 +463,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();