宅基地调查

src/router/index.js

@@ -2794,6 +2794,33 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/homesteadSurvey/list'], resolve)
   },
+  {
+    path: '/homesteadSurvey/list2',
+    name: 'homesteadList2',
+    meta: {
+      title: '宅基地调查',
+      hidden: true
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/list2'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/list3',
+    name: 'homesteadList3',
+    meta: {
+      title: '宅基地调查',
+      hidden: true
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/list3'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/list4',
+    name: 'homesteadList4',
+    meta: {
+      title: '宅基地调查',
+      hidden: true
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/list4'], resolve)
+  },
   {
     path: '/homesteadSurvey/add',
     name: 'homesteadAdd',
@@ -2803,6 +2830,33 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/homesteadSurvey/add'], resolve)
   },
+  {
+    path: '/homesteadSurvey/add2',
+    name: 'homesteadAdd2',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/add2'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/add3',
+    name: 'homesteadAdd3',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/add3'], resolve)
+  },
+  {
+    path: '/homesteadSurvey/add4',
+    name: 'homesteadAdd4',
+    meta: {
+      title: '宅基地调查',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/homesteadSurvey/add4'], resolve)
+  },
   {
     path: '/homesteadSurvey/settle',
     name: 'homesteadSettle',

src/views/homesteadLogin.vue

@@ -2,56 +2,74 @@
   <div class="app-container" style="overflow:auto;">
     <div style="width:100%;max-width:500px;margin:0 auto;">
       <div class="title">
-        <img  width="150" height="150" style="display: block;margin-right: 10px;margin: 20px auto;" src="../assets/images/housesteadSurvey/logo.png" alt="">
-        <p style="text-align:center;font-size:40px;">农村宅基地调查</p>
+        <img  width="100" height="100" style="display: block;margin-right: 10px;margin: 20px auto;" src="../assets/images/housesteadSurvey/logo.png" alt="">
+        <p style="text-align:center;font-size:26px;font-weight: bold;">农村宅基地调查</p>
       </div>
           <van-form>
-            <div style="width: 90%;
-            max-widht:462px;
-            border-radius: 45px;
-            box-shadow: 2px 10px 10px 0px rgba(125,125,125,0.16);padding: 10px 30px; margin:40px 20px; ">
+            <div style="
+              width: 90%;
+              max-widht:462px;
+              border-radius: 45px;
+              box-shadow: 2px 10px 10px 0px rgba(125,125,125,0.16);
+              padding: 5px 0;
+              margin:40px 20px 0;
+              background: #fff;
+              overflow: hidden;
+            "
+            >
             <van-field
               v-model="formData.username"
               placeholder="请输入账号"
               left-icon="manager"
               color="#bfbfbf"
-              input-align="center"
               :rules="[{ required: true, message:''  }]"
             />
             </div>
-            <div style="width: 90%;
-            max-widht:462px;
+            <div style="
+              width: 90%;
+              max-widht:462px;
               border-radius: 45px;
-              box-shadow: 2px 10px 10px 0px rgba(125,125,125,0.16);padding: 10px 30px; margin:40px 20px;  ">
+              box-shadow: 2px 10px 10px 0px rgba(125,125,125,0.16);
+              padding: 5px 0px;
+              margin:20px 20px 10px;
+              background: #fff;
+              overflow: hidden;
+            "
+            >
             <van-field
               v-model="formData.password"
               type="password"
               placeholder="请输入密码"
               left-icon="lock"
               color="#bfbfbf"
-              input-align="center"
               :rules="[{ required: true, message:''  }]"
             />
             </div>
-            <div style="width: 90%;
-            max-widht:462px;
-              border-radius: 45px;
-              box-shadow: 2px 10px 10px 0px rgba(125,125,125,0.16);padding: 10px 30px; margin:40px 20px 10px; " class="codeDiv">
-            <van-field
-              v-model="formData.code"
-              center
-              clearable
-              input-align="center"
-              placeholder="图形验证码"
-            >
-              <template #label>
-                <img style="width: 90px" :src="codeUrl" @click="getCode"  />
-              </template>
-            </van-field>
+            <div style="width: 90%;margin: 15px auto 20px;display:flex;justify-content: end;">
+              <van-checkbox v-model="formData.rememberMe">{{showMessage ? "记住手机号" : "记住密码"}}</van-checkbox>
+            </div>
+            <div style="display: flex;align-items: center;justify-content: space-between;width: 90%;margin: 0 auto;">
+              <div style="width: 60%;
+                max-widht:462px;
+                border-radius: 45px;
+                box-shadow: 2px 10px 10px 0px rgba(125,125,125,0.16);
+                padding: 5px 0px;
+                background: #fff;
+                overflow: hidden;"
+                class="codeDiv"
+              >
+                <van-field
+                  v-model="formData.code"
+                  center
+                  clearable
+                  placeholder="图形验证码"
+                >
+                </van-field>
+              </div>
+              <img style="width: 35%;" :src="codeUrl" @click="getCode"  />
             </div>
-            <van-checkbox style="margin-bottom: 10px;float: left;margin-top:10px;margin-left:20px;" v-model="formData.rememberMe" shape="square">{{showMessage ? "记住手机号" : "记住密码"}}</van-checkbox>
-            <div style="margin: 10px 5px 5px;padding:10px">
-              <van-button block round size="large" :color="formData.username!=''&&formData.password!=''?'#7AC943':'#e2e2e2'" :disabled="formData.username==''||formData.password==''" native-type="submit" @click="handleLogin">登录</van-button>
+            <div style="margin: 50px auto;font-weight: bold;width: 90%;">
+              <van-button block round size="large" :color="formData.username!=''&&formData.password!=''?'#7AC943':'#e2e2e2'" :disabled="formData.username==''||formData.password==''" native-type="submit" @click="handleLogin">登 入</van-button>
             </div>
           </van-form>
     </div>
@@ -83,7 +101,7 @@
 </template>
 <style scoped>
   .app-container{
-    background: #fff;
+    background: #F6F6F6;
     height: 100vh;
   }
   .title{
@@ -128,7 +146,9 @@
   .registerSmsBtn{
     color: rgb(29, 111, 233);
     font-size: 0.34rem;
-
+  }
+  /deep/ .van-field__left-icon{
+    margin-right: 10PX;
   }
 </style>
 <script>
@@ -250,8 +270,7 @@ export default {
         Cookies.remove("password");
         Cookies.remove("rememberMe");
       }
-        this.$store
-          .dispatch("Login", this.formData)
+        this.$store.dispatch("Login", this.formData)
           .then(() => {
             this.$router.push({ path: "/homesteadSurvey/index" }).catch(() => {});
           })

src/views/homesteadSurvey/add2.vue

@@ -0,0 +1,187 @@
+<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 #right>
+          <van-icon name="map-marked" 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>
+    <div style="margin:30px auto 0;width: 95%;">
+      <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">使用权人</p>
+    </div>
+    <van-swipe-cell v-for="(item,index) in syqrlist" :key="'syqr'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;background:#fff;">
+      <div style="padding:15px;">
+        <p style="display: flex;align-items: center;">
+          <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
+          <span style="line-height: 1;font-size: 16px;">{{item.shyqrdbxm}}</span>
+        </p>
+        <div style="display:flex;line-height:20px;margin-top: 15px;font-size: 14px;color: #999999;">
+          <p style="flex:1;text-align:left;">证件号码:</p>
+          <p  style="flex:1;text-align:right;">{{item.shyqrdbzjhm}}</p>
+        </div>
+        <div style="display:flex;line-height:20px;margin-top: 5px;font-size: 14px;color: #999999;">
+          <p style="flex:1;text-align:left;">农户代码:</p>
+          <p style="flex:1;text-align:right;">{{item.nhdm}}</p>
+        </div>
+        <div style="text-align:center;overflow:auto;display: flex;justify-content: space-between;margin-top: 10px;">
+          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnh(item)">
+            <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
+            <span style="font-size: 14px;color: #fff;margin-left: 5px;">户主</span>
+          </p>
+          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: rgba(34,183,242,0.14);padding: 3px 0;border-radius: 50px;" @click="showPopupsyqr(item)">
+            <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">使用权人</span>
+          </p>
+          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopuphncylist(item)">
+            <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">成员</span>
+          </p>
+        </div>
+      </div>
+      <template #right>
+        <van-button square text="删除" type="danger" class="delete-button" @click="deletesyqr(item.id,index)"/>
+      </template>
+    </van-swipe-cell>
+
+    <div style=" width:95%;margin:20px auto;display: flex;justify-content: space-between;">
+      <div style="width:49%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
+        <p style="font-size: 16px;" @click="showPopupsyqr('')">+ 添加使用权人</p>
+      </div>
+      <div style="width:49%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
+        <p style="font-size: 16px;" @click="showPopupnh('')">+ 添加农户信息</p>
+      </div>
+    </div>
+  </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 MapGisDrawing from "@/components/Map/MapGisDrawing";
+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: "homesteadAdd",
+  components: { MapGisDrawing,},
+  data() {
+    return {
+      active:2,
+      // 使用权人列表
+      syqrlist:[
+        {
+          shyqrdbxm :'测试测试',
+          shyqrdbzjhm :'12324648564',
+          nhdm :'777888999',
+        }
+      ],
+    };
+  },
+  created(){
+
+  },
+  mounted(){
+
+  },
+  methods: {
+    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'});
+      // }
+    },
+    showPopupsyqr(){},
+    showPopupnh(){},
+    showPopuphncylist(){},
+  }
+}
+</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/homesteadSurvey/add3.vue

@@ -0,0 +1,178 @@
+<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 #right>
+          <van-icon name="map-marked" 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>
+    <div style="margin:30px auto 0;width: 95%;">
+      <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">自然幢</p>
+    </div>
+      <van-swipe-cell v-for="(item,index) in zrzlist" :key="'zrz'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;background:#fff;">
+        <div style="padding:15px;">
+          <p style="display: flex;align-items: center;">
+            <img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 5px;">
+            <span style="line-height: 1;font-size: 16px;">第{{index+1}}号</span>
+          </p>
+          <div style="display:flex;line-height:20px;margin-top: 15px;font-size: 14px;color: #999999;">
+            <p style="flex:1;text-align:left;">自然幢号:</p>
+            <p  style="flex:1;text-align:right;">{{item.zrzh}}</p>
+          </div>
+          <div style="display:flex;line-height:20px;margin-top: 5px;font-size: 14px;color: #999999;">
+            <p style="flex:1;text-align:left;">总层数:</p>
+            <p style="flex:1;text-align:right;">{{item.zcs}}</p>
+          </div>
+          <div style="text-align:center;overflow:auto;display: flex;justify-content: space-between;margin-top: 10px;">
+            <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnh(item)">
+              <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
+              <span style="font-size: 14px;color: #fff;margin-left: 5px;">自然幢信息</span>
+            </p>
+            <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopuphncylist(item)">
+              <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+              <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">房屋列表</span>
+            </p>
+          </div>
+        </div>
+        <template #right>
+          <van-button square text="删除" type="danger" class="delete-button" @click="deletezrz(item,index)"/>
+        </template>
+      </van-swipe-cell>
+      <div style=" width:95%;margin:20px auto;display: flex;justify-content: center;">
+        <div style="width:100%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
+          <p style="font-size: 16px;">+ 添加自然幢信息</p>
+        </div>
+      </div>
+    </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 MapGisDrawing from "@/components/Map/MapGisDrawing";
+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: "homesteadAdd",
+  components: { MapGisDrawing,},
+  data() {
+    return {
+      active:3,
+      zrzlist:[
+        {
+          zrzh :'123',
+          zcs :'321654987'
+        }
+      ]
+    };
+  },
+  created(){
+
+  },
+  mounted(){
+
+  },
+  methods: {
+    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'});
+      // }
+    },
+    showPopupzrz(){},
+    shownmfwlist(){},
+    deletezrz(){},
+    showPopupzrz(){},
+  }
+}
+</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/homesteadSurvey/add4.vue

@@ -0,0 +1,184 @@
+<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 #right>
+          <van-icon name="map-marked" 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>
+    <div style="margin:30px auto 0;width: 95%;">
+      <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-bottom: 5px;">附属设施</p>
+    </div>
+    <van-swipe-cell v-for="(item,index) in fssslist" :key="'fsss'+index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;background:#fff;">
+      <div style="padding:15px;">
+        <p style="display: flex;align-items: center;">
+          <img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 5px;">
+          <span style="line-height: 1;font-size: 16px;">{{item.fssslx}}</span>
+        </p>
+        <div style="display:flex;line-height:20px;margin-top: 15px;font-size: 14px;color: #999999;">
+          <p style="flex:1;text-align:left;">建筑面积(㎡):</p>
+          <p  style="flex:1;text-align:right;">{{item.jzmj}}</p>
+        </div>
+        <div style="display:flex;line-height:20px;margin-top: 5px;font-size: 14px;color: #999999;">
+          <p style="flex:1;text-align:left;">建筑物情况:</p>
+          <p style="flex:1;text-align:right;">{{item.jzwqk}}</p>
+        </div>
+        <div style="text-align:center;overflow:auto;display: flex;justify-content: center;margin-top: 10px;">
+          <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnh(item)">
+            <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
+            <span style="font-size: 14px;color: #fff;margin-left: 5px;">查看附属设施信息</span>
+          </p>
+        </div>
+      </div>
+      <template #right>
+        <van-button square text="删除" type="danger" class="delete-button" @click="deletefsss(item.id,index)"/>
+      </template>
+    </van-swipe-cell>
+    <div style=" width:95%;margin:20px auto;display: flex;justify-content: center;">
+      <div style="width:100%;text-align:center;overflow:auto;border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);padding: 15px 0px;background: #ffffff;color: #22B7F2;">
+        <p style="font-size: 16px;">+ 添加附属设施信息</p>
+      </div>
+    </div>
+    <div style="width:95%;margin:20px auto;text-align:center;overflow:auto;display: flex;justify-content: space-around;">
+      <p style="width:32%;border: 1px solid transparent;background: #FA5353;padding: 5px 0;border-radius: 50px;">
+        <span style="font-size: 14px;color: #fff;margin-left: 5px;">异常标记</span>
+      </p>
+      <p style="width:32%;border: 1px solid transparent;background: #22B7F2;padding: 5px 0;border-radius: 50px;">
+        <span style="font-size: 14px;color: #fff;margin-left: 5px;">签名确认</span>
+      </p>
+      <p style="width:32%;border: 1px solid #22B7F2;background: #ffffff;padding: 5px 0;border-radius: 50px;">
+        <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">调查审核</span>
+      </p>
+    </div>
+  </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 MapGisDrawing from "@/components/Map/MapGisDrawing";
+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: "homesteadAdd",
+  components: { MapGisDrawing,},
+  data() {
+    return {
+      active:4,
+      fssslist:[{
+        fssslx :'123',
+        jzmj :'123',
+        jzwqk:'123',
+      }]
+    };
+  },
+  created(){
+
+  },
+  mounted(){
+
+  },
+  methods: {
+    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'});
+      // }
+    },
+    showPopupzrz(){},
+    shownmfwlist(){},
+    deletezrz(){},
+    showPopupzrz(){},
+  }
+}
+</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/homesteadSurvey/index.vue

