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

---
 .../AppPropagandaStatistics.vue               | 52 ++++++++++++++-----
 .../AppPropagandaStatistics/calendarInfo.vue  |  2 +-
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
index 28077f2a..7bbaf3cc 100644
--- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
+++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
@@ -9,27 +9,52 @@
       ></u-section>
     </div>
     <div class="threeDays">
+      <!-- 昨天 -->
       <div class="yesterday">
         <div class="itemYesterday">昨天<span>{{ nowMonth }}.{{ nowDate - 1 }}</span></div>
-        <div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0 && calendarList[nowDate - 1].taskList.length <= 2">晴风小区志愿者活动</div>
-        <div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0 && calendarList[nowDate - 1].taskList.length > 2">晴风小区志愿者活动</div>
+
+        <div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0">
+          <div v-show="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-show="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>
+        </div>
         <div v-if="!(calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0)">今日暂无宣发任务</div>
-        <div class="isShow" v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0 && calendarList[nowDate - 1].taskList.length > 2" @click="showMore()">{{ isShow ? "收起" : "展开" }}</div>
+        <div class="isShow" v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0 && calendarList[nowDate - 1].taskList.length > 2" @click="showYes = !showYes">{{ showYes ? "收起" : "展开" }}</div>
       </div>
+
+      <!-- 今天 -->
       <div class="today">
         <div class="itemToday">今天<span>{{ nowMonth }}.{{ nowDate }}</span></div>
-        <div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0 && calendarList[nowDate - 1].taskList.length <=2">晴风小区志愿者活动</div>
-        <div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0 && calendarList[nowDate - 1].taskList.length > 2">晴风小区志愿者活动</div>
-        <div v-if="!(calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0)">今日暂无宣发任务</div>
-        <div class="isShow" v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0 && calendarList[nowDate - 1].taskList.length > 2" @click="showMore()">{{ isShow ? "收起" : "展开" }}</div>
+
+        <div v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length > 0">
+          <div v-show="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-show="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 class="isShow" v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length > 0 && calendarList[nowDate].taskList.length > 2" @click="showTo=!showTo">{{ showTo ? "收起" : "展开" }}</div>
       </div>
+
+      <!-- 明天 -->
       <div class="tomorrow">
         <div class="itemTomorrow">明天<span>{{ nowMonth }}.{{ nowDate + 1 }}</span></div>
-        <div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0 && calendarList[nowDate - 1].taskList.length <= 2">晴风小区志愿者活动 </div>
-        <div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0 && calendarList[nowDate - 1].taskList.length > 2">晴风小区志愿者活动 </div>
-        <div v-if="!(calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0)"> 今日暂无宣发任务</div>
-        <div class="isShow" v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length > 0 && calendarList[nowDate - 1].taskList.length > 2" @click="showMore()">{{ isShow ? "收起" : "展开" }}</div>
-        <span></span>
+
+        <div v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length > 0">
+          <div v-show="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-show="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>
+        <div v-if="!(calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length > 0)">今日暂无宣发任务</div>
+        <div class="isShow" v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length > 0 && calendarList[nowDate + 1].taskList.length > 2" @click="showTom=!showTom">{{ showTom ? "收起" : "展开" }}</div>
       </div>
     </div>
 
@@ -194,6 +219,9 @@ export default {
       columnarEcharts: null,
       filterShow: false,
       customShow: false,
+      showYes: false,
+      showTo: false,
+      showTom: false,
       timeList: ["近7天", "近30天", "近1年", "自定义"],
       timeSelect: 0,
       start: "",
diff --git a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue
index 74e8efde..79fbb8e6 100644
--- a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue
+++ b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue
@@ -11,7 +11,7 @@
           </div>
         </div>
         <div v-show="show">
-          <div v-for="(item, index) in list.slice(0,list.length - 2)" :key="index" 
+          <div v-for="(item, index) in list.slice(2, list.length)" :key="index" 
            :class="{'color1': index % 4 == 2,'color2': index % 4 == 3,'color3': index % 4 == 0,'color4': index % 4 == 1 }" class="daily_item">
             <div>{{ item.createTime.substring(10, 16) }}</div>
             <div>{{ item.taskTitle }}</div>