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

src/App.vue

@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.1.0------------");
+		console.log("版本2.1.1------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

src/components/drawers/ActiveAttendance.vue

@@ -59,7 +59,6 @@
                   :options="projectNameList2"
                   @change="selectProjectName2"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>

src/components/drawers/AddLevelImportStu.vue

@@ -31,35 +31,12 @@
                 name="uploadFile"
                 :multiple="false"
                 @change="handleChange"
-                :data="
+                :data="{
-                  courseType == 1
-                    ? {
                         targetId: Number(courseId),
-                        type: 3,
+                        type: courseType,
                         userId: userInfo.id,
                         userName: userInfo.realName,
-                      }
+                      } "
-                    : courseType == 3
-                    ? {
-                        targetId: Number(courseId),
-                        type: 1,
-                        userId: userInfo.id,
-                        userName: userInfo.realName,
-                      }
-                    : courseType == 4
-                    ? {
-                        targetId: Number(courseId),
-                        type: 2,
-                        userId: userInfo.id,
-                        userName: userInfo.realName,
-                      }
-                    : {
-                        targetId: Number(courseId),
-                        type: 3,
-                        userId: userInfo.id,
-                        userName: userInfo.realName,
-                      }
-                "
                 :showUploadList="false"
               >
                 <p class="ant-upload-drag-icon">

src/components/drawers/ChangeGroup.vue

@@ -23,7 +23,6 @@
             style="width: 264px; border-radius: 8px"
             :options="stugroupList"
             allowClear
-            showSearch
             @change="handleChange"
           />
         </div>

src/components/drawers/FaceManage.vue

@@ -36,7 +36,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>

src/components/drawers/FaceStu.vue

@@ -61,7 +61,6 @@
                   :options="projectNameList2"
                   @change="selectProjectName2"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>

src/components/drawers/NoticeHis.vue

@@ -9,14 +9,15 @@
   <div class="noticeContent">
     <div v-for="item in notice" :key="item.id" class="item">
       <!-- <div class="itemcontent">{{ item.content }}</div> -->
-      <a-textarea
+      <!-- <a-textarea
           class="itemcontent"
           disabled="true"
           v-model:value="item.content"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
           style="margin-top: -10px; height: 120px;background-color: #fff;"
-        />
+        /> -->
+      <pre style="text-align: left;padding-left: 20px">{{item.content}}</pre>
       <div class="itemtime">{{ item.pubtime }}</div>
     </div>
   </div>
