From 421cb2577552ac1753b4d872b87493bfa301cc8b Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Wed, 6 Jul 2022 16:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/onlineHome/homestead/circulation.js   |   9 +
 src/components/Map/MapGisLyDrawing.vue        | 162 ++++++++++++++++++
 src/views/onlineHome/done.vue                 |   3 +
 .../homeApplication/proposerLite.vue          |  38 +++-
 .../homestead/mortgage/mortgageList.vue       |  33 +++-
 .../homestead/paidExit/paidExitDetail.vue     |  95 +++++++++-
 .../homestead/paidExit/paidExitList.vue       |  17 +-
 .../paidUtilize/paidUtilizeDteail.vue         |  33 +++-
 .../homestead/paidUtilize/paidUtilizeList.vue |  42 +++--
 .../homestead/utilization/utilizationList.vue |  26 +--
 src/views/zjdLogin.vue                        |   6 +-
 11 files changed, 419 insertions(+), 45 deletions(-)
 create mode 100644 src/components/Map/MapGisLyDrawing.vue

diff --git a/src/api/onlineHome/homestead/circulation.js b/src/api/onlineHome/homestead/circulation.js
index a200752c..5f79538b 100644
--- a/src/api/onlineHome/homestead/circulation.js
+++ b/src/api/onlineHome/homestead/circulation.js
@@ -75,3 +75,12 @@ export function selectAllLicense(id){
     method:'get'
   })
 }
