From e5d1e8eb55f3b59bb77acb09c7a80d3955ce168e Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 28 Jul 2022 10:48:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?echart=E9=83=A8=E9=97=A8id=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppAnnounceStatistics/AppAnnounceStatistics.vue  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue b/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
index ec7cecb0..e4a6dace 100644
--- a/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
+++ b/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
@@ -34,7 +34,7 @@
                   <el-card>
                     <div class="flex-between">
                       <p class="item-title">{{item.taskTitle}}</p>
-                      <span class="item-time" v-if="item.createTime">{{item.createTime.substring(10, 16)}}</span>
+                      <span class="item-time" v-if="item.choiceTime">{{item.choiceTime.substring(10, 16)}}</span>
                     </div>
                     <div class="item-info item-created">
                       <span class="label">创建人：</span>
@@ -116,7 +116,7 @@
         </div>
       </div>
 
-      <ai-dialog :visible.sync="dialogDate" title="选择时间" width="500px" customFooter :show-close="false">
+      <ai-dialog :visible.sync="dialogDate" title="选择时间" width="500px" customFooter>
         <el-date-picker v-model="timeList" size="small" type="daterange" value-format="yyyy-MM-dd"
           range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
@@ -226,11 +226,13 @@
           return this.$message.error('请选择自定义时间');
         }
 
-        if(this.effectType == 3 && this.isEffectTimeSelect) { //宣发效果
+        if(this.isEffectTimeSelect) { //宣发效果
           this.timeListEffect = this.timeList
+          this.effectType = 3
           this.getEffect()
         } else {  //宣发明细
           this.timeListDepart = this.timeList
+          this.departType = 3
           this.getDepart()
         }
 
@@ -256,7 +258,6 @@
         }else {
           this.timeList = this.timeListEffect
         }
-        this.effectType = type
         if(type == 3) {
           this.isEffectTimeSelect = true
           this.dialogDate = true
@@ -322,7 +323,6 @@
         }else {
           this.timeList = this.timeListDepart
         }
-        this.departType = type
         if(type == 3) {
           this.isEffectTimeSelect = false
           this.dialogDate = true
@@ -384,7 +384,7 @@
               type: 'shadow'
             },
             formatter: function(data) {
-              let name = `<ai-open-data type="userName" :openid="${this.departBarData[data[0].dataIndex].deptId}" class="name"></ai-open-data><br/>宣发任务数：${data[0].data}`
+              let name = `<ai-open-data type="departmentName" openid="${this.departBarData[data[0].dataIndex].deptId}" class="name"></ai-open-data><br/>宣发任务数：${data[0].data}`
               return name
             }
           },

From ec70dc13bc1f31af1ca3c9733b38d7c5ff2bae4d Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 28 Jul 2022 10:52:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=A3=E5=8F=91=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue b/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
index e4a6dace..fb5267ca 100644
--- a/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
+++ b/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
@@ -384,7 +384,8 @@
               type: 'shadow'
             },
             formatter: function(data) {
-              let name = `<ai-open-data type="departmentName" openid="${this.departBarData[data[0].dataIndex].deptId}" class="name"></ai-open-data><br/>宣发任务数：${data[0].data}`
+              var index = data[0].dataIndex
+              let name = `<ai-open-data type="departmentName" openid="${this.departBarData[index].deptId}" class="name"></ai-open-data><br/>宣发任务数：${this.departBarData[index].taskCount}`
               return name
             }
           },