宅基地调查优化

src/components/house/CommonMap.vue

@@ -314,6 +314,69 @@ export default {
       });
       return true;
     },
+
+    addLayerNew(name, theGeom,tcmc,status) {
+      if(!this.mapObject)
+        return false;
+      let css =  null;
+      if(tcmc === "zjdzdxx"){
+        if(status === "1"){
+          css = "#F9F900";
+        }else if(status === "2"){
+          css = "#FF8000";
+        }else if(status === "3"){
+          css = "#82D900";
+        }else if(status === "4"){
+          css = "#F75000";
+        }else{
+          css = "#9F4D95";
+        }
+      }else if(tcmc === "fsss"){
+          css = "#FF8C00";
+      }else{
+          css =  "#47c68f";
+      }
+      //地图只加载一次
+      //加载地图编辑
+      //图层查询定位开始 ---------start
+      console.info(css);
+      let hc_land = new ol.layer.Vector({
+        title: name,
+        source: new ol.source.Vector({
+          projection: this.getProjection(),
+          features: new ol.format.GeoJSON().readFeatures("{\n" +
+            "    \"type\": \"Feature\",\n" +
+            "    \"geometry\":" + theGeom + "}"),
+        }),
+        style: new ol.style.Style({
+          fill: new ol.style.Fill({
+            //矢量图层填充颜色，以及透明度
+            color: "rgba(204, 255, 204,0.3)",
+          }),
+          stroke: new ol.style.Stroke({
+            //边界样式
+            color: css,
+            width: 3,
+          }),
+        }),
+      });
+      if(!this.pushLayer(name, hc_land))
+        return false;
+      var maxXMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxX;
+      var maxYMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxY;
+      var minXMap = hc_land.values_.source.featuresRtree_.rbush_.data.minX;
+      var minYMap = hc_land.values_.source.featuresRtree_.rbush_.data.minY;
+      //定位查询位置
+      var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+      this.mapObject.getView().animate({
+        // 只设置需要的属性即可
+        center: center, // 中心点
+        zoom: 17.9, // 缩放级别
+        rotation: undefined, // 缩放完成view视图旋转弧度
+        duration: 1000, // 缩放持续时间，默认不需要设置
+      });
+      return true;
+    },
     update() {
       if(!this.mapObject)
         return;

src/views/homesteadSurvey/add.vue

@@ -977,7 +977,7 @@ export default {
       if(!map) return;
       if(data)
       {
-        map.setLayer('pointDarwLayer', data);
+        map.addLayerNew('pointDarwLayer',data,"zjdzdxx",this.form.surveyStatus);
       }
       else {
         this.getLandCoord((lng, lat) => {

src/views/homesteadSurvey/fsssAdd.vue

@@ -115,6 +115,7 @@
           v-model="form.remark"
           name="备注"
           label="备注"
+          placeholder="备注"
           maxlength="50"
           autocomplete="off"
         />
@@ -183,6 +184,7 @@ export default {
     let data = this.$route.query;
     this.form = data;
     this.permission = localStorage.getItem("executePermission");
+    this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
     if(this.form.id == null){
       this.$set(this.form, 'fssslx', "11");
       this.$set(this.form, 'sfzsy', "1");
@@ -253,11 +255,11 @@ export default {
       if(data)
       {
         map.setLayer('pointDarwLayer', data);
+        console.info(this.zjdzdxx.surveyStatus);
+        map.addLayerNew('pointDarwLayer3', this.zjdzdxx.theGeomJson,"zjdzdxx",this.zjdzdxx.surveyStatus);
       }
       else {
-        this.getLandCoord((lng, lat) => {
-          map.setCoord(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
-        });
+        map.addLayerNew('pointDarwLayer3', this.zjdzdxx.theGeomJson,"zjdzdxx",this.zjdzdxx.surveyStatus);
       }
     },
     // 当地图绘制完成时

src/views/homesteadSurvey/index.vue

@@ -9,9 +9,10 @@
           src="https://img.yzcdn.cn/vant/leaf.jpg"
         />
         <div style="margin-left: 15px;">
-          <p style="font-size: 16px;" v-if="businessLevel=='1'">调查员·采集员</p>
-          <p style="font-size: 16px;" v-if="businessLevel=='2'">审核员</p>
-          <p style="margin-top: 10px;font-size: 16px;">{{nickName}}</p>
+          <p style="margin-top: 10px;font-size: 16px;">{{nickName}}
+            <span style="font-size: 16px;" v-if="businessLevel=='1'">·调查员</span>
+            <span style="font-size: 16px;" v-if="businessLevel=='2'">·审核员</span>
+          </p>
         </div>
         <van-icon name="setting-o" style="margin-left: auto;" @click="gotoLink" size="25"/>
       </div>
@@ -224,6 +225,7 @@
         })
         if(this.checked){
           let userId = this.$store.getters.userId;
+          this.nickName = this.$store.getters.nickName;
           this.$set(this.queryParams, "rwzxr", userId);
           this.getList();
         }else{

src/views/homesteadSurvey/list.vue

@@ -52,13 +52,14 @@
           </p>
         </div>
       </div>
+      <van-search v-model="zjdvalue" placeholder="请输入宅基地代码或农户姓名" show-action @search="onSearchzjd"  style="padding-top: 0;padding-bottom: 0;">
+        <template #action>
+          <van-icon name="add" color="rgba(122,201,67,1)" size=".8rem" @click="onClickzjd" style="vertical-align:middle;"/>
+        </template>
+      </van-search>
     </van-sticky>
-    <van-search v-model="zjdvalue" placeholder="请输入宅基地代码或农户姓名" show-action @search="onSearchzjd"  style="padding-top: 0;padding-bottom: 0;">
-      <template #action>
-        <van-icon name="add" color="rgba(122,201,67,1)" size=".8rem" @click="onClickzjd" style="vertical-align:middle;"/>
-      </template>
-    </van-search>
-    <van-tabs v-model="active" title-active-color="#7AC943" color="#7AC943" @click="getZjdList">
+
+    <van-tabs sticky offset-top="185%" v-model="active" title-active-color="#7AC943" color="#7AC943" @click="getZjdList">
       <van-tab v-for="(item,index) in surveyStatusOptions" >
         <template #title>
 

src/views/homesteadSurvey/list2.vue

@@ -50,12 +50,13 @@
           </p>
         </div>
       </div>
+      <van-search  v-model="nhvalue" placeholder="请输入农户姓名或证件号" show-action @search="onSearchnh">
+        <template #action>
+          <van-icon name="add" color="rgba(122,201,67,1)" size=".8rem" @click="onClicknh" style="vertical-align:middle;"/>
+        </template>
+      </van-search>
     </van-sticky>
-    <van-search v-model="nhvalue" placeholder="请输入农户姓名或证件号" show-action @search="onSearchnh">
-      <template #action>
-        <van-icon name="add" color="rgba(122,201,67,1)" size=".8rem" @click="onClicknh" style="vertical-align:middle;"/>
-      </template>
-    </van-search>
+
 <!--<van-pull-refresh v-model="isLoadingnh" @refresh="onRefreshnh">-->
     <van-list
       v-model:loading="loading2"

src/views/homesteadSurvey/list4.vue

@@ -26,37 +26,27 @@
             <van-col span="12"><van-button type="primary" style="width:100px;" round  @click="submitUploadList">上传</van-button></van-col>
           </van-row>
         </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="$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="$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="$router.push({path:'/homesteadSurvey/list3'})">
-              <van-icon size=".3rem" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn3'+(activeBtn!=3?'3':'')+'.png')" />
-              所有权人
-            </div>
-            <div :class="{activeBtn : activeBtn==4,disactiveBtn :activeBtn!=4 }"  @click="activeBtn=4,mapShow()">
-              <van-icon size=".3rem" style="vertical-align:middle;" :name="require('../../assets/images/housesteadSurvey/btn4'+(activeBtn!=4?'4':'')+'.png')" />
-              切换地图
-            </div>
-          </div>
+        <div style="display:flex;width:95%;margin:0 auto;justify-content:space-between;padding: 0px 0 15px">
+          <div :class="{activeBtn : activeBtn==1,disactiveBtn :activeBtn!=1 }" @click="$router.push({path:'/homesteadSurvey/list'})">入户核查</div>
+          <div :class="{activeBtn : activeBtn==2,disactiveBtn :activeBtn!=2 }" @click="$router.push({path:'/homesteadSurvey/list2'})">农户信息</div>
+          <div :class="{activeBtn : activeBtn==3,disactiveBtn :activeBtn!=3 }" @click="$router.push({path:'/homesteadSurvey/list3'})">所有权人</div>
+          <div :class="{activeBtn : activeBtn==4,disactiveBtn :activeBtn!=4 }" @click="$router.push({path:'/homesteadSurvey/list4'})">切换地图</div>
         </div>
       </div>
-      <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(250, 83, 83);line-height:.8rem;">{{qbNums}} <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(250, 83, 83);line-height:.8rem">{{totalR}} <span style="font-size:12px;">人</span></span>
-          </div>
+      <div style="background:#fff;padding:10px 2.5%;display: flex;justify-content: space-between;">
+        <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 style="font-size:16px;color: #448815;">{{qbNums}}</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 style="font-size:16px;color: #448815;">{{totalR}}</span> 人</span>
+          </p>
         </div>
       </div>
     </van-sticky>
@@ -570,38 +560,38 @@
             <van-checkbox-group v-model="checked"  ref="checkboxGroup">
               <van-checkbox name="zjdDdc" shape="square" style="margin-bottom: 5px;" id="zjdDdc">
                 <template #default>
-                  待<i style="margin-right: 0.5em;"></i>调<i style="margin-right: 0.5em;"></i>查<span style="display: inline-block;background: #F9F900;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                  待<i style="margin-right: 0.5em;"></i>调<i style="margin-right: 0.5em;"></i>查<span style="display: inline-block;border:2px solid #F9F900;height: 10px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
               <van-checkbox name="zjdDcyc" shape="square" style="margin-bottom: 5px;" id="zjdDcyc">
                 <template #default>
-                  调查异常<span style="display: inline-block;background: #FF8000;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                  调查异常<span style="display: inline-block;border:2px solid #FF8000;height: 10px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
               <van-checkbox name="zjdDcwc" shape="square" style="margin-bottom: 5px;" id="zjdDcwc">
                 <template #default>
-                  调查完成<span style="display: inline-block;background: #82D900;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                  调查完成<span style="display: inline-block;border:2px solid #82D900;height: 10px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
               <van-checkbox name="zjdDcbh" shape="square" style="margin-bottom: 5px;" id="zjdDcbh">
                 <template #default>
-                  调查驳回<span style="display: inline-block;background: #F75000;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                  调查驳回<span style="display: inline-block;border:2px solid #F75000;height: 10px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
               <van-checkbox name="zjdSptg" shape="square" style="margin-bottom: 5px;" id="zjdSptg">
                 <template #default>
-                  审批通过<span style="display: inline-block;background: #9F4D95;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                  审批通过<span style="display: inline-block;border:2px solid #9F4D95;height: 10px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
               <van-checkbox name="fsssSx" shape="square" style="margin-bottom: 5px;" id="fsssSx">
                 <template #default>
-                  附属设施<span style="display: inline-block;background: #FF8C00;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                  附属设施<span style="display: inline-block;background: #FF8C00;opacity: 0.5;height: 10px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
 
               <van-checkbox name="zrzSx" shape="square" style="margin-bottom: 5px;" id="zrzSx">
                 <template #default>
-                  自<i style="margin-right: 0.5em;"></i>然<i style="margin-right: 0.5em;"></i>幢<span style="display: inline-block;background: #00FA9A;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
+                  自<i style="margin-right: 0.5em;"></i>然<i style="margin-right: 0.5em;"></i>幢<span style="display: inline-block;background: #00FA9A;opacity: 0.5;height: 10px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
 
@@ -5837,6 +5827,7 @@
                 //this.$cookies.set("search",this.mapZjdTeAll);
                 this.$cookies.set("search","")
                 console.info(this.mapZjdTeAll);
+                localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZjdAData));
                 this.$router.push({path:'/homesteadSurvey/zrzAdd',query: this.mapZjdTeAll.mapZrzAData});
               } else {
                 this.$toast("必须有宅基地数据才能进入自然幢核查");
@@ -5846,6 +5837,7 @@
                 this.mapZjdTeAll.active = 4;
                 //this.$cookies.set("search", this.mapZjdTeAll);
                 this.$cookies.set("search","")
+                localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZjdAData));
                 this.$router.push({path: '/homesteadSurvey/fsssAdd',query: this.mapZjdTeAll.mapFsssAData});
               } else {
                 this.$toast("必须有宅基地数据才能进入附属设施核查");
@@ -6070,25 +6062,23 @@
   }
   .activeBtn{
     background:#fff;
-    height:50px;
-    border-radius:25px;
+    border-radius:25PX;
     color:#7AC943;
-    line-height:50px;
+    line-height:30PX;
     text-align:center;
-    font-size:20px;
-    width: 26%;
+    font-size:14PX;
+    width: 25%;
     margin:0 10px;
     box-shadow: 0px 5px 6px 0px rgba(0,0,0,0.16);
   }
   .disactiveBtn{
     background:rgba(255,255,255,.4);
-    height:50px;
-    border-radius:25px;
+    border-radius:25PX;
     color:#fff;
-    line-height:50px;
+    line-height:30PX;
     text-align:center;
-    font-size:20px;
-    width: 26%;
+    font-size:14PX;
+    width: 25%;
     margin:0 10px;
     box-shadow: 0px 5px 6px 0px rgba(0,0,0,0.16);
   }

src/views/homesteadSurvey/nmfwAdd.vue

@@ -60,6 +60,7 @@
           v-model="form.nmfwzh"
           name="房屋幢号"
           label="房屋幢号"
+          placeholder="房屋幢号"
           maxlength="50"
           autocomplete="off"
           :rules="[{ required: true }]"
@@ -92,6 +93,7 @@
           v-model="form.sjcs"
           name="实际层数"
           label="实际层数"
+          placeholder="实际层数"
           maxlength="50"
           autocomplete="off"
           type="number"
@@ -101,6 +103,7 @@
           v-model="form.hh"
           name="户号"
           label="户号"
+          placeholder="户号"
           maxlength="50"
           autocomplete="off"
         />
@@ -179,6 +182,7 @@
           v-model="form.zl"
           name="坐落"
           label="坐落"
+          placeholder="坐落"
           maxlength="50"
           autocomplete="off"
           :rules="[{ required: true }]"
@@ -198,6 +202,7 @@
           v-model="form.bz"
           name="备注"
           label="备注"
+          placeholder="备注"
           maxlength="50"
           autocomplete="off"
         />
@@ -207,6 +212,7 @@
           v-model="form.bdcdyh"
           name="不动产单元号"
           label="不动产单元号"
+          placeholder="不动产单元号"
           maxlength="50"
           autocomplete="off"
         />
@@ -215,6 +221,7 @@
           v-model="form.fwbm"
           name="房屋编码"
           label="房屋编码"
+          placeholder="房屋编码"
           maxlength="50"
           autocomplete="off"
         />
@@ -223,6 +230,7 @@
           v-model="form.zrzh"
           name="自然幢号"
           label="自然幢号"
+          placeholder="自然幢号"
           maxlength="50"
           autocomplete="off"
         />
@@ -231,6 +239,7 @@
           v-model="form.ch"
           name="层号"
           label="层号"
+          placeholder="层号"
           maxlength="50"
           autocomplete="off"
         />
@@ -239,6 +248,7 @@
           v-model="form.sjc"
           name="实际层"
           label="实际层"
+          placeholder="实际层"
           maxlength="50"
           autocomplete="off"
           type="number"
@@ -248,6 +258,7 @@
           v-model="form.myc"
           name="名义层"
           label="名义层"
+          placeholder="名义层"
           maxlength="50"
           autocomplete="off"
           type="number"

src/views/homesteadSurvey/settle.vue

@@ -19,7 +19,10 @@
       </template>
 
     </van-cell>-->
-
+    <div @click="userMessage" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;display: flex;align-items: center;">
+      <van-icon :name="require('../../assets/images/housesteadSurvey/btn3.png')" size="18"/>
+      <p style="font-size: 14px;color: #666666;margin-left: 5px;">个人信息</p>
+    </div>
     <div @click="showPassword=true,oldPassword='',newPassword='',confirmPassword='' " style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;display: flex;align-items: center;">
       <van-icon :name="require('../../assets/images/housesteadSurvey/btn2.png')" size="18"/>
       <p style="font-size: 14px;color: #666666;margin-left: 5px;">修改密码</p>
@@ -45,6 +48,16 @@
         </van-row>
       </van-cell-group>
     </van-popup>
+
+    <van-popup v-model:show="showMessage" position="bottom" style="width:100%;padding:20px;">
+      <van-cell-group >
+        <van-field v-model="userName" label="账号"  readonly />
+        <van-field v-model="nickName" label="昵称" readonly/>
+        <van-row style="text-align: center;margin-top: 40px">
+          <van-button round block color="#7AC943" @click="submit">保存</van-button>
+        </van-row>
+      </van-cell-group>
+    </van-popup>
     <van-popup v-model:show="showUpload" position="bottom" style="width:100%;padding:20px;">
       <van-cell center title="批量上传">
         <template #right-icon>
@@ -64,6 +77,10 @@
       data(){
           return{
             showPassword:false,
+            showMessage:false,
+            userName:null,
+            nickName:null,
+            jsName:null,
             oldPassword: "",
             newPassword: "",
             confirmPassword: "",
@@ -83,6 +100,11 @@
             this.$cookies.set("upload",0)
           }
 
+        },
+        userMessage(){
+          this.userName = this.$store.getters.name;
+          this.nickName = this.$store.getters.nickName;
+          this.showMessage = true;
         },
           submit() {
             if(this.confirmPassword

src/views/homesteadSurvey/zrzAdd.vue

@@ -79,6 +79,7 @@
           v-model="form.zrzh"
           name="自然幢号"
           label="自然幢号"
+          placeholder="自然幢号"
           maxlength="50"
           autocomplete="off"
         />
@@ -172,6 +173,7 @@
           v-model="form.bz"
           name="备注"
           label="备注"
+          placeholder="备注"
           maxlength="50"
           autocomplete="off"
         />
@@ -237,8 +239,8 @@ export default {
   },
   created(){
     let data = this.$route.query;
-    console.info(data)
     this.form = data;
+    this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
     this.permission = localStorage.getItem("executePermission");
     if(this.form.shyqrdbzjhm != null){
       this.getList();
@@ -310,11 +312,13 @@ export default {
       if(data)
       {
         map.setLayer('pointDarwLayer', data);
+        map.addLayerNew('pointDarwLayer2', this.zjdzdxx.theGeomJson,"zjdzdxx",this.zjdzdxx.surveyStatus);
       }
       else {
-        this.getLandCoord((lng, lat) => {
-          map.setCoord(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
-        });
+        // this.getLandCoord((lng, lat) => {
+        //   map.setCoord(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+        // });
+        map.addLayerNew('pointDarwLayer2', this.zjdzdxx.theGeomJson,"zjdzdxx",this.zjdzdxx.surveyStatus);
       }
     },
     // 当地图绘制完成时