Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

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

@@ -109,4 +109,15 @@ public class TOrderFeedbackController extends BaseController
     {
         return toAjax(tOrderFeedbackService.deleteTOrderFeedbackByIds(feedbackIds));
     }
+
+    /**
+     *
+     * @return
+     */
+    @Log(title = "工单反馈信息列表", businessType = BusinessType.DELETE)
+    @GetMapping("/listbyOrder")
+    public TableDataInfo listbyOrder(String orderId)
+    {
+        return getDataTable(tOrderFeedbackService.selectTOrderFeedbackByOrderId(orderId));
+    }
 }

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

@@ -58,4 +58,10 @@ public interface ITOrderFeedbackService
      * @return 结果
      */
     public int deleteTOrderFeedbackById(int feedbackId);
+    /**
+     * 查询工单的反馈信息列表
+     * @param orderId
+     * @return
+     */
+    public List<TOrderFeedback> selectTOrderFeedbackByOrderId(String orderId);
 }

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

@@ -189,4 +189,15 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
     {
         return tOrderFeedbackMapper.deleteTOrderFeedbackById(feedbackId);
     }
+
+    /**
+     * 工单的反馈信息列表
+     * @param orderId
+     * @return
+     */
+    @Override
+    public List<TOrderFeedback> selectTOrderFeedbackByOrderId(String orderId){
+        List<TOrderFeedback> orderFeedbackList = tOrderFeedbackMapper.selectTOrderFeedbackByOrderId(orderId);
+        return orderFeedbackList;
+    }
 }

gassafety-web/.env.development

@@ -8,7 +8,7 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_MAP_CENTER = '石家庄'
 
 #代理地址
-VUE_APP_TARGET = 'http://localhost:8903/gassafety'
+VUE_APP_TARGET = 'http://36.148.23.59:8901/gassafety'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

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

@@ -105,13 +105,16 @@
 
 // gis地图中底部table样式
 .drawer {
-  // .el-button {
-  //   color:red;
-  //   .is-disabled {
-  //     background-color: none;
-  //   }
-  // }
-
+  .el-button {
+    color: #ffffff;
+    &:not(.is-disabled):hover {
+      color: rgb(46, 231, 231);
+    }
+    &.is-disabled {
+      border-color: #ccccccc3 !important;
+      color: #ccccccc3;
+    }
+  }
 }
 .right-bottom-data-left {
   .el-table {

gassafety-web/src/components/mapDialog/js/gaodeMapDialog.js

@@ -9,6 +9,8 @@ import { delDeviceInfo } from "@/api/device/deviceInfo";
 import markerInfoWindow from "@/components/PopWindow/markerInfoWindow.vue";
 import { getArray } from "@/utils/gassafety.js";
 import { delPipe } from "@/api/device/pipe.js";
+import { lineColor,mapStyle } from "@/utils/mapCommon.js";
+
 import vue from "@/main";
 let defaultCenter = "石家庄";
 export let map;
@@ -48,7 +50,8 @@ class gaodeMap {
       showLabel: true,
       // labelzIndex: 110,
       pitch: 8,
-      zoom: 12
+      zoom: 12,
+      mapStyle,
       //mapStyle: 'amap://styles/darkblue',
       // mapStyle: 'amap://styles/3b679a15f448a4740ba2ff7524e1a4ae',
     });

gassafety-web/src/utils/gaodeMap.js

 import createPop from "./createPop";
-import { lineColor } from "./mapCommon.js";
+import { lineColor,mapStyle } from "./mapCommon.js";
 import regulatorBox from "../components/PopWindow/regulatorBox.vue";
 import valveWell from "../components/PopWindow/valveWell.vue";
 import flowMeter from "../components/PopWindow/flowMeter.vue";
@@ -57,7 +57,7 @@ class gaodeMap {
       // labelzIndex: 110,
       pitch: 8,
       zoom: 9,
-      mapStyle: "amap://styles/1c84d2203793b0f622df2cda53db1afd"
+      mapStyle,
       // mapStyle: 'amap://styles/darkblue',
       // mapStyle: 'amap://styles/3b679a15f448a4740ba2ff7524e1a4ae',
     });

gassafety-web/src/utils/gaodeMapView.js

