Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

src/components/drawers/AddActive.vue

@@ -33,7 +33,7 @@
                 v-model:value="inputV1"
                 style="width: 424px; height: 32px"
                 placeholder="请输入活动名称"
-                maxlength="50"
+                maxlength="20"
               />
             </div>
           </div>

src/components/drawers/AddEval.vue

@@ -19,7 +19,7 @@
             <div class="btnbox">
               <a-input v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入测评名称"
               show-count
-              :maxlength="50" />
+              :maxlength="20" />
             </div>
           </div>
           <div class="main_item">

src/components/drawers/AddFaceteach.vue

@@ -20,7 +20,7 @@
             </div>
             <div class="btnbox">
               <a-input v-model:value="courseName" style="width: 384px; height: 32px" placeholder="请输入名称"
-                       :maxlength="50"/>
+                       :maxlength="20"/>
             </div>
           </div>
           <div class="main_item">
@@ -32,11 +32,11 @@
             </div>
             <div class="btnbox">
               <button class="xkbtn" @click="showDrawerSelFacet">
-                {{ chooseCourseName ? chooseCourseName : "选择面授课" }}
+                {{ chooseCourseName  ? "重选": "选择"}}面授课
               </button>
               <div v-if="chooseCourse">
                 <a-tag closable color="processing" @close="logC">
-                  <span style="font-size:14px;line-height: 33px;">删除课程</span>
+                  <span style="font-size:14px;line-height: 33px;">{{chooseCourseName}}</span>
                 </a-tag>
               </div>
 
@@ -197,7 +197,9 @@
                 </a-tag>
               </div>
               <AssessmentList v-model:assessmentVisible="assessmentVisible" v-model:titleTag="titleTag"
-                              v-model:assessmentId="assessmentId"/>
+                              v-model:assessmentId="assessmentId"
+                              v-model:assessmentName="assessmentName"
+                              />
 
             </div>
           </div>
@@ -211,23 +213,39 @@
             </div>
             <div class="btnbox" @click="showDrawerAddHomework">
               <button class="xkbtn">配置</button>
-              <div v-if="EditWorkId > 0">
-                <a-tag closable color="processing" @close="logW">
-                  <span style="font-size:14px;line-height: 33px;">删除作业</span>
-                </a-tag>
-              </div>
 
             </div>
 
             <!-- 添加作业侧弹窗 -->
             <div>
               <add-homework v-model:addhomeworkVisible="addhomeworkvisible" @getWork="getWork" :faceLevel="true"
-                            v-model:EditWorkId="EditWorkId"/>
+                            v-model:EditWorkId="EditWorkId"
+                            v-model:workName="workName"
+                            />
             </div>
             <!-- 添加作业侧弹窗 -->
           </div>
-          <div>
+          <div   v-if="EditWorkId > 0" class="main_item">
+            <div class="signbox">
+              <span style="margin-right: 3px">已选作业：</span>
+            </div>
+            <div class="btnbox" @click="showDrawerAddHomework">
+              
+                <a-tag closable color="processing" @close="logW">
+                  <span style="font-size:14px;line-height: 33px;">{{workName}}</span>
+                </a-tag>
+             
 
+            </div>
+
+            <!-- 添加作业侧弹窗 -->
+            <div>
+              <add-homework v-model:addhomeworkVisible="addhomeworkvisible" @getWork="getWork" :faceLevel="true"
+                            v-model:EditWorkId="EditWorkId"
+                            v-model:workName="workName"
+                            />
+            </div>
+            <!-- 添加作业侧弹窗 -->
           </div>
           <div class="main_item">
             <div class="signbox">
@@ -235,18 +253,30 @@
             </div>
             <div class="btnbox" @click="showDrawerAddTest">
               <button class="xkbtn">配置</button>
-              <div v-if="EditTestId > 0">
-                <a-tag closable color="processing" @close="logT">
-                  <span style="font-size:14px;line-height: 33px;">删除考试</span>
-                </a-tag>
-              </div>
+           
 
             </div>
             <!-- 添加考试侧弹窗 -->
             <div>
-              <add-test v-model:addtestVisible="addtestvisible" v-model:EditTestId="EditTestId" :faceLevel="true"/>
+              <add-test v-model:addtestVisible="addtestvisible" v-model:EditTestId="EditTestId" 
+              v-model:testName="testName"
+               :faceLevel="true"/>
             </div>
             <!-- 添加考试侧弹窗 -->
