From e9574cf236f45aa48ccc8c81a29ae560555ccf04 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 28 Feb 2023 13:48:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E7=8A=B6=E5=9B=BE0%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCooperationPropagandaBeta.vue                |  2 +-
 .../AppCooperationPropaganda/circleDetail.vue       | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
index aa67d347..0afd0519 100644
--- a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
@@ -154,7 +154,7 @@ export default {
       if(this.tabIndex == 0) {
         uni.navigateTo({url: `./cooperationDetail?id=${item.id}&time=${item.createTime}`})
       } else {
-        uni.navigateTo({url: `./circleDetail??id=${item.id}&time=${item.createTime}&type=${this.sendType}`})
+        uni.navigateTo({url: `./circleDetail??id=${item.id}&type=${this.sendType}`})
       }
     },
     searchBtn() {
diff --git a/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue b/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
index 23276f64..043dacde 100644
--- a/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
@@ -6,7 +6,7 @@
           <div>{{ detail.taskTitle }} <span :class="detail.status==0? 'status0': detail.status==1? 'status1': detail.status==2? 'status2':
            detail.status == 3? 'status3':detail.status==4? 'status4': 'status5'">{{ $dict.getLabel('mstStatus', detail.status) }}</span></div>
           <div>
-            创建时间: <span>{{ createTime }}</span> 
+            创建时间: <span>{{ detail.createTime }}</span> 
           </div>
         </div>
         <div class="header_right" @click="toDetail">查看详情</div>
@@ -75,7 +75,6 @@ export default {
       pieEcharts: null,
       subIndex: 0,
       tableData: [],
-      createTime: "",
       id: "",
       info: {},
       current: 1,
@@ -90,6 +89,7 @@ export default {
       ],
       update: true,
       type: "",
+      percent: 0,
     };
   },
   computed: {
@@ -102,7 +102,6 @@ export default {
   },
   onLoad(o) {
     this.id = o.id;
-    this.createTime = o.time;
     this.type = o.type
   },
   methods: {
@@ -192,7 +191,7 @@ export default {
         tooltip: {
           show: false,
         },
-        color: ["#1684fc", "#ccc"],
+        color: ["#1684fc","#ccc"],
         series: [
           {
             name: "任务完成率",
@@ -216,8 +215,8 @@ export default {
                   normal: {
                     show: true,
                     formatter: ({ name, value }) => {
-                      let num = value / this.info.planCount * 100
-                      return `{name|任务达成率\n\n}{value|${num}%}`
+                      this.percent = value / this.info.planCount * 100 || 0
+                      return `{name|任务达成率\n\n}{value|${ this.percent }%}`
                     },
                     textStyle: {
                       fontSize: 16,
@@ -236,7 +235,7 @@ export default {
                 },
               },
               { 
-                value: this.info.planCount - this.info.executedCount ,
+                value: 100 - this.percent,
                 name: "未执行成员"
               },
             ],