宅基地调查

src/views/homesteadSurvey/add.vue

@@ -582,8 +582,8 @@
         </div>
       </div>
       <div style="position:fixed;bottom:0;left:5%;width:90%;text-align:center;">
- <!--       <van-button round  size="small" color="#7AC943" style="width:40%" @click="changeActiveBack">上一项</van-button>-->
-        <van-button round color="#7AC943" style="width:100%" @click="searchCommit">签名确认</van-button>
+        <van-button round color="#ee0a24" style="width:40%" @click="showycbjinfo">异常标记</van-button>
+        <van-button round color="#7AC943" style="width:40%" @click="searchCommit">签名确认</van-button>
       </div>
     </div>
     <van-popup v-model="showsyqr" style="height:100%;width:100%;">
@@ -772,7 +772,6 @@
             name="电话"
             label="电话"
             placeholder="电话"
-            type="number"
           />
           <van-field
             autocomplete="off"
@@ -2745,6 +2744,21 @@
         <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleGenerate">保存签名</van-button></van-col>
       </van-row>
     </van-popup>
+    <van-popup v-model="showycbj" position="bottom"
+               style="padding-top:20px;">
+      <van-field name="radio" label="是否异常">
+        <template #input>
+          <van-radio-group v-model="isyc" direction="horizontal">
+            <van-radio name="Y">是</van-radio>
+            <van-radio name="N">否</van-radio>
+          </van-radio-group>
+        </template>
+      </van-field>
+      <van-field v-model="ycms" v-if="isyc=='Y'" type="textarea" maxlength="250" label="异常描述" placeholder="请输入异常描述" />
+      <div style="margin: 16px;">
+        <van-button round block type="info" @click="saveyc">关闭</van-button>
+      </div>
+    </van-popup>
     <!--户内成员职业-->
     <van-popup v-model="showhncyoccupation" position="bottom">
       <van-picker
