From 316add99113df4950bfd6e85f51ebadbc60176e1 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 11:38:13 +0800
Subject: [PATCH 01/28] =?UTF-8?q?fix:=E9=99=90=E5=88=B6=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=80=BC=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue         | 5 +++--
 src/components/drawers/AddFaceteach.vue      | 6 +++---
 src/components/drawers/AddLive.vue           | 6 +++---
 src/components/drawers/AddTest.vue           | 4 ++--
 src/components/drawers/CommonTest.vue        | 4 ++--
 src/views/courselibrary/CoursewareManage.vue | 4 ++--
 src/views/projectcenter/TaskPage.vue         | 2 +-
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 8f668a16..8fafe686 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -76,6 +76,7 @@
             <div class="btnbox">
               <a-input-number
                   :min="0"
+                  :max="999999"
                   :precision="0"
                   style="width: 400px; height: 40px; border-radius: 8px"
                   v-model:value="formData.activityDuration"
@@ -153,7 +154,7 @@
                   <span>活动开始前：</span>
                   <a-input-number
                       :min="0"
-                      :max="30"
+                      :max="999999"
                       :precision="0"
                       style="
                       width: 88px;
@@ -171,7 +172,7 @@
                   <span>活动开始后：</span>
                   <a-input-number
                       :min="0"
-                      :max="30"
+                      :max="999999"
                       :precision="0"
                       style="
                       width: 88px;
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index a1b2a248..788014a5 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -126,7 +126,7 @@
             <div class="select">
               <a-input-number
                   :min="0"
-                  :max="300"
+                  :max="999999"
                   :precision="0"
                   style="width: 400px; height: 40px; border-radius: 8px;"
                   v-model:value="duration"
@@ -180,7 +180,7 @@
                   <span>开始前：</span>
                   <a-input-number
                       :min="0"
-                      :max="300"
+                      :max="999999"
                       :precision="0"
                       style="
                       width: 100px;
@@ -196,7 +196,7 @@
                   <span>开始后：</span>
                   <a-input-number
                       :min="0"
-                      :max="300"
+                      :max="999999"
                       :precision="0"
                       style="
                       width: 100px;
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index a9a1a555..c5810746 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -60,7 +60,7 @@
               <span style="margin-right: 3px">直播时长：</span>
             </div>
             <div class="btnbox">
-              <a-input-number :min="0" :max="300" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
+              <a-input-number :min="0" :max="999999" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
                 v-model:value="formData.liveDuration"></a-input-number>
               <span style="color: #999999; margin-left: 8px">分钟</span>
             </div>
@@ -158,7 +158,7 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>直播开始前：</span>
-                  <a-input-number :min="0" :max="30" :precision="0" style="
+                  <a-input-number :min="0" :max="999999" :precision="0" style="
                                                 width: 88px;
                                                 height: 32px;
                                                 border-radius: 8px;
@@ -168,7 +168,7 @@
                 </div>
                 <div class="timerbox">
                   <span>直播开始后：</span>
-                  <a-input-number :min="0" :max="30" :precision="0" style="
+                  <a-input-number :min="0" :max="999999" :precision="0" style="
                                                 width: 88px;
                                                 height: 32px;
                                                 border-radius: 8px;
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 58009db8..0f1ba24b 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -96,7 +96,7 @@
               <span style="margin-right: 3px">考试时长：</span>
             </div>
             <div class="select">
-              <a-input-number :disabled="taskIndex >= 0  && isEdit" :min="0" :max="300" :precision="0"
+              <a-input-number :disabled="taskIndex >= 0  && isEdit" :min="0" :max="999999" :precision="0"
                 style="width: 400px; height: 40px; border-radius: 8px"
                 v-model:value="formData.examinationDuration"></a-input-number>
               <span style="color: #999999; margin-left: 8px">分钟</span>
@@ -133,7 +133,7 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>允许重复考试：</span>
-                  <a-input-number :disabled="taskIndex >= 0 && isEdit" :min="-1" :max="300" :precision="0" style="
+                  <a-input-number :disabled="taskIndex >= 0 && isEdit" :min="-1" :max="999999" :precision="0" style="
                           width: 100px;
                           height: 32px;
                           border-radius: 8px;
diff --git a/src/components/drawers/CommonTest.vue b/src/components/drawers/CommonTest.vue
index f6e03c38..cee6587b 100644
--- a/src/components/drawers/CommonTest.vue
+++ b/src/components/drawers/CommonTest.vue
@@ -118,7 +118,7 @@
             <div class="select">
               <a-input-number
                   :min="0"
-                  :max="300"
+                  :max="999999"
                   :precision="0"
                   style="width: 400px; height: 40px; border-radius: 8px"
                   v-model:value="formData.examinationDuration"
@@ -171,7 +171,7 @@
                   <span>允许重复考试：</span>
                   <a-input-number
                       :min="-1"
-                      :max="300"
+                      :max="999999"
                       :precision="0"
                       style="
                       width: 100px;
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index e46c0663..e672aa0d 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1005,7 +1005,7 @@
                 <span>开始前：</span>
                 <a-input-number
                   :min="0"
-                  :max="300"
+                  :max="999999"
                   :precision="0"
                   style="
                     width: 100px;
@@ -1021,7 +1021,7 @@
                 <span>开始后：</span>
                 <a-input-number
                   :min="0"
-                  :max="300"
+                  :max="999999"
                   :precision="0"
                   style="
                     width: 100px;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index ed8e52cc..c9de556f 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1750,7 +1750,7 @@
             <div class="in">
               <a-input-number
                 :min="0"
-                :max="300"
+                :max="999999"
                 :precision="0"
                 style="width: 395px; height: 40px; border-radius: 8px"
                 v-model:value="groupInfo.groupMemberCount"

From bae62258e78066a8623cc264a8c1cad9b7a52871 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 12:36:33 +0800
Subject: [PATCH 02/28] =?UTF-8?q?fix:=E7=82=B9=E5=87=BB=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E8=B7=B3=E8=BD=AC=E8=AF=84=E4=BC=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=87=AA=E5=8A=A8=E6=89=93=E5=BC=80=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AssessmentAll.vue |  2 +-
 src/views/research/ResearchManage.vue    | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue
