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

src/api/homesteadSurvey/fsss.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询数据调查-附属设施列表
 export function listFsss(query) {
   return request({
-    url: '/houseSurvey/fsss/list',
+    url: '/home/homesteadfsss/list',
     method: 'get',
     params: query
   })

src/api/homesteadSurvey/nh.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询数据调查-户主信息列表
 export function listNh(query) {
   return request({
-    url: '/houseSurvey/nh/list',
+    url: '/home/homesteadnh/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listNh(query) {
 // 导出数据调查-户主信息
 export function exportNh(query) {
   return request({
-    url: '/houseSurvey/nh/export',
+    url: '/home/homesteadnhhncy/export',
     method: 'get',
     params: query
   })
@@ -21,7 +21,7 @@ export function exportNh(query) {
 // 查询数据调查-户主信息详细
 export function getNh(id) {
   return request({
-    url: '/houseSurvey/nh/get/' + id,
+    url: '/home/homesteadnhhncy/get/' + id,
     method: 'get'
   })
 }
@@ -29,7 +29,7 @@ export function getNh(id) {
 // 查询数据调查-户主信息详细
 export function getNhByNhdm(nhdm) {
   return request({
-    url: '/houseSurvey/nh/getByNhdm/' + nhdm,
+    url: '/home/homesteadnhhncy/getByNhdm/' + nhdm,
     method: 'get'
   })
 }
@@ -37,7 +37,7 @@ export function getNhByNhdm(nhdm) {
 // 新增数据调查-户主信息
 export function addNh(data) {
   return request({
-    url: '/houseSurvey/nh/add',
+    url: '/home/homesteadnhhncy/add',
     method: 'post',
     data: data
   })
@@ -46,7 +46,7 @@ export function addNh(data) {
 // 新增数据调查-户主信息
 export function nhConnectTask(data) {
   return request({
-    url: '/houseSurvey/nh/connectTask',
+    url: '/home/homesteadnhhncy/connectTask',
     method: 'post',
     data: data
   })
@@ -55,7 +55,7 @@ export function nhConnectTask(data) {
 // 修改数据调查-户主信息
 export function updateNh(data) {
   return request({
-    url: '/houseSurvey/nh/edit',
+    url: '/home/homesteadnhhncy/edit',
     method: 'post',
     data: data
   })
@@ -64,7 +64,7 @@ export function updateNh(data) {
 // 删除数据调查-户主信息
 export function delNh(id) {
   return request({
-    url: '/houseSurvey/nh/remove/' + id,
+    url: '/home/homesteadnhhncy/remove/' + id,
     method: 'get'
   })
 }
@@ -72,7 +72,7 @@ export function delNh(id) {
 // 设为户主-户主信息
 export function setNhInfo(data) {
   return request({
-    url: '/houseSurvey/nh/setNhInfo',
+    url: '/home/homesteadnhhncy/setNhInfo',
     method: 'post',
     data: data
   })

src/api/homesteadSurvey/nhhncy.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询数据调查-农户户内成员列表
 export function listNhhncy(query) {
   return request({
-    url: '/houseSurvey/nhhncy/list',
+    url: '/home/homesteadnhhncy/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listNhhncy(query) {
 // 导出数据调查-农户户内成员
 export function exportNhhncy(query) {
   return request({
-    url: '/houseSurvey/nhhncy/export',
+    url: '/home/homesteadnhhncy/export',
     method: 'get',
     params: query
   })
@@ -21,7 +21,7 @@ export function exportNhhncy(query) {
 // 查询数据调查-农户户内成员详细
 export function getNhhncy(id) {
   return request({
-    url: '/houseSurvey/nhhncy/get/' + id,
+    url: '/home/homesteadnhhncy/get/' + id,
     method: 'get'
   })
 }
@@ -29,7 +29,7 @@ export function getNhhncy(id) {
 // 新增数据调查-农户户内成员
 export function addNhhncy(data) {
   return request({
-    url: '/houseSurvey/nhhncy/add',
+    url: '/home/homesteadnhhncy/add',
     method: 'post',
     data: data
   })
@@ -38,7 +38,7 @@ export function addNhhncy(data) {
 // 新增数据调查-户主信息
 export function nhhncyConnectTask(data) {
   return request({
-    url: '/houseSurvey/nhhncy/connectTask',
+    url: '/home/homesteadnhhncy/connectTask',
     method: 'post',
     data: data
   })
@@ -47,7 +47,7 @@ export function nhhncyConnectTask(data) {
 // 修改数据调查-农户户内成员
 export function updateNhhncy(data) {
   return request({
-    url: '/houseSurvey/nhhncy/edit',
+    url: '/home/homesteadnhhncy/edit',
     method: 'post',
     data: data
   })
@@ -56,7 +56,7 @@ export function updateNhhncy(data) {
 // 删除数据调查-农户户内成员
 export function delNhhncy(id) {
   return request({
-    url: '/houseSurvey/nhhncy/remove/' + id,
+    url: '/home/homesteadnhhncy/remove/' + id,
     method: 'get'
   })
 }

src/api/homesteadSurvey/shyqr.js

@@ -3,12 +3,23 @@ import request from '@/utils/request'
 // 查询数据调查-使用权人列表
 export function listShyqr(query) {
   return request({
-    url: '/houseSurvey/shyqr/list',
+    url: '/home/homesteadshyqr/list',
     method: 'get',
     params: query
   })
 }
 
+
+// 查询数据调查-使用权人列表
+export function getShyqrs(query) {
+  return request({
+    url: '/home/homesteadshyqr/getShyqrs',
+    method: 'get',
+    params: query
+  })
+}
+
+
 // 导出数据调查-使用权人
 export function exportShyqr(query) {
   return request({

src/api/homesteadSurvey/suyqr.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询数据调查-所有权利人列表
 export function listSuyqr(query) {
   return request({
-    url: '/houseSurvey/suyqr/list',
+    url: '/home/homesteadsuyqr/list',
     method: 'get',
     params: query
   })

src/api/homesteadSurvey/zjdzd.js

@@ -1,14 +1,27 @@
 import request from '@/utils/request'
-
+//手机调查-入户核查
+export function rhhcList(query){
+  return request({
+    url:'/home/homesteadzjdzdxx/rhhcMobileList',
+    method:'get',
+    params: query
+  })
+}
+//手机调查-用户切换部门
+export function changeDept(id){
+  return request({
+    url:'/system/user/changeDept?loginDeptID='+id,
+    method:'get',
+  })
+}
 // 查询数据调查-宅基地宗地列表
 export function listZjdzd(query) {
   return request({
-    url: '/houseSurvey/zjdzd/searchList',
+    url: '/home/homesteadzjdzdxx/list',
     method: 'get',
     params: query
   })
 }
-
 // 导出数据调查-宅基地宗地
 export function exportZjdzd(query) {
   return request({
@@ -21,7 +34,7 @@ export function exportZjdzd(query) {
 // 查询数据调查-宅基地宗地详细
 export function getZjdzd(id) {
   return request({
-    url: '/houseSurvey/zjdzd/get/' + id,
+    url: '/home/homesteadzjdzdxx/get/' + id,
     method: 'get'
   })
 }
@@ -47,7 +60,7 @@ export function zjdzdConnectTask(data) {
 // 修改数据调查-宅基地宗地
 export function updateZjdzd(data) {
   return request({
-    url: '/houseSurvey/zjdzd/edit',
+    url: '/home/homesteadzjdzdxx/edit',
     method: 'post',
     data: data
   })

src/api/homesteadSurvey/zrz.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询数据调查-自然幢列表
 export function listZrz(query) {
   return request({
-    url: '/houseSurvey/zrz/list',
+    url: '/home/homespacezrz/list',
     method: 'get',
     params: query
   })

src/api/onlineHome/homestead/reporting.js

@@ -100,3 +100,12 @@ export function getJg(id){
     method:'get'
   })
 }
+
+// 查询任务上报列表
+export function listHomeuseshangbao(query) {
+  return request({
+    url: '/home/homeuseshangbao/list',
+    method: 'get',
+    params: query
+  })
+}

src/components/Map/MapGisDrawing.vue

@@ -41,7 +41,7 @@ export default {
       mapGeoServerUrl:"",
     };
   },
-  props: ['theGeom','message'],
+  props: ['theGeom','message','zjddm'],
   // created() {
   //   // setTimeout(() => {
   //   //   this.drawingPaceCountryDarw();
@@ -158,12 +158,13 @@ export default {
         });
         //国有数据加载----------------------------------end
         //宅基地图层查询开始 ------------------start
-        var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + that.$cookies.get("search").zjddm + "'";
+        console.info(that.$cookies);
+        var cql_filter_all = "zjddm='" +this.zjddm + "'";
         zjdTc= new ol.layer.Image({
           source: new ol.source.ImageWMS({
-            url: that.mapGeoServerUrl +"/geoserver/zjd_dc/wms",
+            url: that.mapGeoServerUrl +"/geoserver/nsgk_wulanhaote/wms",
             params: {
-              LAYERS: 'zjd_dc:t_house_survey_zjdzd',
+              LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx',
               TILED: true,
               cql_filter: cql_filter_all,
               SRID: 3857,
@@ -176,9 +177,9 @@ export default {
         //自然幢图层查询开始 ------------------start
         zrzTc= new ol.layer.Image({
           source: new ol.source.ImageWMS({
-            url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+            url: that.mapGeoServerUrl+"/geoserver/nsgk_wulanhaote/wms",
             params: {
-              LAYERS: 'zjd_dc:t_house_survey_zrz',
+              LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
               TILED: true,
               cql_filter: cql_filter_all,
               SRID: 3857,
@@ -192,9 +193,9 @@ export default {
         //附属设施图层查询开始 ------------------start
         fsssTc= new ol.layer.Image({
           source: new ol.source.ImageWMS({
-            url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+            url: that.mapGeoServerUrl+"/geoserver/nsgk_wulanhaote/wms",
             params: {
-              LAYERS: 'zjd_dc:t_house_survey_fsss',
+              LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
               TILED: true,
               cql_filter: cql_filter_all,
               SRID: 3857,

src/components/form/FieldCascader.vue

@@ -54,6 +54,7 @@ export default {
     'parentName', // 父的值键名 String 如果不为空 则自动转数组为树树结构数组 String
     'showTextAndValue', // 是否显示值和键 Bool|String 字符串为分隔符, true为空字符串
     'showHasChildren', // 是否显示存在子级的标识 Bool|String 字符串为标识符, true为` >`
+    'clearable', // 点击取消时清空绑定值
   ],
   watch: {
     value: function (newVal, oldVal) {
@@ -121,6 +122,12 @@ export default {
     onCancel() {
       this.closePopup();
       this.$emit('cancel');
+      if(this.clearable)
+      {
+        this.visibleValue = '';
+        this.internalValue = null;
+        this.$emit('input', this.internalValue);
+      }
     },
     getValue(data) {
       return typeof(data) === 'object' && this.valueName ? data[this.valueName] : data;

src/components/form/FieldDatePicker.vue

@@ -44,6 +44,7 @@ export default {
     'name', 'readonly', 'value', 'label', 'placeholder', 'required', 'rules', 'labelWidth',
     'type', // 类型, 仅支持 datetime date time year-month month-day datehour
     'formatter', // value的格式化 String|Function|undefined 字符串为格式字符串, 函数则必须有返回 undefined则不转换
+    'clearable', // 点击取消时清空绑定值
   ],
   watch: {
     value: function (newVal, oldVal) {
@@ -108,6 +109,12 @@ export default {
     onCancel() {
       this.closePopup();
       this.$emit('cancel');
+      if(this.clearable)
+      {
+        this.visibleValue = '';
+        this.internalValue = null;
+        this.$emit('input', this.internalValue);
+      }
     },
     onChanged(data) {
       this.$emit('change', this.getValue(data), data);

src/components/form/FieldSelect.vue

@@ -45,6 +45,7 @@ export default {
     'dataKey', // 值键名 String
     'remoteUrl', // 远程列表加载地址 String
     'onRemoteResponse', // 远程获取到结果的处理回调 String|Function 如果是函数需返回数组, 如果是字符串支持.分割
+    'clearable', // 点击取消时清空绑定值
   ],
   watch: {
     value: function (newVal, oldVal) {
@@ -102,6 +103,12 @@ export default {
     onCancel() {
       this.closePopup();
       this.$emit('cancel');
+      if(this.clearable)
+      {
+        this.visibleValue = '';
+        this.internalValue = null;
+        this.$emit('input', this.internalValue);
+      }
     },
     getValue(data) {
       return typeof(data) === 'object' && this.dataKey ? data[this.dataKey] : data;

src/router/index.js

@@ -2956,6 +2956,16 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/homesteadSurvey/add4'], resolve)
   },
+
+  {
+    path: '/homesteadSurvey/shyqrAdd',
+    name: 'shyqrAdd',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/shyqrAdd'], resolve)
+  },
   {
     path: '/homesteadSurvey/settle',
     name: 'homesteadSettle',

src/views/homesteadSurvey/add.vue

@@ -44,7 +44,7 @@
         </van-row>
       </div>
     </van-sticky>
-    <van-form @submit="onSubmitzjd">
+    <van-form @submit="submitzjd">
       <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">宅基地信息</p>
         <!--<van-field
@@ -86,8 +86,8 @@
         <van-field name="radio" label="是否发证" input-align="right" autocomplete="off">
           <template #input>
             <van-radio-group v-model="form.sffz" direction="horizontal">
-              <van-radio name="Y">是</van-radio>
-              <van-radio name="N">否</van-radio>
+              <van-radio name="1">是</van-radio>
+              <van-radio name="0">否</van-radio>
             </van-radio-group>
           </template>
         </van-field>
@@ -185,269 +185,269 @@
           required
           :rules="[{ required: true, message: '宗地四至-北不能为空' }]"
         />
-        <van-collapse v-model="activeZjd">
-          <van-collapse-item title="利用状况" name="1" class="label-class">
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.lyzkName"
-              name="当前利用状况"
-              label="当前利用状况"
-              placeholder="当前利用状况"
-              readonly
-              @click="showlyzk = true"
-            />
-            <van-field
-              v-model="form.lyzk"
-              style="display:none"
-            />
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.zjdxzyy"
-              name="闲置原因"
-              label="闲置原因"
-              placeholder="宅基地闲置原因"
-              maxlength="200"
-            />
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.xzkssj"
-              name="闲置开始时间"
-              label="闲置开始时间"
-              placeholder="闲置开始时间"
-              readonly
-              @click="showPickerxzkssj = true"
-            />
-            <van-popup v-model:show="showPickerxzkssj" position="bottom">
-              <van-datetime-picker
-                type="date"
-                @confirm="onConfirmxzkssj"
-                @cancel="showPickerxzkssj = false"
-                :min-date="minDate"
-                :max-date="maxDate"
-              />
-            </van-popup>
-            <van-field name="radio" label="流转意向" input-align="right" autocomplete="off">
-              <template #input>
-                <van-radio-group v-model="form.lzyx" direction="horizontal">
-                  <van-radio name="1">有</van-radio>
-                  <van-radio name="0">无</van-radio>
-                </van-radio-group>
-              </template>
-            </van-field>
-            <van-field name="radio" label="有偿退出意向" input-align="right" autocomplete="off">
-              <template #input>
-                <van-radio-group v-model="form.yctcyx" direction="horizontal">
-                  <van-radio name="1">有</van-radio>
-                  <van-radio name="0">无</van-radio>
-                </van-radio-group>
-              </template>
-            </van-field>
-          </van-collapse-item>
-          <van-collapse-item title="其他信息" name="2" class="label-class">
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.djName"
-              name="等级"
-              label="等级"
-              placeholder="等级"
-              @click="showdj = true"
-            />
-            <van-field
-              autocomplete="off"
-              v-model="form.dj"
-              style="display:none"
-            />
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.jg"
-              name="价格（万元）"
-              label="价格（万元）"
-              placeholder="价格（万元）"
-              maxlength="15"
-              type="number"
-            />
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.ytmc"
-              name="用途"
-              label="用途"
-              placeholder="用途"
-              readonly
-              @click="showyt = true"
-              required
-              :rules="[{ required: true, message: '用途不能为空' }]"
-            />
-            <van-field
-              v-model="form.yt"
-              style="display:none"
-              autocomplete="off"
-            />
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.qllxName"
-              name="权利类型"
-              label="权利类型"
-              placeholder="权利类型"
-              readonly
-              @click="showqllx = true"
-            />
-            <van-field
-              autocomplete="off"
-              v-model="form.qllx"
-              style="display:none"
-            />
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.qlxzName"
-              name="权利性质"
-              label="权利性质"
-              placeholder="权利性质"
-              readonly
-              @click="showqlxz = true"
-            />
-            <van-field
-              autocomplete="off"
-              v-model="form.qlxz"
-              style="display:none"
-            />
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.qlsdfsName"
-              name="权利设定方式"
-              label="权利设定方式"
-              placeholder="权利设定方式"
-              readonly
-              @click="showqlsdfs = true"
-            />
-            <van-field
-              autocomplete="off"
-              v-model="form.qlsdfs"
-              style="display:none"
-            />
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.rjl"
-              name="容积率"
-              label="容积率"
-              placeholder="容积率"
-            />
-            <van-field
-              input-align="right"
-              v-model="form.jzmd"
-              name="validator"
-              label="建筑密度"
-              placeholder="填写0~1小数"
-              :rules="[{ validator, message: '请填写0~1小数，保留两位小数' }]"
-              type="number"
-            />
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.jzxg"
-              name="建筑限高(m)"
-              label="建筑限高(m)"
-              placeholder="填写000.00~999.99小数"
-              :rules="[{ validator:validator1, message: '请填写000.00~999.99小数，保留两位小数' }]"
-              type="number"
-            />
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.zdt"
-              name="宗地图"
-              label="宗地图"
-              placeholder="宗地图"
-              maxlength="200"
-            />
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.tfh"
-              name="图幅号"
-              label="图幅号"
-              placeholder="图幅号"
-              maxlength="50"
-            />
-            <van-field
-              autocomplete="off"
-              input-align="right"
-              v-model="form.djh"
-              name="地籍号"
-              label="地籍号"
-              placeholder="自动生成"
-              disabled
-              v-show="false"
-            />
-            <van-field name="radio" label="被惩处经历" input-align="right" autocomplete="off">
-              <template #input>
-                <van-radio-group v-model="form.bccjl" direction="horizontal">
-                  <van-radio name="1">有</van-radio>
-                  <van-radio name="0">无</van-radio>
-                </van-radio-group>
-              </template>
-            </van-field>
-            <van-field
-              autocomplete="off"
-              v-if="form.bccjl==1"
-              input-align="right"
-              v-model="form.bccbz"
-              name="被惩处备注"
-              label="被惩处备注"
-              placeholder="被惩处备注"
-              maxlength="200"
-            />
-            <van-field name="radio" label="宅基地取得方式" input-align="right" autocomplete="off">
-              <template #input>
-                <van-radio-group v-model="form.zjdqdfs" direction="horizontal">
-                  <van-radio v-for="dict in zjdqdfsOptions" :key="dict.dictValue" :name="dict.dictValue">{{dict.dictLabel}}</van-radio>
-                </van-radio-group>
-              </template>
-            </van-field>
-          </van-collapse-item>
-        </van-collapse>
-        <van-field
-          autocomplete="off"
-          v-model="form.sjlyName"
-          name="数据来源"
-          label="数据来源"
-          placeholder="数据来源"
-          input-align="right"
-          readonly
-          @click="showsjly = true"
-        />
-        <van-field
-          autocomplete="off"
-          v-model="form.sjly"
-          style="display:none"
-        />
+<!--        <van-collapse v-model="activeZjd">-->
+<!--          <van-collapse-item title="利用状况" name="1" class="label-class">-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.lyzkName"-->
+<!--              name="当前利用状况"-->
+<!--              label="当前利用状况"-->
+<!--              placeholder="当前利用状况"-->
+<!--              readonly-->
+<!--              @click="showlyzk = true"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              v-model="form.lyzk"-->
+<!--              style="display:none"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.zjdxzyy"-->
+<!--              name="闲置原因"-->
+<!--              label="闲置原因"-->
+<!--              placeholder="宅基地闲置原因"-->
+<!--              maxlength="200"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.xzkssj"-->
+<!--              name="闲置开始时间"-->
+<!--              label="闲置开始时间"-->
+<!--              placeholder="闲置开始时间"-->
+<!--              readonly-->
+<!--              @click="showPickerxzkssj = true"-->
+<!--            />-->
+<!--            <van-popup v-model:show="showPickerxzkssj" position="bottom">-->
+<!--              <van-datetime-picker-->
+<!--                type="date"-->
+<!--                @confirm="onConfirmxzkssj"-->
+<!--                @cancel="showPickerxzkssj = false"-->
+<!--                :min-date="minDate"-->
+<!--                :max-date="maxDate"-->
+<!--              />-->
+<!--            </van-popup>-->
+<!--            <van-field name="radio" label="流转意向" input-align="right" autocomplete="off">-->
+<!--              <template #input>-->
+<!--                <van-radio-group v-model="form.lzyx" direction="horizontal">-->
+<!--                  <van-radio name="1">有</van-radio>-->
+<!--                  <van-radio name="0">无</van-radio>-->
+<!--                </van-radio-group>-->
+<!--              </template>-->
+<!--            </van-field>-->
+<!--            <van-field name="radio" label="有偿退出意向" input-align="right" autocomplete="off">-->
+<!--              <template #input>-->
+<!--                <van-radio-group v-model="form.yctcyx" direction="horizontal">-->
+<!--                  <van-radio name="1">有</van-radio>-->
+<!--                  <van-radio name="0">无</van-radio>-->
+<!--                </van-radio-group>-->
+<!--              </template>-->
+<!--            </van-field>-->
+<!--          </van-collapse-item>-->
+<!--          <van-collapse-item title="其他信息" name="2" class="label-class">-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.djName"-->
+<!--              name="等级"-->
+<!--              label="等级"-->
+<!--              placeholder="等级"-->
+<!--              @click="showdj = true"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              v-model="form.dj"-->
+<!--              style="display:none"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.jg"-->
+<!--              name="价格（万元）"-->
+<!--              label="价格（万元）"-->
+<!--              placeholder="价格（万元）"-->
+<!--              maxlength="15"-->
+<!--              type="number"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.ytmc"-->
+<!--              name="用途"-->
+<!--              label="用途"-->
+<!--              placeholder="用途"-->
+<!--              readonly-->
+<!--              @click="showyt = true"-->
+<!--              required-->
+<!--              :rules="[{ required: true, message: '用途不能为空' }]"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              v-model="form.yt"-->
+<!--              style="display:none"-->
+<!--              autocomplete="off"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.qllxName"-->
+<!--              name="权利类型"-->
+<!--              label="权利类型"-->
+<!--              placeholder="权利类型"-->
+<!--              readonly-->
+<!--              @click="showqllx = true"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              v-model="form.qllx"-->
+<!--              style="display:none"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.qlxzName"-->
+<!--              name="权利性质"-->
+<!--              label="权利性质"-->
+<!--              placeholder="权利性质"-->
+<!--              readonly-->
+<!--              @click="showqlxz = true"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              v-model="form.qlxz"-->
+<!--              style="display:none"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.qlsdfsName"-->
+<!--              name="权利设定方式"-->
+<!--              label="权利设定方式"-->
+<!--              placeholder="权利设定方式"-->
+<!--              readonly-->
+<!--              @click="showqlsdfs = true"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              v-model="form.qlsdfs"-->
+<!--              style="display:none"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.rjl"-->
+<!--              name="容积率"-->
+<!--              label="容积率"-->
+<!--              placeholder="容积率"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              input-align="right"-->
+<!--              v-model="form.jzmd"-->
+<!--              name="validator"-->
+<!--              label="建筑密度"-->
+<!--              placeholder="填写0~1小数"-->
+<!--              :rules="[{ validator, message: '请填写0~1小数，保留两位小数' }]"-->
+<!--              type="number"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.jzxg"-->
+<!--              name="建筑限高(m)"-->
+<!--              label="建筑限高(m)"-->
+<!--              placeholder="填写000.00~999.99小数"-->
+<!--              :rules="[{ validator:validator1, message: '请填写000.00~999.99小数，保留两位小数' }]"-->
+<!--              type="number"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.zdt"-->
+<!--              name="宗地图"-->
+<!--              label="宗地图"-->
+<!--              placeholder="宗地图"-->
+<!--              maxlength="200"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.tfh"-->
+<!--              name="图幅号"-->
+<!--              label="图幅号"-->
+<!--              placeholder="图幅号"-->
+<!--              maxlength="50"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.djh"-->
+<!--              name="地籍号"-->
+<!--              label="地籍号"-->
+<!--              placeholder="自动生成"-->
+<!--              disabled-->
+<!--              v-show="false"-->
+<!--            />-->
+<!--            <van-field name="radio" label="被惩处经历" input-align="right" autocomplete="off">-->
+<!--              <template #input>-->
+<!--                <van-radio-group v-model="form.bccjl" direction="horizontal">-->
+<!--                  <van-radio name="1">有</van-radio>-->
+<!--                  <van-radio name="0">无</van-radio>-->
+<!--                </van-radio-group>-->
+<!--              </template>-->
+<!--            </van-field>-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              v-if="form.bccjl==1"-->
+<!--              input-align="right"-->
+<!--              v-model="form.bccbz"-->
+<!--              name="被惩处备注"-->
+<!--              label="被惩处备注"-->
+<!--              placeholder="被惩处备注"-->
+<!--              maxlength="200"-->
+<!--            />-->
+<!--            <van-field name="radio" label="宅基地取得方式" input-align="right" autocomplete="off">-->
+<!--              <template #input>-->
+<!--                <van-radio-group v-model="form.zjdqdfs" direction="horizontal">-->
+<!--                  <van-radio v-for="dict in zjdqdfsOptions" :key="dict.dictValue" :name="dict.dictValue">{{dict.dictLabel}}</van-radio>-->
+<!--                </van-radio-group>-->
+<!--              </template>-->
+<!--            </van-field>-->
+<!--          </van-collapse-item>-->
+<!--        </van-collapse>-->
+<!--        <van-field-->
+<!--          autocomplete="off"-->
+<!--          v-model="form.sjlyName"-->
+<!--          name="数据来源"-->
+<!--          label="数据来源"-->
+<!--          placeholder="数据来源"-->
+<!--          input-align="right"-->
+<!--          readonly-->
+<!--          @click="showsjly = true"-->
+<!--        />-->
+<!--        <van-field-->
+<!--          autocomplete="off"-->
+<!--          v-model="form.sjly"-->
+<!--          style="display:none"-->
+<!--        />-->
 
-        <van-field
-          autocomplete="off"
-          input-align="right"
-          v-model="form.bz"
-          name="备注"
-          label="备注"
-          placeholder="备注"
-          maxlength="200"
-        />
-        <van-field name="uploader" label="现场照片" autocomplete="off">
-          <template #input>
-            <van-uploader v-model="fileListzjd" :after-read="beforeReadzjd" multiple @delete="deleteFilezjd" :max-count="20" accept="image/*"></van-uploader>
-          </template>
-        </van-field>
+<!--        <van-field-->
+<!--          autocomplete="off"-->
+<!--          input-align="right"-->
+<!--          v-model="form.bz"-->
+<!--          name="备注"-->
+<!--          label="备注"-->
+<!--          placeholder="备注"-->
+<!--          maxlength="200"-->
+<!--        />-->
+<!--        <van-field name="uploader" label="现场照片" autocomplete="off">-->
+<!--          <template #input>-->
+<!--            <van-uploader v-model="fileListzjd" :after-read="beforeReadzjd" multiple @delete="deleteFilezjd" :max-count="20" accept="image/*"></van-uploader>-->
+<!--          </template>-->
+<!--        </van-field>-->
 
 
-        <MapGisDrawing :ref="this.zjdProductResh" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
+        <MapGisDrawing ref="zjdProductResh" :message="form.theGeomJson" :zjddm="form.zjddm"  ></MapGisDrawing>
       </div>
       <div style="margin: 16px;display: flex;justify-content: space-around;">
         <van-button round color="#22B7F2" style="width:45%" native-type="submit">保存</van-button>
@@ -491,14 +491,43 @@ export default {
     };
   },
   created(){
-
+    let data = this.$route.query.res;
+    this.form = JSON.parse(localStorage.getItem("zjdzdxxItem"));
+    console.info(this.form);
+    this.onSubmitzjd();
   },
   mounted(){
 
   },
   methods: {
     onSubmitzjd(){
-
+      setTimeout(() => {
+        this.$refs.zjdProductResh.drawingPaceCountryDarw();
+      }, 500);
+    },
+    submitzjd(){
+      updateZjdzd(this.form).then(response => {
+        let _this =this
+        this.$toast({
+          icon: 'success', // 找到自己需要的图标
+          message: '保存成功',
+          duration:"1000",
+          onClose:function(){
+            _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+          }
+        })
+      });
+    },
+    guidProduct(){
+      return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    },
+    /** 查找地图中定位点 */
+    MapTag: function (data) {
+      this.$refs[this.zjdProductResh].drawingPaceCountryDarw();
     },
     goBack(){
       if(this.ztMap && this.enterMap ==1){

src/views/homesteadSurvey/add2.vue

@@ -96,7 +96,7 @@
 </template>
 
 <script>
-import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
+import {getShyqrs,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
 import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand,submitOnly} from "@/api/homesteadSurvey/zjdzd";
 import MapGisDrawing from "@/components/Map/MapGisDrawing";
 import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzStatus} from "@/api/homesteadSurvey/zrz";
@@ -117,22 +117,23 @@ export default {
     return {
       active:2,
       // 使用权人列表
-      syqrlist:[
-        {
-          shyqrdbxm :'测试测试',
-          shyqrdbzjhm :'12324648564',
-          nhdm :'777888999',
-        }
-      ],
+      zjdzdxx:{},
+      syqrlist:[],
     };
   },
   created(){
-
+    this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
+    this.getList();
   },
   mounted(){
 
   },
   methods: {
+    getList(){
+      getShyqrs({zjddm:this.zjdzdxx.zjddm,shyqrdbxm:this.zjdzdxx.shyqrdbxm }).then(response => {
+        this.syqrlist = response.rows;
+      });
+    },
     goBack(){
       if(this.ztMap && this.enterMap ==1){
         if(this.form.id == null){
@@ -147,7 +148,9 @@ export default {
       this.$router.push({name:'homesteadList'});
       // }
     },
-    showPopupsyqr(){},
+    showPopupsyqr(){
+      this.$router.push({name:'shyqrAdd'});
+    },
     showPopupnh(){},
     showPopuphncylist(){},
   }

src/views/homesteadSurvey/add3.vue

@@ -108,21 +108,23 @@ export default {
   data() {
     return {
       active:3,
-      zrzlist:[
-        {
-          zrzh :'123',
-          zcs :'321654987'
-        }
-      ]
+      zjdzdxx:{},
+      zrzlist:[]
     };
   },
   created(){
-
+    this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
+    this.getList();
   },
   mounted(){
 
   },
   methods: {
+    getList(){
+      listZrz({zjddm:this.zjdzdxx.zjddm}).then(response => {
+        this.zrzlist = response.rows;
+      });
+    },
     goBack(){
       if(this.ztMap && this.enterMap ==1){
         if(this.form.id == null){

src/views/homesteadSurvey/add4.vue

@@ -115,20 +115,23 @@ export default {
   data() {
     return {
       active:4,
-      fssslist:[{
-        fssslx :'123',
-        jzmj :'123',
-        jzwqk:'123',
-      }]
+      zjdzdxx:{},
+      fssslist:[]
     };
   },
   created(){
-
+    this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
+    this.getList();
   },
   mounted(){
 
   },
   methods: {
+    getList(){
+      listFsss({zjddm:this.zjdzdxx.zjddm}).then(response => {
+        this.fssslist = response.rows;
+      });
+    },
     goBack(){
       if(this.ztMap && this.enterMap ==1){
         if(this.form.id == null){

src/views/homesteadSurvey/index.vue

@@ -61,12 +61,9 @@
       <van-cell  v-for="(item,index) in totalList" :key="item.id" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:0px auto 20px;height: 110px;">
         <template #title>
-          <div>{{item.deptName}}</div>
+          <div>{{item.rwmc}}  <span :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">{{item.zjdsl}}/{{zjdslSum}}</span></div>
         </template>
         <template #default>
-          <p :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">
-            {{item.confirmZjdzdNumber}}/{{item.reportZjdzdNumber}}
-          </p>
           <van-circle
             v-model="item.reportZrzNumber"
             :rate="item.reportNhNumber"
@@ -75,7 +72,7 @@
             size="70%"
             layer-color="#ebedf0"
             :color="chooseColor(item)"
-            :text="item.reportZjdzdNumber!=null?(((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed())+'%':0+'%'"
+            :text="item.zjdsl!=0?(((item.zjdsl/zjdslSum)*100).toFixed())+'%':0+'%'"
           />
         </template>
         <template #label>
@@ -90,12 +87,10 @@
       <van-cell  v-for="(item,index) in doneList" :key="item.id" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:0px auto 20px;height: 110px;">
         <template #title>
-          <div>{{item.deptName}}</div>
+          <div>{{item.rwmc}}     <span :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">{{item.zjdsl}}/{{zjdslSum}}</span></div>
         </template>
         <template #default>
-          <p :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">
-            {{item.confirmZjdzdNumber}}/{{item.reportZjdzdNumber}}
-          </p>
+
           <van-circle
             v-model="item.reportZrzNumber"
             :rate="item.reportNhNumber"
@@ -104,7 +99,7 @@
             size="70%"
             layer-color="#ebedf0"
             :color="chooseColor(item)"
-            :text="item.reportZjdzdNumber!=null?(((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed())+'%':0+'%'"
+            :text="item.zjdsl!=0?(((item.zjdsl/zjdslSum)*100).toFixed())+'%':0+'%'"
           />
         </template>
         <template #label>
@@ -119,12 +114,9 @@
       <van-cell  v-for="(item,index) in todoList" :key="item.id" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:0px auto 20px;height: 110px;">
         <template #title>
-          <div>{{item.deptName}}</div>
+          <div>{{item.rwmc}}   <span :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">{{item.zjdsl}}/{{zjdslSum}}</span></div>
         </template>
         <template #default>
-          <p :style="{'color':chooseColor(item),'background':chooseColor2(item),'display':'inline-block','padding':'4px 2px','line-height':'1','border-radius':'5px'}">
-            {{item.confirmZjdzdNumber}}/{{item.reportZjdzdNumber}}
-          </p>
           <van-circle
             v-model="item.reportZrzNumber"
             :rate="item.reportNhNumber"
@@ -133,7 +125,7 @@
             size="70%"
             layer-color="#ebedf0"
             :color="chooseColor(item)"
-            :text="item.reportZjdzdNumber!=null?(((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed())+'%':0+'%'"
+            :text="item.zjdsl!=0?(((item.zjdsl/zjdslSum)*100).toFixed())+'%':0+'%'"
           />
         </template>
         <template #label>
@@ -149,6 +141,7 @@
 
 <script>
   import {addTask, complete, delTask, exportTask, getTask, listTask, publish, updateTask, userList} from "@/api/homesteadSurvey/index";
+  import {changeDept} from "@/api/homesteadSurvey/zjdzd";
   import {getInfo} from "../../api/login";
   import CircleProccess from "@/components/circleProccess.vue";
   import {updateUserPwd} from "../../api/onlineHome/my";
@@ -173,6 +166,7 @@
           phone:null,
           activeKey:0,
           currentRate: 0,
+          zjdslSum:0,
           total:0,
           totalList:[],
           done:0,
@@ -186,7 +180,7 @@
           queryParams: {
             rwwczt: null,
             rwfbzt:"PUBLISHED",
-            taskExecutor:null
+            rwzxr:null
           },
           nickName:"",
           text:0,
@@ -211,7 +205,6 @@
           this.nickName = response.user.nickName
           this.businessLevel = response.user.businessLevel
           this.$cookies.set("businessLevel",this.businessLevel)
-          this.queryParams.taskExecutor = response.user.userName
           this.getList();
         });
         axios.get('../static/dictyType.json').then(res => {
@@ -243,6 +236,9 @@
             this.$cookies.set("url",response.rows[0].configValue)
           })
         },
+        qiehuan(deptId){
+          changeDept(deptId);
+        },
         chooseValue(item){
             let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
           return a
@@ -296,7 +292,6 @@
           let _this = this
           if(this.active==1){
             let params = {
-              "rwwczt": "FINISHED",
               "rwfbzt":"PUBLISHED",
               "pageNum": this.countyhc+1,
               "pageSize":10,
@@ -311,7 +306,7 @@
             });
           }else if(this.active==2){
             let params = {
-              "rwwczt": "UNFINISHED",
+              "rwwczt": "PUBLISHED",
               "rwfbzt":"PUBLISHED",
               "pageNum": this.countwhc+1,
               "pageSize":10,
@@ -326,6 +321,7 @@
             });
           }else{
             let params = {
+              "rwwczt": "UNPUBLISHED",
               "rwfbzt":"PUBLISHED",
               "pageNum": this.countqb+1,
               "pageSize":10,
@@ -360,29 +356,55 @@
           }*/
           this.$cookies.set("item","");
           this.$cookies.set("item",JSON.stringify(item));
+          this.qiehuan(item.deptId);
           this.$router.push({name:'homesteadList'})
         },
         getList() {
           this.totalList = []
           this.doneList = [];
           this.todoList = [];
+          this.zjdslSum = 0;
+          if(this.active==1) {
+            this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
+            this.$set(this.queryParams, "rwwczt", null);
+            this.$set(this.queryParams, "pageNum",  this.countyhc + 1);
+            this.$set(this.queryParams, "pageSize",  10);
+          }else if(this.active==2) {
+            this.$set(this.queryParams, "rwwczt", "FINISHED");
+            this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
+            this.$set(this.queryParams, "pageNum",  this.countwhc + 1);
+          }else{
+            this.$set(this.queryParams, "rwwczt", "UNFINISHED");
+            this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
+            this.$set(this.queryParams, "pageNum",  this.countqb + 1);
+          }
           listTask(this.queryParams).then(response => {
-            this.total = response.total
             this.done = 0;
             this.todo = 0;
             response.rows.map(res => {
-              if(res.taskStatus == "FINISHED"){
+              this.zjdslSum += res.zjdsl;
+              if(this.active==1) {
+                this.total = response.total;
+                if(res.rwwczt == "FINISHED"){
+                  this.done+=1
+                  this.doneList.push(res);
+                }else{
+                  this.todo+=1
+                  this.todoList.push(res);
+                }
+                // if(res.rwzxr!=null&&res.rwzxr!=''){
+                //   res.rwzxr = res.rwzxr.split(',')
+                // }
+                this.totalList = response.rows;
+              }else if(this.active==2) {
                 this.done+=1
                 this.doneList.push(res);
               }else{
                 this.todo+=1
                 this.todoList.push(res);
               }
-              if(res.taskExecutor!=null&&res.taskExecutor!=''){
-                res.taskExecutor = res.taskExecutor.split(',')
-              }
             })
-          this.totalList = response.rows
+
           });
         },
         gotoLink(){

src/views/homesteadSurvey/list.vue

@@ -40,14 +40,14 @@
         <div style="text-align:center;background: rgba(122,201,67,0.2);width: 49%;font-size: 14px;border-radius: 8px;display: flex;align-items: center;justify-content: center;padding: 2px 0;">
           <img src="../../assets/images/housesteadSurvey/list01.png" alt="">
           <p style="margin-left: 10px;">
-            <span style="color:#60B722;line-height:.8rem;">总户数：</span>
+            <span style="color:#60B722;line-height:.8rem;">宅基地数：</span>
             <span style="color:#60B722;line-height:.8rem;"><span style="font-size:16px;color: #448815;">{{totalH}}</span> 户</span>
           </p>
         </div>
         <div style="text-align:center;background: rgba(122,201,67,0.2);width: 49%;font-size: 14px;border-radius: 8px;display: flex;align-items: center;justify-content: center;padding: 2px 0;">
           <img src="../../assets/images/housesteadSurvey/list02.png" alt="">
           <p style="margin-left: 10px;">
-            <span style="color:#60B722;line-height:.8rem">总人数：</span>
+            <span style="color:#60B722;line-height:.8rem">使用权人数：</span>
             <span style="color:#60B722;line-height:.8rem"><span style="font-size:16px;color: #448815;">{{totalR}}</span> 人</span>
           </p>
         </div>
@@ -80,7 +80,7 @@
               <div style="display: flex;align-items: center;">
                 <p style="display: flex;align-items: center;">
                   <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
-                  <span style="line-height: 1;">{{limitWords(item.syqr)}}</span>
+                  <span style="line-height: 1;">{{limitWords(item.shyqrdbxm)}}</span>
                 </p>
                 <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="setCookies(item)"><img src="../../assets/images/housesteadSurvey/list06.png" alt="" style="margin-right: 3px;">详情</p>
                 <p v-if="item.zjdAudit=='0'" style="color:#ff976a;background:rgba(255,151,106,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">待审核</p>
@@ -96,7 +96,7 @@
             </template>-->
             <template #label>
               <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">宅基地代码:  {{item.zjddm}} </p>
-              <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">宗地面积: {{item.zdmj}}㎡<span style="margin-left: auto;color: #333333;">检察员：{{item.updateBy}}</span></p>
+              <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">宗地面积: {{item.zdmj}}㎡<span style="margin-left: auto;color: #333333;">检察员：{{item.surveyBy}}</span></p>
             </template>
           </van-cell>
         </van-list>
@@ -147,7 +147,7 @@
 </template>
 
 <script>
-    import {listZjdzd,getQueryLand,getZjdzd,delZjdzdInfo,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
+    import {rhhcList,getQueryLand,getZjdzd,delZjdzdInfo,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
     import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
     import {listShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
@@ -218,25 +218,9 @@
           // 全部列表
           list:[],
           // 已核查列表
-          list1:[
-            {
-              syqr:'刘茂强，王讲讲，王公公',
-              zjdAudit :'0',
-              zjddm :'4413215200216562255Z00026',
-              zdmj :'119.87㎡',
-              updateBy :'高一鹏',
-            }
-          ],
+          list1:[],
           // 未核查列表
-          list2:[
-            {
-              syqr:'刘茂强，王讲讲，王公公12',
-              zjdAudit :'0',
-              zjddm :'4413215200216562255Z00026',
-              zdmj :'119.87㎡',
-              updateBy :'高一鹏',
-            }
-          ],
+          list2:[],
           // 户主列表
           nhlist:[],
           // 户内成员表单
@@ -360,6 +344,7 @@
       mounted(){
       },
       created(){
+
         axios.get('../static/dictyType.json').then(res => {
           this.dictTypeList = res.data
           this.zjlxOptions = this.dictTypeList.zjlx;
@@ -371,6 +356,7 @@
           this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
           this.cybzOptions = this.dictTypeList.member_remark;
         })
+        this.getList();
           // this.getDicts("family_status").then(response => {
           //   var arr = [];
           //   response.data.forEach(function (item) {
@@ -429,6 +415,13 @@
           // }
       },
       methods: {
+        getList(){
+          rhhcList({surveyStatus:"3"}).then(res => {
+            this.list1 = res.data.zjdzdxxList;
+            this.totalH = res.data.zjdzs;
+            this.totalR = res.data.shyqrs;
+          });
+        },
         showUploadList(){
           this.showImageList = true;
         },
@@ -1208,15 +1201,17 @@
         },
         // 宅基地搜索框
         onSearchzjd(){
+          console.info(this.active);
           if(this.active==1){
             let params = {
-              "deptId" : this.item.deptId,
-              "houseDataConfirmStatus" : "CONFIRMED",
-              "syqr" : this.zjdvalue
+              "shyqrdbxm" : this.zjdvalue,
+              "surveyStatus":"1",
             }
-            listZjdzd(params).then((response) => {
+            rhhcList(params).then((response) => {
               if (response.code == 200) {
-                this.list1 = response.rows
+                this.list2 = response.data.zjdzdxxList;
+                this.totalH = response.data.zjdzs;
+                this.totalR = response.data.shyqrs;
               }
             });
           }else if(this.active==2){
@@ -1232,12 +1227,14 @@
             });
           }else{
             let params = {
-              "deptId" : this.item.deptId,
-              "syqr" : this.zjdvalue
+              "shyqrdbxm" : this.zjdvalue,
+              "surveyStatus":"3",
             }
-            listZjdzd(params).then((response) => {
+            rhhcList(params).then((response) => {
               if (response.code == 200) {
-                this.list = response.rows
+                this.list1 = response.data.zjdzdxxList;
+                this.totalH = response.data.zjdzs;
+                this.totalR = response.data.shyqrs;
               }
             });
           }
@@ -1413,64 +1410,36 @@
           })
         },
       getZjdList(){
-         let params = {
-           "deptId" : this.item.deptId,
-           "pageNum": 1,
-           "pageSize":10,
-         }
-         listZjdzd(params).then((response) => {
-           if (response.code == 200) {
-             this.list = response.rows
-             this.qbNums = response.total
-   /*          if(response.rows.length>=10){
-               this.list = newList.slice(0,9)
-             }else {
-               this.list = newList
-             }
-             this.yhcNums = 0
-             this.whcNums = 0
-             this.list1 = []
-             this.list2 = []
-             response.rows.map(res => {
-               if(res.houseDataConfirmStatus == 'CONFIRMED'){
-                 if(this.list1.length<10){
-                   this.list1.push(res)
-                 }
-                 this.yhcNums ++
-               }else{
-                 if(this.list2.length<10){
-                   this.list2.push(res)
-                 }
-                 this.whcNums ++
-               }
-             })*/
-
+        this.totalH = 0;
+        this.totalR = 0;
+         if(this.active === 0){
+           let params = {
+             "shyqrdbxm" : this.zjdvalue,
+             "surveyStatus":"3",
            }
-         });
-         let params1 = {
-           "deptId" : this.item.deptId,
-           "houseDataConfirmStatus" : "CONFIRMED",
-           "pageNum": 1,
-           "pageSize":10,
-         }
-         listZjdzd(params1).then((response) => {
-           if (response.code == 200) {
-             this.yhcNums = response.total
-             this.list1 = response.rows
+           rhhcList(params).then((response) => {
+             if (response.code == 200) {
+               this.yhcNums = response.data.zjdzs;
+               this.list1 = response.data.zjdzdxxList;
+               this.totalH = response.data.zjdzs;
+               this.totalR = response.data.shyqrs;
+             }
+           });
+         }else if(this.active === 1){
+           let params = {
+             "shyqrdbxm" : this.zjdvalue,
+             "surveyStatus":"1",
            }
-         });
-         let params2 = {
-           "deptId" : this.item.deptId,
-           "houseDataConfirmStatus" : "UNCONFIRMED",
-           "pageNum": 1,
-           "pageSize":10,
+           rhhcList(params).then((response) => {
+             if (response.code == 200) {
+               this.whcNums = response.data.zjdzs;
+               this.list2 = response.data.zjdzdxxList;
+               this.totalH = response.data.zjdzs;
+               this.totalR = response.data.shyqrs;
+             }
+           });
          }
-         listZjdzd(params2).then((response) => {
-           if (response.code == 200) {
-             this.whcNums = response.total
-             this.list2 = response.rows
-           }
-         });
+
         },
         onConfirm(){},
         /*onSubmithncy(){

src/views/homesteadSurvey/list2.vue

@@ -64,7 +64,7 @@
         <div style="display: flex;align-items: center;">
           <p style="display: flex;align-items: center;">
             <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
-            <span style="line-height: 1;">{{item.hzxm}}</span>
+            <span style="line-height: 1;">{{item.xm}}</span>
           </p>
           <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">成员</p>
           <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopupnh(item)"><img src="../../assets/images/housesteadSurvey/list10.png" alt="" style="margin-right: 3px;">户主</p>
@@ -72,7 +72,7 @@
         </div>
       </template>
       <template #label>
-        <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">证件号码:<span style="margin-left: auto;">{{item.hzzjhm}}</span> </p>
+        <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">证件号码:<span style="margin-left: auto;">{{item.zjhm}}</span> </p>
         <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">农户代码:<span style="margin-left: auto;">{{item.nhdm}}</span></p>
       </template>
     </van-cell>
@@ -81,7 +81,7 @@
 </template>
 
 <script>
-    import {listZjdzd,getQueryLand,getZjdzd,delZjdzdInfo,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
+    import {getQueryLand,getZjdzd,delZjdzdInfo,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
     import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
     import {listShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
@@ -156,11 +156,7 @@
           // 未核查列表
           list2:[],
           // 户主列表
-          nhlist:[{
-            hzxm :'刘茂强',
-            hzzjhm :'373702215605074707',
-            nhdm :'3737022156050747072'
-          }],
+          nhlist:[],
           // 户内成员表单
           form5: {},
           // 户内成员列表
@@ -293,6 +289,8 @@
           this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
           this.cybzOptions = this.dictTypeList.member_remark;
         })
+        this.item = this.$cookies.get("item");
+        this.getNh();
           this.getDicts("family_status").then(response => {
             var arr = [];
             response.data.forEach(function (item) {
@@ -310,7 +308,6 @@
                 //   location.reload();
                 // }
                 this.activeBtn = this.$cookies.get("search").activeBtn;
-                this.item = this.$cookies.get("item");
                 this.mapAddJump = this.$cookies.get("search").backMapZjdAData.deptId;
                 this.backTheGeom = this.$cookies.get("search").backMapZjdAData.theGeom;
                 this.mapZjdData = this.$cookies.get("search").backMapZjdAData;
@@ -330,7 +327,6 @@
                 }
               }
             }else {
-              this.item = this.$cookies.get("item");
               this.getZjdList();
               this.getTotalHR();
               if(this.item.taskStatus=="FINISHED"){
@@ -340,7 +336,6 @@
               }
             }
           }else {
-            this.item = this.$cookies.get("item");
             this.getZjdList();
             this.getTotalHR();
             if(this.item.taskStatus=="FINISHED"){
@@ -763,7 +758,6 @@
         },
         getTotalHR(){
           let params = {
-            "deptId" : this.item.deptId,
             "pageNum": 1,
             "pageSize":10,
           }
@@ -1074,13 +1068,16 @@
         getNh(){
           //删除地图选中状态
           $("#deleteHistoryMap").trigger("click");
+          console.info(this.item.deptId);
           let params = {
-            "deptId" : this.item.deptId
+            dept:this.item.deptId,
+            yhzgx : "02"
           }
-          listNh(params).then((response) => {
+          listNhhncy(params).then((response) => {
             this.nhlist = response.rows
             this.totalN = response.total
           });
+          console.info( this.nhlist);
           this.mapZjdData = "";
           this.mapZrzData = "";
           this.mapFsssData = "";
@@ -1121,9 +1118,10 @@
         onSearchnh(){
           let params = {
             "deptId" : this.item.deptId,
+            "yhzgx" : "01",
             "nhValue" : this.nhvalue
           }
-          listNh(params).then((response) => {
+          listNhhncy(params).then((response) => {
             this.nhlist = response.rows
           });
         },
@@ -1334,64 +1332,30 @@
           })
         },
       getZjdList(){
-         let params = {
-           "deptId" : this.item.deptId,
-           "pageNum": 1,
-           "pageSize":10,
-         }
-         listZjdzd(params).then((response) => {
-           if (response.code == 200) {
-             this.list = response.rows
-             this.qbNums = response.total
-   /*          if(response.rows.length>=10){
-               this.list = newList.slice(0,9)
-             }else {
-               this.list = newList
-             }
-             this.yhcNums = 0
-             this.whcNums = 0
-             this.list1 = []
-             this.list2 = []
-             response.rows.map(res => {
-               if(res.houseDataConfirmStatus == 'CONFIRMED'){
-                 if(this.list1.length<10){
-                   this.list1.push(res)
-                 }
-                 this.yhcNums ++
-               }else{
-                 if(this.list2.length<10){
-                   this.list2.push(res)
-                 }
-                 this.whcNums ++
-               }
-             })*/
-
-           }
-         });
-         let params1 = {
-           "deptId" : this.item.deptId,
-           "houseDataConfirmStatus" : "CONFIRMED",
-           "pageNum": 1,
-           "pageSize":10,
-         }
-         listZjdzd(params1).then((response) => {
-           if (response.code == 200) {
-             this.yhcNums = response.total
-             this.list1 = response.rows
-           }
-         });
-         let params2 = {
-           "deptId" : this.item.deptId,
-           "houseDataConfirmStatus" : "UNCONFIRMED",
-           "pageNum": 1,
-           "pageSize":10,
-         }
-         listZjdzd(params2).then((response) => {
-           if (response.code == 200) {
-             this.whcNums = response.total
-             this.list2 = response.rows
-           }
-         });
+         // let params1 = {
+         //   "deptId" : this.item.deptId,
+         //   "houseDataConfirmStatus" : "CONFIRMED",
+         //   "pageNum": 1,
+         //   "pageSize":10,
+         // }
+         // listZjdzd(params1).then((response) => {
+         //   if (response.code == 200) {
+         //     this.yhcNums = response.total
+         //     this.list1 = response.rows
+         //   }
+         // });
+         // let params2 = {
+         //   "deptId" : this.item.deptId,
+         //   "houseDataConfirmStatus" : "UNCONFIRMED",
+         //   "pageNum": 1,
+         //   "pageSize":10,
+         // }
+         // listZjdzd(params2).then((response) => {
+         //   if (response.code == 200) {
+         //     this.whcNums = response.total
+         //     this.list2 = response.rows
+         //   }
+         // });
         },
         onConfirm(){},
         /*onSubmithncy(){

src/views/homesteadSurvey/list3.vue

@@ -333,7 +333,7 @@
 </template>
 
 <script>
-    import {listZjdzd,getQueryLand,getZjdzd,delZjdzdInfo,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
+    import {getQueryLand,getZjdzd,delZjdzdInfo,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
     import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
     import {listShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
@@ -541,6 +541,7 @@
           this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
           this.cybzOptions = this.dictTypeList.member_remark;
         })
+        this.getSyqr();
           this.getDicts("family_status").then(response => {
             var arr = [];
             response.data.forEach(function (item) {
@@ -569,7 +570,7 @@
                 this.mapZjdDataTure = 1;
                 this.mapAddJumpNum =1;
                 this.mapShow();
-                this.getZjdList();
+                // this.getZjdList();
                 this.getTotalHR();
                 if(this.item.taskStatus=="FINISHED"){
                     this.isFinished = true
@@ -579,7 +580,7 @@
               }
             }else {
               this.item = this.$cookies.get("item");
-              this.getZjdList();
+              // this.getZjdList();
               this.getTotalHR();
               if(this.item.taskStatus=="FINISHED"){
                 this.isFinished = true
@@ -589,7 +590,8 @@
             }
           }else {
             this.item = this.$cookies.get("item");
-            this.getZjdList();
+            console.info(this.item );
+            // this.getZjdList();
             this.getTotalHR();
             if(this.item.taskStatus=="FINISHED"){
               this.isFinished = true
@@ -1061,9 +1063,6 @@
         // 农户信息搜索框新增。
         onClicknh(){
           this.shownh = true;
-          let params = {
-            "deptId" : this.item.deptId
-          }
           this.qlrform={}
           this.nhform={
             "suyqrdm":null,
@@ -1084,7 +1083,7 @@
             "sjly":'07',
             "sjlyName":'农村集体产权制度改革',
           }
-          listSuyqr(params).then((response) => {
+          listSuyqr({}).then((response) => {
             if(response.rows.length>0){
               this.qlrform = response.rows[0]
               this.nhform.suyqrdm = this.qlrform.suyqrdm
@@ -1264,7 +1263,7 @@
             "sjly":'04',
             "sjlyName":"农村宅基地使用权确权登记发证"
           }
-          listSuyqr(params).then((response) => {
+          listSuyqr({}).then((response) => {
             if(response.rows.length>0){
               this.qlrform = response.rows[0]
               if(this.qlrform.suyqxz==null||this.qlrform.suyqxz==""){

src/views/homesteadSurvey/list4.vue

@@ -31,15 +31,15 @@
         </van-popup>
         <div style="display:flex;width:94%;margin:0 auto;justify-content:space-between;padding: 10px 0">
           <div style="display:flex;width:90%;margin:0 auto;">
-            <div :class="{activeBtn : activeBtn==1,disactiveBtn :activeBtn!=1 }" @click="activeBtn=1,getDc()"
+            <div :class="{activeBtn : activeBtn==1,disactiveBtn :activeBtn!=1 }" @click="$router.push({path:'/homesteadSurvey/list'})"
             ><van-icon size=".3rem" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn1'+(activeBtn!=1?'1':'')+'.png')" />
               入户核查
             </div>
-            <div :class="{activeBtn : activeBtn==2,disactiveBtn :activeBtn!=2 }" @click="activeBtn=2,getNh()">
+            <div :class="{activeBtn : activeBtn==2,disactiveBtn :activeBtn!=2 }" @click="$router.push({path:'/homesteadSurvey/list2'})">
               <van-icon size=".3rem" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn2'+(activeBtn!=2?'2':'')+'.png')" />
               农户信息
             </div>
-            <div :class="{activeBtn : activeBtn==3,disactiveBtn :activeBtn!=3 }" @click="activeBtn=3,getSyqr()">
+            <div :class="{activeBtn : activeBtn==3,disactiveBtn :activeBtn!=3 }" @click="$router.push({path:'/homesteadSurvey/list3'})">
               <van-icon size=".3rem" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn3'+(activeBtn!=3?'3':'')+'.png')" />
               所有权人
             </div>
@@ -53,11 +53,11 @@
       <div style="background:#fff;padding:10px 0;">
         <div style="border:1px solid rgb(122, 201, 67);width:90%;margin:0 auto;border-radius:15px;height:.8rem;display:flex;font-size:.3rem;">
           <div style="flex:1;text-align:center;">
-            <span style="color:rgb(122, 201, 67);line-height:.8rem;">总户数：</span>
+            <span style="color:rgb(122, 201, 67);line-height:.8rem;">宅基地数：</span>
             <span style="color:rgb(250, 83, 83);line-height:.8rem;">{{totalH}} <span style="font-size:12px;">户</span></span>
           </div>
           <div style="flex:1;text-align:center;">
-            <span style="color:rgb(122, 201, 67);line-height:.8rem">总人数：</span>
+            <span style="color:rgb(122, 201, 67);line-height:.8rem">使用权人数：</span>
             <span style="color:rgb(250, 83, 83);line-height:.8rem">{{totalR}} <span style="font-size:12px;">人</span></span>
           </div>
         </div>
@@ -196,7 +196,7 @@
       <van-pull-refresh v-model="isLoadingnh" @refresh="onRefreshnh">
       <van-cell  v-for="(item,index) in nhlist" :key="index" size="small"  style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
         <template #title>
-          <p style="color:#22B7F2">{{item.hzxm}}
+          <p style="color:#22B7F2">{{item.xm}}
             <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;margin-left:10px;" @click="showPopuphncylist(item)">查看成员</van-button>
             <van-button plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;margin-left:10px;" @click="showPopupnh(item)">查看户主</van-button>
             <van-button plain round color="#FA5353" size="mini" v-if="!isFinished" style="vertical-align:middle;float:right;" @click="deletenh(item,index)">删除</van-button>
@@ -206,7 +206,7 @@
 
         </template>-->
         <template #label>
-          <p>证件号码:{{item.hzzjhm}}</p>
+          <p>证件号码:{{item.zjhm}}</p>
           <p>农户代码:{{item.nhdm}}</p>
         </template>
         <template #icon>
@@ -517,7 +517,7 @@
         <div class="searchBox" style="display: none;">
           <van-cell center v-for="(item,index) in mapDataAll" :key="index">
             <template #title>
-              <p><van-icon name="manager" /><span>{{item.syqr}}</span><span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.paceType}}</span>
+              <p><van-icon name="manager" /><span>{{item.shyqrdbxm}}</span><span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.paceType}}</span>
                 <!--<span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.typeTc}}</span>--></p>
             </template>
             <template #default>
@@ -1272,7 +1272,7 @@
           showhzlx:false,
           showhncylist:false,
           showhncy:false,
-          activeBtn:1,
+          activeBtn:4,
           value:'',
           // 宅基地搜索框
           zjdvalue:"",
@@ -1419,6 +1419,7 @@
           this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
           this.cybzOptions = this.dictTypeList.member_remark;
         })
+        this.mapShow();
           this.getDicts("family_status").then(response => {
             var arr = [];
             response.data.forEach(function (item) {
@@ -1923,12 +1924,11 @@
         },
         setCookies(item){
           //this.$cookies.set("search",JSON.stringify(item));
-          this.$cookies.set("search","");
+          this.$cookies.set("zjdzdxx",JSON.stringify(item));
           // let _this = this
           // setTimeout(function(){
           //   _this.$router.push({name:'homesteadAdd'});
           // },1000)
-
           this.$router.push({path:'/homesteadSurvey/add',query: {res: item}});
         },
         // 入户核查搜索框新增。
@@ -2201,9 +2201,9 @@
           //删除地图选中状态
           $("#deleteHistoryMap").trigger("click");
           let params = {
-            "deptId" : this.item.deptId
+            "yhzgx" : "01"
           }
-          listNh(params).then((response) => {
+          listNhhncy(params).then((response) => {
             this.nhlist = response.rows
             this.totalN = response.total
           });
@@ -3109,9 +3109,9 @@
           var cql_filter = "dept_id='" + that.$cookies.get("item").deptId + "'";
           var cunTc = new ol.layer.Image({
             source: new ol.source.ImageWMS({
-              url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+              url: that.mapGeoServerUrl + "/wms",
               params: {
-                LAYERS: 'zjd_dc:t_house_survey_border_village',
+                LAYERS: 'nsgk_wulanhaote:t_homespace_cjqy',
                 TILED: true,
                 cql_filter: cql_filter,
                 SRID: 3857,
@@ -3286,6 +3286,7 @@
           map.addLayer(cunTc);
           //村边界查询开始 ------------------------------end
           //国有数据加载-----------------------------------start
+
           deptGetId(that.$cookies.get("item").deptId).then((res) => {
             var cql_filter_guoyou = "ZLDWDM='" + res.data.orgCode + "0000000'";
             var guoyouTc = new ol.layer.Image({
@@ -3307,11 +3308,11 @@
           //var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
           var zjdTc = new ol.layer.Image({
             source: new ol.source.ImageWMS({
-              url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+              url: that.mapGeoServerUrl + "/wms",
               params: {
-                LAYERS: 'zjd_dc:t_house_survey_zjdzd',
+                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx',
                 TILED: true,
-                cql_filter: cql_filter,
+                cql_filter: cql_filter+"and survey_status = '1'",
                 SRID: 3857,
                 TIMESTAMP: new Date().getTime(),
               },
@@ -3323,16 +3324,16 @@
             service: "WFS",
             version: "1.0.0",
             request: "GetFeature",
-            typename: "zjd_dc:t_house_survey_zjdzd",
+            typename: "nsgk_wulanhaote:t_homestead_zjdzdxx",
             //featureNS: 'nsgk_hc',//命名空间 URI
-            cql_filter: cql_filter,
+            cql_filter: cql_filter+" and survey_status = '1'",
             //featurePrefix: 'nationalwater',//工作区名称
             //featureTypes: ['nationalwater:01fir'],//查询图层，可以是同一个工作区下多个图层，逗号隔开
             outputFormat: "application/json",
             maxFeatures:1,
             //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值
           };
-          let url_zjdzd = that.mapGeoServerUrl + "/geoserver/zjd_dc/wfs"; //wfsurl;
+          let url_zjdzd = that.mapGeoServerUrl + "/wfs"; //wfsurl;
           url_zjdzd = url_zjdzd + "?";
           for (let key in param_zjdzd) {
             url_zjdzd = url_zjdzd + key + "=" + param_zjdzd[key] + "&";
@@ -3351,9 +3352,9 @@
                 var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + that.mapZjdData.zjddm + "'";
                 zrzTc = new ol.layer.Image({
                   source: new ol.source.ImageWMS({
-                    url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                    url: that.mapGeoServerUrl + "/wms",
                     params: {
-                      LAYERS: 'zjd_dc:t_house_survey_zrz',
+                      LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
                       TILED: true,
                       cql_filter: cql_filter_map,
                       SRID: 3857,
@@ -3367,9 +3368,9 @@
                 //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
                 fsssTc = new ol.layer.Image({
                   source: new ol.source.ImageWMS({
-                    url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                    url: that.mapGeoServerUrl + "/wms",
                     params: {
-                      LAYERS: 'zjd_dc:t_house_survey_fsss',
+                      LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
                       TILED: true,
                       cql_filter: cql_filter_map,
                       SRID: 3857,
@@ -4073,22 +4074,22 @@
               if(that.mapAddJumpNum == 1){
                 params = {
                   "deptId" : that.mapAddJump,
-                  "syqr" : val
+                  "shyqrdbxm" : val
                 }
               } else {
                 params = {
                   "deptId" : that.$cookies.get("item").deptId,
-                  "syqr" : val
+                  "shyqrdbxm" : val
                 }
               }
               listZjdzd(params).then((response) => {
                 if(response.rows.length != 0){
                   that.mapDataAll = response.rows;
                   for(var hg=0; hg < that.mapDataAll.length; hg++){
-                    var mapNum = that.mapDataAll[hg].houseDataConfirmStatus;
-                    if(mapNum == "UNCONFIRMED"){
+                    var mapNum = that.mapDataAll[hg].surveyStatus;
+                    if(mapNum == "1"){
                       that.mapDataAll[hg].paceType = "未核查";
-                    } else if (mapNum == "CONFIRMED"){
+                    } else if (mapNum == "3"){
                       that.mapDataAll[hg].paceType = "已核查";
                     }else{
 
@@ -4102,7 +4103,7 @@
                             projection: projection,
                             features: new ol.format.GeoJSON().readFeatures("{\n" +
                               "    \"type\": \"Feature\",\n" +
-                              "    \"geometry\":" + that.mapDataAll[hg].theGeom + ",    \"properties\":" + JSON.stringify(that.mapDataAll[hg]) + "}"),
+                              "    \"geometry\":" + that.mapDataAll[hg].theGeomJson + ",    \"properties\":" + JSON.stringify(that.mapDataAll[hg]) + "}"),
                           }),
                           style: styleZjd
                         });
@@ -4834,9 +4835,9 @@
 
           //查询宅基地图层
           var ZjdwmsSource = new ol.source.TileWMS({
-            url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+            url: that.mapGeoServerUrl+"/wms",
             params: {
-              LAYERS: "zjd_dc:t_house_survey_zjdzd",
+              LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx",
               TILED: true,
               SRID: 3857,
               serverType: "geoserver",
@@ -4847,9 +4848,9 @@
 
           //查询自然幢图层
           var ZrzwmsSource = new ol.source.TileWMS({
-            url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+            url: that.mapGeoServerUrl+"/wms",
             params: {
-              LAYERS: "zjd_dc:t_house_survey_zrz",
+              LAYERS: "nsgk_wulanhaote:t_homespace_zrz",
               TILED: true,
               SRID: 3857,
               serverType: "geoserver",
@@ -5015,14 +5016,14 @@
                       that.mapZjdTeAll.mapFsssAData = {};
                       that.mapZjdDataTure = "";
                       setTimeout(() => {
-                        if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_zjdzd") {
+                        if ($("#info .featureInfo .featureInfo").text() == "t_homestead_zjdzdxx") {
                           map.removeLayer(hc_land_on);
                           that.mapHasDateStatus = 2;
                           that.mapXs = true;
                           let obj = {};
                           let trs = $("#info .featureInfo").find("tr:eq(1)");
                           let zjdXq = trs.find("td").eq(0).text();
-                          let zjdIdNum = zjdXq.replace("t_house_survey_zjdzd.", "");
+                          let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx.", "");
                           obj.id = zjdIdNum; //	主键id
                           obj.deptName = trs.find("td").eq(3).text();//行政区划名称
 
@@ -6011,7 +6012,8 @@
             this.mapZjdTeAll.active = 1;
             this.mapZjdTeAll.mapZjdAData = this.mapZjdData;
             //this.$cookies.set("search",this.mapZjdTeAll);
-            this.$cookies.set("search","")
+            console.info(this.mapZjdTeAll.mapZjdAData);
+            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZjdAData));
             setTimeout(() => {
             this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
               }, 500);

src/views/homesteadSurvey/shyqrAdd.vue

@@ -0,0 +1,609 @@
+<template>
+  <div class="app-container">
+    <van-sticky style="position:relative;">
+      <div class="bannerBg">
+        <van-nav-bar
+          style="background:transparent;border-bottom-width:0;height:2rem;margin-bottom:.5rem;"
+          @click-left="goBack()"
+        >
+          <template #left>
+            <van-icon name="arrow-left" size="18" color="#fff" />
+          </template>
+          <template #title>
+            <p style="color:#fff">入户调查</p>
+          </template>
+        </van-nav-bar>
+      </div>
+      <div style="width:95%;left:2.5%;position:absolute;background:#fff;border-radius:15px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: .3rem;top:1.2rem">
+        <van-row>
+          <van-col span="4" :offset="1" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add'})">
+              <van-icon :name="require('../../assets/images/housesteadSurvey/zjd'+(active==1?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
+              <p :style="{color:(active==1?'rgb(34, 183, 242)':'#000')}">宅基地</p>
+          </van-col>
+          <van-col span="2">
+            <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
+            <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+          </van-col>
+          <van-col span="2">
+            <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add3'})" >
+            <van-icon :name="require('../../assets/images/housesteadSurvey/fwxx'+(active==3?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
+            <p  :style="{color:(active==3?'rgb(34, 183, 242)':'#000')}">房屋</p>
+          </van-col>
+          <van-col span="2">
+            <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
+          </van-col>
+          <van-col span="4" style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add4'})">
+            <van-icon :name="require('../../assets/images/housesteadSurvey/fsss'+(active==4?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
+            <p :style="{color:(active==4?'rgb(34, 183, 242)':'#000')}">附属物</p>
+          </van-col>
+        </van-row>
+      </div>
+    </van-sticky>
+    <van-form @submit="submitzjd">
+      <div style="margin:30px auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
+        <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">使用权人信息</p>
+        <!--<van-field
+          v-model="form.deptId"
+          name="行政区划名称"
+          label="行政区划名称"
+          placeholder="行政区划名称"
+          :rules="[{ required: true, message: '' }]"
+        />-->
+        <van-field
+          autocomplete="off"
+          v-model="form.nhdm"
+          name="农户代码"
+          label="农户代码"
+          placeholder="自动生成"
+          input-align="right"
+          disabled
+        />
+        <van-field
+          autocomplete="off"
+          v-model="form.zjddm"
+          name="宅基地代码"
+          label="宅基地代码"
+          placeholder="自动生成"
+          input-align="right"
+          disabled
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.nmfwdm"
+          name="农民房屋代码"
+          label="宗地代码"
+          placeholder="自动生成"
+          disabled
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.bdcdyh"
+          name="不动产单元号"
+          label="不动产单元号"
+          placeholder="自动生成"
+          disabled
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.bdcqzh"
+          name="不动产权证号"
+          label="不动产权证号"
+          placeholder="自动生成"
+          disabled
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.qzysxlh"
+          name="权证印刷序列号"
+          label="权证印刷序列号"
+          placeholder="自动生成"
+          disabled
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.fzjg"
+          name="发证机关"
+          label="发证机关"
+          disabled
+        />
+        <van-field name="radio" label="是否发证" input-align="right" autocomplete="off">
+          <template #input>
+            <van-radio-group v-model="form.sffz" direction="horizontal">
+              <van-radio name="1">是</van-radio>
+              <van-radio name="0">否</van-radio>
+            </van-radio-group>
+          </template>
+        </van-field>
+
+        <van-field
+          input-align="right"
+          v-model="form.zjdzsh"
+          name="宅基地证书号"
+          label="宅基地证书号"
+          placeholder="宅基地证书号"
+          maxlength="50"
+          autocomplete="off"
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.zjdpzmj"
+          name="批准面积(㎡)"
+          label="批准面积(㎡)"
+          placeholder="单位：平方米"
+          type="number"
+          maxlength="15"
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.zdmj"
+          type="number"
+          name="宗地面积(㎡)"
+          label="宗地面积(㎡)"
+          placeholder="宗地面积(㎡)"
+          maxlength="15"
+        />
+
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.zl"
+          name="坐落"
+          label="坐落"
+          placeholder="坐落"
+          required
+          :rules="[{ required: true, message: '坐落不能为空' }]"
+        />
+        <van-field
+          autocomplete="off"
+          v-model="form.zldwdm"
+          name="坐落单位代码"
+          label="坐落单位代码"
+          placeholder="自动生成"
+          input-align="right"
+          disabled
+          v-show="false"
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.zdszd"
+          name="宗地四至-东"
+          label="宗地四至-东"
+          placeholder="宗地四至-东"
+          maxlength="150"
+          required
+          :rules="[{ required: true, message: '宗地四至-东不能为空' }]"
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.zdszn"
+          name="宗地四至-南"
+          label="宗地四至-南"
+          placeholder="宗地四至-南"
+          maxlength="150"
+          required
+          :rules="[{ required: true, message: '宗地四至-南不能为空' }]"
+        />
+        <van-field
+          input-align="right"
+          v-model="form.zdszx"
+          name="宗地四至-西"
+          label="宗地四至-西"
+          placeholder="宗地四至-西"
+          maxlength="150"
+          required
+          :rules="[{ required: true, message: '宗地四至-西不能为空' }]"
+        />
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.zdszb"
+          name="宗地四至-北"
+          label="宗地四至-北"
+          placeholder="宗地四至-北"
+          maxlength="150"
+          required
+          :rules="[{ required: true, message: '宗地四至-北不能为空' }]"
+        />
+<!--        <van-collapse v-model="activeZjd">-->
+<!--          <van-collapse-item title="利用状况" name="1" class="label-class">-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.lyzkName"-->
+<!--              name="当前利用状况"-->
+<!--              label="当前利用状况"-->
+<!--              placeholder="当前利用状况"-->
+<!--              readonly-->
+<!--              @click="showlyzk = true"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              v-model="form.lyzk"-->
+<!--              style="display:none"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.zjdxzyy"-->
+<!--              name="闲置原因"-->
+<!--              label="闲置原因"-->
+<!--              placeholder="宅基地闲置原因"-->
+<!--              maxlength="200"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.xzkssj"-->
+<!--              name="闲置开始时间"-->
+<!--              label="闲置开始时间"-->
+<!--              placeholder="闲置开始时间"-->
+<!--              readonly-->
+<!--              @click="showPickerxzkssj = true"-->
+<!--            />-->
+<!--            <van-popup v-model:show="showPickerxzkssj" position="bottom">-->
+<!--              <van-datetime-picker-->
+<!--                type="date"-->
+<!--                @confirm="onConfirmxzkssj"-->
+<!--                @cancel="showPickerxzkssj = false"-->
+<!--                :min-date="minDate"-->
+<!--                :max-date="maxDate"-->
+<!--              />-->
+<!--            </van-popup>-->
+<!--            <van-field name="radio" label="流转意向" input-align="right" autocomplete="off">-->
+<!--              <template #input>-->
+<!--                <van-radio-group v-model="form.lzyx" direction="horizontal">-->
+<!--                  <van-radio name="1">有</van-radio>-->
+<!--                  <van-radio name="0">无</van-radio>-->
+<!--                </van-radio-group>-->
+<!--              </template>-->
+<!--            </van-field>-->
+<!--            <van-field name="radio" label="有偿退出意向" input-align="right" autocomplete="off">-->
+<!--              <template #input>-->
+<!--                <van-radio-group v-model="form.yctcyx" direction="horizontal">-->
+<!--                  <van-radio name="1">有</van-radio>-->
+<!--                  <van-radio name="0">无</van-radio>-->
+<!--                </van-radio-group>-->
+<!--              </template>-->
+<!--            </van-field>-->
+<!--          </van-collapse-item>-->
+<!--          <van-collapse-item title="其他信息" name="2" class="label-class">-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.djName"-->
+<!--              name="等级"-->
+<!--              label="等级"-->
+<!--              placeholder="等级"-->
+<!--              @click="showdj = true"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              v-model="form.dj"-->
+<!--              style="display:none"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.jg"-->
+<!--              name="价格（万元）"-->
+<!--              label="价格（万元）"-->
+<!--              placeholder="价格（万元）"-->
+<!--              maxlength="15"-->
+<!--              type="number"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.ytmc"-->
+<!--              name="用途"-->
+<!--              label="用途"-->
+<!--              placeholder="用途"-->
+<!--              readonly-->
+<!--              @click="showyt = true"-->
+<!--              required-->
+<!--              :rules="[{ required: true, message: '用途不能为空' }]"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              v-model="form.yt"-->
+<!--              style="display:none"-->
+<!--              autocomplete="off"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.qllxName"-->
+<!--              name="权利类型"-->
+<!--              label="权利类型"-->
+<!--              placeholder="权利类型"-->
+<!--              readonly-->
+<!--              @click="showqllx = true"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              v-model="form.qllx"-->
+<!--              style="display:none"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.qlxzName"-->
+<!--              name="权利性质"-->
+<!--              label="权利性质"-->
+<!--              placeholder="权利性质"-->
+<!--              readonly-->
+<!--              @click="showqlxz = true"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              v-model="form.qlxz"-->
+<!--              style="display:none"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.qlsdfsName"-->
+<!--              name="权利设定方式"-->
+<!--              label="权利设定方式"-->
+<!--              placeholder="权利设定方式"-->
+<!--              readonly-->
+<!--              @click="showqlsdfs = true"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              v-model="form.qlsdfs"-->
+<!--              style="display:none"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.rjl"-->
+<!--              name="容积率"-->
+<!--              label="容积率"-->
+<!--              placeholder="容积率"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              input-align="right"-->
+<!--              v-model="form.jzmd"-->
+<!--              name="validator"-->
+<!--              label="建筑密度"-->
+<!--              placeholder="填写0~1小数"-->
+<!--              :rules="[{ validator, message: '请填写0~1小数，保留两位小数' }]"-->
+<!--              type="number"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.jzxg"-->
+<!--              name="建筑限高(m)"-->
+<!--              label="建筑限高(m)"-->
+<!--              placeholder="填写000.00~999.99小数"-->
+<!--              :rules="[{ validator:validator1, message: '请填写000.00~999.99小数，保留两位小数' }]"-->
+<!--              type="number"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.zdt"-->
+<!--              name="宗地图"-->
+<!--              label="宗地图"-->
+<!--              placeholder="宗地图"-->
+<!--              maxlength="200"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.tfh"-->
+<!--              name="图幅号"-->
+<!--              label="图幅号"-->
+<!--              placeholder="图幅号"-->
+<!--              maxlength="50"-->
+<!--            />-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              input-align="right"-->
+<!--              v-model="form.djh"-->
+<!--              name="地籍号"-->
+<!--              label="地籍号"-->
+<!--              placeholder="自动生成"-->
+<!--              disabled-->
+<!--              v-show="false"-->
+<!--            />-->
+<!--            <van-field name="radio" label="被惩处经历" input-align="right" autocomplete="off">-->
+<!--              <template #input>-->
+<!--                <van-radio-group v-model="form.bccjl" direction="horizontal">-->
+<!--                  <van-radio name="1">有</van-radio>-->
+<!--                  <van-radio name="0">无</van-radio>-->
+<!--                </van-radio-group>-->
+<!--              </template>-->
+<!--            </van-field>-->
+<!--            <van-field-->
+<!--              autocomplete="off"-->
+<!--              v-if="form.bccjl==1"-->
+<!--              input-align="right"-->
+<!--              v-model="form.bccbz"-->
+<!--              name="被惩处备注"-->
+<!--              label="被惩处备注"-->
+<!--              placeholder="被惩处备注"-->
+<!--              maxlength="200"-->
+<!--            />-->
+<!--            <van-field name="radio" label="宅基地取得方式" input-align="right" autocomplete="off">-->
+<!--              <template #input>-->
+<!--                <van-radio-group v-model="form.zjdqdfs" direction="horizontal">-->
+<!--                  <van-radio v-for="dict in zjdqdfsOptions" :key="dict.dictValue" :name="dict.dictValue">{{dict.dictLabel}}</van-radio>-->
+<!--                </van-radio-group>-->
+<!--              </template>-->
+<!--            </van-field>-->
+<!--          </van-collapse-item>-->
+<!--        </van-collapse>-->
+<!--        <van-field-->
+<!--          autocomplete="off"-->
+<!--          v-model="form.sjlyName"-->
+<!--          name="数据来源"-->
+<!--          label="数据来源"-->
+<!--          placeholder="数据来源"-->
+<!--          input-align="right"-->
+<!--          readonly-->
+<!--          @click="showsjly = true"-->
+<!--        />-->
+<!--        <van-field-->
+<!--          autocomplete="off"-->
+<!--          v-model="form.sjly"-->
+<!--          style="display:none"-->
+<!--        />-->
+
+<!--        <van-field-->
+<!--          autocomplete="off"-->
+<!--          input-align="right"-->
+<!--          v-model="form.bz"-->
+<!--          name="备注"-->
+<!--          label="备注"-->
+<!--          placeholder="备注"-->
+<!--          maxlength="200"-->
+<!--        />-->
+<!--        <van-field name="uploader" label="现场照片" autocomplete="off">-->
+<!--          <template #input>-->
+<!--            <van-uploader v-model="fileListzjd" :after-read="beforeReadzjd" multiple @delete="deleteFilezjd" :max-count="20" accept="image/*"></van-uploader>-->
+<!--          </template>-->
+<!--        </van-field>-->
+
+      </div>
+      <div style="margin: 16px;display: flex;justify-content: space-around;">
+        <van-button round color="#22B7F2" style="width:45%" native-type="submit">保存</van-button>
+        <van-button plain color="#22B7F2" round type="info" style="width:45%" native-type="submit">取消</van-button>
+      </div>
+      <div style="height: 50px;"></div>
+    </van-form>
+  </div>
+</template>
+
+<script>
+import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
+import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand,submitOnly} from "@/api/homesteadSurvey/zjdzd";
+import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzStatus} from "@/api/homesteadSurvey/zrz";
+import {listNmfw,addNmfw,updateNmfw,delNmfw} from "@/api/homesteadSurvey/nmfw";
+import {listSuyqr,addSuyqr,updateSuyqr} from "@/api/homesteadSurvey/suyqr";
+import {listNhhncy,addNhhncy,updateNhhncy,delNhhncy} from "@/api/homesteadSurvey/nhhncy";
+import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
+import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss";
+import { listTown, getTown } from "@/api/homesteadSurvey/town";
+import { listVillage} from "@/api/homesteadSurvey/village";
+import { sysConfig} from "@/api/homesteadSurvey/index";
+import { Notify, Dialog, Toast } from 'vant';
+import axios from "axios";
+export default {
+  name: "shyqrAdd",
+  data() {
+    return {
+      active:2,
+      // 使用权人列表
+      syqrlist:[
+        {
+          shyqrdbxm :'测试测试',
+          shyqrdbzjhm :'12324648564',
+          nhdm :'777888999',
+        }
+      ],
+      form:{}
+    };
+  },
+  created(){
+    let data = this.$route.query.res;
+    this.form = JSON.parse(localStorage.getItem("zjdzdxxItem"));
+    console.info(this.form);
+    this.onSubmitzjd();
+  },
+  mounted(){
+
+  },
+  methods: {
+    onSubmitzjd(){
+      setTimeout(() => {
+        this.$refs.zjdProductResh.drawingPaceCountryDarw();
+      }, 500);
+    },
+    submitzjd(){
+      updateZjdzd(this.form).then(response => {
+        let _this =this
+        this.$toast({
+          icon: 'success', // 找到自己需要的图标
+          message: '保存成功',
+          duration:"1000",
+          onClose:function(){
+            _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+          }
+        })
+      });
+    },
+    guidProduct(){
+      return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0,
+          v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    },
+    /** 查找地图中定位点 */
+    MapTag: function (data) {
+      this.$refs[this.zjdProductResh].drawingPaceCountryDarw();
+    },
+    goBack(){
+      if(this.ztMap && this.enterMap ==1){
+        if(this.form.id == null){
+          this.backMap.backMapZjdAData.theGeom= "";
+        }else{
+          this.backMap.backMapZjdAData = this.form;
+        }
+        this.$cookies.set("search",this.backMap);
+      } else {
+        this.$cookies.set("search","");
+      }
+      this.$router.push({name:'homesteadList'});
+      // }
+    },
+  }
+}
+</script>
+
+<style scoped>
+>>> .bannerBg{
+  width: 100%;
+  color:#fff;
+  padding:10px;
+  background: linear-gradient(134deg,#7ac943 1%, #22b7f2);
+}
+>>> .van-hairline--bottom::after {
+  border-bottom-width: 0;
+}
+>>> .title:before
+{
+  content:"";
+  width: 6px;
+  height: 20PX;
+  background: #7ac943;
+  border-radius: 3px;
+  position:absolute;
+  left:0;
+  bottom:0;
+}
+>>> .delete-button {
+  height: 100%;
+}
+>>> .van-swipe-cell__wrapper{
+  margin-right:-3px;
+}
+>>> .label-class .van-collapse-item__title--expanded{
+  font-weight: bold;
+}
+</style>

src/views/sunVillage_info/list_multipleLotsNh.vue

@@ -81,9 +81,7 @@
 </template>
 
 <script>
-  import { listMultipleLotsNh, multipleLotsSecondSign } from "@/api/sunVillage_info/fixedAssets";
-  import {attachmentList, commonAttach, systemAttachment} from "@/api/sunVillage_info/fixedAssets";
-  import request from "@/utils/request";
+  import { listMultipleLotsNh, multipleLotsSecondSign, attachmentList, commonAttach, systemAttachment } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
   import signatureUploadSignature from "@/views/yinnong/signatureUploadSignature";
   import $ from "jquery";

src/views/sunVillage_info/statistical_report_edit.vue

@@ -55,14 +55,14 @@
                                         <div class="subclass">大豆种植</div>
                                         <div class="unit_munt">个</div>
                                         <div class="number_value">
-                                            <van-stepper v-model="stepperValue" /> 
+                                            <van-stepper v-model="stepperValue" />
                                         </div>
                                     </div>
                                     <div class="planting_flex">
                                         <div class="subclass">大豆种植</div>
                                         <div class="unit_munt">个</div>
                                         <div class="number_value">
-                                            <van-stepper v-model="stepperValue" /> 
+                                            <van-stepper v-model="stepperValue" />
                                         </div>
                                     </div>
 
@@ -73,14 +73,14 @@
                             <div class="type_project">各类合作社总数各类合</div>
                             <div class="unit_munt">个</div>
                             <div class="number_value">
-                                <van-stepper v-model="stepperValue" /> 
+                                <van-stepper v-model="stepperValue" />
                             </div>
                         </div>
                         <div class="industry_list">
                             <div class="type_project">牧业</div>
                             <div class="unit_munt">个</div>
                             <div class="number_value">
-                                <van-stepper v-model="stepperValue" /> 
+                                <van-stepper v-model="stepperValue" />
                             </div>
                         </div>
 
@@ -100,14 +100,14 @@
                                         <div class="subclass">大豆种植</div>
                                         <div class="unit_munt">个</div>
                                         <div class="number_value">
-                                            <van-stepper v-model="stepperValue" /> 
+                                            <van-stepper v-model="stepperValue" />
                                         </div>
                                     </div>
                                     <div class="planting_flex">
                                         <div class="subclass">大豆种植</div>
                                         <div class="unit_munt">个</div>
                                         <div class="number_value">
-                                            <van-stepper v-model="stepperValue" /> 
+                                            <van-stepper v-model="stepperValue" />
                                         </div>
                                     </div>
 
@@ -118,14 +118,14 @@
                             <div class="type_project">各类合作社总数各类合</div>
                             <div class="unit_munt">个</div>
                             <div class="number_value">
-                                <van-stepper v-model="stepperValue" /> 
+                                <van-stepper v-model="stepperValue" />
                             </div>
                         </div>
                         <div class="industry_list">
                             <div class="type_project">牧业</div>
                             <div class="unit_munt">个</div>
                             <div class="number_value">
-                                <van-stepper v-model="stepperValue" /> 
+                                <van-stepper v-model="stepperValue" />
                             </div>
                         </div>
 
@@ -158,12 +158,12 @@
                                             <div class="subclass">{{val.projectName}}</div>
                                             <div class="unit_munt">{{val.measuringUnit}}</div>
                                             <div class="number_value">
-                                                <!-- <van-stepper v-model="val.currentYearNumber"   min="0"/> 
+                                                <!-- <van-stepper v-model="val.currentYearNumber"   min="0"/>
                                                 <input type=""> -->
                                                 <van-field v-model="val.currentYearNumber" type="number" />
                                             </div>
                                         </div>
-                               
+
 
                                     </div>
                                 </div>
@@ -179,11 +179,11 @@
 
 
                         </div>
-           
+
 
                     </div>
                 </div>
-                
+
             </div>
         </div>
 
@@ -246,8 +246,8 @@ export default {
             updateBy:null,
             updateTime:null,
             templateName:null,  //模板名称
-            declarationTypeId:null, //申报类型 1 
-            principalName:null, //单位负责人  1 
+            declarationTypeId:null, //申报类型 1
+            principalName:null, //单位负责人  1
             preparer:null, //填表人  1
             preparerDeptName:'', //填报单位 1
             time:this.format(new Date(),'yyyy-MM-dd'), //填报时间
@@ -276,9 +276,9 @@ export default {
             value: 'dictValue',
             children: 'children',
         }
-        
-        
-  
+
+
+
     };
   },
   created() {
@@ -291,7 +291,7 @@ export default {
             this.declarationTypeValue = content[0].dictLabel;
         }
 
- 
+
     });
   },
   mounted(){
@@ -305,7 +305,7 @@ export default {
         //編輯
         let oId = this.$route.query.id;
         entityStatisticsDetail(oId).then((res)=>{
-         
+
             if(res.code == 200){
                 let content = res.data;
                 // let obj = {
@@ -326,8 +326,8 @@ export default {
                 //     updateBy:content.updateBy,
                 //     updateTime:content.updateTime,
                 //     templateName:content.templateName,  //模板名称
-                //     declarationTypeId:content.declarationTypeId, //申报类型 1 
-                //     principalName:content.principalName, //单位负责人  1 
+                //     declarationTypeId:content.declarationTypeId, //申报类型 1
+                //     principalName:content.principalName, //单位负责人  1
                 //     preparer:content.preparer, //填表人  1
                 //     preparerDeptName:content.preparerDeptName, //填报单位 1
                 //     time:content.time,
@@ -349,11 +349,11 @@ export default {
                 this.from = res.data;
             }
 
-            
+
         })
     }
 
-    this.getDicts("newBusinessEntity_statistics_project").then(res => {
+    this.getDicts("statistics_template_type").then(res => {
         if(res.code == 200){
             let content = res.data;
             content.forEach((v)=>{
@@ -362,7 +362,7 @@ export default {
             this.statisticsProject = content;
         }
     });
-   
+
   },
   methods: {
     projectOnFinish(data){
@@ -380,7 +380,7 @@ export default {
         if(value.tabIndex == 0){
            //查看
             entityStatisticsTemplate({statisticsTypeId:value.selectedOptions[0].dictValue}).then((response)=>{
-                if(response.code == 200){ 
+                if(response.code == 200){
                     let content = response.data;
 
                     this.statisticsProject[Number(value.value)-1].children = content.map(item => {
@@ -396,9 +396,9 @@ export default {
                             })
                         }
                         recursionFileMap(item.tEntityStatisticsNumberList)
-             
-                        return { 
-                            dictLabel:item.templateName, 
+
+                        return {
+                            dictLabel:item.templateName,
                             dictValue: item.templateId,
                             templateForm:item,
                             // templateForm:{
@@ -423,7 +423,7 @@ export default {
                 message:'请选择模板!',
                 type: 'danger'
             });
-    
+
             return false;
         }else if(this.from.declarationTypeId == null){
             this.$notify({
@@ -448,7 +448,7 @@ export default {
                     this.$router.push('/sunVillage_info/statistical_report')
                 },1500)
             }
-            
+
         })
     },
     typeDeclarationClick(){
@@ -465,7 +465,7 @@ export default {
     templateClick(){
         this.popObj.templateVisbile = true;
     }
-  
+
   },
 }
 </script>
@@ -499,7 +499,7 @@ export default {
            top: 36px;
        }
 
-    
+
    }
    .template_main{
         padding:30px 24px 0;
@@ -535,7 +535,7 @@ export default {
             align-items: center;
             justify-content: space-between;
 
-         
+
             .title{
                 width: 465px;
                 height: 64px;
@@ -553,7 +553,7 @@ export default {
                 background-size: 100% 100%;
             }
 
-            
+
         }
    }
    .choose_main{
@@ -605,7 +605,7 @@ export default {
                 }
             }
         }
-        
+
    }
    .table_main{
         padding:0px  24px 0 24px;
@@ -701,11 +701,11 @@ export default {
                            .van-cell {
                                 padding:20px 16px;
                                 background: none;
-                            
+
                            }
-                           
-                            
-                        
+
+
+
                         }
 
 
@@ -782,7 +782,7 @@ export default {
 
 
                     }
-                  
+
                 }
             }
         }

src/views/yinnong/homestead/supervision/supervisionAdd.vue

@@ -38,6 +38,16 @@
         :on-remote-response="'data'"
       />
       <van-field v-model="jgList.shyqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <field-select
+        v-model="jgList.shangbaoId"
+        label="关联任务"
+        value-key="surveyName"
+        data-key="id"
+        placeholder="选择关联任务"
+        :rules="[{ required: true }]"
+        :columns="shangbaoList"
+        :clearable="true"
+      />
     </div>
       <p class="main_title">违法信息</p>
       <div class="main_box">
@@ -98,7 +108,7 @@
 </template>
 
 <script>
-  import { jgAdd,getShyqrs } from "@/api/onlineHome/homestead/reporting";
+import {jgAdd, getShyqrs, listHomeuseshangbao} from "@/api/onlineHome/homestead/reporting";
   import FieldSelect from "@/components/form/FieldSelect";
   import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
   import FieldDatePicker from "@/components/form/FieldDatePicker";
@@ -122,7 +132,9 @@
         maxDate: new Date(2025, 10, 1),
         currentDate: new Date(),
         deptId:this.$store.state.user.loginDeptId,
-        jgList:{},
+        jgList:{
+          shangbaoId: null,
+        },
         getObligeeOptions:[],
         sfzjjzw:'',
         jglx:'',
@@ -131,11 +143,12 @@
         wfydlxDictionaries:[],
         jglxDictionaries:[],
         sysDictionaries:[],
-
+        shangbaoList: [],
       };
     },
     created() {
       this.getDictionaries();
+      this.getShangbaoList();
     },
     methods: {
       getDictionaries(){
@@ -273,7 +286,12 @@
       },
       goBack(){
         window.history.go(-1)
-      }
+      },
+      getShangbaoList() {
+        listHomeuseshangbao({deptId: this.$store.state.user.loginDeptId, surveyStatus: '0'}).then((resp) => {
+          this.shangbaoList = resp.rows;
+        });
+      },
     },
   }
 </script>

src/views/yinnong/homestead/supervision/supervisionCloseCase.vue

@@ -25,6 +25,7 @@
         />
         <van-field readonly label="使用权人证件号码" v-model="jgList.shyqrzjhm" input-align="right"/>
         <van-field readonly label="宅基地代码" v-model="jgList.zjddm" input-align="right" label-width="auto"/>
+        <van-field readonly label="关联任务" :value="jgList.surveyName" input-align="right"/>
         <field-select
           v-model="jgList.jglx"
           label="监管类型"

src/views/yinnong/homestead/supervision/supervisionDetail.vue

@@ -25,6 +25,7 @@
         />
         <van-field readonly label="使用权人证件号码" v-model="jgList.shyqrzjhm" input-align="right"/>
         <van-field readonly label="宅基地代码" v-model="jgList.zjddm" input-align="right" label-width="auto"/>
+        <van-field readonly label="关联任务" :value="jgList.surveyName" input-align="right"/>
       </div>
       <p class="main_title">违法信息</p>
       <div class="main_box">

src/views/yinnong/homestead/supervision/supervisionModify.vue

@@ -38,6 +38,16 @@
         :on-remote-response="'data'"
       />
       <van-field v-model="jgList.shyqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <field-select
+        v-model="jgList.shangbaoId"
+        label="关联任务"
+        value-key="surveyName"
+        data-key="id"
+        placeholder="选择关联任务"
+        :rules="[{ required: true }]"
+        :columns="shangbaoList"
+        :clearable="true"
+      />
     </div>
     <p class="main_title">执法情况</p>
     <field-select
@@ -138,7 +148,7 @@
 </template>
 
 <script>
-  import { jgAdd,getShyqrs,getJg,jgEdit} from "@/api/onlineHome/homestead/reporting";
+import {jgAdd, getShyqrs, getJg, jgEdit, listHomeuseshangbao} from "@/api/onlineHome/homestead/reporting";
   import FieldSelect from "@/components/form/FieldSelect";
   import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
   import FieldDatePicker from "@/components/form/FieldDatePicker";
@@ -171,12 +181,13 @@
         wfydlxDictionaries:[],
         jglxDictionaries:[],
         sysDictionaries:[],
-
+        shangbaoList: [],
       };
     },
     created() {
       this.getDictionaries();
       this.getTaskGet();
+      this.getShangbaoList();
     },
     methods: {
       getTaskGet(){
@@ -316,7 +327,12 @@
       },
       goBack(){
         window.history.go(-1)
-      }
+      },
+      getShangbaoList() {
+        listHomeuseshangbao({deptId: this.$store.state.user.loginDeptId, surveyStatus: '0'}).then((resp) => {
+          this.shangbaoList = resp.rows;
+        });
+      },
     },
   }
 </script>

src/views/yinnong/homestead/supervision/supervisionWfxx.vue

@@ -25,6 +25,7 @@
         />
         <van-field readonly label="使用权人证件号码" v-model="jgList.shyqrzjhm" input-align="right"/>
         <van-field readonly label="宅基地代码" v-model="jgList.zjddm" input-align="right" label-width="auto"/>
+        <van-field readonly label="关联任务" :value="jgList.surveyName" input-align="right"/>
         <p class="main_title">违法信息</p>
         <div class="main_box">
           <van-field

打包.bat

@@ -1,14 +1,18 @@
 @echo off
 
-D:
-cd D:\workspace\code\nsgk_mobile
+@echo 开始打包App......
 
+call :extract %0
+goto :eof
+:extract
 
+rem 进入项目根目录
+@echo 进入项目根目录: %~dp1
+%~d1
+cd %~dp1
 
+call npm run build
 
-:: 鎵撳寘棰勫彂甯冪幆澧�
-npm run build
+@echo 打包成功
 
-
-@echo SUCCESS
-pause
+@pause