From 0894a937824476073e17c62afb91ec96022ff594 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 22 Aug 2022 16:34:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppPropagandaStatistics.vue               | 35 ++++++++++---------
 .../AppPropagandaStatistics/calendarInfo.vue  |  4 +--
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue
index 2d77d95b..06d2a96e 100644
--- a/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue
+++ b/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue
@@ -550,23 +550,26 @@ export default {
         .then((res) => {
           if (res.code ===0) {
             if(res.data && res.data.length) {
-              this.colData = res.data
-              let items = [], xData = [], yData = []
-              res.data.forEach((item) => {
-                const i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
-                items.push(i)
-                yData.push(item.taskCount)
-              })
+              let xData = res.data.map(e=> e.deptName)
+              let yData = res.data.map(e=> e.taskCount)
+              this.getColumnarEcharts(xData, yData)
+              // this.colData = res.data
+              // let items = [], xData = [], yData = []
+              // res.data.forEach((item) => {
+              //   const i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
+              //   items.push(i)
+              //   yData.push(item.taskCount)
+              // })
              
-              this.initOpenData({canvas:true})
-              setTimeout(() => {
-                this.transCanvas(items).then((data) => {
-                  data.items.map((a) => {
-                    xData.push(a.data)
-                  })
-                  this.getColumnarEcharts(xData, yData)
-                })
-              }, 2000)
+              // this.initOpenData({canvas:true})
+              // setTimeout(() => {
+              //   this.transCanvas(items).then((data) => {
+              //     data.items.map((a) => {
+              //       xData.push(a.data)
+              //     })
+              //     this.getColumnarEcharts(xData, yData)
+              //   })
+              // }, 2000)
             }
           }
         });
diff --git a/src/apps/AppPropagandaStatistics/calendarInfo.vue b/src/apps/AppPropagandaStatistics/calendarInfo.vue
index 216b3a1a..39424350 100644
--- a/src/apps/AppPropagandaStatistics/calendarInfo.vue
+++ b/src/apps/AppPropagandaStatistics/calendarInfo.vue
@@ -5,7 +5,7 @@
     </div>
     
     <div class="dailyMatters">
-      <div v-if="list && list.length">
+      <div v-if="list.length">
         <div>
           <div v-for="(item, index) in list.slice(0,3)" :key="index" :class="{'color1':index%4==0,'color2':index%4==1,'color3':index%4==2,'color4':index%4==3}" class="daily_item">
             <div>{{ item.createTime.substring(10, 16) }}</div>
@@ -21,7 +21,7 @@
         </div>
         <div class="readMore" v-show="!show && list.length > 3" @click="show = true">查看更多</div>
       </div>
-      <AiEmpty description="暂无宣发" v-else></AiEmpty>
+      <AiEmpty description="暂无宣发" v-if="!list.length" />
     </div>
   </div>
 </template>