From 62758968ee9ffc0c9fccf5388f0c466307b48d7f Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 12 Aug 2024 18:11:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0status=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeach.vue         |  4 ++--
 src/views/faceteach/FaceTeachStuSign.vue  |  4 ++--
 src/views/liveBroadcast/LiveBroadcast.vue | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 772c24e..a17f8f7 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -72,14 +72,14 @@
                 new Date(data.planDto?.beginTime).getTime() >
                 new Date().getTime()
                   ? '#999'
-                  : data.isSurvery
+                  : data.isSurvery && data.status == 1
                   ? '#999'
                   : 'rgb(57, 146, 249)'
               }`,
             }"
             class="btn"
             @click="toSurvery"
-          >{{ data.isSurvery ? "已评估" : "评估" }}
+          >{{ data.isSurvery && data.status == 1 ? "已评估" : "评估" }}
           </botton>
         </div>
       </div>
diff --git a/src/views/faceteach/FaceTeachStuSign.vue b/src/views/faceteach/FaceTeachStuSign.vue
index d7fab5b..61810fd 100644
--- a/src/views/faceteach/FaceTeachStuSign.vue
+++ b/src/views/faceteach/FaceTeachStuSign.vue
@@ -72,14 +72,14 @@
                 new Date(data.planDto?.beginTime).getTime() >
                 new Date().getTime()
                   ? '#999'
-                  : data.isSurvery
+                  : data.isSurvery && data.status == 1
                   ? '#999'
                   : 'rgb(57, 146, 249)'
               }`,
             }"
             class="btn"
             @click="toSurvery"
-          >{{ data.isSurvery ? "已评估" : "评估" }}
+          >{{ data.isSurvery && data.status == 1 ? "已评估" : "评估" }}
           </botton>
         </div>
       </div>
diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue
index 796ee55..efb0699 100644
--- a/src/views/liveBroadcast/LiveBroadcast.vue
+++ b/src/views/liveBroadcast/LiveBroadcast.vue
@@ -71,18 +71,18 @@
           </botton> -->
 
           <botton :style="{
-		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(59, 191, 252)'}`,
+		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery && data.status == 1 ? '#999' : 'rgb(59, 191, 252)'}`,
 	}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{
-              data.isSurvery ? "已评估" :
+              data.isSurvery && data.status == 1 ? "已评估" :
                   "评估"
             }}
           </botton>
         </div>
         <div v-else class="threeBtn">
           <botton :style="{
-		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(59, 191, 252)'}`,
-	}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1&&data.isSurvery">{{
-              data.isSurvery ? "已评估" :
+		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery && data.status == 1 ? '#999' : 'rgb(59, 191, 252)'}`,
+	}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1&&data.isSurvery && data.status == 1">{{
+              data.isSurvery && data.status == 1 ? "已评估" :
                   "评估"
             }}
           </botton>
@@ -109,9 +109,9 @@
           </botton> -->
 
           <botton :style="{
-		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(59, 191, 252)'}`,
+		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery && data.status == 1 ? '#999' : 'rgb(59, 191, 252)'}`,
 	}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{
-              data.isSurvery ? "已评估" :
+              data.isSurvery && data.status == 1 ? "已评估" :
                   "评估"
             }}
           </botton>

From 64db7e768d9a1e556a62e03bb9a4fed979afae89 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 22 Aug 2024 11:51:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=AF=BC=E8=87=B4=E7=9A=84=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/useCommon.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/useCommon.js b/src/api/useCommon.js
index 35f0cbc..da581cd 100644
--- a/src/api/useCommon.js
+++ b/src/api/useCommon.js
@@ -36,9 +36,9 @@ export function useTaskPage() {
                 query: {
                     id: d.id,
                     type: type,
-                    infoId: info.id,
+                    infoId: info.value.projectId,
                     courseId: d.courseId,
-                    pName: info.name,
+                    pName: info.value.name,
                     sName: d.stageName,
                     chapterOrStageId: d.stageId,
                     btype: type