@@ -138,7 +139,7 @@ export default {
   margin-top: 20px;
   margin-left: 32px;
   .item {
-    height: 66px;
+    // height: 66px;
     width: 74%;
     display: flex;
     justify-content: space-between;

src/components/drawers/NoticePub.vue

@@ -17,13 +17,14 @@
         <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
         </div> -->
-        <a-textarea
+        <!-- <a-textarea
           disabled="true"
           v-model:value="noticeContent1"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
           style="margin-top: -10px; height: 160px; resize: none;background-color: #fff;color:#666;"
-        />
+        /> -->
+        <pre>{{noticeContent1}}</pre>
         <div class="btn-content">
           <a-button type="primary" @click="handleEdit">编辑</a-button>
         </div>
@@ -33,19 +34,13 @@
         <!-- <div class="txt-content">
           {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
         </div> -->
-        <a-textarea
+        <pre>{{noticeContent1}}</pre>
-          disabled="true"
-          v-model:value="noticeContent1"
-          :maxlength="150"
-          placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height:160px; resize: none;background-color: #fff;color:#666;"
-        />
         <p>编辑新公告：</p>
         <a-textarea
           v-model:value="noticeContent"
           :maxlength="150"
           placeholder="公告信息最多输入150个字"
-          style="margin-top: -10px; height: 160px"
+          style="margin-top: -10px; height: 160px; width:340px;"
         />
         <div class="btn-content">
           <a-button class="cancel" @click="handleCancel">取消</a-button>

src/components/drawers/TestManage.vue

@@ -37,7 +37,6 @@
                   :options="projectNameList"
                   @change="selectProjectName"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>

src/components/drawers/TimeManage.vue

@@ -37,7 +37,6 @@
                   :options="projectNameList"
                   @change="selectProjectName"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>

src/components/drawers/WorkManage.vue

@@ -37,7 +37,6 @@
                   :options="projectNameList"
                   @change="selectProjectName"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>

src/components/drawers/project/ProjectExamManage.vue

@@ -37,7 +37,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>

src/components/drawers/project/ProjectFaceStu.vue

@@ -186,7 +186,7 @@
     v-model:AddImpStuvisible="AddImpStuvisible"
     @AddImpStuvisibleClose="AddImpStuvisibleClose"
     :courseId="projectTaskInfo.courseId"
-    :courseType="2"
+    :courseType="3"
   />
   <!-- 批量签到弹窗 -->
   <a-modal
@@ -397,7 +397,7 @@ export default {
         ids: state.selectedStudents,
         taskId: Number(props.projectTaskInfo.projectTaskId),
         taskType: Number(props.projectTaskInfo.type),
-        type: 1,
+        type: 3,
         // userName: "",
       };
       api
@@ -663,7 +663,7 @@ export default {
                       studentName: text.record.studentName,
                       taskId: Number(props.projectTaskInfo.projectTaskId),
                       taskType: Number(props.projectTaskInfo.type),
-                      type: 1,
+                      type: 3,
                       // userName: "",
                     };
                     api
@@ -697,7 +697,7 @@ export default {
                       studentName: text.record.studentName,
                       taskId: Number(props.projectTaskInfo.projectTaskId),
                       taskType: Number(props.projectTaskInfo.type),
-                      type: 1,
+                      type: 3,
                     };
                     api
                       .attendanceLeave(obj)
@@ -800,26 +800,26 @@ export default {
       console.log("我是传递的查询参数", props.projectTaskInfo, {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
-        currentStageId: props.projectTaskInfo.stageId,
+        // currentStageId: props.projectTaskInfo.stageId,
-        type: 1,
+        type: 3,
-        pid: props.projectTaskInfo.projectId,
+        pid: props.projectTaskInfo.courseId,
         // status: Number(state.name),
         studentName: state.name,
         signStatus: state.projectName2,
-        taskId: props.projectTaskInfo.projectTaskId,
+        // taskId: props.projectTaskInfo.projectTaskId,
       });
       api
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
           pageSize: state.pageSize,
           currentStageId: props.projectTaskInfo.stageId,
-          type: 1,
+          type: 3,
-          pid: props.projectTaskInfo.projectId,
+          pid: props.projectTaskInfo.courseId,
           // status: Number(state.name),
           studentName: state.name,
-          taskId: props.projectTaskInfo.projectTaskId,
+          // taskId: props.projectTaskInfo.projectTaskId,
           signStatus: state.projectName2,
-          taskType: props.projectTaskInfo.type,
+          // taskType: props.projectTaskInfo.type,
         })
         .then((res) => {
           console.log("获取面授管理学员", res);
@@ -866,7 +866,7 @@ export default {
     function exportTaskStu() {
       console.log("props.projectTaskInfo", props.projectTaskInfo);
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=${1}&taskId=${props.projectTaskInfo.projectTaskId}&pid=${props.projectTaskInfo.projectId}&taskType=2&thirdType=2`
+        `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=6`
       );
       // api
       //   .exportTaskStudent({

src/components/drawers/project/ProjectFaceTaskManage.vue

@@ -48,7 +48,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>
@@ -613,23 +612,23 @@ export default {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
         currentStageId: props.projectTaskInfo.stageId,
-        type: 1,
+        type: 3,
-        pid: props.projectTaskInfo.projectId,
+        pid: props.projectTaskInfo.courseId,
         status: state.projectName,
         studentName: state.name,
-        taskId: props.projectTaskInfo.projectTaskId,
+        // taskId: props.projectTaskInfo.projectTaskId,
       });
       api
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
           pageSize: state.pageSize,
           currentStageId: props.projectTaskInfo.stageId,
-          type: 1,
+          type: 3,
-          pid: props.projectTaskInfo.projectId,
+          pid: props.projectTaskInfo.courseId,
           status: state.projectName,
           studentName: state.name,
-          taskId: props.projectTaskInfo.projectTaskId,
+          // taskId: props.projectTaskInfo.projectTaskId,
-          taskType: props.projectTaskInfo.type,
+          // taskType: props.projectTaskInfo.type,
         })
         .then((res) => {
           console.log("获取面授管理学员", res);
@@ -733,9 +732,7 @@ export default {
         `${
           process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${
           props.projectTaskInfo.stageId
-        }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${
+        }&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=4`
-          props.projectTaskInfo.projectTaskId
-        }&taskType=${props.projectTaskInfo.type}`
       );
     }
 

src/components/drawers/project/ProjectHomeWorkManage.vue

@@ -49,7 +49,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>

src/components/drawers/project/ProjectOnlineManage.vue

@@ -65,7 +65,6 @@
                   :options="projectNameList"
                   @change="selectProjectName"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>
@@ -385,7 +384,7 @@ export default {
           "status": state.projectName,
           "studentName": state.name,
           "targetId":props.datasource.projectId,
-          "taskId": props.datasource.projectTaskId,
+          "taskId": props.datasource.courseId,
           "thirdId": props.datasource.targetId,
           "type": 1
         });

src/components/drawers/router/RouterCommonManage.vue

@@ -387,7 +387,7 @@ export default {
           "chapterId": props.datasource.chapterId,
           "status": state.projectName,
           "studentName": state.name,
-          "taskId": props.datasource.routerTaskId,
+          "taskId": props.datasource.courseId,
           "thirdId": props.datasource.targetId,
           "type": 1
         });

src/components/drawers/router/RouterEvaluationManage.vue

@@ -48,7 +48,6 @@
                   :options="projectNameList"
                   @change="selectProjectName"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>

src/components/drawers/router/RouterExaminationManage.vue

@@ -37,7 +37,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>

src/components/drawers/router/RouterFaceStu.vue

@@ -63,7 +63,6 @@
                   :options="projectNameList2"
                   @change="selectProjectName2"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
             </div>
@@ -181,7 +180,7 @@
     v-model:AddImpStuvisible="AddImpStuvisible"
     @AddImpStuvisibleClose="AddImpStuvisibleClose"
     :courseId="datasource.courseId"
-    :courseType="1"
+    :courseType="3"
   />
   <!-- 批量签到弹窗 -->
   <a-modal
@@ -764,14 +763,14 @@ export default {
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
           pageSize: state.pageSize,
-          currentStageId: props.datasource.chapterId,
+          // currentStageId: props.datasource.chapterId,
-          type: 2,
+          type: 3,
-          pid: props.datasource.routerId,
+          pid: props.datasource.courseId,
           // status: Number(state.name),
           signStatus: state.projectName2,
           studentName: state.name,
-          taskId: props.datasource.routerTaskId,
+          // taskId: props.datasource.routerTaskId,
-          taskType: props.datasource.type,
+          // taskType: props.datasource.type,
         })
         .then((res) => {
           console.log("获取面授管理学员", res);
@@ -822,7 +821,7 @@ export default {
           process.env.VUE_APP_BASE_API
         }/admin/student/exportTaskStudent?currentStageId=${
           props.datasource.chapterId
-        }&type=${2}&pid=${props.datasource.routerId}&taskType=2&thirdType=2&taskId=${props.datasource.routerTaskId}`
+        }&type=3&pid=${props.datasource.courseId}&thirdType=7&taskId=${props.datasource.routerTaskId}`
       );
       // api
       //   .exportTaskStudent({

src/components/drawers/router/RouterFaceTeachManage.vue

@@ -43,7 +43,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>
@@ -549,26 +548,15 @@ export default {
     // 获取数据
     //获取学员
     const getStudent = () => {
-      console.log("我是传递的查询参数", {
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-        currentStageId: props.datasource.chapterId,
-        type: 2,
-        pid: props.datasource.routerId,
-        taskId: props.datasource.routerTaskId,
-        taskType: props.datasource.type,
-        status: state.projectName,
-        studentName: state.name,
-      });
       api
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
           pageSize: state.pageSize,
           currentStageId: props.datasource.chapterId,
-          type: 2,
+          type: 3,
-          pid: props.datasource.routerId,
+          pid: props.datasource.courseId,
-          taskId: props.datasource.routerTaskId,
+          // taskId: props.datasource.routerTaskId,
-          taskType: props.datasource.type,
+          // taskType: props.datasource.type,
           status: state.projectName,
           studentName: state.name,
         })
@@ -622,7 +610,7 @@ export default {
         `${
           process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
           props.datasource.chapterId
-        }&type=${2}&pid=${props.datasource.routerId}&taskType=${2}&taskId=${props.datasource.routerTaskId}`
+        }&type=3&pid=${props.datasource.courseId}`
       );
       // api
       //   .exportTaskStudent({
@@ -647,10 +635,10 @@ export default {
       state.downloadUrl = null;
       let obj = {
         currentStageId: props.datasource.chapterId,
-        pid: props.datasource.routerId,
+        pid: props.datasource.courseId,
-        taskId: props.datasource.routerTaskId,
+        // taskId: props.datasource.routerTaskId,
-        taskType: props.datasource.type,
+        // taskType: props.datasource.type,
-        type: 2,
+        type: 3,
       };
       api
         .exportHomeWork(obj)
@@ -679,7 +667,7 @@ export default {
           props.datasource.chapterId
         }&type=${2}&pid=${props.datasource.routerId}&taskId=${
           props.datasource.routerTaskId
-        }&taskType=${props.datasource.type}`
+        }&taskType=${props.datasource.type}&thirdType=5`
       );
     }
     return {

src/components/drawers/router/RouterHomeworkManage.vue

@@ -44,7 +44,6 @@
                 :options="projectNameList"
                 @change="selectProjectName"
                 allowClear
-                showSearch
               ></a-select>
             </div>
           </div>

src/components/student/TableStudent.vue

@@ -362,7 +362,7 @@
     v-model:AddImpStuvisible="AddImpStuvisible"
     @AddImpStuvisibleClose="AddImpStuvisibleClose"
     :courseId="id"
-    :courseType="type === 1 ? 3 : 4"
+    :courseType="type"
   />
 </template>
 <script setup>

src/views/courselibrary/CoursewareManage.vue

@@ -34,7 +34,6 @@
               placeholder="请选择状态"
               :options="options1"
               allowClear
-              showSearch
             >
             </a-select>
           </div>

src/views/courselibrary/CoursewareManage_Old.vue

@@ -34,7 +34,6 @@
               placeholder="请选择状态"
               :options="options1"
               allowClear
-              showSearch
             >
             </a-select>
           </div>
@@ -1862,7 +1861,6 @@
                         style="width: 200px"
                         :options="options1"
                         allowClear
-                        showSearch
                         @focus="focus"
                         @change="handleChange"
                       >

src/views/examine/CourseReviewed.vue

@@ -46,19 +46,29 @@
 						</div>
 						<div class="inpbox1">
 							<a-input v-model:value="valuecreater" style="
-                  width: 270px;
+								width: 270px;
-                  height: 40px;
+								height: 40px;
-                  border-radius: 8px;
+								border-radius: 8px;
-                  margin-right: 14px;
+								margin-right: 14px;
-                " placeholder="请输入创建人" />
+								" placeholder="请输入创建人" />
 						</div>
 						<div class="inpbox1">
 							<a-input v-model:value="valuename" style="
-                  width: 270px;
+								width: 270px;
-                  height: 40px;
+								height: 40px;
-                  border-radius: 8px;
+								border-radius: 8px;
-                  margin-right: 14px;
+								margin-right: 14px;
-                " placeholder="请输入名称" />
+								" placeholder="请输入名称" />
+						</div>
+						<div class="select addTimeBox">
+							<div class="addTime">审核时间：</div>
+							<a-range-picker
+								v-model:value="searchParam"
+								style="width: 420px"
+								format="YYYY-MM-DD"
+								separator="至"
+								:placeholder="['      开始时间', '        结束时间']"
+							/>
 						</div>
 					</div>
 				</div>
@@ -120,6 +130,7 @@ import {reactive, toRefs, onMounted, computed} from "vue";
 import { courseListView } from "../../api/indexAudit";
 import * as api1 from "@/api/index1";
 import {useStore} from "vuex";
+import dayjs from "dayjs";
 
 export default {
 	name: "CoursereViewed",
@@ -406,6 +417,7 @@ export default {
 					],
 				}
 			],
+			searchParam:[], // 时间搜索
 		});
 
     const store = useStore();
@@ -424,9 +436,12 @@ export default {
 		}
 
 		const getList = () => {
+			console.log(state.searchParam[0],state.searchParam[1],new Date(state.searchParam[0]).getTime(),new Date(state.searchParam[0]))
 			state.loading = true
 			let objn = {
 				auditStatus: 0,
+				beginTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[0]).getTime()).format("YYYY-MM-DD"): "",
+				endTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[1]).getTime()).format("YYYY-MM-DD"): "",
 				sysTypeId: state.valueproj,
 				createName: state.valuecreater,
 				name: state.valuename,
@@ -530,6 +545,28 @@ export default {
 };
 </script>
 <style lang="scss">
+.addTimeBox {
+	top: 4px;
+	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;
+	}
+}
+
 .coursereviewed {
 	width: 100%;
 

src/views/examine/CourseReviewedN.vue

@@ -53,7 +53,7 @@
 								margin-right: 14px;
 								" placeholder="请输入名称" />
 						</div>
-						<!-- <div class="select addTimeBox">
+						<div class="select addTimeBox">
 							<div class="addTime">创建时间：</div>
 							<a-range-picker
 								v-model:value="searchParam"
@@ -62,7 +62,7 @@
 								separator="至"
 								:placeholder="['      开始时间', '        结束时间']"
 							/>
-						</div> -->
+						</div>
 					</div>
 				</div>
 				<div class="tmplh_btn">
@@ -150,6 +150,7 @@ import SeeModal from "../courselibrary/components/seeModal.vue";
 import { iframeUrl } from "../../api/method";
 import * as api1 from "@/api/index1";
 import {useStore} from "vuex";
+import dayjs from "dayjs";
 
 export default {
 	name: "CoursereViewedN",
@@ -418,6 +419,7 @@ export default {
 					],
 				}
 			],
+			searchParam:[], // 时间搜索
 		});
     const store = useStore();
 
@@ -519,9 +521,15 @@ export default {
 		// contentList11.find(e => e.dictCode == text)?.dictValue
 
 		const searchList = () => {
+			console.log('searchParamsearchParamsearchParam', state.searchParam)
+			console.log('searchParamsearchParamsearchParam', Math.ceil(new Date(state.searchParam[0]).getTime()))
 			let objn = {
 				auditStatus: 1,
 				// categoryId: state.valueproj,
+				// beginTime:state.searchParam.length!==0? Math.ceil(new Date(state.searchParam[0]).getTime()/1000): "",
+				// endTime:state.searchParam.length!==0? Math.ceil(new Date(state.searchParam[1]).getTime()/1000): "",
+				beginTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[0]).getTime()).format("YYYY-MM-DD"): "",
+				endTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[1]).getTime()).format("YYYY-MM-DD"): "",
 				sysTypeId: state.valueproj,
 				createName: state.valuecreater,
 				name: state.valuename,
@@ -587,6 +595,7 @@ export default {
 			state.tableData1 = array;
 		};
 		const reset = () => {
+			state.searchParam = [];
 			state.valueproj = null;
 			state.valuecreater = null;
 			state.valuename = null;

src/views/examine/ProjectReviewed.vue

@@ -65,7 +65,7 @@
           </div>
           </div>
         </div>
-        <div class="tmplh_btn">
+        <div class="tmplh_btn" style="margin-top:50px;">
           <div class="btn btn1" @click="getProjList">
             <div class="search"></div>
             <div class="btnText btnText1">搜索</div>

src/views/examine/ProjectReviewedN.vue

@@ -53,9 +53,19 @@
             <!--              <a-range-picker v-model:value="valueDate" style="border-radius: 8px; height: 40px; margin-left: 5px"-->
             <!--                :placeholder="['      开始时间', '        结束时间']" @change="rankTimeChange" />-->
             <!--            </div>-->
+            <div class="select addTimeBox">
+							<div class="addTime">提交时间：</div>
+							<a-range-picker
+								v-model:value="searchParam"
+								style="width: 420px"
+								format="YYYY-MM-DD"
+								separator="至"
+								:placeholder="['      开始时间', '        结束时间']"
+							/>
+						</div>
           </div>
         </div>
-        <div class="tmplh_btn">
+        <div class="tmplh_btn" style="margin-top:50px;">
           <div class="btn btn1" @click="getProjList">
             <div class="search"></div>
             <div class="btnText btnText1">搜索</div>
@@ -108,6 +118,7 @@
 import { onMounted, reactive, toRefs } from "vue";
 import ProjectAudit from "../../components/drawers/ProjectAudit";
 import { auditlist } from "../../api/indexAudit";
+import dayjs from "dayjs";
 
 export default {
   name: "ProjectViewedN",
@@ -230,6 +241,7 @@ export default {
         },
       ],
       tableData1: [],
+      searchParam:[]
     });
     const showProjAudit = (id, createId, creater) => {
       state.ProjAuditvisible = true;
@@ -240,17 +252,16 @@ export default {
     const getProjList = () => {
       state.loading=true
       let objn = {
-        beginTime:
+        beginTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[0]).getTime()).format("YYYY-MM-DD"): "",
-          state.valueDate == undefined ? "" : Date.parse(state.valueDate[0]),
+				endTime:state.searchParam.length!==0? dayjs(new Date(state.searchParam[1]).getTime()).format("YYYY-MM-DD"): "",
         createName: state.valuecreater,
-        endTime:
-          state.valueDate == undefined ? "" : Date.parse(state.valueDate[1]),
         manager: state.valuename,
         name: state.valueproj,
         pageNo: state.currentPage,
         pageSize: state.pageSize,
         status: 1,
       };
+      console.log(objn)
       auditlist(objn)
         .then((res) => {
           console.log("获取待审核项目成功", res);
@@ -278,6 +289,7 @@ export default {
       getProjList();
     };
     const reset = () => {
+      state.searchParam = [];
       (state.valueproj = ""),
         (state.valuecreater = ""),
         (state.valuename = ""),
@@ -298,6 +310,28 @@ export default {
 };
 </script>
 <style lang="scss">
+.addTimeBox {
+	top: 4px;
+	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;
+	}
+}
+
 .projectviewedn {
   width: 100%;
 

src/views/learningpath/LearningPath.vue

@@ -26,7 +26,6 @@
             :options="statusList"
             @change="selectStatusClassify"
             allowClear
-            showSearch
           ></a-select>
         </div>
 

src/views/learningpath/LevelAdd.vue

@@ -897,7 +897,6 @@
                   :options="statess"
                   @change="selectProjectName4"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
               <div class="btn">

src/views/learningpath/LevelAddDetail.vue

@@ -1005,7 +1005,6 @@
                 :options="level"
                 @change="handleChangeStage"
                 allowClear
-                showSearch
               ></a-select>
             </div>
             <div class="btn">

src/views/projectcenter/LibraryAdd.vue

@@ -717,7 +717,6 @@
                   :options="projectNameList4"
                   @change="selectProjectName4"
                   allowClear
-                  showSearch
                 ></a-select>
               </div>
               <div class="btn">

src/views/projectcenter/ProjectAdd.vue

@@ -192,19 +192,35 @@
           <div class="namebox">
             <div class="inname">同步学习记录</div>
           </div>
-          <div class="in">
+          <div class="in ggysxz" v-if="courseSyncFlag">
+            <!-- :disabled="viewDetail ? true : false" -->
             <a-checkbox
                 v-model:checked="courseSyncFlag"
-                :disabled="viewDetail ? true : false"
+                disabled>
-            ><span
+              <span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
+                ">
-            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
-            ></a-checkbox
+              </span>
-            >
+            </a-checkbox>
+          </div>
+          <div class="in" v-else>
+            <!-- :disabled="viewDetail ? true : false" -->
+            <a-checkbox
+                v-model:checked="courseSyncFlag"
+                disabled>
+              <span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                ">
+                同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
+              </span>
+            </a-checkbox>
           </div>
         </div>
         <div class="name name2">
@@ -320,7 +336,7 @@ export default {
         keyWord: "",
       },
       classifyList5: [],
-      courseSyncFlag: false,
+      courseSyncFlag: true,
       auditDescription: "",
       ptojectType: "",
     });
@@ -533,6 +549,16 @@ export default {
 };
 </script>
 <style lang="scss">
+
+.ggysxz {
+  .ant-checkbox-disabled.ant-checkbox-checked .ant-checkbox-inner::after {
+    border-color: #FFF !important;
+  }
+  .ant-checkbox-disabled .ant-checkbox-inner {
+   background-color: #1890ff !important;
+  }
+}
+
 .flex-top {
   align-items: flex-start !important;
 }

src/views/projectcenter/TaskAdd.vue

@@ -1177,7 +1177,7 @@ export default {
 							arraynew.push(data[i])
 						}
 					}
-					console.log(arraynew)
+					// console.log(arraynew)
 					if (arraynew.length !== 0) {
 						state.chooseStageId = Number(arraynew[arraynew.length - 1].stageId);
 					}
@@ -1439,8 +1439,7 @@ export default {
 				});
 		};
 		onMounted(() => {
-			document.getElementsByTagName("main")[0].style.background =
+			document.getElementsByTagName("main")[0].style.background = "rgb(245, 247, 250,1)";
-				"rgb(245, 247, 250,1)";
 			document.getElementsByTagName("main")[0].style.boxShadow = "none";
 			getTask();
 		});
@@ -1452,8 +1451,7 @@ export default {
 		});
 		onUnmounted(() => {
 			document.getElementsByTagName("main")[0].style.background = "#ffffff";
-			document.getElementsByTagName("main")[0].style.boxShadow =
+			document.getElementsByTagName("main")[0].style.boxShadow = "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
-				"0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
 		});
 		const showDrawerOnline = (id, eleId) => {
 			console.log("id, eleId", id, eleId);

src/views/projectcenter/temTask.vue

@@ -1016,7 +1016,6 @@
                 :options="level"
                 @change="handleChangeStage"
                 allowClear
-                showSearch
               ></a-select>
             </div>
             <div class="btn">

src/views/projectcenter/templateAdd.vue

@@ -166,10 +166,26 @@
           <div class="namebox">
             <div class="inname">同步学习记录</div>
           </div>
-          <div class="in">
+          <div class="in ggysxz" v-if="courseSyncFlag"> 
+            <!-- :disabled="viewDetail ? true : false" -->
             <a-checkbox
+                disabled
+                v-model:checked="courseSyncFlag"
+            ><span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                "
+            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+            ></a-checkbox
+            >
+          </div>
+          <div class="in" v-else> 
+            <!-- :disabled="viewDetail ? true : false" -->
+            <a-checkbox
+                disabled
                 v-model:checked="courseSyncFlag"
-                :disabled="viewDetail ? true : false"
             ><span
                 style="
                   width: 100%;
@@ -223,7 +239,7 @@ const router = useRouter();
 const store = useStore();
 const projectInfo = ref({});
 const projectPic = ref([]);
-const courseSyncFlag = ref(false)
+const courseSyncFlag = ref(true)
 onMounted(() => {
   getDetail();
   projectPic.value = store.state.projectPic.map((e) => ({
@@ -305,6 +321,15 @@ function managerChange(e, l, d, t,orgName) {
 }
 </script>
 <style lang="scss">
+.ggysxz {
+  .ant-checkbox-disabled.ant-checkbox-checked .ant-checkbox-inner::after {
+    border-color: #FFF !important;
+  }
+  .ant-checkbox-disabled .ant-checkbox-inner {
+   background-color: #1890ff !important;
+  }
+}
+
 .active {
   border: 2px solid rgba(78, 166, 255, 1);
 }

src/views/research/ResearchManage.vue

@@ -20,7 +20,6 @@
             :options="projectStateList"
             @change="handleProjectState"
             allowClear
-            showSearch
           ></a-select>
         </div>
         <div class="select">