@@ -1,31 +1,24 @@
 <template>
   <div class="app-container">
-      <div style="width: 100%;
-    color:#fff;
-    padding:20px;
-    background: linear-gradient(134deg,#7ac943 1%, #22b7f2);">
-        <van-row>
-          <van-col span="6">
-            <van-image
-              width="60"
-              height="60"
-              round
-              src="https://img.yzcdn.cn/vant/leaf.jpg"
-            />
-          </van-col>
-          <van-col span="14">
-            <p style="margin-top: 10px;" v-if="businessLevel=='1'">调查员.采集员</p>
-            <p style="margin-top: 10px;" v-if="businessLevel=='2'">审核员</p>
-            <p>{{nickName}}</p>
-          </van-col>
-          <van-col span="2" style="text-align:center;">
-            <van-icon name="setting-o" style="margin-top:10px" @click="gotoLink" size="30"/>
-          </van-col>
-        </van-row>
+    <div style="width: 100%;color:#fff;padding:15px 0;background: linear-gradient(134deg,#7ac943 1%, #22b7f2);">
+      <div style="width: 95%;margin: 0 auto;display: flex;align-items: center;">
+        <van-image
+          width="60"
+          height="60"
+          round
+          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>
+        </div>
+        <van-icon name="setting-o" style="margin-left: auto;" @click="gotoLink" size="25"/>
       </div>
-      <div style="background:#F5F5F5; padding-top:10px;">
-      <van-row style="text-align:center;margin:20px;background:#fff;padding:15px;border-radius:15px;">
-        <van-col span="8">
+    </div>
+    <div style="background:#F5F5F5;width: 95%;margin: 20px auto 0;border-radius: 15px;overflow: hidden;">
+      <van-grid :column-num="3" :border="false">
+        <van-grid-item>
           <van-badge :content="total">
             <img
               width="50"
@@ -34,9 +27,9 @@
               @click="active=1,getList()"
             />
           </van-badge>
-          <p id="basetext" :style="{color:(active==1?'#7AC943':'#000')}">全部任务</p>
-        </van-col>
-        <van-col span="8">
+          <p id="basetext" :style="{color:(active==1?'#7AC943':'#000'),fontSize:'14px',marginTop:'5px'}">全部任务</p>
+        </van-grid-item>
+        <van-grid-item>
           <van-badge :content="done">
             <img
               width="50"
@@ -45,9 +38,9 @@
               @click="active=2,getList()"
             />
           </van-badge>
-          <p :style="{color:(active==2?'#7AC943':'#000')}">已完成</p>
-        </van-col>
-        <van-col span="8" >
+          <p :style="{color:(active==2?'#7AC943':'#000'),fontSize:'14px',marginTop:'5px'}">已完成</p>
+        </van-grid-item>
+        <van-grid-item>
           <van-badge :content="todo">
             <img
               width="50"
@@ -56,44 +49,39 @@
               @click="active=3,getList()"
             />
           </van-badge>
-          <p :style="{color:(active==3?'#7AC943':'#000')}">待调查</p>
-        </van-col>
-      </van-row>
-      <div style="margin:20px;">
-        <p class="title" style="position:relative;padding-left:20px;line-height:32px;">任务列表</p>
-      </div>
-      </div>
+          <p :style="{color:(active==3?'#7AC943':'#000'),fontSize:'14px',marginTop:'5px'}">待调查</p>
+        </van-grid-item>
+      </van-grid>
+    </div>
+    <div style="margin:20px;">
+      <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;">任务列表</p>
+    </div>
 
     <div v-if="active==1" style="height:calc( 100vh - 350px);overflow-y:auto;">
       <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask" :immediate-check="false">
-      <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:calc( 100% - 40px);margin:20px">
+      <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}}
-            <p style="float:right">
-              {{item.confirmZjdzdNumber}}/{{item.reportZjdzdNumber}}
-            </p>
-          </div>
+          <div>{{item.deptName}}</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"
             :stroke-width="100"
             :speed="100"