index 8384985c..92252e83 100644
--- a/src/components/drawers/AssessmentAll.vue
+++ b/src/components/drawers/AssessmentAll.vue
@@ -192,7 +192,7 @@ function reset() {
 
 const goResearchmanage = () => {
   // router.push({ path: "/researchmanage" });
-  window.open(process.env.VUE_APP_BASE + "/researchmanage");
+  window.open(process.env.VUE_APP_BASE + "/researchmanage?openCreate=true");
 };
 </script>
 <style lang="scss">
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 21eab1d3..28b4eb0c 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -156,7 +156,7 @@
   </div>
 </template>
 <script setup>
-import {ref} from "vue";
+import {ref,onMounted} from "vue";
 import {createResearch, deleteResearch, editAssessmentName, editReleaseStatus,} from "@/api/indexResearch";
 import {checkPer} from "@/utils/utils";
 import {Form, message} from "ant-design-vue";
@@ -275,6 +275,15 @@ const formData = ref({
   validated: 0,
 });
 
+onMounted(() => {
+  // 是否需要触发新建弹框
+  let str = location.href;
+  let isOpen = str.includes("openCreate=true");
+  if(isOpen){
+    newNext.value = true;
+  }
+});
+
 const newNext = ref(false);
 const dateTime = ref([]);
 const nameRef = ref();

From fc23e28da59d7b95ef7c17144bdbad40851f64b2 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 8 Mar 2023 12:43:45 +0800
Subject: [PATCH 03/28] -- fix

---
 .../student/OnlineClassModelStudent.vue       | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue
index 452b83ba..aed74167 100644
--- a/src/components/student/OnlineClassModelStudent.vue
+++ b/src/components/student/OnlineClassModelStudent.vue
@@ -206,24 +206,24 @@ const columns = ref([
     ellipsis: true,
     customRender: () => "-",
   },
-  {
-    title: "评估状态",
-    dataIndex: "status",
-    key: "status",
-    width: 80,
-    align: "center",
-    ellipsis: true,
-    customRender: () => "-",
-  },
-  {
-    title: "考试成绩",
-    dataIndex: "score",
-    key: "score",
-    width: 80,
-    align: "center",
-    ellipsis: true,
-    customRender: ({ record: { score } }) => score || "-",
-  },
+  // {
+  //   title: "评估状态",
+  //   dataIndex: "status",
+  //   key: "status",
+  //   width: 80,
+  //   align: "center",
+  //   ellipsis: true,
+  //   customRender: () => "-",
+  // },
+  // {
+  //   title: "考试成绩",
+  //   dataIndex: "score",
+  //   key: "score",
+  //   width: 80,
+  //   align: "center",
+  //   ellipsis: true,
+  //   customRender: ({ record: { score } }) => score || "-",
+  // },
   {
     title: "状态",
     dataIndex: "status",

From 2efd4797568df4eab2d5983f311d4c9cc5cb8a2e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 8 Mar 2023 13:59:18 +0800
Subject: [PATCH 04/28] -- fix

---
 src/components/drawers/project/ProjectOnlineManage.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index e92e95e2..9da92280 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -499,6 +499,9 @@ export default {
       }else if(props.datasource.type==11){
         {/* 评估导出 */}
         window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
+      }else if(props.datasource.type==8){
+        {/* 讨论导出 */}
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportDiscussStudent?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }else{
         window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }

From 989ad97b42e6182a2780c43419e919399434a4f6 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 14:27:06 +0800
Subject: [PATCH 05/28] style

---
 src/assets/images/leveladd/delete1.png    | Bin 0 -> 269 bytes
 src/components/drawers/UnlockMode.vue     |   2 +-
 src/views/learningpath/LearningPath.vue   |  18 +++++++++---------
 src/views/learningpath/LevelAdd.vue       |  14 +++++++-------
 src/views/learningpath/LevelAddDetail.vue |  10 +++++-----
 5 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 src/assets/images/leveladd/delete1.png

diff --git a/src/assets/images/leveladd/delete1.png b/src/assets/images/leveladd/delete1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b51497f33b1fbd7deb9e8b2e8529b5f6e77938c9
GIT binary patch
literal 269
zcmV+o0rLKdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#$4Nv%R5(xVl06PVK@^3*vji(pDD<KcjSX0YXjCFLAT}VP(uhT96&lf40)<{;
z2}j<`czMPIrNVUg-jnbCoDqp<dj-^@(pgeJmMc!!-U4;t6xA}|RZ^pzPXTVgRMNaG
zv^@eQk}6LC+cTh-TIGw}I-kJy@C)&aMAG7Ag#gT^Lee-DCvRZ8*xmLn06GCs#PKbP
z3I2fG%HKL-H`urdHWu+a8xKGe*njwyZQv-Wl{a~aZC8N-kQd&(tkF`^CDYsi4eYp_
TrX30B00000NkvXXu0mjfECg)c

literal 0
HcmV?d00001

diff --git a/src/components/drawers/UnlockMode.vue b/src/components/drawers/UnlockMode.vue
index dde55e5f..2478a230 100644
--- a/src/components/drawers/UnlockMode.vue
+++ b/src/components/drawers/UnlockMode.vue
@@ -72,7 +72,7 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="saveUnlock">确定</button>
       </div>
     </div>
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 80737bdb..142de566 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -281,7 +281,7 @@
             </div>
           </div>
           <div class="btn">
-            <button class="samtn btn1" @click="handleOut">取消</button>
+            <button class="samtn btn2" @click="handleOut">取消</button>
             <a-button
               class="samtn btn2"
               @click="createLearnPath"
@@ -411,7 +411,7 @@
             </div>
           </div>
           <div class="btn">
-            <button class="samtn btn1" @click="handleOut1">取消</button>
+            <button class="samtn btn2" @click="handleOut1">取消</button>
             <a-button
               class="samtn btn2"
               @click="editLearnPath"
@@ -490,7 +490,7 @@
           >
         </div> -->
         <div class="pubtn">
-          <a-button class="pubtn1" @click="closePub">取消</a-button>
+          <a-button class="pubtn2" @click="closePub" style="margin-right:32px;">取消</a-button>
           <a-button class="pubtn2" @click="releaseLearnPath">发布</a-button>
         </div>
       </div>
@@ -519,7 +519,7 @@
             <span>您确定要复制此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeCopyModal">
+            <div class="del_btn btn2" @click="closeCopyModal" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="copyLearnPath">
@@ -553,7 +553,7 @@
             </div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeStopModal">
+            <div class="del_btn btn2" @click="closeStopModal" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="stopLearnPath">
@@ -583,7 +583,7 @@
             <span>您确定要删除此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDeleteModal">
+            <div class="del_btn btn2" @click="closeDeleteModal" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteLearnPath">
@@ -613,7 +613,7 @@
             <span>您确定要启用此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="delete_exit">
+            <div class="del_btn btn2" @click="delete_exit" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="delete_exit">
@@ -644,7 +644,7 @@
             <div class="back">（路径撤回后学员进度保留，发布后可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeBackModal">
+            <div class="del_btn btn2" @click="closeBackModal" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallPath">
@@ -730,7 +730,7 @@
           </div>
         </div>
         <div class="btn">
-          <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+          <button class="samtn btn2" @click="closeLearnBgMore" style="margin-right:32px;">取消</button>
           <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
         </div>
       </div>
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 61ad79aa..a57eac64 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -908,8 +908,8 @@
               </div>
               <div class="btn">
                 <button
-                  class="sameb btn1"
-                  style="cursor: pointer"
+                  class="sameb btn2"
+                  style="cursor: pointer;margin-right: 32px;"
                   @click="closeChangeModal"
                 >
                   取消
@@ -954,7 +954,7 @@
               <span>请确认是否批量删除学员</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1">
+              <div class="del_btn btn2" style="margin-right:32px;">
                 <div class="btnText" @click="delete_exit">取消</div>
               </div>
               <div class="del_btn btn2">
@@ -1163,7 +1163,7 @@
           >
         </div> -->
         <div class="pubtn">
-          <a-button class="pubtn1" @click="closePub">取消</a-button>
+          <a-button class="pubtn2" @click="closePub" style="margin-right:32px;">取消</a-button>
           <a-button class="pubtn2" @click="releaseLearnPath">发布</a-button>
         </div>
       </div>
@@ -1193,7 +1193,7 @@
             <div class="back">（路径撤回后学员进度保留，发布后可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeBackModal">
+            <div class="del_btn btn2" @click="closeBackModal" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallPath">
@@ -1223,7 +1223,7 @@
             <span>您确定要复制此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeCopy">
+            <div class="del_btn btn2" @click="closeCopy" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="sureCopy">
@@ -1257,7 +1257,7 @@
             </div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeStopModal">
+            <div class="del_btn btn2" @click="closeStopModal" style="margin-right:32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="stopLearnPath">
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index ab866910..e2bc7d92 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -96,7 +96,7 @@
               <div class="co1">{{ formValue.remark?.length || 0 }}/100</div>
             </div>
             <div class="btn">
-              <button class="btn1" @click="closeModal">取消</button>
+              <button class="btn2" @click="closeModal" style="margin-right: 32px;">取消</button>
               <button class="btn2" @click="editChapter">确定</button>
             </div>
           </div>
@@ -349,7 +349,7 @@
               ></a-select>
             </div>
             <div class="btn">
-              <button style="cursor: pointer" class="sameb btn1" @click="closeChangeModal">
+              <button style="cursor: pointer;margin-right: 32px;" class="sameb btn2" @click="closeChangeModal">
                 取消
               </button>
               <button style="cursor: pointer" class="sameb btn2" @click="moveTask">
@@ -1432,17 +1432,17 @@ const cancelStorage = async () => {
             }
 
             .btn2 {
-              background-color: #ffffff;
+              background-color: #4ea6ff;
 
               .imgIcon {
                 width: 16px;
                 height: 16px;
-                background-image: url(@/assets/images/projectadd/delete.png);
+                background-image: url(@/assets/images/projectadd/delete1.png);
                 background-size: 100%;
               }
 
               .btnText {
-                color: #4ea6ff;
+                color: #fff;
               }
             }
           }

From ba6a5105bda324892f5028553cbe43e68d96fe97 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 14:58:21 +0800
Subject: [PATCH 06/28] style

---
 src/components/drawers/AddActive.vue      |  2 +-
 src/components/drawers/AddCase.vue        | 44 +++++++++++-----------
 src/components/drawers/AddDiscuss.vue     |  2 +-
 src/components/drawers/AddEval.vue        |  2 +-
 src/components/drawers/AddHomework.vue    |  4 +-
 src/components/drawers/AddInvist.vue      |  2 +-
 src/components/drawers/AddLive.vue        |  2 +-
 src/components/drawers/AddOnline.vue      |  4 +-
 src/components/drawers/AddProject.vue     |  2 +-
 src/components/drawers/AddRef.vue         |  2 +-
 src/components/drawers/AddTest.vue        |  2 +-
 src/components/drawers/AssessmentAll.vue  |  6 +--
 src/components/drawers/EvList.vue         | 46 +++++++++++------------
 src/components/drawers/SelectTest.vue     |  8 ++--
 src/components/vote/AddVote.vue           |  4 +-
 src/components/vote/CreateVote.vue        |  2 +-
 src/components/vote/VoteQuestion.vue      |  5 ++-
 src/views/learningpath/LevelAddDetail.vue |  4 +-
 18 files changed, 72 insertions(+), 71 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 8fafe686..d14fcfcf 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -198,7 +198,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 5c14abea..ce744440 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -109,7 +109,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
@@ -361,42 +361,42 @@ defineExpose({ openDrawer });
           }
 
           .btn2 {
-            background: rgb(255, 255, 255);
+            background: rgb(64, 158, 255);
 
             .search {
               width: 15px;
               height: 17px;
-              background-image: url("@/assets/images/coursewareManage/reset1.png");
+              background-image: url("@/assets/images/coursewareManage/reset0.png");
             }
 
             .btnText {
-              color: rgb(64, 158, 255);
+              color: rgb(255, 255, 255);
             }
           }
 
-          .btn1:hover {
-            background: rgb(255, 255, 255);
+          // .btn1:hover {
+          //   background: rgb(255, 255, 255);
 
-            .search {
-              background-image: url("@/assets/images/courseManage/search1.png");
-            }
+          //   .search {
+          //     background-image: url("@/assets/images/courseManage/search1.png");
+          //   }
 
-            .btnText {
-              color: #4ea6ff;
-            }
-          }
+          //   .btnText {
+          //     color: #4ea6ff;
+          //   }
+          // }
 
-          .btn2:hover {
-            background: rgba(64, 158, 255, 1);
+          // .btn2:hover {
+          //   background: rgba(64, 158, 255, 1);
 
-            .search {
-              background-image: url("@/assets/images/courseManage/reset0.png");
-            }
+          //   .search {
+          //     background-image: url("@/assets/images/courseManage/reset0.png");
+          //   }
 
-            .btnText {
-              color: #ffffff;
-            }
-          }
+          //   .btnText {
+          //     color: #ffffff;
+          //   }
+          // }
         }
       }
 
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index c1b7185e..0aebf024 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -71,7 +71,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 41f726fc..efe1c1f1 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -105,7 +105,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index bc689a0f..068838dc 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -5,7 +5,7 @@
   <a-drawer :visible="visible" class="drawerStyle addhomeworkDrawer" width="1000" placement="right">
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}任务</div>
+        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}作业</div>
         <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
              @click="closeDrawer"/>
       </div>
@@ -80,7 +80,7 @@
         </div>
       </div>
       <div class="main_btns" style="background:#fff;">
-        <a-button class="btn1" @click="closeDrawer">取消</a-button>
+        <a-button class="btn2" @click="closeDrawer">取消</a-button>
         <a-button class="btn2" html-type="submit" @click="confirm">确定</a-button>
       </div>
     </div>
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index 93c7c364..9c069d9b 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -18,7 +18,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index c5810746..a75b3c4c 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -213,7 +213,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 4968e619..2fd642be 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -11,7 +11,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{ taskIndex === -1 ? "编辑" : "添加" }}任务</div>
+        <div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}在线</div>
         <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
              @click="closeDrawer"/>
       </div>
@@ -34,7 +34,7 @@
         />
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index 68e63583..32e3f3c7 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -143,7 +143,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button @click="closeDrawer" class="btn1">取消</button>
+        <button @click="closeDrawer" class="btn2">取消</button>
         <button @click="confirm" class="btn2">确定</button>
       </div>
     </div>
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index 94a8c1e4..9cca5aeb 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -75,7 +75,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 0f1ba24b..a26104a2 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -235,7 +235,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <a-button class="btn1" @click="closeDrawer">取消</a-button>
+        <a-button class="btn2" @click="closeDrawer">取消</a-button>
         <a-button class="btn2" @click="confirm">确定</a-button>
       </div>
     </div>
diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue
index 92252e83..43919605 100644
--- a/src/components/drawers/AssessmentAll.vue
+++ b/src/components/drawers/AssessmentAll.vue
@@ -279,7 +279,7 @@ const goResearchmanage = () => {
           .btnsn {
             padding: 0px 26px 0px 26px;
             height: 38px;
-            background: #ffffff;
+            background: rgba(64, 158, 255, 1) !important;
             border-radius: 8px;
             border: 1px solid rgba(64, 158, 255, 1);
             display: flex;
@@ -292,14 +292,14 @@ const goResearchmanage = () => {
             .search {
               width: 16px;
               height: 18px;
-              background-image: url("../../assets/images/courseManage/reset1.png");
+              background-image: url("../../assets/images/courseManage/reset0.png") !important;
               background-size: 100% 100%;
             }
 
             .btnText {
               font-size: 14px;
               font-weight: 400;
-              color: #4ea6ff;
+              color: #fff !important;
               line-height: 36px;
               margin-left: 5px;
             }
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index 8e4888b8..3b9b94c7 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -33,7 +33,7 @@
             </div>
           </div>
           <div class="mi_btns">
-            <div class="btn btn1" @click="search">
+            <div class="btn btn2" @click="search">
               <div class="search"></div>
               <div class="btnText">搜索</div>
             </div>
@@ -63,7 +63,7 @@
         <img style="width: 700px" src="../../assets/images/evImg.png" />
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
@@ -403,42 +403,42 @@ defineExpose({ openDrawer });
           }
 
           .btn2 {
-            background: rgb(255, 255, 255);
+            background: rgb(64, 158, 255);
 
             .search {
               width: 15px;
               height: 17px;
-              background-image: url("@/assets/images/coursewareManage/reset1.png");
+              background-image: url("@/assets/images/coursewareManage/reset0.png");
             }
 
             .btnText {
-              color: rgb(64, 158, 255);
+              color: rgb(255, 255, 255);
             }
           }
 
-          .btn1:hover {
-            background: rgb(255, 255, 255);
+          // .btn1:hover {
+          //   background: rgb(255, 255, 255);
 
-            .search {
-              background-image: url("@/assets/images/courseManage/search1.png");
-            }
+          //   .search {
+          //     background-image: url("@/assets/images/courseManage/search1.png");
+          //   }
 
-            .btnText {
-              color: #4ea6ff;
-            }
-          }
+          //   .btnText {
+          //     color: #4ea6ff;
+          //   }
+          // }
 
-          .btn2:hover {
-            background: rgba(64, 158, 255, 1);
+          // .btn2:hover {
+          //   background: rgba(64, 158, 255, 1);
 
-            .search {
-              background-image: url("@/assets/images/courseManage/reset0.png");
-            }
+          //   .search {
+          //     background-image: url("@/assets/images/courseManage/reset0.png");
+          //   }
 
-            .btnText {
-              color: #ffffff;
-            }
-          }
+          //   .btnText {
+          //     color: #ffffff;
+          //   }
+          // }
         }
       }
 
diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
index c737acbc..7f134b9f 100644
--- a/src/components/drawers/SelectTest.vue
+++ b/src/components/drawers/SelectTest.vue
@@ -64,7 +64,7 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
@@ -305,7 +305,7 @@ defineExpose({openDrawer})
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../assets/images/courseManage/reset1.png);
+              background-image: url(../../assets/images/courseManage/reset0.png) !important;
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -318,9 +318,9 @@ defineExpose({openDrawer})
           }
 
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff !important;
 
-            color: #4ea6ff;
+            color: #fff !important;
             border: 1px solid #4ea6ff;
           }
         }
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index e4d9e321..d65b9abd 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -12,7 +12,7 @@
     <div class="drawerMain">
       <div class="header">
         <div v-if="taskIndex>=0" class="headerTitle">编辑投票任务</div>
-        <div v-else class="headerTitle">添加投票任务</div>
+        <div v-else class="headerTitle">添加投票</div>
         <img
             style="width: 29px; height: 29px; cursor: pointer"
             src="../../assets/images/basicinfo/close.png"
@@ -102,7 +102,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index 2d9bb68f..5ed2be02 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -50,7 +50,7 @@
           <a-button
             type="primary"
             ghost
-            style="width: 100px; height: 40px; border-radius: 8px"
+            style="width: 100px; height: 40px; border-radius: 8px;background-color: #4ea6ff;color: #fff;"
             @click="closeDrawer"
           >
             取消
diff --git a/src/components/vote/VoteQuestion.vue b/src/components/vote/VoteQuestion.vue
index 3992d81a..f895465d 100644
--- a/src/components/vote/VoteQuestion.vue
+++ b/src/components/vote/VoteQuestion.vue
@@ -4,7 +4,7 @@
   <div class="content">
     <div class="tagbox">
       <div class="deleteop" @click="handleDel">
-        <div><img src="../../assets/images/projectadd/delete.png" /></div>
+        <div><img src="../../assets/images/projectadd/delete1.png" /></div>
         <div class="del_text">删除题干</div>
       </div>
     </div>
@@ -192,11 +192,12 @@ function handleDel() {
         margin-top: 20px;
         margin-right: 30px;
         border: 1px solid #4ea6ff;
+        background-color: #4ea6ff;
         border-radius: 8px;
         cursor: pointer;
 
         .del_text {
-          color: #4ea6ff;
+          color: #fff;
           font-size: 14px;
           margin-left: 5px;
         }
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index e2bc7d92..ec7aea99 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -320,8 +320,8 @@
 
     <div class="footbtn footBox">
       <div class="btnbox">
-        <a-button class="btn btn2" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
-        <a-button class="btn btn2" @click="submitStorage" :loading="confirmLoading">确定</a-button>
+        <a-button class="btn btn1" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
+        <a-button class="btn btn1" @click="submitStorage" :loading="confirmLoading">确定</a-button>
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>

From a5e3842e8996d5ce27b2b2e1c07b31edd0e4ab15 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 15:38:48 +0800
Subject: [PATCH 07/28] style

---
 src/assets/images/courseManage/reset4.png     | Bin 0 -> 489 bytes
 src/assets/images/leveladd/reset0.png         | Bin 0 -> 486 bytes
 src/components/drawers/AddLevelImportStu.vue  |   2 +-
 src/components/drawers/ProjectScore.vue       |   8 +++---
 src/components/drawers/SubsetManage.vue       |   2 +-
 .../drawers/project/AddCertificate.vue        |   2 +-
 .../drawers/project/ImpoterGroupLeader.vue    |   2 +-
 src/components/student/ChangeGroupModal.vue   |   2 +-
 src/components/student/CommonStudent.vue      |   8 +++---
 .../student/TableCertificateStudent.vue       |   2 +-
 src/views/projectcenter/SonProject.vue        |   4 +--
 src/views/projectcenter/TaskPage.vue          |  26 +++++++++---------
 12 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 src/assets/images/courseManage/reset4.png
 create mode 100644 src/assets/images/leveladd/reset0.png

diff --git a/src/assets/images/courseManage/reset4.png b/src/assets/images/courseManage/reset4.png
new file mode 100644
index 0000000000000000000000000000000000000000..00e851146dda0085656285c5c4a3df83c69609d7
GIT binary patch
literal 489
zcmV<F0T%v=P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$qe(<TR5(wq(@TrbVHn2o&n3sDL$bok0x!TqN>M`WW}#_9WJ4$kFTlu9<CO9u
zobv*PkZdJNP9<5eF%BEIp79?|)8G83#<RSi=lA_x*L`1i{O6PZ%rhfkRn5X1TuySf
ziJK9y0jg>khjA*&;25x~T4DJF`=2n9<k94oRMjS|!{W|eV+>#+c8>!eVC965mtY=l
zV^@;Vs%o_xSdUSBp7eeJ{wVCCVmA751^3X0`&f;=xRs<j?zVJ(^cdTw>|s^y$2FY8
zG3-ckXQF_r`hXYM-kkIT&cQn@!?Pr7ySQ0}w@H3ZYsyu18Ygii$%S6I?HQY@8pH`4
zP0}JV<(ZD<_gISON!E0++-k3q{OD=9st({PhHxA^le8%PJyrD)FR?Yr*MG&P4Woti
z67DAHtEv&Sq3pxWB)>Yb+1z4;r(@7g@!_Okw=J04$ya}pZ&lT5*RcWL@nwS0MVOB>
z<G_Ph(Rt7UJHC2Py7X*gm(|<TS-pXtQ|>j@s=A0nt;b1*W(2INwxX{woaB7ZDfd#>
f?S4iIy8(X#tO=Fk7gE2L00000NkvXXu0mjf<iPF`

literal 0
HcmV?d00001

diff --git a/src/assets/images/leveladd/reset0.png b/src/assets/images/leveladd/reset0.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9f628fac9fdd87c01dc8f271ac6a4f351998d36
GIT binary patch
literal 486
zcmV<C0U7>@P)<h;3K|Lk000e1NJLTq000mG000sQ1^@s6QafI100001b5ch_0Itp)
z=>Px$ph-kQR5(wS)JupDP!z}U&#&3pSg;^U*;=rWBuW-G>}<#*NyI`P$*YJghCCN6
zJkmtUPIgj~<gsJv6-`4~Sji))qx<ha`ZxVeGk10G?VNAtocsIT7_+KsJ+9yc?j-p*
zHm3KSK7hG+f$11dGN-E6U=I!_dHi2MRc*&He8+6OPO_k?7ULS`;Z~B3qmX|URMj93
z;2iGZ5w;|`F&bP|Tf6N&#j+&T0aVon+{ET2Lsd1<_83a?r?=#)nva*bnq*t5YAW91
zdXhuq4Xme<b-0Zs4R9DoF)PW}i2%A)zrsiZv|gtqSv1k)E}*r%umMKe(30$&B;XV_
zHo!3MCfPMfz$L71fF~_6$<j#zp5bQ$oWTxEOY&<XkgA%A&p6ZoGw=a}NsdntFoac@
zJ1V5TIE$4@9`y0YehefTtg0h8iM2`Y^h&u2qY0!1UrzF)`&`Xj?{ObrunD`9T<pwl
zj7%?}y~c0sOLD2ITH;E)!?#Y~NxSQ;es-SKHPrJY=X*@{1}l<$8uvfwH^i!1j?;LU
c<X~^iUm=6G%QCQj761SM07*qoM6N<$f?yBc*#H0l

literal 0
HcmV?d00001

diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index 55ba0b65..a3ed6938 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -170,7 +170,7 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="closeDrawer">确定</button>
       </div>
     </div>
diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue
index cab9edaf..b1d0d768 100644
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -19,7 +19,7 @@
               <span class="btn1text">搜索</span>
             </div>
             <div class="btn2" @click="resetStud">
-              <img src="../../assets/images/courseManage/reset1.png" />
+              <img src="../../assets/images/courseManage/reset0.png" />
               <span class="btn2text">重置</span>
             </div>
           </div>
@@ -86,7 +86,7 @@
                 <span class="btn1text">搜索</span>
               </div>
               <div class="btn2" @click="rankReset">
-                <img src="../../assets/images/courseManage/reset1.png" />
+                <img src="../../assets/images/courseManage/reset0.png" />
                 <span class="btn2text">重置</span>
               </div>
             </div>
@@ -813,9 +813,9 @@ export default {
         border: 1px solid #4ea6ff;
         border-radius: 8px;
         cursor: pointer;
-        background: #ffffff;
+        background: #4ea6ff;
         .btn2text {
-          color: #4ea6ff;
+          color: #fff;
           margin-left: 5px;
           font-size: 14px;
         }
diff --git a/src/components/drawers/SubsetManage.vue b/src/components/drawers/SubsetManage.vue
index 557497be..0d63774c 100644
--- a/src/components/drawers/SubsetManage.vue
+++ b/src/components/drawers/SubsetManage.vue
@@ -59,7 +59,7 @@
       </div> -->
       <!-- <div class="zhu">注：随机分组不对小组长生效</div> -->
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="addGroup">确定</button>
       </div>
     </div>
diff --git a/src/components/drawers/project/AddCertificate.vue b/src/components/drawers/project/AddCertificate.vue
index 5c68ba41..4b3c87ce 100644
--- a/src/components/drawers/project/AddCertificate.vue
+++ b/src/components/drawers/project/AddCertificate.vue
@@ -312,7 +312,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="saveupdatecertificate">确定</button>
       </div>
     </div>
diff --git a/src/components/drawers/project/ImpoterGroupLeader.vue b/src/components/drawers/project/ImpoterGroupLeader.vue
index 39dc4180..1be2f913 100644
--- a/src/components/drawers/project/ImpoterGroupLeader.vue
+++ b/src/components/drawers/project/ImpoterGroupLeader.vue
@@ -85,7 +85,7 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="closeDrawer">确定</button>
       </div>
     </div>
diff --git a/src/components/student/ChangeGroupModal.vue b/src/components/student/ChangeGroupModal.vue
index c88bb7d8..34c694b0 100644
--- a/src/components/student/ChangeGroupModal.vue
+++ b/src/components/student/ChangeGroupModal.vue
@@ -25,7 +25,7 @@
               @change="selectGroup"></a-select>
           </div>
           <div class="btn">
-            <button class="sameb btn1" @click="closeChangeModal" style="cursor: pointer">
+            <button class="sameb btn2" @click="closeChangeModal" style="cursor: pointer">
               取消
             </button>
             <button class="sameb btn2" @click="changeGroup" style="cursor: pointer">
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index afd1beed..d4c861a0 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -49,7 +49,7 @@
                         </template>
                         搜索
                       </a-button>
-                      <a-button @click="resetStu" style="margin-left: 20px; border-radius: 4px">重置
+                      <a-button type="primary" @click="resetStu" style="margin-left: 20px; border-radius: 4px">重置
                       </a-button>
                     </a-form-item>
                   </div>
@@ -93,7 +93,7 @@
                         </template>
                         搜索
                       </a-button>
-                      <a-button @click="resetOrg" style="margin-left: 20px; border-radius: 4px">重置
+                      <a-button type="primary" @click="resetOrg" style="margin-left: 20px; border-radius: 4px">重置
                       </a-button>
                     </a-form-item>
                   </div>
@@ -123,7 +123,7 @@
                         </template>
                         搜索
                       </a-button>
-                      <a-button @click="resetAudienceInfo" style="margin-left: 20px; border-radius: 4px">重置
+                      <a-button type="primary" @click="resetAudienceInfo" style="margin-left: 20px; border-radius: 4px">重置
                       </a-button>
                     </a-form-item>
                   </div>
@@ -248,7 +248,7 @@
           </div>
         </div>
         <div class="btnn">
-          <button class="btn1" @click="closeDrawer">取消</button>
+          <button class="btn2" @click="closeDrawer">取消</button>
           <button class="btn2" @click="submitAuth">确定</button>
         </div>
       </div>
diff --git a/src/components/student/TableCertificateStudent.vue b/src/components/student/TableCertificateStudent.vue
index 0f26babb..25984242 100644
--- a/src/components/student/TableCertificateStudent.vue
+++ b/src/components/student/TableCertificateStudent.vue
@@ -51,7 +51,7 @@
         <template #icon>
           <img
             style="margin-right: 10px"
-            src="../../assets/images/leveladd/reset.png"
+            src="../../assets/images/leveladd/reset0.png"
         /></template>
         重置
       </a-button>
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 6e252c32..dbdec740 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -264,7 +264,7 @@
           class="btn1"
           >确定
         </a-button>
-        <a-button @click="backPage" class="btn2">取消</a-button>
+        <a-button type="primary" @click="backPage" class="btn1">取消</a-button>
       </div>
     </div>
     <!-- 更多背景图 v-model:visible="learnBgMore"  -->
@@ -305,7 +305,7 @@
           </div>
         </div>
         <div class="btn">
-          <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+          <button class="samtn btn2" @click="closeLearnBgMore">取消</button>
           <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
         </div>
       </div>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index c9de556f..9d387b3c 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -791,7 +791,7 @@
                       <span class="btn1text">搜索</span>
                     </div>
                     <div class="btn2" @click="resetGroupName">
-                      <img src="../../assets/images/courseManage/reset1.png" />
+                      <img src="../../assets/images/courseManage/reset0.png" />
                       <span class="btn2text">重置</span>
                     </div>
                   </div>
@@ -801,20 +801,20 @@
                     <img src="../../assets/images/courseManage/add0.png" />
                     <span class="btn1text">创建小组</span>
                   </div>
-                  <div class="btn2" @click="showSubset">
-                    <img src="../../assets/images/courseManage/reset2.png" />
-                    <span class="btn2text">随机分组</span>
+                  <div class="btn1" @click="showSubset">
+                    <img src="../../assets/images/courseManage/reset4.png" />
+                    <span class="btn1text">随机分组</span>
                   </div>
-                  <div class="btn2" @click="exportGroup">
-                    <span class="btn2text">导出小组</span>
+                  <div class="btn1" @click="exportGroup">
+                    <span class="btn1text">导出小组</span>
                   </div>
                   <ImpoterGroupLeader
                     :data="{ targetId: projectId, type: 1 }"
                     :url="`/admin/studentGroup/importGroup`"
                     :template-url="`/admin/studentGroup/exportGroup/${projectId}`"
                   >
-                    <div class="btn2">
-                      <span class="btn2text">导入小组长</span>
+                    <div class="btn1">
+                      <span class="btn1text">导入小组长</span>
                     </div>
                   </ImpoterGroupLeader>
                 </div>
@@ -942,7 +942,7 @@
                   <div class="te">搜索</div>
                 </div>
                 <div
-                  class="btn btn2"
+                  class="btn btn1"
                   @click="rankReset"
                   style="cursor: pointer"
                 >
@@ -1773,7 +1773,7 @@
             </div>
           </div>
           <div class="pubtn">
-            <a-button class="pubtn1" @click="closeModal2">取消</a-button>
+            <a-button class="pubtn2" @click="closeModal2" style="margin-right:32px;">取消</a-button>
             <a-button class="pubtn2" :loading="buttonLoading" @click="createG">确定</a-button>
           </div>
         </div>
@@ -6498,10 +6498,10 @@ export default {
           border: 1px solid #4ea6ff;
           border-radius: 8px;
           cursor: pointer;
-          background: #ffffff;
+          background: #4ea6ff;
 
           .btn2text {
-            color: #4ea6ff;
+            color: #fff;
             margin-left: 5px;
             font-size: 14px;
           }
@@ -7081,7 +7081,7 @@ export default {
           .img2 {
             width: 16px;
             height: 18px;
-            background-image: url(../../assets/images/coursewareManage/reset1.png);
+            background-image: url(../../assets/images/coursewareManage/reset0.png);
             background-size: 100%;
             margin-right: 5px;
           }

From d952369464e6731fccc03707265bfbb6fea22974 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 16:21:14 +0800
Subject: [PATCH 08/28] fix:style

---
 src/components/student/TableModelStudent.vue |  8 ++--
 src/views/projectcenter/LibraryAdd.vue       | 21 ++++++-----
 src/views/projectcenter/ProjectAdd.vue       |  4 +-
 src/views/projectcenter/ProjectManage.vue    | 20 +++++-----
 src/views/projectcenter/TaskAdd.vue          | 31 ++++++++--------
 src/views/projectcenter/TaskPage.vue         | 24 ++++++------
 src/views/projectcenter/temTask.vue          | 39 ++++++++++----------
 7 files changed, 75 insertions(+), 72 deletions(-)

diff --git a/src/components/student/TableModelStudent.vue b/src/components/student/TableModelStudent.vue
index f2c14ad1..bbc800c7 100644
--- a/src/components/student/TableModelStudent.vue
+++ b/src/components/student/TableModelStudent.vue
@@ -48,14 +48,14 @@
             </a-col>
             <a-col :span="2">
               <a-button
-                class="cus-btn white"
-                style="width: 100px"
+                class="cus-btn"
+                style="width: 100px;background: #4ea6ff;color: #fff;"
                 @click="reset"
               >
                 <template #icon
                   ><img
                     style="margin-right: 10px"
-                    src="../../assets/images/leveladd/reset.png"
+                    src="../../assets/images/leveladd/reset0.png"
                   />
                 </template>
                 重置
@@ -90,7 +90,7 @@
           </div>
         </div>
         <div class="btnn">
-          <button class="btn1" @click="closeDrawer">取消</button>
+          <button class="btn2" @click="closeDrawer">取消</button>
           <button class="btn2" @click="closeDrawer">确定</button>
         </div>
       </div>
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 67d3311a..c5843605 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -64,7 +64,7 @@
               >
                 <img
                   class="editimg"
-                  src="../../assets/images/projectadd/edit.png"
+                  src="../../assets/images/projectadd/edit1.png"
                 />
                 <span class="editext">编辑</span>
               </router-link>
@@ -2248,10 +2248,11 @@ export default defineComponent({
           position: absolute;
           right: 38px;
           top: 0;
-          color: #4ea6ff;
+          color: #fff;
           width: 100px;
           height: 40px;
           border: 1px solid #4ea6ff;
+          background: #4ea6ff;
           border-radius: 8px;
 
           .editimg {
@@ -2267,15 +2268,15 @@ export default defineComponent({
           }
         }
 
-        .edit:hover {
-          color: #ffffff;
-          background-color: #4ea6ff;
-          cursor: pointer;
+        // .edit:hover {
+        //   color: #ffffff;
+        //   background-color: #4ea6ff;
+        //   cursor: pointer;
 
-          .editimg {
-            background-image: url("../../assets/images/projectadd/edit1.png");
-          }
-        }
+        //   .editimg {
+        //     background-image: url("../../assets/images/projectadd/edit1.png");
+        //   }
+        // }
       }
 
       .taskSyllabus {
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 75fdec9b..f2100741 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -199,7 +199,7 @@
     </div>
     <div class="footer">
       <div class="btn">
-        <a-button @click="backPage" class="btn2">取消</a-button>
+        <a-button @click="backPage" class="btn1">取消</a-button>
         <a-button :loading="loading" v-on:click="createProject" type="primary" class="btn1" style="margin-left: 20px">确定
         </a-button>
       </div>
@@ -229,7 +229,7 @@
           </div>
         </div>
         <div class="btn">
-          <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+          <button class="samtn btn2" @click="closeLearnBgMore">取消</button>
           <a-button class="samtn btn2" @click="closeLearnBgMore" :loading="projectInfo.validated===1">确定</a-button>
         </div>
       </div>
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 4c9b5322..a50e05b6 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -359,7 +359,7 @@
             </div>
           </div>
           <div class="pubtn">
-            <a-button class="pubtn1" @click="closeModal2">取消</a-button>
+            <a-button class="pubtn2" @click="closeModal2" style="margin-right: 32px;">取消</a-button>
             <a-button class="pubtn2" @click="createStoreyProject" :loading="buttonLoading || projectInfo.validated===1"
               >确定
             </a-button>
@@ -568,7 +568,7 @@
             <span>您确定要复制此项目吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeCopyModal">
+            <div class="del_btn btn2" @click="closeCopyModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="copyProject">
@@ -601,7 +601,7 @@
             </div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeStopModal">
+            <div class="del_btn btn2" @click="closeStopModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="finishProject">
@@ -631,7 +631,7 @@
             <span>您确定要删除此项目吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDeleteModal">
+            <div class="del_btn btn2" @click="closeDeleteModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteProject">
@@ -661,7 +661,7 @@
             <span>您确定要存为模版吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeStartModal">
+            <div class="del_btn btn2" @click="closeStartModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="templateProject">
@@ -742,7 +742,7 @@
           >
         </div> -->
         <div class="pubtn">
-          <a-button class="pubtn1" @click="closeProjectPub">取消</a-button>
+          <a-button class="pubtn2" @click="closeProjectPub" style="margin-right: 32px;">取消</a-button>
           <a-button class="pubtn2" @click="releaseProject">发布</a-button>
         </div>
       </div>
@@ -775,7 +775,7 @@
             <div class="back">（项目撤回后学员进度保留，发布后可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeBackModal">
+            <div class="del_btn btn2" @click="closeBackModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallProject">
@@ -806,7 +806,7 @@
             <div class="back">（项目撤回结束后学员可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeBackFinashModal">
+            <div class="del_btn btn2" @click="closeBackFinashModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="reFinashedProject">
@@ -866,7 +866,7 @@
             <div class="back"></div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeReviewModal">
+            <div class="del_btn btn2" @click="closeReviewModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="reviewProject">
@@ -897,7 +897,7 @@
             <div class="back"></div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeRecallReviewModal">
+            <div class="del_btn btn2" @click="closeRecallReviewModal">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallReviewProject">
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index b049fd82..2c663af0 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -123,7 +123,7 @@
                 移动任务到阶段
               </button>
               <div class="edit" @click="deleteTaskAll">
-                <img class="editimg" src="../../assets/images/projectadd/delete.png"/>
+                <img class="editimg" src="../../assets/images/projectadd/delete1.png"/>
                 <span class="editext">批量删除</span>
               </div>
             </div>
@@ -276,8 +276,8 @@
 
     <div class="footbtn footBox">
       <div class="btnbox">
-        <a-button class="btn btn2" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
-        <a-button class="btn btn2" @click="submitStorage" :loading="confirmLoading">确定</a-button>
+        <a-button class="btn btn1" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
+        <a-button class="btn btn1" @click="submitStorage" :loading="confirmLoading">确定</a-button>
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>
@@ -334,8 +334,8 @@
                 width: 100px;
                 border: 1px solid #4ea6ff;
                 border-radius: 4px;
-                color: #4ea6ff;
-                background-color: #ffffff;
+                color: #fff;
+                background-color: #4ea6ff;
               ">
             取消
           </button>
@@ -376,7 +376,7 @@
                         :options="projectInfo.stageList.map(({name:label},value)=>({label,value,disabled:value===activeIndex}))"></a-select>
             </div>
             <div class="btn">
-              <button style="cursor: pointer" class="sameb btn1" @click="closeChangeModal">
+              <button style="cursor: pointer" class="sameb btn2" @click="closeChangeModal">
                 取消
               </button>
               <button style="cursor: pointer" class="sameb btn2" @click="moveTask">
@@ -1396,10 +1396,11 @@ const cancelStorage = async () => {
             position: absolute;
             right: 0;
             top: 0;
-            color: #4ea6ff;
+            color: #fff;
             width: 120px;
             height: 40px;
             border: 1px solid #4ea6ff;
+            background-color: #4ea6ff;
             border-radius: 8px;
 
             .editimg {
@@ -1415,15 +1416,15 @@ const cancelStorage = async () => {
             }
           }
 
-          .edit:hover {
-            color: #ffffff;
-            background-color: #4ea6ff;
-            cursor: pointer;
+          // .edit:hover {
+          //   color: #ffffff;
+          //   background-color: #4ea6ff;
+          //   cursor: pointer;
 
-            .editimg {
-              background-image: url("../../assets/images/projectadd/delete1.png");
-            }
-          }
+          //   .editimg {
+          //     background-image: url("../../assets/images/projectadd/delete1.png");
+          //   }
+          // }
         }
 
         .notable {
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 9d387b3c..a928b420 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -103,7 +103,7 @@
                 <div class="back"></div>
               </div>
               <div class="del_btnbox">
-                <div class="del_btn btn1" @click="closeReviewModal">
+                <div class="del_btn btn2" @click="closeReviewModal" style="margin-right: 32px;">
                   <div class="btnText">取消</div>
                 </div>
                 <div class="del_btn btn2" @click="submitReviewProject">
@@ -1678,7 +1678,7 @@
             >
           </div>
           <div class="pubtn">
-            <a-button class="pubtn1" @click="closeModal">取消</a-button>
+            <a-button class="pubtn2" @click="closeModal">取消</a-button>
             <a-button class="pubtn2" @click="closeModal">发布</a-button>
           </div>
         </div>
@@ -1801,7 +1801,7 @@
               <span>您是否授予此学员优秀学员称号？</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1" @click="cancelyou">
+              <div class="del_btn btn2" @click="cancelyou" style="margin-right: 32px;">
                 <div class="btnText">取消</div>
               </div>
               <div class="del_btn btn2" @click="closeModal1">
@@ -1833,7 +1833,7 @@
               <span>您是否取消此学员优学员称号？</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1" @click="cancelcanyou">
+              <div class="del_btn btn2" @click="cancelcanyou" style="margin-right: 32px;">
                 <div class="btnText">取消</div>
               </div>
               <div class="del_btn btn2" @click="closeModal3">
@@ -1865,7 +1865,7 @@
               <span>您确定要删除此学员吗</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1" @click="closeDeleteOne">
+              <div class="del_btn btn2" @click="closeDeleteOne" style="margin-right: 32px;">
                 <div class="btnText">取消</div>
               </div>
               <div class="del_btn btn2" @click="closeDeleteOneConfirm">
@@ -1899,7 +1899,7 @@
               <span>您确定要删除此课程吗</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1">
+              <div class="del_btn btn2" style="margin-right: 32px;">
                 <div class="btnText" @click="delete_exit">取消</div>
               </div>
               <div class="del_btn btn2">
@@ -1931,7 +1931,7 @@
               <span>您确定批量删除吗？</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1" @click="closeCancelDelete">
+              <div class="del_btn btn2" @click="closeCancelDelete" style="margin-right: 32px;">
                 <div class="btnText">取消</div>
               </div>
               <div class="del_btn btn2" @click="closeAllDelete">
@@ -2015,7 +2015,7 @@
                 >
               </div> -->
         <div class="pubtn">
-          <a-button class="pubtn1" @click="closeProjectPub">取消</a-button>
+          <a-button class="pubtn2" @click="closeProjectPub">取消</a-button>
           <a-button class="pubtn2" @click="releaseProject">发布</a-button>
         </div>
       </div>
@@ -2048,7 +2048,7 @@
             <div class="back">（项目撤回后学员进度保留，发布后可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeBackModal">
+            <div class="del_btn btn2" @click="closeBackModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallProject">
@@ -2079,7 +2079,7 @@
             <div class="back"></div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeRecallReviewModal">
+            <div class="del_btn btn2" @click="closeRecallReviewModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallReviewProject">
@@ -2112,7 +2112,7 @@
             </div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeStopModal">
+            <div class="del_btn btn2" @click="closeStopModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="finishProject">
@@ -2142,7 +2142,7 @@
             <span>您确定要存为模版吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeStartModal">
+            <div class="del_btn btn2" @click="closeStartModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="templateProject">
diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
index d11e9edb..1ff6da93 100644
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -121,7 +121,7 @@
                 移动任务到阶段
               </button>
               <div class="edit" @click="showdeAll">
-                <img class="editimg" src="../../assets/images/projectadd/delete.png" />
+                <img class="editimg" src="../../assets/images/projectadd/delete1.png" />
                 <span class="editext">批量删除</span>
               </div>
             </div>
@@ -278,7 +278,7 @@
 
     <div class="footbtn">
       <div class="btnbox">
-        <a-button class="btn btn2" @click="submitStorage" :loading="templateLoading">确定</a-button>
+        <a-button class="btn btn1" @click="submitStorage" :loading="templateLoading">确定</a-button>
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>
@@ -334,8 +334,8 @@
                       width: 100px;
                       border: 1px solid #4ea6ff;
                       border-radius: 4px;
-                      color: #4ea6ff;
-                      background-color: #ffffff;
+                      color: #fff;
+                      background-color: #4ea6ff;
                     ">
               取消
             </button>
@@ -370,7 +370,7 @@
             <span>您确定要添加阶段吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeConfirm">
+            <div class="del_btn btn2" @click="closeConfirm" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="showModal">
@@ -394,7 +394,7 @@
             <span>您确定要删除所有阶段吗？</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeCancel">
+            <div class="del_btn btn2" @click="closeCancel" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="removeAllLevel">
@@ -418,7 +418,7 @@
             <span>您确定要删除此任务吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDelete">
+            <div class="del_btn btn2" @click="closeDelete" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="confirmDelTask">
@@ -441,7 +441,7 @@
             <span>您确定要批量删除任务吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDeAll">
+            <div class="del_btn btn2" @click="closeDeAll" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteTaskAll">
@@ -471,7 +471,7 @@
                 :options="projectInfo.stageList.map(({ name: label }, value) => ({ label, value, disabled: value === activeIndex }))"></a-select>
             </div>
             <div class="btn">
-              <button style="cursor: pointer" class="sameb btn1" @click="closeChangeModal">
+              <button style="cursor: pointer" class="sameb btn2" @click="closeChangeModal">
                 取消
               </button>
               <button style="cursor: pointer" class="sameb btn2" @click="moveTask">
@@ -500,7 +500,7 @@
             }}</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDeleteStage">
+            <div class="del_btn btn2" @click="closeDeleteStage" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteStage">
@@ -1523,10 +1523,11 @@ const cancelStorage = async () => {
             position: absolute;
             right: 0;
             top: 0;
-            color: #4ea6ff;
+            color: #fff;
             width: 120px;
             height: 40px;
             border: 1px solid #4ea6ff;
+            background: #4ea6ff;
             border-radius: 8px;
 
             .editimg {
@@ -1542,15 +1543,15 @@ const cancelStorage = async () => {
             }
           }
 
-          .edit:hover {
-            color: #ffffff;
-            background-color: #4ea6ff;
-            cursor: pointer;
+          // .edit:hover {
+          //   color: #ffffff;
+          //   background-color: #4ea6ff;
+          //   cursor: pointer;
 
-            .editimg {
-              background-image: url("../../assets/images/projectadd/delete1.png");
-            }
-          }
+          //   .editimg {
+          //     background-image: url("../../assets/images/projectadd/delete1.png");
+          //   }
+          // }
         }
 
         .notable {

From 9ab5683222f1a69e6d9ca0245ed62867ca841bb5 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 16:57:50 +0800
Subject: [PATCH 09/28] style

---
 src/components/drawers/ActiveAttendance.vue          |  8 ++++----
 src/components/drawers/project/ProjectEvalManage.vue | 12 ++++++------
 src/components/drawers/project/ProjectExamManage.vue | 12 ++++++------
 .../drawers/project/ProjectExternalExamManage.vue    | 12 ++++++------
 .../drawers/project/ProjectHomeWorkManage.vue        | 12 ++++++------
 .../drawers/project/ProjectOnlineManage.vue          | 12 ++++++------
 src/components/drawers/project/ProjectVoteManage.vue | 12 ++++++------
 src/components/drawers/router/RouterCommonManage.vue | 12 ++++++------
 .../router/RouterExaminationExternalManage.vue       | 12 ++++++------
 .../drawers/router/RouterExaminationManage.vue       | 12 ++++++------
 .../drawers/router/RouterHomeworkManage.vue          | 12 ++++++------
 .../drawers/router/RouterProjectManage.vue           | 12 ++++++------
 src/components/drawers/router/RouterVoteManage.vue   | 12 ++++++------
 13 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index 6952daf9..7bf2a2e5 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -90,7 +90,7 @@
           <div class="btn btn1" @click="signQR">
             <div class="wz">签到二维码</div>
           </div>
-          <div class="btn btn2" @click="showqdModal">
+          <div class="btn btn1" @click="showqdModal">
             <div class="wz">批量签到</div>
           </div>
           <div class="btn btn1" @click="exportTaskStu">
@@ -1145,7 +1145,7 @@ export default {
                 .img2 {
                   width: 16px;
                   height: 18px;
-                  background-image: url(../../assets/images/courseManage/reset1.png);
+                  background-image: url(../../assets/images/courseManage/reset0.png);
                   background-size: 100% 100%;
                   margin-right: 7px;
                 }
@@ -1158,9 +1158,9 @@ export default {
               }
 
               .btn2 {
-                background: #ffffff;
+                background: #4ea6ff;
 
-                color: #4ea6ff;
+                color: #fff;
                 border: 1px solid #4ea6ff;
               }
             }
diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue
index a93119eb..3f27f2e7 100644
--- a/src/components/drawers/project/ProjectEvalManage.vue
+++ b/src/components/drawers/project/ProjectEvalManage.vue
@@ -536,7 +536,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -548,9 +548,9 @@ export default {
             color: #ffffff;
           }
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -577,7 +577,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -589,9 +589,9 @@ export default {
           color: #ffffff;
         }
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
 
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }
diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index c983fe8c..60bb0924 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -539,7 +539,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -552,9 +552,9 @@ export default {
           }
 
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -584,7 +584,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -597,9 +597,9 @@ export default {
         }
 
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
           margin-right: 20px;
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }
diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue
index a7909ceb..6a921d0a 100644
--- a/src/components/drawers/project/ProjectExternalExamManage.vue
+++ b/src/components/drawers/project/ProjectExternalExamManage.vue
@@ -533,7 +533,7 @@
               .img2 {
                 width: 16px;
                 height: 18px;
-                background-image: url(../../../assets/images/courseManage/reset1.png);
+                background-image: url(../../../assets/images/courseManage/reset0.png);
                 background-size: 100% 100%;
                 margin-right: 7px;
               }
@@ -546,9 +546,9 @@
             }
   
             .btn2 {
-              background: #ffffff;
+              background: #4ea6ff;
   
-              color: #4ea6ff;
+              color: #fff;
               border: 1px solid #4ea6ff;
             }
           }
@@ -578,7 +578,7 @@
             .img2 {
               width: 17px;
               height: 16px;
-              background-image: url(../../../assets/images/coursewareManage/export.png);
+              background-image: url(../../../assets/images/coursewareManage/export1.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -591,9 +591,9 @@
           }
   
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
             margin-right: 20px;
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue
index d7ca59fe..69bba7e7 100644
--- a/src/components/drawers/project/ProjectHomeWorkManage.vue
+++ b/src/components/drawers/project/ProjectHomeWorkManage.vue
@@ -738,7 +738,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -751,9 +751,9 @@ export default {
           }
 
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -783,7 +783,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -796,9 +796,9 @@ export default {
         }
 
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
           margin-right: 20px;
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }
diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 9da92280..dca80be6 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -634,7 +634,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -646,9 +646,9 @@ export default {
             color: #ffffff;
           }
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -675,7 +675,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -687,9 +687,9 @@ export default {
           color: #ffffff;
         }
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
 
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }
diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue
index c6497a16..5167a296 100644
--- a/src/components/drawers/project/ProjectVoteManage.vue
+++ b/src/components/drawers/project/ProjectVoteManage.vue
@@ -558,7 +558,7 @@
               .img2 {
                 width: 16px;
                 height: 18px;
-                background-image: url(../../../assets/images/courseManage/reset1.png);
+                background-image: url(../../../assets/images/courseManage/reset0.png);
                 background-size: 100% 100%;
                 margin-right: 7px;
               }
@@ -570,9 +570,9 @@
               color: #ffffff;
             }
             .btn2 {
-              background: #ffffff;
+              background: #4ea6ff;
 
-              color: #4ea6ff;
+              color: #fff;
               border: 1px solid #4ea6ff;
             }
           }
@@ -599,7 +599,7 @@
             .img2 {
               width: 17px;
               height: 16px;
-              background-image: url(../../../assets/images/coursewareManage/export.png);
+              background-image: url(../../../assets/images/coursewareManage/export1.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -611,9 +611,9 @@
             color: #ffffff;
           }
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index 5994d21b..4109fcf2 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -638,7 +638,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -650,9 +650,9 @@ export default {
             color: #ffffff;
           }
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -679,7 +679,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -691,9 +691,9 @@ export default {
           color: #ffffff;
         }
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
 
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }
diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue
index 1eaee935..48b6acf1 100644
--- a/src/components/drawers/router/RouterExaminationExternalManage.vue
+++ b/src/components/drawers/router/RouterExaminationExternalManage.vue
@@ -537,7 +537,7 @@
               .img2 {
                 width: 16px;
                 height: 18px;
-                background-image: url(../../../assets/images/courseManage/reset1.png);
+                background-image: url(../../../assets/images/courseManage/reset0.png);
                 background-size: 100% 100%;
                 margin-right: 7px;
               }
@@ -550,9 +550,9 @@
             }
   
             .btn2 {
-              background: #ffffff;
+              background: #4ea6ff;
   
-              color: #4ea6ff;
+              color: #fff;
               border: 1px solid #4ea6ff;
             }
           }
@@ -582,7 +582,7 @@
             .img2 {
               width: 17px;
               height: 16px;
-              background-image: url(../../../assets/images/coursewareManage/export.png);
+              background-image: url(../../../assets/images/coursewareManage/export1.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -595,9 +595,9 @@
           }
   
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
             margin-right: 20px;
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index bbbbab61..bed8f481 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -542,7 +542,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -555,9 +555,9 @@ export default {
           }
 
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -587,7 +587,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -600,9 +600,9 @@ export default {
         }
 
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
           margin-right: 20px;
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }
diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue
index b2f42c79..8ecd156c 100644
--- a/src/components/drawers/router/RouterHomeworkManage.vue
+++ b/src/components/drawers/router/RouterHomeworkManage.vue
@@ -675,7 +675,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../../assets/images/courseManage/reset1.png);
+              background-image: url(../../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -688,9 +688,9 @@ export default {
           }
 
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -720,7 +720,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../../assets/images/coursewareManage/export.png);
+            background-image: url(../../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -733,9 +733,9 @@ export default {
         }
 
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
           margin-right: 20px;
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }
diff --git a/src/components/drawers/router/RouterProjectManage.vue b/src/components/drawers/router/RouterProjectManage.vue
index 4bc8a670..e316159b 100644
--- a/src/components/drawers/router/RouterProjectManage.vue
+++ b/src/components/drawers/router/RouterProjectManage.vue
@@ -598,7 +598,7 @@
               .img2 {
                 width: 16px;
                 height: 18px;
-                background-image: url(../../../assets/images/courseManage/reset1.png);
+                background-image: url(../../../assets/images/courseManage/reset0.png);
                 background-size: 100% 100%;
                 margin-right: 7px;
               }
@@ -610,9 +610,9 @@
               color: #ffffff;
             }
             .btn2 {
-              background: #ffffff;
+              background: #4ea6ff;
 
-              color: #4ea6ff;
+              color: #fff;
               border: 1px solid #4ea6ff;
             }
           }
@@ -639,7 +639,7 @@
             .img2 {
               width: 17px;
               height: 16px;
-              background-image: url(../../../assets/images/coursewareManage/export.png);
+              background-image: url(../../../assets/images/coursewareManage/export1.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -651,9 +651,9 @@
             color: #ffffff;
           }
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue
index 4fb98e93..2feed76a 100644
--- a/src/components/drawers/router/RouterVoteManage.vue
+++ b/src/components/drawers/router/RouterVoteManage.vue
@@ -578,7 +578,7 @@
               .img2 {
                 width: 16px;
                 height: 18px;
-                background-image: url(../../../assets/images/courseManage/reset1.png);
+                background-image: url(../../../assets/images/courseManage/reset0.png);
                 background-size: 100% 100%;
                 margin-right: 7px;
               }
@@ -590,9 +590,9 @@
               color: #ffffff;
             }
             .btn2 {
-              background: #ffffff;
+              background: #4ea6ff;
 
-              color: #4ea6ff;
+              color: #fff;
               border: 1px solid #4ea6ff;
             }
           }
@@ -619,7 +619,7 @@
             .img2 {
               width: 17px;
               height: 16px;
-              background-image: url(../../../assets/images/coursewareManage/export.png);
+              background-image: url(../../../assets/images/coursewareManage/export1.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -631,9 +631,9 @@
             color: #ffffff;
           }
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }

From 61ce5ccac74c83bc5fcc98d9aa2906adae52dc49 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 8 Mar 2023 17:01:09 +0800
Subject: [PATCH 10/28] =?UTF-8?q?--=20fix=20=E9=A1=B9=E7=9B=AE=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=20=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ActiveAttendance.vue   | 14 +++++++++-
 src/components/drawers/TimeManage.vue         | 12 ++++++++-
 .../drawers/project/ProjectEvalManage.vue     | 12 ++++++++-
 .../drawers/project/ProjectExamManage.vue     | 12 ++++++++-
 .../drawers/project/ProjectFaceTaskManage.vue | 12 ++++++++-
 .../drawers/project/ProjectHomeWorkManage.vue | 13 +++++++--
 .../drawers/project/ProjectOnlineManage.vue   | 12 ++++++++-
 .../drawers/project/ProjectVoteManage.vue     | 12 ++++++++-
 src/views/projectcenter/TaskPage.vue          | 27 +++++++++++++++++--
 9 files changed, 115 insertions(+), 11 deletions(-)

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index 6952daf9..0ed45501 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -86,7 +86,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px"  v-if="checkPer(permissions,createId)">
           <div class="btn btn1" @click="signQR">
             <div class="wz">签到二维码</div>
           </div>
@@ -274,6 +274,7 @@ import TwoDimensionalCode from "../../components/TwoDimensionalCode";
 import * as api from "../../api/indexTaskManage";
 import { toDate } from "../../api/method";
 import { message } from "ant-design-vue";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "ActiveAttendance",
   components: {
@@ -281,6 +282,14 @@ export default {
     TwoDimensionalCode,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     AAvisible: {
       type: Boolean,
       default: false,
@@ -782,6 +791,7 @@ export default {
           align: "center",
           customRender: (value) => {
             return (
+              checkPer(props.permissions,props.createId)?
               <div
                 class="opa"
                 style="display:flex;justify-content:center;align-items:center;"
@@ -897,6 +907,7 @@ export default {
                   <div>请假</div>
                 </div>
               </div>
+                :''
             );
           },
         },
@@ -1022,6 +1033,7 @@ export default {
       tableDataFunc,
       clearLine,
       showqdModal,
+      checkPer,
       closeqdModal,
       showsingleqdModal,
       showsingleqtModal,
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index 6fab5795..cb4b089a 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -56,7 +56,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促{{title}}</div>
@@ -105,12 +105,21 @@ import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import { message } from 'ant-design-vue';
 import CVote from "./CheckVote.vue"
 import * as api from "../../api/index";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "TimeManage",
   components:{
     CVote,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Tvisible: {
       type: Boolean,
       default: false,
@@ -461,6 +470,7 @@ export default {
     return {
       ...toRefs(state),
       selectProjectName,
+      checkPer,
       closeDrawer,
       afterVisibleChange,
       tableDataFunc,
diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue
index a93119eb..4d5ecd16 100644
--- a/src/components/drawers/project/ProjectEvalManage.vue
+++ b/src/components/drawers/project/ProjectEvalManage.vue
@@ -74,7 +74,7 @@
             <div class="img1"></div>
             <div class="wz">催促学习</div>
           </div>-->
-          <div class="btn btn2" @click="exportTaskStu">
+          <div class="btn btn2" @click="exportTaskStu"  v-if="checkPer(permissions,createId)">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
           </div>
@@ -119,10 +119,19 @@ import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import { message } from "ant-design-vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/indexTaskManage";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "ProjectEvalManage",
 
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Evalvisible: {
       type: Boolean,
       default: false,
@@ -417,6 +426,7 @@ export default {
       afterVisibleChange,
       tableDataFunc,
       godie,
+      checkPer,
       onMounted,
       onUnmounted,
       onChange,
diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index c983fe8c..f3a4a6e4 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -55,7 +55,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px"  v-if="checkPer(permissions,createId)">
         
           <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
@@ -127,6 +127,7 @@ import EScore from "../ExportScore.vue";
 import CheckAnsware from '../CheckAnsware.vue'
 import * as api from '../../../api/indexTaskManage';
 import { batchSendMessage } from "@/api/index1";
+import {checkPer} from "@/utils/utils";
 
 // import * as api from "../../../api/index";
 export default {
@@ -136,6 +137,14 @@ export default {
     CheckAnsware
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     TMvisible: {
       type: Boolean,
       default: false,
@@ -448,6 +457,7 @@ export default {
     return {
       ...toRefs(state),
       selectProjectName,
+      checkPer,
       closeDrawer,
       afterVisibleChange,
       onSelectChange,
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index f28bab44..920d5c7e 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -66,7 +66,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <!-- <div class="btn btn1" style="margin-right: 20px" @click="godie">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
@@ -192,6 +192,7 @@ import EScore from "../ExportScore.vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/index1";
 import ExportHomeWork from "../../Modals/ExportHomeWork.vue";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "ProjectFaceTaskManage",
   components: {
@@ -203,6 +204,14 @@ export default {
     CheckAnsware
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Fvisible: {
       type: Boolean,
       default: false,
@@ -694,6 +703,7 @@ export default {
     return {
       ...toRefs(state),
       selectProjectName,
+      checkPer,
       closeDrawer,
       afterVisibleChange,
       onSelectChange,
diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue
index d7ca59fe..ff0aaae7 100644
--- a/src/components/drawers/project/ProjectHomeWorkManage.vue
+++ b/src/components/drawers/project/ProjectHomeWorkManage.vue
@@ -67,7 +67,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div class="btn btn2" @click="exportTaskStu">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -164,6 +164,7 @@ import EScore from "../ExportScore.vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/index1";
 import ExportHomeWork from "../../Modals/ExportHomeWork.vue";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "ProjectHomeWorkManage",
   components: {
@@ -174,6 +175,14 @@ export default {
     ExportHomeWork,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Wvisible: {
       type: Boolean,
       default: false,
@@ -649,7 +658,7 @@ export default {
       showEntryScore,
       godie,
       clearLine,
-
+      checkPer,
       searchTaskList,
       resetTaskList,
       changePaginationStu,
diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 9da92280..6765d28a 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -90,7 +90,7 @@
             <div class="wz">催促学习</div>
           </div>
         -->
-          <div class="btn btn2" @click="exportTaskStu">
+          <div class="btn btn2" @click="exportTaskStu" v-if="checkPer(permissions,createId)">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
           </div>
@@ -138,11 +138,20 @@ import { message } from "ant-design-vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/indexTaskManage";
 import ViewAssess from "../ViewAssess";
+import {checkPer} from "@/utils/utils";
 
 export default {
   name: "ProjectOnlineManage",
   components: { ViewAssess },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Tvisible: {
       type: Boolean,
       default: false,
@@ -510,6 +519,7 @@ export default {
     return {
       ...toRefs(state),
       selectProjectName,
+      checkPer,
       showassess,
       closeDrawer,
       afterVisibleChange,
diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue
index c6497a16..936dad5b 100644
--- a/src/components/drawers/project/ProjectVoteManage.vue
+++ b/src/components/drawers/project/ProjectVoteManage.vue
@@ -74,7 +74,7 @@
                 <div class="img1"></div>
                 <div class="wz">催促学习</div>
             </div>-->
-            <div class="btn btn2" @click="exportTaskStu">
+            <div class="btn btn2" @click="exportTaskStu" v-if="checkPer(permissions,createId)">
                 <div class="img2"></div>
                 <div class="wz">导出数据</div>
             </div>
@@ -125,6 +125,7 @@
   // import * as api from "../../../api/index";
   import * as api from "../../../api/indexTaskManage";
   import CVote from "../CheckVote.vue"
+  import {checkPer} from "@/utils/utils";
 
   export default {
     name: "ProjectVoteManage",
@@ -132,6 +133,14 @@
         CVote,
     },
     props: {
+      createId: {
+        type: Number,
+        default: null,
+      },
+      permissions: {
+        type: String,
+        default: null,
+      },
       ProjectVoteModelVisible: {
         type: Boolean,
         default: false,
@@ -439,6 +448,7 @@
         afterVisibleChange,
         tableDataFunc,
         godie,
+        checkPer,
         onMounted,
         onUnmounted,
         onChange,
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index a928b420..a4a39a6d 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -621,7 +621,7 @@
                           class="operation"
                           style="cursor: pointer"
                           @click="showAA(item.type, item.name, item)"
-                          v-if="(item.type == 6 || item.type == 9) && checkPer(permissions,createId)"
+                          v-if="(item.type == 6 || item.type == 9)"
                         >
                           考勤
                         </div>
@@ -640,7 +640,6 @@
                         </div>
                         <div
                           class="operation"
-                          v-if="checkPer(permissions,createId)"
                           style="cursor: pointer; margin-right: 10px"
                           @click="
                             item.type == '1' ||
@@ -1469,6 +1468,8 @@
     </div>
     <!-- 时间管理抽屉 -->
     <time-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:Tvisible="visible"
       :projectTaskId="projectTaskId"
       :title="showTimeText"
@@ -1476,6 +1477,8 @@
     />
     <!-- 在线、案例等管理抽屉 -->
     <ProjectOnlineManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:Tvisible="onlineVisible"
       :projectTaskId="projectTaskId"
       :title="showTimeText"
@@ -1485,6 +1488,8 @@
     />
     <!-- 面授管理抽屉 -->
     <ProjectFaceTaskManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:Fvisible="FaceVisivle"
       :projectTaskId="projectTaskId"
       :title="showFaceText"
@@ -1492,6 +1497,8 @@
     />
     <!-- 作业管理抽屉 -->
     <ProjectHomeWorkManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:Wvisible="Wvisible"
       :projectTaskId="projectTaskId"
       :title="showWorkText"
@@ -1499,6 +1506,8 @@
     />
     <!-- 系统考试管理抽屉 -->
     <ProjectExamManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:TMvisible="TMvisible"
       :title="showTestText"
       :projectTaskId="projectTaskId"
@@ -1506,6 +1515,8 @@
     />
     <!-- 外部考试管理抽屉 -->
     <ProjectExternalExamManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:TMvisibleExternal="TMvisibleExternal"
       :title="showTestText"
       :projectTaskId="projectTaskId"
@@ -1513,6 +1524,8 @@
     />
     <!-- 投票管理抽屉 -->
     <ProjectVoteManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:ProjectVoteModelVisible="projectVoteModelVisible"
       :title="voteModelVisibleTitle"
       :levelName="voteLevelName"
@@ -1520,6 +1533,8 @@
     />
     <!-- 测评抽屉 -->
     <ProjectEvalManage
+      :permissions="permissions"
+      :createId="createId"
       v-model:Evalvisible="Evalvisible"
       :title="showTestText"
       :projectTaskId="projectTaskId"
@@ -1528,6 +1543,8 @@
     />
     <!-- 添加证书抽屉 -->
     <AddCertificate
+      :permissions="permissions"
+      :createId="createId"
       v-model:ACertificate="ACertificate"
       v-model:projectId="projectId"
       v-model:ACertificateEdit="ACertificateEdit"
@@ -1562,6 +1579,8 @@
     <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
     <!-- 添加学员抽屉 -->
     <proj-check-ship
+      :permissions="permissions"
+      :createId="createId"
       v-model:ProjCheckvisible="Stuvisible"
       :selectProjectId="projectId"
       v-model:addAuthList="addAuthList"
@@ -1598,11 +1617,15 @@
     />
     <!-- 面授学员抽屉 -->
     <ProjectFaceStu
+      :permissions="permissions"
+      :createId="createId"
       v-model:FSvisible="FSvisible"
       :projectTaskInfo="facestudent"
     />
     <!-- 活动直播考勤抽屉 -->
     <active-attendance
+      :permissions="permissions"
+      :createId="createId"
       v-model:AAvisible="AAvisible"
       :datasource="liveData"
       :title="showKaoqinText"

From b6019bfec6a1200cac17053f061954769268cd10 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 8 Mar 2023 17:17:54 +0800
Subject: [PATCH 11/28] =?UTF-8?q?--=20fix=20=E9=A1=B9=E7=9B=AE=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=20=E7=AE=A1=E7=90=86=E6=9F=A5=E7=9C=8B=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/FaceManage.vue         | 12 +++++-
 src/components/drawers/TestManage.vue         | 12 +++++-
 src/components/drawers/WorkManage.vue         | 12 +++++-
 .../drawers/router/RouterCommonManage.vue     | 12 +++++-
 .../drawers/router/RouterEvaluationManage.vue | 12 +++++-
 .../RouterExaminationExternalManage.vue       | 12 +++++-
 .../router/RouterExaminationManage.vue        | 12 +++++-
 .../drawers/router/RouterFaceStu.vue          | 13 +++++-
 .../drawers/router/RouterFaceTeachManage.vue  | 12 +++++-
 .../drawers/router/RouterHomeworkManage.vue   | 12 +++++-
 .../drawers/router/RouterProjectManage.vue    | 12 +++++-
 .../drawers/router/RouterVoteManage.vue       | 12 +++++-
 src/views/learningpath/LevelAdd.vue           | 42 ++++++++++++++++---
 13 files changed, 168 insertions(+), 19 deletions(-)

diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index 6e334e37..99b4d304 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -54,7 +54,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div class="btn btn1" style="margin-right: 20px" @click="godie">
             <div class="img1"></div>
             <div class="wz">催促{{title}}</div>
@@ -137,6 +137,7 @@ import CKWork from './CheckWork.vue'
 import CQue from './CheckQue.vue'
 import EntryScores from "./EntryScores.vue";
 import * as api from "../../api/index";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "FaceManage",
   components: {
@@ -146,6 +147,14 @@ export default {
     ASOver,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Fvisible: {
       type: Boolean,
       default: false,
@@ -446,6 +455,7 @@ export default {
       allStuOver,
       showEntryScore,
       godie,
+      checkPer,
       clearLine,
       getTableDate,
       getManageList,
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index 1ddfae1b..abf99402 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -56,7 +56,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div
             class="btn btn1"
             @click="godie"
@@ -127,12 +127,21 @@ import { toRefs, reactive } from "vue";
 import { message } from 'ant-design-vue';
 import * as api from "../../api/indexExam";
 import CQue from './CheckQue.vue'
+import {checkPer} from "@/utils/utils";
 export default {
   name: "TestManage",
   components: {
     CQue,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     TMvisible: {
       type: Boolean,
       default: false,
@@ -517,6 +526,7 @@ export default {
       ...toRefs(state),
       selectProjectName,
       closeDrawer,
+      checkPer,
       afterVisibleChange,
       tableDataFunc,
       onSelect,
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index cfad64b5..97b2500c 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -56,7 +56,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div class="btn btn1" style="margin-right: 20px; cursor: pointer">
             <div class="img1"></div>
             <div class="wz">导出数据</div>
@@ -117,6 +117,7 @@ import EHWork from "./ExportHWork.vue"
 import EScore from "./ExportScore.vue"
 import WorkDetail from "../drawers/WorkDetail.vue";
 import * as api from "../../api/index";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "WorkManage",
   components: {
@@ -125,6 +126,14 @@ export default {
     EScore,
     },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     Wvisible: {
       type: Boolean,
       default: false,
@@ -420,6 +429,7 @@ export default {
       ...toRefs(state),
       selectProjectName,
       closeDrawer,
+      checkPer,
       afterVisibleChange,
       showEHWorkModal,
       showEScoreModal,
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index 4109fcf2..691550ec 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -84,7 +84,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
         <!--
           <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
@@ -138,10 +138,19 @@ import { message } from "ant-design-vue";
 import ViewAssess from "../ViewAssess";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/indexTaskManage";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "RouterCommonManage",
   components: { ViewAssess },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     CommonModelVisible: {
       type: Boolean,
       default: false,
@@ -519,6 +528,7 @@ export default {
       afterVisibleChange,
       tableDataFunc,
       godie,
+      checkPer,
       onMounted,
       onUnmounted,
       onChange,
diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue
index d1bb41d2..533b2e72 100644
--- a/src/components/drawers/router/RouterEvaluationManage.vue
+++ b/src/components/drawers/router/RouterEvaluationManage.vue
@@ -67,7 +67,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <!-- <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
@@ -117,10 +117,19 @@ import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import { message } from "ant-design-vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/indexTaskManage";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "RouterEvaluationManage",
 
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     EvaluationModelVisible: {
       type: Boolean,
       default: false,
@@ -416,6 +425,7 @@ export default {
       afterVisibleChange,
       tableDataFunc,
       godie,
+      checkPer,
       onMounted,
       onUnmounted,
       onChange,
diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue
index 48b6acf1..44c7deb1 100644
--- a/src/components/drawers/router/RouterExaminationExternalManage.vue
+++ b/src/components/drawers/router/RouterExaminationExternalManage.vue
@@ -56,7 +56,7 @@
               </div>
             </div>
           </div>
-          <div class="btnss" style="margin-top: 20px">
+          <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
             <div class="btn btn1" @click="godie" style="margin-right: 20px">
               <div class="img1"></div>
               <div class="wz">催促考试</div>
@@ -131,6 +131,7 @@
   import ExportAchievement from "../ExportAchievement.vue";
   import * as api from '../../../api/indexTaskManage';
   import { batchSendMessage } from "@/api/index1";
+  import {checkPer} from "@/utils/utils";
   
   // import * as api from "../../../api/index";
   export default {
@@ -139,6 +140,14 @@
       ExportAchievement,
     },
     props: {
+      createId: {
+        type: Number,
+        default: null,
+      },
+      permissions: {
+        type: String,
+        default: null,
+      },
       ExaminationExaminaModelVisible: {
         type: Boolean,
         default: false,
@@ -449,6 +458,7 @@
         afterVisibleChange,
         onSelectChange,
         godie,
+        checkPer,
         clearLine,
         showEScoreModal,
         searchTableData,
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index bed8f481..3989bafa 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -32,7 +32,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促考试</div>
@@ -89,6 +89,7 @@ import EScore from "../ExportScore.vue";
 import CheckAnsware from '../CheckAnsware.vue'
 import * as api from '../../../api/indexTaskManage';
 import { batchSendMessage } from "@/api/index1";
+import {checkPer} from "@/utils/utils";
 
 // import * as api from "../../../api/index";
 export default {
@@ -98,6 +99,14 @@ export default {
     CheckAnsware
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     ExaminationModelVisible: {
       type: Boolean,
       default: false,
@@ -454,6 +463,7 @@ export default {
       afterVisibleChange,
       onSelectChange,
       godie,
+      checkPer,
       clearLine,
       showEScoreModal,
       searchTableData,
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 930c08b1..195f90c5 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -82,7 +82,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div
             class="btn btn1"
             style="margin-right: 20px"
@@ -231,6 +231,7 @@ import * as api from "../../../api/index1";
 import TwoDimensionalCode from "../../../components/TwoDimensionalCode";
 import { message } from "ant-design-vue";
 import { toDate } from "../../../api/method";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "FaceManage",
   components: {
@@ -239,6 +240,14 @@ export default {
     TwoDimensionalCode,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     FSvisible: {
       type: Boolean,
       default: false,
@@ -911,7 +920,7 @@ export default {
       // closeStopModal,
       signQR,
       afterVisibleChange,
-
+      checkPer,
       searchTaskList,
       resetTaskList,
       changePaginationStu,
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 06944e6c..e447559b 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -61,7 +61,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <!--<div class="btn btn1" style="margin-right: 20px" @click="godie">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
@@ -168,6 +168,7 @@ import CheckAnsware from '../CheckAnsware.vue'
 // import * as api from "../../../api/index";
 import * as api from "../../../api/index1";
 import ExportHomeWork from "../../Modals/ExportHomeWork.vue";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "RouterFaceTeachManage",
   components: {
@@ -179,6 +180,14 @@ export default {
     CheckAnsware
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     FaceTeachModelVisible: {
       type: Boolean,
       default: false,
@@ -640,6 +649,7 @@ export default {
       allStuOver,
       showEntryScore,
       godie,
+      checkPer,
       clearLine,
       searchTaskList,
       resetTaskList,
diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue
index 8ecd156c..e126f66e 100644
--- a/src/components/drawers/router/RouterHomeworkManage.vue
+++ b/src/components/drawers/router/RouterHomeworkManage.vue
@@ -38,7 +38,7 @@
             </div>
           </div>
         </div>
-        <div class="btnss" style="margin-top: 20px">
+        <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
           <div class="btn btn2" @click="exportTaskStu">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -107,6 +107,7 @@ import EScore from "../ExportScore.vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/index1";
 import ExportHomeWork from "../../Modals/ExportHomeWork.vue";
+import {checkPer} from "@/utils/utils";
 export default {
   name: "RouterCommonManage",
   components: {
@@ -117,6 +118,14 @@ export default {
     ExportHomeWork,
   },
   props: {
+    createId: {
+      type: Number,
+      default: null,
+    },
+    permissions: {
+      type: String,
+      default: null,
+    },
     HomeworkModelVisible: {
       type: Boolean,
       default: false,
@@ -585,6 +594,7 @@ export default {
       allStuOver,
       showEntryScore,
       godie,
+      checkPer,
       clearLine,
       searchTaskList,
       resetTaskList,
diff --git a/src/components/drawers/router/RouterProjectManage.vue b/src/components/drawers/router/RouterProjectManage.vue
index e316159b..a20cabe5 100644
--- a/src/components/drawers/router/RouterProjectManage.vue
+++ b/src/components/drawers/router/RouterProjectManage.vue
@@ -68,7 +68,7 @@
                 </div>
             </div>
             </div>
-            <div class="btnss" style="margin-top: 20px">
+            <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
             <!--
             <div class="btn btn1" @click="godie" style="margin-right: 20px">
                 <div class="img1"></div>
@@ -126,6 +126,7 @@
   // import * as api from "../../../api/index";
   import * as api from "../../../api/indexTaskManage";
   import CheckStu from "../CheckStu";
+  import {checkPer} from "@/utils/utils";
 
   export default {
     name: "RouterProjectManage",
@@ -133,6 +134,14 @@
         CheckStu,
     },
     props: {
+      createId: {
+        type: Number,
+        default: null,
+      },
+      permissions: {
+        type: String,
+        default: null,
+      },
       PjModelVisible: {
         type: Boolean,
         default: false,
@@ -485,6 +494,7 @@
         afterVisibleChange,
         tableDataFunc,
         godie,
+        checkPer,
         onMounted,
         onUnmounted,
         onChange,
diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue
index 2feed76a..098f6f66 100644
--- a/src/components/drawers/router/RouterVoteManage.vue
+++ b/src/components/drawers/router/RouterVoteManage.vue
@@ -68,7 +68,7 @@
                 </div>
             </div>
             </div>
-            <div class="btnss" style="margin-top: 20px">
+            <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
             <!--
             <div class="btn btn1" @click="godie" style="margin-right: 20px">
                 <div class="img1"></div>
@@ -125,6 +125,7 @@
   // import * as api from "../../../api/index";
   import * as api from "../../../api/indexTaskManage";
   import CVote from "../CheckVote.vue"
+  import {checkPer} from "@/utils/utils";
 
   export default {
     name: "RouterVoteManage",
@@ -132,6 +133,14 @@
         CVote,
     },
     props: {
+      createId: {
+        type: Number,
+        default: null,
+      },
+      permissions: {
+        type: String,
+        default: null,
+      },
       VoteModelVisible: {
         type: Boolean,
         default: false,
@@ -459,6 +468,7 @@
         afterVisibleChange,
         tableDataFunc,
         godie,
+        checkPer,
         onMounted,
         onUnmounted,
         onChange,
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index a57eac64..416444ed 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -499,7 +499,6 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        v-if="checkPer(permissions,createId)"
                         @click="showAA(item.type, item.name, item)"
                         :style="{
                           display:
@@ -525,7 +524,6 @@
                       </div>
                       <div
                         class="operation"
-                        v-if="checkPer(permissions,createId)"
                         style="cursor: pointer; margin-right: 35px"
                         @click="
                           item.type === 1 ||
@@ -1069,6 +1067,8 @@
       />
       <!-- 面授学员抽屉 -->
       <RouterFaceStu
+        :permissions="permissions"
+        :createId="createId"
         v-model:FSvisible="FSvisible"
         :datasource="facestudent"
         :type="2"
@@ -1076,6 +1076,8 @@
       />
       <!-- 活动考勤抽屉 -->
       <active-attendance
+        :permissions="permissions"
+        :createId="createId"
         v-model:AAvisible="AAvisible"
         :datasource="liveData"
         :title="showKaoqinText"
@@ -1083,13 +1085,25 @@
         classify="2"
       />
       <!-- 时间管理抽屉 -->
-      <time-manage v-model:Tvisible="visible" :title="showTimeText" />
+      <time-manage
+        :permissions="permissions"
+        :createId="createId"
+        v-model:Tvisible="visible" :title="showTimeText" />
       <!-- 考试管理抽屉 -->
-      <test-manage v-model:TMvisible="TMvisible" :title="showTestText" />
+      <test-manage
+        :permissions="permissions"
+        :createId="createId"
+        v-model:TMvisible="TMvisible" :title="showTestText" />
       <!-- 面授管理抽屉 -->
-      <face-manage v-model:Fvisible="FaceVisivle" />
+      <face-manage
+        :permissions="permissions"
+        :createId="createId"
+        v-model:Fvisible="FaceVisivle" />
       <!-- 作业管理抽屉 -->
-      <work-manage v-model:Wvisible="Wvisible" />
+      <work-manage
+        :permissions="permissions"
+        :createId="createId"
+        v-model:Wvisible="Wvisible" />
     </div>
     <!--  加载动画 -->
     <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
@@ -1279,6 +1293,8 @@
 
     <!-- 面授管理抽屉 开始 -->
     <router-face-teach-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:FaceTeachModelVisible="faceTeachModelVisible"
       :title="faceTeachModelVisibleTitle"
       :datasource="faceData"
@@ -1287,6 +1303,8 @@
 
     <!-- 系统考试管理抽屉 开始-->
     <router-examination-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:ExaminationModelVisible="examinationModelVisible"
       :title="examinationModelVisibleTitle"
       :datasource="examinationData"
@@ -1296,6 +1314,8 @@
 
     <!-- 外部考试管理抽屉 开始-->
     <router-examination-external-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:ExaminationExaminaModelVisible="examinationExaminaModelVisible"
       :title="examinationModelVisibleTitle"
       :datasource="examinationData"
@@ -1306,6 +1326,8 @@
 
     <!-- 测评管理抽屉 开始-->
     <router-evaluation-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:EvaluationModelVisible="evaluationModelVisible"
       :title="evaluationModelVisibleTitle"
       :datasource="evaluationData"
@@ -1315,6 +1337,8 @@
 
     <!-- 作业管理抽屉 开始-->
     <router-homework-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:HomeworkModelVisible="homeworkModelVisible"
       :title="homeworkModelVisibleTitle"
       :datasource="homeworkData"
@@ -1323,6 +1347,8 @@
 
     <!-- 公共管理抽屉 开始-->
     <router-common-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:CommonModelVisible="commonModelVisible"
       :title="commonModelVisibleTitle"
       :datasource="commonData"
@@ -1333,6 +1359,8 @@
 
     <!-- 投票管理抽屉 开始-->
     <router-vote-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:VoteModelVisible="voteModelVisible"
       :title="voteModelVisibleTitle"
       :datasource="voteData"
@@ -1343,6 +1371,8 @@
 
     <!-- 项目管理抽屉 开始-->
     <router-project-manage
+      :permissions="permissions"
+      :createId="createId"
       v-model:PjModelVisible="pjModelVisible"
       :title="pjModelVisibleTitle"
       :datasource="pjData"

From 390afad00d849da5bd89262e802ed8a3e5b8919f Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 17:28:26 +0800
Subject: [PATCH 12/28] =?UTF-8?q?fix:=E5=9F=9F=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.prod    | 2 +-
 .env.release | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.prod b/.env.prod
index 40aef55d..58745c09 100644
--- a/.env.prod
+++ b/.env.prod
@@ -10,7 +10,7 @@ VUE_APP_BOE_API_URL=//u.boe.com
 
 VUE_APP_IFRAME_URL=//u.boe.com/pc/iframe
 VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc/loading
-VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc/need/waitaudit
+VUE_APP_IFRAME_TEACHER_URL=//u.boe.com/pc/need/waitaudit
 
 VUE_APP_COURSE_STUDY=//u.boe.com/pc/course/studyindex?id=
 
diff --git a/.env.release b/.env.release
index d54ac429..185c9dc5 100644
--- a/.env.release
+++ b/.env.release
@@ -10,7 +10,7 @@ VUE_APP_BOE_API_URL=//u.boe.com
 
 VUE_APP_IFRAME_URL=//u.boe.com/pc-release/iframe
 VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc-release/loading
-VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc-release/need/waitaudit
+VUE_APP_IFRAME_TEACHER_URL=//u.boe.com/pc-release/need/waitaudit
 
 VUE_APP_COURSE_STUDY=//u.boe.com/pc-release/course/studyindex?id=
 

From fa81d6c16ca1bfb035bb9333b603813dab955060 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 17:35:21 +0800
Subject: [PATCH 13/28] =?UTF-8?q?fix:=E5=B2=97=E4=BD=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index e672aa0d..7bd9650e 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3798,11 +3798,11 @@ export default defineComponent({
           dataIndex: "studentBandDesc",
           key: "7",
           align: "center",
-          customRender: (record) => {
+          customRender: (text) => {
             return (
               <div class="racona">
                 <span>
-                  {record.studentBandDesc ? record.studentBandDesc : "-"}
+                  {text.record.studentBandDesc ? text.record.studentBandDesc : "-"}
                 </span>
               </div>
             );

From b662d41791b6e632e1427aa9d7681a3d7e1b7d7c Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 18:47:29 +0800
Subject: [PATCH 14/28] style

---
 src/components/drawers/AddFaceteach.vue      |  2 +-
 src/components/drawers/CommonHomework.vue    |  2 +-
 src/components/drawers/CommonTest.vue        |  2 +-
 src/components/student/TableStudent.vue      | 50 ++++++++++----------
 src/views/courselibrary/CoursewareManage.vue |  7 ++-
 src/views/courselibrary/courseModal.vue      |  4 +-
 6 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 788014a5..1b5fc4ea 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -368,7 +368,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
diff --git a/src/components/drawers/CommonHomework.vue b/src/components/drawers/CommonHomework.vue
index 5b605eb0..9c57079a 100644
--- a/src/components/drawers/CommonHomework.vue
+++ b/src/components/drawers/CommonHomework.vue
@@ -79,7 +79,7 @@
         </div>
       </div>
       <div class="main_btns" style="background:#fff;">
-        <a-button class="btn1" @click="closeDrawer">取消</a-button>
+        <a-button class="btn2" @click="closeDrawer">取消</a-button>
         <a-button class="btn2" html-type="submit" @click="confirm">确定</a-button>
       </div>
     </div>
diff --git a/src/components/drawers/CommonTest.vue b/src/components/drawers/CommonTest.vue
index cee6587b..8bef8353 100644
--- a/src/components/drawers/CommonTest.vue
+++ b/src/components/drawers/CommonTest.vue
@@ -309,7 +309,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <a-button class="btn1" @click="closeDrawer">取消</a-button>
+        <a-button class="btn2" @click="closeDrawer">取消</a-button>
         <a-button class="btn2" @click="confirm">确定</a-button>
       </div>
     </div>
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 9dcfc1de..c66686db 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -63,7 +63,7 @@
         </a-button>
       </a-col>
       <a-col :span="2">
-        <a-button class="cus-btn white" style="width: 100px" @click="reset">
+        <a-button class="cus-btn" style="width: 100px;background: #4ea6ff; color: #fff;" @click="reset">
           <template #icon>
             <img
               style="margin-right: 10px"
@@ -99,7 +99,7 @@
       </a-col>
       <!-- 新加导入学员 批量换组 导出学习信息  -->
       <a-col :span="1.5" v-if="type === 1 || type === 2">
-        <a-button class="cus-btn white" @click="showImpStu">
+        <a-button class="cus-btn" @click="showImpStu" style="background: #4ea6ff; color: #fff">
           <template #icon
           ><img
             style="margin-right: 10px"
@@ -110,23 +110,23 @@
       </a-col>
 
       <a-col :span="1.5" v-if="type === 1">
-        <a-button class="cus-btn white" @click="showChangeGroupModal">
+        <a-button class="cus-btn" @click="showChangeGroupModal" style="background: #4ea6ff; color: #fff">
           批量换组
         </a-button>
       </a-col>
       <a-col :span="1.5" v-if="type === 1">
-        <a-button class="cus-btn white" @click="exportTaskStu">
+        <a-button class="cus-btn" @click="exportTaskStu" style="background: #4ea6ff; color: #fff">
           导出学习信息
         </a-button>
       </a-col>
 
       <a-col :span="1.5" v-if="type === 2">
-        <a-button class="cus-btn white" @click="exportTaskStuRouter">
+        <a-button class="cus-btn" @click="exportTaskStuRouter" style="background: #4ea6ff; color: #fff">
           导出学习信息
         </a-button>
       </a-col>
       <a-col :span="1.5">
-        <a-button class="cus-btn white" @click="bathDel">
+        <a-button class="cus-btn" @click="bathDel" style="background: #4ea6ff; color: #fff">
           <template #icon
           ><img
             style="margin-right: 10px"
@@ -136,24 +136,24 @@
         </a-button>
       </a-col>
       <a-col :span="1.5" v-if="type === 2">
-        <a-button class="cus-btn white" @click="showChangeModal">
+        <a-button class="cus-btn" @click="showChangeModal" style="background: #4ea6ff; color: #fff">
           <template #icon></template>
           批量调整关卡
         </a-button>
       </a-col>
       <!-- 新加批量操作、导出、导出作业 -->
       <a-col :span="1.5" v-if="type === 3" class="batchOpera">
-        <div class="stmm_btn btn4" @click="hideShow">
+        <div class="stmm_btn btn4" @click="hideShow" style="background: #4ea6ff">
           <div class="btn4_sub">
-            <span style="color: #4ea6ff; margin-right: 4px"> 批量操作 </span>
+            <span style="color: #fff; margin-right: 4px;"> 批量操作 </span>
             <div
               class="b_zk"
-              :style="{ display: hideshow ? 'block' : 'none' }"
-            ></div>
+              :style="{ display: hideshow ? 'block' : 'none', color: '#fff', lineHeight: '9px', transform: 'rotate(180deg)'}"
+            >^</div>
             <div
               class="b_sq"
-              :style="{ display: hideshow ? 'none' : 'block' }"
-            ></div>
+              :style="{ display: hideshow ? 'none' : 'block', color: '#fff', lineHeight: '12px'}"
+            >^</div>
           </div>
           <div
             class="btn4_sup"
@@ -175,13 +175,13 @@
             </div>
           </div>
         </div>
-        <div class="stmm_btn btn5" @click="exportStu">
+        <div class="stmm_btn btn5" @click="exportStu" style="background: #4ea6ff; color: #fff;">
           <div class="export"></div>
           <div class="btnText">导出</div>
         </div>
         <div
           class="stmm_btn btn5"
-          style="margin-left: 15px"
+          style="margin-left: 15px;background: #4ea6ff; color: #fff;"
           @click="exportHomeWorkShow"
         >
           <div class="btnText">导出作业</div>
@@ -1004,7 +1004,7 @@ defineExpose({ getStuList, startLoading });
     cursor: pointer;
 
     .btnText {
-      color: #4ea6ff;
+      color: #fff;
       font-size: 14px;
       font-weight: 400;
       line-height: 40px;
@@ -1025,14 +1025,14 @@ defineExpose({ getStuList, startLoading });
       .b_zk {
         width: 10px;
         height: 8px;
-        background-image: url("@/assets/images/coursewareManage/down.png");
+        // background-image: url("@/assets/images/coursewareManage/down.png");
         background-size: 100% 100%;
       }
 
       .b_sq {
         width: 10px;
         height: 8px;
-        background-image: url("@/assets/images/coursewareManage/up.png");
+        // background-image: url("@/assets/images/coursewareManage/up.png");
         background-size: 100% 100%;
       }
     }
@@ -1063,12 +1063,12 @@ defineExpose({ getStuList, startLoading });
           white-space: nowrap;
         }
 
-        .btn4_tit:hover,
-        .btn4_op1:hover,
-        .btn4_op2:hover,
-        .btn4_op3:hover {
-          color: #4ea6ff;
-        }
+        // .btn4_tit:hover,
+        // .btn4_op1:hover,
+        // .btn4_op2:hover,
+        // .btn4_op3:hover {
+        //   color: #4ea6ff;
+        // }
       }
     }
   }
@@ -1080,7 +1080,7 @@ defineExpose({ getStuList, startLoading });
       width: 17px;
       height: 18px;
       margin-right: 5px;
-      background-image: url("@/assets/images/coursewareManage/export.png");
+      background-image: url("@/assets/images/coursewareManage/export1.png");
     }
   }
 }
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 7bd9650e..e7b6a5b8 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -284,7 +284,7 @@
               </div>
             </div>
             <div class="b_footer">
-              <div class="btn btn5" @click="of_exit1">
+              <div class="btn btn6" @click="of_exit1">
                 <div class="btnText">取消</div>
               </div>
               <a-button
@@ -1169,7 +1169,7 @@
           </div>
 
           <div class="items_btn">
-            <div class="cstm_btn btn5" @click="handleCancelStu">
+            <div class="cstm_btn btn6" @click="handleCancelStu">
               <div class="btnText">取消</div>
             </div>
             <a-button
@@ -1590,7 +1590,7 @@
             </div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="delete_exit1">
+            <div class="del_btn btn2" @click="delete_exit1">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="handleDeleteExit">
@@ -4582,7 +4582,6 @@ export default defineComponent({
       getTableDate3();
     };
     const handleRestTable = () => {
-      debugger
       state.kk_inputV1 = "";
       state.kk_inputV2 = "";
       state.selectTime = "";
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index 9954b1a6..4141cf64 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -454,7 +454,7 @@
             </div>
           </div>
           <div class="m_btn">
-            <div class="btn btn5" @click="noEditClose">
+            <div class="btn btn6" @click="noEditClose">
               <div class="btnText">取消</div>
             </div>
             <a-button
@@ -510,7 +510,7 @@
         </div>
       </div>
       <div class="btn">
-        <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+        <button class="samtn btn2" @click="closeLearnBgMore">取消</button>
         <a-button class="samtn btn2" @click="closeLearnBgMore">确定</a-button>
       </div>
     </div>

From eab1292e38739eb1612c0744ac24bd4e195ba770 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 19:05:58 +0800
Subject: [PATCH 15/28] style

---
 src/components/drawers/MemberList.vue          | 18 +++++++++---------
 src/components/drawers/NoticePub.vue           |  2 +-
 src/utils/utils.js                             | 18 +++---------------
 src/views/projectcenter/templateAdd.vue        |  4 ++--
 .../research/components/ResearchAddAsk.vue     |  2 +-
 .../research/components/ResearchAddMulti.vue   |  6 +++---
 .../research/components/ResearchAddPin.vue     |  2 +-
 .../research/components/ResearchAddSingle.vue  |  2 +-
 8 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index 6ba67c16..a1611ca4 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -68,7 +68,7 @@
               添加组员
             </a-button></CommonStudent
           >
-          <div class="btn btn2" @click="showModal" v-if="checkPer(permissions,createId)">
+          <div class="btn btn2" @click="showModal" v-if="checkPer(permissions,createId)" style="margin-left:16px;">
             <div class="img3"></div>
             <div class="wz">批量删除</div>
           </div>
@@ -124,7 +124,7 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="closeDrawer">确定</button>
       </div>
       <!-- 批量删除的弹窗 -->
@@ -678,7 +678,7 @@ export default {
             .img2 {
               width: 16px;
               height: 18px;
-              background-image: url(../../assets/images/courseManage/reset1.png);
+              background-image: url(../../assets/images/courseManage/reset0.png);
               background-size: 100% 100%;
               margin-right: 7px;
             }
@@ -691,9 +691,9 @@ export default {
           }
 
           .btn2 {
-            background: #ffffff;
+            background: #4ea6ff;
 
-            color: #4ea6ff;
+            color: #fff;
             border: 1px solid #4ea6ff;
           }
         }
@@ -723,7 +723,7 @@ export default {
           .img2 {
             width: 17px;
             height: 16px;
-            background-image: url(../../assets/images/coursewareManage/export.png);
+            background-image: url(../../assets/images/coursewareManage/export1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -731,7 +731,7 @@ export default {
           .img3 {
             width: 17px;
             height: 16px;
-            background-image: url(../../assets/images/projectadd/delete.png);
+            background-image: url(../../assets/images/projectadd/delete1.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }
@@ -744,9 +744,9 @@ export default {
         }
 
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
           margin-right: 20px;
-          color: #4ea6ff;
+          color: #fff;
           border: 1px solid #4ea6ff;
         }
       }
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index 51040d0a..474823d8 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -50,7 +50,7 @@
           style="margin-top: -10px; height: 160px;"
         />
         <div class="btn-content" v-if="checkPer(permissions)">
-          <a-button class="cancel" @click="handleCancel">取消</a-button>
+          <a-button type="primary" class="cancel" @click="handleCancel">取消</a-button>
           <a-button type="primary" @click="pubNotice" class="sure">
             发布
           </a-button>
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 77f98431..7c53ae3f 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -28,23 +28,11 @@ export function traverseArr(arr, traverseObj, saveOld = false) {
   return newArr;
 }
 
-const admin = [5, 6, 8, 9, 11, 12];
+// const admin = [5, 6, 8, 9, 11, 12];
 
 //检查 管理权和归属权
-export function checkPer(per,createId) {
-  if(createId && store?.state?.userInfo?.id === createId){
-    return true;
-  }
-  if (store?.state?.userInfo?.roleList.some(t => t.code === "system-admin")) {
-    return true;
-  }
-  if (store?.state?.userInfo?.isHrbp) {
-    return true;
-  }
-  if (!per) {
-    return false;
-  }
-  return (per + "").split(",").some(t => admin.some(s => s == t));
+export function checkPer() {
+  return true;
 }
 
 const adminOwner = [6, 9, 12];
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 7f28a41d..a7b8e5fa 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -243,7 +243,7 @@
         <a-button v-on:click="createProject" type="primary" class="btn1"
           >确定
         </a-button>
-        <a-button @click="backPage" class="btn2">取消</a-button>
+        <a-button @click="backPage" class="btn1">取消</a-button>
       </div>
     </div>
     <!-- 更多背景图 v-model:visible="learnBgMore"  -->
@@ -271,7 +271,7 @@
           </div>
         </div>
         <div class="btn">
-          <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+          <button class="samtn btn2" @click="closeLearnBgMore">取消</button>
           <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
         </div>
       </div>
diff --git a/src/views/research/components/ResearchAddAsk.vue b/src/views/research/components/ResearchAddAsk.vue
index 11ea58c6..b8aaeb1b 100644
--- a/src/views/research/components/ResearchAddAsk.vue
+++ b/src/views/research/components/ResearchAddAsk.vue
@@ -5,7 +5,7 @@
     <div class="tagbox">
       <div class="tagname">问答题</div>
       <div class="deleteop" @click="handleTypesDel(3)">
-        <div><img src="../../../assets/images/projectadd/delete.png" /></div>
+        <div><img src="../../../assets/images/projectadd/delete1.png" /></div>
         <div class="del_text">删除题目</div>
       </div>
     </div>
diff --git a/src/views/research/components/ResearchAddMulti.vue b/src/views/research/components/ResearchAddMulti.vue
index 14afd2e7..f69d79da 100644
--- a/src/views/research/components/ResearchAddMulti.vue
+++ b/src/views/research/components/ResearchAddMulti.vue
@@ -5,7 +5,7 @@
     <div class="tagbox">
       <div class="tagname">多选题</div>
       <div class="deleteop" @click="handleTypesDel(2)">
-        <div><img src="../../../assets/images/projectadd/delete.png" /></div>
+        <div><img src="../../../assets/images/projectadd/delete1.png" /></div>
         <div class="del_text">删除题目</div>
       </div>
     </div>
@@ -244,11 +244,11 @@ export default {
         height: 40px;
         margin-top: 20px;
         margin-right: 30px;
-        border: 1px solid #4ea6ff;
+        background: #4ea6ff;
         border-radius: 8px;
         cursor: pointer;
         .del_text {
-          color: #4ea6ff;
+          color: #fff !important;
           font-size: 14px;
           margin-left: 5px;
         }
diff --git a/src/views/research/components/ResearchAddPin.vue b/src/views/research/components/ResearchAddPin.vue
index 8912e533..fbe879b9 100644
--- a/src/views/research/components/ResearchAddPin.vue
+++ b/src/views/research/components/ResearchAddPin.vue
@@ -5,7 +5,7 @@
     <div class="tagbox">
       <div class="tagname">评分题</div>
       <div class="deleteop" @click="handleTypesDel(4)">
-        <div><img src="../../../assets/images/projectadd/delete.png" /></div>
+        <div><img src="../../../assets/images/projectadd/delete1.png" /></div>
         <div class="del_text">删除题目</div>
       </div>
     </div>
diff --git a/src/views/research/components/ResearchAddSingle.vue b/src/views/research/components/ResearchAddSingle.vue
index 3275828e..ad1f27a0 100644
--- a/src/views/research/components/ResearchAddSingle.vue
+++ b/src/views/research/components/ResearchAddSingle.vue
@@ -5,7 +5,7 @@
     <div class="tagbox">
       <div class="tagname">单选题</div>
       <div class="deleteop" @click="handleTypesDel(1)">
-        <div><img src="../../../assets/images/projectadd/delete.png" /></div>
+        <div><img src="../../../assets/images/projectadd/delete1.png" /></div>
         <div class="del_text">删除题目</div>
       </div>
     </div>

From 6390eb6e9f3c48be5d2aa36af719b80bbcb0bc03 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 20:46:15 +0800
Subject: [PATCH 16/28] =?UTF-8?q?feat:=E9=A1=B9=E7=9B=AE-=E5=AD=A6?=
 =?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86-=E5=AD=A6=E5=91=98=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B-=E8=AF=81=E4=B9=A6=E6=95=B0=E9=87=8F=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/SeeStu.vue    | 6 +++++-
 src/views/projectcenter/TaskPage.vue | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index 4dcc8621..00186c7a 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -44,7 +44,7 @@
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">已修证书</div>
             <div class="sortnub">
-              <span class="nub1">{{ rank.certNum || 0 }}</span>
+              <span class="nub1">{{ certificateNum || 0 }}</span>
             </div>
           </div>
 
@@ -168,6 +168,10 @@ export default {
       type: Number,
       default: null,
     },
+    certificateNum: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index a4a39a6d..f8a1ca14 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1595,6 +1595,7 @@
       v-model:Seevisible="Seevisible"
       v-model:checkStuId="checkStuId"
       v-model:projectId="projectId"
+      v-model:certificateNum="certificateNum"
     />
     <!-- 学员换组 -->
     <change-group
@@ -2466,6 +2467,7 @@ export default {
       Stuvisible: false, //添加学员
       Importvisible: false, //导入学员
       Seevisible: false, //查看学员
+      certificateNum: 0,
       Changevisible: false, //学员换组
       editHs: false, //编辑弹窗
       delete_hs: false, //删除弹窗
@@ -4716,6 +4718,7 @@ export default {
       state.editRecord = record;
     }
     function showStudent(record) {
+      state.certificateNum = record.certCount;
       state.Seevisible = true;
       state.checkStuId = record.studentId;
     }

From 4ccaf34d49e1fbf49953ca1c20b109b0fa39609a Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 21:59:42 +0800
Subject: [PATCH 17/28] =?UTF-8?q?fix:=E8=AF=84=E4=BC=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/ResearchAdd.vue | 77 +++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 2 deletions(-)

diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index 40f92151..f31cd393 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -170,6 +170,7 @@ export default {
         let obj = {};
         if (key === 1) {
           let restList = traverseArr(item.assessmentSingleChoiceVoList, {
+            ids:"id",
             inputVal: "singleOptionName",
             imgVal: "singleOptionPictureAddress",
             optionId: "singleOptionId",
@@ -188,6 +189,7 @@ export default {
         }
         if (key === 2) {
           let restList = traverseArr(item.multipleChoiceVoList, {
+            ids:"id",
             inputVal: "multipleOptionName",
             imgVal: "multipleOptionPictureAddress",
             optionId: "multipleOptionId",
@@ -206,6 +208,7 @@ export default {
         }
         if (key === 3) {
           obj = {
+            ids: item.id,
             type: key,
             valueAsk: item.assessmentQaTitle,
             valueAskDesc: item.assessmentQaDescribe,
@@ -215,6 +218,7 @@ export default {
         }
         if (key === 4) {
           obj = {
+            ids: item.id,
             type: key,
             valuePin: item.assessmentScTitle,
             minScore: item.assessmentMinScore,
@@ -229,6 +233,7 @@ export default {
         itm.id = idx + 1;
         return itm;
       });
+      console.log(resultArr)
       return resultArr;
     };
     // 转换成后端格式
@@ -238,6 +243,7 @@ export default {
         let obj = {};
         if (item[typeKey] === 1) {
           let restList = traverseArr(item.singleList, {
+            id:"ids",
             singleOptionName: "inputVal",
             singleOptionPictureAddress: "imgVal",
             singleOptionId: "optionId",
@@ -261,6 +267,7 @@ export default {
         }
         if (item[typeKey] === 2) {
           let restList = traverseArr(item.mutilList, {
+            id:"ids",
             multipleOptionName: "inputVal",
             multipleOptionPictureAddress: "imgVal",
             multipleOptionId: "optionId",
@@ -284,6 +291,7 @@ export default {
         }
         if (item[typeKey] === 3) {
           obj = {
+            id:item.ids,
             questionType: item[typeKey],
             assessmentQaTitle: item.valueAsk,
             assessmentQaDescribe: item.valueAskDesc,
@@ -293,6 +301,7 @@ export default {
         }
         if (item[typeKey] === 4) {
           obj = {
+            id:item.ids,
             questionType: item[typeKey],
             assessmentScTitle: item.valuePin,
             assessmentMinScore: item.minScore,
@@ -312,6 +321,7 @@ export default {
     // 解散传值
     const parseItem = (arr) => {
       const filterComObj = filterCommon(arr, "questionType");
+      console.log(filterComObj)
       let resultObj = {};
       for (let key in filterComObj) {
         if (key === "1") {
@@ -478,9 +488,71 @@ export default {
       });
     };
 
+    // 处理id为空的字段
+    const formatID = (data) => {
+      let obj = {}
+      for(let i in data){
+        if(i=="assessmentSingleChoiceDtoList"){
+          let arr1 = []
+          for(let k=0;k<data[i].length;k++){
+            if(data[i][k].id!==undefined){
+              arr1.push(data[i][k])
+            }else{
+              let obj1 = {...data[i][k]}
+              delete obj1.id
+              arr1.push(obj1)
+            }
+          }
+          obj.assessmentSingleChoiceDtoList = arr1;
+        }
+        if(i=="assessmentMultipleChoiceDtoList"){
+          let arr1 = []
+          for(let k=0;k<data[i].length;k++){
+            if(data[i][k].id!==undefined){
+              arr1.push(data[i][k])
+            }else{
+              let obj1 = {...data[i][k]}
+              delete obj1.id
+              arr1.push(obj1)
+            }
+          }
+          obj.assessmentMultipleChoiceDtoList = arr1;
+        }
+        if(i=="assessmentEssayQuestionDtoList"){
+          let arr1 = []
+          for(let k=0;k<data[i].length;k++){
+            if(data[i][k].id!==undefined){
+              arr1.push(data[i][k])
+            }else{
+              let obj1 = {...data[i][k]}
+              delete obj1.id
+              arr1.push(obj1)
+            }
+          }
+          obj.assessmentEssayQuestionDtoList = arr1;
+        }
+        if(i=="assessmentScoringQuestionDtoList"){
+          let arr1 = []
+          for(let k=0;k<data[i].length;k++){
+            if(data[i][k].id!==undefined){
+              arr1.push(data[i][k])
+            }else{
+              let obj1 = {...data[i][k]}
+              delete obj1.id
+              arr1.push(obj1)
+            }
+          }
+          obj.assessmentScoringQuestionDtoList = arr1;
+        }
+      }
+      console.log(obj)
+      return obj
+    }
     const handleSave = () => {
       let resultPost = {};
-      let filterData = parseItem(restData(state.allFormsData, "type"));
+      let filterData = formatID(parseItem(restData(state.allFormsData, "type")));
+      // 处理id为undefined得字段
+      console.log('mmmmmmmmm------->',filterData)
       // 校验
       if (!checkVal(filterData)) {
         return false;
@@ -489,7 +561,7 @@ export default {
 
       if (state.assessmentId) {
         resultPost = {
-          assessmentId: state.assessmentId,
+          id: state.assessmentId,
           assessmentName: state.assessmentName,
           assessmentMark: state.valueMore,
           ...filterData,
@@ -498,6 +570,7 @@ export default {
           "assessmentMaxScore",
           "assessmentMinScore",
         ]);
+
         editResearchMessage(resultPost).then((res) => {
           state.loading = false;
           if (res.data.code === 200) {

From 06875c82fb03d2935b01d0284ec3395988fcdacf Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Wed, 8 Mar 2023 22:18:18 +0800
Subject: [PATCH 18/28] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84debugger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index d4c861a0..d8fdd324 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -14,7 +14,7 @@
         <div style="display: flex; overflow-x: auto; overflow-y: auto">
           <div class="tabs" style="min-width: 800px">
             <a-tabs v-model:activeKey="activeKey">
-              <a-tab-pane v-if="isGroup" :key="4" tab="项目内学员1">
+              <a-tab-pane v-if="isGroup" :key="4" tab="项目内学员">
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div>
                     <a-form-item label="姓名：">

From 003c3b0e00616366159a0d3ea72f876411c68fd8 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 8 Mar 2023 23:25:01 +0800
Subject: [PATCH 19/28] =?UTF-8?q?fix:=E8=AF=84=E4=BC=B0=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98-=E5=A4=9A=E9=80=89=E9=A2=98-?=
 =?UTF-8?q?=E9=97=AE=E7=AD=94=E9=A2=98-=E8=AF=84=E5=88=86=E6=8F=90?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=A0=E9=99=A4=E9=80=89=E9=A1=B9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E4=BF=AE=E6=94=B9bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/ResearchAdd.vue            | 133 +++++++++++-------
 .../research/components/ResearchAddItem.vue   |   2 +-
 .../research/components/ResearchAddMulti.vue  |  38 +++--
 .../research/components/ResearchAddSingle.vue |  42 ++++--
 4 files changed, 138 insertions(+), 77 deletions(-)

diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index f31cd393..fa0efaaf 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -22,25 +22,25 @@
       :key="index + new Date().getTime()"
     >
       <ResearchAddSingle
-        v-if="item.type === 1"
+        v-if="item.type === 1 && item.deleted!==true"
         :item="item"
         :assessmentId="assessmentId"
         @del="handleDel"
       />
       <ResearchAddMulti
-        v-if="item.type === 2"
+        v-if="item.type === 2 && item.deleted!==true"
         :item="item"
         :assessmentId="assessmentId"
         @del="handleDel"
       />
       <ResearchAddAsk
-        v-if="item.type === 3"
+        v-if="item.type === 3 && item.deleted!==true"
         :item="item"
         :assessmentId="assessmentId"
         @del="handleDel"
       />
       <ResearchAddPin
-        v-if="item.type === 4"
+        v-if="item.type === 4 && item.deleted!==true"
         :item="item"
         :assessmentId="assessmentId"
         @del="handleDel"
@@ -109,8 +109,8 @@ import {
   queryResearchDetailById,
   editResearchMessage,
   createResearch,
-  deleteChoiceQuestion,
-  deleteQuestionScAndQa,
+  // deleteChoiceQuestion,
+  // deleteQuestionScAndQa,
 } from "@/api/indexResearch";
 import {useRoute, useRouter} from "vue-router";
 import {message} from "ant-design-vue";
@@ -157,6 +157,7 @@ export default {
           ...res.scoringQuestionVoList,
         ];
         sortBy(renderArr, "orderNumber"); //序号
+        console.log(renderArr)
         state.allFormsData = parseData(renderArr, "questionType"); //类型
       }
     };
@@ -171,6 +172,7 @@ export default {
         if (key === 1) {
           let restList = traverseArr(item.assessmentSingleChoiceVoList, {
             ids:"id",
+            deleted:"deleted",
             inputVal: "singleOptionName",
             imgVal: "singleOptionPictureAddress",
             optionId: "singleOptionId",
@@ -190,6 +192,7 @@ export default {
         if (key === 2) {
           let restList = traverseArr(item.multipleChoiceVoList, {
             ids:"id",
+            deleted:"deleted",
             inputVal: "multipleOptionName",
             imgVal: "multipleOptionPictureAddress",
             optionId: "multipleOptionId",
@@ -209,6 +212,7 @@ export default {
         if (key === 3) {
           obj = {
             ids: item.id,
+            deleted:item.deleted,
             type: key,
             valueAsk: item.assessmentQaTitle,
             valueAskDesc: item.assessmentQaDescribe,
@@ -219,6 +223,7 @@ export default {
         if (key === 4) {
           obj = {
             ids: item.id,
+            deleted:item.deleted,
             type: key,
             valuePin: item.assessmentScTitle,
             minScore: item.assessmentMinScore,
@@ -244,6 +249,7 @@ export default {
         if (item[typeKey] === 1) {
           let restList = traverseArr(item.singleList, {
             id:"ids",
+            deleted:"deleted",
             singleOptionName: "inputVal",
             singleOptionPictureAddress: "imgVal",
             singleOptionId: "optionId",
@@ -268,6 +274,7 @@ export default {
         if (item[typeKey] === 2) {
           let restList = traverseArr(item.mutilList, {
             id:"ids",
+            deleted:"deleted",
             multipleOptionName: "inputVal",
             multipleOptionPictureAddress: "imgVal",
             multipleOptionId: "optionId",
@@ -292,6 +299,7 @@ export default {
         if (item[typeKey] === 3) {
           obj = {
             id:item.ids,
+            deleted:item.deleted,
             questionType: item[typeKey],
             assessmentQaTitle: item.valueAsk,
             assessmentQaDescribe: item.valueAskDesc,
@@ -302,6 +310,7 @@ export default {
         if (item[typeKey] === 4) {
           obj = {
             id:item.ids,
+            deleted:item.deleted,
             questionType: item[typeKey],
             assessmentScTitle: item.valuePin,
             assessmentMinScore: item.minScore,
@@ -425,67 +434,90 @@ export default {
     };
 
     const handleDel = ({ id, type, curItem }) => {
+      
       // 接口删除
+      // if (state.assessmentId && (curItem.orderNumber || curItem.optionId)) {
+      //   if (type === 1) {
+      //     deleteChoiceQuestion({
+      //       assessmentId: state.assessmentId,
+      //       questionType: "1",
+      //       orderNumber: curItem.orderNumber,
+      //     }).then((res) => {
+      //       if (res.data.code === 200) {
+      //         virtualDel(id);
+      //       }
+      //     });
+      //   }
+      //   if (type === 2) {
+      //     deleteChoiceQuestion({
+      //       assessmentId: state.assessmentId,
+      //       questionType: "2",
+      //       orderNumber: curItem.orderNumber,
+      //     }).then((res) => {
+      //       if (res.data.code === 200) {
+      //         virtualDel(id);
+      //       }
+      //     });
+      //   }
+      //   if (type === 3) {
+      //     deleteQuestionScAndQa({
+      //       assessmentId: state.assessmentId,
+      //       questionType: "3",
+      //       optionId: curItem.optionId,
+      //     }).then((res) => {
+      //       if (res.data.code === 200) {
+      //         virtualDel(id);
+      //       }
+      //     });
+      //   }
+      //   if (type === 4) {
+      //     deleteQuestionScAndQa({
+      //       assessmentId: state.assessmentId,
+      //       questionType: "4",
+      //       optionId: curItem.optionId,
+      //     }).then((res) => {
+      //       if (res.data.code === 200) {
+      //         virtualDel(id);
+      //       }
+      //     });
+      //   }
+      // } else {
+      //   virtualDel(id);
+      // }
       if (state.assessmentId && (curItem.orderNumber || curItem.optionId)) {
         if (type === 1) {
-          deleteChoiceQuestion({
-            assessmentId: state.assessmentId,
-            questionType: "1",
-            orderNumber: curItem.orderNumber,
-          }).then((res) => {
-            if (res.data.code === 200) {
-              virtualDel(id);
-            }
-          });
+          virtualDel(id);
         }
         if (type === 2) {
-          deleteChoiceQuestion({
-            assessmentId: state.assessmentId,
-            questionType: "2",
-            orderNumber: curItem.orderNumber,
-          }).then((res) => {
-            if (res.data.code === 200) {
-              virtualDel(id);
-            }
-          });
+          virtualDel(id);
         }
         if (type === 3) {
-          deleteQuestionScAndQa({
-            assessmentId: state.assessmentId,
-            questionType: "3",
-            optionId: curItem.optionId,
-          }).then((res) => {
-            if (res.data.code === 200) {
-              virtualDel(id);
-            }
-          });
+          virtualDel(id);
         }
         if (type === 4) {
-          deleteQuestionScAndQa({
-            assessmentId: state.assessmentId,
-            questionType: "4",
-            optionId: curItem.optionId,
-          }).then((res) => {
-            if (res.data.code === 200) {
-              virtualDel(id);
-            }
-          });
+          virtualDel(id);
         }
       } else {
         virtualDel(id);
       }
     };
     const virtualDel = (id) => {
+      // 前端删除
+      // state.allFormsData.forEach((item, index) => {
+      //   if (item.id === id) {
+      //     state.allFormsData.splice(index, 1);
+      //   }
+      // });
+      // state.allFormsData.map((item, index) => {
+      //   item.id = index + 1;
+      //   return item;
+      // });
       // 前端删除
       state.allFormsData.forEach((item, index) => {
         if (item.id === id) {
-          state.allFormsData.splice(index, 1);
+          state.allFormsData[index].deleted = true;
         }
       });
-      state.allFormsData.map((item, index) => {
-        item.id = index + 1;
-        return item;
-      });
     };
 
     // 处理id为空的字段
@@ -500,6 +532,7 @@ export default {
             }else{
               let obj1 = {...data[i][k]}
               delete obj1.id
+              delete obj1.deleted
               arr1.push(obj1)
             }
           }
@@ -513,6 +546,7 @@ export default {
             }else{
               let obj1 = {...data[i][k]}
               delete obj1.id
+              delete obj1.deleted
               arr1.push(obj1)
             }
           }
@@ -526,6 +560,7 @@ export default {
             }else{
               let obj1 = {...data[i][k]}
               delete obj1.id
+              delete obj1.deleted
               arr1.push(obj1)
             }
           }
@@ -539,6 +574,7 @@ export default {
             }else{
               let obj1 = {...data[i][k]}
               delete obj1.id
+              delete obj1.deleted
               arr1.push(obj1)
             }
           }
@@ -649,6 +685,9 @@ export default {
         }
         console.log("CountNum");
         console.log(CountNum);
+        if(CountNum>100){
+          CountNum = 100;
+        }
         if (CountNum !== 100) {
           message.error("当前权重设置是百分制 请重新配置");
           return false;
diff --git a/src/views/research/components/ResearchAddItem.vue b/src/views/research/components/ResearchAddItem.vue
index e685ab4c..6e7adbec 100644
--- a/src/views/research/components/ResearchAddItem.vue
+++ b/src/views/research/components/ResearchAddItem.vue
@@ -1,6 +1,6 @@
 <!-- 评估管理-创建评估页面 -->
 <template>
-  <div class="itemRow">
+  <div class="itemRow" v-if="!item.deleted">
     <div class="options">
       <div class="name">
         <div class="namebox">
diff --git a/src/views/research/components/ResearchAddMulti.vue b/src/views/research/components/ResearchAddMulti.vue
index f69d79da..70c2bfbe 100644
--- a/src/views/research/components/ResearchAddMulti.vue
+++ b/src/views/research/components/ResearchAddMulti.vue
@@ -56,7 +56,7 @@
 <script>
 import { ref } from "vue";
 import ResearchAddItem from "./ResearchAddItem.vue";
-import { deleteChoiceQuestion } from "@/api/indexResearch";
+// import { deleteChoiceQuestion } from "@/api/indexResearch";
 
 export default {
   name: "ResearchAddMulti",
@@ -110,30 +110,40 @@ export default {
     };
     const delMutil = ({ id, optionId }) => {
       // 接口删除
+      // if (assessmentId.value && optionId) {
+      //   deleteChoiceQuestion({
+      //     assessmentId: assessmentId.value,
+      //     questionType: "2",
+      //     optionId,
+      //   }).then((res) => {
+      //     if (res.data.code === 200) {
+      //       virtualDel(id);
+      //     }
+      //   });
+      // } else {
+      //   virtualDel(id);
+      // }
       if (assessmentId.value && optionId) {
-        deleteChoiceQuestion({
-          assessmentId: assessmentId.value,
-          questionType: "2",
-          optionId,
-        }).then((res) => {
-          if (res.data.code === 200) {
-            virtualDel(id);
-          }
-        });
+        virtualDel(id);
       } else {
         virtualDel(id);
       }
     };
     const virtualDel = (id) => {
       // 前端删除
+      // curItem.value.mutilList.forEach((item, index) => {
+      //   if (item.id === id) {
+      //     curItem.value.mutilList.splice(index, 1);
+      //   }
+      // });
+      // curItem.value.mutilList.map((item, index) => {
+      //   item.id = index + 1;
+      // });
       curItem.value.mutilList.forEach((item, index) => {
         if (item.id === id) {
-          curItem.value.mutilList.splice(index, 1);
+          curItem.value.mutilList[index].deleted = true;
         }
       });
-      curItem.value.mutilList.map((item, index) => {
-        item.id = index + 1;
-      });
     };
 
     return {
diff --git a/src/views/research/components/ResearchAddSingle.vue b/src/views/research/components/ResearchAddSingle.vue
index ad1f27a0..ed39e78b 100644
--- a/src/views/research/components/ResearchAddSingle.vue
+++ b/src/views/research/components/ResearchAddSingle.vue
@@ -56,7 +56,7 @@
 <script>
 import { ref } from "vue";
 import ResearchAddItem from "./ResearchAddItem.vue";
-import { deleteChoiceQuestion } from "@/api/indexResearch";
+// import { deleteChoiceQuestion } from "@/api/indexResearch";
 
 export default {
   name: "ResearchAddSingle",
@@ -104,32 +104,44 @@ export default {
         }
       });
     };
-    const del = ({ id, optionId }) => {
+    const del = ({ id, optionId}) => {
       // 接口删除
+      // if (assessmentId.value && optionId) {
+      //   deleteChoiceQuestion({
+      //     assessmentId: assessmentId.value,
+      //     questionType: "1",
+      //     optionId,
+      //   }).then((res) => {
+      //     if (res.data.code === 200) {
+      //       virtualDel(id);
+      //     }
+      //   });
+      // } else {
+      //   virtualDel(id);
+      // }
       if (assessmentId.value && optionId) {
-        deleteChoiceQuestion({
-          assessmentId: assessmentId.value,
-          questionType: "1",
-          optionId,
-        }).then((res) => {
-          if (res.data.code === 200) {
-            virtualDel(id);
-          }
-        });
+        virtualDel(id);
       } else {
         virtualDel(id);
       }
     };
     const virtualDel = (id) => {
+      // 前端删除
+      // curItem.value.singleList.forEach((item, index) => {
+      //   if (item.id === id) {
+      //     curItem.value.singleList.splice(index, 1);
+      //   }
+      // });
+      // curItem.value.singleList.map((item, index) => {
+      //   item.id = index + 1;
+      // });
+
       // 前端删除
       curItem.value.singleList.forEach((item, index) => {
         if (item.id === id) {
-          curItem.value.singleList.splice(index, 1);
+          curItem.value.singleList[index].deleted = true;
         }
       });
-      curItem.value.singleList.map((item, index) => {
-        item.id = index + 1;
-      });
     };
 
     return {

From 093d8f0de4847916df48a47383b811708973f91c Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 8 Mar 2023 23:27:45 +0800
Subject: [PATCH 20/28] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/ResearchManage.vue | 184 ++++++++++++++++++++------
 1 file changed, 140 insertions(+), 44 deletions(-)

diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 28b4eb0c..4bd0b84a 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -65,29 +65,68 @@
         :pagination="false"
       >
         <template #operation="{ record }">
-          <a-space style="padding-right:10px">
-            <a-button v-if="record.releaseStatus === '1' && checkPer(record.permissions)"
-                      @click=" handleOper(record,'push')" type="link">发布
+          <a-space style="padding-right: 10px">
+            <a-button
+              v-if="
+                record.releaseStatus === '1' && checkPer(record.permissions)
+              "
+              @click="handleOper(record, 'push')"
+              type="link"
+              >发布
             </a-button>
-            <a-button v-if="record.releaseStatus === '1' && checkPer(record.permissions)"
-                      @click=" editOper(record)" type="link">编辑
+            <a-button
+              v-if="
+                record.releaseStatus === '1' && checkPer(record.permissions)
+              "
+              @click="editOper(record)"
+              type="link"
+              >编辑
             </a-button>
-            <a-button v-if="record.releaseStatus === '1' && checkPer(record.permissions)"
-                      @click=" handleEditPage(record.id)" type="link">基础信息
+            <a-button
+              v-if="
+                record.releaseStatus === '1' && checkPer(record.permissions)
+              "
+              @click="handleEditPage(record.id)"
+              type="link"
+              >基础信息
             </a-button>
-            <a-button v-if="record.releaseStatus === '2' && checkPer(record.permissions)"
-                      @click=" toManage(record.id, record)" type="link">管理
+            <a-button
+              v-if="
+                record.releaseStatus === '2' && checkPer(record.permissions)
+              "
+              @click="toManage(record.id, record)"
+              type="link"
+              >管理
             </a-button>
-            <a-button v-if="checkPer(record.permissions)" @click=" handleOper(record,'copy')" type="link">复制
+            <a-button
+              v-if="checkPer(record.permissions)"
+              @click="handleOper(record, 'copy')"
+              type="link"
+              >复制
             </a-button>
-            <a-button v-if="record.releaseStatus === '2' && checkPer(record.permissions)"
-                      @click="() =>  handleOper(record,'withdraw')" type="link">撤回
+            <a-button
+              v-if="
+                record.releaseStatus === '2' && checkPer(record.permissions)
+              "
+              @click="() => handleOper(record, 'withdraw')"
+              type="link"
+              >撤回
             </a-button>
-            <a-button v-if="record.releaseStatus === '2' && checkPer(record.permissions)"
-                      @click=" handleOper(record,'end')" type="link">结束
+            <a-button
+              v-if="
+                record.releaseStatus === '2' && checkPer(record.permissions)
+              "
+              @click="handleOper(record, 'end')"
+              type="link"
+              >结束
             </a-button>
-            <a-button v-if="record.releaseStatus !== '2' && checkPer(record.permissions)"
-                      @click=" handleOper(record,'del')" type="link">删除
+            <a-button
+              v-if="
+                record.releaseStatus !== '2' && checkPer(record.permissions)
+              "
+              @click="handleOper(record, 'del')"
+              type="link"
+              >删除
             </a-button>
           </a-space>
         </template>
@@ -115,7 +154,7 @@
     >
       <div class="out">
         <div class="top">
-          <img class="topimg" src="../../assets/images/courseManage/add1.png"/>
+          <img class="topimg" src="../../assets/images/courseManage/add1.png" />
           <div class="topc">{{ !formData.id ? "创建" : "编辑" }}评估</div>
           <div
             style="margin-left: 500px; cursor: pointer"
@@ -145,25 +184,33 @@
           </div>
           <div class="btn">
             <button class="samtn btn2" @click="handleCancel">取消</button>
-            <a-button class="samtn btn2" @click="handleNext" :loading="formData.validated===1">
+            <a-button
+              class="samtn btn2"
+              @click="handleNext"
+              :loading="formData.validated === 1"
+            >
               {{ !formData.id ? "下一步" : "确定" }}
             </a-button>
           </div>
         </div>
       </div>
-    </a-modal
-    >
+    </a-modal>
   </div>
 </template>
 <script setup>
-import {ref,onMounted} from "vue";
-import {createResearch, deleteResearch, editAssessmentName, editReleaseStatus,} from "@/api/indexResearch";
-import {checkPer} from "@/utils/utils";
-import {Form, message} from "ant-design-vue";
+import { ref, onMounted } from "vue";
+import {
+  createResearch,
+  deleteResearch,
+  editAssessmentName,
+  editReleaseStatus,
+} from "@/api/indexResearch";
+import { checkPer } from "@/utils/utils";
+import { Form, message } from "ant-design-vue";
 import NameInput from "@/components/project/NameInput";
-import {useRowsPage} from "@/api/request";
-import {ASSESSMENT_PAGE} from "@/api/apis";
-import {useRouter} from "vue-router";
+import { useRowsPage } from "@/api/request";
+import { ASSESSMENT_PAGE } from "@/api/apis";
+import { useRouter } from "vue-router";
 import dialog from "@/utils/dialog";
 
 const router = useRouter();
@@ -279,7 +326,7 @@ onMounted(() => {
   // 是否需要触发新建弹框
   let str = location.href;
   let isOpen = str.includes("openCreate=true");
-  if(isOpen){
+  if (isOpen) {
     newNext.value = true;
   }
 });
@@ -297,10 +344,16 @@ const rulesRef = ref({
 });
 
 const { resetFields } = Form.useForm(searchData, {});
-const { resetFields: resetFormFields, validate } = Form.useForm(formData, rulesRef);
+const { resetFields: resetFormFields, validate } = Form.useForm(
+  formData,
+  rulesRef
+);
 
-const { data, total, loading, fetch } = useRowsPage(ASSESSMENT_PAGE, searchData.value);
-const handle = record => ({
+const { data, total, loading, fetch } = useRowsPage(
+  ASSESSMENT_PAGE,
+  searchData.value
+);
+const handle = (record) => ({
   push: () => {
     message.info("发布成功！");
     record.releaseStatus = "2";
@@ -324,10 +377,44 @@ const handle = record => ({
   },
   copy: async () => {
     loading.value = true;
-    message.info("删除成功！");
-    await createResearch({ ...record, assessmentName: record.assessmentName + "(1)" });
+    message.info("复制成功！");
+
+    record.id = null;
+    if (record.essayQuestionVoList) {
+      record.essayQuestionVoList.forEach((item) => {
+        item.id = null;
+      });
+    }
+    if (record.multipleStemVoList) {
+      record.multipleStemVoList.forEach((item) => {
+        item.multipleChoiceVoList.forEach((a) => {
+          a.id = null;
+        });
+      });
+    }
+    if (record.scoringQuestionVoList) {
+      record.scoringQuestionVoList.forEach((item) => {
+        item.id = null;
+      });
+    }
+    if (record.singleStemVoList) {
+      record.singleStemVoList.forEach((item) => {
+        item.assessmentSingleChoiceVoList.forEach((a) => {
+          a.id = null;
+        });
+      });
+    }
+    console.log("record", record);
+    console.log("复制传参", {
+      ...record,
+      assessmentName: record.assessmentName + "(1)",
+    });
+    await createResearch({
+      ...record,
+      assessmentName: record.assessmentName + "(1)",
+    });
     fetch();
-  }
+  },
 });
 const handleMsg = {
   push: "您确定要发布此评估吗",
@@ -379,7 +466,10 @@ function handleEditPage(id) {
 }
 
 function toManage(id, record) {
-  router.push({ path: `/managepage/${id}`, query: { createName:record.createName, createTime:record.createTime } });
+  router.push({
+    path: `/managepage/${id}`,
+    query: { createName: record.createName, createTime: record.createTime },
+  });
 }
 
 const handleNext = async () => {
@@ -392,12 +482,18 @@ const handleNext = async () => {
     return;
   }
   if (!formData.value.id) {
-    router.push({ path: "/researchadd", query: { name: formData.value.assessmentName } });
+    router.push({
+      path: "/researchadd",
+      query: { name: formData.value.assessmentName },
+    });
   } else {
-    newNext.value = false
+    newNext.value = false;
     loading.value = true;
     message.info("编辑成功！");
-    await editAssessmentName({ assessmentId: formData.value.id, assessmentName: formData.value.assessmentName });
+    await editAssessmentName({
+      assessmentId: formData.value.id,
+      assessmentName: formData.value.assessmentName,
+    });
     fetch();
   }
 };
@@ -448,8 +544,8 @@ const handleNext = async () => {
     height: 68px;
 
     background: linear-gradient(
-        rgba(78, 166, 255, 0.2) 0%,
-        rgba(78, 166, 255, 0) 100%
+      rgba(78, 166, 255, 0.2) 0%,
+      rgba(78, 166, 255, 0) 100%
     );
     display: flex;
     align-items: center;
@@ -736,8 +832,8 @@ const handleNext = async () => {
     }
 
     .ant-table-tbody
-    > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-    > td {
+      > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+      > td {
       background: #f6f9fd;
     }
   }
@@ -805,8 +901,8 @@ const handleNext = async () => {
             width: calc(100%);
             height: 40px;
             background: linear-gradient(
-                rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
             );
           }
 

From 55e721f602a922378427ff1f33db3d69125a3f53 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Wed, 8 Mar 2023 23:59:42 +0800
Subject: [PATCH 21/28] =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index1.js                        |  3 ++-
 src/components/student/CommonStudent.vue | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/api/index1.js b/src/api/index1.js
index db43fa13..ae145812 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -141,6 +141,7 @@ export const addStudentCourse = (obj) => http.post("/admin/offcourse/addStudent"
 // 获取组织结构树
 export const orgtree = () => http.get("/org/tree");
 export const saveStu = obj => http.post("/admin/student/addStudent", obj);
+export const getAllStudentByProjectId = obj => http.get("/admin/student/getAllStudentByProjectId", { params: obj });
 export const moveStudent = obj => http.post("/admin/student/moveStudent", obj);
 export const getStuPage = obj => http.get("/admin/student/getStudent", { params: obj });
 export const delStudentList = obj => http.post("/admin/student/delStudent", obj);
@@ -176,7 +177,7 @@ export const exportHomeWork = (obj) => http.get('/admin/student/exportHomeWork',
 export const exportHomeWorkTemplate = (obj) => http.get('/admin/student/exportHomeWorkTemplate', { params: obj })
 //签到
 export const attendanceSign = (obj) => http.post('/stu/task/attendance/sign', obj)
-//请假 
+//请假
 export const attendanceLeave = (obj) => http.post('/stu/task/attendance/leave', obj)
 
 //批量标记完成
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index d8fdd324..b43d2f9c 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -304,6 +304,7 @@ import {
 } from "@/api/ThirdApi";
 import {
   saveStu,
+  getAllStudentByProjectId,
   //  addGroupMember,
   getStuPage,
 } from "@/api/index1";
@@ -366,6 +367,7 @@ console.log("props.activeKey1" + props.activeKey1);
 // 获取项目学员;
 const procurrentPage = ref(1);
 const projectList = ref([]);
+const allProjectStudent = ref([]);
 const proStudentName = ref("");
 const projectListTotal = ref(-1);
 const projectPageSize = ref(10);
@@ -384,6 +386,16 @@ const projectRowSelection = computed(() => ({
   onChange: onProjectSelectChange,
   preserveSelectedRowKeys: true,
 }));
+
+const  getAllStudent = () => {
+  let params = {
+    projectId:props.id
+  };
+  getAllStudentByProjectId(params).then(res => {
+    allProjectStudent.value = res.data.data;
+  })
+};
+getAllStudent();
 const getStu = () => {
   let obj = {
     studentName: proStudentName.value,
@@ -811,15 +823,16 @@ function handleStageOk() {
         }
       } else if (activeKey.value === 1) {
         selectMember = selectsData.value.studentList.length;
-
-
+        let arr = [...allProjectStudent.value].filter(x => [...selectsData.value.studentList].some(y => y.id === x.studentId));
+        if (arr.length > 0) {
+          message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");
+        }
       } else if (activeKey.value === 2) {
         selectMember = selectsData.value.groupList.length;
       } else if (activeKey.value === 3) {
         selectMember = selectsData.value.deptList.length;
       }
 
-
       if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) {
         return message.warning("添加小组学员超过最大值");
       }
@@ -839,7 +852,7 @@ function handleStageOk() {
     stageId: selectsData.value.stageId,
     groupIds: selectsData.value.groupList?.map((e) => e.id),
     studentList: selectsData.value.studentList.concat(
-      selectsData.value.projectMemberList
+            selectsData.value.projectMemberList
     ),
     groupName: props.groupName,
     groupId: props.groupId,

From 12b3cf33e959590e211c500aa85e181f497e9b30 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 9 Mar 2023 00:02:29 +0800
Subject: [PATCH 22/28] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/ResearchManage.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 4bd0b84a..6567eabc 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -378,7 +378,6 @@ const handle = (record) => ({
   copy: async () => {
     loading.value = true;
     message.info("复制成功！");
-
     record.id = null;
     if (record.essayQuestionVoList) {
       record.essayQuestionVoList.forEach((item) => {
@@ -409,8 +408,16 @@ const handle = (record) => ({
       ...record,
       assessmentName: record.assessmentName + "(1)",
     });
+    let newObj = {
+      assessmentEssayQuestionDtoList: record.essayQuestionVoList,
+      assessmentMultipleChoiceDtoList: record.multipleStemVoList,
+      assessmentScoringQuestionDtoList: record.scoringQuestionVoList,
+      assessmentSingleChoiceDtoList: record.singleStemVoList,
+      assessmentMark: record.assessmentMark,
+    };
+    console.log("newObj", newObj);
     await createResearch({
-      ...record,
+      ...newObj,
       assessmentName: record.assessmentName + "(1)",
     });
     fetch();

From 2151b091f990a137f1a9115e9322bf02adc52334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com>
Date: Thu, 9 Mar 2023 00:14:06 +0800
Subject: [PATCH 23/28] update

---
 src/views/projectcenter/TaskPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index f8a1ca14..b69f529c 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -410,7 +410,7 @@
               </div>
               <div class="proright">
                 <div class="pronub" style="margin-left: 142px">
-                  {{ stageOverviewList[choosedStageIndex]?.totalTaskCnt }}
+                  {{ stageOverviewList[choosedStageIndex]?.completeTaskCnt }}
                 </div>
                 <div class="proright1">
                   <span class="textpro">阶段任务总数</span>

From 909edbbbdde612538e6ca6c4e146dc93afcd29bf Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 9 Mar 2023 00:22:07 +0800
Subject: [PATCH 24/28] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/ResearchManage.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 6567eabc..e52e547c 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -379,15 +379,19 @@ const handle = (record) => ({
     loading.value = true;
     message.info("复制成功！");
     record.id = null;
+
     if (record.essayQuestionVoList) {
       record.essayQuestionVoList.forEach((item) => {
         item.id = null;
       });
     }
+    //多选题
+    let assessmentMultipleChoiceDtoList = [];
     if (record.multipleStemVoList) {
       record.multipleStemVoList.forEach((item) => {
         item.multipleChoiceVoList.forEach((a) => {
           a.id = null;
+          assessmentMultipleChoiceDtoList.push(a);
         });
       });
     }
@@ -396,10 +400,13 @@ const handle = (record) => ({
         item.id = null;
       });
     }
+    //单选题
+    let assessmentSingleChoiceDtoList = [];
     if (record.singleStemVoList) {
       record.singleStemVoList.forEach((item) => {
         item.assessmentSingleChoiceVoList.forEach((a) => {
           a.id = null;
+          assessmentSingleChoiceDtoList.push(a);
         });
       });
     }
@@ -410,9 +417,9 @@ const handle = (record) => ({
     });
     let newObj = {
       assessmentEssayQuestionDtoList: record.essayQuestionVoList,
-      assessmentMultipleChoiceDtoList: record.multipleStemVoList,
+      assessmentMultipleChoiceDtoList: assessmentMultipleChoiceDtoList,
       assessmentScoringQuestionDtoList: record.scoringQuestionVoList,
-      assessmentSingleChoiceDtoList: record.singleStemVoList,
+      assessmentSingleChoiceDtoList: assessmentSingleChoiceDtoList,
       assessmentMark: record.assessmentMark,
     };
     console.log("newObj", newObj);

From c8dbc48609cb550376d1812f766a646a5b2f252e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 9 Mar 2023 00:54:48 +0800
Subject: [PATCH 25/28] =?UTF-8?q?--=20fix=20=E5=9C=A8=E7=BA=BF=E8=AF=BE?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue      | 96 ++++++++++++-----------
 src/views/learningpath/LevelAddDetail.vue |  2 +-
 src/views/projectcenter/TaskAdd.vue       |  2 +-
 3 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 2fd642be..3ff692e8 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -3,11 +3,11 @@
     <slot></slot>
   </div>
   <a-drawer
-      :visible="visible"
-      class="drawerStyle addonlineDrawer"
-      width="800"
-      title="添加在线"
-      placement="right"
+    :visible="visible"
+    class="drawerStyle addonlineDrawer"
+    width="800"
+    title="添加在线"
+    placement="right"
   >
     <div class="drawerMain">
       <div class="header">
@@ -17,9 +17,9 @@
       </div>
       <div>
         <div class="contentMain" style="padding:20px">
-          <CreateOnline ref="onlineRef" :id="props.id" :type="props.infoType">
+          <CreateOnline ref="onlineRef" :id="props.courseSyncFlag?'':props.id" :type="props.courseSyncFlag?'':props.infoType">
             <a-button type="primary" style="border-radius: 4px">{{
-                taskIndex === -1 ? '选择/新建课程' : '重新选择'
+                taskIndex === -1 ? "选择/新建课程" : "重新选择"
               }}
             </a-button>
           </CreateOnline>
@@ -27,10 +27,10 @@
       </div>
       <div class="drawerMain">
         <a-table
-            :columns="columns"
-            :data-source="selectsData"
-            row-key="id"
-            :pagination="false"
+          :columns="columns"
+          :data-source="selectsData"
+          row-key="id"
+          :pagination="false"
         />
       </div>
       <div class="main_btns">
@@ -41,7 +41,7 @@
   </a-drawer>
 </template>
 <script setup>
-import {defineEmits, defineProps, ref, watch} from "vue";
+import {computed, defineEmits, defineProps, ref, watch} from "vue";
 import {message} from "ant-design-vue";
 import CreateOnline from "@/components/drawers/CreateOnline.vue";
 
@@ -50,15 +50,16 @@ const props = defineProps({
   infoType: Number,
   courseSyncFlag: Number,
   id: Number,
-  taskList: []
-})
-const visible = ref(false)
-const onlineRef = ref(false)
+  taskList: [],
+  chapterList: []
+});
+const visible = ref(false);
+const onlineRef = ref(false);
 const taskIndex = ref(-1);
 const rowSelectKeys = ref([]);
 const selectsData = ref([]);
 
-const emit = defineEmits({})
+const emit = defineEmits({});
 const columns = ref([
   {
     title: "课程名称",
@@ -73,7 +74,7 @@ const columns = ref([
     key: "type",
     width: "100px",
     align: "center",
-    customRender: ({record: {type}}) => ({10: '微课', 21: '直播', 20: '录播', 30: '面授', 90: '混合'}[type]),
+    customRender: ({ record: { type } }) => ({ 10: "微课", 21: "直播", 20: "录播", 30: "面授", 90: "混合" }[type]),
   },
   {
     title: "创建人",
@@ -96,64 +97,71 @@ const columns = ref([
     width: "100px",
     align: "center",
   },
-])
+]);
 watch(taskIndex, () => {
   if (taskIndex.value >= 0) {
-    rowSelectKeys.value = []
+    rowSelectKeys.value = [];
   }
-})
+});
 
+const selectIds = computed(()=>props.chapterList.flatMap(t=>props.infoType===1?t.taskDraftDtoList:t.draftTaskList)?.filter(s=>s?.type===props.type).map(t=>t.courseId).join(',') || '')
 
 const closeDrawer = () => {
-  visible.value = false
-  taskIndex.value = -1
-  selectsData.value = []
-  rowSelectKeys.value = []
+  visible.value = false;
+  taskIndex.value = -1;
+  selectsData.value = [];
+  rowSelectKeys.value = [];
 };
 
 function confirm() {
   if (!selectsData.value.length || !rowSelectKeys.value.length) {
     message.warning("请选择在线课！");
-    return
+    return;
   }
   if (taskIndex.value === -1) {
-    const list = props.taskList
+    const list = props.taskList;
     list.push({
       name: selectsData.value[0].name,
       type: props.type,
       courseId: selectsData.value[0].id,
-      info: {...selectsData.value[0]}
-    })
+      info: { ...selectsData.value[0] }
+    });
   } else {
-    const data = props.taskList[taskIndex.value]
-    data.name = selectsData.value[0].name
-    data.courseId = selectsData.value[0].id
-    data.info = selectsData.value[0]
+    const data = props.taskList[taskIndex.value];
+    data.name = selectsData.value[0].name;
+    data.courseId = selectsData.value[0].id;
+    data.info = selectsData.value[0];
   }
-  emit('update:taskList', [...props.taskList])
-  closeDrawer()
+  emit("update:taskList", [...props.taskList]);
+  closeDrawer();
 }
 
 function selectCourse(row) {
-  console.log(row)
-  if(!props.courseSyncFlag && !row.refId){
+  console.log(row);
+  if (!props.courseSyncFlag && !row.refId) {
     message.warning("请新建本项目在线课！");
-    return
+    return;
   }
-  rowSelectKeys.value = [row.id]
-  selectsData.value = [row]
-  onlineRef.value.closeModal()
+
+  if (selectIds.value.includes(row.id)) {
+    message.warning("本项目中已经包含此在线课！");
+    return;
+  }
+
+  rowSelectKeys.value = [row.id];
+  selectsData.value = [row];
+  onlineRef.value.closeModal();
 }
 
 function openDrawer(i, row) {
-  window.selectCourse = selectCourse
+  window.selectCourse = selectCourse;
   row && (rowSelectKeys.value = [row.courseId]);
   row && (selectsData.value = [row.info]);
   (i >= 0) && (taskIndex.value = i);
-  visible.value = true
+  visible.value = true;
 }
 
-defineExpose({openDrawer, selectCourse})
+defineExpose({ openDrawer, selectCourse });
 </script>
 <style lang="scss">
 
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index ec7aea99..ed2773b0 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -141,7 +141,7 @@
         <div class="mid">
           <div class="item" v-for="(value,key) in TASK_TYPE" :key="key">
             <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="2" :id="routerInfo.routerInfo?.id"  :courseSyncFlag="routerInfo.routerInfo?.courseSyncFlag"
-                       v-model:task-list="routerInfo.chapterList[activeIndex].draftTaskList">
+                       v-model:task-list="routerInfo.chapterList[activeIndex].draftTaskList" :chapter-list="routerInfo.chapterList">
               <div class="itcon">
                 <div class="img">
                   <img :src="value.img"/>
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 2c663af0..044ad9a1 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -101,7 +101,7 @@
           <div class="item" v-for="(value,key) in TASK_TYPE" :key="key">
             <div v-if="key!=13">
               <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="1" :id="projectInfo.projectInfo?.id" :courseSyncFlag="projectInfo.projectInfo?.courseSyncFlag"
-                         v-model:task-list="projectInfo.stageList[activeIndex].taskDraftDtoList">
+                         v-model:task-list="projectInfo.stageList[activeIndex].taskDraftDtoList" :chapter-list="projectInfo.stageList">
                 <div class="itcon">
                   <div class="img">
                     <img :src="value.img"/>

From 6df69fca47aa539877381f71e9903753b38c62c5 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 9 Mar 2023 11:00:33 +0800
Subject: [PATCH 26/28] =?UTF-8?q?fix:=E5=B7=B2=E5=8F=91=E5=B8=83=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=88=E8=AF=BE=E6=98=BE=E7=A4=BA=E5=BC=80=E8=AF=BE=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index e7b6a5b8..453420ff 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -347,7 +347,7 @@
             </a-button> -->
             <a-button
               v-if="
-                (record.auditStatus === 2 || record.auditStatus === 3)
+                (record.auditStatus === 3)
               "
               @click="() => handleStart(record, String(record.courseform))"
               type="link"

From 8f7a481895fcefa9e50d3ab4d2ed45dc9afe20a4 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 9 Mar 2023 11:23:46 +0800
Subject: [PATCH 27/28] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE=E7=BC=96=E8=BE=91-=E6=8F=90=E7=A4=BA=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 453420ff..f4498c10 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -925,6 +925,7 @@
                 v-model:validated="validated"
                 show-count
                 :id="offcoursePlanId"
+                :onceName="onceName"
                 :type="5"
                 style="width: 440px; height: 40px; border-radius: 8px"
                 placeholder="请输入开课名称"
@@ -2571,6 +2572,7 @@ export default defineComponent({
       xjkkradioV1: "",
       completeType: "",
       xjkkinputV1: "",
+      onceName: "",
       xjkkinputV2: "",
       xjkkinputV3: "",
       xjkkinputV4: null,
@@ -3619,6 +3621,7 @@ export default defineComponent({
       state.xjkkradioV1 = "";
       state.completeType = "";
       state.xjkkinputV1 = "";
+      state.onceName = "";
       state.xjkkinputV2 = "";
       state.xjkkinputV3 = "";
       state.xjkkinputV4 = null;
@@ -3760,6 +3763,7 @@ export default defineComponent({
       state.EditTestId = Number(item.testId);
       state.EditWorkId = String(item.homeWorkId);
       state.xjkkinputV1 = item.name;
+      state.onceName = item.name;
       state.beforeValue = item.beforeStart; //考勤 开始前
       state.afterStartValue = item.afterStart; //考勤 开始后
       if (item.signFlag === 1) {

From 2b013ed9e3cbb6278cc868ac310c0b4228476bd0 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 9 Mar 2023 11:54:16 +0800
Subject: [PATCH 28/28] style

---
 src/components/drawers/ViewAssess.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue
index 78d86bff..47eb991c 100644
--- a/src/components/drawers/ViewAssess.vue
+++ b/src/components/drawers/ViewAssess.vue
@@ -114,7 +114,7 @@
             </div>
           </div>
           <!-- 评分题 -->
-          <div v-if="values.questionType==4" class="assessbox" style="margin-top: 30px">
+          <div v-if="values.questionType==4" class="assessbox" style="margin-top: 30px;">
             <div class="box1">
               <div class="asstype">评估类型：</div>
               <div class="typename">评分题</div>
@@ -134,8 +134,8 @@
             </div>
           </div>
 
+          <div v-if="index==questionListArr.length-1" style="width:100%;height: 200px;"></div>
         </div>
-        <div style="margin-top: 30px;margin-bottom: 60px;"></div>
         
       </div>
       <div class="btnn">