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

src/components/drawers/AddCase.vue

@@ -64,7 +64,6 @@
             :pagination="false"
           />-->
           <a-table
-            
             class="ant-table-striped"
             :row-class-name="
               (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
@@ -92,7 +91,8 @@
                 class="pagination"
                 @change="handelChangePage"
               />
-          </div></div>
+            </div>
+          </div>
         </div>
       </div>
       <div class="main_btns">
@@ -171,7 +171,7 @@ export default {
       time: undefined,
       caseId: null,
       caseName: "",
-      isClick: false
+      isClick: false,
     });
     const closeDrawer = () => {
       ctx.emit("update:addcaseVisible", false);
@@ -218,6 +218,7 @@ export default {
       }
       state.selectedRowKeys = selectedRowKeys;
       state.apiTaskList = selectedRows;
+      console.log("selectedRows", selectedRows);
     };
     const handelChangePage = (page, pageSize) => {
       state.selectedRowKeys = [];
@@ -282,8 +283,8 @@ export default {
         }
         if (state.isClick) {
           message.destroy();
-					message.error('请勿频繁点击')
+          message.error("请勿频繁点击");
-					return
+          return;
         }
         state.isClick = true;
         for (let i = 0; i < state.apiTaskList.length; i++) {
@@ -310,8 +311,8 @@ export default {
       } else if (props.isLevel == 2) {
         if (state.isClick) {
           message.destroy();
-					message.error('请勿频繁点击')
+          message.error("请勿频繁点击");
-					return
+          return;
         }
         state.isClick = true;
         for (let i = 0; i < state.apiTaskList.length; i++) {
@@ -340,8 +341,8 @@ export default {
       } else if (props.isLevel == 3) {
         if (state.isClick) {
           message.destroy();
-					message.error('请勿频繁点击')
+          message.error("请勿频繁点击");
-					return
+          return;
         }
         state.isClick = true;
         for (let i = 0; i < state.apiTaskList.length; i++) {
@@ -350,7 +351,9 @@ export default {
               courseId: Number(state.apiTaskList[i].casesId),
               name: state.apiTaskList[i].title,
               projectTaskId: props.projectTaskId,
-              projectTemplateId: Number(localStorage.getItem("projectTemplateId")),
+              projectTemplateId: Number(
+                localStorage.getItem("projectTemplateId")
+              ),
               stageId: Number(props.chooseStageId) || 0,
               type: 3,
             })

src/components/drawers/AddOnline.vue

@@ -1,12 +1,21 @@
 <template>
-	<a-drawer :visible="addonlineVisible" class="drawerStyle addonlineDrawer" width="80%" title="添加在线" placement="right"
+  <a-drawer
-		@after-visible-change="afterVisibleChange">
+    :visible="addonlineVisible"
+    class="drawerStyle addonlineDrawer"
+    width="80%"
+    title="添加在线"
+    placement="right"
+    @after-visible-change="afterVisibleChange"
+  >
     <div class="drawerMain">
       <div class="header">
         <div v-if="edit" class="headerTitle">编辑在线</div>
         <div v-else 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="main_items">
@@ -14,16 +23,19 @@
             <div class="mii_ipt">
               <div class="ipt_name"></div>
               <div class="fi_input">
-								<a-input v-model:value="inputV1" style="
+                <a-input
+                  v-model:value="inputV1"
+                  style="
                     width: 280px;
                     height: 40px;
                     border-radius: 8px;
                     padding-right: 49px;
-                  " placeholder="请输入课程名称" maxlength="20" />
+                  "
+                  placeholder="请输入课程名称"
+                  maxlength="20"
+                />
                 <div class="inp_num" style="position: absolute; right: 7px">
-									<span style="color: #c7cbd2">
+                  <span style="color: #c7cbd2"> </span>
-
-									</span>
                 </div>
               </div>
             </div>
@@ -79,19 +91,34 @@
           <!-- 编辑的表格 -->
           <div>
             <div>
-							<a-table class="ant-table-striped" :row-class-name="
+              <a-table
+                class="ant-table-striped"
+                :row-class-name="
                   (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
-							" :row-selection="{
+                "
+                :row-selection="{
                   type: 'radio',
                   selectedRowKeys: selectedRowKeys,
                   onChange: onSelectChange,
-}" :columns="tableDataFunc()" :data-source="tableData" :loading="tableDataTotal === -1 ? true : false"
+                }"
-								:pagination="false" />
+                :columns="tableDataFunc()"
-							<div class="tableBox" style="margin-top:85px;">
+                :data-source="tableData"
+                :loading="tableDataTotal === -1 ? true : false"
+                :pagination="false"
+              />
+              <div class="tableBox" style="margin-top: 85px">
                 <div class="pa">
-									<a-pagination v-if="tableDataTotal > 10" :showSizeChanger="false" showQuickJumper="true"
+                  <a-pagination
-										hideOnSinglePage="true" :pageSize="pageSize" :current="currentPage" :total="tableDataTotal"
+                    v-if="tableDataTotal > 10"
-										class="pagination" @change="handelChangePage" />
+                    :showSizeChanger="false"
+                    showQuickJumper="true"
+                    hideOnSinglePage="true"
+                    :pageSize="pageSize"
+                    :current="currentPage"
+                    :total="tableDataTotal"
+                    class="pagination"
+                    @change="handelChangePage"
+                  />
                 </div>
               </div>
             </div>
@@ -232,7 +259,7 @@ export default {
       pageSize: 10,
       choicecourse: true,
       ddLoading: false,
-			isClick: false
+      isClick: false,
     });
     const ChoiceCourse = () => {
       state.choicecourse = false;
@@ -256,9 +283,7 @@ export default {
       }
     };
     //TODO 根据id 获取在线课信息
-		const getOnlineById = () => {
+    const getOnlineById = () => {};
-
-		}
     const tableDataFunc = () => {
       const columns = [
         // {
@@ -317,6 +342,7 @@ export default {
       return columns;
     };
     const onSelectChange = (selectedRowKeys, selectedRows) => {
+      console.log("selectedRows", selectedRows);
       state.selectedRowKeys = selectedRowKeys;
       state.addOnlineList = selectedRows;
       console.log(selectedRowKeys, selectedRows);
@@ -357,7 +383,9 @@ export default {
             createTime: value.sysCreateTime,
             publishTime: value.publishTime,
             courseId: Number(value.onlineClassesId),
+            studyTime: value.studyTime,
           };
+          // console.log("objobjobjobj", obj, value);
           array.push(obj);
         }
       });
@@ -458,8 +486,8 @@ export default {
         console.log("需要查询的在线课ID", l_data_id);
         if (state.isClick) {
           message.destroy();
-					message.error('请勿频繁点击')
+          message.error("请勿频繁点击");
-					return
+          return;
         }
         state.isClick = true;
         IsExistence({
@@ -487,7 +515,7 @@ export default {
               return;
             } else {
               state.addOnlineList.map((value) => {
-								console.log(value);
+                console.log("要添加的在线课任务", value);
                 RouterEditTask({
                   chapterId: Number(props.isactive),
                   courseId: value.num,
@@ -495,6 +523,7 @@ export default {
                   routerId: props.routerId,
                   routerTaskId: props.routerTaskId || 0,
                   type: 1,
+                  duration: value.studyTime,
                 })
                   .then((res) => {
                     if (res.data.code == 200) {
@@ -533,8 +562,8 @@ export default {
         console.log("需要查询的在线课ID", p_data_id);
         if (state.isClick) {
           message.destroy();
-					message.error('请勿频繁点击')
+          message.error("请勿频繁点击");
-					return
+          return;
         }
         state.isClick = true;
         IsExistenceProject({
@@ -569,6 +598,7 @@ export default {
                     projectTaskId: props.projectTaskId || 0,
                     stageId: props.chooseStageId || 0,
                     type: 1,
+                    duration: value.studyTime,
                   })
                   .then(() => {
                     message.destroy();
@@ -589,7 +619,6 @@ export default {
             console.log(err);
           });
       } else if (props.isLevel == 3) {
-
         let p_data = state.addOnlineList;
         let p_data_id = [];
         p_data.map((item) => {
@@ -598,8 +627,8 @@ export default {
         console.log("需要查询的在线课ID", p_data_id);
         if (state.isClick) {
           message.destroy();
-					message.error('请勿频繁点击')
+          message.error("请勿频繁点击");
-					return
+          return;
         }
         state.isClick = true;
         IsExistenceProjectTemplate({
@@ -625,8 +654,7 @@ export default {
             return;
           } else {
             state.addOnlineList.map((value) => {
-
+              console.log(props, props.projectTemplateId, props.projectTaskId);
-							console.log(props, props.projectTemplateId, props.projectTaskId)
               addTempTask({
                 courseId: value.num,
                 name: value.name,
@@ -634,24 +662,28 @@ export default {
                 projectTaskId: props.projectTaskId || 0,
                 stageId: props.chooseStageId || 0,
                 type: 1,
+                duration: value.studyTime,
               })
                 .then((res) => {
-									console.log('新增或者编辑在线课', res)
+                  console.log("新增或者编辑在线课", res);
                   message.destroy();
-									message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`);
+                  message.success(
+                    `${props.edit ? "编辑" : "新增"}模板库任务成功`
+                  );
                   ctx.emit("changeData", false);
                   closeDrawer();
                   state.isClick = false;
                 })
                 .catch(() => {
                   message.destroy();
-									message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`);
+                  message.error(
+                    `${props.edit ? "编辑" : "新增"}模板库任务失败`
+                  );
                   state.isClick = false;
                 });
-						})
+            });
           }
         });
-
       }
       //if(state.addOnlineList.Target==undefined){
       // closeDrawer();
@@ -674,9 +706,7 @@ export default {
       state.currentPage = 1;
       getAllOnlineText();
     };
-		onMounted(() => {
+    onMounted(() => {});
-
-		});
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -878,7 +908,9 @@ export default {
           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;
         }
 

src/components/drawers/AddTest.vue

@@ -1,11 +1,19 @@
 <template>
-	<a-drawer :visible="addtestVisible" class="drawerStyle addtestDrawer" width="80%" placement="right"
+  <a-drawer
-		@after-visible-change="afterVisibleChange">
+    :visible="addtestVisible"
+    class="drawerStyle addtestDrawer"
+    width="80%"
+    placement="right"
+    @after-visible-change="afterVisibleChange"
+  >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">{{ edit ? "编辑" : "添加" }}考试</div>
-				<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+        <img
-					@click="closeDrawer2" />
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer2"
+        />
       </div>
       <!-- 2022-11-30注释 后面放开 修改div的padding-topL:32 -->
       <div style="display: flex; flex-direction: row; padding-top: 0px">
@@ -31,20 +39,30 @@
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-								<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
               </div>
               <span style="margin-right: 3px">考试名称：</span>
             </div>
             <div class="btnbox">
-							<a-input v-model:value="test.examinationName" style="width: 400px; height: 40px; border-radius: 8px"
+              <a-input
-								placeholder="请输入考试名称" :maxlength="20" />
+                v-model:value="test.examinationName"
+                style="width: 400px; height: 40px; border-radius: 8px"
+                placeholder="请输入考试名称"
+                :maxlength="20"
+              />
             </div>
           </div>
 
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-								<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
               </div>
               <span style="margin-right: 3px">选择试卷：</span>
             </div>
@@ -62,8 +80,11 @@
             </div>
             <!-- 选择面授侧弹窗 -->
             <div>
-							<sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse"
+              <sel-facet
-								v-model:chooseCourseName="chooseCourseName" />
+                v-model:selfacetVisible="selfacetvisible"
+                v-model:chooseCourse="chooseCourse"
+                v-model:chooseCourseName="chooseCourseName"
+              />
             </div>
             <!-- 选择面授侧弹窗 -->
           </div>
@@ -71,25 +92,41 @@
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-								<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
               </div>
               <span style="margin-right: 3px">考试时间：</span>
             </div>
             <div class="btnbox">
-							<a-range-picker style="width: 400px; height: 40px; border-radius: 8px" show-time format="YYYY/MM/DD HH:mm"
+              <a-range-picker
-								v-model:value="test.chooseTime" :placeholder="['      开始时间', '        结束时间']" />
+                style="width: 400px; height: 40px; border-radius: 8px"
+                show-time
+                format="YYYY/MM/DD HH:mm"
+                v-model:value="test.chooseTime"
+                :placeholder="['      开始时间', '        结束时间']"
+              />
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-								<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
               </div>
               <span style="margin-right: 3px">考试时长：</span>
             </div>
             <div class="select">
-							<a-input-number :min="0" :max="300" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
+              <a-input-number
-								v-model:value="test.examinationDuration"></a-input-number>
+                :min="0"
+                :max="300"
+                :precision="0"
+                style="width: 400px; height: 40px; border-radius: 8px"
+                v-model:value="test.examinationDuration"
+              ></a-input-number>
               <span style="color: #999999; margin-left: 8px">分钟</span>
             </div>
           </div>
@@ -98,8 +135,14 @@
               <span style="margin-right: 3px">考试说明：</span>
             </div>
             <div class="textarea">
-							<a-textarea v-model:value="test.examinationExplain" placeholder="请输入考试说明" allow-clear show-count
+              <a-textarea
-								:maxlength="200" :rows="6" />
+                v-model:value="test.examinationExplain"
+                placeholder="请输入考试说明"
+                allow-clear
+                show-count
+                :maxlength="200"
+                :rows="6"
+              />
             </div>
           </div>
           <div class="main_item2">
@@ -110,13 +153,21 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>允许重复考试：</span>
-									<a-input-number :min="-1" :max="300" :precision="0" style="
+                  <a-input-number
+                    :min="-1"
+                    :max="300"
+                    :precision="0"
+                    style="
                       width: 100px;
                       height: 32px;
                       border-radius: 8px;
                       overflow: hidden;
-                    " v-model:value="test.examinationLimit"></a-input-number>
+                    "
-									<span style="color: #999999; margin-left: 8px">次,-1表示无限制</span>
+                    v-model:value="test.examinationLimit"
+                  ></a-input-number>
+                  <span style="color: #999999; margin-left: 8px"
+                    >次,-1表示无限制</span
+                  >
                 </div>
               </div>
             </div>
@@ -127,10 +178,15 @@
               <span style="margin-right: 3px">显示答案：</span>
             </div>
             <div class="btnbox">
-							<a-radio-group style="margin-right: 12px" v-model:value="test.showAnswers">
+              <a-radio-group
-								<a-radio v-model:checked="checked" :value="1" @click="cloradio1">允许查看
+                style="margin-right: 12px"
+                v-model:value="test.showAnswers"
+              >
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
+                  >允许查看
                 </a-radio>
-								<a-radio v-model:checked="checked" :value="2" @click="cloradio1">不允许查看
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
+                  >不允许查看
                 </a-radio>
               </a-radio-group>
             </div>
@@ -140,10 +196,15 @@
               <span style="margin-right: 3px">显示解析：</span>
             </div>
             <div class="btnbox">
-							<a-radio-group style="margin-right: 12px" v-model:value="test.showAnalysis">
+              <a-radio-group
-								<a-radio v-model:checked="checked" :value="1" @click="cloradio2">允许查看
+                style="margin-right: 12px"
+                v-model:value="test.showAnalysis"
+              >
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio2"
+                  >允许查看
                 </a-radio>
-								<a-radio v-model:checked="checked" :value="2" @click="cloradio2">不允许查看
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio2"
+                  >不允许查看
                 </a-radio>
               </a-radio-group>
             </div>
@@ -153,21 +214,35 @@
               <span style="margin-right: 3px">评分模式：</span>
             </div>
             <div class="btnbox">
-							<a-radio-group style="margin-right: 12px" v-model:value="test.scoringModel">
+              <a-radio-group
-								<a-radio v-model:checked="checked" :value="1" @click="cloradio3">最高一次
+                style="margin-right: 12px"
+                v-model:value="test.scoringModel"
+              >
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio3"
+                  >最高一次
                 </a-radio>
-								<a-radio v-model:checked="checked" :value="2" @click="cloradio3">最后一次
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio3"
+                  >最后一次
                 </a-radio>
               </a-radio-group>
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
               <span style="margin-right: 3px">及格线：</span>
             </div>
             <div class="btnbox">
-							<a-input v-model:value="test.passLine" type="number"
+              <a-input
-								style="width: 400px; height: 40px; border-radius: 8px" />
+                v-model:value="test.passLine"
+                type="number"
+                style="width: 400px; height: 40px; border-radius: 8px"
+              />
 
               <span style="color: #999999; margin-left: 8px">分</span>
             </div>
@@ -178,14 +253,33 @@
                 <span style="margin-right: 3px">试题排列：</span>
               </div>
               <div class="btnbox">
-								<a-radio-group style="margin-right: 12px" v-model:value="test.questionArrangement">
+                <a-radio-group
-									<a-radio v-model:checked="checked" :value="1" @click="cloradio4">试题乱序
+                  style="margin-right: 12px"
+                  v-model:value="test.questionArrangement"
+                >
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="1"
+                    @click="cloradio4"
+                    >试题乱序
                   </a-radio>
-									<a-radio v-model:checked="checked" :value="2" @click="cloradio4">选项乱序
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="2"
+                    @click="cloradio4"
+                    >选项乱序
                   </a-radio>
-									<a-radio v-model:checked="checked" :value="3" @click="cloradio4">全部乱序
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="3"
+                    @click="cloradio4"
+                    >全部乱序
                   </a-radio>
-									<a-radio v-model:checked="checked" :value="4" @click="cloradio4">不乱序
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="4"
+                    @click="cloradio4"
+                    >不乱序
                   </a-radio>
                 </a-radio-group>
               </div>
@@ -309,7 +403,10 @@ export default {
         },
       ],
     });
-
+    state.test.showAnswers = 1;
+    state.test.showAnalysis = 1;
+    state.test.scoringModel = 2;
+    state.test.questionArrangement = 4;
     const clearAll = () => {
       state.test = {};
     };
@@ -389,6 +486,10 @@ export default {
         message.destroy();
         return message.warning("请输入考试时长");
       }
+      if (!state.test.passLine) {
+        message.destroy();
+        return message.warning("请输入及格线");
+      }
 
       state.addLoading = true;
       console.log("test", state.test);
@@ -400,10 +501,13 @@ export default {
       //   new Date(state.test.$slotschooseTime[1].$d).getTime() / 1000,
       //   "Y-M-D h:m"
       // );
-			state.test.examinationStartTime = dayjs(state.test.chooseTime[0]).format("YYYY-MM-DD HH:mm"),
+      (state.test.examinationStartTime = dayjs(state.test.chooseTime[0]).format(
-
+        "YYYY-MM-DD HH:mm"
-				state.test.examinationEndTime = dayjs(state.test.chooseTime[1]).format("YYYY-MM-DD HH:mm"),
+      )),
-				state.test.examinationPaperId = state.paperId;
+        (state.test.examinationEndTime = dayjs(state.test.chooseTime[1]).format(
+          "YYYY-MM-DD HH:mm"
+        )),
+        (state.test.examinationPaperId = state.paperId);
       //TODO缺少paperName字段
       state.test.examinationTestName = state.paperName;
 
@@ -764,7 +868,9 @@ export default {
         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;
       }
 

src/components/drawers/EvList.vue

@@ -54,7 +54,7 @@
               onChange: onSelectChange,
             }"
           />
-          <div class="tableBox" style="margin-top:85px;">
+          <div class="tableBox" style="margin-top: 85px">
             <div class="pa">
               <a-pagination
                 v-if="tableDataTotal > 10"
@@ -67,7 +67,8 @@
                 class="pagination"
                 @change="changePagination"
               />
-          </div></div>
+            </div>
+          </div>
         </div>
       </div>
       <div class="main_btns">
@@ -230,12 +231,12 @@ export default {
     const getAllEvalText = () => {
       let objael = {
         keyword: state.inputV1,
-       
       };
       api
         .choiceEvaluation(objael)
         .then((res) => {
           state.tableDataTotal = 9;
+          // console.log("测评列表", res.data.data);
           getTableDataList(res.data.data);
         })
         .catch(() => {});

src/components/student/CommonStudent.vue

@@ -4,11 +4,11 @@
   <div class="CommonStudent">
     <a-drawer
       :visible="visiable"
-      class="drawerStyle ProjCheckship"
+      class="drawerStyle ProjCheckship CommonStudent"
       placement="right"
       width="60%"
     >
-      <div class="drawerMain" id="ProjCheckship">
+      <div class="drawerMain" id="ProjCheckship" style="">
         <div class="header">
           <div class="headerTitle">
             {{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || "" }}
@@ -19,10 +19,8 @@
             @click="closeDrawer"
           />
         </div>
-        <div
+        <div style="display: flex; overflow-x: auto; overflow-y: auto">
-          style="width: 100%; display: grid; grid-template-columns: 750px auto"
+          <div class="tabs" style="min-width: 800px">
-        >
-          <div class="tabs" style="min-height: 800px">
             <a-tabs v-model:activeKey="activeKey">
               <a-tab-pane :key="1" tab="快速选人">
                 <div :style="{ height: screenHeight - 235 + 'px' }">
@@ -175,7 +173,7 @@
               </a-tab-pane>
             </a-tabs>
           </div>
-          <div class="right1">
+          <div class="right1" style="min-width: 200px">
             <div class="onerow">
               <div class="onleft">
                 <div class="already">已选</div>
@@ -663,10 +661,8 @@ watch(visiable, () => {
   .ant-tabs {
     overflow: visible;
   }
-}
   .right1 {
     border-left: 1px solid #f2f6fe;
-  width: 100%;
     margin-left: 20px;
     .onerow {
       display: flex;
@@ -840,4 +836,5 @@ watch(visiable, () => {
       }
     }
   }
+}
 </style>

src/views/courselibrary/CoursewareManage.vue

@@ -143,7 +143,6 @@
                   placeholder="请输入课程名称"
                   v-model:value="xzinputV1"
                   v-model:validate="validate"
-               
                   :maxlength="20"
                   show-count
                   :type="2"
@@ -226,7 +225,8 @@
               </div>
               <a-radio-group v-model:value="valueE1">
                 <div class="bc_box">
-                  <div class="bc_boxl">
+                  <!-- 2022-12-21 隐藏 后面放开 lixiaoge -->
+                  <!-- <div class="bc_boxl">
                     <div class="ol_checkbox" @click="expectOnline">
                       <a-radio
                         v-model:checked="checked"
@@ -237,7 +237,7 @@
                         线上
                       </a-radio>
                     </div>
-                  </div>
+                  </div> -->
                   <div class="bc_boxr">
                     <div class="ol_checkbox">
                       <a-radio
@@ -364,7 +364,6 @@
                         placeholder="请输入课程名称"
                         v-model:value="qdms_inputV1"
                         v-model:validate="validate"
-                     
                         :maxlength="20"
                         show-count
                         :type="2"
@@ -2278,7 +2277,11 @@
                 <span>{{ currentPlanItem.teacher }}</span>
               </div>
               <div class="stmm_i5">
-                <TableStudent :type="3" :id="offcoursePlanId" :columns="stuColumns">
+                <TableStudent
+                  :type="3"
+                  :id="offcoursePlanId"
+                  :columns="stuColumns"
+                >
                   <!--                  <template #extension = "data">-->
                   <!--                    <div style="display: flex">-->
                   <!--                      <button @click="handlJoinStu(data)">成绩录入</button>-->
@@ -4659,7 +4662,6 @@ export default defineComponent({
 
       console.log("state.validate", state.validate);
 
-
       if (!state.validate) {
         message.destroy();
         return message.warning("该课程名称已存在");

src/views/learningpath/LevelAddDetail.vue

@@ -206,7 +206,8 @@
               <router-link to="/leveladd">
                 <div style="display: flex">
                   <img
-                    class="img2" style="margin-right:22px;"
+                    class="img2"
+                    style="margin-right: 22px"
                     src="../../assets/images/leveladd/back.png"
                   />
                   <div class="return">返回</div>
@@ -688,7 +689,7 @@
                       </div>
                     </div>
                     <div style="width: 87px; text-align: center">
-                      {{ element.cretime }}分钟
+                      {{ element.cretime ? element.cretime + "分钟" : "-" }}
                     </div>
                     <div
                       style="
@@ -1313,9 +1314,9 @@ export default {
             console.log("删除关卡成功", res);
             message.destroy();
             message.success("删除关卡成功");
-            let chapter = localStorage.getItem("chapterId")
+            let chapter = localStorage.getItem("chapterId");
             if (state.deleteChapterId == chapter) {
-              localStorage.removeItem("chapterId")
+              localStorage.removeItem("chapterId");
             }
             closeDeleteChapter();
             getDetail();
@@ -1324,7 +1325,6 @@ export default {
             message.success("至少保留一个关卡");
             closeDeleteChapter();
           }
-          
         })
         .catch((err) => {
           console.log("删除关卡失败", err);
@@ -1418,13 +1418,16 @@ export default {
           state.chooseProjectList = JSON.stringify(state.level[i].taskList);
           console.log("state.level[i].taskList", state.level[i].taskList);
           state.level[i].taskList.forEach((element) => {
-            // console.log("element", element);
+            console.log("element", element);
             let obj = {
               id: element.routerTaskId,
               key: element.routerTaskId,
               lei: checkType(element.type),
               creater: element.name,
-              cretime: element.duration,
+              cretime:
+                element.duration || element.duration == 0
+                  ? element.duration
+                  : "-",
               checked1: element.flag,
               routerTaskId: element.routerTaskId,
               courseId: element.courseId,
@@ -1853,7 +1856,7 @@ export default {
       let obj = {
         chapterId: ele.chapterId,
         courseId: ele.courseId,
-        duration: ele.cretime,
+        duration: ele.cretime == "-" ? 0 : ele.cretime,
         flag: ele.checked1,
         name: ele.creater,
         routerId: ele.routerId,

src/views/projectcenter/TaskAdd.vue

@@ -437,9 +437,7 @@
             
             </div>
           </div>
-        -->
+        --></div>
-
-        </div>  
         <div class="boom">
           <div class="boomcen">
             <div class="onerow">
@@ -632,7 +630,11 @@
                         </div>
                       </div>
                       <div style="width: 87px; text-align: center">
-                        {{ element.cretime }}分钟
+                        {{
+                          element.cretime 
+                            ? element.cretime + "分钟"
+                            : "-"
+                        }}
                       </div>
                       <div
                         style="
@@ -1026,7 +1028,7 @@
             <div class="close_exit" @click="closeDeleteStage"></div>
           </div>
           <div class="body">
-            <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前阶段为第一阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span>
+            <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span>
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeDeleteStage">
@@ -1096,6 +1098,7 @@ export default {
       projectId: route.query.projectId,
       chooseStageId: null, 
       removeStageId: null,
+      onceChoice: true,
       edit: false,
       isLevel: 2, //学习路径1项目2模板库3
       // isRefEdit: 1, //外链编辑
@@ -1222,7 +1225,8 @@ export default {
               ? "投票"
               : "-",
           creater: value.name,
-          cretime: value.duration ? value.duration : "-",
+          cretime:
+            value.duration || value.duration == 0 ? value.duration : "-",
           checked1: value.flag ? true : false,
           checked: false, //是否选中类型
           courseId: value.courseId,
@@ -1253,7 +1257,8 @@ export default {
           array.push(obj);
         }
       });
-      state.level = array;
+      console.log(array)
+      state.level = array.sort((a,b)=>{ return a.id - b.id });
     };
 
     const tableDataFunc = () => {
@@ -1391,6 +1396,20 @@ export default {
       };
       await api.getTask(obj).then((res) => {
         console.log("22222", res.data.data.stageList);
+
+        if(state.onceChoice){
+          let data = res.data.data.stageList;
+          state.onceChoice = false;
+          let arraynew = []
+          for(let i=0;i<data.length;i++){
+            if(data[i].stageId!=='0'){
+              arraynew.push(data[i])
+            }
+          }
+          console.log(arraynew)
+          state.chooseStageId = Number(arraynew[arraynew.length-1].stageId);
+        }
+
         state.projectTitle = res.data.data.projectInfo.name;
         state.picUrl = res.data.data.projectInfo.picUrl;
         state.stageList = res.data.data.stageList;
@@ -1620,7 +1639,7 @@ export default {
     const showDeleteStage = (id) => {
       state.deleteStageId = id;
       state.deleteStageModal = true;
-      console.log(state.level)
+      console.log(state.level);
     };
     //关闭删除阶段弹窗
     const closeDeleteStage = () => {
@@ -1759,12 +1778,12 @@ export default {
     // 删除所有阶段
     const removeAllLevel = () => {
       // state.cancelModal = false;
-      console.log(state.level)
+      console.log(state.level);
       let removeArr = state.level;
       for (let i = 0; i < removeArr.length; i++) {
         let obj = {
-          stageId: removeArr[i].id
+          stageId: removeArr[i].id,
-        }
+        };
         apistage
           .deleteStage(obj)
           .then((res) => {
@@ -1787,7 +1806,7 @@ export default {
             }
           });
       }
-    }
+    };
 
     //选择单个任务
     const changeRow = (e) => {
@@ -1993,7 +2012,7 @@ export default {
       temporaryStorage,
       submitStorage,
       cancelStorage,
-      removeAllLevel
+      removeAllLevel,
     };
   },
 };

src/views/projectcenter/temTask.vue

@@ -455,7 +455,6 @@
             </div>
           </div>
 -->
-
         </div>
         <div class="boom">
           <div class="boomcen">
@@ -649,7 +648,7 @@
                         </div>
                       </div>
                       <div style="width: 87px; text-align: center">
-                        {{ element.cretime }}分钟
+                        {{ element.cretime ? element.cretime + "分钟" : "-" }}
                       </div>
                       <div
                         style="
@@ -1389,7 +1388,7 @@ export default {
               ? "投票"
               : "-",
           creater: value.name,
-          cretime: Number(value.duration) > 0 ? value.duration : "-",
+          cretime: value.duration || value.duration == 0 ? value.duration : "-",
           checked1: value.flag ? true : false,
           checked: false, //是否选中类型
           courseId: value.courseId,
@@ -1407,7 +1406,11 @@ export default {
       let data = tableData;
       let array = [];
       data.map((value) => {
-        console.log("dd",Number(value.templateStageId) ,Number(value.templateStageId) > 0);
+        console.log(
+          "dd",
+          Number(value.templateStageId),
+          Number(value.templateStageId) > 0
+        );
         if (Number(value.templateStageId) > 0) {
           let obj = {
             id: value.templateStageId,
@@ -1626,16 +1629,15 @@ export default {
 
     //获取任务列表
     const getTask = async () => {
-       
       await api
-        .templateDetail(localStorage.getItem("projectTemplateId")).then((res) => {
+        .templateDetail(localStorage.getItem("projectTemplateId"))
+        .then((res) => {
           console.log("22222", res.data.data.stageList);
           state.projectTitle = res.data.data.projectTemplateInfo.name;
           state.picUrl = res.data.data.projectTemplateInfo.picUrl;
           state.stageList = res.data.data.stageList;
           getStageData(res.data.data.stageList);
           updateStageChoosd();
- 
         });
     };
 
@@ -1659,9 +1661,15 @@ export default {
         getTableData(state.stageList[0].taskList);
         return;
       }
-      console.log(state.chooseStageId,state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList,state.stageList);
+      console.log(
+        state.chooseStageId,
+        state.stageList.find((e) => e.templateStageId == state.chooseStageId)
+          ?.taskList,
+        state.stageList
+      );
       getTableData(
-        state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList
+        state.stageList.find((e) => e.templateStageId == state.chooseStageId)
+          ?.taskList
       );
     }
 
@@ -1959,7 +1967,6 @@ export default {
       if (final != null) {
         getTableData(final.taskList);
       }
-     
     };
 
     //选择单个任务