Merge remote-tracking branch 'origin/master'

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

@@ -156,14 +156,25 @@ public class PipeInterfaceController {
     @RequestBody
     @RequestMapping("/selectvalveData")
     public DeviceDataList selectvalveData(){
-        DeviceDataList deviceDataList=new DeviceDataList();
         //查询阀门井数据
         List<DeviceData> pipeDates = iPipeInterfaceService.selectvalveData();
+        //查询下级数据
+        List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlow("1");
+        //最后返回的封装类型
+        DeviceDataList deviceDataList=new DeviceDataList();
+        //调压箱数据循环
         for (int i=0;i<pipeDates.size();i++){
-            //查询下级设备数据
-            List<PressureFlow> pressureFlows = iPipeInterfaceService.selectPressureFlow(pipeDates.get(i).getDeviceId());
+            //临时存下级数据id
+            List<PressureFlow> pressList=new ArrayList<>();
+            for (int s=0;s<pressureFlows1.size();s++){
+                //判断调压箱id与下级数据调压箱id是否相等
+                if (pressureFlows1.get(s).getDeviceId()==pipeDates.get(i).getDeviceId()){
+                    //下级数据添加进临时存储数据的数组中
+                    pressList.add(pressureFlows1.get(s));
+                }
+            }
+            pipeDates.get(i).setPressureFlows(pressList);
             pipeDates.get(i).setIconType(3);
-            pipeDates.get(i).setPressureFlows(pressureFlows);
         }
             deviceDataList.setData(pipeDates);
         return deviceDataList;

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

@@ -37,11 +37,12 @@
               <div style="color: red" v-else-if="scope.row.deviceState == 2">
                 报警
               </div>
+              <div v-else>-</div>
             </template>
           </el-table-column>
           <el-table-column prop="reportTime" label="报警时间" width="">
             <template slot-scope="scope">
-              <div>{{ scope.row.reportTime }}</div>
+              <div v-unValue>{{ scope.row.reportTime }}</div>
             </template>
           </el-table-column>
         </el-table>

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

 <!--
  * @Author: your name
  * @Date: 2022-01-26 20:07:52
- * @LastEditTime: 2022-02-28 09:45:42
+ * @LastEditTime: 2022-02-28 15:52:58
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 
@@ -61,27 +61,23 @@
         <div>已处理报警</div>
         <div class="last">报警中</div>
       </div>
-      <div class="tbody flex">
-        <div class="first zzz">{{ "流量计" }}</div>
-        <div class="">{{ deviceData.pressureFlows.length }}</div>
+      <div class="tbody flex" v-if="Array.isArray(deviceData.pressureFlows)">
+        <div class="first zzz">{{ "压力表与流量计" }}</div>
+        <div v-unValue class="">{{ deviceData.numberEquipment }}</div>
         <div v-unValue class="">
-          {{ (Math.random() * deviceData.pressureFlows.length) >> 1 }}
+          {{ deviceData.onlineEquipment }}
         </div>
         <div v-unValue class="">
-          {{ (Math.random() * deviceData.pressureFlows.length) >> 1 }}
+          {{ deviceData.offlineEquipment }}
         </div>
         <div v-unValue class="">
-          {{ (Math.random() * deviceData.pressureFlows.length) >> 1 }}
+          {{ deviceData.historicalAlarm }}
         </div>
         <div v-unValue class="">
-          {{ (Math.random() * deviceData.pressureFlows.length) >> 1 }}
+          {{ deviceData.alarmProcessed }}
         </div>
-        <div v-unValue class="last zzz">
-          {{
-            deviceData.pressureFlows.filter((item) => {
-              return item.deviceState == 2;
-            }).length
-          }}
+        <div v-unValue class="last">
+          {{ deviceData.inAlarm }}
         </div>
       </div>
     </div>
@@ -99,8 +95,7 @@ export default {
     return {
       companyType,
       deviceType,
-      profile:"暂无"
-
+      profile: "暂无",
     };
   },
   computed: {
@@ -119,8 +114,7 @@ export default {
         this.companyType[item.conpanyId] = item.companyName;
       });
     }
-    console.log(this.deviceData)
-
+    console.log(this.deviceData);
   },
   methods: {
     close() {

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

 <!--
  * @Author: your name
  * @Date: 2022-01-26 20:07:52
- * @LastEditTime: 2022-02-28 10:01:07
+ * @LastEditTime: 2022-02-28 13:30:46
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 

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

@@ -27,21 +27,21 @@
                   >
                     <el-table-column prop="unitName" label="所在单位" width="80">
                       <template slot-scope="scope">
-                        <div class="ddd" :title="scope.row.unitName">
+                        <div class="zzz" :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">
+                        <div class="zzz" :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">
+                        <div class="zzz" :title="scope.row.statusName">
                           {{ scope.row.statusName }}
                         </div>
                       </template>
@@ -50,7 +50,7 @@
                     </el-table-column>
                     <el-table-column prop="handledStatus" label="状态">
                       <template slot-scope="scope">
-                        <div class="ddd" :title="scope.row.handledStatus">
+                        <div class="zzz" :title="scope.row.handledStatus">
                           {{ scope.row.handledStatus }}
                         </div>
                       </template>

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

 /*
  * @Author: your name
  * @Date: 2022-01-26 10:47:44
- * @LastEditTime: 2022-02-25 11:19:55
+ * @LastEditTime: 2022-02-28 15:53:46
  * @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
@@ -31,7 +31,7 @@ export const deviceType = {
   1:"管道",
   2:"调压箱",
   3:"阀门",
-  4:"厂站",
+  4:"场站",
   5:"监控",
   6:"用户",
 };

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

 <!--
  * @Author: your name
  * @Date: 2022-01-11 13:44:17
- * @LastEditTime: 2022-02-26 23:40:26
+ * @LastEditTime: 2022-02-28 15:54:27
  * @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
@@ -72,7 +72,7 @@
     <!-- 头部 -->
     <div class="banner-test">
       <!-- <dv-decoration-5 style="width:100%;height:100%;" /> -->
-      <img src="@/assets/mapinages/topbanner.png" alt="" />
+      <img src="@/assets/mapinages/tb.png" alt="" />
     </div>
 
     <!-- 左边 -->
@@ -222,7 +222,7 @@ export default {
           val: 4,
           ischeck: false,
           imgurl: require("@/assets/image/czsub.svg"),
-          name: "厂 站",
+          name: "场 站",
         },
         {
           val: 6,
@@ -383,7 +383,8 @@ export default {
         this.selarr = this.company.map((item) => item.conpanyId);
       }
 
-      this.map.companyFilter(this.selarr);
+      // this.map.companyFilter(this.selarr);
+      this.map.allfilter(this.selarr, this.selarr1);
       this.map.infowindowClose();
       this.show = false;
     },