YHYZT/client/src/views/DataManage/Gd.vue

@@ -6,7 +6,7 @@
           <el-row :gutter="0">
             <el-col :span="6">
               <el-form-item label="做地主体：">
-                <el-input v-model="searchParam.gdsy" placeholder="请输入做地主体" clearable></el-input>
+                <el-input v-model="searchParam.zdzt" placeholder="请输入做地主体" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -44,6 +44,7 @@
             <el-col :span="6">
               <el-form-item label="出让金是否已缴清：">
                 <el-select v-model="searchParam.crjsfyjq" style="width: 100%;">
+                  <el-option value="" label="全部"></el-option>
                   <el-option value="是" label="是"></el-option>
                   <el-option value="否" label="否"></el-option>
                 </el-select>
@@ -54,6 +55,7 @@
             <el-col :span="6">
               <el-form-item label="合同是否已备案：">
                 <el-select v-model="searchParam.htsfyba" style="width: 100%;">
+                  <el-option value="" label="全部"></el-option>
                   <el-option value="是" label="是"></el-option>
                   <el-option value="否" label="否"></el-option>
                 </el-select>
@@ -104,7 +106,7 @@
               label="序号">
           </el-table-column>
           <el-table-column
-              prop="gdsy"
+              prop="zdzt"
               label="做地主体">
           </el-table-column>
           <el-table-column

YHYZT/client/src/views/DataManage/Lsyd.vue

