Browse Source

文件资料回显

maxiaoxiao 7 months ago
parent
commit
5745db8379

+ 3 - 4
src/views/Idleland/components/details.vue

@@ -86,7 +86,6 @@ export default {
               value: res.data[key],
             });
           });
-          this.flyTo(res.data);
         } else {
           this.$message.error(res.message);
         }
@@ -105,7 +104,7 @@ export default {
               { name: "认定时间", value: res.data.confirmTime },
               { name: "认定情况", value: res.data.confirmBasis },
             ];
-            this.rdfileList = res.data.file;
+            this.rdfileList = res.data.files;
           } else {
             this.$message.error(res.message);
           }
@@ -115,12 +114,12 @@ export default {
         this.czfileList = [];
         GetDisposalDetail(val.id).then((res) => {
           if (res.statuscode == 200) {
-            this.rdData = [
+            this.czData = [
               { name: "处置时间", value: res.data.disposalTime },
               { name: "处置方式", value: res.data.disposalMethod },
               { name: "处置情况", value: res.data.disposalInfo },
             ];
-            this.czfileList = res.data.file;
+            this.czfileList = res.data.files;
           } else {
             this.$message.error(res.message);
           }

+ 3 - 7
src/views/Idleland/components/info.vue

@@ -28,13 +28,13 @@
         </el-table-column>
         <el-table-column
           show-overflow-tooltip="true"
-          prop="name"
+          prop="fileName"
           label="文件名称"
         >
         </el-table-column>
         <el-table-column label="操作" width="70px">
           <template slot-scope="scope">
-            <span class="usable" @click="download(scope.row)"> 下载查看 </span>
+            <span class="usable" @click="download(scope.row)"> 查看 </span>
           </template>
         </el-table-column>
       </el-table>
@@ -54,11 +54,7 @@ export default {
   },
   methods: {
     download(obj) {
-      window.open(
-        window.axiosURI +
-          "/analyse/fzss/DownloadReport?filePath=" +
-          `${obj.fxbg}`
-      );
+      window.open(obj.fileUrl);
     },
   },
 };

+ 12 - 12
src/views/Idleland/components/list.vue

@@ -39,7 +39,7 @@
           size="mini"
           type="primary"
           icon="el-icon-search"
-          @click="getTableData"
+          @click="searchFun"
         >
         </el-button>
       </template>
@@ -73,7 +73,7 @@
     <div class="tip" v-if="type == 0">
       说明:系统判断疑似闲置的条件(合同约定开工之日起仍未开工的项目)
     </div>
-    <handleModal ref="handleRef"></handleModal>
+    <handleModal ref="handleRef" @close="searchFun()"></handleModal>
   </div>
 </template>
 
@@ -90,7 +90,7 @@ import {
   reasonList,
 } from "./config";
 import { loadGeoJSON } from "@/utils/MapHelper/help.js";
-let geoSources;
+let geoSources = {};
 export default {
   components: {
     tablePage,
@@ -114,6 +114,7 @@ export default {
         isConfirm: true,
         pageNum: 1,
         pageSize: 10,
+        isDisposal: false,
       },
       datalist: [{}],
       formConfig: ysForm,
@@ -129,19 +130,18 @@ export default {
   mounted() {
     this.formConfig = this.$props.type == 0 ? ysForm : xzForm;
     this.cloumn = this.$props.type == 0 ? TableHeader : TableHeader2;
-
-    console.log("s0s-scddcd-s");
+    this.pageObj.isConfirm = this.$props.type == 2;
+    this.pageObj.isDisposal = this.$props.type == 2;
   },
   methods: {
-    searchFun(page) {
+    searchFun(page = {}) {
       this.getTableData({
-        pageNum: page.pageIndex,
-        pageSize: page.size,
         ...this.pageObj,
+        pageNum: page.pageIndex || 1,
+        pageSize: page.size || 10,
       });
     },
     getTableData() {
-      console.log("s0s-s-s", this.$props.type);
       this.$emit("updateParent", "loading", true);
       this.removeGeoJSON();
       if (this.$props.type == 0) {
@@ -154,7 +154,7 @@ export default {
           };
           this.active_tableData(res.data.list);
         });
-      } else if (this.$props.type == 1) {
+      } else {
         idleLandList(this.pageObj).then((res) => {
           this.$emit("updateParent", "loading", false);
           this.table = {
@@ -164,7 +164,6 @@ export default {
           };
           this.active_tableData(res.data.list);
         });
-      } else if (this.$props.type == 2) {
       }
     },
     active_tableData(newVal) {
@@ -188,6 +187,7 @@ export default {
     flyTo(item) {
       let id = "h_" + item.id;
       this.tempdataLayerId = id;
+      if (geoSources[id]) return;
       loadGeoJSON(
         item.geom || item.st_asewkt,
         "#ff0000",
@@ -220,7 +220,7 @@ export default {
     },
     changerdxz() {
       this.pageObj.isConfirm = !this.pageObj.isConfirm;
-      this.getTableData();
+      this.searchFun();
     },
   },
   watch: {

+ 2 - 2
src/views/Idleland/components/xzgl.vue

@@ -29,7 +29,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.$refs.distrust.getTableData();
+      this.$refs.distrust.searchFun();
     });
   },
   methods: {
@@ -40,7 +40,7 @@ export default {
   },
   watch: {
     activeTabs(newValue) {
-      this.$refs[newValue].getTableData();
+      this.$refs[newValue].searchFun();
       // this.$refs.tjzl.getData();
     },
   },