BUG修复

BJYSYBZ_C/src/components/ol/VlConfigLayers/VlConfigLayers.vue

@@ -168,7 +168,7 @@ export default {
           if (!layerDefs[i]) {
             layerDefs[i] = '1 = 1'
             if (userInfo && userInfo['roles'].length > 0 && userInfo['roles'].indexOf('company') != -1) {
-              layerDefs[i] = `1 = 1 and gddw like '${userInfo['nickName']}'`
+              layerDefs[i] = `gddw like '%${userInfo['nickName']}%'`
             }
           }
         })

BJYSYBZ_C/src/views/BjWlydManageView/components/FourContent.vue

@@ -235,6 +235,16 @@ export default {
         }
       }
     }
+    this.$vm.$on('refreshListData', (payload) => {
+      for (let i = 0; i < this.xzList.length; i++){
+        if (this.xzList[i]['dksyh'] === payload['dksyh']) {
+          this.xzList.splice(i, 1, payload);
+          this.$vm.$emit('setGdDetailType', 24);
+          this.$vm.$emit('getGdDetailData', payload);
+          break;
+        }
+      }
+    })
   },
   mounted() {
     this.$vm.$emit('setGdDetailType', 24);
@@ -274,7 +284,7 @@ export default {
         refreshP += ` and dkbh like '%${this.query.name}%'`;
       }
       if (this.query.gddw) {
-        refreshP += ` and gddw like '${this.query.gddw}'`;
+        refreshP += ` and gddw like '%${this.query.gddw}%'`;
       }
       if (this.query.small) {
         refreshP += ` and mj >= ${this.query.small}`;
@@ -334,6 +344,7 @@ export default {
     },
     xzClick(item) {
       this.$vm.$emit('setGdDetailType', 24);
+      this.$vm.$emit('getGdDetailData', item);
       this.$vm.$emit('location-feature-where', {
         layerId: 'bj-dkgl',
         where: `dksyh = '${item.dksyh}'`,

BJYSYBZ_C/src/views/BjWlydManageView/components/Td.vue

@@ -334,6 +334,7 @@ export default {
     save() {
       let urlApi = `/api/ybz-bj/manageSave`;
       let params = new FormData();
+      params.append('dkbh', this.sumbitObj.dkbh);
       params.append('id', this.sumbitObj.dksyh);
       params.append('mj', this.sumbitObj.mj);
       params.append('dkwz', this.sumbitObj.dkwz);
@@ -359,8 +360,9 @@ export default {
               type: 'warning',
             },
           )
-            .then(() => {})
-            .catch(() => {});
+          var nObj = {};
+          Object.assign(nObj, this.sumbitObj)
+          this.$vm.$emit('refreshListData', nObj)
       });
     },
     beforeUpload(file) {

BJYSYBZ_C/src/views/BjWlydManageView/components/yjsqDetail.vue

@@ -44,7 +44,7 @@
       </div>
       <div class="form">
         <div class="title">
-          <p class="p">附件材料（非必填）</p>
+          <p class="p"><span style="color: red;">*</span> 附件材料</p>
           <el-upload
             action=""
             :show-file-list="false"
@@ -169,14 +169,10 @@ export default {
     submit() {
       let url = '/api/ybz-bj/gddwsq';
       let params = this.queryParams;
-      let fileIds = [];
-      let files = '';
+      this.queryParams.fileIds = ''
       if (this.fileList.length > 0) {
-        this.fileList.forEach((item) => {
-          fileIds.push(item.id);
-        });
-        files = fileIds.join(',');
-        params.fileIds = files;
+        const fileIds = this.fileList.map((item) => item.id);
+        this.queryParams.fileIds = fileIds.join(',');
       }
       if (this.queryParams.newGddw == '') {
         this.$message({
@@ -199,13 +195,13 @@ export default {
         });
         return;
       }
-      // if (this.queryParams.fileIds == '') {
-      //   this.$message({
-      //     message: '附件材料不能为空！',
-      //     type: 'warning',
-      //   });
-      //   return;
-      // }
+      if (this.queryParams.fileIds == '') {
+        this.$message({
+          message: '附件材料不能为空！',
+          type: 'warning',
+        });
+        return;
+      }
       this.$ajax.post(url, params, this, false).then((res) => {
         if (res.data) {
           this.$message({

BJYSYBZ_C/src/views/components/BigScreenMap/index.vue

@@ -258,9 +258,9 @@
             </p>
           </div>
           <div class="content" v-if="detailType == 24">
-            <h2>{{ props["dkbh"] }}</h2>
-            <p>行政区划：{{ "滨江区 - " + props["dkwz"] }}</p>
-            <p>管地单位：{{ props["gddw"] }}</p>
+            <h2>{{ detailData["dkbh"] }}</h2>
+            <p>行政区划：{{ "滨江区 - " + detailData["dkwz"] }}</p>
+            <p>管地单位：{{ detailData["gddw"] }}</p>
           </div>
           <div class="content" v-if="detailType == 25">
             <h2>{{ props["name"] }}</h2>

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/dto/CommonDTO.java

@@ -18,6 +18,7 @@ public class CommonDTO extends PageDTO {
 
     private String id;
     private String id1;
+    private String dkbh;
     private String xzqdm;
     private String xmmc;
     private String jsdw;

BJYSYBZ_S/src/main/resources/mapper/YbzBJMapper.xml

@@ -455,6 +455,7 @@
     <update id="manageSave" parameterType="com.zjugis.ysgzybz.domain.dto.CommonDTO">
         update sde.bjwkfly2000
         set
+        dkbh = #{dkbh},
         dkmj = ${mj} / 0.0015,
         dkwz = #{dkwz},
         mj = ${mj},