@@ -229,13 +229,19 @@ export default {
     //查询报批项目信息
     queryByPage(){
       let _this = this;
-      if (this.dqsjDateRange.length > 0) {
+      if (this.dqsjDateRange && this.dqsjDateRange.length > 0) {
         this.searchParam.dqsjStart = this.dqsjDateRange[0]
         this.searchParam.dqsjEnd = this.dqsjDateRange[1]
+      }else{
+        this.searchParam.dqsjStart = ''
+        this.searchParam.dqsjEnd = ''
       }
       const params = {
         ...this.searchParam
       }
+      if(params['pzwh']){
+        params['pzwh'] = encodeURI(params['pzwh'])
+      }
       this.$ajax.get('/api/templand/page', params, this, true).then(res => {
         if (res.status === 200) {
             _this.tableData.data= res.records;
@@ -251,7 +257,7 @@ export default {
     },
     deleteHandle (index, row) {
       const params = {id: row['objectid']}
-      this.$ajax.get('/api/stgddk/delete', params, this, true).then(res => {
+      this.$ajax.get('/api/templand/delete', params, this, true).then(res => {
         if (res) {
           this.$Message.success('删除成功！')
           this.queryByPage();

YHYZT/client/src/views/DataManage/Nzy.vue

@@ -273,7 +273,7 @@ export default {
       this.$ajax.get('/api/stnzy/deleteByPch', params, this, true).then(res => {
         if (res) {
           this.$Message.success('删除成功！')
-          this.onSearchHandle()
+          this.queryByPage()
         }
       })
     },

YHYZT/client/src/views/DataManage/Ssnyd.vue

@@ -2,32 +2,38 @@
   <div class="page-nzy-manage">
     <div class="page-left" :style="{height:contentHeight+'px',width:contentWidth+'px'}">
       <div class="nzy-tools">
-        <el-form label-width="120px" :model="paramsList">
+        <el-form label-width="120px" :model="searchParam">
           <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="项目索引：">
+                <el-input v-model="searchParam.xmbh" placeholder="请输入项目索引" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
               <el-form-item label="项目名称：">
-                <el-input v-model="paramsList.xmbh" placeholder="请输入项目名称" clearable></el-input>
+                <el-input v-model="searchParam.xmmc" placeholder="请输入项目名称" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="市：">
-                <el-input v-model="paramsList.pcmc" placeholder="请输入市"  clearable></el-input>
+                <el-input v-model="searchParam.szs" placeholder="请输入市"  clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <span></span>
               <el-form-item label="县区：">
-                <el-input v-model="paramsList.pcmc" placeholder="请输入县区"  clearable></el-input>
+                <el-input v-model="searchParam.xzq" placeholder="请输入县区"  clearable></el-input>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="20">
             <el-col :span="6">
               <el-form-item label="备案号：">
-                <el-input v-model="paramsList.bah" placeholder="请输入备案号"  clearable></el-input>
+                <el-input v-model="searchParam.bah" placeholder="请输入备案号"  clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="备案面积：">
-                <el-input v-model="paramsList.pcmc" placeholder="请输入备案面积"  clearable></el-input>
+                <el-input v-model="searchParam.bamj" placeholder="请输入备案面积"  clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -44,11 +50,6 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="用途：">
-                <el-input v-model="paramsList.yt" placeholder="请输入用途"  clearable></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="6">
               <div class="btn-group">
                 <el-button type="primary" @click="onSearchHandle">查询</el-button>
@@ -98,7 +99,7 @@
               label="项目索引">
           </el-table-column>
           <el-table-column
-              prop="xmbh"
+              prop="xmmc"
               label="项目名称">
           </el-table-column>
           <el-table-column
@@ -109,6 +110,10 @@
               prop="xzq"
               label="县区">
           </el-table-column>
+          <el-table-column
+              prop="yt"
+              label="用途">
+          </el-table-column>
           <el-table-column
               prop="bah"
               label="备案号">
@@ -118,13 +123,9 @@
               label="备案面积">
           </el-table-column>
           <el-table-column
-              prop="pf_wh"
+              prop="basj"
               label="备案时间">
           </el-table-column>
-          <el-table-column
-              prop="yt"
-              label="备注">
-          </el-table-column>
           <el-table-column
               prop="bz"
               label="备注">
@@ -167,8 +168,8 @@
         </el-table>
         <Page style="float: right;margin-top: 10px;"
               show-total
-              :total="paramsList.total"
-              :page-size="paramsList.size"
+              :total="tableData.total"
+              :page-size="searchParam.size"
               @on-change="pageChange"
               @on-page-size-change="sizeChange"
               show-sizer />
@@ -185,7 +186,7 @@
   </div>
 </template>
 <script>
-import Detail from "./nzy/Detail";
+import Detail from "./ssnyd/Detail";
 export default {
   name: "Nzy",
   props:{
@@ -201,9 +202,9 @@ export default {
       detailShow:false,
       tableData:{
         data:[],
+        total: 0
       },
       currProject:null,
-      paramsList: { pzwh: '', pcmc: '', page: 1, size: 15, total: 0 },
       basjDateRange: [],
       searchParam: {
         xmbh: '',
@@ -237,14 +238,17 @@ export default {
     //查询报批项目信息
     queryByPage(){
       let _this = this;
-      if (this.basjDateRange.length > 0) {
+      if (this.basjDateRange && this.basjDateRange.length > 0) {
         this.searchParam.basjStart = this.basjDateRange[0]
         this.searchParam.basjEnd = this.basjDateRange[1]
+      }else{
+        this.searchParam.basjStart = ''
+        this.searchParam.basjEnd = ''
       }
       const params = {
         ...this.searchParam
       }
-      this.$ajax.get('/api/templand/page', params, this, true).then(res => {
+      this.$ajax.get('/api/ssnyd/page', params, this, true).then(res => {
         if (res.status === 200) {
             _this.tableData.data= res.records;
             _this.tableData.total = res.total;
@@ -258,11 +262,11 @@ export default {
       })
     },
     deleteHandle (index, row) {
-      const params = {id: row['objecid']}
+      const params = {id: row['objectid']}
       this.$ajax.get('/api/ssnyd/delete', params, this, true).then(res => {
-        if (res) {
+        if (res.data) {
           this.$Message.success('删除成功！')
-          this.onSearchHandle()
+          this.queryByPage()
         }
       })
     },

YHYZT/client/src/views/DataManage/gd/Detail.vue

@@ -87,7 +87,7 @@
           <div class="title">土地面积（平方米）</div>
           <div class="content">
             <el-input
-              v-model="detailData.tdmj1"
+              v-model="detailData.tdmj"
               placeholder="请输入土地面积（平方米）"
               clearable
               :disabled="!editor"
@@ -96,10 +96,10 @@
           <div class="title">土地面积（亩）</div>
           <div class="content">
             <el-input
-              v-model="detailData.tdmj"
+              :value="detailData.tdmj * 0.0015"
               placeholder="请输入土地面积（亩）"
               clearable
-              :disabled="!editor"
+              :disabled="true"
             />
           </div>
           <div class="title">容积率</div>

YHYZT/client/src/views/DataManage/lsyd/Detail.vue

@@ -2,7 +2,7 @@
   <div class="xm-detal">
     <el-tabs type="border-card" v-model="currentTab" @tab-click="handleTabClick">
       <el-tab-pane label="项目信息" name="tab1">
-        <div class="tables_grid">
+        <div class="tables">
           <div class="title">项目索引</div>
           <div class="content">
             <el-input
@@ -75,32 +75,32 @@
               :disabled="!editor"
             />
           </div>
-          <div class="title">审批时间</div>
+          <div class="title">批准时间</div>
           <div class="content">
-            <el-input
-              v-model="detailData.rksj"
-              placeholder="请输入审批时间"
-              clearable
-              :disabled="!editor"
-            />
+            <el-date-picker
+              v-model="detailData.pzsj"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请输入批准时间"
+              />
           </div>
           <div class="title">到期时间</div>
           <div class="content">
-            <el-input
-              v-model="detailData.bz"
+            <el-date-picker
+              v-model="detailData.dqsj"
+              type="date"
+              value-format="yyyy-MM-dd"
               placeholder="请输入到期时间"
-              clearable
-              :disabled="!editor"
-            />
+              />
           </div>
           <div class="title">入库时间</div>
           <div class="content">
-            <el-input
+            <el-date-picker
               v-model="detailData.rksj"
+              type="date"
+              value-format="yyyy-MM-dd"
               placeholder="请输入入库时间"
-              clearable
-              :disabled="!editor"
-            />
+              />
           </div>
           <div class="title">入库人员</div>
           <div class="content">
@@ -151,9 +151,6 @@ export default {
   props: {
     contentWidth: Number,
     contentHeight: Number,
-  },
-  watch: {
-    
   },
   methods: {
     initDetailData (row, isEditor = false) {
@@ -174,7 +171,8 @@ export default {
       const sendData = {
         ...this.detailData
       }
-      this.$ajax.post('/api/templand/update', sendData, this, true).then(res => {
+      delete sendData['shape']
+      this.$ajax.postJson('/api/templand/update', sendData, this, true).then(res => {
         if (res.data) {
           this.$Message.success('更新成功！')
           this.$emit('init')
@@ -222,7 +220,7 @@ export default {
     text-align: right;
   }
   $t_w: 155px;
-  .tables_grid {
+  .tables {
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between; /* 可选的对齐方式 */

YHYZT/client/src/views/DataManage/ssnyd/Detail.vue

@@ -15,7 +15,7 @@
           <div class="title">项目名称</div>
           <div class="content">
             <el-input
-              v-model="detailData.xmbh"
+              v-model="detailData.xmmc"
               placeholder="请输入项目名称"
               clearable
               :disabled="!editor"
@@ -24,7 +24,7 @@
           <div class="title">市</div>
           <div class="content">
             <el-input
-              v-model="detailData.xmbh"
+              v-model="detailData.szs"
               placeholder="请输入市"
               clearable
               :disabled="!editor"
@@ -33,7 +33,7 @@
           <div class="title">县区</div>
           <div class="content">
             <el-input
-              v-model="detailData.xmbh"
+              v-model="detailData.xzq"
               placeholder="请输入项目县区"
               clearable
               :disabled="!editor"
@@ -42,7 +42,7 @@
           <div class="title">备案号</div>
           <div class="content">
             <el-input
-              v-model="detailData.xmbh"
+              v-model="detailData.bah"
               placeholder="请输入备案号"
               clearable
               :disabled="!editor"
@@ -51,7 +51,7 @@
           <div class="title">备案面积</div>
           <div class="content">
             <el-input
-              v-model="detailData.xmbh"
+              v-model="detailData.bamj"
               placeholder="请输入备案面积"
               clearable
               :disabled="!editor"
@@ -59,17 +59,17 @@
           </div>
           <div class="title">备案时间</div>
           <div class="content">
-            <el-input
-              v-model="detailData.xmbh"
+            <el-date-picker
+              v-model="detailData.basj"
+              type="date"
+              value-format="yyyy-MM-dd"
               placeholder="请输入备案时间"
-              clearable
-              :disabled="!editor"
-            />
+              />
           </div>
           <div class="title">用途</div>
           <div class="content">
             <el-input
-              v-model="detailData.xmbh"
+              v-model="detailData.yt"
               placeholder="请输入用途"
               clearable
               :disabled="!editor"
@@ -78,13 +78,16 @@
           <div class="title">备注</div>
           <div class="content">
             <el-input
-              v-model="detailData.xmbh"
+              v-model="detailData.bz"
               placeholder="请输入备注"
               clearable
               :disabled="!editor"
             />
           </div>
         </div>
+        <div class="btn-group">
+          <el-button type="primary" @click="onSavePcHandle">保存</el-button>
+        </div>
       </el-tab-pane>
       <el-tab-pane label="查看地图" name="tab2">
         <div class="map_box">
@@ -132,7 +135,8 @@ export default {
       const sendData = {
         ...this.detailData
       }
-      this.$ajax.post('/api/ssnyd/update', sendData, this, true).then(res => {
+      delete sendData['shape']
+      this.$ajax.postJson('/api/ssnyd/update', sendData, this, true).then(res => {
         if (res.data) {
           this.$Message.success('更新成功！')
           this.$emit('init')
@@ -166,41 +170,31 @@ export default {
     width: 100%;
     height: 600px;
   }
+  .btn-group {
+    margin-top: 20px;
+    text-align: right;
+  }
+  $t_w: 155px;
   .tables {
-    width: 100%;
-    overflow-y: auto;
-    table {
-      width: 100%;
-      border-collapse: collapse;
-      tr,
-      th,
-      td {
-        border: 1px solid #d6d6d6;
-        height: 40px;
-        font-size: 14px;
-        color: #1f2f47;
-        padding: 0px 10px;
-      }
-      th {
-        width: 155px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between; /* 可选的对齐方式 */
+    border-top: 1px solid #d6d6d6;
+    border-right: 1px solid #d6d6d6;
+    display: grid;
+    grid-template-columns: repeat(3, $t_w 1fr);
+    >div {
+      border-left: 1px solid #d6d6d6;
+      border-bottom: 1px solid #d6d6d6;
+      padding: 8px 10px;
+      display: inline-block;
+      color: #1f2f47;
+      &.title {
+        width: $t_w;
         background: #f4f6f8;
         font-family: AlibabaPuHuiTiM;
         font-weight: normal;
-        &.title {
-          text-align: left;
-          background: #fff;
-          font-size: 16px;
-        }
-      }
-      td {
-        padding: 0px 5px;
-      }
-    }
-    ::v-deep {
-      .el-input__inner {
-        //border:1px solid #fff;
-        border-radius: 0px;
-        border-color: transparent;
+        text-align: center;
       }
     }
   }

YHYZT/server/src/main/java/com/zjugis/yzt/beans/vo/TempLandVO.java

@@ -13,15 +13,15 @@ public class TempLandVO {
     private String zlwz;        // 坐落位置
     private String pzdw;        // 批准单位
     private String pzwh;        // 批准文号
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date pzsj;         // 批准时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date dqsj;         // 到期时间
     private Double pzmj;       // 批准面积
     private String bz;         // 备注
     private String xmbh;       // 项目编号
     private String rknf;       // 入库年份
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date rksj;         // 入库时间
     private String rkry;       // 入库人员
     private String shape;      // 空间数据，WKT格式

YHYZT/server/src/main/java/com/zjugis/yzt/controller/SsnydController.java

@@ -102,19 +102,19 @@ public class SsnydController extends BaseRestController {
      * 更新设施农用地
      */
     @PostMapping("/update")
-    public boolean updateSsnyd(@RequestBody SsnydNew ssnyd) {
+    public Object updateSsnyd(@RequestBody SsnydNew ssnyd) {
         if (ssnyd.getObjectid() == null) {
             return false;
         }
-        return ssnydService.updateById(ssnyd);
+        return result(ssnydService.updateById(ssnyd));
     }
 
     /**
      * 删除设施农用地
      */
     @GetMapping("/delete")
-    public boolean deleteSsnyd(@RequestParam Integer id) {
-        return ssnydService.removeById(id);
+    public Object deleteSsnyd(@RequestParam Integer id) {
+        return result(ssnydService.removeById(id));
     }
 
     /**

YHYZT/server/src/main/java/com/zjugis/yzt/controller/StGddkController.java

@@ -57,7 +57,7 @@ public class StGddkController extends BaseRestController {
             queryWrapper.like("dk_bh", dkbh);
         }
         if (dkMc != null && !dkMc.isEmpty()) {
-            queryWrapper.like("dkMc", dkMc);
+            queryWrapper.like("dk_mc", dkMc);
         }
         if (xxz != null && !xxz.isEmpty()) {
             queryWrapper.like("xxz", xxz);
@@ -107,19 +107,19 @@ public class StGddkController extends BaseRestController {
      * 更新供地地块
      */
     @PostMapping("/update")
-    public boolean updateStGddk(@RequestBody StGddk stGddk) {
+    public Object updateStGddk(@RequestBody StGddk stGddk) {
         if (stGddk.getObjectid() == null) {
-            return false;
+            return result(false);
         }
-        return stGddkService.updateById(stGddk);
+        return result(stGddkService.updateById(stGddk));
     }
 
     /**
      * 删除供地地块
      */
     @GetMapping("/delete")
-    public boolean deleteStGddk(@RequestParam Integer id) {
-        return stGddkService.removeById(id);
+    public Object deleteStGddk(@RequestParam Integer id) {
+        return result(stGddkService.removeById(id));
     }
 
     /**

YHYZT/server/src/main/java/com/zjugis/yzt/controller/TempLandController.java

@@ -10,6 +10,7 @@ import com.zjugis.yzt.beans.vo.TempLandVO;
 import com.zjugis.yzt.beans.entity.TempLand;
 import org.springframework.beans.BeanUtils;
 
+import java.net.URLDecoder;
 import java.util.List;
 import java.util.Date;
 
@@ -57,7 +58,7 @@ public class TempLandController extends BaseRestController {
             queryWrapper.like("xmmc", xmmc);
         }
         if (pzwh != null && !pzwh.isEmpty()) {
-            queryWrapper.like("pzwh", pzwh);
+            queryWrapper.like("pzwh", URLDecoder.decode(pzwh));
         }
         if (yddw != null && !yddw.isEmpty()) {
             queryWrapper.like("yddw", yddw);
@@ -108,21 +109,21 @@ public class TempLandController extends BaseRestController {
      * 更新临时用地
      */
     @PostMapping("/update")
-    public boolean updateTempLand(@RequestBody TempLandVO tempLandVO) {
+    public Object updateTempLand(@RequestBody TempLandVO tempLandVO) {
         if (tempLandVO.getObjectid() == null) {
             return false;
         }
         TempLand tempLand = new TempLand();
         BeanUtils.copyProperties(tempLandVO, tempLand);
-        return tempLandService.updateById(tempLand);
+        return result(tempLandService.updateById(tempLand));
     }
 
     /**
      * 删除临时用地
      */
     @GetMapping("/delete")
-    public boolean deleteTempLand(@RequestParam Integer id) {
-        return tempLandService.removeById(id);
+    public Object deleteTempLand(@RequestParam Integer id) {
+        return result(tempLandService.removeById(id));
     }
 
     /**