-            size="100%"
+            size="70%"
             layer-color="#ebedf0"
             :color="chooseColor(item)"
             :text="item.reportZjdzdNumber!=null?(((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed())+'%':0+'%'"
           />
         </template>
         <template #label>
-          {{item.planBeginTime}}~{{item.planEndTime}}
-          <br/>
-          {{taskExecutorChange(item)}}
-        </template>
-        <template #icon>
-          <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="clock" color="#22b7f2" style="margin-right:5px;"/>{{item.planBeginTime}}~{{item.planEndTime}}</p>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="manager" color="#22b7f2" style="margin-right:5px;"/>{{taskExecutorChange(item)}}</p>
         </template>
       </van-cell>
       </van-pull-refresh>
@@ -101,31 +89,28 @@
     <div v-if="active==2" style="height:calc( 100vh - 350px);overflow-y:auto;">
       <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask">
       <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:calc( 100% - 40px);margin:20px">
+    box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:0px auto 20px;height: 110px;">
         <template #title>
-          <p style="float:right">{{item.deptName}}
-            {{item.confirmZjdzdNumber}}/{{item.reportZjdzdNumber}}
-          </p>
+          <div>{{item.deptName}}</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"
             :stroke-width="100"
             :speed="100"
-            size="100%"
+            size="70%"
             layer-color="#ebedf0"
             :color="chooseColor(item)"
             :text="item.reportZjdzdNumber!=null?(((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed())+'%':0+'%'"
           />
         </template>
         <template #label>
