feat:合并

src/components/drawers/AddCase.vue

@@ -374,6 +374,7 @@ export default {
     };
     //搜索案例列表
     const searchList = () => {
+      state.selectedRowKeys = [];
       if (state.inputV1 !== "") {
         getAllCaseText();
       } else {

src/components/drawers/AddOnline.vue

@@ -692,6 +692,8 @@ export default {
     //搜索在线列表
     const searchList = () => {
       if (state.inputV1 || state.selectV) {
+        state.selectedRowKeys = [];
+        state.addOnlineList = [];
         getAllOnlineText();
       } else {
         resetOnline();

src/components/drawers/AddProject.vue

@@ -374,9 +374,11 @@ export default {
     //   this.selectedRows = selectedRows;
     // };
     const searchProjectList = () => {
+      state.selectedRowKeys = [];
       getAllProjText();
     };
     const resetProjectList = () => {
+      state.selectedRowKeys = [];
       state.inputV1 = "";
       state.inputV2 = "";
       state.inputV3 = "";

src/components/drawers/AssessmentAll.vue

@@ -9,7 +9,7 @@
         maxlength="20"
       />
     </div>
-    <div class="btns" @click="getAllInvistText">
+    <div class="btns" @click="searchList">
       <div class="search"></div>
       <div class="btnText">搜索</div>
     </div>
@@ -144,14 +144,19 @@ export default {
       assessmentId: null,
       assessmentName: null,
     });
+    const afterVisibleChange=()=>{
+
+    }
     const closeDrawer = () => {
       ctx.emit("update:assessmentVisible", false);
+     
     };
     //清空所选
     const clearLine = () => {
       console.log("state.selectedRowKeys", state.selectedRowKeys);
       state.selectedRowKeys = [];
       state.addOnlineList = [];
+      state.inputV1 = "";
     };
     const queryInfo = () => {
       //if (props.edit) {
@@ -185,8 +190,8 @@ export default {
               assessmentId: info.assessmentId,
               name: info.assessmentName,
               num: num,
-              creator: info.createUser ? info.createUser : "-",
+              creator: info.createUserName ? info.createUserName : "-",
-              time: dayjs(info.createTime).format("YYYY-MM-DD"),
+              time: dayjs(info.createTime).format("YYYY-MM-DD HH:mm"),
             };
             //更新讨论信息
             state.assessment = obj;
@@ -277,8 +282,8 @@ export default {
           assessmentId: value.assessmentId,
           num: num,
           name: value.assessmentName ? value.assessmentName : "-",
-          creator: value.createUser ? value.createUser : "-",
+          creator: value.createUserName ? value.createUserName : "-",
-          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+          time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
         };
         array.push(obj);
       });
@@ -287,6 +292,7 @@ export default {
     };
     //获取全部评估信息接口
     const getAllInvistText = () => {
+     
       api
         .queryAssessmentDetailList({
           assessmentName: state.inputV1,
@@ -308,9 +314,15 @@ export default {
           // state.createLoading = false;
         });
     };
+ //重置评估信息
+  const searchList = () => {
+      state.selectedRowKeys = [];
   
+      getAllInvistText();
+    };
     //重置评估信息
     const resetInvist = () => {
+      state.selectedRowKeys = [];
       state.inputV1 = "";
       getAllInvistText();
     };
@@ -321,10 +333,7 @@ export default {
         state.selectedRowKeys,
         state.assessmentId
       );
-      if (!state.assessmentId) {
+      state.inputV1 = "";
-        clearLine();
-      }
-
       queryInfo();
       getAllInvistText();
     });
@@ -336,6 +345,7 @@ export default {
           state.assessment = null;
         } else {
           queryInfo();
+          console.log("dd");
         }
         console.log("props.assessmentId", props.assessmentId);
       },
@@ -353,6 +363,8 @@ export default {
       resetInvist,
       handelChangePage,
       queryInfo,
+      searchList,
+      afterVisibleChange,
     };
   },
 };

src/components/drawers/AssessmentList.vue

@@ -202,8 +202,8 @@ export default {
           assessmentId: value.assessmentId,
           num: num,
           name: value.assessmentName ? value.assessmentName : "-",
-          creator: value.createUser ? value.createUser : "-",
+          creator: value.createUserName ? value.createUserName : "-",
-          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+          time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
         };
         array.push(obj);
       });

src/components/drawers/EvList.vue

