From 155d9cf56dcda5128c6444a98ce822b55a2f9491 Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Tue, 21 Nov 2023 01:18:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/homesteadSurvey/index.js    |   9 ++-
 src/views/homesteadSurvey/index.vue | 119 +++++++++-------------------
 2 files changed, 45 insertions(+), 83 deletions(-)

diff --git a/src/api/homesteadSurvey/index.js b/src/api/homesteadSurvey/index.js
index bb9f7bee..bfa468eb 100644
--- a/src/api/homesteadSurvey/index.js
+++ b/src/api/homesteadSurvey/index.js
@@ -8,7 +8,14 @@ export function listTask(query) {
     params: query
   })
 }
-
+// 数据调查任务列表（带完成数、调查数）
+export function mobileList(query) {
+  return request({
+    url: '/home/homesteadsurvey/mobileList',
+    method: 'get',
+    params: query
+  })
+}
 // 导出数据调查任务
 export function exportTask(id) {
   return request({
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index ee1c9e25..16c6e649 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -172,7 +172,7 @@
 </template>
 
 <script>
-  import {addTask, complete, delTask, exportTask, getTask, listTask,getTownInfo, publish, updateTask, userList} from "@/api/homesteadSurvey/index";
+  import {listTask,mobileList,getTownInfo, publish, updateTask, userList} from "@/api/homesteadSurvey/index";
   import {changeDept} from "@/api/homesteadSurvey/zjdzd";
   import {getInfo} from "../../api/login";
   import CircleProccess from "@/components/circleProccess.vue";
@@ -217,12 +217,6 @@
             rwfbzt:"PUBLISHED",
             rwzxr:null
           },
-          // 切换查询参数
-          switchParams: {
-            rwwczt: null,
-            rwfbzt:"PUBLISHED",
-            rwzxr:null
-          },
           nickName:"",
           text:0,
           isLoadingtask:false,
@@ -246,8 +240,8 @@
             this.$set(this.queryParams, "params", {deptId:100});
             this.getList();
           },1000)
-
         }else{
+
           this.$set(this.queryParams, "rwzxr", null);
           this.getList();
         }
@@ -329,6 +323,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":4,
             }
+            if(this.queryParams.rwzxr != null){
+              params.rwzxr = this.queryParams.rwzxr;
+            }
             listTask(params).then((response) => {
               if(response.rows.length>0&&this.totalList.length<response.total){
                 response.rows.map(res => {
@@ -349,6 +346,9 @@
               "pageNum": this.countwhc+1,
               "pageSize":4,
             }
+            if(this.queryParams.rwzxr != null){
+              params.rwzxr = this.queryParams.rwzxr;
+            }
             listTask(params).then((response) => {
               if(response.rows.lenght>0&&this.doneList.length<response.total){
                 response.rows.map(res => {
@@ -369,6 +369,9 @@
               "pageNum": this.countqb+1,
               "pageSize":4,
             }
+            if(this.queryParams.rwzxr != null){
+              params.rwzxr = this.queryParams.rwzxr;
+            }
             listTask(params).then((response) => {
               if(response.rows.length>0&&this.todoList.length<response.total){
                 response.rows.map(res => {
@@ -391,7 +394,6 @@
             this.$set(this.queryParams, "rwzxr", null);
             this.getList();
           }
-          this.queryNum();
         },
         setCookies(item){
        /*   if(this.$cookies.get("upload")==null||this.$cookies.get("upload")==0){
@@ -442,113 +444,66 @@
         xzChange(val){
           this.deptName = val.deptName;
           this.showDropList = false;
+          this.$set(this.queryParams, "deptId", null);
           if(val.deptId != 100){
             this.$set(this.queryParams, "parentId", val.deptId);
-            this.$set(this.switchParams, "parentId", val.deptId);
+            this.$set(this.queryParams, "params", {deptId:null});
           }else{
             this.$set(this.queryParams, "parentId", null);
-            this.$set(this.switchParams, "parentId", null);
+            this.$set(this.queryParams, "params", {deptId:val.deptId});
           }
           this.getList();
-          this.queryNum();
         },
         checkBadge(){
           this.finished = false;
           this.loading = false;
-          this.countqb = 1;
-          this.countyhc = 1;
-          this.countwhc = 1;
           this.totalList = []
           this.doneList = [];
           this.todoList = [];
           this.getList();
-          this.queryNum();
-        },
-        queryNum(){
-          if(this.checked){
-            let userId = this.$store.state.user.userId;
-            this.$set(this.switchParams, "rwzxr", userId);
-            listTask(this.switchParams).then(response => {
-              this.done = 0;
-              this.todo = 0;
-              this.total = response.total;
-              response.rows.map(res => {
-                if(res.rwwczt == "FINISHED"){
-                  this.done+=1
-                }else{
-                  this.todo+=1
-                }
-                // if(res.rwzxr!=null&&res.rwzxr!=''){
-                //   res.rwzxr = res.rwzxr.split(',')
-              })
-
-            });
-          }else{
-            this.$set(this.switchParams, "rwzxr", null);
-            if(this.switchParams.parentId == null){
-              this.$set(this.switchParams, "params", {deptId:100});
-            }
-            listTask(this.switchParams).then(response => {
-              this.done = 0;
-              this.todo = 0;
-              this.total = response.total;
-              console.info(this.total)
-              response.rows.map(res => {
-                if(res.rwwczt == "FINISHED"){
-                  this.done+=1
-                }else{
-                  this.todo+=1
-                }
-              })
-            });
-          }
         },
         getList() {
           this.totalList = []
           this.doneList = [];
           this.todoList = [];
+          this.countqb = 1;
+          this.countyhc = 1;
+          this.countwhc = 1;
+          this.finished = false;
+          this.loading = false;
           if(this.active==1) {
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
             this.$set(this.queryParams, "rwwczt", null);
             this.$set(this.queryParams, "pageNum",  this.countyhc);
             this.$set(this.queryParams, "pageSize",  4);
+            mobileList(this.queryParams).then(response => {
+              this.done = response.wcs;
+              this.todo = response.dcs;
+              this.total = response.tableDataInfo.total;
+              this.totalList = response.tableDataInfo.rows;
+            });
           }else if(this.active==2) {
             this.$set(this.queryParams, "rwwczt", "FINISHED");
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
             this.$set(this.queryParams, "pageNum",  this.countwhc);
+            mobileList(this.queryParams).then(response => {
+              this.total = response.wcs;
+              this.todo = response.dcs;
+              this.done = response.tableDataInfo.total;
+              this.doneList = response.tableDataInfo.rows;
+            });
           }else{
             this.$set(this.queryParams, "rwwczt", "UNFINISHED");
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
             this.$set(this.queryParams, "pageNum",  this.countqb);
+            mobileList(this.queryParams).then(response => {
+              this.total = response.wcs;
+              this.done = response.dcs;
+              this.todo = response.tableDataInfo.total;
+              this.todoList = response.tableDataInfo.rows;
+            });
           }
-          listTask(this.queryParams).then(response => {
-            if(this.active==1) {
-              this.done = 0;
-              this.todo = 0;
-              this.total = response.total;
-            }
-            response.rows.map(res => {
-              console.info(this.active);
-              if(this.active==1) {
-                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.doneList.push(res);
-              }else{
-                this.todoList.push(res);
-              }
-            })
 
-          });
         },
         gotoLink(){
           this.$router.push('/homesteadSurvey/settle')