+
+//宅基地信息
+export function getByLyZjddm(data){
+  console.log(data);
+  return request({
+    url:'/house/land/getByZjddm/'+ data,
+    method:'get',
+  })
+}
diff --git a/src/components/Map/MapGisLyDrawing.vue b/src/components/Map/MapGisLyDrawing.vue
new file mode 100644
index 00000000..2b2d43e7
--- /dev/null
+++ b/src/components/Map/MapGisLyDrawing.vue
@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <p class="fuTitle">地块位置</p>
+    <div id="full-screen-acceptance" style="width: 100%;height:45vh;position:relative;">
+        <div :id=this.uuidMap style="width: 100%;height: 100%"></div>
+      </div>
+    <div id="info" style="display: none"></div>
+  </div>
+</template>
+
+<script>
+  import {getQueryLand} from "@/api/homesteadSurvey/zjdzd";
+  import {getByLyZjddm } from "@/api/onlineHome/homestead/circulation";
+import $ from "jquery";
+
+export default {
+  components: {
+    getQueryLand,getByLyZjddm
+  },
+  data() {
+    return {
+      uuidMap: this.guidProduct(),
+      map:this.guidProduct(),
+    };
+  },
+  props: ['theGeom','message'],
+  methods: {
+    //地图加载
+    guidProduct(){
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    },
+    //地图查看
+    drawingLyPaceCountryDarw() {
+      //加载地图编辑
+      var that = this;
+      getByLyZjddm(that.message).then(qlrRes => {
+        document.getElementById(that.uuidMap).innerHTML = '';
+        var hc_land;
+        var projection = new ol.proj.Projection({
+          //地图投影类型
+          code: "EPSG:3857",
+          units: "degrees",
+          //extent:extent
+        });
+
+        var aerial = new ol.layer.Tile({
+          source: new ol.source.XYZ({
+            url: "http://t{0-7}.tianditu.com/img_w/wmts?" +
+              "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
+              "&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067",
+          }),
+          isGroup: true,
+          name: "卫星影像图",
+          resolution:Math.random() * 0.00000001
+        });
+
+        var yingxzi = new ol.layer.Tile({
+          source: new ol.source.XYZ({
+            url: "http://t{0-7}.tianditu.com/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067",
+          }),
+          isGroup: true,
+          name: "天地图文字标注--卫星影像图",
+          resolution:Math.random() * 0.00000001
+        });
+        //加载地图
+        that.map = new ol.Map({
+          controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮
+          layers: [aerial, yingxzi],
+          projection: projection,
+          target: that.uuidMap,
+          view: new ol.View({
+            //center: ol.proj.fromLonLat([115.452752, 31.789033]),
+            zoom: 15,
+            minZoom: 5, //地图缩小限制
+            maxZoom: 18.3, //地图放大限制
+          }),
+          interactions: ol.interaction.defaults({
+            pinchRotate: false // 移动端禁止地图旋转
+          }),
+          //view: new ol.View({ol.view.getResolution() + Math.random() * 0.00000001)});//随机数缩放实现刷新
+        });
+        //图层查询定位开始 ---------start
+      hc_land = new ol.layer.Vector({
+        title: "add Layer",
+        source: new ol.source.Vector({
+          projection: projection,
+          features: new ol.format.GeoJSON().readFeatures("{\n" +
+            "    \"type\": \"Feature\",\n" +
+            "    \"geometry\":" + qlrRes.data.theGeom + "}"),
+        }),
+        resolution:Math.random() * 0.00000001,
+        style: new ol.style.Style({
+          fill: new ol.style.Fill({
+            //矢量图层填充颜色，以及透明度
+            color: "rgba(204, 255, 204,0.3)",
+          }),
+          stroke: new ol.style.Stroke({
+            //边界样式
+            color: "#CCFF66",
+            width: 3,
+          }),
+        }),
+      });
+      that.map.addLayer(hc_land);
+      var maxXMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxX;
+      var maxYMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxY;
+      var minXMap = hc_land.values_.source.featuresRtree_.rbush_.data.minX;
+      var minYMap = hc_land.values_.source.featuresRtree_.rbush_.data.minY;
+      //定位查询位置
+      var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+      that.map.getView().animate({
+        // 只设置需要的属性即可
+        center: center, // 中心点
+        zoom: 16.9, // 缩放级别
+        rotation: undefined, // 缩放完成view视图旋转弧度
+        duration: 1000, // 缩放持续时间，默认不需要设置
+        resolution:Math.random() * 0.00000001,
+      });
+    });
+    },
+  },
+  watch: {},
+};
+</script>
+
+<style scoped>
+#that.message {
+  width: 100%;
+  height: 100%;
+}
+.fuTitle {
+  border-top: 1px solid #e9e9e9;
+  text-align: center;
+  padding: 10px 0px 0px 0px;
+  font-size: 36px;
+  color: #999;
+}
+.ant-btn-red {
+  position: relative;
+  display: inline-block;
+  background: #D0EEFF;
+  border: 1px solid #99D3F5;
+  border-radius: 4px;
+  padding: 4px 12px;
+  overflow: hidden;
+  color: #1E88C7;
+  text-decoration: none;
+  text-indent: 0;
+  line-height: 20px;
+
+}
+#land-btn-wrap{
+  position: absolute;
+  right: 3%;
+  top: 5%;
+  z-index: 2000;
+}
+</style>
diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue
index 29f98be4..01a39a16 100644
--- a/src/views/onlineHome/done.vue
+++ b/src/views/onlineHome/done.vue
@@ -203,6 +203,9 @@
             case 'house_mortgage':
               this.$router.push({name:'mortgageDetail',query: {id: item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
               break;
+            case 'house_utilize_signout':
+              this.$router.push({name:'paidExitDetail',query: {id: item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
+              break;
             case 'house_circulation':
               this.$router.push({name:'circulationDetail',query: {id: item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
               break;
diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 61576a69..30468989 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -1336,12 +1336,10 @@
         <van-row style="margin:0 10%">
           <p class="title" style="margin:20px 0;position:relative;padding-left:20px;font-size:0.5rem">电子签名</p>
         </van-row>
-        <van-row style="margin: 0 5% 5% 5%;border:1px solid #BFBFBF">
+        <van-row style="margin: 0 5% 5% 5%;border:1px solid #BFBFBF;">
           <vue-esign
             ref="esign"
             class="mySign"
-            :width="800"
-            :height="500"
             :isCrop="isCrop"
             :lineWidth="lineWidth"
             :lineColor="lineColor"
@@ -1768,6 +1766,40 @@ export default {
           this.pointDarwNature(null);
           this.pointWrapAcceptance(null);
           this.paintStartNatureMap(null);
+          if(this.selectedTabName == 0 && this.applicationDetail.tHouseApplyProposer.auditStatus =='2'){
+            if(this.applicationDetail.tHouseApproveVillageOptions.villageOption !=null && this.applicationDetail.tHouseApproveVillageOptions.villageOption !=''){
+              this.formVisible.baseApplyForm.villageFormVisible = true;
+            }
+            if(this.applicationDetail.tHouseApproveOtherOptions.approveOption !=null && this.applicationDetail.tHouseApproveOtherOptions.approveOption !=''){
+              this.formVisible.baseApplyForm.buildingFormVisible = true;
+            }
+            if(this.applicationDetail.tHouseApproveAgricultureOptions.approveOption !=null && this.applicationDetail.tHouseApproveAgricultureOptions.approveOption !=''){
+              this.formVisible.baseApplyForm.agricultureFormVisible = true;
+            }
+            if(this.applicationDetail.tHouseApproveNatureOptions.approveOption !=null && this.applicationDetail.tHouseApproveNatureOptions.approveOption !=''){
+              this.formVisible.baseApplyForm.nature_resourceFormVisible = true;
+            }
+            if(this.applicationDetail.tHouseApproveTownOptions.approveOption !=null && this.applicationDetail.tHouseApproveTownOptions.approveOption !=''){
+              this.formVisible.baseApplyForm.townFormVisible = true;
+            }
+          }
+          if(this.selectedTabName == 2 && this.applicationDetail.tHouseApplyProposer.auditStatus =='2'){
+            if(this.applicationDetail.tHouseApproveVillageOptions.villageOption !=null && this.applicationDetail.tHouseApproveVillageOptions.villageOption !=''){
+              this.formVisible.baseApplyForm.villageFormVisible = true;
+            }
+            // if(this.applicationDetail.tHouseApproveOtherOptions.approveOption !=null && this.applicationDetail.tHouseApproveOtherOptions.approveOption !=''){
+            //   this.formVisible.acceptingForm.baseFormVisible = false;
+            // }
+            if(this.applicationDetail.tHouseApplyEnd.nongyeOption !=null && this.applicationDetail.tHouseApplyEnd.nongyeOption !=''){
+              this.formVisible.acceptingForm.agricultureFormVisible = false;
+            }
+            if(this.applicationDetail.tHouseApplyEnd.natureOption !=null && this.applicationDetail.tHouseApplyEnd.natureOption !=''){
+              this.formVisible.acceptingForm.nature_resourceFormVisible = false;
+            }
+            if(this.applicationDetail.tHouseApplyEnd.zhenOption !=null && this.applicationDetail.tHouseApplyEnd.zhenOption !=''){
+              this.formVisible.acceptingForm.townFormVisible = false
+            }
+          }
           break;
 
         // 编辑/审批
diff --git a/src/views/onlineHome/homestead/mortgage/mortgageList.vue b/src/views/onlineHome/homestead/mortgage/mortgageList.vue
index 9f03d242..6b6eba87 100644
--- a/src/views/onlineHome/homestead/mortgage/mortgageList.vue
+++ b/src/views/onlineHome/homestead/mortgage/mortgageList.vue
@@ -33,10 +33,13 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button square text="修改" v-if="item.auditStatus=='0'" :to="{name:'mortgageModify', query: {id:item.id}}" type="info" class="delete-button" />
+                <van-button square text="修改" v-if="item.auditStatus=='0' || item.auditStatus=='2'" :to="{name:'mortgageModify', query: {id:item.id}}" type="info" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button square text="删除" v-if="item.auditStatus=='0'" @click="deleteList(item.id,index)" type="danger" class="delete-button" />
+                <van-button square text="提交" type="primary" v-if="item.auditStatus=='0' || item.auditStatus=='2'" class="delete-button" @click="goSubmit(item)" />
+              </van-col>
+              <van-col>
+                <van-button square text="删除" v-if="item.auditStatus=='0' || item.auditStatus=='2'" @click="deleteList(item.id,index)" type="danger" class="delete-button" />
               </van-col>
             </van-row>
           </template>
@@ -46,7 +49,8 @@
 </template>
 
 <script>
-import { getList , removeList } from "@/api/onlineHome/homestead/mortgage";
+import { getList , removeList, dyApply } from "@/api/onlineHome/homestead/mortgage";
+import {Notify} from "vant";
 export default {
     name: "mortgageList",
   data() {
@@ -120,6 +124,29 @@ export default {
     formatDict(dict, value) {
       return this.selectDictLabel(dict, value);
     },
+    goSubmit(item){
+      this.$dialog.confirm({
+        message: '确认提交该草稿？',
+      })
+        .then(() => {
+          // on confirm
+          dyApply(item.id).then(res => {
+            if(res.code = 200){
+              this.$toast.success('提交成功');
+              this.refresh();
+            }
+          });
+        })
+        .catch(() => {
+          // on cancel
+        });
+    },
+    refresh() {
+      this.finished = false;
+      this.queryParams.pageNum = 1;
+      this.applicationList = [];
+      this.getList();
+    },
   },
 }
 </script>
diff --git a/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue b/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue
index 1db8f495..1c85cdcc 100644
--- a/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue
+++ b/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue
@@ -68,19 +68,54 @@
         <van-field readonly v-model="circulation.zhfwzl" label="置换房屋坐落" input-align="right" label-width="auto"/>
         <van-field readonly v-model="circulation.bz" label="备注" input-align="right" label-width="auto"/>
       </div>
+
+      <!-- 审批 -->
+      <template v-if="approval.type === 'todo'">
+        <div class="main_box examine_box">
+          <van-row type="flex" justify="space-between" align="center">
+            <van-col span="5">审核<br/>意见</van-col>
+            <van-col span="19">
+              <van-field required :readonly="approval.type !== 'todo'" v-model="approval.comment" rows="2" autosize type="textarea" placeholder="审核意见"/>
+            </van-col>
+          </van-row>
+        </div>
+
+        <van-row style="margin-top: 0.2rem;">
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" class="submitButton" @click="complete(true)">同意</van-button>
+          </van-col>
+          <van-col span="12" align="center">
+            <van-button type="danger" native-type="submit" class="submitButton" @click="complete(false)">驳回</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </template>
     </div>
 </template>
 
 <script>
 import { getZyyctc } from "@/api/onlineHome/homestead/paidExit";
+import request from '@/utils/request';
+import {Notify} from "vant";
 export default {
   name: "paidExitDetail",
   data() {
     return {
-      circulation:[]
+      circulation:[],
+      approval: {
+        taskId: null,
+        instanceId: null,
+        type: null,
+        id: null,
+        comment: '',
+      },
     };
   },
   created() {
+    this.approval.id = this.$route.query.id;
+    this.approval.instanceId = this.$route.query.instanceId;
+    this.approval.type = this.$route.query.type;
+    this.approval.taskId = this.$route.query.taskId;
     this.getDetail();
   },
   methods: {
@@ -113,7 +148,42 @@ export default {
           this.circulation.auditStatus = this.selectDictLabel(res.data, response.data.auditStatus);
         });
       });
-    }
+    },
+    complete(pass) {
+      if(!this.approval.taskId || !this.approval.instanceId || this.approval.type !== 'todo')
+      {
+        console.error("无效操作");
+        return false;
+      }
+      if(!this.approval.comment)
+      {
+        this.notify("请填写审批意见", 'danger');
+        return false;
+      }
+      let data = {
+        taskId: this.approval.taskId,
+        instanceId: this.approval.instanceId,
+        variables: JSON.stringify({
+          pass: pass ? "true" : "false",
+          comment: this.approval.comment ? this.approval.comment : (pass ? '同意' : '驳回'),
+        }),
+      };
+      request({
+        url: "/activiti/process/complete",
+        method: "post",
+        params: data,
+      }).then((response) => {
+        this.notify("操作成功", 'success');
+        this.$router.back();
+      }).catch(e => {
+        this.notify("操作失败!", 'danger');
+      });
+      return true;
+    },
+    notify(message, type) {
+      Notify.clear();
+      Notify({ type: type || 'primary', message: message });
+    },
   },
 }
 </script>
@@ -142,4 +212,25 @@ export default {
     background-color: #1D6FE9;
 
   }
+  .examine_box{
+    background-color: #1D6FE9!important;
+    padding: 0.18rem!important;
+    padding-left: 0!important;
+    border-radius: 0.15rem!important;
+    margin-top: 0.3rem!important;
+    .van-col:first-child{
+      color: #FFF!important;
+      font-size: 0.45rem!important;
+      text-align: center!important;
+    }
+    .van-col:last-child{
+      background-color: #FFF!important;
+      border-radius: 0.15rem!important;
+      overflow: hidden!important;
+      .van-radio-group--horizontal{
+        padding: 0.2rem 0;
+        border-bottom: 1px solid #eee;
+      }
+    }
+  }
 </style>
diff --git a/src/views/onlineHome/homestead/paidExit/paidExitList.vue b/src/views/onlineHome/homestead/paidExit/paidExitList.vue
index 0cc055d0..1a918bf8 100644
--- a/src/views/onlineHome/homestead/paidExit/paidExitList.vue
+++ b/src/views/onlineHome/homestead/paidExit/paidExitList.vue
@@ -34,6 +34,9 @@
               <van-col>
                 <van-button square text="修改" v-if="item.auditStatus=='草稿'" :to="{name:'paidExitModify', query: {id:item.id}}" type="info" class="delete-button" />
               </van-col>
+              <van-col>
+                <van-button square text="提交" type="primary" v-if="item.auditStatus=='草稿' || item.auditStatus=='2'" class="delete-button" @click="goSubmit(item)" />
+              </van-col>
               <van-col>
                 <van-button square text="删除" v-if="item.auditStatus=='草稿'" @click="deleteList(item.id,index)" type="danger" class="delete-button" />
               </van-col>
@@ -45,7 +48,7 @@
 </template>
 
 <script>
-import { getList , removeList } from "@/api/onlineHome/homestead/paidExit";
+import { getList , removeList, zyyctcApply } from "@/api/onlineHome/homestead/paidExit";
 export default {
   name: "paidExit",
   data() {
@@ -121,7 +124,17 @@ export default {
       .catch(() => {
         // on cancel
       });
-    }
+    },
+    goSubmit(item) {
+      zyyctcApply(item.id).then(response => {
+        if (response.code = 200) {
+          this.$toast.success('提交成功');
+          setTimeout(function () {
+            window.location.replace("paidExit")
+          }, 1000)
+        }
+      })
+    },
   },
 }
 </script>
diff --git a/src/views/onlineHome/homestead/paidUtilize/paidUtilizeDteail.vue b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeDteail.vue
index 3fe660ec..07db5fcf 100644
--- a/src/views/onlineHome/homestead/paidUtilize/paidUtilizeDteail.vue
+++ b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeDteail.vue
@@ -22,7 +22,11 @@
         v-model="circulation.zjddm"
         label="宅基地代码"
         input-align="right"
-      />
+      >
+        <template #button>
+          <van-button size="small" @click="mapLook" type="primary">查看地图</van-button>
+        </template>
+      </van-field>
       <van-field
         readonly
         v-model="zjlx"
@@ -52,6 +56,9 @@
         input-align="right"
         label-width="auto"
       />
+      <van-dialog v-model:show="mapShow" show-cancel-button>
+        <MapGisLyDrawing ref="zjdProductResh" :message="circulation.zjddm"></MapGisLyDrawing>
+      </van-dialog>
       <van-field readonly v-model="circulation.ycsymj" label="有偿使用面积(㎡)" placeholder="请输入有偿使用面积㎡" input-align="right" label-width="auto"/>
       <van-field readonly v-model="circulation.ycsymjdj" label="有偿使用面积单价(元)" placeholder="请输入有偿使用面积单价" input-align="right" label-width="auto"/>
       <van-field readonly v-model="circulation.ycsyfy" label="有偿使用费用(元)" placeholder="请输入有偿使用费用" input-align="right" label-width="auto"/>
@@ -64,8 +71,11 @@
 <script>
   import { zjdzd } from "@/api/onlineHome/homestead/circulation";
   import { zyyctcEdit , getYcsy , ycsyEdit } from "@/api/onlineHome/homestead/paidUtilize";
+  import MapGisLyDrawing from "@/components/Map/MapGisLyDrawing";
+  import $ from "jquery";
   export default {
     name: "paidUtilizeDteail",
+    components: { MapGisLyDrawing,},
     data() {
       return {
         tcqllxDictionaries:[],//退出权利类型
@@ -94,6 +104,7 @@
         showycsydqsj: false,
 
         circulation:{},
+        mapShow: false,
       };
     },
     created() {
@@ -146,6 +157,10 @@
           this.circulation = response.data;
         });
       },
+      /** 查找地图中定位点 */
+      MapTag: function (data) {
+          //this.form.theGeom = data;
+      },
       onConfirmZjddm(data){
         console.log(data)
         this.circulation.zjddm = data;
@@ -200,7 +215,13 @@
             },1000)
           }
         });
