Merge remote-tracking branch 'origin/master' into zpf

src/api/ghss/ghxz.js

@@ -49,3 +49,10 @@ export function GetXzResList(params) {
         params
     })
 }
+export function DelXzRes(params) {
+    return request({
+        url: '/analyse/fzss/DelXzRes',
+        method: 'delete',
+        params
+    })
+}

src/components/Query/clickQuery/clickQuery.vue

@@ -272,7 +272,7 @@ export default {
         let Pid = "";
         var tempArr = [];
         // "ResultNetWork@管线#1"///"ResultNetWork_Node@管线#1"
-        if (eneityName.indexOf("管线") > 0) {
+        if (eneityName.indexOf("雨水") > -1) {
           let buildingLayer = scene.layers.find(eneityName);
           buildingLayer.indexedDBSetting.isAttributesSave = true; //保存属性
           if (buildingLayer.getSelection().length > 0) {

src/views/cockpit/datePicker.vue

@@ -80,7 +80,7 @@ export default {
   z-index: 100;
   font-size: 14px;
   padding: 0;
-  width: 180px !important;
+  width: 200px !important;
 }
 
 @import "../cockpit/datePicker.scss";

src/views/complianceAnalysis/components/lsjl.vue

@@ -78,7 +78,7 @@ import parse from "wellknown";
 import { GetPage, Delect } from "@/api/ghss/hgxfx.js";
 import { Message, MessageBox } from "element-ui";
 import { rest } from "lodash";
-import { GetXzResList } from "../../../api/ghss/ghxz.js";
+import { GetXzResList,DelXzRes } from "../../../api/ghss/ghxz.js";
 let dataSources;
 export default {
   props: {
@@ -141,6 +141,12 @@ export default {
               }
             });
           } else {
+            DelXzRes({ bsm: item.bsm }).then((res) => {
+              if (res.success) {
+                Message.success("删除成功！");
+                this.changeForm();
+              }
+            });
           }
         })
         .catch(() => {});