@@ -2898,6 +2912,9 @@
     components: { MapGisDrawing,},
     data() {
       return {
+        isyc:'Y',
+        ycms:"",
+        showycbj:false,
         shownh:false,
         showhzzjlx:false,
         showhzoccupation:false,
@@ -3267,6 +3284,18 @@
         }
     },
     methods: {
+      showycbjinfo(){
+        this.showycbj = true
+        if(this.form.isyc!=null&&this.form.isyc!=""){
+          this.isyc = this.form.isyc
+          this.ycms = this.form.ycms
+        }
+      },
+      saveyc(){
+        this.showycbj = false
+        this.form.isyc = this.isyc
+        this.form.ycms = this.ycms
+      },
       shownmfwlist(item){
         this.zrzh = item.zrzh
         this.shownmfw = true
@@ -3453,8 +3482,8 @@
         img.onload = () => {
           const h = img.height
           const w = img.width
-          let ch = img.height/2
-          let cw = img.width/2
+          let ch = img.height/4
+          let cw = img.width/4
           let canvas = document.createElement('canvas')
           let ctx = canvas.getContext('2d')
           canvas.height = ch
@@ -3468,6 +3497,7 @@
             d.push(blobBin.charCodeAt(i))
           }
           const data2 = new FormData();
+          console.log(d)
           data2.append("file", new Blob([new Uint8Array(d)],{type:'image/jpeg'}));
           uploadFile(data2).then(res => {
             if(this.form.zjdxctp!=null&&this.form.zjdxctp!=""){
@@ -3482,8 +3512,10 @@
       deleteFilezjd(file){
         let url = ","+file.baseUrl
         let url1 = file.baseUrl+","
+        let url2 = file.baseUrl
         this.form.zjdxctp = this.form.zjdxctp.replaceAll(url,"")
         this.form.zjdxctp = this.form.zjdxctp.replaceAll(url1,"")
+        this.form.zjdxctp = this.form.zjdxctp.replaceAll(url2,"")
       },
       // 图片上传前
       beforeReadfw(file){
@@ -3501,8 +3533,8 @@
         img.onload = () => {
           const h = img.height
           const w = img.width
-          let ch = img.height/2
-          let cw = img.width/2
+          let ch = img.height/4
+          let cw = img.width/4
           let canvas = document.createElement('canvas')
           let ctx = canvas.getContext('2d')
           canvas.height = ch
@@ -3531,8 +3563,10 @@
       deleteFilefw(file){
         let url = ","+file.baseUrl
         let url1 = file.baseUrl+","
+        let url2 = file.baseUrl
         this.nmfwform.zjdxctp = this.nmfwform.zjdxctp.replaceAll(url,"")
         this.nmfwform.zjdxctp = this.nmfwform.zjdxctp.replaceAll(url1,"")
+        this.nmfwform.zjdxctp = this.nmfwform.zjdxctp.replaceAll(url2,"")
       },
       onConfirmhzsjly(value){
         this.nhform.sjlyName = value.dictLabel
@@ -3572,7 +3606,7 @@
         this.form1.shyqrdbzjhm = value.hzzjhm
         this.form1.shyqrdbzjlx = value.hzzjlx
         this.form1.dh = value.phone
-        this.form1.dz = value.TXDZ
+        this.form1.dz = value.txdz
         this.zjlxOptions.map(res => {
           if(res.dictValue == this.form1.shyqrdbzjlx){
             this.form1.shyqrdbzjlxName = res.dictLabel
@@ -3997,8 +4031,10 @@
           listSuyqr(params).then((response) => {
             if(response.rows.length>0){
               this.nhform.suyqrdm = response.rows[0].suyqrdm
+              this.nhform.txdz = response.rows[0].dbrtxdz
             }else{
               this.nhform.suyqrdm = this.form.suyqrdm
+              this.nhform.txdz = this.form.suyqrmc
             }
           });
         }else{
@@ -4138,8 +4174,6 @@
                 this.fileListzjd.push({"url":this.baseUrl+res,"baseUrl":res})
               })
             }
-
-
             this.lyzkOptions.map(res => {
               if(res.dictValue == this.form.lyzk){
                 this.form.lyzkName = res.dictLabel
@@ -4181,7 +4215,7 @@
               deptId :this.item.deptId,
               sffz:"Y",
               yt:"072",
-              ytName:"农村宅基地",
+              ytmc:"农村宅基地",
               lyzk:"1",
               lyzkName:"正常使用",
               lzyx:'0',
@@ -4197,10 +4231,12 @@
               qlsdfs:'1',
               qlsdfsName:'地上',
               sjly:'04',
-              sjlyName:'农村宅基地使用权确权登记发证'
+              sjlyName:'农村宅基地使用权确权登记发证',
+              zl:''
             }
             if(response.rows.length>0){
               this.form.suyqrdm = response.rows[0].suyqrdm
+              this.form.zl = response.rows[0].dbrtxdz
             }
           });
         }
@@ -4350,14 +4386,24 @@
         if(this.nhform.id!=null){
           updateNh(this.nhform).then(
             response => {
-              let _this =this
+              let _this = this
               this.$toast({
                 icon: 'success', // 找到自己需要的图标
                 message: '修改成功',
                 duration:"1000",
                 onClose:function(){
-                  _this.shownh = false
-                  _this.getNh()
+                  let psyqr = {
+                    deptId : _this.nhform.deptId,
+                    nhdm : _this.nhform.nhdm,
+                    shyqrdbxm : _this.nhform.hzxm,
+                    shyqrdbzjlx : _this.nhform.hzzjlx,
+                    shyqrdbzjhm : _this.nhform.hzzjhm,
+                    dh : _this.nhform.phone,
+                    dz : _this.nhform.txdz
+                  }
+                  setSyqrInfo(psyqr).then(res => {
+                    _this.shownh = false
+                  })
                 }
               })
             }
@@ -4392,11 +4438,13 @@
                 _this.showzrz = false
                 _this.active = 3
                 _this.getZrzList()
+                _this.shownmfwlist(_this.form3)
               }
             })
           });
         } else {
           addZrz(this.form3).then(response => {
+            this.form3 = response.data
             let _this =this
             this.$toast({
               icon: 'success', // 找到自己需要的图标
@@ -4406,6 +4454,7 @@
                 _this.showzrz = false
                 _this.active = 3
                 _this.getZrzList()
+                _this.shownmfwlist(_this.form3)
               }
             })
           });

src/views/homesteadSurvey/index.vue

@@ -30,7 +30,7 @@
               width="50"
               height="50"
               :src="require('../../assets/images/housesteadSurvey/task1.png')"
-              @click="active=1"
+              @click="active=1,getList()"
             />
           </van-badge>
           <p id="basetext" :style="{color:(active==1?'#7AC943':'#000')}">全部任务</p>
@@ -41,7 +41,7 @@
               width="50"
               height="50"
               :src="require('../../assets/images/housesteadSurvey/task2.png')"
-              @click="active=2"
+              @click="active=2,getList()"
             />
           </van-badge>
           <p :style="{color:(active==2?'#7AC943':'#000')}">已完成</p>
@@ -52,7 +52,7 @@
               width="50"
               height="50"
               :src="require('../../assets/images/housesteadSurvey/task3.png')"
-              @click="active=3"
+              @click="active=3,getList()"
             />
           </van-badge>
           <p :style="{color:(active==3?'#7AC943':'#000')}">待调查</p>
@@ -75,7 +75,16 @@
           </div>
         </template>
         <template #default>
-          <CircleProccess :ids="index" :counts="item.reportZjdzdNumber!=0?(item.confirmZjdzdNumber/item.reportZjdzdNumber)*100:0"></CircleProccess>
+          <van-circle
+            v-model="item.reportZrzNumber"
+            :rate="item.reportNhNumber"
+            :stroke-width="100"
+            :speed="100"
+            size="100%"
+            layer-color="#ebedf0"
+            :color="chooseColor(item)"
+            :text="item.reportZjdzdNumber!=null?(((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed())+'%':0+'%'"
+          />
         </template>
         <template #label>
           {{item.planBeginTime}}~{{item.planEndTime}}
@@ -90,15 +99,24 @@
     </div>
     <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" :to="{name:'homesteadList',params:{item:item}}" style="border-radius: 16px;
+      <van-cell  v-for="(item,index) in doneList" :key="item.id" size="small" :to="{name:'homesteadList',params:{item:item}}" 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>{{item.deptName}}
+          <p style="float:right">{{item.deptName}}
             {{item.confirmZjdzdNumber}}/{{item.reportZjdzdNumber}}
           </p>
         </template>
         <template #default>
-          <CircleProccess :ids="index" :counts="item.reportZjdzdNumber!=0?(item.confirmZjdzdNumber/item.reportZjdzdNumber)*100:0"></CircleProccess>
+          <van-circle
+            v-model="item.reportZrzNumber"
+            :rate="item.reportNhNumber"
+            :stroke-width="100"
+            :speed="100"
+            size="100%"
+            layer-color="#ebedf0"
+            :color="chooseColor(item)"
+            :text="item.reportZjdzdNumber!=null?(((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed())+'%':0+'%'"
+          />
         </template>
         <template #label>
           {{item.planBeginTime}}~{{item.planEndTime}}
@@ -113,16 +131,27 @@
     </div>
     <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" :to="{name:'homesteadList',params:{item:item}}" style="border-radius: 16px;
+      <van-cell  v-for="(item,index) in todoList" :key="item.id" size="small" :to="{name:'homesteadList',params:{item:item}}" 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>{{item.deptName}}
-            {{item.confirmZjdzdNumber}}/{{item.reportZjdzdNumber}}
-          </p>
+          <div>{{item.deptName}}
+            <p style="float:right">
+              {{item.confirmZjdzdNumber}}/{{item.reportZjdzdNumber}}
+            </p>
+          </div>
         </template>
         <template #default>
-          <CircleProccess :ids="index" :counts="item.reportZjdzdNumber!=0?(item.confirmZjdzdNumber/item.reportZjdzdNumber)*100:0"></CircleProccess>
-          </template>
+          <van-circle
+            v-model="item.reportZrzNumber"
+            :rate="item.reportNhNumber"
+            :stroke-width="100"
+            :speed="100"
+            size="100%"
+            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/>
@@ -150,6 +179,9 @@
       },
       data() {
         return {
+          currentRate1:0,
+          currentRate2:0,
+          currentRate3:0,
           active: 1,
           show: false,
           loading: false,
@@ -164,6 +196,9 @@
           doneList:[],
           todo:0,
           todoList:[],
+          gradientColor:{
+
+          },
           // 查询参数
           queryParams: {
             taskStatus: null,
@@ -205,6 +240,21 @@
         );
       },
       methods: {
+        chooseValue(item){
+            let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
+          return a
+        },
+        chooseColor(item){
+          let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
+            if(a < 50){
+              return  '#FA5353'
+            }else if(a < 100){
+              return '#22B7F2'
+            }else{
+              return '#85d824'
+            }
+          return  '#FA5353'
+        },
         taskExecutorChange(row){
           if(row.taskExecutor!=null&&row.taskExecutor!=""&&row.taskExecutor.length>1){
             var actions = [];
@@ -282,12 +332,13 @@
         getList() {
           listTask(this.queryParams).then(response => {
             this.total = response.total
-            this.totalList = response.rows
+            this.totalList = []
             this.done = 0;
             this.doneList = [];
             this.todo = 0;
             this.todoList = [];
             response.rows.map(res => {
+              console.log(res.reportNhNumber)
               if(res.taskStatus == "FINISHED"){
                 this.done+=1
                 this.doneList.push(res);
@@ -295,18 +346,17 @@
                 this.todo+=1
                 this.todoList.push(res);
               }
+              /*this.totalList.push(res);*/
               if(res.taskExecutor!=null&&res.taskExecutor!=''){
                 res.taskExecutor = res.taskExecutor.split(',')
               }
             })
+          this.totalList = response.rows
           });
         },
         gotoLink(){
           this.$router.push('/homesteadSurvey/settle')
         },
-        _isMobile() {
-          this.phone = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
-        },
       },
     }
 </script>

src/views/homesteadSurvey/list.vue

@@ -327,6 +327,7 @@
             required
             placeholder="代表人邮政编码"
             input-align="right"
+            maxlength="6"
             :rules="[{ required: true, message: '代表人邮政编码不能为空' }]"
           />
           <van-field name="radio" label="是否成立农村集体经济组织" required input-align="right" autocomplete="off">
@@ -1709,9 +1710,9 @@
             if(response.rows.length>0){
               this.qlrform = response.rows[0]
               this.nhform.suyqrdm = this.qlrform.suyqrdm
+              this.nhform.txdz = response.rows[0].suyqrmc
             }
           });
-
         },
         // 返回
         onClickLeft(){
@@ -1803,8 +1804,19 @@
                   message: '修改成功',
                   duration:"1000",
                   onClose:function(){
-                    _this.shownh = false
                     _this.getNh()
+                    let psyqr = {
+                      deptId : _this.nhform.deptId,
+                      nhdm : _this.nhform.nhdm,
+                      shyqrdbxm : _this.nhform.hzxm,
+                      shyqrdbzjlx : _this.nhform.hzzjlx,
+                      shyqrdbzjhm : _this.nhform.hzzjhm,
+                      dh : _this.nhform.phone,
+                      dz : _this.nhform.txdz
+                    }
+                    setSyqrInfo(psyqr).then(res => {
+                      _this.shownh = false
+                    })
                   }
                 })
               }