-          {{item.planBeginTime}}~{{item.planEndTime}}
-          <br/>
-          {{taskExecutorChange(item)}}
-        </template>
-        <template #icon>
-          <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="clock" color="#22b7f2" style="margin-right:5px;"/>{{item.planBeginTime}}~{{item.planEndTime}}</p>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="manager" color="#22b7f2" style="margin-right:5px;"/>{{taskExecutorChange(item)}}</p>
         </template>
       </van-cell>
       </van-pull-refresh>
@@ -133,33 +118,28 @@
     <div v-if="active==3" style="height:calc( 100vh - 350px);overflow-y:auto;">
       <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask">
       <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:calc( 100% - 40px);margin:20px">
+    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}}
-            <p style="float:right">
-              {{item.confirmZjdzdNumber}}/{{item.reportZjdzdNumber}}
-            </p>
-          </div>
+          <div>{{item.deptName}}</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"
             :stroke-width="100"
             :speed="100"
-            size="100%"
+            size="70%"
             layer-color="#ebedf0"
             :color="chooseColor(item)"
             :text="item.reportZjdzdNumber!=null?(((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed())+'%':0+'%'"
           />
         </template>
         <template #label>
-          {{item.planBeginTime}}~{{item.planEndTime}}
-          <br/>
-          {{taskExecutorChange(item)}}
-        </template>
-        <template #icon>
-          <van-icon name="clock" color="#22b7f2" style="margin-top:10px;margin-right:10px;"/>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="clock" color="#22b7f2" style="margin-right:5px;"/>{{item.planBeginTime}}~{{item.planEndTime}}</p>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="manager" color="#22b7f2" style="margin-right:5px;"/>{{taskExecutorChange(item)}}</p>
         </template>
       </van-cell>
       </van-pull-refresh>
