From 9a75f0b343c03bd71717a29a694e028f4c16f82b Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 22 Jul 2022 13:54:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A3=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cooperationDetail.vue                     | 85 +++++++++++--------
 .../saas/AppCooperationPropaganda/detail.vue  |  2 +-
 2 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
index 5c299241..99e4d4c0 100644
--- a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
+++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
@@ -31,20 +31,27 @@
             数据更新于<span>{{ info.remindTime }}</span>
           </div>
           <div class="pie_card">
-            <div v-show="info.executedCount != null" id="pieEcharts"></div>
-            <AiEmpty description="暂无数据" v-show="info.executedCount == null" />
+            <div  id="pieEcharts"></div>
             <div class="pie_right">
               <div>
-                计划送达居民群: <span>{{ info.planCount || 0 }}</span>
+                <span v-show="tabIndex==0">计划送达居民:</span>
+                <span v-show="tabIndex==1">计划送达居民群:</span>
+                <span>{{ info.planCount || 0 }}</span>
               </div>
               <div>
-                未送达居民群: <span>{{ info.unExecutedCount || 0 }}</span>
+                <span v-show="tabIndex==0">未送达居民:</span>
+                <span v-show="tabIndex==1">未送达居民群:</span>
+                <span>{{ info.unExecutedCount || 0 }}</span>
               </div>
               <div>
-                已送达居民群: <span>{{ info.executedCount || 0 }}</span>
+                <span v-show="tabIndex==0">已送达居民:</span>
+                <span v-show="tabIndex==1">已送达居民群:</span>
+                <span>{{ info.executedCount || 0 }}</span>
               </div>
               <div>
-                无法送达居民群: <span>{{ info.cannotExecuteCount || 0 }}</span>
+                <span v-show="tabIndex==0">无法送达居民:</span>
+                <span v-show="tabIndex==1">无法送达居民群:</span>
+                <span>{{ info.cannotExecuteCount || 0 }}</span>
               </div>
             </div>
           </div>
@@ -60,13 +67,27 @@
           <AiTable
             :data="tableData"
             :colConfigs="colConfigs0"
-            v-if="tabIndex == 0"
-          />
+            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"
-          />
+            v-if="tabIndex == 1 && 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>
+          <AiEmpty v-if="!tableData.length" description="暂无数据"></AiEmpty>
         </div>
       </div>
     </div>
@@ -100,25 +121,15 @@ export default {
   computed: {
     colConfigs0() {
       return [
-        {
-          label: "成员",
-          prop: "groupOwnerId",
-          width: "240rpx",
-          dict: "householdRelation",
-        },
-        { label: "预计未送达居民", prop: "groupCount" },
+        { slot: "groupOwnerId",label: "成员" },
+        { label: "预计送达居民群", prop: "groupCount" }
       ];
     },
     colConfigs1() {
       return [
-        {
-          label: "居民群",
-          prop: "groupName",
-          width: "240rpx",
-          dict: "householdRelation",
-        },
-        { label: "群人数", prop: "memberCount", width: "200rpx" },
-        { label: "群主", prop: "groupOwnerId", dict: "sex" },
+        { label: "居民群",prop: "groupName" },
+        { label: "群人数", prop: "memberCount"},
+        { slot: "groupOwnerId",label: "群主"}
       ];
     },
   },
@@ -129,6 +140,7 @@ export default {
   methods: {
     tabClick(index) {
       this.tabIndex = index;
+      this.getStatistics()
     },
 
     toDetail() {
@@ -171,12 +183,12 @@ export default {
         this.$u.toast(msg);
       }
     },
-
+    // 切换分段器
     changeSub(index) {
       this.subIndex = index;
       this.getStatistics()
     },
-
+    // 获取数据
     getStatistics() {
       this.$http
         .post(`/app/appmasssendingtask/detailStatistics`, null, {
@@ -189,26 +201,26 @@ export default {
         })
         .then((res) => {
           if (res?.data) {
-            this.tableData = res.data.executedList;
+            this.info = res.data
+            this.tableData = res.data.executedList.records
           }
           this.getPieEcharts()
         });
     },
 
-    // 带百分比饼图
+    // 饼图
     getPieEcharts() {
       this.pieEcharts = echarts.init(document.getElementById("pieEcharts"));
       this.pieEcharts.setOption({
         tooltip: {
           trigger: "item",
-          formatter: "{a} <br/>{b}: {c} ({d}%)",
         },
         color: ["#1684fc", "#ccc"],
         series: [
           {
             name: "群发送达率",
             type: "pie",
-            radius: ["65", "50%"],
+            radius: ["50%", "70%"],
             avoidLabelOverlap: false,
             label: {
               normal: {
@@ -221,7 +233,7 @@ export default {
             },
             data: [
               {
-                value: 10,
+                value: this.info.executedCount,
                 name: "群发送达率",
                 label: {
                   normal: {
@@ -233,7 +245,7 @@ export default {
                   },
                 },
               },
-              { value: 120 },
+              { value: this.info.unExecutedCount },
             ],
           },
         ],
@@ -255,6 +267,11 @@ export default {
   ::v-deep .AiTopFixed .content {
     padding: 0;
   }
+  ::v-deep .emptyWrap {
+    border: 2px solid #D0D4DC;
+    border-radius: 8px;
+    padding-bottom: 20px;
+  }
   .tab-select {
     width: 100%;
     height: 96px;
@@ -359,7 +376,7 @@ export default {
   }
 
   .list_content {
-    padding: 0 32px;
+    padding: 0 32px 32px 32px;
     box-sizing: border-box;
 
     .list_card {
diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue
index ede90097..b6b3f085 100644
--- a/src/project/saas/AppCooperationPropaganda/detail.vue
+++ b/src/project/saas/AppCooperationPropaganda/detail.vue
@@ -39,7 +39,7 @@
         <p>群发内容</p>
         <div>
           <!-- 文本 -->
-          <div class="textarea" v-show="content.length">{{ content[0].content }}</div>
+          <div class="textarea" v-show="content && content.length>0">{{ content[0].content }}</div>
           <!-- 图片 -->
           <div class="pictures" v-show="picList.length">
             <image v-for="(item, index) in picList" :key="index" :src="item.imgPicUrl" @click.stop="previewImages(picList, item.imgPicUrl)"/>