-      }
+      },
+      mapLook(){
+        this.mapShow =true;
+        setTimeout(() => {
+        this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
+        },1000)
+      },
     },
   }
 </script>
@@ -229,4 +250,12 @@
     background-color: #1D6FE9;
 
   }
+  .mapBox{
+    position: relative;
+    .mapBox_button{
+      position: absolute;
+      top: 0.2rem;
+      right: 2%;
+    }
+  }
 </style>
diff --git a/src/views/onlineHome/homestead/paidUtilize/paidUtilizeList.vue b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeList.vue
index 0083e22e..8091ded9 100644
--- a/src/views/onlineHome/homestead/paidUtilize/paidUtilizeList.vue
+++ b/src/views/onlineHome/homestead/paidUtilize/paidUtilizeList.vue
@@ -10,9 +10,9 @@
         <template #title>
           <p style="font-weight: bold;">有偿使用</p>
         </template>
-        <template #right>
-          <van-icon name="add" size="18" />
-        </template>
+<!--        <template #right>-->
+<!--          <van-icon name="add" size="18" />-->
+<!--        </template>-->
       </van-nav-bar>
       <van-list
         v-model="loading"
@@ -21,27 +21,27 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.zjddm" :value="item.auditStatus" center :to="{name:'paidUtilizeDteail', query: {id:item.id}}" >
+          <van-cell :title="item.zjddm" center :to="{name:'paidUtilizeDteail', query: {id:item.id}}" >
             <template #icon>
               <van-icon name="../../../static/images/onlineHome/icon_zjd9.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
