Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/components/drawers/CheckStu.vue

src/api/index1.js

@@ -220,6 +220,8 @@ export const cancelOrAuth = (obj) => http.post('/admin/certificate/cancelOrAuth'
 export const allPoints = (obj) => http.get('/points/project/allPoints', { params: obj })
 export const updateStuCert = (obj) => http.post('/admin/certificate/updateStuCert', obj)
 
+//添加外部考试
+export const createExamination = (obj) => http.post('/examination/createExamination', obj)
 // 外部考试导入成绩
 export const ImportExternalExamScore = (obj) => http.post('/admin/external/exam/manage/importExternalExamScore', obj, { headers: { "Content-Type": "multipart/form-data" } })
 //分组

src/components/drawers/AddLive.vue

@@ -3,151 +3,91 @@
   <div @click="openDrawer">
     <slot></slot>
   </div>
-  <a-drawer
+  <a-drawer :visible="visible" class="drawerStyle addliveDrawer" width="1000" title="添加直播" placement="right">
-    :visible="visible"
-    class="drawerStyle addliveDrawer"
-    width="1000"
-    title="添加直播"
-    placement="right"
-  >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">
           {{ taskIndex >= 0 ? "编辑" : "添加" }}直播
         </div>
-        <img
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          style="width: 29px; height: 29px; cursor: pointer"
+          @click="closeDrawer" />
-          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
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">直播名称：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input v-model:value="formData.liveName" style="width: 400px; height: 40px; border-radius: 8px"
-                v-model:value="formData.liveName"
+                placeholder="请输入直播名称" :maxlength="20" />
-                style="width: 400px; height: 40px; border-radius: 8px"
-                placeholder="请输入直播名称"
-                :maxlength="20"
-              />
             </div>
           </div>
           <div class="main_item" style="margin-top: -10px">
             <div class="signbox">
               <div class="asterisk_icon">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">直播链接：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input v-model:value="formData.liveLink" style="width: 400px; height: 40px; border-radius: 8px"
-                v-model:value="formData.liveLink"
+                placeholder="请输入直播链接" :maxlength="100" />
-                style="width: 400px; height: 40px; border-radius: 8px"
-                placeholder="请输入直播链接"
-                :maxlength="100"
-              />
             </div>
           </div>
 
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">直播时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker
+              <a-range-picker :show-time="{ format: 'HH:mm' }" :disabled-date="disabledDate"
-                :show-time="{ format: 'HH:mm' }"
+                style="width: 400px; height: 40px; border-radius: 8px" v-model:value="dateTime" format="YYYY-MM-DD HH:mm"
-                :disabled-date="disabledDate"
+                valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :placeholder="['      开始时间', '        结束时间']" />
-               
-                style="width: 400px; height: 40px; border-radius: 8px"
-                v-model:value="dateTime"
-                format="YYYY-MM-DD HH:mm"
-                valueFormat="YYYY-MM-DD HH:mm"
-                @change="timeChange"
-                :placeholder="['      开始时间', '        结束时间']"
-              />
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">直播时长：</span>
             </div>
             <div class="btnbox">
-              <a-input-number
+              <a-input-number :min="0" :max="300" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
-                :min="0"
+                v-model:value="formData.liveDuration"></a-input-number>
-                :max="300"
-                :precision="0"
-                style="width: 400px; height: 40px; border-radius: 8px"
-                v-model:value="formData.liveDuration"
-              ></a-input-number>
               <span style="color: #999999; margin-left: 8px">分钟</span>
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">授课老师：</span>
             </div>
             <div class="select" style="width: 400px">
-              <ProjectManager
+              <ProjectManager v-model:value="formData.liveTeacherId" v-model:name="formData.liveTeacherName">
-                v-model:value="formData.liveTeacherId"
+              </ProjectManager>
-                v-model:name="formData.liveTeacherName"
-              ></ProjectManager>
             </div>
           </div>
           <div class="mbl_items2">
             <div class="item_nam">
               <div class="asterisk_icon">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 2px">直播封面：</span>
             </div>
             <div class="item_inp">
-              <a-upload
+              <a-upload name="avatar" list-type="picture-card" class="avatar-uploader" :show-upload-list="false"
-                name="avatar"
+                :before-upload="beforeUpload">
-                list-type="picture-card"
+                <img class="i_upload_img" v-if="imageUrl" :src="imageUrl" alt="avatar" />
-                class="avatar-uploader"
-                :show-upload-list="false"
-                :before-upload="beforeUpload"
-              >
-                <img
-                  class="i_upload_img"
-                  v-if="imageUrl"
-                  :src="imageUrl"
-                  alt="avatar"
-                />
                 <div class="i_upload" v-else>
                   <div class="addimg">
                     <div class="heng"></div>
@@ -157,9 +97,7 @@
               </a-upload>
               <div class="i_bottom">
                 <div class="tip">
-                  <span style="color: #999999; margin-left: 8px"
+                  <span style="color: #999999; margin-left: 8px">支持图片格式为jpg/jpeg/png 图片最大为2MB</span>
-                    >支持图片格式为jpg/jpeg/png 图片最大为2MB</span
-                  >
                 </div>
               </div>
             </div>
@@ -167,22 +105,13 @@
           <div class="main_item2">
             <div class="signbox">
               <div class="asterisk_icon">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">直播公告：</span>
             </div>
             <div class="textarea">
-              <a-textarea
+              <a-textarea v-model:value="formData.liveNotice" placeholder="请输入直播公告" allow-clear show-count
-                v-model:value="formData.liveNotice"
+                :maxlength="200" :rows="6" />
-                placeholder="请输入直播公告"
-                allow-clear
-                show-count
-                :maxlength="200"
-                :rows="6"
-              />
             </div>
           </div>
 
@@ -191,10 +120,7 @@
               <span style="margin-right: 3px">回放设置：</span>
             </div>
             <div class="btnbox">
-              <a-switch
+              <a-switch v-model:checked="formData.livePlayback" @change="getchange(formData.livePlayback)" />
-                v-model:checked="formData.livePlayback"
-                @change="getchange(formData.livePlayback)"
-              />
             </div>
           </div>
           <div v-if="formData.livePlayback">
@@ -203,12 +129,8 @@
                 <span style="margin-right: 3px">回放链接：</span>
               </div>
               <div class="btnbox">
-                <a-input
+                <a-input v-model:value="formData.livePlaybackLink" style="width: 400px; height: 40px; border-radius: 8px"
-                  v-model:value="formData.livePlaybackLink"
+                  placeholder="请输入回放链接" :maxlength="100" />
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  placeholder="请输入回放链接"
-                  :maxlength="100"
-                />
               </div>
             </div>
           </div>
@@ -218,14 +140,8 @@
               <span style="margin-right: 3px">直播说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea
+              <a-textarea v-model:value="formData.liveExplain" placeholder="请输入直播说明" allow-clear show-count
-                v-model:value="formData.liveExplain"
+                :maxlength="200" :rows="6" />
-                placeholder="请输入直播说明"
-                allow-clear
-                show-count
-                :maxlength="200"
-                :rows="6"
-              />
             </div>
           </div>
 
@@ -242,39 +158,23 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>直播开始前：</span>
-                  <a-input-number
+                  <a-input-number :min="0" :max="30" :precision="0" style="
-                    :min="0"
-                    :max="30"
-                    :precision="0"
-                    style="
                                                 width: 88px;
                                                 height: 32px;
                                                 border-radius: 8px;
                                                 overflow: hidden;
-                    "
+                                              " v-model:value="formData.beforeSignIn"></a-input-number>
-                    v-model:value="formData.beforeSignIn"
+                  <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
-                  ></a-input-number>
-                  <span style="color: #999999; margin-left: 8px"
-                    >分钟允许签到</span
-                  >
                 </div>
                 <div class="timerbox">
                   <span>直播开始后：</span>
-                  <a-input-number
+                  <a-input-number :min="0" :max="30" :precision="0" style="
-                    :min="0"
-                    :max="30"
-                    :precision="0"
-                    style="
                                                 width: 88px;
                                                 height: 32px;
                                                 border-radius: 8px;
                                                 overflow: hidden;
-                    "
+                                              " v-model:value="formData.afterSignIn"></a-input-number>
-                    v-model:value="formData.afterSignIn"
+                  <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
-                  ></a-input-number>
-                  <span style="color: #999999; margin-left: 8px"
-                    >分钟允许签到</span
-                  >
                 </div>
               </div>
             </div>
@@ -284,18 +184,14 @@
               <span style="margin-right: 3px">评估：</span>
             </div>
             <div class="btnbox2">
-              <a-checkbox v-model:checked="formData.isEvaluate" @change="getchanges(formData.isEvaluate)"
+              <a-checkbox v-model:checked="formData.isEvaluate" @change="getchanges(formData.isEvaluate)">需要评估
-                >需要评估
               </a-checkbox>
             </div>
           </div>
           <div v-if="formData.isEvaluate" class="main_item">
             <div class="signbox"></div>
             <div class="btnbox">
-              <AddInvistRoot
+              <AddInvistRoot v-model:id="formData.assessmentId" v-model:name="formData.assessmentName">
-                v-model:id="formData.assessmentId"
-                v-model:name="formData.assessmentName"
-              >
                 <button class="xkbtn">选择评估</button>
               </AddInvistRoot>
 
@@ -428,6 +324,8 @@ const rulesRef = ref({
 const { resetFields, validate } = Form.useForm(formData, rulesRef);
 
 const closeDrawer = () => {
+  formData.value.liveCover = "";
+  imageUrl.value = "";
   visible.value = false;
   taskIndex.value = -1;
   dateTime.value = [];
@@ -467,7 +365,8 @@ async function confirm() {
   if (taskIndex.value === -1) {
     let list = props.taskList
     list.push(
-            {name: formData.value.liveName,
+      {
+        name: formData.value.liveName,
         type: props.type,
         info: { ...formData.value },
         duration: dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime, 'minutes')
@@ -484,8 +383,10 @@ async function confirm() {
 }
 
 function openDrawer(i, row) {
+  console.log(i, row)
   row && (formData.value = { ...row.info });
   row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]);
+  row && (imageUrl.value = row.info.liveCover);
   i >= 0 && (taskIndex.value = i);
   visible.value = true;
 }
@@ -506,9 +407,10 @@ const beforeUpload = (file) => {
     return false;
   }
 
-  let isLt1M = file.size / 10240 / 10240 <= 1;
+  let isLt1M = file.size < 2097152;
+  console.log(file.size, isLt1M)
   if (!isLt1M) {
-    this.$message.error("图片大小超过10MB!");
+    message.error("图片大小超过2MB!");
     return false;
   }
 

src/components/drawers/AddTest.vue

@@ -2,36 +2,21 @@
   <div @click="openDrawer">
     <slot></slot>
   </div>
-  <a-drawer
+  <a-drawer :visible="visible" class="drawerStyle addtestDrawer" width="800" placement="right">
-      :visible="visible"
-      class="drawerStyle addtestDrawer"
-      width="800"
-      placement="right"
-  >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}考试</div>
-        <img
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-            style="width: 29px; height: 29px; cursor: pointer"
+          @click="closeDrawer" />
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
-        />
       </div>
       <div style="display: flex; flex-direction: row; padding-top: 0px; margin-top: 20px; margin-left: 32px;">
         <div>
-          <button
+          <button style="width: 100px; cursor: pointer;" @click="changeOuter(1)"
-              style="width: 100px; cursor: pointer;"
+            :class="formData.examType === 1 ? 'outer' : 'notOuter'">
-              @click="changeOuter(1)"
-              :class="formData.examType === 1  ? 'outer' : 'notOuter'"
-          >
             系统考试
           </button>
-          <button
+          <button :disabled="taskIndex >= 0" style="width: 100px; cursor: pointer;" @click="changeOuter(2)"
-                  :disabled="taskIndex >= 0"
+            :class="formData.examType === 2 ? 'outer' : 'notOuter'">
-              style="width: 100px; cursor: pointer;"
-              @click="changeOuter(2)"
-              :class="formData.examType === 2  ? 'outer' : 'notOuter'"
-          >
             外部考试
           </button>
         </div>
@@ -42,31 +27,20 @@
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
               </div>
               <span style="margin-right: 3px">考试名称：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input v-model:value="formData.examinationName" style="width: 400px; height: 40px; border-radius: 8px"
-                  v-model:value="formData.examinationName"
+                placeholder="请输入考试名称" :maxlength="20" :disabled="taskIndex >= 0" />
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  placeholder="请输入考试名称"
-                  :maxlength="20"
-                  :disabled="taskIndex >= 0"
-              />
             </div>
           </div>
 
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
               </div>
               <span style="margin-right: 3px">选择试卷：</span>
             </div>
@@ -87,65 +61,40 @@
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
               </div>
               <span style="margin-right: 3px">考试时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker
+              <a-range-picker style="width: 400px; height: 40px; border-radius: 8px" :show-time="{ format: 'hh:mm' }"
-                  style="width: 400px; height: 40px; border-radius: 8px"
+                :disabled-date="disabledDate" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm"
-                  :show-time="{format:'hh:mm'}"
+                v-model:value="dateTime" @change="timeChange" :placeholder="['      开始时间', '        结束时间']" />
-                  :disabled-date="disabledDate"
-                  format="YYYY-MM-DD HH:mm"
-                  valueFormat="YYYY-MM-DD HH:mm"
-                  v-model:value="dateTime"
-                  @change="timeChange"
-                  :placeholder="['      开始时间', '        结束时间']"
-              />
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
               </div>
               <span style="margin-right: 3px">考试时长：</span>
             </div>
             <div class="select">
-              <a-input-number
+              <a-input-number :disabled="taskIndex >= 0" :min="0" :max="300" :precision="0"
-                      :disabled="taskIndex >= 0"
-                  :min="0"
-                  :max="300"
-                  :precision="0"
                 style="width: 400px; height: 40px; border-radius: 8px"
-                  v-model:value="formData.examinationDuration"
+                v-model:value="formData.examinationDuration"></a-input-number>
-              ></a-input-number>
               <span style="color: #999999; margin-left: 8px">分钟</span>
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
               </div>
               <span style="margin-right: 3px">及格线：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input :disabled="taskIndex >= 0" v-model:value="formData.passLine" type="number"
-                      :disabled="taskIndex >= 0"
+                style="width: 400px; height: 40px; border-radius: 8px" />
-                  v-model:value="formData.passLine"
-                  type="number"
-                  style="width: 400px; height: 40px; border-radius: 8px"
-              />
 
               <span style="color: #999999; margin-left: 8px">分</span>
             </div>
@@ -155,15 +104,8 @@
               <span style="margin-right: 3px">考试说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea
+              <a-textarea :disabled="taskIndex >= 0" v-model:value="formData.examinationExplain" placeholder="请输入考试说明"
-                      :disabled="taskIndex >= 0"
+                allow-clear show-count :maxlength="200" :rows="6" />
-                  v-model:value="formData.examinationExplain"
-                  placeholder="请输入考试说明"
-                  allow-clear
-                  show-count
-                  :maxlength="200"
-                  :rows="6"
-              />
             </div>
           </div>
           <div class="main_item2">
@@ -174,21 +116,12 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>允许重复考试：</span>
-                  <a-input-number
+                  <a-input-number :disabled="taskIndex >= 0" :min="-1" :max="300" :precision="0" style="
-                          :disabled="taskIndex >= 0"
-                      :min="-1"
-                      :max="300"
-                      :precision="0"
-                      style="
                           width: 100px;
                           height: 32px;
                           border-radius: 8px;
-                      overflow: hidden;"
+                          overflow: hidden;" v-model:value="formData.examinationLimit"></a-input-number>
-                      v-model:value="formData.examinationLimit"
+                  <span style="color: #999999; margin-left: 8px">次,-1表示无限制</span>
-                  ></a-input-number>
-                  <span style="color: #999999; margin-left: 8px"
-                  >次,-1表示无限制</span
-                  >
                 </div>
               </div>
             </div>
@@ -199,11 +132,7 @@
               <span style="margin-right: 3px">显示答案：</span>
             </div>
             <div class="btnbox">
-              <a-radio-group
+              <a-radio-group :disabled="taskIndex >= 0" style="margin-right: 12px" v-model:value="formData.showAnswers">
-                      :disabled="taskIndex >= 0"
-                  style="margin-right: 12px"
-                  v-model:value="formData.showAnswers"
-              >
                 <a-radio :value="1">允许查看</a-radio>
                 <a-radio :value="2">不允许查看</a-radio>
               </a-radio-group>
@@ -214,11 +143,7 @@
               <span style="margin-right: 3px">显示解析：</span>
             </div>
             <div class="btnbox">
-              <a-radio-group
+              <a-radio-group :disabled="taskIndex >= 0" style="margin-right: 12px" v-model:value="formData.showAnalysis">
-                      :disabled="taskIndex >= 0"
-                  style="margin-right: 12px"
-                  v-model:value="formData.showAnalysis"
-              >
                 <a-radio :value="1">允许查看</a-radio>
                 <a-radio :value="2">不允许查看</a-radio>
               </a-radio-group>
@@ -229,11 +154,7 @@
               <span style="margin-right: 3px">评分模式：</span>
             </div>
             <div class="btnbox">
-              <a-radio-group
+              <a-radio-group :disabled="taskIndex >= 0" style="margin-right: 12px" v-model:value="formData.scoringModel">
-                      :disabled="taskIndex >= 0"
-                  style="margin-right: 12px"
-                  v-model:value="formData.scoringModel"
-              >
                 <a-radio :value="1">最高一次</a-radio>
                 <a-radio :value="2">最后一次</a-radio>
               </a-radio-group>
@@ -246,11 +167,8 @@
               <span style="margin-right: 3px">试题排列：</span>
             </div>
             <div class="btnbox">
-              <a-radio-group
+              <a-radio-group :disabled="taskIndex >= 0" style="margin-right: 12px"
-                      :disabled="taskIndex >= 0"
+                v-model:value="formData.questionArrangement">
-                  style="margin-right: 12px"
-                  v-model:value="formData.questionArrangement"
-              >
                 <a-radio :value="1">试题乱序</a-radio>
                 <a-radio :value="2">选项乱序</a-radio>
                 <a-radio :value="3">全部乱序</a-radio>
@@ -266,39 +184,25 @@
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
               </div>
               <span style="margin-right: 3px">考试名称：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input v-model:value="formData.examinationName" style="width: 400px; height: 40px; border-radius: 8px"
-                  v-model:value="formData.examinationName"
+                placeholder="请输入考试名称" :maxlength="20" />
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  placeholder="请输入考试名称"
-                  :maxlength="20"
-              />
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
               </div>
               <span style="margin-right: 3px">数据来源：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px"
-                  v-model:value="formData.source"
+                placeholder="请输入数据来源" :maxlength="20" />
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  placeholder="请输入数据来源"
-                  :maxlength="20"
-              />
             </div>
           </div>
           <div class="main_item2">
@@ -306,14 +210,8 @@
               <span style="margin-right: 3px">考试说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea
+              <a-textarea v-model:value="formData.externalExplain" placeholder="请输入考试说明" allow-clear show-count
-                  v-model:value="formData.externalExplain"
+                :maxlength="200" :rows="6" />
-                  placeholder="请输入考试说明"
-                  allow-clear
-                  show-count
-                  :maxlength="200"
-                  :rows="6"
-              />
             </div>
           </div>
         </div>
@@ -328,6 +226,7 @@
 <script setup>
 import { defineEmits, defineProps, ref, watch } from "vue";
 import STest from "./SelectTest.vue";
+import { createExamination } from "@/api/index1";
 import dayjs from "dayjs";
 import { Form, message } from "ant-design-vue";
 
@@ -436,7 +335,7 @@ const disabledDate = (current) => {
 
 // 系统考试
 async function confirm() {
-  debugger
+  // debugger
   await validate().catch(({ errorFields }) => {
     message.warning(errorFields[0].errors.join());
     throw Error("数据校验不通过")
@@ -449,6 +348,13 @@ async function confirm() {
     data.name = formData.value.examinationName
     data.info = { ...formData.value }
   }
+  let obj = formData.value;
+  createExamination(obj).then(res => {
+    console.log(res)
+    message.success("成功");
+  }).catch(err => {
+    console.log(err)
+  })
   emit('update:taskList', [...props.taskList])
   closeDrawer()
 }
@@ -668,9 +574,7 @@ defineExpose({openDrawer})
         background-color: #eff4fc !important;
       }
 
-      .ant-table-tbody
+      .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
-      > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-      > td {
         background: #f6f9fd;
       }
 

src/components/drawers/EvList.vue

@@ -2,22 +2,33 @@
   <div @click="openDrawer">
     <slot></slot>
   </div>
-  <a-drawer :visible="visible" class="drawerStyle addonlineDrawer" width="800" title="选择测评"
+  <a-drawer
-            placement="right">
+    :visible="visible"
+    class="drawerStyle addonlineDrawer"
+    width="800"
+    title="选择测评"
+    placement="right"
+  >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">选择测评</div>
-        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+        <img
-             @click="closeDrawer"/>
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
       </div>
-      <div class="contentMain">
+      <div class="contentMain" v-if="data.length > 0">
         <div class="main_items">
           <div class="mi_ipts">
             <div class="mii_ipt">
               <div class="ipt_name"></div>
               <div class="fi_input">
-                <a-input v-model:value="params.keyword" style="width: 424px; height: 40px; border-radius: 8px"
+                <a-input
-                         placeholder="请输入测评名称"/>
+                  v-model:value="params.keyword"
+                  style="width: 424px; height: 40px; border-radius: 8px"
+                  placeholder="请输入测评名称"
+                />
               </div>
             </div>
           </div>
@@ -36,7 +47,9 @@
           <a-table
             :customRow="customRow"
             class="ant-table-striped"
-              :row-class-name="(_, index) => (index % 2 === 1 ? 'table-striped' : null)"
+            :row-class-name="
+              (_, index) => (index % 2 === 1 ? 'table-striped' : null)
+            "
             row-key="id"
             :columns="columns"
             :data-source="data"
@@ -46,6 +59,83 @@
           />
         </div>
       </div>
+      <div class="contentMain nolimits" v-else>
+        <div class="limitstext1">
+          抱歉，您没有关联测评的权限，您可以联系下方管理员开启权限
+        </div>
+        <div class="limitstext2">测评工具介绍</div>
+        <div class="limitsRow">
+          <div class="limitsRowDrop"></div>
+          <div class="limitsRowText">
+            人才发展项目中恰当运用测评手段可以更为精准地定位培训需求，更有针对性地设计培养项目和课程；同时，也能够帮助学员精准认知自身问题，提高在项目中的参与度。
+          </div>
+        </div>
+        <div class="limitsRow" style="margin-top: 10px">
+          <div class="limitsRowDrop"></div>
+          <div class="limitsRowText">
+            BOEU测评部经过多年的额实践，积累了一套覆盖“能力、性格和动力”三大方面的测评工具，可在人才发展项目中选择使用。
+          </div>
+        </div>
+        <div class="tool" v-for="(item, key) in toolList" :key="key">
+          <div
+            class="toolName"
+            :style="{
+              backgroundColor:
+                key === 0
+                  ? 'rgba(0, 77, 126)'
+                  : key === 1
+                  ? 'rgba(184, 0, 0)'
+                  : 'rgba(46, 129, 83)',
+            }"
+          >
+            <div>{{ item.name[0] }}</div>
+            <div>{{ item.name[1] }}</div>
+          </div>
+          <div class="toolEvery1" v-for="(i, k) in item.children" :key="k">
+            <div
+              class="toolEveryText1"
+              :style="{
+                color:
+                  key === 0
+                    ? 'rgba(5,75,120)'
+                    : key === 1
+                    ? 'rgba(169,3,3)'
+                    : 'rgba(44,120,79)',
+              }"
+            >
+              {{ i.text1 }}
+            </div>
+            <div class="toolEveryText2">{{ i.text2 }}</div>
+            <div
+              class="toolEveryText3"
+              v-if="i.text3"
+              :style="{
+                color:
+                  key === 0
+                    ? 'rgba(5,75,120)'
+                    : key === 1
+                    ? 'rgba(169,3,3)'
+                    : 'rgba(44,120,79)',
+              }"
+            >
+              {{ i.text3 }}
+            </div>
+            <div class="toolEveryText4" v-if="i.text4">{{ i.text4 }}</div>
+          </div>
+        </div>
+        <div class="limitsRow">
+          <div class="limitsRowDrop"></div>
+          <div class="limitsRowText">
+            如项目中有测评需求，请您联系BOEU测评部
+          </div>
+        </div>
+        <div class="limitsRow">
+          <div class="limitsRowDrop"></div>
+          <div class="limitsRowText">
+            联系人：王逸（10167304） 联系电话：010-60965646
+          </div>
+        </div>
+      </div>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
@@ -59,14 +149,78 @@ import {useBoeApiPage} from "@/api/request";
 import { TEST_PAGE } from "@/api/ThirdApi";
 import { message } from "ant-design-vue";
 import { useStore } from "vuex";
-
+const toolList = ref([
+  {
+    name: ["能力类", "测验工具"],
+    children: [
+      {
+        text1: "职场准备度测评",
+        text2: "无工作经验学生",
+        text3: "职业能力成熟度测评",
+        text4: "五年以内工龄员工",
+      },
+      {
+        text1: "职业认知能力测评",
+        text2: "五年内工龄员工",
+        text3: "商业推荐测评",
+        text4: "五年内工龄员工",
+      },
+      {
+        text1: "沟通能力测评",
+        text2: "五年内工龄员工",
+        text3: "情商测评",
+        text4: "各层级人员",
+      },
+      {
+        text1: "管理行为自检问卷",
+        text2: "基/中/高层管理者",
+        text3: "管理者情境判断测评",
+        text4: "基/中高层管理者",
+      },
+    ],
+  },
+  {
+    name: ["性格/风格", "测验工具"],
+    children: [
+      {
+        text1: "PDP性格类型测验",
+        text2: "各层级人员",
+      },
+      {
+        text1: "RTC综合评估",
+        text2: "各层级人员",
+      },
+      {
+        text1: "大五职业性格测评",
+        text2: "各层级人员",
+      },
+      {
+        text1: "领导风格测验",
+        text2: "各层级人员",
+      },
+    ],
+  },
+  {
+    name: ["动机/价值观", "测验工具"],
+    children: [
+      {
+        text1: "动机测验（内隐&外显）",
+        text2: "各层级人员",
+      },
+      {
+        text1: "职业兴趣测验",
+        text2: "各层级人员",
+      },
+    ],
+  },
+]);
 const props = defineProps({
   taskList: [],
   evaluationTypeId: String,
-  evaluationTypeName: Number
+  evaluationTypeName: Number,
-})
+});
-const visible = ref(false)
+const visible = ref(false);
-const emit = defineEmits({})
+const emit = defineEmits({});
 
 const columns = ref([
   {
@@ -100,18 +254,18 @@ const columns = ref([
     align: "center",
     ellipsis: true,
   },
-])
+]);
 
 const store = useStore();
 
 const initParams = {
-  keyword: '',
+  keyword: "",
   page: 1,
   size: 10,
-  user_id: store.state.userInfo.id
+  user_id: store.state.userInfo.id,
   // orderAsc: true
-}
+};
-const params = ref(initParams)
+const params = ref(initParams);
 
 const rowSelectKeys = ref([]);
 const selectsData = ref([]);
@@ -119,31 +273,35 @@ const taskIndex = ref(-1);
 
 const { data, loading, total, fetch } = useBoeApiPage(TEST_PAGE, params.value, {
   init: false,
-  result: res => {
+  result: (res) => {
-    let newArr = []
+    console.log("获取测评", res);
+    let newArr = [];
     for (let i = 0; i < res.result.data.length; i++) {
       res.result.data[i].id = res.result.data[i].quiz_kid;
-      newArr.push(res.result.data[i])
+      newArr.push(res.result.data[i]);
     }
-    return newArr
+    return newArr;
   },
-  totalPage: res => res.result.total_page_num,
+  totalPage: (res) => res.result.total_page_num,
-  total: res => res.result.count
+  total: (res) => res.result.count,
-})
+});
-console.log(data, 222)
+
 watch(taskIndex, () => {
   if (taskIndex.value >= 0) {
-    rowSelectKeys.value = [props.taskList[taskIndex.value].courseId]
+    rowSelectKeys.value = [props.taskList[taskIndex.value].courseId];
-    selectsData.value = data.value.find(t => t.id === props.taskList[taskIndex.value].courseId) || {}
+    selectsData.value =
+      data.value.find(
+        (t) => t.id === props.taskList[taskIndex.value].courseId
+      ) || {};
   }
-})
+});
 
 const customRow = (record) => ({
   onClick: () => {
-    rowSelectKeys.value = [record.id]
+    rowSelectKeys.value = [record.id];
-    selectsData.value = [record]
+    selectsData.value = [record];
-  }
+  },
-})
+});
 
 const pagination = computed(() => ({
   total: total.value,
@@ -155,20 +313,20 @@ const pagination = computed(() => ({
 
 const changePagination = (e) => {
   params.value.pageIndex = e;
-  fetch()
+  fetch();
 };
 const rowSelection = computed(() => ({
-  type: 'radio',
+  type: "radio",
   columnWidth: 20,
   selectedRowKeys: rowSelectKeys.value,
   onChange: onSelectChange,
   preserveSelectedRowKeys: true,
-  getCheckboxProps: getCheckboxProps
+  getCheckboxProps: getCheckboxProps,
 }));
 const getCheckboxProps = () => ({
   // 某几项默认禁止选中(R: 当state等于1时)
-  disabled: false
+  disabled: false,
-})
+});
 
 function onSelectChange(e, l) {
   rowSelectKeys.value = e;
@@ -176,28 +334,28 @@ function onSelectChange(e, l) {
 }
 
 function search() {
-  params.value.pageIndex = 1
+  params.value.pageIndex = 1;
-  fetch()
+  fetch();
 }
 
 function reset() {
   rowSelectKeys.value = [];
   selectsData.value = [];
-  params.value.pageIndex = 1
+  params.value.pageIndex = 1;
-  params.value.keyWord = ''
+  params.value.keyWord = "";
-  fetch()
+  fetch();
 }
 
 const closeDrawer = () => {
-  visible.value = false
+  visible.value = false;
-  taskIndex.value = -1
+  taskIndex.value = -1;
-  reset()
+  reset();
 };
 
 function confirm() {
   if (!selectsData.value.length || !rowSelectKeys.value.length) {
     message.warning("请选择测评！");
-    return
+    return;
   }
   // if (taskIndex.value === -1) {
   //   let list = props.taskList
@@ -220,18 +378,17 @@ function confirm() {
   // if(props.taskList!=undefined){
   //   emit('update:taskList', [...props.taskList])
   // }
-  emit('update:evaluationTypeId', selectsData.value[0].id)
+  emit("update:evaluationTypeId", selectsData.value[0].id);
-  emit('update:evaluationTypeName', selectsData.value[0].title)
+  emit("update:evaluationTypeName", selectsData.value[0].title);
-  closeDrawer()
+  closeDrawer();
 }
 
 function openDrawer(i) {
-  (i >= 0) && (taskIndex.value = i)
+  i >= 0 && (taskIndex.value = i);
-  visible.value = true
+  visible.value = true;
 }
 
-defineExpose({openDrawer})
+defineExpose({ openDrawer });
-
 </script>
 <style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
@@ -417,7 +574,9 @@ defineExpose({openDrawer})
           background-color: #eff4fc !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;
         }
 
@@ -431,6 +590,76 @@ defineExpose({openDrawer})
         }
       }
     }
+    .nolimits {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      .limitstext1 {
+        margin-top: 30px;
+        font-size: 23px;
+        color: #333333;
+        font-weight: 600;
+      }
+      .limitstext2 {
+        margin-top: 30px;
+        font-size: 18px;
+        color: #333333;
+        font-weight: 800;
+      }
+      .limitsRow {
+        display: flex;
+        align-items: center;
+        margin-top: 20px;
+        width: 100%;
+        .limitsRowDrop {
+          width: 8px;
+          height: 8px;
+          background-color: #333333;
+          border-radius: 4px;
+          margin-left: 20px;
+          margin-right: 20px;
+          flex-shrink: 0;
+        }
+        .limitsRowText {
+          display: flex;
+          flex-wrap: wrap;
+          font-size: 16px;
+          color: #333333;
+          font-weight: 400;
+          line-height: 28px;
+        }
+      }
+      .tool {
+        width: 100%;
+        border-bottom: 1px dashed rgba(0, 78, 126);
+        display: flex;
+        margin-top: 30px;
+        align-items: center;
+        padding-bottom: 30px;
+        .toolName {
+          width: 100px;
+          height: 100px;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          color: #fff;
+          font-size: 16px;
+          font-weight: 600;
+
+          border-radius: 5px;
+          margin-left: 20px;
+          margin-right: 20px;
+        }
+        .toolEvery1 {
+          text-align: center;
+          font-size: 16px;
+          color: rgba(71, 74, 76);
+          margin-right: 12px;
+          line-height: 26px;
+        }
+      }
+    }
 
     .main_btns {
       height: 72px;

src/components/drawers/ProjectScore.vue

@@ -645,7 +645,7 @@ export default {
           bum: item.userInfoBo.deptName,
           gangw: item.userInfoBo.jobName,
           group: item.groupName,
-          diploma: "0",
+          diploma: item.allPointsCount,
           // operation: "查看",
         };
         array.push(obj);

src/components/drawers/router/RouterProjectManage.vue

@@ -377,7 +377,7 @@
                     onClick={
                         () => {
                             {/* 当前学员 用来查看学员详情 */}
-                            state.routerId = value.record.routerId;
+                            state.routerId = value.record.pid;
                             state.studentId = value.record.studentId;
                             state.CheckStuvisible = true;
                             console.log(value);

src/components/project/OrgClass.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2023-02-23 10:53:15
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2023-02-23 21:31:59
+ * @FilePath: /fe-manage/src/components/project/OrgClass.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <a-tree-select
     :getPopupContainer="
@@ -79,6 +87,7 @@ function change(
     },
   }
 ) {
+  console.log("label2222", label, namePath, value);
   emit("update:name", label);
   emit("update:fullName", namePath);
   emit("update:value", value);

src/components/project/OrgClassCheck.vue

@@ -0,0 +1,101 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2023-02-23 14:57:21
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2023-02-23 20:42:25
+ * @FilePath: /fe-manage/src/components/project/OrgClassCheck.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <a-tree-select
+    :getPopupContainer="
+      (triggerNode) => {
+        return triggerNode.parentNode || document.body;
+      }
+    "
+    v-model:value="labelValue"
+    style="width: 440px; min-height: 40px"
+    :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+    placeholder="请选择归属组织"
+    :labelInValue="true"
+    allow-clear
+    v-model:treeExpandedKeys="stuTreeExpandedKeys"
+    :loading="orgLoading"
+    :load-data="onLoadData"
+    :tree-data="options"
+    :fieldNames="{
+      children: 'treeChildList',
+      label: 'name',
+      value: 'id',
+    }"
+    :disabled="disabled"
+    @change="change"
+    dropdownClassName="treeDropdown"
+    multiple
+  >
+  </a-tree-select>
+</template>
+<script setup>
+import { defineEmits, defineProps, ref, watch } from "vue";
+import { boeRequest, useBoeApi } from "@/api/request";
+import { ORG_CHILD_LIST, ORG_LIST } from "@/api/ThirdApi";
+
+const props = defineProps({
+  value: {
+    type: Array,
+    default: () => [],
+  },
+  name: {
+    type: Array,
+    default: () => [],
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+});
+const emit = defineEmits({});
+const stuTreeExpandedKeys = ref([]);
+const labelValue = ref([]);
+const { data: options, loading: orgLoading } = useBoeApi(
+  ORG_LIST,
+  { keyword: "" },
+  {
+    init: true,
+    result: (res) => res.result.map((e) => ({ ...e, isLeaf: false })),
+  }
+);
+
+watch(props, () => {
+  stuTreeExpandedKeys.value = [];
+  console.log("labelValue.value", labelValue.value, props.value);
+  labelValue.value = props.value;
+  // if (labelValue.value.value !== props.value) {
+  //   labelValue.value = { value: props.value, label: props.name };
+  // }
+  // if (labelValue.value.label !== props.name) {
+  //   labelValue.value = { value: props.value, label: props.name };
+  // }
+});
+
+function onLoadData(treeNode) {
+  return boeRequest(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
+    (r) => {
+      treeNode.dataRef.treeChildList = r.result.directChildList;
+      options.value = [...options.value];
+    }
+  );
+}
+
+function change(e) {
+  // console.log("label", e, emit);
+  // let label = [];
+  // let value = [];
+  // for (let i = 0; i < e.length; i++) {
+  //   label.push(e[i].label);
+  //   value.push(e[i].value);
+  // }
+  // emit("update:name", label);
+  emit("update:value", e);
+}
+</script>

src/components/student/ChangeGroupModal.vue

@@ -59,6 +59,7 @@ const props = defineProps({
 });
 
 const option = computed(() => {
+  debugger
   console.log("props.groupList", props.groupList);
   return props.groupList.map((e) => ({
     label: e.groupName,

src/components/student/CommonStudent.vue

@@ -378,7 +378,8 @@ const getStu = () => {
     studentName: proStudentName.value,
     pageNo: procurrentPage.value,
     pageSize: 10,
-    projectId: props.id,
+    pid: props.id,
+    type: props.type
   };
   projectListTotal.value = -1;
   console.log("获取项目学员", obj);
@@ -392,6 +393,7 @@ const getStu = () => {
           id: value.id,
           realName: value.studentName,
           userNo: value.studentId,
+          isLeader: value.isLeader,
           orgName: value.studentOrgName ? value.studentOrgName : "-",
           departName: value.studentDepartName ? value.studentDepartName : "-",
         };
@@ -758,9 +760,14 @@ const submitAuth = () => {
 function handleStageOk() {
   // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
   if (props.type === 1) {
-    if (props.groupMemberCount < selectsData.value.studentList.length + props.groupMemberNumber) {
+    if (props.groupMemberCount < selectsData.value.projectMemberList.length + Number(props.groupMemberNumber)) {
       return message.warning("添加小组学员超过最大值");
     }
+    // 判断是否是组长，组长不能添加
+    const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === '1');
+    if (leaderArray.length > 0) {
+      return message.warning("当前选学员"+leaderArray[0].realName+"已在其他小组为小组长，请勿重复选择。");
+    }
     // 对选中的人员进行判断是否已经分组了
     let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);
     if (haveGroupNum.length > 0) {

src/components/student/TableStudent.vue

@@ -1,17 +1,9 @@
 <template>
   <div class="TableStudent">
-    <a-row
+    <a-row type="flex" gutter="12" style="padding-left: 20px; margin-right: 0px">
-      type="flex"
-      gutter="12"
-      style="padding-left: 20px; margin-right: 0px"
-    >
       <a-col>
         <a-form-item title="姓名：">
-          <a-input
+          <a-input class="cus-input" v-model:value="tableParam.studentName" placeholder="请输入姓名" />
-            class="cus-input"
-            v-model:value="tableParam.studentName"
-            placeholder="请输入姓名"
-          />
         </a-form-item>
       </a-col>
       <!-- <a-col v-if="type === 1">
@@ -27,73 +19,39 @@
       <a-col v-if="type === 1">
         <a-form-item title="部门：">
           <div class="select in" style="width: 270px">
-            <OrgClass
+            <OrgClass v-model:value="tableParam.studentDepartId" v-model:name="tableParam.studentDepartName"></OrgClass>
-              v-model:value="tableParam.studentDepartId"
-              v-model:name="tableParam.studentDepartName"
-            ></OrgClass>
           </div>
         </a-form-item>
       </a-col>
       <a-col v-if="type === 1">
         <a-form-item title="优秀学员：">
           <div class="select">
-            <a-select
+            <a-select v-model:value="tableParam.topFlag" style="width: 260px; height: 40px" placeholder="是否为优秀学员"
-              v-model:value="tableParam.topFlag"
+              :options="topFlagList" @change="selectProjectName" allowClear showSearch></a-select>
-              style="width: 260px; height: 40px"
-              placeholder="是否为优秀学员"
-              :options="topFlagList"
-              @change="selectProjectName"
-              allowClear
-              showSearch
-            ></a-select>
           </div>
         </a-form-item>
       </a-col>
       <a-col>
-        <a-button
+        <a-button class="cus-btn" style="background: #4ea6ff; color: #fff; width: 100px" @click="getStuList">
-          class="cus-btn"
-          style="background: #4ea6ff; color: #fff; width: 100px"
-          @click="getStuList"
-        >
           <template #icon>
-            <img
+            <img style="margin-right: 10px" src="../../assets/images/courseManage/search0.png" /></template>
-              style="margin-right: 10px"
-              src="../../assets/images/courseManage/search0.png"
-          /></template>
           搜索
         </a-button>
       </a-col>
       <a-col :span="2">
         <a-button class="cus-btn white" style="width: 100px" @click="reset">
           <template #icon>
-            <img
+            <img style="margin-right: 10px" src="../../assets/images/leveladd/reset.png" /></template>
-              style="margin-right: 10px"
-              src="../../assets/images/leveladd/reset.png"
-          /></template>
           重置
         </a-button>
       </a-col>
     </a-row>
 
-    <a-row
+    <a-row type="flex" gutter="12" style="padding-left: 20px; margin-right: 0px" v-if="checkPer(permissions)">
-      type="flex"
-      gutter="12"
-      style="padding-left: 20px; margin-right: 0px"
-      v-if="checkPer(permissions)"
-    >
       <a-col :span="1.5">
-        <CommonStudent
+        <CommonStudent :type="type" :id="id" @finash="submitCall" :stage="stage">
-          :type="type"
-          :id="id"
-          @finash="submitCall"
-          :stage="stage"
-        >
           <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
-            <template #icon
+            <template #icon><img style="margin-right: 10px" src="../../assets/images/courseManage/add0.png" /></template>
-              ><img
-                style="margin-right: 10px"
-                src="../../assets/images/courseManage/add0.png"
-            /></template>
             添加学员
           </a-button>
         </CommonStudent>
@@ -101,11 +59,7 @@
       <!-- 新加导入学员 批量换组 导出学习信息  -->
       <a-col :span="1.5" v-if="type === 1 || type === 2">
         <a-button class="cus-btn white" @click="showImpStu">
-          <template #icon
+          <template #icon><img style="margin-right: 10px" src="../../assets/images/basicinfo/in2.png" /></template>
-            ><img
-              style="margin-right: 10px"
-              src="../../assets/images/basicinfo/in2.png"
-          /></template>
           导入学员
         </a-button>
       </a-col>
@@ -128,11 +82,7 @@
       </a-col>
       <a-col :span="1.5">
         <a-button class="cus-btn white" @click="bathDel">
-          <template #icon
+          <template #icon><img style="margin-right: 10px" src="../../assets/images/projectadd/delete.png" /></template>
-            ><img
-              style="margin-right: 10px"
-              src="../../assets/images/projectadd/delete.png"
-          /></template>
           批量删除
         </a-button>
       </a-col>
@@ -147,19 +97,10 @@
         <div class="stmm_btn btn4" @click="hideShow">
           <div class="btn4_sub">
             <span style="color: #4ea6ff; margin-right: 4px"> 批量操作 </span>
-            <div
+            <div class="b_zk" :style="{ display: hideshow ? 'block' : 'none' }"></div>
-              class="b_zk"
+            <div class="b_sq" :style="{ display: hideshow ? 'none' : 'block' }"></div>
-              :style="{ display: hideshow ? 'block' : 'none' }"
-            ></div>
-            <div
-              class="b_sq"
-              :style="{ display: hideshow ? 'none' : 'block' }"
-            ></div>
           </div>
-          <div
+          <div class="btn4_sup" :style="{ display: hideshow ? 'none' : 'block' }">
-            class="btn4_sup"
-            :style="{ display: hideshow ? 'none' : 'block' }"
-          >
             <div class="btnsbox">
               <div class="btn4_tit" @click="showEScoreModal">
                 <span>批量录入成绩</span>
@@ -180,25 +121,14 @@
           <div class="export"></div>
           <div class="btnText">导出</div>
         </div>
-        <div
+        <div class="stmm_btn btn5" style="margin-left: 15px" @click="exportHomeWorkShow">
-          class="stmm_btn btn5"
-          style="margin-left: 15px"
-          @click="exportHomeWorkShow"
-        >
           <div class="btnText">导出作业</div>
         </div>
       </a-col>
     </a-row>
     <div style="margin-top: 20px">
-      <a-table
+      <a-table :columns="tablecolumns" :data-source="tableData.list" :pagination="stuPagination"
-        :columns="tablecolumns"
+        :loading="tableData.loading" :scroll="{ x: 1500 }" row-key="id" :row-selection="stuRowSelection">
-        :data-source="tableData.list"
-        :pagination="stuPagination"
-        :loading="tableData.loading"
-        :scroll="{ x: 1500 }"
-        row-key="id"
-        :row-selection="stuRowSelection"
-      >
         <template #action="{ record }">
           <!--					<div style="display:flex;justify-content: center;align-items: center;">-->
           <!-- <div v-if="props.type == 1" @click="excellentStudent(record)"
@@ -219,56 +149,28 @@
           <a-space :size="2">
             <slot name="extension" v-bind:data="{ record }"></slot>
 
-            <a-button
+            <a-button v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
-              v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
+              @click="updateStatus(0, record.id)" type="link">通过</a-button>
-              @click="updateStatus(0, record.id)"
+            <a-button v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
-              type="link"
+              @click="updateStatus(2, record.id)" type="link">拒绝</a-button>
-              >通过</a-button
+            <a-button v-if="checkPer(permissions)" :disabled="record.isLeader === '1'" @click="del(record.id, record)"
-            >
+              type="link" danger>删除</a-button>
-            <a-button
-              v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
-              @click="updateStatus(2, record.id)"
-              type="link"
-              >拒绝</a-button
-            >
-            <a-button
-              v-if="checkPer(permissions)"
-              :disabled="record.isLeader === '1' "
-              @click="del(record.id,record)"
-              type="link"
-              danger
-              >删除</a-button
-            >
           </a-space>
         </template>
       </a-table>
     </div>
   </div>
   <!-- 批量调整关卡弹窗 -->
-  <ChangeLevelModal
+  <ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys" @finash="submitCall" />
-    v-model:visiblene="visiblene"
-    :stage="stage"
-    :ids="stuSelectKeys"
-    @finash="submitCall"
-  />
 
   <!-- 换组弹窗 -->
-  <ChangeGroupModal
+  <ChangeGroupModal v-model:changegroupV="checkgroupParam.changegroupV" :groupList="groupList"
-    v-model:changegroupV="checkgroupParam.changegroupV"
+    :checkgroupStuId="stuSelectKeys" />
-    :groupList="groupList"
-    :checkgroupStuId="stuSelectKeys"
-  />
   <!-- 批量调整关卡弹窗 -->
   <!-- 取消学员弹窗 -->
   <div>
-    <a-modal
+    <a-modal v-model:visible="canclestu" :footer="null" :closable="close" wrapClassName="canclestu" centered="true"
-      v-model:visible="canclestu"
+      @cancel="closeModal1">
-      :footer="null"
-      :closable="close"
-      wrapClassName="canclestu"
-      centered="true"
-      @cancel="closeModal1"
-    >
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -294,13 +196,7 @@
   <!-- 取消学员弹窗 -->
   <!-- 优秀学员弹窗 -->
   <div>
-    <a-modal
+    <a-modal v-model:visible="canclestu1" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
-      v-model:visible="canclestu1"
-      :footer="null"
-      :closable="close"
-      wrapClassName="canclestu1"
-      centered="true"
-    >
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -324,35 +220,18 @@
     </a-modal>
   </div>
   <!-- 查看学员 传入查看学员的id-->
-  <see-stu
+  <see-stu v-model:Seevisible="Seevisible" v-model:checkStuId="checkStuId" v-model:projectId="projectId" />
-    v-model:Seevisible="Seevisible"
-    v-model:checkStuId="checkStuId"
-    v-model:projectId="projectId"
-  />
 
   <!-- 导入作业成绩抽屉 -->
-  <EScore
+  <EScore v-model:eScorevisible="eScorevisible" :type="3" :id="id" :pid="id" v-model:searchTaskList="getStuList" />
-    v-model:eScorevisible="eScorevisible"
-    :type="3"
-    :id="id"
-    :pid="id"
-    v-model:searchTaskList="getStuList"
-  />
   <!-- 导出作业提示框 -->
-  <ExportHomeWork
+  <ExportHomeWork v-model:exportHomeWorkV="exportHomeWorkV" :downloadUrl="downloadUrl" />
-    v-model:exportHomeWorkV="exportHomeWorkV"
-    :downloadUrl="downloadUrl"
-  />
 
   <!-- 导入学员抽屉 -->
   <!--  :courseId="projectTaskInfo.courseId"
     :courseType="2" -->
-  <imp-stu
+  <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" @AddImpStuvisibleClose="AddImpStuvisibleClose" :courseId="id"
-    v-model:AddImpStuvisible="AddImpStuvisible"
+    :courseType="type" />
-    @AddImpStuvisibleClose="AddImpStuvisibleClose"
-    :courseId="id"
-    :courseType="type"
-  />
 </template>
 <script setup>
 import { computed, createVNode, defineProps, onMounted, ref, watch } from "vue";
@@ -481,9 +360,9 @@ const tablecolumns = ref([
     // ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
     ({
       0: "导入",
-        1: "导入",
+      1: "手动加入",
-        2: "导入",
+      2: "手动加入",
-        3: "导入",
+      3: "手动加入",
       4: "导入",
       5: "报名",
       6: "导入",
@@ -557,8 +436,7 @@ function showChangeGroupModal() {
 function exportTaskStu() {
   console.log("props.datasource", props);
   window.open(
-    `${
+    `${process.env.VUE_APP_BASE_API
-      process.env.VUE_APP_BASE_API
     }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}`
   );
 }
@@ -566,8 +444,7 @@ function exportTaskStu() {
 function exportTaskStuRouter() {
   console.log("props.datasource", props, props.id);
   window.open(
-    `${
+    `${process.env.VUE_APP_BASE_API
-      process.env.VUE_APP_BASE_API
     }/admin/student/exportTaskStudent?type=${2}&pid=${props.id}`
   );
 }
@@ -779,8 +656,7 @@ const exportStu = () => {
   console.log("props.datasource", props);
   if (props.id != undefined) {
     window.open(
-      `${
+      `${process.env.VUE_APP_BASE_API
-        process.env.VUE_APP_BASE_API
       }/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
     );
   }
@@ -833,11 +709,13 @@ defineExpose({ getStuList, startLoading });
 </script>
 <style lang="scss">
 .TableStudent {
+
   table tr th.ant-table-selection-column,
   table tr td.ant-table-selection-column {
     padding-left: 3px;
   }
 }
+
 .stydentName {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -906,13 +784,13 @@ defineExpose({ getStuList, startLoading });
   position: absolute;
   width: calc(100%);
   height: 40px;
-  background: linear-gradient(
+  background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-    rgba(78, 166, 255, 0.2) 0%,
+      rgba(78, 166, 255, 0) 100%);
-    rgba(78, 166, 255, 0) 100%
-  );
 }
+
 .batchOpera {
   display: flex;
+
   .stmm_btn {
     width: 100px;
     height: 40px;
@@ -985,6 +863,7 @@ defineExpose({ getStuList, startLoading });
           margin-bottom: 10px;
           white-space: nowrap;
         }
+
         .btn4_tit:hover,
         .btn4_op1:hover,
         .btn4_op2:hover,
@@ -1006,6 +885,7 @@ defineExpose({ getStuList, startLoading });
     }
   }
 }
+
 /*.delete {
   z-index: 9999;
   width: 424px;

src/views/courselibrary/CoursewareManage.vue

@@ -3706,7 +3706,11 @@ export default defineComponent({
         handleCancelStu();
         rest();
         state.addLoading = false;
-      });
+      }).catch(err => {
+        state.loading = false
+        console.log(err)
+      })
+      state.cstm_hs = false;
     };
 
     //编辑开课

src/views/courselibrary/courseModal.vue

@@ -1,15 +1,30 @@
 <!-- 确定新建面授课弹窗 -->
 <template>
-	<a-modal v-model:visible="ft_hs" title="Title" :footer="null" :closable="false"
+  <a-modal
-		wrapClassName="modalStyle facteachModal" width="80%" @cancel="visibleClose" @ok="handlePush">
+    v-model:visible="ft_hs"
+    title="Title"
+    :footer="null"
+    :closable="false"
+    wrapClassName="modalStyle facteachModal coursemodal"
+    width="80%"
+    @cancel="visibleClose"
+    @ok="handlePush"
+  >
     <div class="modalHeader">
       <div class="headerLeft">
-				<img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/basicinfo/add.png" />
+        <img
+          style="width: 17px; height: 18px; margin-right: 8px"
+          src="@/assets/images/basicinfo/add.png"
+        />
         <span v-if="ft_eidt" class="headerLeftText">编辑面授课</span>
         <span v-else class="headerLeftText">新建面授课</span>
       </div>
       <div style="margin-right: 57px; cursor: pointer">
-				<img @click="noEditClose" style="width: 22px; height: 22px" src="@/assets/images/basicinfo/close22.png" />
+        <img
+          @click="noEditClose"
+          style="width: 22px; height: 22px"
+          src="@/assets/images/basicinfo/close22.png"
+        />
       </div>
     </div>
     <div class="modalMain">
@@ -26,14 +41,25 @@
               <div class="mbl_items">
                 <div class="item_nam">
                   <div class="asterisk_icon">
-										<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk" />
+                    <img
+                      src="@/assets/images/coursewareManage/asterisk.png"
+                      alt="asterisk"
+                    />
                   </div>
                   <span style="margin-right: 14px">课程名称</span>
                 </div>
                 <div class="item_inp">
                   <div class="i1_input">
-										<NameInput ref="inputRef" placeholder="请输入课程名称" v-model:value="qdms_inputV1"
+                    <NameInput
-											v-model:validate="validate" :maxlength="20" show-count :type="2" :id="offcourseId"></NameInput>
+                      ref="inputRef"
+                      placeholder="请输入课程名称"
+                      v-model:value="qdms_inputV1"
+                      v-model:validate="validate"
+                      :maxlength="20"
+                      show-count
+                      :type="2"
+                      :id="offcourseId"
+                    ></NameInput>
                     <!--                    <a-input-->
                     <!--                        v-model:value="qdms_inputV1"-->
                     <!--                        maxlength="90"-->
@@ -53,17 +79,30 @@
                   <div class="i2_left">
                     <span style="color: #999ba3">课程命名规则</span>
                   </div>
-									<div class="i2_right" @click="hideShow" style="cursor: pointer">
+                  <div
-										<div class="b_zk" :style="{ display: hideshow ? 'block' : 'none' }">
+                    class="i2_right"
+                    @click="hideShow"
+                    style="cursor: pointer"
+                  >
+                    <div
+                      class="b_zk"
+                      :style="{ display: hideshow ? 'block' : 'none' }"
+                    >
                       <span style="color: #4ea6ff">收起</span>
                     </div>
-										<div class="b_sq" :style="{ display: hideshow ? 'none' : 'block' }">
+                    <div
+                      class="b_sq"
+                      :style="{ display: hideshow ? 'none' : 'block' }"
+                    >
                       <span style="color: #4ea6ff">展开</span>
                     </div>
                     <div class="b_icon"></div>
                   </div>
                 </div>
-								<div class="i2_detail" :style="{ display: hideshow ? 'block' : 'none' }">
+                <div
+                  class="i2_detail"
+                  :style="{ display: hideshow ? 'block' : 'none' }"
+                >
                   <span style="color: #999ba3">
                     1、课程名称统一不加书名号。<br />
                     2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息
@@ -75,56 +114,118 @@
                 </div>
               </div>
               <div class="mbl_items2">
-								<div class="item_nam" style="margin-top: 8px;">
+                <div class="item_nam" style="margin-top: 8px">
                   <div class="asterisk_icon">
-										<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                    <img
+                      src="@/assets/images/coursewareManage/asterisk.png"
+                      alt=""
+                    />
                   </div>
                   <span style="margin-right: 14px">封面图</span>
                 </div>
                 <div class="item_inp">
-									<div style="width:440px;height:70px;display: flex;justify-content: flex-start;align-items: center;">
+                  <div
-										<img v-for="(item, index) in optionsUrl" :key="index" class="choiceoptionurl"
+                    style="
-											:style="item.value == feng_mian_1 ? 'border:3px solid rgb(78, 166, 255);' : ''" :src="item.value"
+                      width: 440px;
-											:alt="item.name" @click="choicePic(item.value)" />
+                      height: 100px;
-									</div>
+                      display: flex;
-									<!-- <a-select
+                      justify-content: flex-start;
-                    :getPopupContainer="
+                      align-items: center;
-                      (triggerNode) => {
-                        return triggerNode.parentNode || document.body;
-                      }
                     "
-                    v-model:value="feng_mian_1"
+                  >
-                    dropdownClassName="dropdown-style"
+                    <img
-                    style="width: 440px"
+                      v-for="(item, index) in optionsUrl"
-                    placeholder="请选择"
+                      :key="index"
-                    :options="optionsUrl"
+                      class="choiceoptionurl"
-                    allowClear
+                      :style="{
-                    showSearch
+                        border:
-                  /> -->
+                          pathBgId === item.id
-									<img class="i_upload_img" v-if="feng_mian_1" :src="feng_mian_1"
+                            ? '3px solid rgba(78, 166, 255, 1)'
-										style="width:220px;height:120px;border-radius: 8px;" alt="avatar" />
+                            : '1px solid #ccc',
+                        display: index >= 3 ? 'none' : 'flex',
+                      }"
+                      :src="item.value"
+                      :alt="item.name"
+                      @click="chooseImg(item)"
+                    />
+                    <div
+                      @click="showLearnBgMore"
+                      class="learnBgItem learnBgMore"
+                    >
+                      查看更多
+                      <img src="../../assets/images/projectadd/go.png" />
+                    </div>
+                  </div>
+
+                  <!-- <img
+                    class="i_upload_img"
+                    v-if="feng_mian_1"
+                    :src="feng_mian_1"
+                    style="width: 220px; height: 120px; border-radius: 8px"
+                    alt="avatar"
+                  />
                   <div class="i_bottom">
                     <span style="color: #999ba3">
                       高宽比为16:9 (如:800*450) png或jpg图片
                     </span>
-									</div>
+                  </div> -->
                 </div>
               </div>
               <div class="mbl_items">
-								<div class="item_nam">
+                <div class="item_nam" style="margin-bottom: 102px">
                   <div class="asterisk_icon">
-										<img style="width: 10px; height: 10px" src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                    <img
+                      style="width: 10px; height: 10px"
+                      src="@/assets/images/coursewareManage/asterisk.png"
+                      alt=""
+                    />
                   </div>
                   <span style="margin-right: 14px">目标人群</span>
                 </div>
                 <div class="item_inp">
                   <div class="i1_input">
-										<a-input v-model:value="qdms_inputV2" maxlength="50"
+                    <!-- <a-input v-model:value="qdms_inputV2" maxlength="50"
 											style="width: 440px; height: 40px; border-radius: 8px" placeholder="请输入目标人群" />
 										<div class="inp_num">
 											<span style="color: #c7cbd2">
 												{{ qdms_inputV2.length }}/50
 											</span>
+										</div> -->
+                    <div>
+                      <OrgClassCheck
+                        v-model:value="orgSelect"
+                        v-model:name="orgSelectName"
+                      ></OrgClassCheck>
+                    </div>
+                    <div style="margin-top: 10px">
+                      <a-select
+                        v-model:value="selectJobId"
+                        mode="multiple"
+                        style="width: 440px; min-height: 40px"
+                        placeholder="请选择岗位"
+                        :options="jobType"
+                        @change="handleChangeJob"
+                        :fieldNames="{
+                          key: 'id',
+                          label: 'name',
+                          value: 'id',
+                        }"
+                      ></a-select>
+                    </div>
+                    <div style="margin-top: 10px">
+                      <a-select
+                        v-model:value="selectBandName"
+                        mode="multiple"
+                        style="width: 440px; min-height: 40px"
+                        placeholder="请选择Band"
+                        :options="bandList"
+                        @change="handleChangeBand"
+                        :fieldNames="{
+                          key: 'id',
+                          label: 'name',
+                          value: 'id',
+                        }"
+                      ></a-select>
                     </div>
                   </div>
                 </div>
@@ -132,49 +233,87 @@
               <div class="mbl_items">
                 <div class="item_nam">
                   <div class="asterisk_icon">
-										<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk" />
+                    <img
+                      src="@/assets/images/coursewareManage/asterisk.png"
+                      alt="asterisk"
+                    />
+                  </div>
+                  <span style="margin-right: 14px">资源归属</span>
+                </div>
+                <div class="item_inp">
+                  <div class="select i6_input" style="width: 440px">
+                    <OrgClass
+                      v-model:value="sourceBelongId"
+                      v-model:name="sourceBelongName"
+                    ></OrgClass>
+                  </div>
+                </div>
+              </div>
+              <div class="mbl_items">
+                <div class="item_nam">
+                  <div class="asterisk_icon">
+                    <img
+                      src="@/assets/images/coursewareManage/asterisk.png"
+                      alt="asterisk"
+                    />
                   </div>
                   <span style="margin-right: 14px">内容分类</span>
                 </div>
                 <div class="item_inp">
                   <div class="select i6_input">
-										<a-tree-select style="width: 440px" placeholder="请选择内容分类" :treeDefaultExpandAll="true"
+                    <a-tree-select
-											             :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
+                      style="width: 440px"
+                      placeholder="请选择内容分类"
+                      :treeDefaultExpandAll="true"
+                      :getPopupContainer="
+                        (triggerNode) => triggerNode.parentNode || document.body
+                      "
                       v-model:value="fen_lei"
                       :tree-data="sysTypeOptions"
                       :fieldNames="{
                         children: 'children',
                         label: 'name',
                         value: 'code',
-                                        }">
+                      }"
+                    >
                     </a-tree-select>
                   </div>
                 </div>
               </div>
               <div v-if="fen_lei" class="mbl_items">
                 <div class="item_nam">
-									<div class="asterisk_icon">
+                  <div class="asterisk_icon"></div>
-									</div>
                   <span style="margin-right: 14px"> </span>
                 </div>
                 <div class="item_inp">
                   <div class="select i6_input">
-										<div style="width:440px;height:26px;font-size: 14px;color: rgb(153, 155, 163);">
+                    <div
+                      style="
+                        width: 440px;
+                        height: 26px;
+                        font-size: 14px;
+                        color: rgb(153, 155, 163);
+                      "
+                    >
                       所属层级：{{ fen_lei1 }}
                     </div>
                   </div>
                 </div>
               </div>
               <div class="mbl_items">
-								<div class="item_nam" style="margin-bottom:110px;">
+                <div class="item_nam" style="margin-bottom: 110px">
                   <span style="margin-right: 14px">课程价值</span>
                 </div>
                 <div class="item_inp">
                   <div class="i1_input">
-										<a-textarea v-model:value="qdms_inputV3" maxlength="200"
+                    <a-textarea
-											style="width: 440px; height: 140px; border-radius: 8px" placeholder="请输入课程价值" />
+                      v-model:value="qdms_inputV3"
-										<div class="inp_num" style="top:110px;">
+                      maxlength="200"
-											<span style="color: #c7cbd2;">
+                      style="width: 440px; height: 140px; border-radius: 8px"
+                      placeholder="请输入课程价值"
+                    />
+                    <div class="inp_num" style="top: 110px">
+                      <span style="color: #c7cbd2">
                         {{ qdms_inputV3.length }}/200
                       </span>
                     </div>
@@ -188,8 +327,12 @@
                 </div>
                 <div class="item_inp">
                   <div class="i1_input">
-										<a-input v-model:value="chang_jin" maxlength="50"
+                    <a-input
-											style="width: 440px; height: 40px; border-radius: 8px" placeholder="请输入场景" />
+                      v-model:value="chang_jin"
+                      maxlength="50"
+                      style="width: 440px; height: 40px; border-radius: 8px"
+                      placeholder="请输入场景"
+                    />
                     <div class="inp_num">
                       <span style="color: #c7cbd2">
                         {{ chang_jin.length }}/50
@@ -214,10 +357,19 @@
                   <span style="margin-right: 14px">内容标签</span>
                 </div>
                 <div class="item_inp">
-									<a-input v-model:value="tags_val_single" style="width: 440px; height: 40px; border-radius: 8px"
+                  <a-input
-										placeholder="请输入内容标签按回车键添加内容标签，可添加多个内容标签。" @pressEnter="handleTagChange" />
+                    v-model:value="tags_val_single"
+                    style="width: 440px; height: 40px; border-radius: 8px"
+                    placeholder="请输入内容标签按回车键添加内容标签，可添加多个内容标签。"
+                    @pressEnter="handleTagChange"
+                  />
                   <div class="tag-content">
-										<a-tag v-for="(item, index) in tags_val" :key="index" closable @close="handleTagClose(item)">
+                    <a-tag
+                      v-for="(item, index) in tags_val"
+                      :key="index"
+                      closable
+                      @close="handleTagClose(item)"
+                    >
                       {{ item }}
                     </a-tag>
                   </div>
@@ -244,16 +396,23 @@
 -->
 
               <div class="mbl_items2">
-								<div class="item_nam" style="margin-top: 8px;">
+                <div class="item_nam" style="margin-top: 8px">
                   <div class="asterisk_icon">
-										<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk" />
+                    <img
+                      src="@/assets/images/coursewareManage/asterisk.png"
+                      alt="asterisk"
+                    />
                   </div>
                   <span style="margin-right: 14px">课程简介</span>
                 </div>
                 <div class="item_inp">
                   <div class="i10_textarea">
-										<a-textarea v-model:value="qdms_inputV6" maxlength="150"
+                    <a-textarea
-											style="width: 440px; height: 100px; border-radius: 8px" placeholder="请输入" />
+                      v-model:value="qdms_inputV6"
+                      maxlength="150"
+                      style="width: 440px; height: 100px; border-radius: 8px"
+                      placeholder="请输入"
+                    />
                     <div class="inp_num">
                       <span style="color: #c7cbd2">
                         {{ qdms_inputV6.length }}/150
@@ -263,7 +422,7 @@
                 </div>
               </div>
               <div class="mbl_items">
-								<div class="item_nam" style="margin-top: 8px;">
+                <div class="item_nam" style="margin-top: 8px">
                   <span style="margin-right: 10px">附件</span>
                 </div>
                 <div class="item_inp">
@@ -278,10 +437,19 @@
             </div>
             <div v-if="ft_hs" class="fotarea">
               <div style="border: 1px solid #ccc">
-								<Toolbar style="border-bottom: 1px solid #ccc" :editor="editorRef" :defaultConfig="toolbarConfig"
+                <Toolbar
-									:mode="mode" />
+                  style="border-bottom: 1px solid #ccc"
-								<Editor style="height: 250px; overflow-y: hidden" v-model="valueHtml" :defaultConfig="editorConfig"
+                  :editor="editorRef"
-									:mode="mode" @onCreated="handleCreated" />
+                  :defaultConfig="toolbarConfig"
+                  :mode="mode"
+                />
+                <Editor
+                  style="height: 250px; overflow-y: hidden"
+                  v-model="valueHtml"
+                  :defaultConfig="editorConfig"
+                  :mode="mode"
+                  @onCreated="handleCreated"
+                />
               </div>
             </div>
           </div>
@@ -303,6 +471,49 @@
       <a-spin :spinning="addLoading" tip="" />
     </div>
   </a-modal>
+
+  <!-- 更多背景图 v-model:visible="learnBgMore"  -->
+  <a-modal
+    :closable="sh"
+    centered="true"
+    v-model:visible="learnBgMore"
+    :footer="null"
+    wrapClassName="courseBgMoreModal"
+    :z-index="9999"
+  >
+    <div class="main">
+      <div class="top">
+        <div class="topc">面授课封面</div>
+        <div @click="closeLearnBgMore">
+          <img
+            style="width: 20px; height: 20px"
+            src="../../assets/images/basicinfo/close.png"
+          />
+        </div>
+      </div>
+      <div class="imagesBox">
+        <div
+          @click="chooseImg(item)"
+          v-for="item in optionsUrl"
+          :key="item.id"
+          class="learnBgItem"
+          :style="{
+            border:
+              pathBgId === item.id
+                ? '3px solid rgba(78, 166, 255, 1)'
+                : '1px solid #ccc',
+            'background-image': 'url(' + item.value + ')',
+          }"
+        >
+          <!-- <img class="im" :src="item.source" /> -->
+        </div>
+      </div>
+      <div class="btn">
+        <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+        <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
+      </div>
+    </div>
+  </a-modal>
 </template>
 <script>
 import {
@@ -326,13 +537,16 @@ import FJUpload from "@/components/common/FJUpload";
 import * as moment from "moment";
 import * as api2 from "../../api/indexAudit";
 import { useStore } from "vuex";
-
+import OrgClassCheck from "@/components/project/OrgClassCheck";
+import OrgClass from "@/components/project/OrgClass";
 export default defineComponent({
   components: {
     Editor,
     Toolbar,
     FJUpload,
     NameInput,
+    OrgClassCheck,
+    OrgClass,
   },
   props: {
     xzinputV1: {
@@ -367,39 +581,78 @@ export default defineComponent({
       auditDescription: "",
       contentClassify: [],
       // 课程三级分类
+      projectInfo: { id: "" },
+      //选择的封面图id及url
+      pathBgId: null,
+      pathBgUrl: null,
+      learnBgMore: false, //封面图弹窗
+
+      //目标任务
+      orgSelect: [],
+      orgSelectName: [],
+      orgSelectFullName: [],
+      selectJobName: [],
+      selectJobId: [],
+      selectBandName: [],
+      selectBandId: [],
+      //资源归属
+      sourceBelongId: [],
+      sourceBelongName: [],
+      sourceBelongFullName: [],
     });
     const store = useStore();
     console.log(store, 666);
     const sysTypeOptions = computed(() => store.state.content_type);
     const optionsUrl = computed(() => store.state.course_pic);
+    console.log("optionsUrl", optionsUrl);
+    //获取岗位
+    const jobType = computed(() => store.state.job_type);
+    //获取band
+    const bandList = computed(() => store.state.band);
+    console.log("jobTypebandList", jobType, bandList);
+    watch(
+      () => state.fen_lei,
+      () => {
+        state.fen_lei1 = findClassFullName(sysTypeOptions.value);
+      }
+    );
 
-    watch(()=>state.fen_lei,()=>{
+    function findClassFullName(list, name = "") {
-      state.fen_lei1 = findClassFullName(sysTypeOptions.value)
+      return (
+        list &&
+        list.length > 0 &&
+        list
+          .map((e) => {
+            return state.fen_lei === e.code
+              ? name
+                ? name + "-" + e.name
+                : e.name
+              : findClassFullName(
+                  e.children,
+                  name ? name + "-" + e.name : e.name
+                );
           })
-
+          .filter((name) => name)
-    function findClassFullName(list,name=''){
+          .join("")
-		
+      );
-     return list && list.length > 0 && list.map(e=>{
-       return  state.fen_lei === e.code ? name?name+'-'+e.name:e.name : findClassFullName(e.children,name?name+'-'+e.name:e.name)
-      }).filter(name=>name).join('')
     }
 
     // 删除文件返回参数
     const changevalue = (e) => {
-			let arr = state.attach.split(',')
+      let arr = state.attach.split(",");
-			let newarr = []
+      let newarr = [];
       for (let i = 0; i < arr.length; i++) {
         if (i !== e) {
-					newarr.push(arr[i])
+          newarr.push(arr[i]);
         }
       }
       if (newarr.length == 0) {
         state.attach = "";
       } else {
-				state.attach = newarr.toString()
+        state.attach = newarr.toString();
-			}
-			console.log('changevalue', e, newarr, state.attach)
       }
+      console.log("changevalue", e, newarr, state.attach);
+    };
 
     const visibleOpen = (offcourseId, name) => {
       state.offcourseId = offcourseId;
@@ -427,7 +680,7 @@ console.log(store,666);
       state.ft_hs = false;
       ft_exit();
       emit("noEdit");
-		}
+    };
 
     expose({
       visibleOpen,
@@ -459,7 +712,20 @@ console.log(store,666);
 
       valueHtml.value = "";
 
+      //目标任务
+      state.orgSelect = [];
+      state.orgSelectName = [];
+      state.orgSelectFullName = [];
+      state.selectJobName = [];
+      state.selectJobId = [];
+      state.selectBandName = [];
+      state.selectBandId = [];
+      //资源归属
+      state.sourceBelongId = [];
+      state.sourceBelongName = [];
+      state.sourceBelongFullName = [];
       // valueHtml.value = "";
+      console.log("清空");
     };
 
     //  富文本 sssssssssssssss
@@ -512,10 +778,11 @@ console.log(store,666);
     //  富文本 eeeeeeeeeeeeee
 
     // 点击图片选择图片
-		const choicePic = (value) => {
+    const chooseImg = (item) => {
-			console.log(111111112);
+      console.log(item);
-			state.feng_mian_1 = value;
+      state.pathBgId = item.id;
-		}
+      state.feng_mian_1 = item.value;
+    };
 
     //获取分类、场景、封面图、-----------字典配置-------------------------------
     const options2 = ref([]);
@@ -545,6 +812,13 @@ console.log(store,666);
 
     //保存面授课
     const handlePush = async (param) => {
+      console.log(
+        "组织、岗位、Band、资源归属选择",
+        state.orgSelect,
+        state.selectJobId,
+        state.selectBandId,
+        state.sourceBelongId
+      );
       let files = "";
       if (state.imgList.length) {
         state.imgList.forEach((item) => {
@@ -552,12 +826,42 @@ console.log(store,666);
         });
       }
       files = files.slice(0, files.length - 1);
-			console.log("filesfiles", files);
-			const offName = await validateName({ name: state.qdms_inputV1, type: 2, id: state.offcourseId }).then(res => {
 
+      let orgSelect = [];
+      if (state.orgSelect && state.orgSelect.length) {
+        state.orgSelect.forEach((item) => {
+          orgSelect.push({
+            label: item.label,
+            value: item.value,
+          });
+        });
+      }
+
+      let selectJobId = "";
+      if (state.selectJobId.length) {
+        state.selectJobId.forEach((item) => {
+          selectJobId += item + ",";
+        });
+      }
+      selectJobId = selectJobId.slice(0, selectJobId.length - 1);
+
+      let selectBandId = "";
+      if (state.selectBandId.length) {
+        state.selectBandId.forEach((item) => {
+          selectBandId += item + ",";
+        });
+      }
+      selectBandId = selectBandId.slice(0, selectBandId.length - 1);
+
+      console.log("filesfiles", files);
+      const offName = await validateName({
+        name: state.qdms_inputV1,
+        type: 2,
+        id: state.offcourseId,
+      }).then((res) => {
         return res.data.data === 1;
       });
-			console.log('校验重复',offName)
+      console.log("校验重复", offName);
       if (offName) {
         message.destroy();
         return message.warning("课程名称重复，请重新填写");
@@ -578,19 +882,34 @@ console.log(store,666);
         intro: state.qdms_inputV6,
         attach: state.attach,
         outline: valueHtml.value,
+        organizationIds: orgSelect,
+        jobTypeIds: selectJobId,
+        bandIds: selectBandId,
+        sourceBelongId: state.sourceBelongId,
+        sourceBelongFullName: state.sourceBelongName,
       };
-			console.log("postData");
+      console.log("postData", postData);
-			console.log(postData);
       const checkList = [
         postData.name,
-				postData.targetUser,
+        // postData.targetUser,
         // postData.categoryId,
         postData.sysTypeId,
         // postData.teacherId,
         postData.picUrl,
         postData.intro,
+        postData.sourceBelongId,
       ];
       console.log("checkList", checkList);
+      if (
+        !postData.organizationIds &&
+        !postData.jobTypeIds &&
+        !postData.bandIds
+      ) {
+        message.destroy();
+        return message.error("请输入必填项");
+      } else {
+        state.addLoading = true;
+      }
       if (!checkVal(checkList)) {
         message.destroy();
         return message.error("请输入必填项");
@@ -649,7 +968,9 @@ console.log(store,666);
         });
         if (res.rows && res.rows.length > 0) {
           let i = res.rows.length;
-					state.auditDescription = res.rows[i - 1].description ? res.rows[i - 1].description : "-";
+          state.auditDescription = res.rows[i - 1].description
+            ? res.rows[i - 1].description
+            : "-";
         }
       }
 
@@ -659,17 +980,19 @@ console.log(store,666);
       state.qdms_inputV3 = item.meaning;
       // state.fen_lei = item.categoryId;
       state.fen_lei = item.sysTypeId;
-			state.chang_jin = String(item.sceneContent ? item.sceneContent : '');
+      state.chang_jin = String(item.sceneContent ? item.sceneContent : "");
       state.tags_val = item.tips ? item.tips.split(",") : [];
       state.qdms_inputV6 = item.intro;
       state.member = { value: item.teacherId, name: item.teacher };
       valueHtml.value = item.outline;
-			let arrss = item.attach.split(',')
+      let arrss = item.attach.split(",");
-			let str = ''
+      let str = "";
       for (let i = 0; i < arrss.length; i++) {
-				i == arrss.length - 1 ? str += arrss[i].slice(arrss[i].lastIndexOf('/') + 1) : str += arrss[i].slice(arrss[i].lastIndexOf('/') + 1) + ','
+        i == arrss.length - 1
+          ? (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1))
+          : (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1) + ",");
       }
-			console.log(str)
+      console.log(str);
       state.attach = str;
     };
 
@@ -687,7 +1010,7 @@ console.log(store,666);
     //提交审核
     const reviewClick = () => {
       if (state.offcourseId) {
-				submitReview(state.offcourseId)
+        submitReview(state.offcourseId);
       } else {
         handlePush("review");
       }
@@ -716,6 +1039,23 @@ console.log(store,666);
         }
       });
     };
+    //目标人群
+    const handleChangeJob = (e, k) => {
+      console.log("eeee", e, k);
+      state.selectJobId = e;
+    };
+    const handleChangeBand = (e, k) => {
+      console.log("eeeeeeeeeee", e, k);
+      state.selectBandId = e;
+    };
+    //封面图
+    const showLearnBgMore = () => {
+      state.learnBgMore = true;
+    };
+    //关闭更多路径背景弹窗
+    const closeLearnBgMore = () => {
+      state.learnBgMore = false;
+    };
 
     return {
       ...toRefs(state),
@@ -725,6 +1065,8 @@ console.log(store,666);
       options3,
       options4,
       optionsUrl,
+      jobType,
+      bandList,
       hideShow,
       visibleOpen,
       visibleClose,
@@ -739,8 +1081,12 @@ console.log(store,666);
       toolbarConfig,
       editorConfig,
       handleCreated,
-			choicePic,
+      chooseImg,
       changevalue,
+      showLearnBgMore,
+      closeLearnBgMore,
+      handleChangeJob,
+      handleChangeBand,
     };
   },
 });
@@ -1147,14 +1493,136 @@ console.log(store,666);
   }
 
   .choiceoptionurl {
-		width: 60px;
+    width: 100px;
-		height: 60px;
+    height: 100px;
     margin-right: 10px;
     border-radius: 8px;
   }
+  .learnBgItem {
+    border-radius: 8px;
+    width: 100px;
+    height: 100px;
+    background-size: 100%;
+    background-repeat: no-repeat;
+    // margin-bottom: 20px;
+    margin-right: 6px;
+  }
+
+  .learnBgMore {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 1px solid #c7cbd2;
+    font-size: 14px;
+    font-weight: 400;
+    color: #4ea6ff;
+    line-height: 36px;
+    cursor: pointer;
+  }
 
   .aeLoading {
     z-index: 10000;
   }
 }
+.coursemodal {
+  .i1_input {
+    .ant-select-selector {
+      min-height: 40px !important;
+      border-radius: 8px !important;
+      border: 1px solid #c7cbd2 !important;
+    }
+  }
+}
+.courseBgMoreModal {
+  .ant-modal {
+    width: 680px !important;
+    height: 528px !important;
+
+    .ant-modal-content {
+      width: 680px !important;
+      height: 528px !important;
+
+      .ant-modal-body {
+        width: 680px !important;
+        height: 528px !important;
+        padding: 0 !important;
+
+        .main {
+          display: flex;
+          flex-direction: column;
+
+          .top {
+            padding-left: 51px;
+            padding-right: 51px;
+            padding-top: 28px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            cursor: pointer;
+
+            .topc {
+              font-size: 16px;
+              font-weight: bold;
+              color: #000000;
+              line-height: 36px;
+            }
+          }
+
+          .imagesBox {
+            display: flex;
+            //  justify-content: space-between;
+            flex-wrap: wrap;
+            padding-left: 51px;
+            padding-right: 39px;
+            margin-top: 20px;
+            height: 350px;
+            overflow-y: auto;
+
+            .learnBgItem {
+              border-radius: 8px;
+              width: 136px;
+              height: 106px;
+              background-size: 100%;
+              background-repeat: no-repeat;
+              margin-bottom: 20px;
+              margin-right: 10px;
+            }
+          }
+
+          .btn {
+            width: 100%;
+            position: absolute;
+            bottom: 30px;
+            margin-top: 30px;
+            display: flex;
+            justify-content: center;
+
+            .samtn {
+              width: 100px;
+              height: 40px;
+              font-size: 14px;
+              border: 1px solid #4ea6ff;
+              border-radius: 8px;
+              cursor: pointer;
+            }
+
+            .btn1 {
+              background-color: #fff;
+              color: #4ea6ff;
+            }
+
+            .btn2 {
+              background-color: #4ea6ff;
+              color: #fff;
+              margin-left: 16px;
+            }
+          }
+        }
+      }
+    }
+    .ant-modal-close-x {
+      display: none;
+    }
+  }
+}
 </style>

src/views/learningpath/LearningPath.vue

@@ -90,7 +90,7 @@
     <div v-if="tableDataTotal" style="padding: 10px 35px">
       <a-table
         :header-cell-style="{ 'text-align': 'center' }"
-        style="border: 1px solid #f2f6fe;"
+        style="border: 1px solid #f2f6fe"
         :columns="tableDataFunc()"
         :data-source="tableData"
         :loading="tableLoading"
@@ -101,20 +101,58 @@
         <template #bodyCell="{ record, column }">
           <template v-if="column.key === 'operation'">
             <a-space>
-            <a-button v-if="record.state==='草稿' && checkPer(record.permissions)" @click="showPub(record)" type="link">发布</a-button>
+              <a-button
-            <a-button v-if="record.state==='草稿' && checkPer(record.permissions)" @click="getLearnPathInfo(record.id)" type="link">编辑</a-button>
+                v-if="record.state === '草稿' && checkPer(record.permissions)"
-            <a-button v-if="record.state==='已发布' && checkPer(record.permissions)" @click="getLearnPathInfo(record.id)" type="link">编辑</a-button>
+                @click="showPub(record)"
+                type="link"
+                >发布</a-button
+              >
+              <a-button
+                v-if="record.state === '草稿' && checkPer(record.permissions)"
+                @click="getLearnPathInfo(record.id)"
+                type="link"
+                >编辑</a-button
+              >
+              <a-button
+                v-if="record.state === '已发布' && checkPer(record.permissions)"
+                @click="getLearnPathInfo(record.id)"
+                type="link"
+                >编辑</a-button
+              >
               <a-button @click="manage(record.id)" type="link">管理</a-button>
               <DropDown v-if="checkPer(record.permissions)" value="授权">
-              <OwnerTableModelStudent :types="[7,8,9]" :id="record.id" :type="9">权限名单</OwnerTableModelStudent>
+                <OwnerTableModelStudent
-              <CommonStudent :type="7" :id="record.id" title="查看权">查看权</CommonStudent>
+                  :types="[7, 8, 9]"
-              <CommonStudent :type="8" :id="record.id" title="管理权">管理权</CommonStudent>
+                  :id="record.id"
+                  :type="9"
+                  >权限名单</OwnerTableModelStudent
+                >
+                <CommonStudent :type="7" :id="record.id" title="查看权"
+                  >查看权</CommonStudent
+                >
+                <CommonStudent :type="8" :id="record.id" title="管理权"
+                  >管理权</CommonStudent
+                >
               </DropDown>
               <DropDown v-if="checkPer(record.permissions)" value="更多">
-              <a-button @click="showCopyModal(record.id)" type="link">复制</a-button>
+                <a-button @click="showCopyModal(record.id)" type="link"
-              <a-button @click="showDeleteModal(record.id)" type="link" danger>删除</a-button>
+                  >复制</a-button
-              <a-button v-if="record.state==='已发布'" @click="showBackModal(record.id)" type="link">撤回</a-button>
+                >
-              <a-button v-if="record.state==='已发布'" @click="showStopModal(record.id)" type="link">结束</a-button>
+                <a-button @click="showDeleteModal(record.id)" type="link" danger
+                  >删除</a-button
+                >
+                <a-button
+                  v-if="record.state === '已发布'"
+                  @click="showBackModal(record.id)"
+                  type="link"
+                  >撤回</a-button
+                >
+                <a-button
+                  v-if="record.state === '已发布'"
+                  @click="showStopModal(record.id)"
+                  type="link"
+                  >结束</a-button
+                >
               </DropDown>
               <!-- <a-button v-if="record.state==='已结束'" @click="showStartModal(record.id)" type="link">启用</a-button> -->
             </a-space>
@@ -244,7 +282,12 @@
           </div>
           <div class="btn">
             <button class="samtn btn1" @click="handleOut">取消</button>
-            <a-button class="samtn btn2" @click="createLearnPath" :loading="confirmLoading">确定</a-button>
+            <a-button
+              class="samtn btn2"
+              @click="createLearnPath"
+              :loading="confirmLoading"
+              >确定</a-button
+            >
           </div>
 
           <div
@@ -344,7 +387,7 @@
                       ? '2px solid rgba(78, 166, 255, 1)'
                       : '1px solid #ccc',
                   'background-image': 'url(' + item.value.split(',')[0] + ')',
-                  display: index >= 5 ? 'none' : 'flex',
+                  display: index >= 3 ? 'none' : 'flex',
                 }"
                 style="background-size: 100% 100%"
               >
@@ -368,7 +411,12 @@
           </div>
           <div class="btn">
             <button class="samtn btn1" @click="handleOut1">取消</button>
-            <a-button class="samtn btn2" @click="editLearnPath" :loading="confirmLoading">确定</a-button>
+            <a-button
+              class="samtn btn2"
+              @click="editLearnPath"
+              :loading="confirmLoading"
+              >确定</a-button
+            >
           </div>
         </div>
       </div>
@@ -390,7 +438,9 @@
           height: 68px;
           display: flex;
           align-items: center;
-          justify-content: space-between;">
+          justify-content: space-between;
+        "
+      >
         <div class="headerLeft" style="margin-left: 32px">
           <span style="width: 15px; height: 15px"
             ><img src="../../assets/images/taskpage/pub.png"
@@ -720,7 +770,7 @@ export default {
   setup() {
     const store = useStore();
     const router = useRouter();
-    const userInfo = computed(()=>store.state.userInfo)
+    const userInfo = computed(() => store.state.userInfo);
     const state = reactive({
       confirmLoading: false,
       tableLoading: false,
@@ -874,14 +924,14 @@ export default {
     const chooseImg = (item) => {
       console.log(item);
       state.pathBgId = item.code;
-      state.pathBg = item.value.split(',')[0];
+      state.pathBg = item.value.split(",")[0];
-      state.mobilePicUrl = item.value.split(',')[1];
+      state.mobilePicUrl = item.value.split(",")[1];
     };
     const chooseImg2 = (item) => {
       // console.log(item);
       state.pathBgId = item.code;
-      state.pathBg = item.value.split(',')[0];
+      state.pathBg = item.value.split(",")[0];
-      state.mobilePicUrl = item.value.split(',')[1];
+      state.mobilePicUrl = item.value.split(",")[1];
     };
     //发布弹窗
     const showPub = (router) => {
@@ -961,10 +1011,14 @@ export default {
     const copyLearnPath = () => {
       state.copyModal = false;
       state.tableLoading = true;
-      api.handleLearnPath({
+      api
+        .handleLearnPath({
           routerId: state.copyPathId,
           type: 2,
-      }).then(() => {getLearnPath();})
+        })
+        .then(() => {
+          getLearnPath();
+        });
       message.success("复制成功");
     };
 
@@ -1158,30 +1212,30 @@ export default {
     };
     //创建学习路径图
     const createLearnPath = async () => {
-      state.confirmLoading = true
+      state.confirmLoading = true;
       if (!state.pathName) {
         message.destroy();
-        state.confirmLoading = false
+        state.confirmLoading = false;
         return message.warning("请输入路径图名称");
       }
       if (!state.organizationSelectName) {
         message.destroy();
-        state.confirmLoading = false
+        state.confirmLoading = false;
         return message.warning("请选择归属组织");
       }
       if (!state.pathBg) {
         message.destroy();
-        state.confirmLoading = false
+        state.confirmLoading = false;
         return message.warning("请选择背景图");
       }
       if (!state.mobilePicUrl) {
         message.destroy();
-        state.confirmLoading = false
+        state.confirmLoading = false;
         return message.warning("未配置H5背景图，请联系管理员！");
       }
       if (!state.validate) {
         message.destroy();
-        state.confirmLoading = false
+        state.confirmLoading = false;
         message.warning("路径图名称重复");
         return;
       }
@@ -1194,10 +1248,11 @@ export default {
       });
       if (offName) {
         message.destroy();
-        state.confirmLoading = false
+        state.confirmLoading = false;
         return message.warning("项目名称重复，请重新填写");
       }
-      api.createLearnPath({
+      api
+        .createLearnPath({
           name: state.pathName,
           remark: state.pathIntro,
           status: 0,
@@ -1205,12 +1260,13 @@ export default {
           organizationName: state.organizationSelectName,
           picUrl: state.pathBg,
           mobilePicUrl: state.mobilePicUrl,
-      }).then(id => {
-          message.destroy();
-          state.confirmLoading = false
-          message.success("创建成功");
-          router.push( {path: "/leveladd",query:{routerId: id.data.data }})
         })
+        .then((id) => {
+          message.destroy();
+          state.confirmLoading = false;
+          message.success("创建成功");
+          router.push({ path: "/leveladd", query: { routerId: id.data.data } });
+        });
     };
 
     //获取学习路径列表
@@ -1260,35 +1316,39 @@ export default {
       state.deleteModal = false;
       state.tableLoading = true;
       message.success("删除成功");
-      api.handleLearnPath({routerId: state.deletePathId, type: -2}).then(() => {getLearnPath()})
+      api
+        .handleLearnPath({ routerId: state.deletePathId, type: -2 })
+        .then(() => {
+          getLearnPath();
+        });
     };
 
     //编辑学习路径图
     const editLearnPath = async () => {
-      state.confirmLoading = true
+      state.confirmLoading = true;
       if (!state.pathName) {
         message.destroy();
-        state.confirmLoading = false
+        state.confirmLoading = false;
         return message.warning("请输入路径图名称");
       }
       if (!state.organizationSelectName) {
         message.destroy();
-        state.confirmLoading = false
+        state.confirmLoading = false;
         return message.warning("请选择归属组织");
       }
       if (!state.pathBgId) {
         message.destroy();
-        state.confirmLoading = false
+        state.confirmLoading = false;
         return message.warning("请选择背景图");
       }
       if (!state.mobilePicUrl) {
         message.destroy();
-        state.confirmLoading = false
+        state.confirmLoading = false;
         return message.warning("未配置H5背景图，请联系管理员！");
       }
       if (!state.validate) {
         message.destroy();
-        state.confirmLoading = false
+        state.confirmLoading = false;
         return message.warning("路径图名称重复");
       }
       // state.pathName = detail.name;
@@ -1308,11 +1368,11 @@ export default {
       });
       if (offName) {
         message.destroy();
-        state.confirmLoading = false
+        state.confirmLoading = false;
         return message.warning("项目名称重复，请重新填写");
       }
       state.out1 = false;
-      state.confirmLoading = false
+      state.confirmLoading = false;
       message.success("修改成功");
       state.tableLoading = true;
       let obj = {
@@ -1325,7 +1385,9 @@ export default {
         organizationId: state.organizationSelectId,
         status: 0,
       };
-      api.createLearnPath(obj).then(() => {getLearnPath()})
+      api.createLearnPath(obj).then(() => {
+        getLearnPath();
+      });
     };
     //选择状态
     const selectStatusClassify = (e, v) => {
@@ -1452,10 +1514,10 @@ export default {
     );
     function manage(id) {
       // TODO 为了点击顶部面包屑导航返回而存储
-      localStorage.setItem('routerId',id)
+      localStorage.setItem("routerId", id);
       router.push({
         path: "/leveladd",
-        query:{routerId:id}
+        query: { routerId: id },
       });
     }
 
@@ -1476,11 +1538,13 @@ export default {
             state.organizationSelectId = detail.organizationId;
             state.pathIntro = detail.remark;
             state.editPathId = id;
-              const imgDict = imgData.value.find((img)=>img.value.split(',')[0] === state.pathBg)
+            const imgDict = imgData.value.find(
+              (img) => img.value.split(",")[0] === state.pathBg
+            );
             if (imgDict) {
               state.pathBgId = imgDict.code;
-                state.pathBg = imgDict.value.split(',')[0];
+              state.pathBg = imgDict.value.split(",")[0];
-                state.mobilePicUrl = imgDict.value.split(',')[1];
+              state.mobilePicUrl = imgDict.value.split(",")[1];
             }
 
             //for (let i = 0; i < arr.length; i++) {
@@ -1541,7 +1605,7 @@ export default {
       showLearnBgMore,
       closeLearnBgMore,
       checkPer,
-      getLearnPathInfo
+      getLearnPathInfo,
     };
   },
 };

src/views/research/ManagePage.vue

@@ -35,7 +35,8 @@
           </div>
           <div style="width: 88px; margin-right: 126px; float: left">
             <span class="name">状态:</span>
-            <span class="descript">{{basicInfo.releaseStatus?basicInfo.releaseStatus==1?"待发布":basicInfo.releaseStatus==2?"已发布":"已结束":''}}</span>
+            <span
+              class="descript">{{ basicInfo.releaseStatus ? basicInfo.releaseStatus == 1 ? "待发布" : basicInfo.releaseStatus == 2 ? "已发布" : "已结束" : '' }}</span>
           </div>
           <div style="width: 192px; margin-right: 126px; float: left">
             <span class="name">创建时间:</span>
@@ -59,36 +60,22 @@
       </div>
       <!-- 表格 -->
       <div class="tableBox">
-        <a-table
+        <a-table style="border: 1px solid #f2f6fe" :columns="columns" :data-source="evalStuListData"
-          style="border: 1px solid #f2f6fe"
+          :loading="evalStuListLoading" expandRowByClick="true" :scroll="{ x: 1500 }" @expand="expandTable"
-          :columns="columns"
+          :pagination="false" />
-          :data-source="evalStuListData" 
-          :loading="evalStuListLoading"
-          expandRowByClick="true"
-          :scroll="{ x: 1500 }"
-          @expand="expandTable"
-          :pagination="false"
-        />
       </div>
       <!-- 表格 -->
       <!-- 分页 -->
       <div style="width:100%;display:flex;justify-content:center;align-items:center;">
-        <a-pagination 
+        <a-pagination v-if="evalStuListDataTotal > 10" :showSizeChanger="false" showQuickJumper="true"
-          v-if="evalStuListDataTotal > 10"
+          hideOnSinglePage="true" :pageSize="pageSize" :current="evalCurrentPage" :total="evalStuListDataTotal"
-          :showSizeChanger="false"
+          class="pagination" @change="changePaginationStu" />
-          showQuickJumper="true"
-          hideOnSinglePage="true"
-          :pageSize="pageSize"
-          :current="evalCurrentPage"
-          :total="evalStuListDataTotal"
-          class="pagination"
-          @change="changePaginationStu"
-        />
       </div>
       <!-- 分页 -->
     </div>
   </div>
-  <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="basicInfo.assessmentName" :basicdata="basicInfo"/>
+  <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="basicInfo.assessmentName"
+    :basicdata="basicInfo" />
 </template>
 
 <script>
@@ -156,7 +143,7 @@ export default {
 
     // 导出学员信息
     function exportStudentInfo() {
-      window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?assessmentId=${state.basicInfo.assessmentId}`)
+      window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?assessmentId=${router.currentRoute.value.params.id}`)
     }
 
     //分页
@@ -347,10 +334,12 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
+
   .up {
     width: 100%;
     display: flex;
     flex-direction: column;
+
     .header {
       width: 100%;
       display: flex;
@@ -359,6 +348,7 @@ export default {
       align-items: center;
       padding-right: 38px;
       border-bottom: 1px solid #f2f6fc;
+
       .text {
         font-size: 16px;
         color: #363636;
@@ -366,6 +356,7 @@ export default {
         margin-left: 38px;
         margin-bottom: 10px;
       }
+
       .export {
         float: left;
         width: 130px;
@@ -377,11 +368,13 @@ export default {
         text-align: center;
         padding-top: 7px;
       }
+
       .goback {
         float: right;
         padding-right: 70px;
         //padding-top: 37px;
         position: relative;
+
         .return {
           display: inline-block;
           width: 42px;
@@ -390,6 +383,7 @@ export default {
           margin-right: 10px;
           background-image: url("../../assets/images/projectadd/return.png");
         }
+
         .returntext {
           display: inline-block;
           position: absolute;
@@ -399,10 +393,12 @@ export default {
         }
       }
     }
+
     .message {
       width: 100%;
       display: flex;
       flex-direction: column;
+
       .title {
         color: #4f5156;
         font-size: 14px;
@@ -410,16 +406,19 @@ export default {
         margin-top: 20px;
         font-weight: 500;
       }
+
       .messagebox {
         //width: 100%;
         //display: flex;
         margin-top: 20px;
         margin-left: 38px;
         margin-bottom: 20px;
+
         .name {
           color: #999ba3;
           font-size: 14px;
         }
+
         .descript {
           color: #4f5156;
           font-size: 14px;
@@ -427,32 +426,37 @@ export default {
       }
     }
   }
+
   .split {
     width: 100%;
     height: 20px;
     background-color: #edf0f5;
   }
+
   .down {
     width: 100%;
     display: flex;
     flex-direction: column;
+
     .tableBox {
       margin: 20px 38px 30px;
+
       .opacationn {
         color: #4ea6ff;
         cursor: pointer;
       }
+
       th.ant-table-cell {
         background-color: #eff4fc !important;
         text-align: center;
         color: #999ba3;
       }
+
       td.ant-table-cell {
         text-align: center;
       }
-      .ant-table-tbody
+
-        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+      .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
-        > td {
         background: #f6f9fd;
       }
     }
@@ -496,5 +500,4 @@ export default {
     color: #4ea6ff;
     border: 1px solid #4ea6ff;
   }
-}
+}</style>
-</style>

vue.config.js

@@ -16,6 +16,7 @@ module.exports = defineConfig({
         proxy: {
             "/manageApi": {
                 target: 'http:' + process.env.VUE_APP_PROXY_URL,
+                // target: 'http://localhost:30001',
                 changeOrigin: true, //表示是否改变原域名
                 pathRewrite: {
                     "^/manageApi": "",