From 81752640f23d661939c3dca33f97420ac08f6192 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 25 Jul 2022 11:15:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../saas/AppCooperationPropaganda/detail.vue  |  3 +-
 .../AppPropagandaStatistics.vue               | 49 +++++++++----------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue
index fb6b6054..18c66c25 100644
--- a/src/project/saas/AppCooperationPropaganda/detail.vue
+++ b/src/project/saas/AppCooperationPropaganda/detail.vue
@@ -68,7 +68,8 @@
             <p>小程序地址</p>
             <navigator target="miniProgram" open-type="navigate" 
              v-for="(item, index) in webpage" :key="index"
-             :app-id="item.mpAppid" path="item.mpPage" version="release"></navigator>
+             :app-id="item.mpAppid" path="item.mpPage" version="release"
+             >{{item.mpTitle}}</navigator>
           </div>
 
         </div>
diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
index 1600050f..104b0951 100644
--- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
+++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
@@ -14,9 +14,7 @@
         <div class="itemYesterday">昨天<span>{{ nowMonth }}.{{ nowDate - 1 }}</span></div>
 
         <div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length">
-          <div v-if="calendarList[nowDate - 1].taskList.length <= 2">
-            <div v-for="(item,index) in calendarList[nowDate - 1].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
-          </div>
+          <div v-for="(item,index) in calendarList[nowDate - 1].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
           <div v-if="calendarList[nowDate - 1].taskList.length > 2 && showYes">
             <div v-for="(item,index) in calendarList[nowDate - 1].taskList.slice(2, calendarList[nowDate - 1].taskList.length)" :key="index">{{item.taskTitle}}</div>
           </div>
@@ -30,14 +28,12 @@
         <div class="itemToday">今天<span>{{ nowMonth }}.{{ nowDate }}</span></div>
 
         <div v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length">
-          <div v-if="calendarList[nowDate].taskList.length <=2">
-            <div v-for="(item,index) in calendarList[nowDate].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
-          </div>
-          <div v-if="calendarList[nowDate].taskList.length > 2" && showTo>
+          <div v-for="(item,index) in calendarList[nowDate].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
+          <div v-if="calendarList[nowDate].taskList.length > 2 && showTo">
             <div v-for="(item,index) in calendarList[nowDate].taskList.slice(2, calendarList[nowDate].taskList.length)" :key="index">{{item.taskTitle}}</div>
           </div>
         </div>
-        <div v-if="!!!(calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length>0)">今日暂无宣发任务</div>
+        <div v-if="!(calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length>0)">今日暂无宣发任务</div>
         <div class="isShow" v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length && calendarList[nowDate].taskList.length > 2" @click="showTo=!showTo">{{ showTo ? "收起" : "展开" }}</div>
       </div>
 
@@ -46,10 +42,8 @@
         <div class="itemTomorrow">明天<span>{{ nowMonth }}.{{ nowDate + 1 }}</span></div>
 
         <div v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length">
-          <div v-if="calendarList[nowDate + 1].taskList.length <= 2">
-            <div v-for="(item,index) in calendarList[nowDate + 1].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
-          </div>
-          <div v-if="calendarList[nowDate + 1].taskList.length > 2" && showTom>
+          <div v-for="(item,index) in calendarList[nowDate + 1].taskList.slice(0, 2)" :key="index">{{item.taskTitle}}</div>
+          <div v-if="calendarList[nowDate + 1].taskList.length > 2 && showTom">
             <div v-for="(item,index) in calendarList[nowDate + 1].taskList.slice(2, calendarList[nowDate + 1].taskList.length)" :key="index">{{item.taskTitle}}</div>
           </div>
         </div>
@@ -249,6 +243,7 @@ export default {
     this.getData();
     this.getColData();
     this.getNowDate();
+    // console.log(WWOpenData);
   },
   mounted() {
     this.getBrokenEcharts1();
@@ -567,26 +562,28 @@ export default {
         })
         .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 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) => {
+            res.data.map((item) => {
               var i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
               items.push(i)
               xData.push(item.deptId)
               yData.push(item.taskCount)
             })
+            // data.map((item) => {
+            //   var 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哈哈哈');