Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/api/homesteadSurvey/index.js

@@ -68,9 +68,9 @@ export function delTask(id) {
   })
 }
 // 查询附件上传配置列表
-export function listAttachmentConfig(query) {
+export function sysConfig(query) {
   return request({
-    url: '/system/attachmentConfig/list',
+    url: '/system/config/list',
     method: 'get',
     params: query
   })

src/api/homesteadSurvey/zjdzd.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询数据调查-宅基地宗地列表
 export function listZjdzd(query) {
   return request({
-    url: '/houseSurvey/zjdzd/list',
+    url: '/houseSurvey/zjdzd/searchList',
     method: 'get',
     params: query
   })

src/components/Map/MapGisDrawing.vue

@@ -110,6 +110,7 @@ export default {
         });
         //图层查询定位开始 ---------start
         if(this.message.substring(0,1) =="{"){
+          //that.newHt ="1";
           // var theGeomMap =this.message.replace("Point", "MultiPolygon");
           // var pointLeft = theGeomMap.replace("[", "[[[[");
           // var pointRight = pointLeft.replace("]", "]]]]");
@@ -151,11 +152,11 @@ export default {
           // map.getView().fit([maxXMap, maxYMap, minXMap, minYMap]);
           // map.getView().setResolution(resolution);
         } else if(this.message.substring(0,1) =="["){
+          //that.newHt ="1";
           var zbNew = JSON.stringify({"type": "MultiPolygon", "coordinates": [this.message.replaceAll("\"","")]});
           var leftJoin = zbNew.replace("\"[","[");
           var rightJoin = leftJoin.replace("\"]","]");
-          console.log(rightJoin);
-          hc_landFuther = new ol.layer.Vector({
+          hc_land = new ol.layer.Vector({
             title: "add Layer",
             source: new ol.source.Vector({
               projection: projection,
@@ -175,11 +176,11 @@ export default {
               }),
             }),
           });
-          map.addLayer(hc_landFuther);
-          var maxXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxX;
-          var maxYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxY;
-          var minXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minX;
-          var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY;
+          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]); //获取边界区域的中心位置
           map.getView().animate({
@@ -199,7 +200,6 @@ export default {
         //开始绘制地图
         $("#"+this.drawingPolygonMap).click(function () {
           map.removeLayer(hc_land);
-          map.removeLayer(hc_landFuther);
           map.removeLayer(vector_drawing);
           //that.closeMoule = null;
           map.removeInteraction(draw);
@@ -239,14 +239,9 @@ export default {
         //还原之前图层
         $("#"+this.drawingResetMap).click(function () {
           if(that.closeMoule !=null) {
-            if(that.message.substring(0,1) =="{"){
-              map.addLayer(hc_landFuther);
-            }
-            if(that.message.substring(0,1) =="["){
               map.addLayer(hc_land);
               map.removeInteraction(draw);
               map.removeLayer(vector_drawing);
-            }
             that.formSubmit();
           }
         });

src/views/homesteadSurvey/add.vue

@@ -384,9 +384,10 @@
             autocomplete="off"
             input-align="right"
             v-model="form.jzxg"
-            name="建筑限高"
+            name="建筑限高(m)"
             label="建筑限高(m)"
-            placeholder="建筑限高"
+            placeholder="填写000.00~999.99小数"
+            :rules="[{ validator:validator1, message: '请填写000.00~999.99小数，保留两位小数' }]"
             type="number"
           />
           <van-field
@@ -462,6 +463,8 @@
           </div>
           <div style="text-align:center;overflow:auto;">
             <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showPopupsyqr(item)">查看使用权人信息</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showPopuphncylist(item)">查看户内成员信息</van-button>
+
           </div>
         </div>
         <template #right>
@@ -513,7 +516,7 @@
       </div>
       <van-swipe-cell v-for="(item,index) in fwlist" :key="index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
         <div style="padding:20px;">
-          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>自然幢号：{{item.zrzh}}</p>
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>第{{index+1}}号</p>
           <div style="display:flex;line-height:20px">
             <p style="flex:1;text-align:left;">农民房屋幢号</p>
             <p  style="flex:1;text-align:right;">{{item.nmfwzh}}</p>
@@ -828,9 +831,9 @@
             label="备注"
             placeholder="备注"
           />
-          <div style="text-align:center;overflow:auto;">
+<!--          <div style="text-align:center;overflow:auto;">
             <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" native-type="button" @click="showPopuphncylist(form1)">查看户内成员列表</van-button>
-          </div>
+          </div>-->
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -2464,7 +2467,7 @@
   import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList} from "@/api/homesteadSurvey/fsss";
   import { listTown, getTown } from "@/api/homesteadSurvey/town";
   import { listVillage} from "@/api/homesteadSurvey/village";
-  import { listAttachmentConfig} from "@/api/homesteadSurvey/index";
+  import { sysConfig} from "@/api/homesteadSurvey/index";
   import { Notify, Dialog, Toast } from 'vant';
   export default {
     name: "homesteadAdd",
@@ -2639,6 +2642,9 @@
         jzqkOptions:[],
         // 土地等级字典
         tddjOptions:[],
+
+        // 图片上传路径
+        baseUrl:"",
       };
     },
     created(){
@@ -2777,16 +2783,9 @@
     methods: {
       getBaseUrl(){
         let params={
-          parentId: null,
-          processKey: null,
-          nodeStatus: null,
-          fileType: null,
-          fileTypeName: null,
-          configLevel: null,
-          nodeStatusName: null,
-          businessType: null}
-        listAttachmentConfig(params).then(response => {
-          console.log(response)
+          configKey: "system.attachment.url"}
+        sysConfig(params).then(response => {
+          this.baseUrl = response.rows[0].configValue
         })
       },
       // 验证
@@ -2799,8 +2798,8 @@
         }
       },
       validator1(val){
-        console.log(val.length)
-        if(val>1||val<0||val.length>4){
+        console.log(val)
+        if(val>=1000||val<0||val.length>6){
           return false
         }else{
           return true
@@ -2812,6 +2811,7 @@
           "deptId" : this.item.deptId
         }
         listNh(params).then((response) => {
+          console.log(response)
           this.syqrnhdmlist = response.rows
         });
       },
@@ -3349,7 +3349,7 @@
             if(this.form.zjdxctp!=null&&this.form.zjdxctp!=""&&this.form.zjdxctp.length>0){
               let li = this.form.zjdxctp.split(",");
               li.map(res => {
-                this.fileListzjd.push({"url":location.protocol+"//"+location.host+process.env.VUE_APP_BASE_API+res,"baseUrl":res})
+                this.fileListzjd.push({"url":this.baseUrl+res,"baseUrl":res})
               })
             }
 
@@ -3443,7 +3443,6 @@
           }
           listZrz(params).then(response => {
             this.zrzlist = response.rows;
-            this.fwlist = []
           });
           listNmfw(params).then(r => {
             this.fwlist = r.rows
@@ -4134,7 +4133,9 @@
       },
       searchCommit(){
         this.showesign = true
-        this.resultImg = location.protocol+"//"+location.host+process.env.VUE_APP_BASE_API+this.form.dzqm
+        if(this.form.dzqm!=null&&this.form.dzqm!=""){
+          this.resultImg = this.baseUrl+this.form.dzqm
+        }
       },
       searchCommit1(){
         this.form.houseDataConfirmStatus = "CONFIRMED"

src/views/homesteadSurvey/index.vue

@@ -111,6 +111,7 @@
       </van-cell>
       </van-pull-refresh>
     </div>
+
   </div>
 </template>
 
@@ -118,6 +119,7 @@
   import {addTask, complete, delTask, exportTask, getTask, listTask, publish, updateTask} from "@/api/homesteadSurvey/index";
   import {getInfo} from "../../api/login";
    import CircleProccess from "@/components/circleProccess.vue";
+  import {updateUserPwd} from "../../api/onlineHome/my";
     export default {
       name: "homesteadIndex",
       components: {
@@ -125,6 +127,7 @@
       },
       data() {
         return {
+
           active: 1,
           show: false,
           loading: false,
@@ -173,6 +176,7 @@
 
       },
       methods: {
+
         onRefreshtask(){
           this.isLoadingtask = false;
           let _this = this

src/views/homesteadSurvey/list.vue

@@ -151,8 +151,7 @@
     </div>
     <div v-if="activeBtn==3">
       <van-form @submit="onSubmitsyqr">
-        <div style="border-radius: 16px;
-          box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;padding:5px;background:#fff;">
+        <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;padding:5px;background:#fff;">
           <van-field
             autocomplete="off"
             v-model="qlrform.qydm"
@@ -259,6 +258,7 @@
             placeholder="代表人联系电话"
             type="number"
             input-align="right"
+            required
             :rules="[{ required: true, message: '代表人联系电话不能为空' }]"
           />
           <van-field
@@ -425,8 +425,8 @@
           <van-button round block color="#7AC943" native-type="submit">保存</van-button>
         </div>
       </van-form>
-    </div>
-    <div v-if="activeBtn==4">
+  </div>
+    <div v-if="activeBtn==4" style="overflow:hidden">
       <!--      <van-search placeholder="请输入宅基地号查询" v-if="false">
               <template #action>
               </template>
@@ -1140,7 +1140,6 @@
 </template>
 
 <script>
-    import { currentLocation,} from "@/api/homestead/index";
     import {listZjdzd,getQueryLand,getZjdzd} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh} from "@/api/homesteadSurvey/nh";
     import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
@@ -1213,7 +1212,6 @@
           // 户内成员列表
           hncylist:[],
           currentRate:20,
-          geoJson:null,
           // 使用权人
           nhform:[],
           // 户主列表
@@ -1310,12 +1308,6 @@
         };
       },
       mounted(){
-        currentLocation().then((res) => {
-          if (res.code == 200) {
-            let content = res.data;
-            this.geoJson = content.geoJson;
-          }
-        });
       },
       created(){
         this.getDicts("zjlx").then(response => {
@@ -1655,6 +1647,7 @@
               }
             );
           }else{
+            this.qlrform.deptId = this.item.deptId
             addSuyqr(this.qlrform).then(
               response => {
                 let _this =this
@@ -1676,7 +1669,7 @@
             "suyqxz":'40',
             "suyqxzName":'集体土地所有权',
             "dbrzjlx":'01',
-            "dbrzjlxName":'代表人证件类型',
+            "dbrzjlxName":'身份证',
             "sfclncjtjjzz":'农村宅基地使用权确权登记发证',
             "sjly":'04',
           }
@@ -1897,6 +1890,7 @@
               }
             });
           }else{
+             console.log(1)
                let params = {
                  "deptId" : this.item.deptId,
                  "pageNum": 1,

src/views/homesteadSurvey/settle.vue

@@ -19,7 +19,7 @@
       </template>
 
     </van-cell>
-    <van-cell title="修改密码" is-link style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
+    <van-cell title="修改密码" @click="showPassword=true" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
       <template #icon>
         <van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
       </template>
@@ -29,12 +29,65 @@
         <van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
       </template>
     </van-cell>
+    <van-popup v-model:show="showPassword" position="bottom" style="width:100%;padding:20px;">
+      <van-cell-group >
+        <van-field v-model="oldPassword" label="原密码" type="password" placeholder="请输入" />
+        <van-field v-model="newPassword" label="新密码" type="password" placeholder="请输入" />
+        <van-field v-model="confirmPassword" label="确认新密码" type="password" placeholder="请输入" />
+        <van-row style="text-align: center;margin-top: 40px">
+          <van-button round block color="#7AC943" @click="submit">保存</van-button>
+        </van-row>
+      </van-cell-group>
+    </van-popup>
   </div>
 </template>
 
 <script>
+    import {updateUserPwd} from "../../api/onlineHome/my";
+
     export default {
-        name: "homesteadSettle"
+        name: "homesteadSettle",
+      data(){
+          return{
+            showPassword:false,
+            oldPassword: "",
+            newPassword: "",
+            confirmPassword: "",
+        }},
+            methods:{
+          submit() {
+            if(this.confirmPassword
+              !=this.newPassword){
+              this.$toast({
+                icon: 'error', // 找到自己需要的图标
+                message: '两次密码不同，请重新输入',
+                duration:"1000",
+                onClose:function(){
+                  this.oldPassword=""
+                  this.newPassword=""
+                  this.confirmPassword=""
+                  return false;
+                }
+              })
+            }else{
+              updateUserPwd(this.oldPassword, this.newPassword).then(
+                response => {
+                  let _this =this
+                  this.$toast({
+                    icon: 'success', // 找到自己需要的图标
+                    message: '修改成功',
+                    duration:"1000",
+                    onClose:function(){
+                      _this.showPassword = false
+                    }
+                  })
+                }
+              );
+            }
+
+          }
+        }
+
     }
 </script>