From faea4c65bdfd0399c804588a5e9400de397c1b26 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 25 Jul 2022 18:02:40 +0800
Subject: [PATCH] bug

---
 .../AppCooperationPropaganda.vue              | 26 ++++++++----
 .../cooperationDetail.vue                     | 14 +++----
 .../AppCooperationPropaganda/selectUser.vue   |  6 +--
 .../AppPropagandaStatistics.vue               | 41 +++++++------------
 4 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
index 8ba5584f..25e984fc 100644
--- a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
+++ b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
@@ -3,7 +3,7 @@
     <AiTopFixed>
       <div class="search">
         <div class="searchBox">
-          <u-search placeholder="请输入任务名称" v-model="taskTitle" @search="searchBtn" @clear="taskTitle='',current=1, list=[],getList()" :show-action="false"></u-search>
+          <u-search placeholder="请输入任务名称" v-model="taskTitle" clearabled @search="searchBtn" @clear="taskTitle='',getList()" :show-action="false"></u-search>
         </div>
         <div class="filterBtn" @click="filterShow = true"><img src="./images/shaixuan.png" alt="">筛选</div>
       </div>
@@ -41,7 +41,7 @@
         <scroll-view class="select-content" scroll-y="true">
           <div class="type-list">
             <div class="type-title">创建人</div>
-            <AiPagePicker type="custom" :selected.sync="userIdList" nodeKey="userId" :ops="{url:`./selectUser`,label: 'id'}">
+            <AiPagePicker type="custom" :selected.sync="userIdList" nodeKey="createUserId" :ops="{url:`./selectUser`,label: 'id'}">
               <span class="label" v-if="userIdList.length">已选择</span>
               <span v-else style="color:#999;">请选择</span>
               <u-icon name="arrow-right" color="#999" size="24" style="margin-left:8px;"/>
@@ -93,7 +93,7 @@ export default {
       showStart: false,
       showEnd: false,
       taskTitle: '',
-      userId: '',
+      createUserId: '',
       userList: [],
       userIdList: []
     }
