From 1eb989b0bf6667feda20d9c11364387062b5c54f Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 25 Jul 2022 10:46:48 +0800
Subject: [PATCH] =?UTF-8?q?v-show=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cooperationDetail.vue                     | 17 ++-----
 .../AppCooperationPropaganda/selectUser.vue   |  4 +-
 .../AppPropagandaStatistics.vue               | 47 +++++++++++++------
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
index da6953fe..73c71be9 100644
--- a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
+++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
@@ -64,22 +64,11 @@
           <div class="tab">
             <u-subsection :list="subsection" :current="subIndex" @change="changeSub"></u-subsection>
           </div>
+
           <AiTable
             :data="tableData"
-            :colConfigs="colConfigs0"
-            v-if="tabIndex == 0 && tableData.length">
-            <u-td slot="groupOwnerId" align="center">
-              <template #slot="{ row }">
-                <p>{{row}}</p>
-                <AiOpenData v-if="row.groupOwnerId" type="userName" :openid="row.groupOwnerId"/>
-              </template>
-            </u-td>
-          </AiTable>
-          <AiTable
-            :data="tableData"
-            :colConfigs="colConfigs1"
-            v-if="tabIndex == 1 && tableData.length"
-          >
+            :colConfigs="tabIndex==0? colConfigs0 : colConfigs1"
+            v-if="tableData.length">
             <u-td slot="groupOwnerId" align="center">
               <template #slot="{ row }">
                 <p>{{row}}</p>
diff --git a/src/project/saas/AppCooperationPropaganda/selectUser.vue b/src/project/saas/AppCooperationPropaganda/selectUser.vue
index acf41f78..c440e9b5 100644
--- a/src/project/saas/AppCooperationPropaganda/selectUser.vue
+++ b/src/project/saas/AppCooperationPropaganda/selectUser.vue
@@ -3,8 +3,8 @@
     <div class="header-middle">
       <div class="userCards" v-for="e in userList" :key="e.id">
         <div class="imges">
-          <div class="imgselect" :class="{checked:e.isChecked}" @click.stop="itemCheck(e)" />
-          <img src="./images/tx@2x.png" alt="" class="avatras"/>
+          <div class="imgselect" :class="{ checked: e.isChecked }" @click.stop="itemCheck(e)" />
+          <img src="./images/tx@2x.png" alt="" class="avatras"/> {{e}}
         </div>
         <div class="rights fill">
           <div class="applicationNames">
diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
index b8f44bc5..1600050f 100644
--- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
+++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
@@ -14,10 +14,10 @@
         <div class="itemYesterday">昨天<span>{{ nowMonth }}.{{ nowDate - 1 }}</span></div>
 
         <div v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length">
-          <div v-show="calendarList[nowDate - 1].taskList.length <= 2">
+          <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-show="calendarList[nowDate - 1].taskList.length > 2 && showYes">
+          <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>
         </div>
@@ -30,14 +30,14 @@
         <div class="itemToday">今天<span>{{ nowMonth }}.{{ nowDate }}</span></div>
 
         <div v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length">
-          <div v-show="calendarList[nowDate].taskList.length <=2">
+          <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-show="calendarList[nowDate].taskList.length > 2" && showTo>
+          <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)">今日暂无宣发任务</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 +46,10 @@
         <div class="itemTomorrow">明天<span>{{ nowMonth }}.{{ nowDate + 1 }}</span></div>
 
         <div v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length">
-          <div v-show="calendarList[nowDate + 1].taskList.length <= 2">
+          <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-show="calendarList[nowDate + 1].taskList.length > 2" && showTom>
+          <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>
@@ -567,22 +567,39 @@ 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 items = [], xData = [], yData = []
-            res.data.map((item) => {
+            // 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) => {
               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) => {
-              data.items.map((i) => {
-                xData.push(i.data)
-              })
-              this.getColumnarEcharts(xData, yData)
-            })
+            // this.initOpenData({canvas:true})
+            // this.transCanvas(items).then((data) => {
+            //   console.log(data,'data哈哈哈');
+            //   data.items.map((i) => {
+            //     xData.push(i.data)
+            //   })
+            //   this.getColumnarEcharts(xData, yData)
+            // })
+            this.getColumnarEcharts(xData, yData)
           }
         });
     },
+    // 柱状图
     getColumnarEcharts(xData, yData) {
       this.columnarEcharts = echarts.init(
         document.getElementById("columnarEcharts")