Merge remote-tracking branch 'origin/master'

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

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

@@ -140,9 +140,14 @@ public class PipeInterfaceController {
         //查询阀门井数据
         List<DeviceData> pipeDates = iPipeInterfaceService.selectvalveData();
         for (int i=0;i<pipeDates.size();i++){
+            //查询下级设备数据
+            List<PressureFlow> pressureFlows = iPipeInterfaceService.selectPressureFlow(pipeDates.get(i).getDeviceId());
             pipeDates.get(i).setIconType(3);
+            pipeDates.get(i).setPressureFlows(pressureFlows);
         }
-        deviceDataList.setData(pipeDates);
+            deviceDataList.setData(pipeDates);
+
+
         return deviceDataList;
     }