-              <p>{{item.shyqrdm}}</p>
+              <p>{{item.shyqrxm}}{{item.shyqrdm}}</p>
             </template>
           </van-cell>
-          <template #right>
-            <van-row>
-              <van-col>
-                <van-button color="#7DDA4F" v-if="item.auditStatus=='草稿'" square text="提交" @click="goSubmit(item.id,index)" type="primary" class="delete-button" />
-              </van-col>
-              <van-col>
-                <van-button square text="修改" v-if="item.auditStatus=='草稿'" :to="{name:'paidUtilizeModify', query: {id:item.id}}" type="info" class="delete-button" />
-              </van-col>
-              <van-col>
-                <van-button square text="删除" v-if="item.auditStatus=='草稿'" @click="deleteList(item.id,index)" type="danger" class="delete-button" />
-              </van-col>
-            </van-row>
-          </template>
+<!--          <template #right>-->
+<!--            <van-row>-->
+<!--              <van-col>-->
+<!--                <van-button color="#7DDA4F" v-if="item.auditStatus=='草稿'" square text="提交" @click="goSubmit(item.id,index)" type="primary" class="delete-button" />-->
+<!--              </van-col>-->
+<!--              <van-col>-->
+<!--                <van-button square text="修改" v-if="item.auditStatus=='草稿'" :to="{name:'paidUtilizeModify', query: {id:item.id}}" type="info" class="delete-button" />-->
+<!--              </van-col>-->
+<!--              <van-col>-->
+<!--                <van-button square text="删除" v-if="item.auditStatus=='草稿'" @click="deleteList(item.id,index)" type="danger" class="delete-button" />-->
+<!--              </van-col>-->
+<!--            </van-row>-->
+<!--          </template>-->
         </van-swipe-cell>
       </van-list>
     </div>