@@ -15,7 +15,7 @@ import workerManInfowindow from "../components/PopWindowGis/workerManInfowindow.
 import workerManView from "../components/PopWindowGis/workerManView.vue";
 
 import { getArray } from "@/utils/gassafety.js";
-import { lineColor } from "./mapCommon.js";
+import { lineColor,mapStyle } from "./mapCommon.js";
 import { delPipe } from "@/api/device/pipe.js";
 import vue from "../main";
 import { Card } from "element-ui";
@@ -73,7 +73,7 @@ class gaodeMap {
       pitch: 8,
       zoom: 9,
       //mapStyle: 'amap://styles/darkblue',
-      mapStyle: "amap://styles/1c84d2203793b0f622df2cda53db1afd"
+      mapStyle,
     });
     this.myMap = map;
     this.myMap.on("mousedown", e => {
@@ -103,6 +103,8 @@ class gaodeMap {
     // 地图开始平移删除infowindow
     this.myMap.on("movestart", () => {
       // console.log("地图平移");
+      // 如果这个值为真，下面都不执行,trac用的，第一额值班人员的infowindow显示的时候被消掉了
+      if (this.tracMoveFlag) return;
       if (this.leftListClick) {
         console.log("moveStart");
         this.closeInfoWindow();
@@ -113,11 +115,15 @@ class gaodeMap {
     // 地图开始缩放删除infowindow
     this.myMap.on("zoomstart", () => {
       // console.log("缩放开始")
+      this.domAllShow();
+      // 如果这个值为真，下面都不执行,trac用的，第一额值班人员的infowindow显示的时候被消掉了
+      if (this.tracMoveFlag) return;
       this.closeInfoWindow();
-      this.polyLinesColorClear()
-
+      this.polyLinesColorClear();
     });
     this.myMap.on("moveend", () => {
+      this.tracMoveFlag = false;
+
       if (this.handleInfoWindowOpenFunc) {
         this.handleInfoWindowOpenFunc();
         this.handleInfoWindowOpenFunc = null;
@@ -703,6 +709,11 @@ class gaodeMap {
   }
   //
   trackBack(marker, arr, data) {
+    this.tracMoveFlag = true;
+    // 飞过去
+    this.panTo(arr[0]);
+    // 放大
+    this.myMap.setZoom(13);
     // 值班人员轨迹回放
     AMap.plugin("AMap.MoveAnimation", () => {
       let lineArr = arr;
@@ -766,15 +777,30 @@ class gaodeMap {
       });
       // 刚开始的时候要立个点
       let workPoint = this.addMarker(DEVICE_TYPE.SMALLINSPECTOR, data[0]);
+      this.wokerManOpen({
+        target: workPoint,
+        lnglat: workPoint.getExtData().pos
+      });
       marker.pointArr.push(workPoint);
       marker.moveMarker.on("moveend", e => {
         // 如果不是最后一个点，就创建一个新的worderpoint，如果是就不创建，并且把自身删除
+        let z = {};
         if (e.index == lineArr.length - 1) {
+          z = {
+            target: marker,
+            lnglat: e.passedPos
+          };
           map.remove(marker.moveMarker);
         } else {
           workPoint = this.addMarker(DEVICE_TYPE.SMALLINSPECTOR, data[e.index]);
+          // workPoint.infoWindow.open(map,e.passedPos);
+          z = {
+            target: workPoint,
+            lnglat: e.passedPos
+          };
           marker.pointArr.push(workPoint);
         }
+        this.wokerManOpen(z);
       });
       marker.moveMarker.on("moveAlong", () => {
         console.log("moveAlong", e);
@@ -789,6 +815,7 @@ class gaodeMap {
     });
   }
   workerManAttrRemove(marker) {
+    marker.moveMarker && marker.moveMarker.stopMove();
     marker.moveMarker && map.remove(marker.moveMarker);
     marker.polyline && map.remove(marker.polyline);
     marker.passedPolyline && map.remove(marker.passedPolyline);

gassafety-web/src/utils/mapCommon.js

@@ -6,3 +6,4 @@
   "3":"#18FF0F",
   "4":"#DE67FA"
 }
+export const mapStyle="amap://styles/1c84d2203793b0f622df2cda53db1afd";
\ No newline at end of file