@@ -243,6 +243,7 @@ export default {
     };
     //搜索测评列表
     const searchList = () => {
+      state.selectedRowKeys = [];
       if (state.inputV1 !== "") {
         getAllEvalText();
       } else {

src/components/drawers/ProjectAudit.vue

@@ -63,16 +63,12 @@
                         :unCheckedValue="0"
                         :disabled="true"
                     ><span
-                        style="
+                        style="width: 100%;color: rgba(109, 117, 132, 1);font-size: 14px;"
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
                     >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                     ></a-switch>
                   </div>
                 </div>
-                <div class="set_content">
+                <div class="set_content" v-if="projectInfo.boeFlag">
                   <div class="setc_name"><span>是否BOEU实施：</span></div>
                   <div class="setc_main">
                     <a-switch
@@ -83,7 +79,7 @@
                     ></a-switch>
                   </div>
                 </div>
-                <div class="set_content">
+                <div class="set_content" v-if="projectInfo.remark ">
                   <div class="setc_name"><span>项目说明：</span></div>
                   <div class="setc_main">
                     <span style="color: #999999">{{ projectInfo.remark }}</span>

src/components/drawers/SelFacet.vue

@@ -527,6 +527,7 @@ export default {
     };
     //搜索
     const search = () => {
+      state.selectedRows = [];
       //重新获取列表
       getClassList();
     };

src/components/drawers/SelectTest.vue

@@ -245,6 +245,7 @@ export default {
     // };
     //获取选择考试列表
     const getManageList = () => {
+      state.selectedRowKeys = [];
       let obj = {
         keyWord: state.inputPname,
         pageIndex: state.currentPage,

src/components/student/CommonStudent.vue

@@ -507,6 +507,7 @@ const auditRowSelection = computed(() => ({
 }));
 const closeDrawer = () => {
   visiable.value = false;
+  stuData.value = [];
 };
 const openDrawer = () => {
   visiable.value = true;
@@ -574,6 +575,7 @@ const auditChangePagination = (page) => {
 const resetStu = () => {
   deleteDepSelect();
   nameSearch.value = { keyword: "", page: 1, pageSize: 10 };
+
 };
 //清空选择部门信息
 const deleteDepSelect = () => {

src/components/student/TableStudent.vue

@@ -6,7 +6,7 @@
       style="padding-left: 20px; margin-right: 0px"
     >
       <a-col>
-        <a-form-item title="姓名：" @click="getStuList">
+        <a-form-item title="姓名：" >
           <a-input
             class="cus-input"
             v-model:value="tableParam.studentName"
@@ -15,7 +15,7 @@
         </a-form-item>
       </a-col>
       <a-col>
-        <a-button class="cus-btn" style="width: 100px">
+        <a-button class="cus-btn" style="width: 100px"  @click="getStuList">
           <template #icon>
             <img
               style="margin-right: 10px"
@@ -149,6 +149,7 @@ import { computed, defineProps, onMounted, ref, watch } from "vue";
 import { delStudentList, getStuPage } from "@/api/index1";
 import CommonStudent from "@/components/student/CommonStudent";
 import ChangeLevelModal from "./ChangeLevelModal.vue";
+import { message } from "ant-design-vue";
 const props = defineProps({
   type: Number,
   id: String,
@@ -222,7 +223,7 @@ const tableData = ref({
 });
 
 const stuRowSelection = computed(() => ({
-  columnWidth: 10,
+  columnWidth: 20,
   selectedRowKeys: stuSelectKeys.value,
   onChange: onStuSelectChange,
   preserveSelectedRowKeys: true,
@@ -264,9 +265,16 @@ function getStuList() {
   });
 }
 
-function reset() {}
+function reset() {
+  tableParam.value.studentName="";
+}
 
 function bathDel() {
+  if( stuSelectKeys.value &&
+    stuSelectKeys.value.length == 0){
+      message.destroy();
+    return message.warning("请先选中学员");
+  }
   stuSelectKeys.value &&
     stuSelectKeys.value.length &&
     delStudentList({

src/views/examine/ProjectReviewed.vue

@@ -49,17 +49,22 @@
                 placeholder="请输入创建人"
               />
             </div>
+     
+
             <div class="inpbox1">
+            <div class="select addTimeBox">
+              <div class="addTime">审核时间：</div>
               <a-range-picker
                 v-model:value="valueDate"
-                show-time
+                style="width: 360px"
-                style="border-radius: 8px; height: 40px; margin-left: 5px"
+                format="YYYY-MM-DD"
+                separator="至"
                 :placeholder="['      开始时间', '        结束时间']"
-                format="YYYY/MM/DD HH:mm"
               />
             </div>
           </div>
           </div>
+        </div>
         <div class="tmplh_btn">
           <div class="btn btn1" @click="getProjList">
             <div class="search"></div>
@@ -144,6 +149,7 @@
 import { onMounted, reactive, toRefs } from "vue";
 import { auditedlist } from "../../api/indexAudit";
 import * as moment from "moment";
+import dayjs from "dayjs";
 
 export default {
   name: "ProjectViewed",
@@ -324,8 +330,8 @@ export default {
     const getProjList = () => {
       state.loading=true
       let objn = {
-        beginTime: state.valueDate ? state.valueDate[0] : "",
+        beginTime: state.valueDate ? dayjs(state.valueDate[0]).format("YYYY-MM-DD") : "",
-        endTime: state.valueDate ? state.valueDate[1] : "",
+        endTime: state.valueDate ? dayjs(state.valueDate[1]).format("YYYY-MM-DD") : "",
         createName: state.valuecreater,
         manager: state.valuename,
         name: state.valueproj,
@@ -408,6 +414,7 @@ export default {
 </script>
 <style lang="scss">
 .projAuditModal {
+  
   .ant-modal {
     width: 816px !important;
     min-height: 420px !important;
@@ -539,7 +546,26 @@ export default {
 
 .projectviewed {
   width: 100%;
+  .addTimeBox {
+  position: relative;
+  display: flex;
+  align-items: center;
 
+  .addTime {
+    position: absolute;
+    z-index: 10;
+    margin-left: 10px;
+    color: rgba(0, 0, 0, 0.4);
+  }
+
+  .ant-picker {
+    padding-left: 85px;
+  }
+
+  .ant-picker-range .ant-picker-active-bar {
+    margin-left: 85px;
+  }
+}
   .tmpl {
     width: 100%;
 

src/views/learningpath/LevelAddDetail.vue

@@ -1516,7 +1516,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 60,
+          width: 160,
           align: "left",
           ellipsis: true,
           className: "classify",

src/views/projectcenter/LibraryAdd.vue

@@ -332,7 +332,7 @@
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
-
+<!--
         <a-tab-pane key="3" tab="项目积分">
           <div class="split"></div>
           <div class="projectscore">
@@ -478,6 +478,8 @@
             </div>
           </div>
         </a-tab-pane>
+-->
+
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
           <a-tabs>

src/views/projectcenter/SonProject.vue

@@ -175,7 +175,7 @@
             </a-radio-group>
           </div>
         </div>
-        <div class="name name2">
+        <div class="name name2" v-if="courseSyncFlag">
           <div class="namebox">
             <div class="inname">同步学习记录</div>
           </div>
@@ -194,7 +194,7 @@
             >
           </div>
         </div>
-        <div class="name name2">
+        <div class="name name2" v-if="projectInfo.remark">
           <div class="namebox">
             <div class="inname" style="margin-top: 13px">项目说明</div>
           </div>

src/views/projectcenter/TaskAdd.vue

@@ -5,31 +5,18 @@
 				<div class="leftmain">
 					<div class="tit">
 						阶段
-            <img
+						<img src="../../assets/images/projectadd/right.png" style="margin-left: 10px; cursor: pointer"
-              src="../../assets/images/projectadd/right.png"
+							@click="showCancel" />
-              style="margin-left: 10px; cursor: pointer"
-              @click="showCancel"
-            />
 					</div>
 					<div class="btn btn3" @click="showModal()" style="margin-left: 19px">
 						<div class="search"></div>
 						<div class="btnText">添加阶段</div>
 					</div>
 					<div class="maincon" style="background-color: #fff">
-            <draggable
+						<draggable v-model="level" chosenClass="chosen" ghostClass="ghost" forceFallback="true" group="stage"
-              v-model="level"
+							animation="500">
-              chosenClass="chosen"
-              ghostClass="ghost"
-              forceFallback="true"
-              group="stage"
-              animation="500"
-            >
 							<template #item="{ element }">
-                <div
+								<div class="items" :class="chooseStageId == element.id ? 'active' : ''" @click="changebgc(element.id)">
-                  class="items"
-                  :class="chooseStageId == element.id ? 'active' : ''"
-                  @click="changebgc(element.id)"
-                >
 									<div class="items1">
 										<div class="boxs_left">
 											<a-popover placement="topLeft" trigger="click">
@@ -42,26 +29,18 @@
 													<span>阶段说明</span>
 												</template>
 												<div class="script">
-                          <span style="font-size: 12px; color: #ffffff"
+													<span style="font-size: 12px; color: #ffffff">说明</span>
-                            >说明</span
-                          >
 												</div>
 											</a-popover>
 
 											<div class="imgIcon" @click="showModal(element)"></div>
 										</div>
 										<div class="boxs_right">
-                      <div
+											<div class="imgIcon" @click="showDeleteStage(element.id)"></div>
-                        class="imgIcon"
-                        @click="showDeleteStage(element.id)"
-                      ></div>
 										</div>
 									</div>
 									<div class="items2">
-                    <a-popover
+										<a-popover placement="topLeft" v-if="element.tit?.length > 10">
-                      placement="topLeft"
-                      v-if="element.tit?.length > 10"
-                    >
 											<template #content>
 												<div style="width: 130px">
 													{{ element.tit }}
@@ -140,14 +119,9 @@
 							<!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
             <div class="pub">保存</div>
             <div class="line"></div> -->
-              <router-link
+							<router-link :to="{ path: `/taskpage`, query: { projectId: projectId } }">
-                :to="{ path: `/taskpage`, query: { projectId: projectId } }"
-              >
 								<div style="display: flex">
-                  <img
+									<img class="img2" src="../../assets/images/leveladd/back.png" />
-                    class="img2"
-                    src="../../assets/images/leveladd/back.png"
-                  />
 									<div class="return">返回</div>
 								</div>
 							</router-link>
@@ -164,16 +138,9 @@
 						</div>
 						<!-- 添加在线侧弹窗 -->
 						<div>
-              <add-online
+							<add-online v-model:addonlineVisible="addonlinevisible" @changeData="updateTableData" :isLevel="isLevel"
-                v-model:addonlineVisible="addonlinevisible"
+								v-model:edit="edit" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
+								v-model:projectTaskId="projectTaskId" v-model:EditOnlineId="EditOnlineId" />
-                :isLevel="isLevel"
-                v-model:edit="edit"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:projectTaskId="projectTaskId"
-                v-model:EditOnlineId="EditOnlineId"
-              />
 						</div>
 						<!-- 添加在线侧弹窗 -->
 						<div class="lin"></div>
@@ -187,16 +154,10 @@
 						</div>
 						<!-- 添加面授侧弹窗 -->
 						<div>
-              <add-faceteach
+							<add-faceteach v-model:addfaceteachVisible="addfaceteachvisible" v-model:EditFaceId="EditFaceId"
-                v-model:addfaceteachVisible="addfaceteachvisible"
+								v-model:edit="edit" :isLevel="isLevel" v-model:projectId="projectId"
-                v-model:EditFaceId="EditFaceId"
+								v-model:chooseStageId="chooseStageId" @changeData="updateTableData"
-                v-model:edit="edit"
+								v-model:projectTaskId="projectTaskId" />
-                :isLevel="isLevel"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
-                v-model:projectTaskId="projectTaskId"
-              />
 						</div>
 						<!-- 添加面授侧弹窗 -->
 						<div class="lin"></div>
@@ -210,16 +171,9 @@
 						</div>
 						<!-- 添加案例侧弹窗 -->
 						<div>
-              <add-case
+							<add-case v-model:addcaseVisible="addcasevisible" @changeData="updateTableData" :isLevel="isLevel"
-                v-model:addcaseVisible="addcasevisible"
+								v-model:edit="edit" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
+								v-model:projectTaskId="projectTaskId" v-model:EditCaseId="EditCaseId" />
-                :isLevel="isLevel"
-                v-model:edit="edit"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:projectTaskId="projectTaskId"
-                v-model:EditCaseId="EditCaseId"
-              />
 						</div>
 						<!-- 添加案例侧弹窗 -->
 						<div class="lin"></div>
@@ -233,16 +187,10 @@
 						</div>
 						<!-- 添加作业侧弹窗 -->
 						<div>
-              <add-homework
+							<add-homework v-model:addhomeworkVisible="addhomeworkvisible" @changeData="updateTableData"
-                v-model:addhomeworkVisible="addhomeworkvisible"
+								v-model:isLevel="isLevel" v-model:edit="edit" v-model:projectId="projectId"
-                @changeData="updateTableData"
+								v-model:chooseStageId="chooseStageId" v-model:EditWorkId="EditWorkId"
-                v-model:isLevel="isLevel"
+								v-model:projectTaskId="projectTaskId" />
-                v-model:edit="edit"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:EditWorkId="EditWorkId"
-                v-model:projectTaskId="projectTaskId"
-              />
 						</div>
 						<!-- 添加作业侧弹窗 -->
 						<div class="lin"></div>
@@ -256,16 +204,9 @@
 						</div>
 						<!-- 添加考试侧弹窗 -->
 						<div>
-              <add-test
+							<add-test v-model:addtestVisible="addtestvisible" @changeData="updateTableData" :isLevel="isLevel"
-                v-model:addtestVisible="addtestvisible"
+								v-model:edit="edit" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
+								v-model:EditTestId="EditTestId" v-model:projectTaskId="projectTaskId" />
-                :isLevel="isLevel"
-                v-model:edit="edit"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:EditTestId="EditTestId"
-                v-model:projectTaskId="projectTaskId"
-              />
 						</div>
 						<!-- 添加考试侧弹窗 -->
 						<div class="lin"></div>
@@ -279,16 +220,9 @@
 						</div>
 						<!-- 添加直播侧弹窗 -->
 						<div>
-              <add-live
+							<add-live v-model:addliveVisible="addlivevisible" :isLevel="isLevel" @changeData="updateTableData"
-                v-model:addliveVisible="addlivevisible"
+								v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:edit="edit"
-                :isLevel="isLevel"
+								v-model:EditLiveId="EditLiveId" v-model:projectTaskId="projectTaskId" />
-                @changeData="updateTableData"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:edit="edit"
-                v-model:EditLiveId="EditLiveId"
-                v-model:projectTaskId="projectTaskId"
-              />
 						</div>
 						<!-- 添加直播侧弹窗 -->
 						<div class="lin"></div>
@@ -302,16 +236,9 @@
 						</div>
 						<!-- 添加外链侧弹窗 -->
 						<div>
-              <add-ref
+							<add-ref v-model:addrefVisible="addrefvisible" :isLevel="isLevel" @changeData="updateTableData"
-                v-model:addrefVisible="addrefvisible"
+								v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:edit="edit"
-                :isLevel="isLevel"
+								v-model:EditRefId="EditRefId" v-model:projectTaskId="projectTaskId" />
-                @changeData="updateTableData"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:edit="edit"
-                v-model:EditRefId="EditRefId"
-                v-model:projectTaskId="projectTaskId"
-              />
 						</div>
 						<!-- 添加外链侧弹窗 -->
 						<div class="lin"></div>
@@ -350,16 +277,9 @@
 						</div>
 						<!-- 添加活动侧弹窗 -->
 						<div>
-              <add-active
+							<add-active v-model:addactiveVisible="addactivevisible" v-model:projectId="projectId"
-                v-model:addactiveVisible="addactivevisible"
+								v-model:EditActiveId="EditActiveId" v-model:projectTaskId="projectTaskId" v-model:edit="edit"
-                v-model:projectId="projectId"
+								:isLevel="isLevel" v-model:chooseStageId="chooseStageId" @changeData="updateTableData" />
-                v-model:EditActiveId="EditActiveId"
-                v-model:projectTaskId="projectTaskId"
-                v-model:edit="edit"
-                :isLevel="isLevel"
-                v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
-              />
 						</div>
 						<!-- 添加活动侧弹窗 -->
 						<div class="lin"></div>
@@ -373,16 +293,9 @@
 						</div>
 						<!-- 添加测评侧弹窗 -->
 						<div>
-              <add-eval
+							<add-eval v-model:addevalVisible="addevalvisible" @changeData="updateTableData" v-model:edit="edit"
-                v-model:addevalVisible="addevalvisible"
+								:isLevel="isLevel" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
+								v-model:projectTaskId="projectTaskId" v-model:EditEvalId="EditEvalId" />
-                v-model:edit="edit"
-                :isLevel="isLevel"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:projectTaskId="projectTaskId"
-                v-model:EditEvalId="EditEvalId"
-              />
 						</div>
 						<!-- 添加测评侧弹窗 -->
 						<div class="lin"></div>
@@ -396,16 +309,9 @@
 						</div>
 						<!-- 添加评估侧弹窗 -->
 						<div>
-              <add-invist
+							<add-invist v-model:addinvistVisible="addinvistvisible" @changeData="updateTableData" v-model:edit="edit"
-                v-model:addinvistVisible="addinvistvisible"
+								:isLevel="isLevel" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
-                @changeData="updateTableData"
+								v-model:projectTaskId="projectTaskId" v-model:EditInvistId="EditInvistId" />
-                v-model:edit="edit"
-                :isLevel="isLevel"
-                v-model:projectId="projectId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:projectTaskId="projectTaskId"
-                v-model:EditInvistId="EditInvistId"
-              />
 						</div>
 
 						<div class="lin"></div>
@@ -437,7 +343,8 @@
             
             </div>
           </div>
-        --></div>
+        -->
+				</div>
 				<div class="boom">
 					<div class="boomcen">
 						<div class="onerow">
@@ -446,10 +353,7 @@
 								移动任务到阶段
 							</button>
 							<div class="edit" @click="showdeAll">
-                <img
+								<img class="editimg" src="../../assets/images/projectadd/delete.png" />
-                  class="editimg"
-                  src="../../assets/images/projectadd/delete.png"
-                />
 								<span class="editext">批量删除</span>
 							</div>
 						</div>
@@ -484,8 +388,7 @@
               </div>
             </div> -->
 							<div class="tableBox" style="border: 1px solid #f2f6fc">
-                <div
+								<div style="
-                  style="
                     height: 50px;
                     display: flex;
                     justify-content: space-between;
@@ -496,32 +399,25 @@
                     color: #999ba3;
                     line-height: 36px;
                     border-bottom: 1px solid #f2f6fc;
-                  "
+                  ">
-                >
+									<div style="
-                  <div
-                    style="
                       width: 87px;
                       text-align: center;
                       display: flex;
                       margin-left: 46px;
-                    "
+                    ">
-                  >
+										<img style="
-                    <img
-                      style="
                         width: 16px;
                         height: 16px;
                         cursor: pointer;
                         margin-top: 12px;
-                      "
+                      " :src="
-                      :src="
                       	selectAll === 0
                       		? require('../../assets/images/notSelect.png')
                       		: selectAll === 1
                       			? require('../../assets/images/selectAll.png')
                       			: require('../../assets/images/select.png')
-                      "
+                      " @click="selectRowAll" />
-                      @click="selectRowAll"
-                    />
 										<!-- <a-checkbox
                     v-model:checked="selectAll"
                     @change="selectRowAll"
@@ -532,25 +428,14 @@
 									<div style="width: 120px; text-align: center">任务名称</div>
 									<div style="width: 120px; text-align: center">必修/选修</div>
 									<div style="width: 87px; text-align: center">时长</div>
-                  <div
+									<div style="width: 120px; text-align: center; margin-right: 20px">
-                    style="width: 120px; text-align: center; margin-right: 20px"
-                  >
 										操作
 									</div>
 								</div>
-                <draggable
+								<draggable v-model="tableData" chosenClass="chosen" ghostClass="ghost" forceFallback="true" group="task"
-                  v-model="tableData"
+									animation="500" @start="onStart" @end="onEnd">
-                  chosenClass="chosen"
-                  ghostClass="ghost"
-                  forceFallback="true"
-                  group="task"
-                  animation="500"
-                  @start="onStart"
-                  @end="onEnd"
-                >
 									<template #item="{ element }">
-                    <div
+										<div style="
-                      style="
                         height: 50px;
                         display: flex;
                         justify-content: space-between;
@@ -560,68 +445,46 @@
                         font-weight: 400;
                         color: #4f5156;
                         line-height: 36px;
-                      "
+                      " class="tableRow">
-                      class="tableRow"
+											<div style="
-                    >
-                      <div
-                        style="
                           width: 87px;
                           text-align: center;
                           margin-left: 46px;
                           position: relative;
-                        "
+                        ">
-                      >
 												<div class="racona">
-                          <div
+													<div class="img" style="
-                            class="img"
-                            style="
                               cursor: pointer;
                               margin-top: 2px;
                               margin-right: 9px;
                               position: absolute;
                               left: -25px;
-                            "
+                            "></div>
-                          ></div>
+													<a-checkbox :id="element.id" v-model:checked="element.checked" @change="changeRow">
-                          <a-checkbox
-                            :id="element.id"
-                            v-model:checked="element.checked"
-                            @change="changeRow"
-                          >
 													</a-checkbox>
 													<div style="margin-top: 2px; margin-left: 8px">
 														{{ element.lei }}
 													</div>
 												</div>
 											</div>
-                      <div
+											<div style="
-                        style="
                           width: 120px;
                           text-align: center;
                           overflow: hidden;
                           text-overflow: ellipsis;
                           white-space: nowrap;
-                        "
+                        " :title="element.creater">
-                        :title="element.creater"
-                      >
 												{{ element.creater }}
 											</div>
 											<div style="width: 120px; text-align: center">
 												<div class="opat">
 													<div class="opacationt clearfix">
-                            <a-switch
+														<a-switch style="margin-left: -50px; margin-top: 3px" v-model:checked="element.checked1"
-                              style="margin-left: -50px; margin-top: 3px"
+															size="small" active-color="red" @click="changeCourseType(element)" />
-                              v-model:checked="element.checked1"
-                              size="small"
-                              active-color="red"
-                              @click="changeCourseType(element)"
-                            />
 														<div class="showt clearfix">
-                              <div
+															<div class="bi" :style="{
-                                class="bi"
-                                :style="{
 																'z-index': element.checked1 ? 999 : 998,
-                                }"
+															}">
-                              >
 																必修
 															</div>
 															<div class="xuan">选修</div>
@@ -636,35 +499,27 @@
 															: "-"
 												}}
 											</div>
-                      <div
+											<div style="
-                        style="
                           width: 120px;
                           text-align: center;
                           margin-right: 20px;
-                        "
+                        ">
-                      >
 												<div class="opa">
 													<div class="opacation">
-                            <span
+														<span style="
-                              style="
                                 color: #4ea6ff;
                                 margin-right: 25px;
                                 cursor: pointer;
-                              "
+                              " @click="
-                              @click="
                               	decideType(
                               		element.lei,
                               		element.courseId,
                               		element.id
                               	)
-                              "
+                              ">
-                            >
 															编辑
 														</span>
-                            <span
+														<span style="color: #4ea6ff; cursor: pointer" @click="showDelete(element.id)">
-                              style="color: #4ea6ff; cursor: pointer"
-                              @click="showDelete(element.id)"
-                            >
 															删除
 														</span>
 													</div>
@@ -722,58 +577,32 @@
 
 		<!-- 添加阶段弹窗 -->
 		<div>
-      <a-modal
+			<a-modal v-model:visible="stage" :title="null" @ok="closeModal" :footer="null" :closable="false"
-        v-model:visible="stage"
+				wrapClassName="addstage" width="624px" height="388px" centered="true" @cancel="closeModal">
-        :title="null"
+				<div class="modalHeader" style="
-        @ok="closeModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="addstage"
-        width="624px"
-        height="388px"
-        centered="true"
-        @cancel="closeModal"
-      >
-        <div
-          class="modalHeader"
-          style="
             width: 100%;
             height: 68px;
             display: flex;
             align-items: center;
             justify-content: space-between;
-          "
+          ">
-        >
 					<div class="headerLeft" style="margin-left: 32px">
-            <span class="headerLeftText" style="font-size: 16px"
+						<span class="headerLeftText" style="font-size: 16px">编辑/添加阶段</span>
-              >编辑/添加阶段</span
-            >
 					</div>
 					<div style="cursor: pointer; margin-right: 32px" @click="closeModal">
-            <img
+						<img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
-            />
 					</div>
 				</div>
 				<div class="modalMain" style="width: 100%">
 					<div class="name">
 						<div class="namebox">
 							<div>
-                <img
+								<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
 							</div>
 							<div class="inname">阶段名称：</div>
 						</div>
 						<div class="in">
-              <a-input
+							<a-input v-model:value="valuesname" show-count :maxlength="20" placeholder="请输入阶段名称" />
-                v-model:value="valuesname"
-                show-count
-                :maxlength="20"
-                placeholder="请输入阶段名称"
-              />
 						</div>
 					</div>
 					<div class="name" style="display: flex; align-items: flex-start">
@@ -781,26 +610,17 @@
 							<div class="inname">阶段说明：</div>
 						</div>
 						<div class="intext" style="margin-left: 14px">
-              <a-textarea
+							<a-textarea v-model:value="valuesnotice" style="height: 88px" show-count :maxlength="100"
-                v-model:value="valuesnotice"
+								placeholder="请输入阶段说明" />
-                style="height: 88px"
-                show-count
-                :maxlength="100"
-                placeholder="请输入阶段说明"
-              />
 						</div>
 					</div>
-          <div
+					<div style="
-            style="
               display: flex;
               width: 100%;
               justify-content: center;
               margin-top: 40px;
-            "
+            ">
-          >
+						<button @click="closeModal" style="
-            <button
-              @click="closeModal"
-              style="
                 cursor: pointer;
                 height: 40px;
                 width: 100px;
@@ -808,13 +628,10 @@
                 border-radius: 4px;
                 color: #4ea6ff;
                 background-color: #ffffff;
-              "
+              ">
-            >
 							取消
 						</button>
-            <button
+						<button @click="editStage" style="
-              @click="editStage"
-              style="
                 cursor: pointer;
                 margin-left: 16px;
                 margin-bottom: 40px;
@@ -824,31 +641,18 @@
                 border-radius: 4px;
                 color: #ffffff;
                 background-color: #4ea6ff;
-              "
+              ">
-            >
 							确定
 						</button>
 					</div>
 				</div>
-        <div
+				<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-          class="aeLoading"
+					<a-spin :spinning="addLoading" :tip="updateStageID ? '修改中...' : ''" />
-          :style="{ display: addLoading ? 'flex' : 'none' }"
-        >
-          <a-spin
-            :spinning="addLoading"
-            :tip="updateStageID ? '修改中...' : ''"
-          />
 				</div>
 			</a-modal>
 		</div>
 		<!-- 确认添加阶段弹窗 -->
-    <a-modal
+		<a-modal v-model:visible="confirmModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal" centered="true">
-      v-model:visible="confirmModal"
-      :footer="null"
-      :closable="cC"
-      wrapClassName="ConfirmModal"
-      centered="true"
-    >
 			<div class="delete">
 				<div class="del_header"></div>
 				<div class="del_main">
@@ -872,13 +676,7 @@
 			</div>
 		</a-modal>
 		<!-- 确认取消阶段弹窗 -->
-    <a-modal
+		<a-modal v-model:visible="cancelModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal" centered="true">
-      v-model:visible="cancelModal"
-      :footer="null"
-      :closable="cC"
-      wrapClassName="ConfirmModal"
-      centered="true"
-    >
 			<div class="delete">
 				<div class="del_header"></div>
 				<div class="del_main">
@@ -902,13 +700,7 @@
 			</div>
 		</a-modal>
 		<!-- 确认删除任务弹窗 -->
-    <a-modal
+		<a-modal v-model:visible="deleteModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal" centered="true">
-      v-model:visible="deleteModal"
-      :footer="null"
-      :closable="cC"
-      wrapClassName="ConfirmModal"
-      centered="true"
-    >
 			<div class="delete">
 				<div class="del_header"></div>
 				<div class="del_main">
@@ -931,13 +723,7 @@
 				</div>
 			</div>
 		</a-modal>
-    <a-modal
+		<a-modal v-model:visible="deAll" :footer="null" :closable="cC" wrapClassName="ConfirmModal" centered="true">
-      v-model:visible="deAll"
-      :footer="null"
-      :closable="cC"
-      wrapClassName="ConfirmModal"
-      centered="true"
-    >
 			<div class="delete">
 				<div class="del_header"></div>
 				<div class="del_main">
@@ -961,14 +747,8 @@
 			</div>
 		</a-modal>
 		<!-- 移动任务到阶段 -->
-    <a-modal
+		<a-modal style="padding: 0" :closable="sh" v-model:visible="visiblene" :footer="null" centered="true"
-      style="padding: 0"
+			wrapClassName="moveModal">
-      :closable="sh"
-      v-model:visible="visiblene"
-      :footer="null"
-      centered="true"
-      wrapClassName="moveModal"
-    >
 			<div class="con">
 				<div class="header">
 					<div class="inhe">
@@ -980,29 +760,14 @@
 					<div class="inher">
 						<div class="cur">已选中{{ selectRow.length }}个任务</div>
 						<div class="select">
-              <a-select
+							<a-select v-model:value="curLevel" style="width: 100%" placeholder="请选择阶段" :options="level"
-                v-model:value="curLevel"
+								@change="handleChangeStage" allowClear showSearch></a-select>
-                style="width: 100%"
-                placeholder="请选择阶段"
-                :options="level"
-                @change="handleChangeStage"
-                allowClear
-                showSearch
-              ></a-select>
 						</div>
 						<div class="btn">
-              <button
+							<button style="cursor: pointer" class="sameb btn1" @click="closeChangeModal">
-                style="cursor: pointer"
-                class="sameb btn1"
-                @click="closeChangeModal"
-              >
 								取消
 							</button>
-              <button
+							<button style="cursor: pointer" class="sameb btn2" @click="moveTask">
-                style="cursor: pointer"
-                class="sameb btn2"
-                @click="moveTask"
-              >
 								确定
 							</button>
 						</div>
@@ -1012,13 +777,8 @@
 		</a-modal>
 
 		<!-- 是否删除阶段弹窗 -->
-    <a-modal
+		<a-modal v-model:visible="deleteStageModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal"
-      v-model:visible="deleteStageModal"
+			centered="true">
-      :footer="null"
-      :closable="cC"
-      wrapClassName="ConfirmModal"
-      centered="true"
-    >
 			<div class="delete">
 				<div class="del_header"></div>
 				<div class="del_main">
@@ -1028,7 +788,9 @@
 						<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">
@@ -1258,7 +1020,7 @@ export default {
 				}
 			});
 			console.log(array)
-      state.level = array.sort((a,b)=>{ return a.id - b.id });
+			state.level = array.sort((a, b) => { return a.id - b.id });
 		};
 
 		const tableDataFunc = () => {
@@ -1397,17 +1159,19 @@ export default {
 			await api.getTask(obj).then((res) => {
 				console.log("22222", res.data.data.stageList);
 
-        if(state.onceChoice){
+				if (state.onceChoice) {
 					let data = res.data.data.stageList;
 					state.onceChoice = false;
 					let arraynew = []
-          for(let i=0;i<data.length;i++){
+					for (let i = 0; i < data.length; i++) {
-            if(data[i].stageId!=='0'){
+						if (data[i].stageId !== '0') {
 							arraynew.push(data[i])
 						}
 					}
 					console.log(arraynew)
-          state.chooseStageId = Number(arraynew[arraynew.length-1].stageId);
+					if (arraynew.length !== 0) {
+						state.chooseStageId = Number(arraynew[arraynew.length - 1].stageId);
+					}
 				}
 
 				state.projectTitle = res.data.data.projectInfo.name;
@@ -2045,10 +1809,8 @@ export default {
 						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%
-            );
 					}
 
 					.del_main {
@@ -2147,11 +1909,9 @@ export default {
 			padding: 0 !important;
 
 			.modalHeader {
-        background: linear-gradient(
+				background: linear-gradient(0deg,
-          0deg,
 						rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
+						rgba(78, 166, 255, 0.2) 100%);
-        );
 			}
 
 			.modalMain {
@@ -2266,10 +2026,8 @@ export default {
 						position: relative;
 						justify-content: center;
 
-            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%
-            );
 
 						.inhe {
 							width: 80%;
@@ -2375,6 +2133,7 @@ export default {
 		.leftmain {
 			margin-top: 20px;
 			min-height: 800px;
+
 			.tit {
 				margin-left: 20px;
 				font-size: 18px;
@@ -2627,6 +2386,7 @@ export default {
 						.pub {
 							margin-right: 10px;
 						}
+
 						.line {
 							margin-right: 10px;
 						}
@@ -2943,7 +2703,7 @@ export default {
 							padding-left: 60px !important;
 						}
 
-            .ant-table-thead > tr > th {
+						.ant-table-thead>tr>th {
 							background-color: rgba(239, 244, 252, 1);
 						}
 
@@ -2951,9 +2711,7 @@ export default {
 							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/views/research/ResearchManage.vue

@@ -24,12 +24,17 @@
           ></a-select>
         </div>
         <div class="select">
+            <div class="select addTimeBox">
+              <div class="addTime">创建时间：</div>
               <a-range-picker
                 v-model:value="projectTime"
+                style="width: 420px"
+                format="YYYY-MM-DD"
                 separator="至"
                 :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
+          </div>
         <div style="display: flex; margin-bottom: 20px">
           <div class="btn btn1" @click="handleSearch">
             <div class="search"></div>
@@ -414,7 +419,7 @@ export default {
       if (state.projectTime) {
         startTime = toDate(
           new Date(state.projectTime[0].$d).getTime() / 1000,
-          "Y-M-D"
+          "Y-M-D hh:mm"
         );
         endTime = toDate(
           new Date(state.projectTime[1].$d).getTime() / 1000,
@@ -865,6 +870,26 @@ export default {
   display: block;
   clear: both;
 }
+.addTimeBox {
+  position: relative;
+  display: flex;
+  align-items: center;
+
+  .addTime {
+    position: absolute;
+    z-index: 10;
+    margin-left: 10px;
+    color: rgba(0, 0, 0, 0.4);
+  }
+
+  .ant-picker {
+    padding-left: 85px;
+  }
+
+  .ant-picker-range .ant-picker-active-bar {
+    margin-left: 85px;
+  }
+}
 .out {
   //display: flex;
   display: block;