土地供应开竣工设置

src/api/Idleland.js

@@ -0,0 +1,47 @@
+import request from '@/utils/request.js'
+//开工设置
+export function kgSet(data) {
+    return request({
+        url: '/apply/tdgy',
+        method: 'put',
+        data: data
+    })
+}
+// 获取疑似闲置用地
+export function GetList(params) {
+    return request({
+        url: '/apply/tdgy/suspectedIdleLand',
+        method: 'get',
+        params
+    })
+}
+export function GetDetail(params) {
+    return request({
+        url: '/apply/tdgy/{id}',
+        method: 'get',
+        params
+    })
+}
+export function Confirm(data) {
+    return request({
+        url: '/apply/tdgy/idleLandConfirm',
+        method: 'post',
+        data
+    })
+}
+export function Disposal(data) {
+    return request({
+        url: '/apply/tdgy/idleLandDisposal',
+        method: 'post',
+        data
+    })
+}
+// export function GetDetail(params) {
+//     return request({
+//         url: '/apply/tdgy/{id}',
+//         method: 'get',
+//         params
+//     })
+// }
+
+

src/components/Query/clickQuery/CockpitVector.vue

@@ -19,12 +19,16 @@
           item.name !== 'zlmj' &&
           item.name !== 'tzje' &&
           item.name !== 'dataid' &&
-          item.name !== 'did'
+          item.name !== 'did'&&
+          item.name !== 'pid'
       ) : []
         " style="width: 100%">
         <el-table-column show-overflow-tooltip prop="name" label="属性" width="140">
         </el-table-column>
         <el-table-column show-overflow-tooltip prop="value" label="属性值">
+          <template slot-scope="scope" >
+            <span> {{map[scope.row.value]||scope.row.value}} </span>
+          </template>
         </el-table-column>
       </el-table>
       <div id="seaTransferCharts" ref="echartsRef" v-if="store.state.vectordataid"></div>
@@ -58,6 +62,10 @@ export default {
       timeout: null,
       pick_entity: null,
       dataid: 0,
+      map: {
+    true: '是',
+    false: '否'
+  }
     };
   },
   //监听属性 类似于data概念

src/views/Idleland/components/config.js