@@ -279,6 +259,17 @@
             }
           return  '#FA5353'
         },
+        chooseColor2(item){
+          let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
+            if(a < 50){
+              return  'rgba(250,83,83,0.22)'
+            }else if(a < 100){
+              return 'rgba(34,183,242,0.22)'
+            }else{
+              return 'rgba(122,201,67,0.22)'
+            }
+          return  '#FA5353'
+        },
         taskExecutorChange(row){
           if(row.taskExecutor!=null&&row.taskExecutor!=""&&row.taskExecutor.length>1){
             var actions = [];
@@ -413,7 +404,7 @@
   {
     content:"";
     width: 6px;
-    height: 32px;
+    height: 20PX;
     background: #7ac943;
     border-radius: 3px;
     position:absolute;

src/views/homesteadSurvey/settle.vue

@@ -19,21 +19,22 @@
       </template>
 
     </van-cell>-->
-    <van-cell title="修改密码" @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;">
-      <template #icon>
-        <van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
-      </template>
-    </van-cell>
-    <van-cell title="上传设置" @click="showUpload = true " style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
-      <template #icon>
-        <van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
-      </template>
-    </van-cell>
-    <van-cell title="退出软件" @click="logout"  style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
-      <template #icon>
-        <van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
-      </template>
-    </van-cell>
+
+    <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>
+    </div>
+
+    <div @click="showUpload = true " style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;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="logout" 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/btn4.png')" size="18"/>
+      <p style="font-size: 14px;color: #666666;margin-left: 5px;">退出软件</p>
+    </div>
+
     <van-popup v-model:show="showPassword" position="bottom" style="width:100%;padding:20px;">
       <van-cell-group >
         <van-field v-model="oldPassword" label="原密码" type="password" placeholder="请输入" />