@@ -49,6 +49,7 @@
 
 <script>
 import { getList , removeList , submitApply } from "@/api/onlineHome/homestead/paidUtilize";
+import {getGeoServerConfigKey} from "@/api/system/config";
 export default {
   name: "paidUtilizeList",
   data() {
@@ -66,7 +67,9 @@ export default {
         pageSize:10,
         orderByColumn:'id',
         isAsc:'desc'
-      }
+      },
+      //地图服务地址
+      mapGeoServerUrl:"",
     };
   },
   created() {
@@ -97,6 +100,7 @@ export default {
             response.rows[i].tcfs = this.selectDictLabel(this.tcfsStatus, response.rows[i].tcfs)
             response.rows[i].auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus)
             this.applicationList.push(response.rows[i]);
+            console.log(this.applicationList);
           }
           if(this.applicationList.length >= response.total){
             this.finished = true;
diff --git a/src/views/yinnong/homestead/utilization/utilizationList.vue b/src/views/yinnong/homestead/utilization/utilizationList.vue
index 07c70b8e..59eb2bdc 100644
--- a/src/views/yinnong/homestead/utilization/utilizationList.vue
+++ b/src/views/yinnong/homestead/utilization/utilizationList.vue
@@ -10,9 +10,9 @@
         <template #title>
           <p style="font-weight: bold;">农房利用情况</p>
         </template>
-        <template #right>
-          <van-icon name="add" size="18" />
-        </template>
+<!--        <template #right>-->
+<!--          <van-icon name="add" size="18" />-->
+<!--        </template>-->
       </van-nav-bar>
       <van-list
         v-model="loading"
@@ -29,16 +29,16 @@
               <p><b style="color: #7DDA4F;">{{item.lyzk}}</b><i style="margin-right: 0.5rem;"></i>{{item.fwzt}}<span style="float: right">{{item.dcsj}}</span></p>
             </template>
           </van-cell>
-          <template #right>
-            <van-row>
-              <van-col>
-                <van-button square text="修改" :to="{name:'utilizationModify', query: {id:item.id}}" type="info" class="delete-button" />
-              </van-col>
-              <van-col>
-                <van-button square text="删除" type="danger" class="delete-button"  @click="deleteList(item.id,index)" />
-              </van-col>
-            </van-row>
-          </template>
+<!--          <template #right>-->
+<!--            <van-row>-->
+<!--              <van-col>-->
+<!--                <van-button square text="修改" :to="{name:'utilizationModify', query: {id:item.id}}" type="info" class="delete-button" />-->
+<!--              </van-col>-->
+<!--              <van-col>-->
+<!--                <van-button square text="删除" type="danger" class="delete-button"  @click="deleteList(item.id,index)" />-->
+<!--              </van-col>-->
+<!--            </van-row>-->
+<!--          </template>-->
         </van-swipe-cell>
       </van-list>
     </div>
diff --git a/src/views/zjdLogin.vue b/src/views/zjdLogin.vue
index 37973444..f375a319 100644
--- a/src/views/zjdLogin.vue
+++ b/src/views/zjdLogin.vue
@@ -29,7 +29,7 @@
           placeholder="图形验证码"
         >
           <template #button>
-            <img style="width: 100px" :src="codeUrl" @click="getCode" />
+            <img style="width: 100px;margin-left: 20px" :src="codeUrl" @click="getCode" />
           </template>
         </van-field>
         <van-checkbox style="float: left;margin-top:10px;margin-left:20px;" v-model="formData.rememberMe" shape="square">{{showMessage ? "记住手机号" : "记住密码"}}</van-checkbox>
@@ -180,6 +180,10 @@
     font-size: 0.34rem;
 
   }
+  ::v-deep.van-field__button {
+    margin-left: 20px;
+    padding: 0;
+  }
 </style>
 <script>
 import { getCodeImg, getSmsCode ,getRegisterSmsCode,registerCheck,registerOn} from "../api/login";