From 2c5945bfc7fcb1ab999a94644b70e0d719ee64b4 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Thu, 23 Feb 2023 09:48:18 +0800
Subject: [PATCH 01/15] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=BD=AC=E5=8F=91?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 4e53e66d..fb1e86d9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,7 +6,7 @@
  * @FilePath: /fe-manage/vue.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-const {defineConfig} = require("@vue/cli-service");
+const { defineConfig } = require("@vue/cli-service");
 
 module.exports = defineConfig({
     publicPath: process.env.VUE_APP_BASE,
@@ -15,8 +15,7 @@ module.exports = defineConfig({
         port: 8070,
         proxy: {
             "/manageApi": {
-                // target: 'http:' + process.env.VUE_APP_PROXY_URL,
-                target: 'http://localhost:30001',
+                target: 'http:' + process.env.VUE_APP_PROXY_URL,
                 changeOrigin: true, //表示是否改变原域名
                 pathRewrite: {
                     "^/manageApi": "",

From 255400dce2c0bc704e8d4b8aa0a88ba5fb8f1c69 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Thu, 23 Feb 2023 09:55:01 +0800
Subject: [PATCH 02/15] =?UTF-8?q?fix:=E5=85=B3=E9=97=ADdebugger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ExportScore.vue        | 156 ++++++++---------
 .../router/RouterExaminationManage.vue        | 164 +++++++-----------
 .../drawers/router/RouterHomeworkManage.vue   | 142 +++++----------
 src/components/student/ChangeGroupModal.vue   |  64 +++----
 4 files changed, 207 insertions(+), 319 deletions(-)

diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
index 61b7d792..c555a587 100644
--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -1,20 +1,12 @@
 
 <template>
-  <a-drawer
-    :visible="eScorevisible"
-    class="drawerStyle ExportScore"
-    placement="right"
-    width="700px"
-    @after-visible-change="afterVisibleChange"
-  >
+  <a-drawer :visible="eScorevisible" class="drawerStyle ExportScore" placement="right" width="700px"
+    @after-visible-change="afterVisibleChange">
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">导入成绩</div>
-        <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer" />
       </div>
       <div class="main">
         <div class="minatitl">
@@ -28,20 +20,13 @@
           <div class="text">上传：</div>
           <div class="right">
             <div style="height: 176px; margin-bottom: 20px">
-              <a-upload-dragger
-                v-model:fileList="fileList"
-                :action="importHomeWork"
-                name="uploadFile"
-                :multiple="true"
-                @change="handleChange"
-                :showUploadList="false"
-                :data="{
+              <a-upload-dragger v-model:fileList="fileList" :action="importHomeWork" name="uploadFile" :multiple="true"
+                @change="handleChange" :showUploadList="false" :data="{
                   type: type,
                   taskId: Number(id),
                   workId: datesource.info.id,
                   targetId: Number(id),
-                }"
-              >
+                }">
                 <p class="ant-upload-drag-icon">
                   <inbox-outlined></inbox-outlined>
                 </p>
@@ -49,16 +34,13 @@
                 <p class="ant-upload-hint">支持扩展名：.xls/.xlsx</p>
               </a-upload-dragger>
             </div>
-            <!-- <div class="load">
+          <!-- <div class="load">
               <div class="cloud"></div>
               <div class="tip">点击或将文件拖拽到此处上传</div>
               <div class="tipz">支持扩展名：.xls/.xlsx</div>
-            </div> -->
+              </div> -->
             <div class="loadstate">
-              <div
-                class="loadborder"
-                v-if="uploadpercent < 100 && uploadpercent !== -1"
-              >
+              <div class="loadborder" v-if="uploadpercent < 100 && uploadpercent !== -1">
                 <div class="content">
                   <div class="img"></div>
                   <div class="timebox">
@@ -67,14 +49,14 @@
                       <div class="stateloading">正在上传</div>
                     </div>
                     <a-progress :percent="uploadpercent" />
-                    <!-- <div class="prog">
+                  <!-- <div class="prog">
                       <div class="inprogloading"></div>
-                    </div> -->
+                      </div> -->
                   </div>
                   <div class="curloading">
                     <!-- <div class="cur">55%</div> -->
-                    <!-- <div class="cancel" style="margin-left: 20px">暂停</div>
-                    <div class="cancel" style="margin-left: 15px">取消</div> -->
+                  <!-- <div class="cancel" style="margin-left: 20px">暂停</div>
+                      <div class="cancel" style="margin-left: 15px">取消</div> -->
                   </div>
                 </div>
               </div>
@@ -87,25 +69,20 @@
                       <div class="statedefeat">上传失败</div>
                     </div>
                     <a-progress :percent="uploadpercent" />
-                    <!-- <div class="prog">
+                  <!-- <div class="prog">
                       <div class="inprogdefeat"></div>
-                    </div> -->
+                      </div> -->
                   </div>
 
                   <div class="curloading">
                     <!-- <div class="cur">55%</div> -->
-                    <div
-                      style="color: #387df7; margin-left: 20px; cursor: pointer"
-                    >
+                    <div style="color: #387df7; margin-left: 20px; cursor: pointer">
                       下载失败数据
                     </div>
-                    <!-- <div class="cancel" style="margin-left: 20px">暂停</div>
-                    <div class="cancel" style="margin-left: 15px">取消</div> -->
+                  <!-- <div class="cancel" style="margin-left: 20px">暂停</div>
+                      <div class="cancel" style="margin-left: 15px">取消</div> -->
                   </div>
-                  <div
-                    class="defeat"
-                    style="display: flex; align-items: center"
-                  >
+                  <div class="defeat" style="display: flex; align-items: center">
                     <div style="color: #ff7474">
                       {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败
                     </div>
@@ -122,17 +99,13 @@
                       <div class="statesucce">上传成功</div>
                     </div>
                     <a-progress :percent="uploadpercent" />
-                    <!-- <div class="prog">
+                  <!-- <div class="prog">
                       <div class="inprogsucce"></div>
-                    </div> -->
+                      </div> -->
                   </div>
                   <div class="curloading">
                     <!-- <div class="cur">100%</div> -->
-                    <div
-                      class="cancel"
-                      style="margin-left: 20px; cursor: pointer"
-                      @click="removeUpload"
-                    >
+                    <div class="cancel" style="margin-left: 20px; cursor: pointer" @click="removeUpload">
                       删除
                     </div>
                   </div>
@@ -143,33 +116,22 @@
                   </div>
                 </div>
               </div>
-              <div
-                v-if="uploadpercent === 100"
-                class="defeat"
-                style="
-                  display: flex;
-                  align-items: center;
-                  width: 500px;
-                  height: 40px;"
-                :style="{
-                  background: errNum
-                    ? 'rgba(255, 116, 116, 0.1)'
-                    : 'rgba(53, 174, 105, 0.1)',
-                  border: errNum ? '1px solid #ff7474' : '1px solid #35AE69',
-                }"
-              >
-                <img
-                  style="width: 14px; height: 14px; margin-left: 16px"
-                  :src="
-                    errNum
-                      ? require('../../assets/images/err.png')
-                      : require('../../assets/images/success.png')
-                  "
-                />
-                <div
-                  style="margin-left: 8px"
-                  :style="{ color: errNum ? '#ff7474' : 'rgba(0,0,0,0.65)' }"
-                >
+              <div v-if="uploadpercent === 100" class="defeat" style="
+                    display: flex;
+                    align-items: center;
+                    width: 500px;
+                    height: 40px;" :style="{
+                      background: errNum
+                        ? 'rgba(255, 116, 116, 0.1)'
+                        : 'rgba(53, 174, 105, 0.1)',
+                      border: errNum ? '1px solid #ff7474' : '1px solid #35AE69',
+                    }">
+                <img style="width: 14px; height: 14px; margin-left: 16px" :src="
+                  errNum
+                    ? require('../../assets/images/err.png')
+                    : require('../../assets/images/success.png')
+                " />
+                <div style="margin-left: 8px" :style="{ color: errNum ? '#ff7474' : 'rgba(0,0,0,0.65)' }">
                   {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败
                 </div>
               </div>
@@ -189,7 +151,7 @@
   </a-drawer>
 </template>
 <script>
-import {reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/index1";
 import { BATCH_IMPORT_SCORE } from "@/api/config";
@@ -225,7 +187,7 @@ export default {
     },
   },
   setup(props, ctx) {
-    debugger
+    // debugger
     const state = reactive({
       fileType: ["xls", "xlsx"],
       importHomeWork:
@@ -295,7 +257,7 @@ export default {
                   console.log("props.getStudent", props.getStudent);
                   clearInterval(timer);
                 }
-              }else{
+              } else {
                 state.addLoading = false;
                 message.destroy();
                 message.error(`文件导入超时`);
@@ -398,6 +360,7 @@ export default {
     overflow-x: auto;
     display: flex;
     flex-direction: column;
+
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
@@ -407,6 +370,7 @@ export default {
       // background-color: red;
       margin-bottom: 20px;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -415,15 +379,19 @@ export default {
         // margin-left: 24px;
       }
     }
+
     .main {
       overflow-y: auto;
+
       .minatitl {
         display: flex;
+
         .up1 {
           font-size: 16px;
           font-weight: 400;
           color: #333333;
         }
+
         .up2 {
           font-size: 16px;
           font-weight: 400;
@@ -431,16 +399,20 @@ export default {
           margin-left: 4px;
         }
       }
+
       .upload {
         margin-top: 32px;
         display: flex;
+
         .text {
           font-size: 14px;
           font-weight: 400;
           color: #333333;
         }
+
         .right {
           margin-left: 6px;
+
           .load {
             width: 500px;
             height: 176px;
@@ -452,12 +424,14 @@ export default {
             flex-direction: column;
             align-items: center;
             margin-bottom: 20px;
+
             .cloud {
               margin-top: 52px;
               width: 28px;
               height: 28px;
               background-image: url(../../assets/images/basicinfo/cloud.png);
             }
+
             .tip {
               font-size: 14px;
               font-weight: 400;
@@ -465,6 +439,7 @@ export default {
               margin-top: 15px;
               cursor: pointer;
             }
+
             .tipz {
               font-size: 14px;
               font-weight: 400;
@@ -472,6 +447,7 @@ export default {
               margin-top: 10px;
             }
           }
+
           .loadstate {
             width: 500px;
             margin-bottom: 100px;
@@ -486,10 +462,12 @@ export default {
               flex-direction: column;
               justify-content: center;
               position: relative;
+
               .content {
                 display: flex;
                 margin-left: 20px;
                 position: relative;
+
                 .defeat {
                   width: 400px;
                   position: absolute;
@@ -499,45 +477,54 @@ export default {
                   font-weight: 500;
                   justify-content: space-between;
                 }
+
                 .img {
                   width: 30px;
                   height: 34px;
                   background-image: url(../../assets/images/basicinfo/exl.png);
                 }
+
                 .timebox {
                   margin-left: 15px;
                   margin-top: -5px;
+
                   .timetop {
                     display: flex;
                     width: 262px;
                     justify-content: space-between;
+
                     // margin-bottom: 8px;
                     .tit {
                       font-size: 14px;
                       font-weight: 400;
                       color: #333333;
                     }
+
                     .stateloading {
                       font-size: 14px;
                       font-weight: 400;
                       color: #4ea6ff;
                     }
+
                     .statedefeat {
                       font-size: 14px;
                       font-weight: 400;
                       color: #ff7474;
                     }
+
                     .statesucce {
                       font-size: 14px;
                       font-weight: 400;
                       color: #35ae69;
                     }
                   }
+
                   .prog {
                     width: 262px;
                     height: 5px;
                     background: #eaf1fe;
                     border-radius: 4px;
+
                     .inprogloading {
                       width: 55%;
                       height: 5px;
@@ -545,6 +532,7 @@ export default {
 
                       background: #4ea6ff;
                     }
+
                     //下载失败条
                     .inprogdefeat {
                       width: 55%;
@@ -553,6 +541,7 @@ export default {
 
                       background: #ff7474;
                     }
+
                     //下载成功条
                     .inprogsucce {
                       width: 100%;
@@ -563,15 +552,18 @@ export default {
                     }
                   }
                 }
+
                 .curloading {
                   margin-left: 15px;
                   margin-top: 15px;
                   display: flex;
+
                   .cur {
                     font-size: 14px;
                     font-weight: 400;
                     color: #333333;
                   }
+
                   .cancel {
                     font-size: 14px;
                     font-weight: 400;
@@ -579,6 +571,7 @@ export default {
                   }
                 }
               }
+
               .downloadErr {
                 width: 120px;
                 height: 32px;
@@ -602,6 +595,7 @@ export default {
         }
       }
     }
+
     .btnn {
       height: 72px;
       width: 100%;
@@ -613,6 +607,7 @@ export default {
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
       .btn1 {
         width: 100px;
         height: 40px;
@@ -622,6 +617,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index 80537f8b..b8792fc8 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -1,51 +1,28 @@
 <template>
-  <a-drawer
-    v-if="ExaminationModelVisible"
-    :visible="ExaminationModelVisible"
-    class="drawerStyle ProjectExamManage"
-    placement="right"
-    width="80%"
-    @after-visible-change="afterVisibleChange"
-  >
+  <a-drawer v-if="ExaminationModelVisible" :visible="ExaminationModelVisible" class="drawerStyle ProjectExamManage"
+    placement="right" width="80%" @after-visible-change="afterVisibleChange">
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">【考试】{{ title }}</div>
-        <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../../assets/images/basicinfo/close.png"
+          @click="closeDrawer" />
       </div>
       <div class="main">
-        <div class="endtime">起止时间：{{datasource.startTime}} ～ {{datasource.endTime}}</div>
+        <div class="endtime">起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }}</div>
         <div class="search">
           <div class="namecon" style="margin-right: 30px">
             <div class="name">姓名：</div>
-            <a-input
-              v-model:value="name"
-              style="width: 200px; height: 40px; border-radius: 8px"
-              placeholder="请输入姓名"
-            />
+            <a-input v-model:value="name" style="width: 200px; height: 40px; border-radius: 8px" placeholder="请输入姓名" />
           </div>
-          <div v-if="datasource.type !==5" class="namecon" style="margin-right: 50px">
+          <div v-if="datasource.type !== 5" class="namecon" style="margin-right: 50px">
             <div class="name">任务状态：</div>
             <div class="select">
-              <a-select
-                v-model:value="projectName"
-                style="width: 200px"
-                placeholder="请选择"
-                :options="projectNameList"
-                @change="selectProjectName"
-                allowClear
-              ></a-select>
+              <a-select v-model:value="projectName" style="width: 200px" placeholder="请选择" :options="projectNameList"
+                @change="selectProjectName" allowClear></a-select>
             </div>
           </div>
           <div class="btns">
-            <div
-              class="btn btn1"
-              style="margin-right: 20px"
-              @click="searchTableData"
-            >
+            <div class="btn btn1" style="margin-right: 20px" @click="searchTableData">
               <div class="img1"></div>
               <div class="wz">搜索</div>
             </div>
@@ -82,31 +59,17 @@
           </div>
         </div> -->
         <div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
-          <a-table
-            style="border: 1px solid #f2f6fe"
-            :columns="tablecolumns"
-            :data-source="tabledata"
-            :loading="loadingData"
-            :scroll="{ x: 900 }"
-            :pagination="false"
-          />
+          <a-table style="border: 1px solid #f2f6fe" :columns="tablecolumns" :data-source="tabledata"
+            :loading="loadingData" :scroll="{ x: 900 }" :pagination="false" />
 
           <div class="pa">
-            <a-pagination
-              :showSizeChanger="false"
-              showQuickJumper="true"
-              hideOnSinglePage="true"
-              :pageSize="pageSize"
-              :current="currentPage"
-              :total="tableDataTotal"
-              class="pagination"
-              v-if="tableDataTotal > 10"
-              @change="changePaginationStu"
-            />
+            <a-pagination :showSizeChanger="false" showQuickJumper="true" hideOnSinglePage="true" :pageSize="pageSize"
+              :current="currentPage" :total="tableDataTotal" class="pagination" v-if="tableDataTotal > 10"
+              @change="changePaginationStu" />
           </div>
         </div>
       </div>
-        <!--
+      <!--
       <div class="btnn">
         <button class="btn1" @click="closeDrawer">取消</button>
         <button class="btn2" @click="closeDrawer">确定</button>
@@ -115,8 +78,8 @@
     <!-- 导出成绩抽屉 -->
     <EScore v-model:eScorevisible="eScorevisible" />
   </a-drawer>
-   <!-- 查看答卷抽屉 -->
-   <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource"/>
+  <!-- 查看答卷抽屉 -->
+  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource" />
 </template>
 
 <script>
@@ -198,7 +161,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.studentCode?text.record.studentCode:"-"}</span>
+                <span> {text.record.studentCode ? text.record.studentCode : "-"}</span>
               </div>
             );
           },
@@ -213,7 +176,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.studentName?text.record.studentName:"-"}</span>
+                <span> {text.record.studentName ? text.record.studentName : "-"}</span>
               </div>
             );
           },
@@ -228,7 +191,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
+                <span> {text.record.studentDepartName ? text.record.studentDepartName : "-"}</span>
               </div>
             );
           },
@@ -244,7 +207,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
+                <span> {text.record.studentJobName ? text.record.studentJobName : "-"}</span>
               </div>
             );
           },
@@ -258,7 +221,7 @@ export default {
           ellipsis: true,
           className: "h",
           customRender: () => {
-          return (
+            return (
               <div class="racona">
                 <span> {props.levelName}</span>
               </div>
@@ -276,7 +239,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.num?text.record.num:"-"}</span>
+                <span> {text.record.num ? text.record.num : "-"}</span>
               </div>
             );
           },
@@ -292,7 +255,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.examinationScore?text.record.examinationScore:"-"}</span>
+                <span> {text.record.examinationScore ? text.record.examinationScore : "-"}</span>
               </div>
             );
           },
@@ -309,7 +272,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.examinationSubmitTime?text.record.examinationSubmitTime:"-"}</span>
+                <span> {text.record.examinationSubmitTime ? text.record.examinationSubmitTime : "-"}</span>
               </div>
             );
           },
@@ -322,7 +285,7 @@ export default {
           align: "center",
           ellipsis: true,
           className: "h",
-          customRender: ({record:{finishStatus}}) => ({1:'通过',2:'未通过'}[finishStatus] || '未开始'),
+          customRender: ({ record: { finishStatus } }) => ({ 1: '通过', 2: '未通过' }[finishStatus] || '未开始'),
         },
         {
           title: "操作",
@@ -333,37 +296,37 @@ export default {
           ellipsis: true,
           className: "h",
           customRender: (text) => {
-            debugger
-            console.log("text"+text.record)
-            if (text.record.finishStatus===1 || text.record.finishStatus===2)  {
+            {/* debugger */ }
+            console.log("text" + text.record)
+            if (text.record.finishStatus === 1 || text.record.finishStatus === 2) {
               return (
-                      <div class="racona">
-                      <a-button
-                      type="link"
-                      onClick={()=>{
-                        state.studentKid = text.record.studentKid;
-                        state.datasource = text.record;
-                        state.CAvisible = true;
-                      }}>
-                      查看答卷
-                      </a-button>
-                      </div>
+                <div class="racona">
+                  <a-button
+                    type="link"
+                    onClick={() => {
+                      state.studentKid = text.record.studentKid;
+                      state.datasource = text.record;
+                      state.CAvisible = true;
+                    }}>
+                    查看答卷
+                  </a-button>
+                </div>
               );
-            }else {
+            } else {
               return (
-                      <div class="racona">
-                      <a-button
-              type="link"
-              disabled
-              onClick={()=>{
-                state.studentKid = text.record.studentKid;
-                state.datasource = text.record;
-                state.CAvisible = true;
-              }}>
-              查看答卷
-              </a-button>
-              </div>
-            );
+                <div class="racona">
+                  <a-button
+                    type="link"
+                    disabled
+                    onClick={() => {
+                      state.studentKid = text.record.studentKid;
+                      state.datasource = text.record;
+                      state.CAvisible = true;
+                    }}>
+                    查看答卷
+                  </a-button>
+                </div>
+              );
             }
 
           },
@@ -424,7 +387,7 @@ export default {
         type: 1,
         taskId: props.datasource.courseId,
         targetId: props.datasource.routerId
-      }).then(res=>{
+      }).then(res => {
         state.tabledata = res.data.data.managementDtoList;
         state.tableDataTotal = res.data.data.total;
         state.loadingData = false;
@@ -453,8 +416,8 @@ export default {
       getData();
     };
 
-    {/* 导出数据 */}
-    function  exportData() {
+    {/* 导出数据 */ }
+    function exportData() {
       // window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
       window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?currentStageId=${props.datasource.chapterId}&type=${1}&pid=${props.datasource.routerId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&taskType=${props.datasource.type}`)
 
@@ -517,6 +480,7 @@ export default {
       height: 100%;
       overflow: auto;
       padding-right: 10px;
+
       .endtime {
         font-size: 16px;
         font-weight: 500;
@@ -688,15 +652,18 @@ export default {
         .ant-table-selection-column {
           padding: 0px !important;
         }
+
         .ant-pagination-item,
         .ant-pagination-prev,
         .ant-pagination-next,
         .ant-pagination-options {
           margin-bottom: 10px;
         }
-        .ant-table-thead > tr > th {
+
+        .ant-table-thead>tr>th {
           background-color: rgba(239, 244, 252, 1) !important;
         }
+
         .ant-table-selection-column {
           padding: 0 !important;
         }
@@ -709,9 +676,7 @@ export default {
           padding-left: 0px !important;
         }
 
-        .ant-table-tbody
-          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          > td {
+        .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
           background: #f6f9fd;
         }
 
@@ -724,6 +689,7 @@ export default {
           border-right: 1px solid #e9e9e9;
           cursor: pointer;
         }
+
         .studentopea2 {
           font-size: 14px;
           font-weight: 400;
diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue
index ca4dd63c..b2f42c79 100644
--- a/src/components/drawers/router/RouterHomeworkManage.vue
+++ b/src/components/drawers/router/RouterHomeworkManage.vue
@@ -1,21 +1,11 @@
-  <template>
-  <a-drawer
-    v-if="HomeworkModelVisible"
-    :visible="HomeworkModelVisible"
-    class="drawerStyle ProjectHomeWorkManage"
-    placement="right"
-    width="80%"
-    @after-visible-change="afterVisibleChange"
-    :zIndex="100"
-  >
+<template>
+  <a-drawer v-if="HomeworkModelVisible" :visible="HomeworkModelVisible" class="drawerStyle ProjectHomeWorkManage"
+    placement="right" width="80%" @after-visible-change="afterVisibleChange" :zIndex="100">
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">【作业】{{ title }}</div>
-        <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../../assets/images/basicinfo/close.png"
+          @click="closeDrawer" />
       </div>
       <div class="main">
         <div class="endtime">
@@ -28,31 +18,17 @@
         <div class="search">
           <div class="namecon" style="margin-right: 30px">
             <div class="name">姓名：</div>
-            <a-input
-              v-model:value="name"
-              style="width: 200px; height: 40px; border-radius: 8px"
-              placeholder="请输入姓名"
-            />
+            <a-input v-model:value="name" style="width: 200px; height: 40px; border-radius: 8px" placeholder="请输入姓名" />
           </div>
           <div class="namecon" style="margin-right: 50px">
             <div class="name">任务状态：</div>
             <div class="select">
-              <a-select
-                v-model:value="projectName"
-                style="width: 200px"
-                placeholder="请选择"
-                :options="projectNameList"
-                @change="selectProjectName"
-                allowClear
-              ></a-select>
+              <a-select v-model:value="projectName" style="width: 200px" placeholder="请选择" :options="projectNameList"
+                @change="selectProjectName" allowClear></a-select>
             </div>
           </div>
           <div class="btns">
-            <div
-              class="btn btn1"
-              style="margin-right: 20px"
-              @click="searchTaskList"
-            >
+            <div class="btn btn1" style="margin-right: 20px" @click="searchTaskList">
               <div class="img1"></div>
               <div class="wz">搜索</div>
             </div>
@@ -88,31 +64,16 @@
             </div>
           </div> -->
         <div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
-          <a-table
-            style="border: 1px solid #f2f6fe"
-            :columns="tablecolumns"
-            :data-source="tabledata"
-            :loading="tableDataTotal === -1 ? true : false"
-            :scroll="{ x: 1300 }"
-            :pagination="false"
-            :row-selection="{
+          <a-table style="border: 1px solid #f2f6fe" :columns="tablecolumns" :data-source="tabledata"
+            :loading="tableDataTotal === -1 ? true : false" :scroll="{ x: 1300 }" :pagination="false" :row-selection="{
               selectedRowKeys: selectedRowKeys,
               onChange: onSelectChange,
-            }"
-          />
+            }" />
 
           <div class="pa">
-            <a-pagination
-              :showSizeChanger="false"
-              showQuickJumper="true"
-              hideOnSinglePage="true"
-              :pageSize="pageSize"
-              :current="currentPage"
-              :total="tableDataTotal"
-              class="pagination"
-              v-if="tableDataTotal > 10"
-              @change="changePaginationStu"
-            />
+            <a-pagination :showSizeChanger="false" showQuickJumper="true" hideOnSinglePage="true" :pageSize="pageSize"
+              :current="currentPage" :total="tableDataTotal" class="pagination" v-if="tableDataTotal > 10"
+              @change="changePaginationStu" />
           </div>
         </div>
       </div>
@@ -125,30 +86,18 @@
   </a-drawer>
 
   <!-- 录入成绩抽屉 -->
-  <EScore
-    v-model:eScorevisible="Evisible"
-    :type="2"
-    :id="datasource?.id"
-    :pid="datasource?.routerId"
-    v-model:searchTaskList="searchTaskList"
-  />
+  <EScore v-model:eScorevisible="Evisible" :type="2" :id="datasource?.id" :pid="datasource?.routerId"
+    v-model:searchTaskList="searchTaskList" />
   <!-- 查看作业抽屉 -->
-  <CKWork
-    v-model:CWvisible="CWvisible"
-    :workId="datasource?.courseId"
-    v-model:stuId="stuId"
-  />
+  <CKWork v-model:CWvisible="CWvisible" :workId="datasource?.courseId" v-model:stuId="stuId" />
   <!-- 查看答卷抽屉 -->
   <CQue v-model:CQvisible="CQvisible" />
 
   <!-- 导出作业提示框 -->
-  <ExportHomeWork
-    v-model:exportHomeWorkV="exportHomeWorkV"
-    :downloadUrl="downloadUrl"
-  />
+  <ExportHomeWork v-model:exportHomeWorkV="exportHomeWorkV" :downloadUrl="downloadUrl" />
 </template>
 
-  <script>
+<script>
 import { toRefs, reactive } from "vue";
 import { message } from "ant-design-vue";
 import CKWork from "../CheckWork.vue";
@@ -341,7 +290,7 @@ export default {
               <div class="racona">
                 <span>
                   {text.record.workScore || text.record.workScore == 0
-                    ? text.record.workScore < 0 ?"-":text.record.workScore
+                    ? text.record.workScore < 0 ? "-" : text.record.workScore
                     : "-"}
                 </span>
               </div>
@@ -380,13 +329,13 @@ export default {
               <div class="racona">
                 <span>
                   {text.record.finishStatus == 0 ||
-                  text.record.finishStatus == null
+                    text.record.finishStatus == null
                     ? "未开始"
                     : text.record.finishStatus == 1
-                    ? "已完成"
-                    : text.record.finishStatus == 2
-                    ? "进行中"
-                    : "-"}
+                      ? "已完成"
+                      : text.record.finishStatus == 2
+                        ? "进行中"
+                        : "-"}
                 </span>
               </div>
             );
@@ -443,7 +392,7 @@ export default {
               }}
             >
               <a-button
-              disabled
+                disabled
                 class="operation"
                 style="margin-right:10px;color:rgba(56, 125, 247, 0.5)"
               >
@@ -497,7 +446,7 @@ export default {
 
     //获取学员
     const getStudent = () => {
-      {/* debugger */}
+      {/* debugger */ }
       console.log("我是传递的查询参数", props.datasource.courseId, {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
@@ -522,7 +471,7 @@ export default {
           studentName: state.name,
         })
         .then((res) => {
-          debugger
+          {/* debugger */ }
           console.log("获取作业管理学员", res);
           if (res.data.code == 200) {
             let newData = [];
@@ -565,12 +514,9 @@ export default {
     function exportTaskStu() {
       console.log("props.datasource", props.datasource);
       window.open(
-        `${
-          process.env.VUE_APP_BASE_API
-        }/admin/student/exportTaskStudent?currentStageId=${
-          props.datasource.chapterId
-        }&type=${2}&pid=${props.datasource.routerId}&taskType=${4}&taskId=${
-          props.datasource.id
+        `${process.env.VUE_APP_BASE_API
+        }/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId
+        }&type=${2}&pid=${props.datasource.routerId}&taskType=${4}&taskId=${props.datasource.id
         }`
       );
       // api
@@ -605,7 +551,7 @@ export default {
         .then((res) => {
           console.log("导出作业", res.data.data);
           if (res.data.code === 200) {
-            debugger
+            // debugger
             // message.destroy();
             // message.success("导出作业成功");
             state.exportHomeWorkV = true;
@@ -623,12 +569,9 @@ export default {
     function exportHomeWork() {
       console.log("props.datasource", props.datasource);
       window.open(
-        `${
-          process.env.VUE_APP_BASE_API
-        }/admin/student/exportHomeWork?currentStageId=${
-          props.datasource.chapterId
-        }&type=${2}&pid=${props.datasource.routerId}&taskId=${
-          props.datasource.routerTaskId
+        `${process.env.VUE_APP_BASE_API
+        }/admin/student/exportHomeWork?currentStageId=${props.datasource.chapterId
+        }&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId
         }&taskType=${props.datasource.type}`
       );
     }
@@ -655,7 +598,7 @@ export default {
 };
 </script>
 
-  <style lang="scss">
+<style lang="scss">
 .ProjectHomeWorkManage {
   .drawerMain {
     min-width: 550px;
@@ -685,6 +628,7 @@ export default {
       height: 100%;
       overflow: auto;
       padding-right: 10px;
+
       .endtime {
         font-size: 16px;
         font-weight: 500;
@@ -856,15 +800,18 @@ export default {
         .ant-table-selection-column {
           padding: 0px !important;
         }
+
         .ant-pagination-item,
         .ant-pagination-prev,
         .ant-pagination-next,
         .ant-pagination-options {
           margin-bottom: 10px;
         }
-        .ant-table-thead > tr > th {
+
+        .ant-table-thead>tr>th {
           background-color: rgba(239, 244, 252, 1) !important;
         }
+
         .ant-table-selection-column {
           padding: 0 !important;
         }
@@ -877,9 +824,7 @@ export default {
           padding-left: 0px !important;
         }
 
-        .ant-table-tbody
-          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          > td {
+        .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
           background: #f6f9fd;
         }
 
@@ -892,6 +837,7 @@ export default {
           border-right: 1px solid #e9e9e9;
           cursor: pointer;
         }
+
         .studentopea2 {
           font-size: 14px;
           font-weight: 400;
diff --git a/src/components/student/ChangeGroupModal.vue b/src/components/student/ChangeGroupModal.vue
index 69975dba..f33615a2 100644
--- a/src/components/student/ChangeGroupModal.vue
+++ b/src/components/student/ChangeGroupModal.vue
@@ -7,14 +7,8 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
-  <a-modal
-    style="padding: 0"
-    :closable="true"
-    :visible="changegroupV"
-    :footer="null"
-    centered="true"
-    wrapClassName="changeModal"
-  >
+  <a-modal style="padding: 0" :closable="true" :visible="changegroupV" :footer="null" centered="true"
+    wrapClassName="changeModal">
     <div class="con">
       <div class="header">
         <div class="inhe">
@@ -27,28 +21,14 @@
         <div class="inher">
           <!-- <div class="cur">当前关卡：关卡2</div> -->
           <div class="select">
-            <a-select
-              v-model:value="selectGroupId"
-              style="width: 100%"
-              placeholder="请选择小组"
-              :options="option"
-              allowClear
-              @change="selectGroup"
-            ></a-select>
+            <a-select v-model:value="selectGroupId" style="width: 100%" placeholder="请选择小组" :options="option" allowClear
+              @change="selectGroup"></a-select>
           </div>
           <div class="btn">
-            <button
-              class="sameb btn1"
-              @click="closeChangeModal"
-              style="cursor: pointer"
-            >
+            <button class="sameb btn1" @click="closeChangeModal" style="cursor: pointer">
               取消
             </button>
-            <button
-              class="sameb btn2"
-              @click="changeGroup"
-              style="cursor: pointer"
-            >
+            <button class="sameb btn2" @click="changeGroup" style="cursor: pointer">
               确定
             </button>
           </div>
@@ -100,7 +80,7 @@ const selectGroup = (e, v) => {
 };
 //确认换组
 const changeGroup = (item) => {
-  debugger
+  // debugger
   console.log("换组", selectGroupId.value, item);
   props.checkgroupStuId.forEach(stu => {
     let obj = {
@@ -110,17 +90,17 @@ const changeGroup = (item) => {
     };
     console.log("换组obj", obj);
     api
-            .changeGroupByStudentId(obj)
-            .then((res) => {
-              console.log("换组成功", res);
-              if (res.data.code === 200) {
-                message.success("换组成功");
-                closeChangeModal();
-              }
-            })
-            .catch((err) => {
-              console.log("换组失败", err);
-            });
+      .changeGroupByStudentId(obj)
+      .then((res) => {
+        console.log("换组成功", res);
+        if (res.data.code === 200) {
+          message.success("换组成功");
+          closeChangeModal();
+        }
+      })
+      .catch((err) => {
+        console.log("换组失败", err);
+      });
   })
 
 };
@@ -131,9 +111,11 @@ const changeGroup = (item) => {
   .ant-modal {
     width: 549px !important;
     height: 245px !important;
+
     .ant-modal-close-x {
       display: none;
     }
+
     .ant-modal-content {
       width: 549px !important;
       height: 245px !important;
@@ -155,10 +137,8 @@ const changeGroup = (item) => {
             position: relative;
             justify-content: center;
 
-            background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
-            );
+            background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%);
 
             .inhe {
               width: 80%;

From 13c5d8ede109ad29e13f0893d2f6488d77cb7aef Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Thu, 23 Feb 2023 11:41:08 +0800
Subject: [PATCH 03/15] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=8A=95=E7=A5=A8?=
 =?UTF-8?q?=E9=A2=98=E5=B9=B2=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/vote/VoteQuestionItem.vue | 74 +++++++++++++++---------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/components/vote/VoteQuestionItem.vue b/src/components/vote/VoteQuestionItem.vue
index da1454f4..9f36cd2e 100644
--- a/src/components/vote/VoteQuestionItem.vue
+++ b/src/components/vote/VoteQuestionItem.vue
@@ -7,45 +7,34 @@
           <div class="inname">选项</div>
         </div>
         <div class="in">
-          <a-input
-              v-model:value="formData.optionName"
-              show-count
-              :maxlength="30"
-              style="border-radius: 8px"
-          />
+          <a-input v-model:value="formData.optionName" show-count :maxlength="30" style="border-radius: 8px" />
         </div>
       </div>
       <div class="delete" @click="handleDel">删除</div>
     </div>
     <div class="name uploadContent">
-      <a-upload
-          v-show="!formData.imgVal"
-          class="in uploadBtn"
-          :show-upload-list="false"
-      >
-        <div class="addimg">+添加图片{{ index }}</div>
+      <a-upload v-show="!formData.imgVal" class="in uploadBtn" :show-upload-list="false" :before-upload="beforeUpload">
+        <div class="addimg">+添加图片</div>
       </a-upload>
       <div v-show="formData.optionPictureAddress" class="picture" style="position: relative">
-        <img class="pictureimg" :src="formData.optionPictureAddress"/>
+        <img class="pictureimg" :src="formData.optionPictureAddress" />
         <div class="picturename" v-show="hasImgName">{{ hasImgName }}</div>
-        <img
-            style="
-            cursor: pointer;
-            width: 20px;
-            height: 20px;
-            position: absolute;
-            right: 0;
-            top: 0;
-          "
-            src="../../assets/images/basicinfo/close.png"
-            @click="handleCancel"
-        />
+        <img style="
+                                cursor: pointer;
+                                width: 20px;
+                                height: 20px;
+                                position: absolute;
+                                right: 0;
+                                top: 0;
+                              " src="../../assets/images/basicinfo/close.png" @click="handleCancel" />
       </div>
     </div>
   </div>
 </template>
 <script setup>
-import {defineEmits, defineProps, ref} from "vue";
+import { defineEmits, defineProps, ref } from "vue";
+import { message } from "ant-design-vue";
+import { fileUp } from "../../api/indexEval";
 
 const props = defineProps({
   item: {},
@@ -55,6 +44,36 @@ const emit = defineEmits(['del'])
 
 const formData = ref(props.item)
 
+const beforeUpload = (file) => {
+  const isJpgOrPng =
+    file.type === "image/jpg" ||
+    file.type === "image/jpeg" ||
+    file.type === "image/png" ||
+    file.type === "image/svg" ||
+    file.type === "image/bmp" ||
+    file.type === "image/gif";
+  if (!isJpgOrPng) {
+    message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
+    return false;
+  }
+
+  let isLt1M = file.size / 10240 / 10240 <= 1;
+  if (!isLt1M) {
+    this.$message.error("图片大小超过10MB!");
+    return false;
+  }
+
+  const formDatas = new FormData();
+  formDatas.append("file", file);
+  fileUp(formDatas).then((res) => {
+    if (res.data.code === 200) {
+      console.log(res.data.data, 45);
+      formData.value.optionPictureAddress = process.env.VUE_APP_FILE_PATH + res.data.data;
+    }
+  });
+  return false;
+};
+
 function handleDel() {
   emit('del', props.index)
 }
@@ -334,8 +353,7 @@ function handleDel() {
           //line-height: 24px;
         }
 
-        .ant-radio-wrapper {
-        }
+        .ant-radio-wrapper {}
 
         .ant-input {
           border-radius: 5px;

From a79efcec0146600e5f7092949d233b52ba8cb220 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 23 Feb 2023 11:41:18 +0800
Subject: [PATCH 04/15] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=B0=81=E9=9D=A2=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectAdd.vue | 315 +++++++++++++------------
 1 file changed, 162 insertions(+), 153 deletions(-)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 98d1cdd1..df829a1c 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -3,15 +3,14 @@
   <div class="projectAdd">
     <div class="header">
       <span class="title"
-      >{{
-          projectInfo.id ? "编辑" : "创建"
+        >{{ projectInfo.id ? "编辑" : "创建"
         }}{{ ptojectType == "3" ? "班级" : "项目" }}</span
       >
       <div
-          @click="backPage"
-          style="cursor: pointer"
-          to="/projectmanage"
-          class="goback"
+        @click="backPage"
+        style="cursor: pointer"
+        to="/projectmanage"
+        class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -21,8 +20,8 @@
         <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目归属</div>
           </div>
@@ -35,8 +34,8 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">
               {{ ptojectType == 3 ? "班级名称" : "项目名称" }}
@@ -44,27 +43,27 @@
           </div>
           <div class="in">
             <NameInput
-                placeholder="请输入项目名称"
-                v-model:value="projectInfo.name"
-                v-model:validate="projectInfo.validate"
-                :maxlength="30"
-                show-count
-                :id="projectInfo.id"
+              placeholder="请输入项目名称"
+              v-model:value="projectInfo.name"
+              v-model:validate="projectInfo.validate"
+              :maxlength="30"
+              show-count
+              :id="projectInfo.id"
             ></NameInput>
           </div>
         </div>
         <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
-            <div class="inname">封面图2</div>
+            <div class="inname">封面图</div>
           </div>
           <div class="in select" style="flex: 1; display: flex">
             <div
-                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-                style="
+              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+              style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
@@ -72,114 +71,115 @@
                 position: relative;
                 overflow: hidden;
               "
-                v-for="(src, index) in projectPic"
-                :style="{
-                  display: index >= 3 ? 'none' : 'flex',
-                }"
-                :key="index"
-                @click="() => (projectInfo.picUrl = src.value)"
+              v-for="(src, index) in projectPic"
+              :style="{
+                display: index >= 3 ? 'none' : 'flex',
+              }"
+              :key="index"
+              @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                  style="
+                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                  :src="src.value"
-                  alt="avatar"
+                :src="src.value"
+                alt="avatar"
               />
             </div>
             <div
-                    @click="showLearnBgMore"
-                    v-if="projectPic.length > 3"
-                    style="
-                      width: 100px;
-                      height: 100px;
-                      padding-left: 15px;
-                      border-radius: 5px;
-                      cursor: pointer;
-                      position: relative;
-                      overflow: hidden;
-                      display: flex;
-                      align-items: center;
-                      justify-content: center;
-                      border: 1px solid #c7cbd2;
-                      font-size: 14px;
-                      font-weight: 400;
-                      color: #4ea6ff;
-                      line-height: 36px;
-                    "
+              @click="showLearnBgMore"
+              v-if="projectPic.length > 3"
+              style="
+                width: 100px;
+                height: 100px;
+                padding-left: 15px;
+                border-radius: 5px;
+                cursor: pointer;
+                position: relative;
+                overflow: hidden;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                border: 1px solid #c7cbd2;
+                font-size: 14px;
+                font-weight: 400;
+                color: #4ea6ff;
+                line-height: 36px;
+              "
             >
-              查看更多 <img src="../../assets/images/projectadd/go.png"  alt=""/>
+              查看更多
+              <img src="../../assets/images/projectadd/go.png" alt="" />
             </div>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-                separator="至"
-                :show-time="{ format: 'HH:mm' }"
-                :placeholder="['      开始时间', '        结束时间']"
-                :disabledDate="disabledDate"
-                v-model:value="timeRange"
-                @calendarChange="calendarChange"
-                style="width: 100%; height: 40px; border-radius: 5px"
-                :allowClear="false"
-                format="YYYY-MM-DD HH:mm"
-                valueFormat="YYYY-MM-DD HH:mm"
-                @change="timeChange"
-                :disabled="!!viewDetail"
+              separator="至"
+              :show-time="{ format: 'HH:mm' }"
+              :placeholder="['      开始时间', '        结束时间']"
+              :disabledDate="disabledDate"
+              v-model:value="timeRange"
+              @calendarChange="calendarChange"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              :allowClear="false"
+              format="YYYY-MM-DD HH:mm"
+              valueFormat="YYYY-MM-DD HH:mm"
+              @change="timeChange"
+              :disabled="!!viewDetail"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager
-                v-model:value="projectInfo.managerId"
-                v-model:name="projectInfo.manager"
-                @onChange="managerChange"
-                mode="multiple"
+              v-model:value="projectInfo.managerId"
+              v-model:name="projectInfo.manager"
+              @onChange="managerChange"
+              mode="multiple"
             ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass
-                v-model:value="projectInfo.sourceBelongId"
-                v-model:name="projectInfo.sourceBelongName"
-                v-model:fullName="projectInfo.sourceBelongFullName"
+              v-model:value="projectInfo.sourceBelongId"
+              v-model:name="projectInfo.sourceBelongName"
+              v-model:fullName="projectInfo.sourceBelongFullName"
             ></OrgClass>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目级别</div>
           </div>
@@ -190,8 +190,8 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">培训分类</div>
           </div>
@@ -202,15 +202,15 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
             <a-radio-group
-                v-model:value="projectInfo.boeFlag"
-                :disabled="viewDetail ? true : false"
+              v-model:value="projectInfo.boeFlag"
+              :disabled="viewDetail ? true : false"
             >
               <a-radio :style="radioStyle" :value="1">是</a-radio>
               <a-radio :style="radioStyle" :value="0">否</a-radio>
@@ -225,7 +225,7 @@
             <!-- :disabled="viewDetail ? true : false" -->
             <a-checkbox v-model:checked="courseSyncFlag" disabled>
               <span
-                  style="
+                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
@@ -239,7 +239,7 @@
             <!-- :disabled="viewDetail ? true : false" -->
             <a-checkbox v-model:checked="courseSyncFlag" disabled>
               <span
-                  style="
+                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
@@ -256,12 +256,12 @@
           </div>
           <div class="in">
             <a-textarea
-                v-model:value="projectInfo.remark"
-                style="height: 80px"
-                placeholder="请输入说明"
-                show-count
-                :maxlength="200"
-                :disabled="viewDetail ? true : false"
+              v-model:value="projectInfo.remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -280,13 +280,15 @@
           <div class="inname" style="width: 50px">模版</div>
           <div class="in select" style="margin-left: 2px">
             <a-select
-                :getPopupContainer="triggerNode => (triggerNode.parentNode || document.body)"
-                placeholder="请选择模版"
-                style="width: 100%"
-                :options="classifyList5"
-                @change="classificationChange5"
-                @popupScroll="templateScroll"
-                :fieldNames="{
+              :getPopupContainer="
+                (triggerNode) => triggerNode.parentNode || document.body
+              "
+              placeholder="请选择模版"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+              @popupScroll="templateScroll"
+              :fieldNames="{
                 label: 'name',
                 value: 'id',
               }"
@@ -300,24 +302,24 @@
       <div class="btn">
         <a-button @click="backPage" class="btn2">取消</a-button>
         <a-button
-            :loading="loading"
-            v-on:click="createProject"
-            type="primary"
-            class="btn1"
-            style="margin-left: 20px"
-        >确定
+          :loading="loading"
+          v-on:click="createProject"
+          type="primary"
+          class="btn1"
+          style="margin-left: 20px"
+          >确定
         </a-button>
       </div>
     </div>
     <!-- 更多背景图 v-model:visible="learnBgMore"  -->
     <a-modal
-            :closable="sh"
-            centered="true"
-            v-model:visible="learnBgMore"
-            :footer="null"
-            :width="650"
-            wrapClassName="learnBgMoreModal"
-            :z-index="9999"
+      :closable="sh"
+      centered="true"
+      v-model:visible="learnBgMore"
+      :footer="null"
+      :width="650"
+      wrapClassName="learnBgMoreModal"
+      :z-index="9999"
     >
       <div class="main">
         <div class="top">
@@ -331,18 +333,18 @@
                   class="learnBgItem"
           > -->
           <div
-          @click="chooseImg2(item)"
-          v-for="item in projectPic"
-          :key="item.code"
-          class="learnBgItem"
-          :style="{
-            border:
-              pathBgId === item.code
-                ? '2px solid rgba(78, 166, 255, 1)'
-                : '1px solid #ccc',
-            'background-image': 'url(' + item.value.split(',')[0] + ')',
-          }"
-        >
+            @click="chooseImg2(item)"
+            v-for="item in projectPic"
+            :key="item.code"
+            class="learnBgItem"
+            :style="{
+              border:
+                projectInfo.picUrl === item.value
+                  ? '3px solid rgba(78, 166, 255, 1)'
+                  : '1px solid #ccc',
+              'background-image': 'url(' + item.value.split(',')[0] + ')',
+            }"
+          >
             <!-- <img class="im" :src="item.source" /> -->
           </div>
         </div>
@@ -355,20 +357,20 @@
   </div>
 </template>
 <script>
-import {onMounted, reactive, toRefs, watch} from "vue";
-import {message} from "ant-design-vue";
-import {useRoute, useRouter} from "vue-router";
+import { onMounted, reactive, toRefs, watch } from "vue";
+import { message } from "ant-design-vue";
+import { useRoute, useRouter } from "vue-router";
 import * as api from "../../api/index";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import NameInput from "@/components/project/NameInput";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import * as api2 from "../../api/indexAudit";
-import {validateName} from "@/api/index1";
+import { validateName } from "@/api/index1";
 import dayjs from "dayjs";
-import {scrollLoad} from "@/api/method";
+import { scrollLoad } from "@/api/method";
 
 export default {
   name: "projectAdd",
@@ -385,14 +387,14 @@ export default {
     const routers = useRoute();
     const router = useRouter();
     const state = reactive({
-      datePartial: 'start',
+      datePartial: "start",
       loading: false,
       currentPage: 1, //当前页
       tableDataTotal: -1, //模版列表总数
       pageSize: 10, //每页10条数据
       totalPages: 0, //总页数
       viewDetail: null,
-      projectInfo: {id: ''},
+      projectInfo: { id: "" },
       projectPic: [],
       memberParam: {
         pageNo: 1,
@@ -406,7 +408,8 @@ export default {
       changeCondition: false,
       clickNum: 0,
       timeRange: [],
-      learnBgMore: false
+      learnBgMore: false,
+      pathBgId: null,
     });
 
     // 封面图选择
@@ -416,6 +419,7 @@ export default {
     };
     onMounted(() => {
       state.projectPic = store.state.project_pic.map((e) => ({
+        code: e.id,
         value: e.value,
         label: e.name,
       }));
@@ -423,7 +427,7 @@ export default {
       getProjectInfo();
       getTemplate();
       state.ptojectType = routers.query.ptojectType;
-      // console.log("routers.query.ptojectType", routers.query.ptojectType);
+      console.log("获取封面图", state.projectPic);
     });
 
     watch(routers.query, () => {
@@ -437,10 +441,9 @@ export default {
       state.projectInfo.parentId = routers.query.parentId;
       state.projectInfo.id = routers.query.projectId;
       (state.projectInfo.id || state.projectInfo.parentId) &&
-      api
+        api
           .getProjectDetail({
-            projectId:
-                state.projectInfo.id || state.projectInfo.parentId,
+            projectId: state.projectInfo.id || state.projectInfo.parentId,
           })
           .then((res) => {
             state.projectInfo = {
@@ -448,9 +451,12 @@ export default {
               ...state.projectInfo,
             };
             !routers.query.projectId &&
-            !!routers.query.parentId &&
-            (state.projectInfo.name = "");
-            state.timeRange = [state.projectInfo.beginTime, state.projectInfo.endTime];
+              !!routers.query.parentId &&
+              (state.projectInfo.name = "");
+            state.timeRange = [
+              state.projectInfo.beginTime,
+              state.projectInfo.endTime,
+            ];
             state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
             if (Number(state.projectInfo.status) === -5) {
               let obj = {
@@ -465,8 +471,8 @@ export default {
                   if (res.rows && res.rows.length > 0) {
                     let i = res.rows.length;
                     state.auditDescription = res.rows[i - 1].description
-                        ? res.rows[i - 1].description
-                        : "-";
+                      ? res.rows[i - 1].description
+                      : "-";
                   }
                 }
               });
@@ -485,8 +491,8 @@ export default {
 
     const classificationChange5 = (key, option) => {
       state.projectInfo = option;
-      state.projectInfo.projectTemplateId = option.id
-      state.projectInfo.id = ''
+      state.projectInfo.projectTemplateId = option.id;
+      state.projectInfo.id = "";
       state.projectInfo.type = 3;
       state.timeRange = [option.beginTime, option.endTime];
       state.projectInfo.parentName = routers.query.parentName;
@@ -581,7 +587,7 @@ export default {
         message.success(state.projectInfo.id ? "编辑成功" : "创建成功");
         router.push({
           path: "/taskpage",
-          query: {projectId: res.data.data},
+          query: { projectId: res.data.data },
         });
       });
     };
@@ -593,14 +599,16 @@ export default {
       state.projectInfo.sourceBelongFullName = orgName;
     }
 
-
     const disabledDate = (current) => {
       //编辑的时候  开始实际只能选当前时间之前的时间
-      if (state.projectInfo.id && state.datePartial === 'start') {
-        return current && current > dayjs(state.timeRange[0]).endOf("YYYY-MM-DD HH:mm");
+      if (state.projectInfo.id && state.datePartial === "start") {
+        return (
+          current &&
+          current > dayjs(state.timeRange[0]).endOf("YYYY-MM-DD HH:mm")
+        );
       }
       // return current && current < dayjs().endOf('day');
-      return current && current < dayjs().subtract(1, 'days').endOf('day')
+      return current && current < dayjs().subtract(1, "days").endOf("day");
     };
 
     //显示更多路径背景弹窗
@@ -612,13 +620,14 @@ export default {
       state.learnBgMore = false;
     };
     function calendarChange(date, dateStr, partial) {
-      state.datePartial = partial
+      state.datePartial = partial;
     }
     const chooseImg2 = (item) => {
       // console.log(item);
+      state.projectInfo.picUrl = item.value;
       state.pathBgId = item.code;
-      state.pathBg = item.value.split(',')[0];
-      state.mobilePicUrl = item.value.split(',')[1];
+      state.pathBg = item.value.split(",")[0];
+      state.mobilePicUrl = item.value.split(",")[1];
     };
 
     return {
@@ -635,7 +644,7 @@ export default {
       handleChangeSelect,
       showLearnBgMore,
       closeLearnBgMore,
-      chooseImg2
+      chooseImg2,
     };
   },
 };
@@ -706,7 +715,7 @@ export default {
   }
 
   .active {
-    border: 2px solid rgba(78, 166, 255, 1);
+    border: 3px solid rgba(78, 166, 255, 1);
   }
 
   .content {

From 1eb14fc86ec4d84d733b41cfd8a50a5b74efef8b Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Thu, 23 Feb 2023 14:27:46 +0800
Subject: [PATCH 05/15] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8E=BB=E9=99=A4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectAdd.vue | 296 ++++++++-----------------
 1 file changed, 94 insertions(+), 202 deletions(-)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 98d1cdd1..14a005d0 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -2,17 +2,10 @@
 <template xmlns:display="http://www.w3.org/1999/xhtml">
   <div class="projectAdd">
     <div class="header">
-      <span class="title"
-      >{{
-          projectInfo.id ? "编辑" : "创建"
-        }}{{ ptojectType == "3" ? "班级" : "项目" }}</span
-      >
-      <div
-          @click="backPage"
-          style="cursor: pointer"
-          to="/projectmanage"
-          class="goback"
-      >
+      <span class="title">{{
+        projectInfo.id ? "编辑" : "创建"
+      }}{{ ptojectType == "3" ? "班级" : "项目" }}</span>
+      <div @click="backPage" style="cursor: pointer" to="/projectmanage" class="goback">
         <span class="return"></span><span class="returntext">返回</span>
       </div>
     </div>
@@ -20,10 +13,7 @@
       <div class="main">
         <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
-            <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-            />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
             <div class="inname">项目归属</div>
           </div>
           <div class="in">
@@ -34,153 +24,97 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-            />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
             <div class="inname">
               {{ ptojectType == 3 ? "班级名称" : "项目名称" }}
             </div>
           </div>
           <div class="in">
-            <NameInput
-                placeholder="请输入项目名称"
-                v-model:value="projectInfo.name"
-                v-model:validate="projectInfo.validate"
-                :maxlength="30"
-                show-count
-                :id="projectInfo.id"
-            ></NameInput>
+            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate"
+              :maxlength="30" show-count :id="projectInfo.id"></NameInput>
           </div>
         </div>
         <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
-            <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-            />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
             <div class="inname">封面图2</div>
           </div>
           <div class="in select" style="flex: 1; display: flex">
-            <div
-                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-                style="
-                width: 100px;
-                height: 100px;
-                border-radius: 5px;
-                cursor: pointer;
-                position: relative;
-                overflow: hidden;
-              "
-                v-for="(src, index) in projectPic"
-                :style="{
-                  display: index >= 3 ? 'none' : 'flex',
-                }"
-                :key="index"
-                @click="() => (projectInfo.picUrl = src.value)"
-            >
-              <img
-                  style="
-                  width: 100px;
-                  height: 100px;
-                  margin-bottom: 4px;
-                  margin-right: 4px;
-                "
-                  :src="src.value"
-                  alt="avatar"
-              />
-            </div>
-            <div
-                    @click="showLearnBgMore"
-                    v-if="projectPic.length > 3"
-                    style="
+            <div :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`" style="
                       width: 100px;
                       height: 100px;
-                      padding-left: 15px;
                       border-radius: 5px;
                       cursor: pointer;
                       position: relative;
                       overflow: hidden;
-                      display: flex;
-                      align-items: center;
-                      justify-content: center;
-                      border: 1px solid #c7cbd2;
-                      font-size: 14px;
-                      font-weight: 400;
-                      color: #4ea6ff;
-                      line-height: 36px;
-                    "
-            >
-              查看更多 <img src="../../assets/images/projectadd/go.png"  alt=""/>
+                    " v-for="(src, index) in projectPic" :style="{
+                      display: index >= 3 ? 'none' : 'flex',
+                    }" :key="index" @click="() => (projectInfo.picUrl = src.value)">
+              <img style="
+                        width: 100px;
+                        height: 100px;
+                        margin-bottom: 4px;
+                        margin-right: 4px;
+                      " :src="src.value" alt="avatar" />
+            </div>
+            <div @click="showLearnBgMore" v-if="projectPic.length > 3" style="
+                            width: 100px;
+                            height: 100px;
+                            padding-left: 15px;
+                            border-radius: 5px;
+                            cursor: pointer;
+                            position: relative;
+                            overflow: hidden;
+                            display: flex;
+                            align-items: center;
+                            justify-content: center;
+                            border: 1px solid #c7cbd2;
+                            font-size: 14px;
+                            font-weight: 400;
+                            color: #4ea6ff;
+                            line-height: 36px;
+                          ">
+              查看更多 <img src="../../assets/images/projectadd/go.png" alt="" />
             </div>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-            />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
-            <a-range-picker
-                separator="至"
-                :show-time="{ format: 'HH:mm' }"
-                :placeholder="['      开始时间', '        结束时间']"
-                :disabledDate="disabledDate"
-                v-model:value="timeRange"
-                @calendarChange="calendarChange"
-                style="width: 100%; height: 40px; border-radius: 5px"
-                :allowClear="false"
-                format="YYYY-MM-DD HH:mm"
-                valueFormat="YYYY-MM-DD HH:mm"
-                @change="timeChange"
-                :disabled="!!viewDetail"
-            />
+            <a-range-picker separator="至" :show-time="{ format: 'HH:mm' }" :placeholder="['      开始时间', '        结束时间']"
+              :disabledDate="disabledDate" v-model:value="timeRange" @calendarChange="calendarChange"
+              style="width: 100%; height: 40px; border-radius: 5px" :allowClear="false" format="YYYY-MM-DD HH:mm"
+              valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :disabled="!!viewDetail" />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-            />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
-            <ProjectManager
-                v-model:value="projectInfo.managerId"
-                v-model:name="projectInfo.manager"
-                @onChange="managerChange"
-                mode="multiple"
-            ></ProjectManager>
+            <ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"
+              @onChange="managerChange" mode="multiple"></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-            />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
-            <OrgClass
-                v-model:value="projectInfo.sourceBelongId"
-                v-model:name="projectInfo.sourceBelongName"
-                v-model:fullName="projectInfo.sourceBelongFullName"
-            ></OrgClass>
+            <OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName"
+              v-model:fullName="projectInfo.sourceBelongFullName"></OrgClass>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-            />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
             <div class="inname">项目级别</div>
           </div>
           <div class="in select">
@@ -189,10 +123,7 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-            />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
             <div class="inname">培训分类</div>
           </div>
           <div class="in select">
@@ -201,17 +132,11 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-            />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
-            <a-radio-group
-                v-model:value="projectInfo.boeFlag"
-                :disabled="viewDetail ? true : false"
-            >
+            <a-radio-group v-model:value="projectInfo.boeFlag" :disabled="viewDetail ? true : false">
               <a-radio :style="radioStyle" :value="1">是</a-radio>
               <a-radio :style="radioStyle" :value="0">否</a-radio>
             </a-radio-group>
@@ -224,13 +149,11 @@
           <div class="in ggysxz" v-if="courseSyncFlag">
             <!-- :disabled="viewDetail ? true : false" -->
             <a-checkbox v-model:checked="courseSyncFlag" disabled>
-              <span
-                  style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-              >
+              <span style="
+                        width: 100%;
+                        color: rgba(109, 117, 132, 1);
+                        font-size: 14px;
+                      ">
                 同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
               </span>
             </a-checkbox>
@@ -238,13 +161,11 @@
           <div class="in" v-else>
             <!-- :disabled="viewDetail ? true : false" -->
             <a-checkbox v-model:checked="courseSyncFlag" disabled>
-              <span
-                  style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-              >
+              <span style="
+                        width: 100%;
+                        color: rgba(109, 117, 132, 1);
+                        font-size: 14px;
+                      ">
                 同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
               </span>
             </a-checkbox>
@@ -255,14 +176,8 @@
             <div class="inname" style="margin-top: 13px">项目说明</div>
           </div>
           <div class="in">
-            <a-textarea
-                v-model:value="projectInfo.remark"
-                style="height: 80px"
-                placeholder="请输入说明"
-                show-count
-                :maxlength="200"
-                :disabled="viewDetail ? true : false"
-            />
+            <a-textarea v-model:value="projectInfo.remark" style="height: 80px" placeholder="请输入说明" show-count
+              :maxlength="200" :disabled="viewDetail ? true : false" />
           </div>
         </div>
 
@@ -279,18 +194,12 @@
         <div class="name">
           <div class="inname" style="width: 50px">模版</div>
           <div class="in select" style="margin-left: 2px">
-            <a-select
-                :getPopupContainer="triggerNode => (triggerNode.parentNode || document.body)"
-                placeholder="请选择模版"
-                style="width: 100%"
-                :options="classifyList5"
-                @change="classificationChange5"
-                @popupScroll="templateScroll"
-                :fieldNames="{
+            <a-select :getPopupContainer="triggerNode => (triggerNode.parentNode || document.body)" placeholder="请选择模版"
+              style="width: 100%" :options="classifyList5" @change="classificationChange5" @popupScroll="templateScroll"
+              :fieldNames="{
                 label: 'name',
                 value: 'id',
-              }"
-            >
+              }">
             </a-select>
           </div>
         </div>
@@ -299,50 +208,31 @@
     <div class="footer">
       <div class="btn">
         <a-button @click="backPage" class="btn2">取消</a-button>
-        <a-button
-            :loading="loading"
-            v-on:click="createProject"
-            type="primary"
-            class="btn1"
-            style="margin-left: 20px"
-        >确定
+        <a-button :loading="loading" v-on:click="createProject" type="primary" class="btn1" style="margin-left: 20px">确定
         </a-button>
       </div>
     </div>
     <!-- 更多背景图 v-model:visible="learnBgMore"  -->
-    <a-modal
-            :closable="sh"
-            centered="true"
-            v-model:visible="learnBgMore"
-            :footer="null"
-            :width="650"
-            wrapClassName="learnBgMoreModal"
-            :z-index="9999"
-    >
+    <a-modal :closable="sh" centered="true" v-model:visible="learnBgMore" :footer="null" :width="650"
+      wrapClassName="learnBgMoreModal" :z-index="9999">
       <div class="main">
         <div class="top">
           <div class="topc">封面图</div>
         </div>
         <div class="imagesBox">
-          <!-- <div
+        <!-- <div
                   @click="() => (projectInfo.picUrl = src.value)"
                   v-for="item in projectPic"
                   :key="item.code"
                   class="learnBgItem"
-          > -->
-          <div
-          @click="chooseImg2(item)"
-          v-for="item in projectPic"
-          :key="item.code"
-          class="learnBgItem"
-          :style="{
+                > -->
+          <div @click="chooseImg2(item)" v-for="item in projectPic" :key="item.code" class="learnBgItem" :style="{
             border:
               pathBgId === item.code
                 ? '2px solid rgba(78, 166, 255, 1)'
                 : '1px solid #ccc',
             'background-image': 'url(' + item.value.split(',')[0] + ')',
-          }"
-        >
+          }">
             <!-- <img class="im" :src="item.source" /> -->
           </div>
         </div>
@@ -355,20 +245,20 @@
   </div>
 </template>
 <script>
-import {onMounted, reactive, toRefs, watch} from "vue";
-import {message} from "ant-design-vue";
-import {useRoute, useRouter} from "vue-router";
+import { onMounted, reactive, toRefs, watch } from "vue";
+import { message } from "ant-design-vue";
+import { useRoute, useRouter } from "vue-router";
 import * as api from "../../api/index";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import NameInput from "@/components/project/NameInput";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import * as api2 from "../../api/indexAudit";
-import {validateName} from "@/api/index1";
+import { validateName } from "@/api/index1";
 import dayjs from "dayjs";
-import {scrollLoad} from "@/api/method";
+import { scrollLoad } from "@/api/method";
 
 export default {
   name: "projectAdd",
@@ -392,7 +282,7 @@ export default {
       pageSize: 10, //每页10条数据
       totalPages: 0, //总页数
       viewDetail: null,
-      projectInfo: {id: ''},
+      projectInfo: { id: '' },
       projectPic: [],
       memberParam: {
         pageNo: 1,
@@ -437,10 +327,10 @@ export default {
       state.projectInfo.parentId = routers.query.parentId;
       state.projectInfo.id = routers.query.projectId;
       (state.projectInfo.id || state.projectInfo.parentId) &&
-      api
+        api
           .getProjectDetail({
             projectId:
-                state.projectInfo.id || state.projectInfo.parentId,
+              state.projectInfo.id || state.projectInfo.parentId,
           })
           .then((res) => {
             state.projectInfo = {
@@ -448,8 +338,8 @@ export default {
               ...state.projectInfo,
             };
             !routers.query.projectId &&
-            !!routers.query.parentId &&
-            (state.projectInfo.name = "");
+              !!routers.query.parentId &&
+              (state.projectInfo.name = "");
             state.timeRange = [state.projectInfo.beginTime, state.projectInfo.endTime];
             state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
             if (Number(state.projectInfo.status) === -5) {
@@ -465,8 +355,8 @@ export default {
                   if (res.rows && res.rows.length > 0) {
                     let i = res.rows.length;
                     state.auditDescription = res.rows[i - 1].description
-                        ? res.rows[i - 1].description
-                        : "-";
+                      ? res.rows[i - 1].description
+                      : "-";
                   }
                 }
               });
@@ -581,7 +471,7 @@ export default {
         message.success(state.projectInfo.id ? "编辑成功" : "创建成功");
         router.push({
           path: "/taskpage",
-          query: {projectId: res.data.data},
+          query: { projectId: res.data.data },
         });
       });
     };
@@ -599,8 +489,8 @@ export default {
       if (state.projectInfo.id && state.datePartial === 'start') {
         return current && current > dayjs(state.timeRange[0]).endOf("YYYY-MM-DD HH:mm");
       }
-      // return current && current < dayjs().endOf('day');
-      return current && current < dayjs().subtract(1, 'days').endOf('day')
+      // 去除创建项目时间限制 可以选择创建时间之前的时间
+      // return current && current < dayjs().subtract(1, 'days').endOf('day')
     };
 
     //显示更多路径背景弹窗
@@ -1084,7 +974,9 @@ export default {
   color: #fff;
   margin-left: 16px;
 }
+
 .treeDropdown {
+
   // width: 240px !important;
   // border-radius: 5px;
   // min-height: 600px !important;

From d79acf9633275cd76149ab42ac88112b261fffb0 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 23 Feb 2023 14:27:47 +0800
Subject: [PATCH 06/15] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=A7=A3=E9=94=81?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/UnlockMode.vue | 117 +++++++++++++++-----------
 1 file changed, 68 insertions(+), 49 deletions(-)

diff --git a/src/components/drawers/UnlockMode.vue b/src/components/drawers/UnlockMode.vue
index 6512420c..dde55e5f 100644
--- a/src/components/drawers/UnlockMode.vue
+++ b/src/components/drawers/UnlockMode.vue
@@ -3,32 +3,33 @@
     <slot></slot>
   </div>
   <a-drawer
-      :visible="visible"
-      class="drawerStyle unlockmode"
-      placement="right"
-      width="700"
+    :visible="visible"
+    class="drawerStyle unlockmode"
+    placement="right"
+    width="700"
   >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">选择解锁模式</div>
         <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
         />
       </div>
       <div class="main">
         <div class="classify">
           <div
-              v-for="(item, index) in classify"
-              :key="index"
-              class="classifyItem"
-              @click="selectClassify(item)"
-              :style="{
-             color: item.type === classifyActive  ? '#FFFFFF' : '#999999',
+            v-for="(item, index) in classify"
+            :key="index"
+            class="classifyItem"
+            @click="selectClassify(item)"
+            :style="{
+              color: item.type === classifyActive ? '#FFFFFF' : '#999999',
               'background-color':
                 item.type === classifyActive ? '#4ea6ff' : '#FFFFFF',
-              border: item.type === classifyActive
+              border:
+                item.type === classifyActive
                   ? '1px solid #4ea6ff'
                   : '1px solid #999999',
             }"
@@ -36,12 +37,19 @@
             {{ item.text }}
           </div>
         </div>
-        <div v-if="classifyActive === 1" @click="updateLockMode(1)" class="type1">
+        <div
+          v-if="classifyActive === 1"
+          @click="updateLockMode(1)"
+          class="type1"
+        >
           <span style="font-weight: 500">描述：</span
           ><span>不设学习限制，学员可以在任何时间学习</span>
         </div>
-        <div v-if="classifyActive === 2" @click="updateLockMode(2)"
-             class="type1 type3">
+        <div
+          v-if="classifyActive === 2"
+          @click="updateLockMode(2)"
+          class="type1 type3"
+        >
           <div>
             <span style="font-weight: 500">描述：</span
             ><span>前一个阶段达成目标后解锁下一个阶段</span>
@@ -51,15 +59,13 @@
             <a-radio-group v-model:value="routerInfoData.unlockMode">
               <div>
                 <a-radio :value="2"
-                >逐个任务解锁，完成一个任务后解锁下一个
-                </a-radio
-                >
+                  >逐个任务解锁，完成一个任务后解锁下一个
+                </a-radio>
               </div>
-              <div v-if="types!==1" style="margin-top: 24px">
+              <div v-if="types !== 1" style="margin-top: 24px">
                 <a-radio :value="3"
-                >完成当前阶段所有必修任务解锁下一阶段
-                </a-radio
-                >
+                  >完成当前阶段所有必修任务解锁下一阶段
+                </a-radio>
               </div>
             </a-radio-group>
           </div>
@@ -74,11 +80,11 @@
 </template>
 
 <script setup>
-import {computed, defineEmits, defineProps, ref, watch} from "vue";
-import {editProjectModel, editRouterModel} from "@/api/indexLearningPath";
+import { computed, defineEmits, defineProps, ref, watch } from "vue";
+import { editProjectModel, editRouterModel } from "@/api/indexLearningPath";
 
-const emit = defineEmits({})
-const visible = ref(false)
+const emit = defineEmits({});
+const visible = ref(false);
 const classify = [
   {
     type: 1,
@@ -91,45 +97,58 @@ const classify = [
 ];
 const props = defineProps({
   routerInfo: {},
-  types: Number
-})
-const routerInfoData = ref({})
-const classifyActive = computed(() => routerInfoData.value.unlockMode === 1 ? 1 : 2)
-watch(() => props.routerInfo, () => {
-  routerInfoData.value = props.routerInfo
-})
+  types: Number,
+});
+const routerInfoData = ref({});
+const classifyActive = computed(() =>
+  routerInfoData.value.unlockMode === 1 ? 1 : 2
+);
+watch(
+  () => props.routerInfo,
+  () => {
+    routerInfoData.value = props.routerInfo;
+    console.log("routerInfoData", routerInfoData);
+  }
+);
 const closeDrawer = () => {
-  visible.value = false
+  visible.value = false;
 };
 
 function selectClassify(e) {
-  if (e.type === 1) {
-    routerInfoData.value.unlockMode = e.type
+  console.log("选择模式", e, props.types);
+  if (routerInfoData.value.status !== 3 && props.types === 2) {
+    routerInfoData.value.unlockMode = e.type;
   }
-  // 当为学习路径图时候 直接默认第一个选项 不用选中
-  if (e.type === 2 && props.types === 1) {
-    routerInfoData.value.unlockMode = e.type
+  if (routerInfoData.value.status !== 1 && props.types === 1) {
+    routerInfoData.value.unlockMode = e.type;
   }
+  // if (e.type === 1) {
+  //   routerInfoData.value.unlockMode = e.type;
+  // }
+  // // 当为学习路径图时候 直接默认第一个选项 不用选中
+  // if (e.type === 2 && props.types === 1) {
+  //   routerInfoData.value.unlockMode = e.type;
+  // }
 }
 
 const saveUnlock = () => {
-  emit("update:userInfo", routerInfoData.value)
+  emit("update:userInfo", routerInfoData.value);
   if (props.types === 2) {
-    editProjectModel(routerInfoData.value)
+    editProjectModel(routerInfoData.value);
   } else {
-    editRouterModel(routerInfoData.value)
+    editRouterModel(routerInfoData.value);
   }
-  closeDrawer()
-}
+  closeDrawer();
+};
 
 function updateLockMode(type) {
-  routerInfoData.value.unlockMode = type
+  console.log("22222", type);
+  routerInfoData.value.unlockMode = type;
 }
 
 function openDrawer() {
-  visible.value = true
+  visible.value = true;
 }
-
 </script>
 <style lang="scss">
 .unlockmode {

From 188670189320ec6317101826f5827e6d999c5cf5 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Thu, 23 Feb 2023 15:05:04 +0800
Subject: [PATCH 07/15] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E5=B0=81=E9=9D=A2=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawers/project/AddCertificate.vue        | 303 ++++++------------
 1 file changed, 97 insertions(+), 206 deletions(-)

diff --git a/src/components/drawers/project/AddCertificate.vue b/src/components/drawers/project/AddCertificate.vue
index 55fc84f3..ded1a160 100644
--- a/src/components/drawers/project/AddCertificate.vue
+++ b/src/components/drawers/project/AddCertificate.vue
@@ -1,42 +1,26 @@
 <template>
-  <a-drawer
-    :visible="ACertificate"
-    class="drawerStyle AddCertificate"
-    width="80%"
-    title="添加证书"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
-  >
+  <a-drawer :visible="ACertificate" class="drawerStyle AddCertificate" width="80%" title="添加证书" placement="right"
+    @after-visible-change="afterVisibleChange">
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">
           {{ ACertificateEditId ? "编辑" : "添加" }}证书
         </div>
-        <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../../assets/images/basicinfo/close.png"
+          @click="closeDrawer" />
       </div>
       <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">证书名称：</span>
             </div>
             <div class="btnbox">
-              <a-input
-                v-model:value="certificateName"
-                style="width: 400px; height: 40px; border-radius: 8px"
-                placeholder="请输入证书名称"
-                maxlength="20"
-              />
+              <a-input v-model:value="certificateName" style="width: 400px; height: 40px; border-radius: 8px"
+                placeholder="请输入证书名称" maxlength="20" />
             </div>
           </div>
 
@@ -63,28 +47,13 @@
           <div class="main_item" style="align-items: flex-start">
             <div class="signbox">
               <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">证书封面：</span>
             </div>
-            <div
-              class="btnbox"
-              style="flex-direction: column; align-items: flex-start"
-            >
-              <a-upload
-                v-model:file-list="fileList"
-                name="file"
-                style="width: 200px"
-                list-type="picture-card"
-                class="avatar-uploader"
-                :show-upload-list="false"
-                action="/manageApi/file/uploadFile"
-                @change="handleChange"
-                :before-upload="beforeUpload"
-              >
+            <div class="btnbox" style="flex-direction: column; align-items: flex-start">
+              <a-upload v-model:file-list="fileList" name="file" style="width: 200px" list-type="picture-card"
+                class="avatar-uploader" :show-upload-list="false" @change="handleChange" :before-upload="beforeUpload">
                 <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
                 <div v-else>
                   <loading-outlined v-if="loading"></loading-outlined>
@@ -102,90 +71,58 @@
               <span style="margin-right: 3px">证书说明：</span>
             </div>
             <div class="textarea" style="width: 400px">
-              <a-textarea
-                v-model:value="certificateRemark"
-                placeholder="请输入证书说明"
-                allow-clear
-                :rows="8"
-                show-count
-                :maxlength="200"
-              />
+              <a-textarea v-model:value="certificateRemark" placeholder="请输入证书说明" allow-clear :rows="8" show-count
+                :maxlength="200" />
             </div>
           </div>
 
           <div class="main_item" style="margin-bottom: 16px">
             <div class="signbox">
               <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
-              <span
-                style="
-                  margin-right: 3px;
-                  font-size: 16px;
-                  color: #333;
-                  font-size: 14px;
-                "
-                >设置获得条件</span
-              >
+              <span style="
+                                margin-right: 3px;
+                                font-size: 16px;
+                                color: #333;
+                                font-size: 14px;
+                              ">设置获得条件</span>
             </div>
             <div class="btnbox"></div>
           </div>
 
-          <div
-            class="main_item"
-            style="
-              border: 1px solid rgba(0, 0, 0, 0.1);
-              width: ;
-              margin-left: 35px;
-              padding-top: 30px;
-              margin-top: 0px;
-            "
-          >
+          <div class="main_item" style="
+                            border: 1px solid rgba(0, 0, 0, 0.1);
+                            width: ;
+                            margin-left: 35px;
+                            padding-top: 30px;
+                            margin-top: 0px;
+                          ">
             <div class="signbox" style="width: 30px">
-              <span
-                style="margin-right: 3px; font-size: 16px; color: #333"
-              ></span>
+              <span style="margin-right: 3px; font-size: 16px; color: #333"></span>
             </div>
             <div class="btnbox">
-              <a-radio-group
-                v-model:value="condition"
-                @change="selectCondition"
-              >
+              <a-radio-group v-model:value="condition" @change="selectCondition">
                 <a-radio v-model:checked="checked" :value="1">
                   完成项目
                   <a-popover>
                     <template #content>
-                      <div
-                        style="font-size: 12px; color: rgba(153, 153, 153, 1)"
-                      >
+                      <div style="font-size: 12px; color: rgba(153, 153, 153, 1)">
                         后续新增自动包括
                       </div>
                     </template>
-                    <img
-                      style="width: 16px; height: 16px"
-                      src="../../../assets/images/project/tishi.png"
-                    />
+                    <img style="width: 16px; height: 16px" src="../../../assets/images/project/tishi.png" />
                   </a-popover>
                 </a-radio>
 
                 <br />
-                <div
-                  style="
-                    height: 60px;
-                    margin-left: 24px;
-                    display: flex;
-                    align-items: center;
-                  "
-                >
-                  <a-radio-group
-                    v-model:value="large"
-                    size="small"
-                    @change="selectlarge"
-                    :disabled="condition !== 1"
-                  >
+                <div style="
+                                  height: 60px;
+                                  margin-left: 24px;
+                                  display: flex;
+                                  align-items: center;
+                                ">
+                  <a-radio-group v-model:value="large" size="small" @change="selectlarge" :disabled="condition !== 1">
                     <a-radio-button value="1">全部任务</a-radio-button>
                     <a-radio-button value="2">完成必修任务</a-radio-button>
                   </a-radio-group>
@@ -194,132 +131,84 @@
                   完成阶段
                 </a-radio>
                 <br />
-                <div
-                  style="
-                    height: 60px;
-                    margin-left: 24px;
-                    display: flex;
-                    align-items: center;
-                  "
-                >
-                  <a-select
-                    ref="select"
-                    size="small"
-                    placeholder="请选择阶段"
-                    v-model:value="selectStageName"
-                    style="width: 120px"
-                    @focus="focus"
-                    @change="selectStage"
-                    :options="stageList"
-                    :fieldNames="{
+                <div style="
+                                  height: 60px;
+                                  margin-left: 24px;
+                                  display: flex;
+                                  align-items: center;
+                                ">
+                  <a-select ref="select" size="small" placeholder="请选择阶段" v-model:value="selectStageName"
+                    style="width: 120px" @focus="focus" @change="selectStage" :options="stageList" :fieldNames="{
                       key: 'id',
                       title: 'name',
                       value: 'name',
-                    }"
-                    :disabled="condition !== 2"
-                  >
+                    }" :disabled="condition !== 2">
                   </a-select>
                 </div>
                 <a-radio v-model:checked="checked" :value="3">
                   完成任务
                 </a-radio>
                 <br />
-                <div
-                  style="
-                    height: 60px;
-                    margin-left: 24px;
-                    display: flex;
-                    align-items: center;
-                  "
-                >
-                  <a-select
-                    ref="select"
-                    size="small"
-                    placeholder="请选择任务"
-                    v-model:value="selectTaskName"
-                    style="width: 120px"
-                    @focus="focus"
-                    @change="selectTask"
-                    :options="taskList"
-                    :fieldNames="{
+                <div style="
+                                  height: 60px;
+                                  margin-left: 24px;
+                                  display: flex;
+                                  align-items: center;
+                                ">
+                  <a-select ref="select" size="small" placeholder="请选择任务" v-model:value="selectTaskName"
+                    style="width: 120px" @focus="focus" @change="selectTask" :options="taskList" :fieldNames="{
                       key: 'id',
                       title: 'name',
                       value: 'name',
-                    }"
-                    :disabled="condition !== 3"
-                  >
+                    }" :disabled="condition !== 3">
                   </a-select>
                 </div>
                 <a-radio v-model:checked="checked" :value="4">
                   考试合格
                 </a-radio>
                 <br />
-                <div
-                  style="
-                    height: 60px;
-                    margin-left: 24px;
-                    display: flex;
-                    align-items: center;
-                  "
-                >
-                  <a-select
-                    ref="select"
-                    size="small"
-                    placeholder="请选择考试"
-                    v-model:value="selectExamName"
-                    style="width: 120px"
-                    @focus="focus"
-                    @change="selectExam"
-                    :options="examList"
-                    :fieldNames="{
+                <div style="
+                                  height: 60px;
+                                  margin-left: 24px;
+                                  display: flex;
+                                  align-items: center;
+                                ">
+                  <a-select ref="select" size="small" placeholder="请选择考试" v-model:value="selectExamName"
+                    style="width: 120px" @focus="focus" @change="selectExam" :options="examList" :fieldNames="{
                       key: 'id',
                       title: 'name',
                       value: 'name',
-                    }"
-                    :disabled="condition !== 4"
-                  >
+                    }" :disabled="condition !== 4">
                   </a-select>
                 </div>
                 <a-radio v-model:checked="checked" :value="5">
                   获得积分
                 </a-radio>
                 <br />
-                <div
-                  style="
-                    height: 60px;
-                    margin-left: 24px;
-                    display: flex;
-                    align-items: center;
-                  "
-                >
-                  <div
-                    style="
-                      font-size: 14px;
-                      font-weight: 400;
-                      color: #333333;
-                      line-height: 20px;
-                      margin-right: 5px;
-                    "
-                  >
+                <div style="
+                                  height: 60px;
+                                  margin-left: 24px;
+                                  display: flex;
+                                  align-items: center;
+                                ">
+                  <div style="
+                                    font-size: 14px;
+                                    font-weight: 400;
+                                    color: #333333;
+                                    line-height: 20px;
+                                    margin-right: 5px;
+                                  ">
                     高于
                   </div>
-                  <a-input-number
-                    id="inputNumber"
-                    v-model:value="score"
-                    :min="1"
-                    :max="projectPoints"
-                    style="width: 70px"
-                    :disabled="condition !== 5"
-                  />
-                  <div
-                    style="
-                      font-size: 14px;
-                      font-weight: 400;
-                      color: #333333;
-                      line-height: 20px;
-                      margin-left: 5px;
-                    "
-                  >
+                  <a-input-number id="inputNumber" v-model:value="score" :min="1" :max="projectPoints" style="width: 70px"
+                    :disabled="condition !== 5" />
+                  <div style="
+                                    font-size: 14px;
+                                    font-weight: 400;
+                                    color: #333333;
+                                    line-height: 20px;
+                                    margin-left: 5px;
+                                  ">
                     分可获得，当前项目积分为 {{ projectPoints }} 分
                   </div>
                 </div>
@@ -708,14 +597,14 @@ export default {
           state.condition == 1
             ? state.large
             : state.condition == 2
-            ? state.selectStageId
-            : state.condition == 3
-            ? state.selectTaskId
-            : state.condition == 4
-            ? state.selectExamId
-            : state.condition == 5
-            ? state.score
-            : "",
+              ? state.selectStageId
+              : state.condition == 3
+                ? state.selectTaskId
+                : state.condition == 4
+                  ? state.selectExamId
+                  : state.condition == 5
+                    ? state.score
+                    : "",
         type: 1,
       };
       if (props.ACertificateEdit) {
@@ -853,6 +742,7 @@ export default {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
+
           .textarea {
             width: 400px;
 
@@ -874,6 +764,7 @@ export default {
               border-radius: 8px;
             }
           }
+
           .signbox {
             width: 120px;
             display: flex;

From d2f26725f37ef559434a38c2c12adfa0991cf166 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Thu, 23 Feb 2023 15:10:23 +0800
Subject: [PATCH 08/15] =?UTF-8?q?fix:=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawers/project/AddCertificate.vue        | 98 +++++++++----------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/components/drawers/project/AddCertificate.vue b/src/components/drawers/project/AddCertificate.vue
index ded1a160..76f49710 100644
--- a/src/components/drawers/project/AddCertificate.vue
+++ b/src/components/drawers/project/AddCertificate.vue
@@ -53,7 +53,7 @@
             </div>
             <div class="btnbox" style="flex-direction: column; align-items: flex-start">
               <a-upload v-model:file-list="fileList" name="file" style="width: 200px" list-type="picture-card"
-                class="avatar-uploader" :show-upload-list="false" @change="handleChange" :before-upload="beforeUpload">
+                class="avatar-uploader" :show-upload-list="false" :before-upload="beforeUpload">
                 <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
                 <div v-else>
                   <loading-outlined v-if="loading"></loading-outlined>
@@ -82,22 +82,22 @@
                 <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="
-                                margin-right: 3px;
-                                font-size: 16px;
-                                color: #333;
-                                font-size: 14px;
-                              ">设置获得条件</span>
+                                      margin-right: 3px;
+                                      font-size: 16px;
+                                      color: #333;
+                                      font-size: 14px;
+                                    ">设置获得条件</span>
             </div>
             <div class="btnbox"></div>
           </div>
 
           <div class="main_item" style="
-                            border: 1px solid rgba(0, 0, 0, 0.1);
-                            width: ;
-                            margin-left: 35px;
-                            padding-top: 30px;
-                            margin-top: 0px;
-                          ">
+                                  border: 1px solid rgba(0, 0, 0, 0.1);
+                                  width: ;
+                                  margin-left: 35px;
+                                  padding-top: 30px;
+                                  margin-top: 0px;
+                                ">
             <div class="signbox" style="width: 30px">
               <span style="margin-right: 3px; font-size: 16px; color: #333"></span>
             </div>
@@ -117,11 +117,11 @@
 
                 <br />
                 <div style="
-                                  height: 60px;
-                                  margin-left: 24px;
-                                  display: flex;
-                                  align-items: center;
-                                ">
+                                        height: 60px;
+                                        margin-left: 24px;
+                                        display: flex;
+                                        align-items: center;
+                                      ">
                   <a-radio-group v-model:value="large" size="small" @change="selectlarge" :disabled="condition !== 1">
                     <a-radio-button value="1">全部任务</a-radio-button>
                     <a-radio-button value="2">完成必修任务</a-radio-button>
@@ -132,11 +132,11 @@
                 </a-radio>
                 <br />
                 <div style="
-                                  height: 60px;
-                                  margin-left: 24px;
-                                  display: flex;
-                                  align-items: center;
-                                ">
+                                        height: 60px;
+                                        margin-left: 24px;
+                                        display: flex;
+                                        align-items: center;
+                                      ">
                   <a-select ref="select" size="small" placeholder="请选择阶段" v-model:value="selectStageName"
                     style="width: 120px" @focus="focus" @change="selectStage" :options="stageList" :fieldNames="{
                       key: 'id',
@@ -150,11 +150,11 @@
                 </a-radio>
                 <br />
                 <div style="
-                                  height: 60px;
-                                  margin-left: 24px;
-                                  display: flex;
-                                  align-items: center;
-                                ">
+                                        height: 60px;
+                                        margin-left: 24px;
+                                        display: flex;
+                                        align-items: center;
+                                      ">
                   <a-select ref="select" size="small" placeholder="请选择任务" v-model:value="selectTaskName"
                     style="width: 120px" @focus="focus" @change="selectTask" :options="taskList" :fieldNames="{
                       key: 'id',
@@ -168,11 +168,11 @@
                 </a-radio>
                 <br />
                 <div style="
-                                  height: 60px;
-                                  margin-left: 24px;
-                                  display: flex;
-                                  align-items: center;
-                                ">
+                                        height: 60px;
+                                        margin-left: 24px;
+                                        display: flex;
+                                        align-items: center;
+                                      ">
                   <a-select ref="select" size="small" placeholder="请选择考试" v-model:value="selectExamName"
                     style="width: 120px" @focus="focus" @change="selectExam" :options="examList" :fieldNames="{
                       key: 'id',
@@ -186,29 +186,29 @@
                 </a-radio>
                 <br />
                 <div style="
-                                  height: 60px;
-                                  margin-left: 24px;
-                                  display: flex;
-                                  align-items: center;
-                                ">
+                                        height: 60px;
+                                        margin-left: 24px;
+                                        display: flex;
+                                        align-items: center;
+                                      ">
                   <div style="
-                                    font-size: 14px;
-                                    font-weight: 400;
-                                    color: #333333;
-                                    line-height: 20px;
-                                    margin-right: 5px;
-                                  ">
+                                          font-size: 14px;
+                                          font-weight: 400;
+                                          color: #333333;
+                                          line-height: 20px;
+                                          margin-right: 5px;
+                                        ">
                     高于
                   </div>
                   <a-input-number id="inputNumber" v-model:value="score" :min="1" :max="projectPoints" style="width: 70px"
                     :disabled="condition !== 5" />
                   <div style="
-                                    font-size: 14px;
-                                    font-weight: 400;
-                                    color: #333333;
-                                    line-height: 20px;
-                                    margin-left: 5px;
-                                  ">
+                                          font-size: 14px;
+                                          font-weight: 400;
+                                          color: #333333;
+                                          line-height: 20px;
+                                          margin-left: 5px;
+                                        ">
                     分可获得，当前项目积分为 {{ projectPoints }} 分
                   </div>
                 </div>

From cc8a32b59412e026302d3751abb6aadbe69d0bfb Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Thu, 23 Feb 2023 15:18:48 +0800
Subject: [PATCH 09/15] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=A4=96=E9=83=A8=E8=80=83=E8=AF=95=E6=88=90?=
 =?UTF-8?q?=E7=BB=A9=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.boe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.boe b/.env.boe
index 8734a622..9f76927b 100644
--- a/.env.boe
+++ b/.env.boe
@@ -9,7 +9,7 @@ VUE_APP_BOE_API_URL=//u-pre.boe.com
 # 导入学员模板
 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
 # 外部考试导入成绩模板
-VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=外部考试学员成绩导入模板-1676551319283.xlsx
+VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=coursefile/外部考试学员成绩导入模板-1676551319283.xlsx
 #在线
 VITE_BOE_ONLINE_CLASS_URL=//u-pre.boe.com/pc/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id=

From 64ac1ead114466485c2cded61a79876a2499ffbf Mon Sep 17 00:00:00 2001
From: peiqingliu <1226880979@qq.com>
Date: Thu, 23 Feb 2023 16:17:06 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddTest.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 24f1692e..1c8e15fd 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -437,6 +437,7 @@ const disabledDate = (current) => {
 
 // 系统考试
 async function confirm() {
+  debugger
   await validate().catch(({errorFields}) => {
     message.warning(errorFields[0].errors.join());
     throw Error("数据校验不通过")
@@ -447,7 +448,7 @@ async function confirm() {
   } else {
     const data = props.taskList[taskIndex.value]
     data.name = formData.value.examinationName
-    data.info = formData.value
+    data.info = {...formData.value}
   }
   emit('update:taskList', [...props.taskList])
   closeDrawer()

From a8600a3c63b8551370dae44ccd20cac96ec6afba Mon Sep 17 00:00:00 2001
From: peiqingliu <1226880979@qq.com>
Date: Thu, 23 Feb 2023 16:20:34 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E5=88=87=E6=8D=A2=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddTest.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 1c8e15fd..78cccd04 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -20,7 +20,6 @@
       <div style="display: flex; flex-direction: row; padding-top: 0px; margin-top: 20px; margin-left: 32px;">
         <div>
           <button
-                  :disabled="taskIndex >= 0"
               style="width: 100px; cursor: pointer;"
               @click="changeOuter(1)"
               :class="formData.examType === 1  ? 'outer' : 'notOuter'"
@@ -468,6 +467,9 @@ const delTag = () => {
 }
 
 function changeOuter(v) {
+  if (taskIndex.value >= 0) {
+    return message.warn("编辑状态不允许切换。")
+  }
   formData.value.examType = v;
 }
 

From 4cac5b25eb27b77e4a782efca95936b8e36ac2b0 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Thu, 23 Feb 2023 16:29:32 +0800
Subject: [PATCH 12/15] =?UTF-8?q?fix:=E5=AF=BC=E5=85=A5=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.boe                                 |   4 +-
 src/components/student/CommonStudent.vue | 281 ++++++-----------------
 2 files changed, 72 insertions(+), 213 deletions(-)

diff --git a/.env.boe b/.env.boe
index 9f76927b..2f955f9d 100644
--- a/.env.boe
+++ b/.env.boe
@@ -7,9 +7,9 @@ VUE_APP_LOGIN_URL=//u-pre.boe.com/web
 VUE_APP_BOE_API_URL=//u-pre.boe.com
 
 # 导入学员模板
-VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
+VUE_APP_UP_LOAD_STUDENT_TEMPLATE=coursefile/导入学员模版-1677140876274.xlsx 
 # 外部考试导入成绩模板
-VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=coursefile/外部考试学员成绩导入模板-1676551319283.xlsx
+VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=coursefile/外部考试学员成绩导入模板-1677055614438.xlsx
 #在线
 VITE_BOE_ONLINE_CLASS_URL=//u-pre.boe.com/pc/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id=
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 7d165707..d20c487a 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -2,22 +2,14 @@
 <!-- eslint-disable vue/require-v-for-key -->
 <template>
   <div class="CommonStudent">
-    <a-drawer
-      :visible="visiable"
-      class="drawerStyle ProjCheckship CommonStudent"
-      placement="right"
-      width="60%"
-    >
+    <a-drawer :visible="visiable" class="drawerStyle ProjCheckship CommonStudent" placement="right" width="60%">
       <div class="drawerMain" id="ProjCheckship" style="">
         <div class="header">
           <div class="headerTitle">
             {{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || title }}
           </div>
-          <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
-          />
+          <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer" />
         </div>
         <div style="display: flex; overflow-x: auto; overflow-y: auto">
           <div class="tabs" style="min-width: 800px">
@@ -26,38 +18,22 @@
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div>
                     <a-form-item label="姓名：">
-                      <a-input
-                        v-model:value="proStudentName"
-                        style="width: 260px; height: 40px; border-radius: 8px"
-                        placeholder="请输入姓名"
-                      />
-                      <a-button
-                        type="primary"
-                        @click="getStu"
-                        style="margin-left: 20px; border-radius: 4px"
-                      >
+                      <a-input v-model:value="proStudentName" style="width: 260px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名" />
+                      <a-button type="primary" @click="getStu" style="margin-left: 20px; border-radius: 4px">
                         <template #icon>
                           <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button
-                        @click="getStu"
-                        style="margin-left: 20px; border-radius: 4px"
-                        >重置
+                      <a-button @click="getStu" style="margin-left: 20px; border-radius: 4px">重置
                       </a-button>
                     </a-form-item>
                   </div>
                   <div class="tableBox tabb">
-                    <a-table
-                      style="border: 1px solid #f2f6fe; width: 800px"
-                      row-key="id"
-                      :columns="stuColumns"
-                      :data-source="projectList"
-                      :loading="projectListTotal"
-                      :pagination="projectPagination"
-                      :row-selection="projectRowSelection"
-                    />
+                    <a-table style="border: 1px solid #f2f6fe; width: 800px" row-key="id" :columns="stuColumns"
+                      :data-source="projectList" :loading="projectListTotal" :pagination="projectPagination"
+                      :row-selection="projectRowSelection" />
                   </div>
                 </div>
               </a-tab-pane>
@@ -65,75 +41,41 @@
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div class="tab1">
                     <a-form-item label="姓名">
-                      <a-input
-                        v-model:value="nameSearch.keyword"
-                        style="width: 270px; height: 40px; border-radius: 8px"
-                        placeholder="请输入姓名"
-                        @change="peopleName"
-                      />
-                      <a-button
-                        type="primary"
-                        @click="onSearchStu"
-                        style="margin-left: 20px; border-radius: 4px"
-                      >
+                      <a-input v-model:value="nameSearch.keyword" style="width: 270px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名" @change="peopleName" />
+                      <a-button type="primary" @click="onSearchStu" style="margin-left: 20px; border-radius: 4px">
                         <template #icon>
                           <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button
-                        @click="resetStu"
-                        style="margin-left: 20px; border-radius: 4px"
-                        >重置
+                      <a-button @click="resetStu" style="margin-left: 20px; border-radius: 4px">重置
                       </a-button>
                     </a-form-item>
                   </div>
-                  <div
-                    class="chooseLeft"
-                    style="display: grid; grid-template-columns: 250px auto"
-                  >
-                    <div
-                      :style="{
-                        height: screenHeight - 180 + 'px',
-                        overflowY: 'auto',
-                      }"
-                      style="border: 1px solid #f0f0f0"
-                    >
+                  <div class="chooseLeft" style="display: grid; grid-template-columns: 250px auto">
+                    <div :style="{
+                      height: screenHeight - 180 + 'px',
+                      overflowY: 'auto',
+                    }" style="border: 1px solid #f0f0f0">
                       <div class="tree" style="margin: 10px 4px 220px 10px">
-                        <a-tree
-                          allow-clear
-                          tree-default-expand-all
-                          :tree-data="treeData"
-                          :loading="orgLoading"
-                          :load-data="onLoadData"
-                          v-model:selectedKeys="stuTreeSelectKeys"
-                          v-model:expandedKeys="stuTreeExpandedKeys"
-                          :fieldNames="{
+                        <a-tree allow-clear tree-default-expand-all :tree-data="treeData" :loading="orgLoading"
+                          :load-data="onLoadData" v-model:selectedKeys="stuTreeSelectKeys"
+                          v-model:expandedKeys="stuTreeExpandedKeys" :fieldNames="{
                             children: 'treeChildList',
                             key: 'id',
                             title: 'name',
                             value: 'name',
-                          }"
-                          @select="stuStuOrgSelect"
-                        >
+                          }" @select="stuStuOrgSelect">
                         </a-tree>
                       </div>
                     </div>
-                    <div
-                      class="tableBox tabb"
-                      style="
-                        margin: 0px 4px 120px 10px;
-                        border: 1px solid #f0f0f0;
-                      "
-                    >
-                      <a-table
-                        :columns="stuColumns"
-                        :data-source="stuData"
-                        :pagination="stuPagination"
-                        :loading="stuLoading"
-                        row-key="id"
-                        :row-selection="stuRowSelection"
-                      />
+                    <div class="tableBox tabb" style="
+                                    margin: 0px 4px 120px 10px;
+                                    border: 1px solid #f0f0f0;
+                                  ">
+                      <a-table :columns="stuColumns" :data-source="stuData" :pagination="stuPagination"
+                        :loading="stuLoading" row-key="id" :row-selection="stuRowSelection" />
                     </div>
                   </div>
                 </div>
@@ -142,44 +84,26 @@
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div class="tab2">
                     <a-form-item label="组织：">
-                      <a-input
-                        v-model:value="searchOrgName.keyword"
-                        style="width: 230px; height: 40px; border-radius: 8px"
-                        placeholder="请输入组织"
-                      />
-                      <a-button
-                        type="primary"
-                        @click="searchOrg"
-                        style="margin-left: 20px; border-radius: 4px"
-                      >
+                      <a-input v-model:value="searchOrgName.keyword"
+                        style="width: 230px; height: 40px; border-radius: 8px" placeholder="请输入组织" />
+                      <a-button type="primary" @click="searchOrg" style="margin-left: 20px; border-radius: 4px">
                         <template #icon>
                           <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button
-                        @click="resetOrg"
-                        style="margin-left: 20px; border-radius: 4px"
-                        >重置
+                      <a-button @click="resetOrg" style="margin-left: 20px; border-radius: 4px">重置
                       </a-button>
                     </a-form-item>
                   </div>
                   <div class="boeTree">
-                    <a-tree
-                      :tree-data="searchOrgName.keyword ? orgData : treeOrgData"
-                      @select="onOrgSelectChange"
-                      :loading="orgOrgLoading"
-                      :load-data="onLoadOrgData"
-                      :fieldNames="{
+                    <a-tree :tree-data="searchOrgName.keyword ? orgData : treeOrgData" @select="onOrgSelectChange"
+                      :loading="orgOrgLoading" :load-data="onLoadOrgData" :fieldNames="{
                         children: 'treeChildList',
                         key: 'id',
                         title: 'name',
                         value: 'name',
-                      }"
-                      row-key="id"
-                      :row-selection="orgRowSelection"
-                      multiple
-                    >
+                      }" row-key="id" :row-selection="orgRowSelection" multiple>
                     </a-tree>
                   </div>
                 </div>
@@ -188,38 +112,22 @@
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div>
                     <a-form-item label="受众名称：">
-                      <a-input
-                        v-model:value="audienceName.keyword"
-                        style="width: 260px; height: 40px; border-radius: 8px"
-                        placeholder="请输入受众名称"
-                      />
-                      <a-button
-                        type="primary"
-                        @click="searchAudi"
-                        style="margin-left: 20px; border-radius: 4px"
-                      >
+                      <a-input v-model:value="audienceName.keyword" style="width: 260px; height: 40px; border-radius: 8px"
+                        placeholder="请输入受众名称" />
+                      <a-button type="primary" @click="searchAudi" style="margin-left: 20px; border-radius: 4px">
                         <template #icon>
                           <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button
-                        @click="resetAudienceInfo"
-                        style="margin-left: 20px; border-radius: 4px"
-                        >重置
+                      <a-button @click="resetAudienceInfo" style="margin-left: 20px; border-radius: 4px">重置
                       </a-button>
                     </a-form-item>
                   </div>
                   <div class="tableBox tabb">
-                    <a-table
-                      style="border: 1px solid #f2f6fe; width: 800px"
-                      row-key="id"
-                      :columns="audiColums"
-                      :data-source="audiData"
-                      :loading="audiLoading"
-                      :pagination="auditPagination"
-                      :row-selection="auditRowSelection"
-                    />
+                    <a-table style="border: 1px solid #f2f6fe; width: 800px" row-key="id" :columns="audiColums"
+                      :data-source="audiData" :loading="audiLoading" :pagination="auditPagination"
+                      :row-selection="auditRowSelection" />
                   </div>
                 </div>
               </a-tab-pane>
@@ -231,16 +139,10 @@
                 <div class="already">已选</div>
               </div>
             </div>
-            <div
-              :style="{ 'max-height': screenHeight - 235 + 'px' }"
-              style="overflow-y: auto"
-            >
+            <div :style="{ 'max-height': screenHeight - 235 + 'px' }" style="overflow-y: auto">
               <div class="selecteds" v-if="isGroup">
                 <div class="person">项目内学员</div>
-                <div
-                  v-for="(item, i) in selectsData.projectMemberList"
-                  :key="i"
-                >
+                <div v-for="(item, i) in selectsData.projectMemberList" :key="i">
                   <div v-if="i < 11">
                     <div class="chose">
                       {{ item.realName }}
@@ -256,16 +158,10 @@
                     </div>
                   </div>
                 </div>
-                <div
-                  v-if="!member && selectsData.projectMemberList?.length > 10"
-                  class="ifsw"
-                >
+                <div v-if="!member && selectsData.projectMemberList?.length > 10" class="ifsw">
                   <div @click="member = !member" class="“sw”">查看更多></div>
                 </div>
-                <div
-                  v-if="member && selectsData.projectMemberList?.length > 10"
-                  class="ifsw"
-                >
+                <div v-if="member && selectsData.projectMemberList?.length > 10" class="ifsw">
                   <div @click="member = !member" class="sw">收起&lt;</div>
                 </div>
               </div>
@@ -287,16 +183,10 @@
                     </div>
                   </div>
                 </div>
-                <div
-                  v-if="!person && selectsData.studentList.length > 10"
-                  class="ifsw"
-                >
+                <div v-if="!person && selectsData.studentList.length > 10" class="ifsw">
                   <div @click="person = !person" class="“sw”">查看更多></div>
                 </div>
-                <div
-                  v-if="person && selectsData.studentList.length > 10"
-                  class="ifsw"
-                >
+                <div v-if="person && selectsData.studentList.length > 10" class="ifsw">
                   <div @click="person = !person" class="sw">收起&lt;</div>
                 </div>
               </div>
@@ -318,16 +208,10 @@
                     </div>
                   </div>
                 </div>
-                <div
-                  v-if="!dept && selectsData.deptList.length > 10"
-                  class="ifsw"
-                >
+                <div v-if="!dept && selectsData.deptList.length > 10" class="ifsw">
                   <div @click="dept = !dept" class="“sw”">查看更多></div>
                 </div>
-                <div
-                  v-if="dept && selectsData.deptList.length > 10"
-                  class="ifsw"
-                >
+                <div v-if="dept && selectsData.deptList.length > 10" class="ifsw">
                   <div @click="dept = !dept" class="sw">收起&lt;</div>
                 </div>
               </div>
@@ -350,10 +234,7 @@
                     </div>
                   </div>
                 </div>
-                <div
-                  v-if="!group && selectsData.groupList.length > 10"
-                  class="ifsw"
-                >
+                <div v-if="!group && selectsData.groupList.length > 10" class="ifsw">
                   <div @click="group = !group" class="“sw”">查看更多></div>
                 </div>
                 <div v-if="group && selectsData.groupList > 10" class="ifsw">
@@ -369,17 +250,12 @@
         </div>
       </div>
     </a-drawer>
-    <a-button @click="openDrawer" type="link"><slot></slot></a-button>
+    <a-button @click="openDrawer" type="link">
+      <slot></slot>
+    </a-button>
   </div>
-  <a-modal
-    :style="{ padding: 0, position: relative, right: '-20%' }"
-    :closable="true"
-    :visible="stageVisible"
-    :footer="null"
-    centered="true"
-    @ok="handleStageOk"
-    wrapClassName="changeModal"
-  >
+  <a-modal :style="{ padding: 0, position: relative, right: '-20%' }" :closable="true" :visible="stageVisible"
+    :footer="null" centered="true" @ok="handleStageOk" wrapClassName="changeModal">
     <div class="con">
       <div class="header">
         <div class="inhe">
@@ -391,36 +267,18 @@
         <div class="inher">
           <!-- <div class="cur">当前关卡：关卡2</div> -->
           <div class="select">
-            <a-select
-              style="width: 400px"
-              :placeholder="type === 1 ? '选择阶段' : '选择关卡'"
-              v-model:value="selectsData.stageId"
-              className="cus-select"
-            >
-              <a-select-option
-                v-for="(item, i) in stageIds"
-                :key="i"
-                :value="item.id"
-                >{{ item.name || "默认" }}
+            <a-select style="width: 400px" :placeholder="type === 1 ? '选择阶段' : '选择关卡'" v-model:value="selectsData.stageId"
+              className="cus-select">
+              <a-select-option v-for="(item, i) in stageIds" :key="i" :value="item.id">{{ item.name || "默认" }}
               </a-select-option>
             </a-select>
           </div>
-          <span style="color: #999999; margin-left: 10px"
-            ><minus-circle-outlined />已在其他关卡的学员，不会被添加到该关卡</span
-          >
+          <span style="color: #999999; margin-left: 10px"><minus-circle-outlined />已在其他关卡的学员，不会被添加到该关卡</span>
           <div class="btn" style="margin-top: 50px">
-            <button
-              class="sameb btn1"
-              @click="closeChangeModal"
-              style="cursor: pointer"
-            >
+            <button class="sameb btn1" @click="closeChangeModal" style="cursor: pointer">
               取消
             </button>
-            <button
-              class="sameb btn2"
-              @click="handleStageOk"
-              style="cursor: pointer"
-            >
+            <button class="sameb btn2" @click="handleStageOk" style="cursor: pointer">
               确定
             </button>
           </div>
@@ -430,7 +288,7 @@
   </a-modal>
 </template>
 <script setup>
-  import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
 import { computed, defineEmits, defineProps, ref, watch } from "vue";
 import { boeRequest, useBoeApi, useBoeApiPage } from "@/api/request";
 import {
@@ -801,10 +659,11 @@ function stuDel(i) {
   selectsData.value.studentList.splice(i, 1);
 }
 
-// function orgDel(i) {
-//   orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
-//   selectsData.value.deptList.splice(i, 1)
-// }
+function orgDel(i) {
+  orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
+  selectsData.value.deptList.splice(i, 1)
+}
+
 function AuditDel(i) {
   auditSelectKeys.value = auditSelectKeys.value.filter(
     (e) => e !== selectsData.value.groupList[i].id
@@ -898,7 +757,7 @@ const submitAuth = () => {
 
 function handleStageOk() {
   // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
-  if(props.type === 1){
+  if (props.type === 1) {
     if (props.groupMemberCount < selectsData.value.studentList.length + props.groupMemberNumber) {
       return message.warning("添加小组学员超过最大值");
     }

From c3535defb375d8fdca1b67acdcaf2266bce338fb Mon Sep 17 00:00:00 2001
From: peiqingliu <1226880979@qq.com>
Date: Thu, 23 Feb 2023 16:30:28 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E9=95=BF=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E9=87=8D=E5=A4=8D=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskPage.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index e027a29a..8f594e24 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3851,6 +3851,11 @@ export default {
     };
     //创建小组
     const createGroup = async () => {
+      console.log("state.groupPageList"+ state.groupPageList)
+      const d = state.groupPageList.filter(item => item.leaderId === state.groupInfo.leaderId);
+      if(d.length > 0) {
+        return message.warn(d[0].leaderName+"已是小组长，请重新选择");
+      }
       const id = state.groupInfo.id
       await editGroup({...state.groupInfo,projectId:state.projectId})
       message.success(id?'小组编辑成功':"小组创建成功");

From 8a1dd3880a6b86d1755700ab345a5b607e82119b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 23 Feb 2023 17:03:51 +0800
Subject: [PATCH 14/15] -- fix bug

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

diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index 03d5dd3e..e8773f9e 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -27,7 +27,7 @@
   </a-tree-select>
 </template>
 <script setup>
-import { defineEmits, defineProps, ref, watch } from "vue";
+import {defineEmits, defineProps, ref, watch} from "vue";
 import {boeRequest, useBoeApi} from "@/api/request";
 import { ORG_CHILD_LIST, ORG_LIST } from "@/api/ThirdApi";
 
@@ -41,7 +41,7 @@ const props = defineProps({
 });
 const emit = defineEmits({});
 const stuTreeExpandedKeys = ref([]);
-const labelValue = ref({});
+const labelValue = ref({ value: props.value, label: props.name });
 const { data: options, loading: orgLoading } = useBoeApi(
   ORG_LIST,
   { keyword: "" },

From 9f6e0a97104afc1545ee87abb207e5ab5e20f6c0 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Thu, 23 Feb 2023 17:05:22 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ActiveAttendance.vue |  2 +-
 src/components/drawers/AddActive.vue        | 10 +++++-----
 src/components/drawers/AddCase.vue          |  1 +
 src/components/drawers/AddFaceteach.vue     |  3 ++-
 src/components/drawers/AddHomework.vue      | 10 +++++-----
 src/components/drawers/AddLive.vue          | 10 +++++-----
 src/components/drawers/AddProject.vue       |  3 +++
 src/components/drawers/AssessmentAll.vue    |  3 +++
 src/components/drawers/ProjectScore.vue     |  2 +-
 9 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index a294b35c..9de9e876 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -17,7 +17,7 @@
       </div>
       <div class="centermain">
         <div class="titl">
-          <div class="endtime">
+          <div class="endtime">{{datasource}}
             起止时间：{{
               datasource && datasource.startTime ? datasource.startTime : "-"
             }}
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 9219faf1..8f668a16 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -53,7 +53,7 @@
             <div class="btnbox">
               <a-range-picker
                   :disabled-date="disabledDate"
-                  :disabled-time="disabledRangeTime"
+                 
                   :show-time="{ format: 'HH:mm' }"
                   format="YYYY-MM-DD HH:mm"
                   style="width: 400px; height: 40px; border-radius: 8px"
@@ -274,14 +274,14 @@ const closeDrawer = () => {
   dateTime.value = []
   resetFields()
 };
-
+/** 
 const range = (start, end) => {
   const result = [];
   for (let i = start; i < end; i++) {
     result.push(i);
   }
   return result;
-};
+};*/
 
 function timeChange(time, timeStr) {
   formData.value.activityStartTime = timeStr[0]
@@ -291,14 +291,14 @@ function timeChange(time, timeStr) {
 const disabledDate = (current) => {
   return current && current < dayjs().startOf('day');
 };
-
+/** 
 const disabledRangeTime = () => ({
   // disabledHours: () => range(0, 24).splice(4, 20),
   disabledMinutes: () => range(30, 60),
   disabledSeconds: () => [55, 56],
 });
 
-
+*/
 async function confirm() {
   // debugger
   await validate().catch(({errorFields}) => {
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index eb4a3a92..7b344437 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -175,6 +175,7 @@ function reset() {
   selectsData.value = [];
   params.value.pageIndex = 1
   params.value.keyWord = ''
+  params.value.authorName = ''
   fetch()
 }
 
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 046e16fc..a1b2a248 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -105,7 +105,8 @@
             <div class="select">
               <a-range-picker style="width: 400px;"
                               :show-time="{ format: 'HH:mm' }"
-                              :disabled-date="disabledDate" :disabled-time="disabledRangeTime"
+                              :disabled-date="disabledDate" 
+                             
                               format="YYYY/MM/DD HH:mm"
                               v-model:value="chooseTime"
                               :placeholder="['      开始时间', '        结束时间']"
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index f7409852..201ee932 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -44,7 +44,7 @@
                   style="width: 400px; height: 40px; border-radius: 8px"
                   :show-time="{ format: 'hh:mm' }"
                   :disabled-date="disabledDate"
-                  :disabled-time="disabledRangeTime"
+                 
                   v-model:value="dateTime"
                   format="YYYY-MM-DD HH:mm"
                   @change="timeChange"
@@ -107,7 +107,7 @@ const closeDrawer = () => {
   formData.value = {}
   dateTime.value = []
 };
-
+/**
 const range = (start, end) => {
   const result = [];
   for (let i = start; i < end; i++) {
@@ -115,7 +115,7 @@ const range = (start, end) => {
   }
   return result;
 };
-
+*/
 function timeChange(time, timeStr) {
   formData.value.submitStartTime = timeStr[0]
   formData.value.submitEndTime = timeStr[1]
@@ -124,13 +124,13 @@ function timeChange(time, timeStr) {
 const disabledDate = (current) => {
   return current && current < dayjs().startOf('day');
 };
-
+/**
 const disabledRangeTime = () => ({
   disabledHours: () => range(0, 24).splice(4, 20),
   disabledMinutes: () => range(30, 60),
   disabledSeconds: () => [55, 56],
 });
-
+ */
 function confirm() {
   if (taskIndex.value === -1) {
     const list = props.taskList
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 2683c336..7c46804a 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -76,7 +76,7 @@
               <a-range-picker
                 :show-time="{ format: 'HH:mm' }"
                 :disabled-date="disabledDate"
-                :disabled-time="disabledRangeTime"
+               
                 style="width: 400px; height: 40px; border-radius: 8px"
                 v-model:value="dateTime"
                 format="YYYY-MM-DD HH:mm"
@@ -433,7 +433,7 @@ const closeDrawer = () => {
   dateTime.value = [];
   resetFields();
 };
-
+/** 
 const range = (start, end) => {
   const result = [];
   for (let i = start; i < end; i++) {
@@ -441,7 +441,7 @@ const range = (start, end) => {
   }
   return result;
 };
-
+*/
 function timeChange(time, timeStr) {
   formData.value.liveStartTime = timeStr[0];
   formData.value.liveEndTime = timeStr[1];
@@ -450,13 +450,13 @@ function timeChange(time, timeStr) {
 const disabledDate = (current) => {
   return current && current < dayjs().startOf("day");
 };
-
+/**
 const disabledRangeTime = () => ({
   // disabledHours: () => range(0, 24).splice(4, 20),
   disabledMinutes: () => range(30, 60),
   disabledSeconds: () => [55, 56],
 });
-
+ */
 async function confirm() {
   // debugger;
   console.log("确定按钮:");
diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index 20a29050..5130f258 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -291,6 +291,9 @@ function reset() {
   selectsData.value = [];
   params.value.pageNo = 1
   params.value.keyWord = ''
+  params.value.createName = ''
+  params.value.manager = ''
+  params.value.name = ''
   fetch()
 }
 
diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue
index eb30f68a..a4cf1020 100644
--- a/src/components/drawers/AssessmentAll.vue
+++ b/src/components/drawers/AssessmentAll.vue
@@ -180,6 +180,7 @@ function reset() {
   selectsData.value = [];
   params.value.pageIndex = 1;
   params.value.keyWord = "";
+  params.value.assessmentName ="";
   fetch();
 }
 
@@ -231,6 +232,8 @@ const goResearchmanage = () => {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 20px;
+          margin-bottom: 20px;
 
           .fi_input {
             margin-right: 20px;
diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue
index 0dbdfae2..99f35d88 100644
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -360,7 +360,7 @@ export default {
           className: "h",
         },
         {
-          title: "证书",
+          title: "已获得积分",
           dataIndex: "diploma",
           key: "diploma",
           width: 40,