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

src/App.vue

@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 
 const store = useStore();
 const isLogin = ref(false);
-console.log("版本2.3.4------------");
+console.log("版本2.3.5------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);

src/components/drawers/AddOpenCourse.vue

@@ -570,6 +570,8 @@ async function coursePlanConfirm() {
   }
   offCourseNewVisiable.value = false;
   tableRef.value.toLoading();
+  // TODO 当点击选择了是否评估按钮 点击保存的时候没有选择评估 则是否需要评估重置为 0 不需要
+  formData.value.evalFlag = formData.value.assessmentName ? 1 : 0;
   await request(COURSE_PLAN_EDIT, { ...formData.value });
   handleCancelStu();
   tableRef.value.fetch();
@@ -614,6 +616,10 @@ const changevalue = (e) => {
   console.log("changevalue", e, newarr, formData.value.attach);
 }
 
+const logT = () => {
+  formData.value.examInfo = {};
+};
+
 defineExpose({ openDrawer });
 </script>
 <style lang="scss">

src/components/drawers/CommonTest.vue

@@ -19,6 +19,25 @@
       </div>
       <div style="display: flex; flex-direction: row; padding-top: 0px; margin-top: 20px; margin-left: 32px;">
         <div>
+          <div v-if="info?.examinationName >= 0">
+            <button
+                v-if="info?.examType == 1"
+                style="width: 100px; cursor: pointer;"
+                @click="changeOuter(1)"
+                :class="formData.examType === 1  ? 'outer' : 'notOuter'"
+            >
+              系统考试
+            </button>
+            <button
+                v-else
+                style="width: 100px; cursor: pointer;"
+                @click="changeOuter(2)"
+                :class="formData.examType === 2  ? 'outer' : 'notOuter'"
+            >
+              外部考试
+            </button>
+          </div>
+          <div v-else>
             <button
                 style="width: 100px; cursor: pointer;"
                 @click="changeOuter(1)"
@@ -35,6 +54,7 @@
             </button>
           </div>
         </div>
+      </div>
 
       <div v-if="formData.examType===1" class="contentMain">
         <div class="main_left">
@@ -50,6 +70,7 @@
             </div>
             <div class="btnbox">
               <a-input
+                  :disabled="info?.examinationName >= 0?true:false"
                   v-model:value="formData.examinationName"
                   style="width: 400px; height: 40px; border-radius: 8px"
                   placeholder="请输入考试名称"
@@ -70,7 +91,7 @@
             </div>
             <s-test v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
               <div class="btnbox">
-                <button class="xkbtn" style="margin:0">
+                <button class="xkbtn" style="margin:0" :disabled="info?.examinationName >= 0?true:false">
                   {{ formData.examinationPaperId ? "重选" : "选择" }}试卷
                 </button>
               </div>
@@ -117,6 +138,7 @@
             </div>
             <div class="select">
               <a-input-number
+                  :disabled="info?.examinationName >= 0?true:false"
                   :min="0"
                   :max="999999"
                   :precision="0"
@@ -138,6 +160,7 @@
             </div>
             <div class="btnbox">
               <a-input
+                  :disabled="info?.examinationName >= 0?true:false"
                   v-model:value="formData.passLine"
                   type="number"
                   style="width: 400px; height: 40px; border-radius: 8px"
@@ -152,6 +175,7 @@
             </div>
             <div class="textarea">
               <a-textarea
+                  :disabled="info?.examinationName >= 0?true:false"
                   v-model:value="formData.examinationExplain"
                   placeholder="请输入考试说明"
                   allow-clear
@@ -170,6 +194,7 @@
                 <div class="timerbox">
                   <span>允许重复考试：</span>
                   <a-input-number
+                      :disabled="info?.examinationName >= 0?true:false"
                       :min="-1"
                       :max="999999"
                       :precision="0"
@@ -194,6 +219,7 @@
             </div>
             <div class="btnbox">
               <a-radio-group
+                  :disabled="info?.examinationName >= 0?true:false"
                   style="margin-right: 12px"
                   v-model:value="formData.showAnswers"
               >
@@ -208,6 +234,7 @@
             </div>
             <div class="btnbox">
               <a-radio-group
+                  :disabled="info?.examinationName >= 0?true:false"
                   style="margin-right: 12px"
                   v-model:value="formData.showAnalysis"
               >
@@ -222,6 +249,7 @@
             </div>
             <div class="btnbox">
               <a-radio-group
+                  :disabled="info?.examinationName >= 0?true:false"
                   style="margin-right: 12px"
                   v-model:value="formData.scoringModel"
               >
@@ -238,6 +266,7 @@
             </div>
             <div class="btnbox">
               <a-radio-group
+                  :disabled="info?.examinationName >= 0?true:false"
                   style="margin-right: 12px"
                   v-model:value="formData.questionArrangement"
               >
@@ -405,6 +434,7 @@ watch(() => formData.value.examType, () => {
 })
 
 watch([props, visible], () => {
+  console.log(props.info)
   resetFields(props.info)
   dateTime.value = [props.info?.examinationStartTime || '', props.info?.examinationEndTime || '']
 })

src/views/learningpath/LearningPath.vue

@@ -138,11 +138,11 @@
                 <a-button @click="showCopyModal(record.id)" type="link"
                   >复制</a-button
                 >
-                <a-button @click="showDeleteModal(record.id)" type="link" danger
+                <a-button v-if="record.state !== '已发布'" @click="showDeleteModal(record.id)" type="link" danger
                   >删除</a-button
                 >
                 <a-button
-                  v-if="record.state === '已发布'"
+                  v-if="record.state === '已发布' && record.status!== -1"
                   @click="showBackModal(record.id)"
                   type="link"
                   >撤回</a-button

src/views/projectcenter/ProjectManage.vue

@@ -198,13 +198,13 @@
                   type="link"
                   >结束</a-button
                 >
-                <a-button
+              </DropDown>
+              <!-- <a-button
                   v-if="record.status == -1"
                   @click="showBackFinashModal(record.id)"
                   type="link"
                   >撤回</a-button
-                >
-              </DropDown>
+                > -->
             </a-space>
           </template>
         </template>

src/views/projectcenter/TaskPage.vue

@@ -815,6 +815,7 @@
                   </div>
                   <ImpoterGroupLeader
                     title="导入小组长"
+                    @change="handleChangeGroupLeader"
                     :data="{ targetId: projectId, type: 1 }"
                     :url="`/admin/studentGroup/importGroup`"
                   >
@@ -4897,6 +4898,13 @@ export default {
     function previewPic() {
       state.modal1Visible = true;
     }
+    // 导入小组长成功回调
+    function handleChangeGroupLeader(e) {
+      if(e=="end"){
+        message.destroy();
+        message.success("导入小组长成功");
+      }
+    }
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -5020,7 +5028,8 @@ export default {
       jdSelectChange1,
       studytimeRank,
       xsSelectChange,
-      changePagination
+      changePagination,
+      handleChangeGroupLeader
     };
   },
 };