@@ -112,9 +112,9 @@ export default {
         params: {
           current: this.current,
           taskTitle: this.taskTitle,
-          createUserId: this.userId,
           startTime: this.start,
           endTime: this.end,
+          createUserId: this.createUserId,
         }
       }).then(res=> {
         if(res?.data) {
@@ -124,15 +124,22 @@ export default {
     },
 
     reset() {
+      this.start = '',
+      this.end = '',
       this.startTime = '',
-      this.endTime = '',
+      this.endTime = ''
       this.userIdList = []
-      uni.clearStorageSync('userSelect')
+      // uni.clearStorageSync('userSelect')  //清空会导致状态字典出问题
+      this.current = 1
+      this.list = []
+      this.getList()
     },
 
     selectConfirm() {
       if(this.userIdList.length) {
-        this.userId = this.userIdList[0].userId
+        this.createUserId = this.userIdList?.[0].userId
+        console.log(this.userIdList,'userIdList');
+        console.log(this.createUserId,'createUserId');
       }
 
       // let arr = this.userIdList
@@ -152,6 +159,8 @@ export default {
         return
       }
       this.filterShow = false
+      this.current = 1
+      this.list = []
       this.getList()
     },
     confirmStart(val) {
@@ -164,10 +173,9 @@ export default {
   onShow() {
     document.title = '群发居民群'
     this.getList()
-    this.$dict.load('mstStatus').then(() => {
+    this.$dict.load(['mstStatus']).then(() => {
       this.getList()
     })
-    
   },
   onReachBottom() {
     this.current ++
diff --git a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
index 73c71be9..c085fb36 100644
--- a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
+++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
@@ -34,23 +34,19 @@
             <div  id="pieEcharts"></div>
             <div class="pie_right">
               <div>
-                <span v-show="tabIndex==0">计划送达居民:</span>
-                <span v-show="tabIndex==1">计划送达居民群:</span>
+                <span>{{tabIndex==0? '计划送达居民：':'计划送达居民群：'}}</span>
                 <span>{{ info.planCount || 0 }}</span>
               </div>
               <div>
-                <span v-show="tabIndex==0">未送达居民:</span>
-                <span v-show="tabIndex==1">未送达居民群:</span>
+                <span>{{tabIndex==0? '未送达居民：':'未送达居民群：'}}</span>
                 <span>{{ info.unExecutedCount || 0 }}</span>
               </div>
               <div>
-                <span v-show="tabIndex==0">已送达居民:</span>
-                <span v-show="tabIndex==1">已送达居民群:</span>
+                <span>{{tabIndex==0? '已送达居民：':'已送达居民群：'}}</span>
                 <span>{{ info.executedCount || 0 }}</span>
               </div>
               <div>
-                <span v-show="tabIndex==0">无法送达居民:</span>
-                <span v-show="tabIndex==1">无法送达居民群:</span>
+                <span>{{tabIndex==0? '无法送达居民：':'无法送达居民群：'}}</span>
                 <span>{{ info.cannotExecuteCount || 0 }}</span>
               </div>
             </div>
@@ -242,7 +238,7 @@ export default {
                   },
                 },
               },
-              { value: this.info.unExecutedCount },
+              { value: this.info.unExecutedCount, name: "未送达数量" },
             ],
           },
         ],
diff --git a/src/project/saas/AppCooperationPropaganda/selectUser.vue b/src/project/saas/AppCooperationPropaganda/selectUser.vue
index c440e9b5..8d1b8d12 100644
--- a/src/project/saas/AppCooperationPropaganda/selectUser.vue
+++ b/src/project/saas/AppCooperationPropaganda/selectUser.vue
@@ -1,14 +1,14 @@
 <template>
   <section class="selectUser">
     <div class="header-middle">
-      <div class="userCards" v-for="e in userList" :key="e.id">
+      <div class="userCards" v-for="e in userList" :key="e.userId">
         <div class="imges">
           <div class="imgselect" :class="{ checked: e.isChecked }" @click.stop="itemCheck(e)" />
-          <img src="./images/tx@2x.png" alt="" class="avatras"/> {{e}}
+          <img src="./images/tx@2x.png" alt="" class="avatras"/> {{e.userId}}
         </div>
         <div class="rights fill">
           <div class="applicationNames">
-            <AiOpenData type="userName" :openid="e.id"/>
+            <AiOpenData type="userName" :openid="e.userId"/>
           </div>
         </div>
       </div>
diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
index 3699f017..631b77dd 100644
--- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
+++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
@@ -218,7 +218,7 @@ export default {
       nowDate: "",
       calendarList: [],
       colData: {},
-      detailType: 0,
+      detailType: '0',
       timeType: "",
       departId: "",
       startTime: "",
@@ -234,6 +234,7 @@ export default {
       peopleNum: "",
       sendNum: "",
       predictNum: "",
+      isDepartData: false,
     };
   },
 
@@ -243,7 +244,6 @@ export default {
     this.getData();
     this.getColData();
     this.getNowDate();
-    // console.log(WWOpenData);
   },
   mounted() {
     this.getBrokenEcharts1();
@@ -255,6 +255,7 @@ export default {
     ...mapState(['user'])
   },
   methods: {
+    ...mapActions(['initOpenData', 'transCanvas']),
     checkTime(index) {
       if (index == 3) {
         this.timeSelect = index;
@@ -295,6 +296,7 @@ export default {
     confirmStart(val) {
       this.startTime = val.year + "-" + val.month + "-" + val.day;
     },
+
     confirmEnd(val) {
       this.endTime = val.year + "-" + val.month + "-" + val.day;
     },
@@ -376,7 +378,6 @@ export default {
             this.getBrokenEcharts1();
             this.getBrokenEcharts2();
             this.getBrokenEcharts3();
-            this.getColumnarEcharts();
           }
         });
     },
@@ -551,47 +552,33 @@ export default {
         ],
       });
     },
-    ...mapActions(['initOpenData', 'transCanvas']),
+
     // 宣发明细
     getColData() {
-      this.$http
-        .post(`/app/appmasssendingtask/statisticsDepart`, null, {
+      this.$http.post(`/app/appmasssendingtask/statisticsDepart`, null, {
           params: {
             type: this.detailType,
           },
         })
         .then((res) => {
           if(res?.data) {
-            let data =  [
-              {taskCount: 4, deptId: "10"},
-              {taskCount: 6, deptId: "13"},
-              {taskCount: 24, deptId: "5"},
-              {taskCount: 14, deptId: "22"},
-              {taskCount: 12, deptId: "20"},
-              {taskCount: 11, deptId: "15"}
-            ]
             let items = [], xData = [], yData = []
-            // res.data.map((item) => {
-            //   var i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
-            //   items.push(i)
-            //   yData.push(item.taskCount)
-            // })
-            data.map((item) => {
-              var i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
+            res.data.map((item) => {
+              const i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
               items.push(i)
-              // xData.push(item.deptId)
               yData.push(item.taskCount)
             })
-
+            
             this.initOpenData({canvas:true})
+
             this.transCanvas(items).then((data) => {
-              console.log(data,'data哈哈哈');
-              data.items.map((i) => {
-                xData.push(i.data)
+              console.log(data.items,"data.items");
+              data.items.map((a) => {
+                xData.push(a.data)
               })
+              console.log(xData, yData, '111222');
               this.getColumnarEcharts(xData, yData)
             })
-            // this.getColumnarEcharts(xData, yData)
           }
         });
     },