From d1d4287c0660b32fba0adbb11323c3091d6b3b57 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 14 Jul 2022 16:44:21 +0800
Subject: [PATCH] bug

---
 src/apps/AppMonitoringObject/Add.vue          |  2 +-
 .../AppPropagandaStatistics.vue               | 43 ++++++++++++-------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index a262f194..ed9db1d0 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -507,7 +507,7 @@ export default {
         foreignWorkersAddress: '',
         houseIdNumber: '',
         familyCount: '',
-        houseType: '',
+        houseType: '1',
       },
       $areaId: '',
       girdInfo: {},
diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
index 2bb2d66d..9b32b4c4 100644
--- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
+++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
@@ -2,20 +2,22 @@
   <div class="AppPropagandaStatistics">
     <div class="calendar_header">
       <u-section title="宣发日历" :show-line="false"  sub-title="查看更多" @click="readMore"></u-section>
-      <!-- <div>{{ calendarList[nowDate - 1] }}</div> -->
     </div>
     <div class="threeDays">
       <div class="yesterday">
-        <div class="itemYesterday">昨天<span>{{ calendarList[nowDate - 1] }}</span></div>
-        <div>晴风小区志愿者活动</div>
+        <div class="itemYesterday">昨天<span>{{ nowMonth }}.{{ nowDate - 1 }}</span></div>
+        <!-- <div v-if="calendarList[nowDate - 1].taskList">晴风小区志愿者活动</div> -->
+        <!-- <div v-if="!calendarList[nowDate - 1].taskList">今日暂无宣发任务</div> -->
       </div>
       <div class="today">
-        <div class="itemToday">今天<span>11:51</span></div>
-        <div>晴风小区志愿者活动</div>
+        <div class="itemToday">今天<span>{{ nowMonth }}.{{ nowDate }}</span></div>
+        <!-- <div v-if="calendarList[nowDate].taskList">晴风小区志愿者活动</div> -->
+        <!-- <div v-if="!calendarList[nowDate].taskList">今日暂无宣发任务</div> -->
       </div>
       <div class="tomorrow">
-        <div class="itemTomorrow">明天<span>11:51</span></div>
-        <div @click="showMore(index)">晴风小区志愿者活动</div>
+        <div class="itemTomorrow">明天<span>{{ nowMonth }}.{{ nowDate + 1 }}</span></div>
+        <!-- <div v-if="calendarList[nowDate + 1].taskList">晴风小区志愿者活动</div> -->
+        <!-- <div v-if="!calendarList[nowDate + 1].taskList">今日暂无宣发任务</div> -->
         <div class="isShow" @click="showMore()">{{ isShow ? '收起' : '展开' }}</div>
         <span></span>
       </div>
@@ -128,6 +130,7 @@ export default {
       start: '',
       end: '',
       deptList: [],
+      nowMonth: '',
       nowDate: '',
       calendarList: [],
       colData: {},
@@ -136,20 +139,22 @@ export default {
       departId: '',
       startTime: '',
       endTime: '',
+      x: [],
     }
   },
   
   onShow() {
     document.title = '宣发统计'
     this.getData()
+    this.getColData()
     this.getNowDate()
+    this.getBrokenDate()
   },
   mounted() {
     this.getBrokenEcharts1()
     this.getBrokenEcharts2()
     this.getBrokenEcharts3()
     this.getColumnarEcharts()
-    this.getColData()
   },
   methods: {
     showMore() {},
@@ -197,14 +202,12 @@ export default {
     getNowDate() {
       let date = new Date()
       this.nowDate = date.getDate()
-      // console.log(this.nowDate);
+      this.nowMonth = date.getMonth() + 1
     },
     // 宣发日历
     getData() {
       this.$http.post(`/app/appmasssendingtask/statisticsCalendar`, null, {
-        params: {
-
-        }
+        params: {}
       }).then((res)=> {{
         if(res?.data) {
           this.calendarList = res.data
@@ -220,11 +223,19 @@ export default {
           type: this.timeSelect,
           startTime: this.startTime,
           endTime: this.endTime,
-          departId: this.departId
+          // departId: this.departId
         }
       }).then(res=>{
         if(res?.data) {
-          console.log(res);
+          if(this.timeType == 0) {
+            this.x = res.data.trend.map(e=> e.ymd.substring(5,7) + '月' + e.ymd.substring(8,10) + '日')
+          } else if (this.timeType == 1) {
+            this.x = res.data.trend.map(e=> e.ymd.substring(5,7) + '月' + e.ymd.substring(8,10) + '日')
+          } else if (this.timeType == 2) {
+            this.x = res.data.trend.map(e=> e.ymd.substring(0,4) + '年' + e.ymd.substring(5,7) + '月')
+          }
+
+          
         }
       })
     },
@@ -258,7 +269,7 @@ export default {
           axisLine: {
             show: false,
           },
-          data: ['2月', '3月', '4月', '5月', '6月', '7月']
+          data: this.x
         },
         yAxis: {
           type: 'value',
@@ -400,7 +411,7 @@ export default {
           type: this.detailType
         }
       }).then(res=> {
-        console.log(res);
+        // console.log(res);
         if(res?.data) {
           console.log(res);
           this.colData = res.data