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

src/components/drawers/AddFaceteach.vue

@@ -29,13 +29,16 @@
               </div>
               <span style="margin-right: 3px">课程名称：</span>
             </div>
-            <div class="btnbox">
+            <div class="btnbox" style="position: relative">
               <a-input
                 v-model:value="courseName"
-                style="width: 384px; height: 32px"
-                placeholder="请输入名称"
+                style="width: 423px; height: 32px"
+                placeholder="请输入名称，最多输入20个字"
                 :maxlength="20"
               />
+              <div class="inp_num" style="position: absolute; right: 115px">
+                <span style="color: #c7cbd2"> {{ courseName.length }}/20 </span>
+              </div>
             </div>
           </div>
           <div class="main_item">
@@ -95,7 +98,7 @@
               </div>
               <span style="margin-right: 3px">授课教师：</span>
             </div>
-            <div class="btnbox">
+            <div class="btnbox" style="width: 423px">
               <!--              <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"-->
               <!--                               :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>-->
               <ProjectManager
@@ -238,7 +241,7 @@
               </a-checkbox>
             </div>
           </div>
-           -->       
+           -->
 
           <div class="main_item">
             <div class="signbox">
@@ -358,7 +361,9 @@
             </div>
             <div class="btnbox">
               <a-tag closable color="processing" @close="logT">
-                <span style="font-size: 14px; line-height: 33px">{{testName}}</span>
+                <span style="font-size: 14px; line-height: 33px">{{
+                  testName
+                }}</span>
               </a-tag>
             </div>
           </div>
@@ -405,8 +410,8 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
 
 import { detail } from "../../api/indexCourse";
 import { queryAppraiseDetailById } from "../../api/indexInvist";
-import {queryWorkDetailById} from "@/api/indexWork";
-import {queryExaminationDetailById} from "@/api/indexExam";
+import { queryWorkDetailById } from "@/api/indexWork";
+import { queryExaminationDetailById } from "@/api/indexExam";
 export default {
   name: "AddFaceteach",
   components: {
@@ -609,19 +614,22 @@ export default {
         state.EditWorkId = result.homeWorkId;
         state.assessmentId = result.evaluateId;
         state.needEval = result.evaluateId;
-        detail({offcourseId:result.offcourseId}).then((res)=>{
-          state.chooseCourseName =res.data.data.name;
-
+        detail({ offcourseId: result.offcourseId }).then((res) => {
+          state.chooseCourseName = res.data.data.name;
         });
-        queryAppraiseDetailById({assessmentId:result.evaluateId}).then((res)=>{
-          state.assessmentName =res.data.data.assessmentName;
-        });
-        queryWorkDetailById({workId:result.homeWorkId}).then((res)=>{
+        queryAppraiseDetailById({ assessmentId: result.evaluateId }).then(
+          (res) => {
+            state.assessmentName = res.data.data.assessmentName;
+          }
+        );
+        queryWorkDetailById({ workId: result.homeWorkId }).then((res) => {
           state.workName = res.data.data.workName;
         });
-        queryExaminationDetailById({ examinationId: result.testId }).then((res)=>{
-          state.testName = res.data.data.examinationName;
-        });
+        queryExaminationDetailById({ examinationId: result.testId }).then(
+          (res) => {
+            state.testName = res.data.data.examinationName;
+          }
+        );
         console.log("state=======", state);
       });
     };
@@ -730,7 +738,7 @@ export default {
         await ProjectEditTask(editObj)
           .then(() => {
             console.log("props.EditFaceId", props.EditFaceId);
-           // message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+            // message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
           })
           .catch(() => {
             //message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);

src/components/drawers/AddOnline.vue

@@ -31,7 +31,8 @@
                 />
               </div>
             </div>
-            <div class="mii_ipt">
+            <!-- 2022-12-10注释 后面放开 李晓鸽 -->
+            <!-- <div class="mii_ipt">
               <div class="ipt_name">课程分类：</div>
               <div class="select">
                 <a-select
@@ -44,7 +45,7 @@
                   showSearch
                 />
               </div>
-            </div>
+            </div> -->
           </div>
           <div class="mi_btns">
             <div class="btn btn1" @click="searchList()">
@@ -98,7 +99,7 @@
               <div class="pa">
                 <a-pagination
                   v-if="tableDataTotal > 10"
-                  showSizeChanger="true"
+                  :showSizeChanger="false"
                   showQuickJumper="true"
                   hideOnSinglePage="true"
                   :pageSize="pageSize"
@@ -129,7 +130,7 @@
             <div class="pa">
               <a-pagination
                 v-if="tableDataTotal > 10"
-                showSizeChanger="true"
+                :showSizeChanger="false"
                 showQuickJumper="true"
                 hideOnSinglePage="true"
                 :pageSize="pageSize"
@@ -159,7 +160,7 @@ import {
   RouterEditTask,
   IsExistence,
   IsExistenceProject,
-  IsExistenceProjectTemplate
+  IsExistenceProjectTemplate,
 } from "@/api/indexTask";
 import { addTempTask } from "../../api/indexTaskadd";
 export default {
@@ -572,9 +573,10 @@ export default {
           projectTaskId: props.projectTaskId || 0,
           stageId: props.chooseStageId || 0,
           type: 1,
-        }).then(res=>{
-          console.log(res)
-          console.log("模板项目中是否包含此在线课了", res);
+        })
+          .then((res) => {
+            console.log(res);
+            console.log("模板项目中是否包含此在线课了", res);
             if (res.data.data.length) {
               let strdata = res.data.data;
               let tipStr = "";
@@ -599,21 +601,26 @@ export default {
                   type: 1,
                 })
                   .then((res) => {
-                    console.log('新增或者编辑在线课',res)
+                    console.log("新增或者编辑在线课", res);
                     message.destroy();
-                    message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`);
+                    message.success(
+                      `${props.edit ? "编辑" : "新增"}模板库任务成功`
+                    );
                     ctx.emit("changeData", false);
                     closeDrawer();
                   })
                   .catch(() => {
                     message.destroy();
-                    message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`);
+                    message.error(
+                      `${props.edit ? "编辑" : "新增"}模板库任务失败`
+                    );
                   });
-              })
+              });
             }
-        }).catch(err=>{
-          console.log(err)
-        })
+          })
+          .catch((err) => {
+            console.log(err);
+          });
       }
       //if(state.addOnlineList.Target==undefined){
       // closeDrawer();

src/components/project/ProjectManager.vue

@@ -69,7 +69,7 @@ export default {
 
     onMounted(() => {
       console.log("onMounted");
-      init()
+      init();
     });
 
     function getMember() {