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

gassafety-admin/src/main/java/com/zehong/web/controller/workOrder/TWorkOrderController.java

@@ -56,12 +56,14 @@ public class TWorkOrderController extends BaseController
      * @throws Exception
      */
     @GetMapping("/waitinglist")
-    public TableDataInfo waitinglist(String userId,@RequestParam(value = "type", defaultValue = "1")Integer type,String searchStr) throws Exception
+    public TableDataInfo waitinglist(String userId,@RequestParam(value = "type", defaultValue = "1")Integer type,
+                                     @RequestParam(value = "waitingtype", defaultValue = "0")Integer waitingtype,
+                                     String searchStr) throws Exception
     {
         startPage();
         PageInfo<TWorkOrder> pageInfo;
         try {
-            pageInfo = tWorkOrderService.selectWaitingWorkOrder(userId,type,searchStr);
+            pageInfo = tWorkOrderService.selectWaitingWorkOrder(userId,type,searchStr,waitingtype);
         } catch (Exception e) {
             e.printStackTrace();
             throw new Exception("查询待办工单失败");

gassafety-system/src/main/java/com/zehong/system/mapper/TWorkOrderMapper.java

@@ -42,7 +42,10 @@ public interface TWorkOrderMapper
      * @param userId
      * @return
      */
-    public List<TWorkOrder> selectWaitingWorkOrder(@Param("userId") String userId,@Param("type") Integer type,@Param("searchStr") String searchStr);
+    public List<TWorkOrder> selectWaitingWorkOrder(@Param("userId") String userId,
+                                                   @Param("type") Integer type,
+                                                   @Param("searchStr") String searchStr,
+                                                   @Param("waitingtype")Integer waitingtype);
 
     /**
      * 新增工单基础信息

gassafety-system/src/main/java/com/zehong/system/service/ITWorkOrderService.java

@@ -50,7 +50,7 @@ public interface ITWorkOrderService
      * @return
      * @throws Exception
      */
-    public PageInfo<TWorkOrder> selectWaitingWorkOrder(String userId,Integer type,String searchStr)throws Exception;
+    public PageInfo<TWorkOrder> selectWaitingWorkOrder(String userId,Integer type,String searchStr,Integer waitingtype)throws Exception;
 
     /**
      * 新增工单基础信息

gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java

@@ -256,8 +256,8 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
      * @return
      */
     @Override
-    public PageInfo<TWorkOrder> selectWaitingWorkOrder(String userId,Integer type,String searchStr){
-        List<TWorkOrder> workOrderList = tWorkOrderMapper.selectWaitingWorkOrder(userId,type,searchStr);
+    public PageInfo<TWorkOrder> selectWaitingWorkOrder(String userId,Integer type,String searchStr,Integer waitingtype){
+        List<TWorkOrder> workOrderList = tWorkOrderMapper.selectWaitingWorkOrder(userId,type,searchStr,waitingtype);
         for(TWorkOrder t :workOrderList){
             if(t.getOrderType().equals('3')){
                 String address = tDeviceAlarmMapper.selectAddressByOrderId(t.getOrderId());

gassafety-system/src/main/resources/mapper/system/TWorkOrderMapper.xml

@@ -51,7 +51,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         <choose>
             <when test="type==1">
-                o.order_status &lt; 2
+                <choose>
+                    <when test="waitingtype==0">
+                        o.order_status &lt; 2
+                    </when>
+                    <when test="waitingtype==1">
+                        o.order_status = 0
+                    </when>
+                    <otherwise>
+                        o.order_status = 1
+                    </otherwise>
+                </choose>
             </when>
             <otherwise>
                 o.order_status > 0

gassafety-web/src/assets/styles/gassafety.scss

@@ -56,7 +56,7 @@
 .el-dialog:not(.is-fullscreen) {
   margin-top: 6vh !important;
 }
-
+// 全局表格样式
 .el-table {
   .el-table__header-wrapper,
   .el-table__fixed-header-wrapper {
@@ -104,6 +104,15 @@
 }
 
 // gis地图中底部table样式
+.drawer {
+  // .el-button {
+  //   color:red;
+  //   .is-disabled {
+  //     background-color: none;
+  //   }
+  // }
+
+}
 .right-bottom-data-left {
   .el-table {
     background-color: rgba(0, 0, 0, 0) !important;
@@ -118,11 +127,11 @@
     .el-table__header-wrapper,
     .el-table__fixed-header-wrapper {
       tr {
-        background-color: #213b5260 !important;
+        background-color: #213b52cc !important;
       }
       th {
         word-break: break-word;
-        background-color: #213b5260 !important;
+        background-color: #213b52cc !important;
         color: rgba(123, 248, 244, 1);
         height: 30px;
         font-size: 13px;
@@ -134,13 +143,7 @@
     }
     .el-table__body-wrapper {
       .el-table__row:nth-child(2n + 1) {
-        // background-color: #e6e6e6;
-        background-color: #213b5260;
-        // &:hover {
-        //   td {
-        //     background-color: #f4f4f4;
-        //   }
-        // }
+        background-color: #213b52b3;
         &:hover td {
           background-color: #7bf8f430 !important;
         }
@@ -152,20 +155,12 @@
         }
       }
       .el-table__row:nth-child(2n) {
-        // background-color: #213b52;
-        background-color: #06315760;
-
-        // &:hover {
-        //   td {
-        //     background-color: #e6e6e6;
-        //   }
-        // }
+        background-color: #063157cc;
         &:hover td {
           background-color: #7bf8f430 !important;
         }
         td {
           .cell {
-            // color: #053b6a;
             color: #fff;
           }
         }

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

@@ -47,7 +47,7 @@
         </el-col>
 
         <div>
-          <span>管道所在地址：</span>
+          <span>设备所在地址：</span>
           <span>{{ data.pipeAddr }}</span>
         </div>
         <div>

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

@@ -49,7 +49,7 @@
         </el-col>
 
         <div>
-          <span>管道所在地址：</span>
+          <span>设备所在地址：</span>
           <span>{{ data.pipeAddr }}</span>
         </div>
         <div>

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

@@ -5,16 +5,6 @@
     :before-close="handleClose"
   >
     <el-form :model="formData" ref="formData" :rules="rules">
-      <!-- <el-form-item label="选择时间段:" prop=""> -->
-      <!-- <el-date-picker
-          v-model="dateValue"
-          type="datetimerange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        >
-        </el-date-picker> -->
-      <!-- </el-form-item> -->
       <el-row>
         <el-col :span="11">
           <el-form-item label="选择值班人员:" prop="userId">
@@ -37,10 +27,23 @@
         </el-col>
       </el-row>
 
+      <el-row>
+        <el-col>
+          <el-form-item label="请选择时间段" prop="changeTime">
+            <el-radio-group v-model="formData.changeTime" @change="radioChange">
+              <el-radio :label="1">最近2小时</el-radio>
+              <el-radio :label="2">最近24小时</el-radio>
+              <el-radio :label="3">自定义时间段</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-row>
         <el-col :span="11">
           <el-form-item label="选择开始时间:" prop="beginTime">
             <el-date-picker
+              :disabled="formData.changeTime != 3"
               v-model="formData.beginTime"
               type="datetime"
               placeholder="选择开始时间"
@@ -51,6 +54,7 @@
         <el-col :span="11">
           <el-form-item label="选择结束时间:" prop="endTime">
             <el-date-picker
+              :disabled="formData.changeTime != 3"
               v-model="formData.endTime"
               type="datetime"
               placeholder="选择结束时间"
@@ -97,13 +101,24 @@ export default {
       okLoading: false,
       formData: {
         userId: null,
+        changeTime: 1,
+        beginTime: "",
+        endTime: "",
       },
+      changeTime: null,
       workerManArr: [],
 
       rules: {
         userId: [
           { required: true, message: "请选择值班人员", trigger: "blur" },
         ],
+        changeTime: [
+          {
+            required: true,
+            message: "选择查询时间",
+            trigger: ["blur", "change"],
+          },
+        ],
         beginTime: [
           { required: true, message: "请输入开始时间", trigger: "blur" },
         ],
@@ -120,6 +135,8 @@ export default {
       label: item.nickName,
       value: item.userId,
     }));
+    this.formData.beginTime = moment().format("YYYY-MM-DD HH:mm:ss");
+    this.formData.endTime = moment().add(2, "h").format("YYYY-MM-DD HH:mm:ss");
   },
 
   methods: {
@@ -128,6 +145,22 @@ export default {
       console.log(e);
       this.formData.userId = e;
     },
+    radioChange(e) {
+      if (e == 1) {
+        this.formData.beginTime = moment().format("YYYY-MM-DD HH:mm:ss");
+        this.formData.endTime = moment()
+          .add(2, "h")
+          .format("YYYY-MM-DD HH:mm:ss");
+      } else if (e == 2) {
+        this.formData.beginTime = moment().format("YYYY-MM-DD HH:mm:ss");
+        this.formData.endTime = moment()
+          .add(1, "d")
+          .format("YYYY-MM-DD HH:mm:ss");
+      } else {
+        this.formData.beginTime = "";
+        this.formData.endTime = "";
+      }
+    },
     ok() {
       this.$refs.formData.validate((valid) => {
         if (valid) {
@@ -135,24 +168,24 @@ export default {
             moment(this.formData.beginTime).valueOf() >
             moment(this.formData.endTime).valueOf()
           ) {
-            this.msgError(
-              "开始时间不能大于结束时间"
-            );
+            this.msgError("开始时间不能大于结束时间");
             this.formData.endTime = "";
-
             return;
           }
 
           this.okLoading = true;
-          this.formData.beginTime = moment(this.formData.beginTime).format(
-            "YYYY-MM-DD HH:mm:ss"
-          );
-          this.formData.endTime = moment(this.formData.endTime).format(
-            "YYYY-MM-DD HH:mm:ss"
-          );
-
-          console.log(this.formData);
+          if (this.formData.changeTime != 3) {
+            this.radioChange(this.formData.changeTime);
+          } else {
+            this.formData.beginTime = moment(this.formData.beginTime).format(
+              "YYYY-MM-DD HH:mm:ss"
+            );
+            this.formData.endTime = moment(this.formData.endTime).format(
+              "YYYY-MM-DD HH:mm:ss"
+            );
+          }
 
+          // console.log(this.formData);
           // 找到哪个值班人员
           const target = this.gaodeMap.workerManMarkArr.filter((item) => {
             // console.log("userId",item.getExtData().userId)

gassafety-web/src/components/mapDialog/checkPipeLineLocation.vue

@@ -15,8 +15,6 @@
       <el-button type="primary" size="small" @click="confirmFun">确定</el-button>
       <el-button size="small" @click="$emit('dialogcancelFun')">取消</el-button>
     </el-row>
-
-
   </el-dialog>
 </template>
 <script>

gassafety-web/src/utils/gaodeMap.js

 import createPop from "./createPop";
+import { lineColor } from "./mapCommon.js";
 import regulatorBox from "../components/PopWindow/regulatorBox.vue";
 import valveWell from "../components/PopWindow/valveWell.vue";
 import flowMeter from "../components/PopWindow/flowMeter.vue";
@@ -9,6 +10,7 @@ import { delDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo";
 import markerInfoWindow from "../components/PopWindow/markerInfoWindow.vue";
 import { getArray } from "@/utils/gassafety.js";
 import { delPipe, updatePipe } from "@/api/device/pipe.js";
+
 import vue from "../main";
 let defaultCenter = "石家庄";
 export let map;
@@ -98,6 +100,7 @@ class gaodeMap {
     // 地图开始缩放删除infowindow
     this.myMap.on("zoomstart", () => {
       this.closeInfoWindow();
+      this.polyLinesColorClear();
     });
     this.myMap.on("moveend", () => {
       if (this.handleInfoWindowOpenFunc) {
@@ -130,7 +133,6 @@ class gaodeMap {
 
   changeMap(bool) {
     // 卫星图
-
     if (!bool) {
       if (this.satellite) return;
       this.satellite = new AMap.TileLayer.Satellite();
@@ -529,7 +531,7 @@ class gaodeMap {
     console.log("包装的数组", arr);
     for (let i = 0; i < arr.length; i++) {
       const item = arr[i];
-      let { coordinates } = item;
+      let { coordinates, pipePressure } = item;
       // console.log("coordinates",coordinates)
       // let path = coordinates ? getArray(coordinates) :[];
       // 字符串转二维数组
@@ -537,7 +539,7 @@ class gaodeMap {
       let path = coordinates ? eval(coordinates) : [];
       let polyline = new AMap.Polyline({
         path,
-        strokeColor: "#2EE7E7",
+        strokeColor: lineColor[pipePressure],
         strokeWeight: 4,
         strokeOpacity: 0.9,
         zIndex: 50,
@@ -592,7 +594,9 @@ class gaodeMap {
         this.polyLinesColorClear(polyline);
       });
       polyline.on("mouseout", e => {
-        polyline.setOptions({ strokeColor: "#2EE7E7" });
+        // polyline.setOptions({ strokeColor: "#2EE7E7" });
+        polyline.setOptions({ strokeColor: lineColor[pipePressure] });
+
         // infoWindow.close();
       });
       // 计算info的位置
@@ -712,7 +716,9 @@ class gaodeMap {
   polyLinesColorClear(polylines) {
     this.polyLines.forEach(item => {
       if (item != polylines) {
-        item.setOptions({ strokeColor: "#2EE7E7" });
+        const { pipePressure } = item.getExtData().lineData;
+        // item.setOptions({ strokeColor: "#2EE7E7" });
+        item.setOptions({ strokeColor: lineColor[pipePressure] });
       }
     });
   }
@@ -915,12 +921,14 @@ class gaodeMap {
     this.polyLines.forEach(item => {
       item.polyEditor.close();
       let opstions = item.getExtData();
+      const { pipePressure } = opstions.lineData;
+
       opstions.isState = 0;
       item.setExtData(opstions);
 
       let attr = item.getOptions();
       // attr.strokeColor = "#F7FE38";
-      attr.strokeColor = "#2EE7E7";
+      attr.strokeColor = lineColor[pipePressure];
       item.setOptions(attr);
     });
   }

gassafety-web/src/views/device/map/index.vue

@@ -108,6 +108,26 @@
         <div :class="{ active: mapStyle }" @click="mapChange(2)">全景地图</div>
       </div>
 
+      <div class="pipePressure">
+        <!-- <div>管道压力</div> -->
+        <div class="hasColorBox" :style="{ color: lineColor[`1`] }">
+          <div :style="{ backgroundColor: lineColor[`1`] }"></div>
+          低压
+        </div>
+        <div class="hasColorBox" :style="{ color: lineColor[`2`] }">
+          <div :style="{ backgroundColor: lineColor[`2`] }"></div>
+          中压
+        </div>
+        <div class="hasColorBox" :style="{ color: lineColor[`3`] }">
+          <div :style="{ backgroundColor: lineColor[`3`] }"></div>
+          次高压
+        </div>
+        <div class="hasColorBox" :style="{ color: lineColor[`4`] }">
+          <div :style="{ backgroundColor: lineColor[`4`] }"></div>
+          高压
+        </div>
+      </div>
+
       <div class="switch" @click="backFlag = !backFlag">
         <img v-if="!backFlag" src="@/assets/images/l.png" alt="" />
         <img v-else src="@/assets/images/r.png" alt="" />
@@ -233,6 +253,8 @@ import gaodeMap from "utils/gaodeMap.js";
 import { pipeAllInfoList } from "@/api/device/pipe.js";
 import { map, DEVICE_TYPE, mapOperateType } from "utils/gaodeMap.js";
 import { getAllDeviceInfo } from "@/api/device/deviceInfo";
+import { lineColor } from "@/utils/mapCommon.js";
+
 export default {
   data() {
     return {
@@ -243,6 +265,7 @@ export default {
       radio1: "",
       // 1新建，2编辑，3删除,点按钮变色
       targetNum: 0,
+      lineColor,
 
       backFlag: true,
       // 卫星与全景地图的切换
@@ -1161,6 +1184,24 @@ input[type="radio"] {
       }
     }
   }
+  .pipePressure {
+    position: absolute;
+    color: #fff;
+    right: -80px;
+    top: 50px;
+    padding: 1px;
+    // background: rgba(6, 29, 51, 0.8);
+    .hasColorBox {
+      // border: 1px solid #053b6a;
+      padding: 2px 5px;
+      margin-bottom: 5px;
+      & > div {
+        display: inline-block;
+        width: 10px;
+        height: 10px;
+      }
+    }
+  }
   .scroll {
     // height: 100%;
     position: relative;

gassafety-web/src/views/device/pipe/index.vue

@@ -479,21 +479,27 @@
       handleDelete(row) {
         row.isDel = "1";
         var devices = " ";
-        for(var i = 0; i < row.deviceInfoList.length; i++){
-          var obj = row.deviceInfoList[i];
-          devices = devices + obj.deviceName + " ";
+        var tip = '';
+        if (row.deviceInfoList != null){
+          for(var i = 0; i < row.deviceInfoList.length; i++){
+            var obj = row.deviceInfoList[i];
+            devices = devices + obj.deviceName + " ";
+          }
+          tip = '请确认是否删除管道名称为"' + row.pipeName + '"的数据项，该管道下包含的设备（' + devices + '）将一并被删除', "警告"
+        }else{
+          tip ='请确认是否删除管道名称为"' + row.pipeName + '"的数据项';
         }
-        this.$confirm('请确认是否删除管道名称为"' + row.pipeName + '"的数据项，该管道下包含的设备（' + devices + '）将一并被删除', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function () {
-          return updatePipe(row);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("已删除");
-        }).catch(() => {
-        });
+        this.$confirm(tip , {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function () {
+            return updatePipe(row);
+          }).then(() => {
+            this.getList();
+            this.msgSuccess("已删除");
+          }).catch(() => {
+          });
       },
       /** 导出按钮操作 */
       handleExport() {

gassafety-web/src/views/device/pipeDetail/index.vue

@@ -332,11 +332,18 @@
       handleDelete(res) {
         res.isDel = "1";
         var devices = " ";
-        for (var i = 0; i < res.deviceInfoList.length; i++) {
-          var obj = res.deviceInfoList[i];
-          devices = devices + obj.deviceName + " ";
+        var tip = '';
+        if(res.deviceInfoList != null){
+          for (var i = 0; i < res.deviceInfoList.length; i++) {
+            var obj = res.deviceInfoList[i];
+            devices = devices + obj.deviceName + " ";
+          }
+          tip = '该管道下包含的设备（' + devices + '）将一并被删除', "警告"
+        }else{
+          tip = '请确认是否删除管道名称为"' + res.pipeName + '"的数据项'
         }
-        this.$confirm('请确认是否删除管道名称为"' + res.pipeName + '"的数据项，该管道下包含的设备（' + devices + '）将一并被删除', "警告", {
+        
+        this.$confirm(tip, {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

gassafety-web/src/views/enterprise/mapView/components/CreateWorkTrouble.vue

@@ -78,7 +78,7 @@ export default {
       },
       gaoMap: "",
       open: false,
-      title: "",
+      title: "隐患生成工单",
       inspector: [],
       loading: false,
       alarmId: "",

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

@@ -106,10 +106,22 @@
       <!-- 管道压力 -->
       <div class="pipePressure">
         <!-- <div>管道压力</div> -->
-        <div class="hasColorBox" :style="{color:lineColor[`1`]}">低压</div>
-        <div class="hasColorBox" :style="{color:lineColor[`2`]}">中压</div>
-        <div class="hasColorBox" :style="{color:lineColor[`3`]}">次高</div>
-        <div class="hasColorBox" :style="{color:lineColor[`4`]}">高压</div>
+        <div class="hasColorBox" :style="{ color: lineColor[`1`] }">
+          <div :style="{ backgroundColor: lineColor[`1`] }"></div>
+          低压
+        </div>
+        <div class="hasColorBox" :style="{ color: lineColor[`2`] }">
+          <div :style="{ backgroundColor: lineColor[`2`] }"></div>
+          中压
+        </div>
+        <div class="hasColorBox" :style="{ color: lineColor[`3`] }">
+          <div :style="{ backgroundColor: lineColor[`3`] }"></div>
+          次高压
+        </div>
+        <div class="hasColorBox" :style="{ color: lineColor[`4`] }">
+          <div :style="{ backgroundColor: lineColor[`4`] }"></div>
+          高压
+        </div>
       </div>
       <div class="switch" @click="backFlag = !backFlag">
         <img v-if="!backFlag" src="@/assets/images/l.png" alt="" />
@@ -1700,16 +1712,20 @@ input[type="radio"] {
   .pipePressure {
     position: absolute;
     color: #fff;
-    right: -52px;
+    right: -80px;
     top: 50px;
-    padding:1px;
+    padding: 1px;
     // background: rgba(6, 29, 51, 0.8);
-    .hasColorBox{
-      border:1px solid #053b6a;
-      padding:2px 5px;
-      margin-bottom:5px;
+    .hasColorBox {
+      // border: 1px solid #053b6a;
+      padding: 2px 5px;
+      margin-bottom: 5px;
+      & > div {
+        display: inline-block;
+        width: 10px;
+        height: 10px;
+      }
     }
-
   }
   .scroll {
     // height: 100%;