隐患生成工单无标题问题解决，gis下边表格透明度问题解决

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 {
@@ -118,11 +118,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 +134,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 +146,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/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;
@@ -527,7 +529,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) :[];
       // 字符串转二维数组
@@ -535,7 +537,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,
@@ -590,7 +592,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的位置
@@ -710,7 +714,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] });
       }
     });
   }
@@ -913,12 +919,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/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%;