@@ -2,7 +2,7 @@ export const ysForm = [
   [
     {
       label: '',
-      prop: 'carNo',
+      prop: 'key',
       span: 12,
       component: 'ElInput',
       componentProps: {
@@ -24,7 +24,7 @@ export const xzForm = [
   [
     {
       label: '',
-      prop: 'carNo',
+      prop: 'key',
       span: 8,
       component: 'ElInput',
       componentProps: {

src/views/Idleland/components/list.vue

@@ -12,7 +12,7 @@
       <template #region>
         <!-- clearable -->
         <el-cascader
-          v-model="pageObj.id"
+          v-model="pageObj.xzqh"
           :show-all-levels="false"
           :options="store.state.region_tree"
           placeholder="行政区"
@@ -81,9 +81,7 @@
 import tablePage from "@/components/mapView/tablePage.vue";
 import customForm from "@/components/mapView/custom-form.vue";
 import handleModal from "./handleModal.vue";
-import { GetPage } from "@/api/ghss/hgxfx.js";
-import { GetXzResList } from "../../../api/ghss/ghxz.js";
-
+import { GetList } from "@/api/Idleland.js";
 import { ysForm, xzForm, TableHeader, TableHeader2 } from "./config";
 let dataSources;
 export default {
@@ -103,13 +101,13 @@ export default {
   data() {
     return {
       pageObj: {
-        kssj: "",
-        sj: [],
-        jssj: "",
-        xmmc: "",
-        page: 1,
+        key: "",
+        xzqh: "4602",
+        xzyy: "",
+        czzt: "",
+        pageNum: 1,
+        pageSize: 10,
       },
-
       datalist: [{}],
       formConfig: ysForm,
       cloumn: TableHeader,
@@ -154,62 +152,26 @@ export default {
   mounted() {
     this.formConfig = this.$props.type == 0 ? ysForm : xzForm;
     this.cloumn = this.$props.type == 0 ? TableHeader : TableHeader2;
-    this.getData();
+    this.getTableData();
   },
   methods: {
-    changetype() {
-      // switch (this.$props.type) {
-      //   case 0:
-      //     this.formConfig = ysForm;
-      //     break;
-      //   case 1:
-      //     this.formConfig = xzForm;
-      //     break;
-      //   case 2:
-      //     this.formConfig = ysForm;
-      //     break;
-      //   default:
-      //     break;
-      // }
+    searchFun(page) {
+      this.getTableData({
+        pageNum: page.pageIndex,
+        pageSize: page.size,
+        ...this.pageObj,
+      });
     },
-    getData() {
+    getTableData() {
       this.$emit("updateParent", "loading", true);
-      if (this.$props.type == "hgxfx") {
-        GetPage({ ...this.pageObj }).then((res) => {
-          setTimeout(() => {
-            this.$emit("updateParent", "loading", false);
-          }, 100);
-          this.listdisabled = res.data.length < 10;
-          this.datalist = [...this.datalist, ...res.data];
-        });
-      } else if (this.$props.type == "ghxz") {
-        //规划选址历史记录
-        let tempObj = { ...this.pageObj };
-        let obj = {
-          startTime: tempObj.kssj,
-          endTime: tempObj.jssj,
-          name: tempObj.xmmc,
-          pageNum: this.pageObj.page,
-          pageSize: 10,
-        };
-        GetXzResList(obj).then((res) => {
-          // setTimeout(() => {
-          //   this.$emit("updateParent", "loading", false);
-          // }, 100);
-          // this.datalist = [...this.datalist, ...res.data.items];
-        });
-      } else if (this.$props.type == "gdbh") {
-        //耕保历史记录
-        // SelectGdbhList({ ...this.pageObj }).then((res) => {
-        //   setTimeout(() => {
-        //     this.$emit("updateParent", "loading", false);
-        //   }, 100);
-        //   if (res.code == 200) {
-        //     this.listdisabled = res.rows.length < 10;
-        //     this.datalist = [...this.datalist, ...res.rows];
-        //   }
-        // });
-      }
+      // if (this.$props.type == 0) {
+      GetList(this.pageObj).then((res) => {
+        this.$emit("updateParent", "loading", false);
+        this.table = res.data;
+      });
+      // } else if (this.$props.type == "ghxz") {
+      // } else if (this.$props.type == "gdbh") {
+      // }
     },
     addPolygon(geojson) {},
     reset() {
@@ -227,7 +189,7 @@ export default {
     },
     changerdxz() {
       this.rdxz = !this.rdxz;
-      this.getData();
+      this.getTableData();
     },
   },
   watch: {},

src/views/ResourceShare/myApplication/index.vue

@@ -116,6 +116,9 @@ export default {
     };
   },
   methods: {
+    searchFun(page) {
+      this.getTableData({ pageNo: page.pageIndex, pageSize: page.size });
+    },
     async getTableData(params) {
       let obj = {
         jscType: store.state.cockpit_vector.tablejscType,

src/views/ResourceShare/myReview/index.vue

@@ -121,6 +121,9 @@ export default {
     };
   },
   methods: {
+    searchFun(page) {
+      this.getTableData({ pageNo: page.pageIndex, pageSize: page.size });
+    },
     async getTableData(params) {
       let obj = {
         jscType: store.state.cockpit_vector.tablejscType,

src/views/ResourceShare/sharedLocation/index.vue

@@ -115,6 +115,9 @@ export default {
     };
   },
   methods: {
+    searchFun(page) {
+      this.getTableData({ pageNo: page.pageIndex, pageSize: page.size });
+    },
     async getTableData(params) {
       let obj = {
         jscType: store.state.cockpit_vector.tablejscType,

src/views/cockpit/common/VectorSpace/BoxCommonVector.vue

@@ -72,7 +72,7 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <startWork ref="startWorkRef"></startWork>
+    <startWork ref="startWorkRef" @close="reset"></startWork>
   </div>
 </template>
 
@@ -121,6 +121,11 @@ export default {
     start(item) {
       this.$refs.startWorkRef.Init(item);
     },
+    reset(){
+      this.searchform= {}
+      this.word=""
+      this.init_vector(this.searchform)
+    },
     closeIsShallow() {
       this.isShallow = false;
       this.details = [];

src/views/cockpit/common/VectorSpace/startWorkModal.vue

@@ -1,24 +1,63 @@
 <template>
   <div class="dialog">
     <el-dialog
-      :title="formData['项目名称']"
+      title="开竣工信息设置"
       width="40%"
       :visible.sync="dialogVisible"
       :before-close="close"
       :modal-append-to-body="false"
       :close-on-click-modal="false"
     >
+      <!-- label-width="130px" -->
       <div class="content">
-        <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
-          <el-form-item label="是否开工:" prop="shjl">
-            <el-radio v-model="ruleForm.shjl" label="1"> 开工 </el-radio>
-            <el-radio v-model="ruleForm.shjl" label="2"> 不开工 </el-radio>
+        <el-form
+          :model="ruleForm"
+          ref="ruleForm"
+          :rules="rules"
+          :inline="true"
+          class="two-columns"
+        >
+          <el-form-item label="项目名称:"> {{ title }} </el-form-item>
+          <el-form-item label="约定开工日期:" prop="ydkgsj">
+            <el-date-picker
+              v-model="ruleForm.ydkgsj"
+              type="date"
+              value-format="yyyy/MM/dd"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="约定竣工时间:" prop="ydjgsj">
+            <el-date-picker
+              v-model="ruleForm.ydjgsj"
+              type="date"
+              value-format="yyyy/MM/dd"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="是否开工:" prop="sfkg">
+            <el-radio v-model="ruleForm.sfkg" :label="true"> 是 </el-radio>
+            <el-radio v-model="ruleForm.sfkg" :label="false"> 否 </el-radio>
           </el-form-item>
-          <el-form-item label="开工日期:" prop="jzrq">
+          <el-form-item label="实际开工日期:" prop="sjkgsj">
             <el-date-picker
-              v-model="ruleForm.jzrq"
+              v-model="ruleForm.sjkgsj"
               type="date"
-              value-format="yyyy-MM-dd"
+              value-format="yyyy/MM/dd"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="是否竣工:" prop="sfjg">
+            <el-radio v-model="ruleForm.sfjg" :label="true"> 是 </el-radio>
+            <el-radio v-model="ruleForm.sfjg" :label="false"> 否 </el-radio>
+          </el-form-item>
+          <el-form-item label="实际竣工日期:" prop="sjjgsj">
+            <el-date-picker
+              v-model="ruleForm.sjjgsj"
+              type="date"
+              value-format="yyyy/MM/dd"
               placeholder="选择日期"
             >
             </el-date-picker>
@@ -34,14 +73,24 @@
 </template>
 
 <script>
+import { kgSet } from "@/api/Idleland";
 export default {
   components: {},
   props: {},
   data() {
     return {
-      formData: {},
-      ruleForm: {},
+      title: "",
+      ruleForm: {
+        id: "",
+        ydkgsj: "",
+        ydjgsj: "",
+        sjkgsj: "",
+        sfjg: false,
+      },
       dialogVisible: false,
+      rules: {
+        sfkg: [{ required: true, message: "请选址是否开工" }],
+      },
     };
   },
   created() {},
@@ -53,11 +102,31 @@ export default {
     },
     Init(rowdata) {
       this.dialogVisible = true;
-      this.formData = rowdata;
+      this.title = rowdata["项目名称"];
+      this.ruleForm = {
+        id: rowdata["pid"] || 415,
+        ydkgsj: rowdata["约定开工日期"] || "",
+        ydjgsj: rowdata["约定竣工日期"] || "",
+        sfkg: rowdata["是否开工"] || false,
+        sfjg: rowdata["是否竣工"] || false,
+        sjkgsj: rowdata["实际开工日期"] || "",
+        sjjgsj: rowdata["实际竣工日期"] || "",
+      };
     },
-
     async submit() {
-      this.close();
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          kgSet(this.ruleForm).then((res) => {
+            if (res.success) {
+              this.$message.success("开工数据设置成功！");
+              this.close();
+            }
+          });
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
     },
   },
 };
@@ -85,6 +154,16 @@ export default {
   .elrow {
     margin-top: 10px;
   }
+  .two-columns .el-form-item {
+    width: 49%;
+  }
+
+  .two-columns .el-form-item:nth-child(odd) {
+    margin-right: 0;
+  }
+  .two-columns .el-form-item:nth-child(1) {
+    width: 100%;
+  }
 }
 </style>
 <style lang="scss" >

src/views/farmlandProtection/components/interDetails.vue

@@ -230,6 +230,9 @@ export default {
         if (res.geom)
           loadGeoJSON(res.geom, "#55A1E3", { isfly: false }, (data) => {
             layerSources[res.id] = data;
+            data.entities.values.forEach((entity) => {
+              entity.properties = res;
+            });
           });
       });
     },