Merge remote-tracking branch 'origin/master'

gassafety-web/src/components/PopWindowGis/markerInfoWindow.vue

@@ -200,9 +200,9 @@ export default {
       deviceId: "",
       alarm: {},
       list: [
-        { a: "我我我我我我我", b: 2, c: 3, d: 4 },
-        { a: "我我我我我我我", b: 2, c: 3, d: 4 },
-        { a: "我我我我我我我", b: 2, c: 3, d: 4 },
+        { a: "我我我我我我", b: 2, c: 3, d: 4 },
+        { a: "我我我我我", b: 2, c: 3, d: 4 },
+        { a: "我我我我", b: 2, c: 3, d: 4 },
       ],
     };
   },

gassafety-web/src/components/PopWindowGis/markerInfoWindowWarn.vue

@@ -63,6 +63,42 @@
 
     <!-- 报警状态 -->
     <div class="warn-wrapper" v-if="true">
+      <!-- 阀门井跟调压箱 报警-->
+      <template v-if="data.deviceType == 1 || data.deviceType == 2">
+        <div class="windowwarn-content tab" v-if="list.length > 0">
+          <div class="foot">
+            <div class="thead flex">
+              <div class="first">设备名称</div>
+              <div>设备状态</div>
+              <div>设备浓度</div>
+              <div>报警状态</div>
+            </div>
+            <template v-if="list.length > 0">
+              <div
+                class="tbody flex"
+                v-for="deviceData in list"
+                :key="deviceData.a"
+              >
+                <div class="first zzz">
+                  {{ deviceData.a || "-" }}
+                </div>
+                <div class="">
+                  {{ deviceData.b || "-" }}
+                </div>
+                <div class="">
+                  {{ deviceData.c || "-" }}
+                </div>
+                <div class="">
+                  {{ deviceData.d || "-" }}
+                </div>
+              </div>
+            </template>
+          </div>
+        </div>
+        <div v-else class="windowwarn-content tab nomal">暂无设备</div>
+      </template>
+      <!-- 流量计跟压力表报警 -->
+      <template v-if="data.deviceType == 3 || data.deviceType == 4">
         <div class="warn-content">
           <div>
             报警状态：<span
@@ -77,7 +113,6 @@
           </div>
         </div>
 
-      <template v-if="data.deviceType == 3 || data.deviceType == 4">
         <div
           v-if="data.deviceType == 3"
           class="windowwarn-content"
@@ -193,6 +228,12 @@ export default {
         3: "流量计",
         4: "智能燃气表",
       },
+      list:[
+        { a: "我我我我我我我", b: 2, c: 3, d: 4 },
+        { a: "我我我我我我", b: 2, c: 3, d: 4 },
+        { a: "我我我我我", b: 2, c: 3, d: 4 },
+
+      ],
       loading: null,
     };
   },
@@ -343,6 +384,54 @@ export default {
 </script>
 <style lang="scss" scoped>
 .windowwarn-content {
+  &.tab {
+    border-bottom: 1px solid #e2e2e2;
+    padding: 10px 5px 2px 5px;
+    max-height: 150px;
+    padding-bottom: 5px;
+    overflow-y: auto;
+    &::-webkit-scrollbar {
+      display: none; /* Chrome Safari */
+    }
+    .foot {
+      color: #ffffff;
+      .thead,
+      .tbody {
+        display: flex;
+        border: 1px solid #cccccc;
+        border-right: none;
+        div {
+          font-size: 12px !important;
+          flex: 1;
+          text-align: left;
+          border-right: 1px solid #cccccc;
+          box-sizing: border-box;
+          padding: 0 5px;
+        }
+        .first {
+          flex: 1;
+          font-size: 12px !important;
+        }
+        .last {
+          border-right: none;
+        }
+      }
+      .tbody {
+        border-top: none;
+      }
+      .thead {
+        div {
+          background-color: rgba(255, 255, 255, 0.1);
+        }
+      }
+    }
+  }
+  // 无设备的样式
+  &.nomal {
+    text-align: center;
+    padding-bottom: 10px;
+  }
+
   div {
     font-size: 14px;
     font-wwight: 400;

gassafety-web/src/views/enterprise/mapView/index.vue

@@ -925,6 +925,30 @@ export default {
                   require(`@/assets/images/ylb.gif`)
                 );
               }
+            }else if (device.getExtData().deviceType == 1) {
+              if (endTime || dealStatus == 4) {
+                this.gaoMap.changeMarkIcon(
+                  device,
+                  require(`@/assets/images/tiaoyaxiang.png`)
+                );
+              } else {
+                this.gaoMap.changeMarkIcon(
+                  device,
+                  require(`@/assets/images/ylb.gif`)
+                );
+              }
+            }else if (device.getExtData().deviceType == 2) {
+              if (endTime || dealStatus == 4) {
+                this.gaoMap.changeMarkIcon(
+                  device,
+                  require(`@/assets/images/famenjing.png`)
+                );
+              } else {
+                this.gaoMap.changeMarkIcon(
+                  device,
+                  require(`@/assets/images/ylb.gif`)
+                );
+              }
             }
           }
         });