+          </div>
+          <div  v-if="EditTestId > 0" class="main_item">
+            <div class="signbox">
+              <span style="margin-right: 3px">已选考试:</span>
+            </div>
+            <div class="btnbox" @click="showDrawerAddTest">
+          
+             
+                <a-tag closable color="processing" @close="logT">
+                  <span style="font-size:14px;line-height: 33px;">{{testName}}</span>
+                </a-tag>
+              </div>
+
+    
           </div>
           <div class="main_item">
             <div class="signbox">
@@ -379,6 +409,7 @@ export default {
       assessmentId: null,
       EditTestId: null,
       EditWorkId: null,
+      workName:null,
       assessmentVisible: false,
       needEval: false,
       onlySign: false,

src/components/drawers/AddHomework.vue

@@ -36,7 +36,7 @@
                     style="width: 424px; height: 32px; margin-left: 35px"
                     placeholder="请输入作业名称"
                     autocomplete="off"
-                    show-count :maxlength="50"
+                    show-count :maxlength="20"
                   />
                 </a-form-item>
               </div>
@@ -159,6 +159,10 @@ export default {
       type: Number,
       default: null,
     },
+    workName:{
+      type: String,
+      default: null,
+    },
     projectTaskId: {
       // 要编辑的projectId
       type: Number,
@@ -251,7 +255,9 @@ export default {
     };
 
     const resetForm = () => {
-      formRef.value.resetFields();
+      //formRef.value.resetFields();
+  
+    
     };
 
     const handleValidate = (...args) => {
@@ -284,7 +290,8 @@ export default {
       ctx.emit("update:addhomeworkVisible", false);
       ctx.emit("update:edit", false);
       ctx.emit("update:EditWorkId", state.EditWorkId);
-      console.log("state.EditWorkId==============", state.EditWorkId);
+      ctx.emit("update:workName", formState.workName);
+      console.log("state.EditWorkId==============", state.workName);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
       fileList.value = [];

src/components/drawers/AddRef.vue

@@ -42,7 +42,7 @@
                   v-model:value="inputV1"
                   style="width: 424px; height: 32px"
                   placeholder="请输入外链名称"
-                  show-count :maxlength="50"
+                  show-count :maxlength="20"
                 />
               </div>
             </div>

src/components/drawers/AddTest.vue

@@ -58,7 +58,7 @@
                       style="width: 424px; height: 32px; margin-left: 35px"
                       autocomplete="off"
                       placeholder="请输入考试名称"
-                      show-count :maxlength="50"
+                      show-count :maxlength="20"
                   />
                 </a-form-item>
               </div>
@@ -338,7 +338,7 @@
                       style="width: 424px; height: 32px; margin-left: 35px"
                       autocomplete="off"
                       placeholder="请输入考试名称"
-                      show-count :maxlength="50"
+                      show-count :maxlength="20"
                   />
                 </a-form-item>
               </div>
@@ -355,7 +355,7 @@
                       style="width: 424px; height: 32px; margin-left: 35px"
                       autocomplete="off"
                       placeholder="数据来源"
-                      show-count :maxlength="50"
+                      show-count :maxlength="20"
                   />
                 </a-form-item>
               </div>
@@ -466,6 +466,10 @@ export default {
       type: Number,
       default: null,
     },
+    testName:{
+      type: String,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const formState = reactive({
@@ -504,6 +508,7 @@ export default {
       paperName: "", //试卷名称 子组件传过来给考试抽屉选择试卷后框框用
       id: "",
       testName: "",
+      TestName:"",
       choosedTestList: [
         {
           value: "提高核心竞争力",
@@ -657,6 +662,8 @@ export default {
       ctx.emit("update:addtestVisible", false);
       ctx.emit("update:edit", false);
       ctx.emit("update:EditTestId", state.EditTestId);
+      ctx.emit("update:testName",  state.testName);
+      console.log("formState.testName", state.testName);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
       resetForm();

src/views/learningpath/LevelAddDetail.vue

@@ -905,7 +905,9 @@
             <div class="close_exit" @click="closedeleteAll"></div>
           </div>
           <div class="body">
-            <span>请确认是否批量删除任务</span>
+            <span
+              >请确认是否批量删除{{ deleteType === 1 ? "任务" : "学员" }}</span
+            >
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closedeleteAll">
@@ -1628,8 +1630,10 @@ export default {
       state.gqxy_hs = !state.gqxy_hs;
     };
     const showDeleteALLModal = (type) => {
-      if (state.selectRow.length === 0)
+      if (state.selectRow.length === 0){
+        message.destroy();
         return message.warning("请选择要删除的任务");
+      }
       state.deleteAll = true;
       state.deleteType = type;
     };