diff --git a/src/App.vue b/src/App.vue index f70b4865..a96115d3 100644 --- a/src/App.vue +++ b/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("版本0.9.14------------"); + console.log("版本1.01------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 9941c82c..7d98ba2b 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -46,7 +46,7 @@
-
-
- -
+
+ +
+
@@ -171,7 +171,7 @@ export default { time: undefined, caseId: null, caseName: "", - isClick: false + isClick: false, }); const closeDrawer = () => { ctx.emit("update:addcaseVisible", false); @@ -202,13 +202,13 @@ export default { width: "200px", align: "center", }, - // { - // title: "导入时间", - // dataIndex: "time", - // key: "time", - // width: "400px", - // align: "center", - // }, + // { + // title: "导入时间", + // dataIndex: "time", + // key: "time", + // width: "400px", + // align: "center", + // }, ]; return columns; }; @@ -218,6 +218,7 @@ export default { } state.selectedRowKeys = selectedRowKeys; state.apiTaskList = selectedRows; + console.log("selectedRows", selectedRows); }; const handelChangePage = (page, pageSize) => { state.selectedRowKeys = []; @@ -276,16 +277,16 @@ export default { }; const updateTask = () => { if (props.isLevel == 1) { - if(!props.isactive){ + if (!props.isactive) { message.destroy(); return message.warning("请先选中关卡"); } - if(state.isClick){ - message.destroy(); - message.error('请勿频繁点击') - return - } - state.isClick = true; + if (state.isClick) { + message.destroy(); + message.error("请勿频繁点击"); + return; + } + state.isClick = true; for (let i = 0; i < state.apiTaskList.length; i++) { RouterEditTask({ chapterId: props.isactive, @@ -308,12 +309,12 @@ export default { }); } } else if (props.isLevel == 2) { - if(state.isClick){ - message.destroy(); - message.error('请勿频繁点击') - return - } - state.isClick = true; + if (state.isClick) { + message.destroy(); + message.error("请勿频繁点击"); + return; + } + state.isClick = true; for (let i = 0; i < state.apiTaskList.length; i++) { apiTask .addTask({ @@ -338,19 +339,21 @@ export default { }); } } else if (props.isLevel == 3) { - if(state.isClick){ - message.destroy(); - message.error('请勿频繁点击') - return - } - state.isClick = true; + if (state.isClick) { + message.destroy(); + message.error("请勿频繁点击"); + return; + } + state.isClick = true; for (let i = 0; i < state.apiTaskList.length; i++) { apiTask .addTaskTemplate({ 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, }) @@ -371,6 +374,7 @@ export default { }; //搜索案例列表 const searchList = () => { + state.selectedRowKeys = []; if (state.inputV1 !== "") { getAllCaseText(); } else { @@ -432,7 +436,7 @@ export default { .main_items { margin-top: 32px; display: flex; - + margin-bottom: 12px; flex-wrap: wrap; .mi_ipts { diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index ce682451..825b96e5 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -1,733 +1,719 @@ diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index f22ce374..10771461 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -1,34 +1,46 @@ \ No newline at end of file diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 98d6dbe1..7c2f3944 100644 --- a/src/components/drawers/AddProject.vue +++ b/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 = ""; diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 62af9c4d..3bcce3ed 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -1,15 +1,23 @@ \ No newline at end of file diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue index 74fab40c..84755032 100644 --- a/src/components/drawers/AssessmentAll.vue +++ b/src/components/drawers/AssessmentAll.vue @@ -9,7 +9,7 @@ maxlength="20" />
-
+
搜索
@@ -43,10 +43,11 @@ >创建人： {{ assessment.creator }} +
@@ -28,11 +28,13 @@
@@ -56,15 +58,63 @@
- diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 632693a9..f6279f78 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -851,7 +851,7 @@
编辑
--> -
+
编辑
@@ -1442,14 +1442,7 @@ >
+ style="width: 100%;height: 68px;display: flex;align-items: center; justify-content: space-between; ">
- -
@@ -649,7 +648,7 @@
- {{ element.cretime }}分钟 + {{ element.cretime ? element.cretime + "分钟" : "-" }}
-
取消
+
取消
-
确定
+
确定
@@ -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, @@ -1402,12 +1401,16 @@ export default { state.tableData = array; console.log("state.tableData", state.tableData); }; - //把阶段放到level里 - const getStageData = (tableData) => { + //把阶段放到level里 + const getStageData = (tableData) => { 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, @@ -1623,20 +1626,48 @@ export default { console.log("获取任务列表失败", err); }); };*/ - - //获取任务列表 - const getTask = async () => { - - await api - .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(); - - }); + // 删除所有阶段 + const removeAllLevel = () => { + // state.cancelModal = false; + console.log(state.level); + let removeArr = state.level; + for (let i = 0; i < removeArr.length; i++) { + + api + .deleteStage(removeArr[i].id) + .then((res) => { + console.log("删除阶段成功", res); + if (removeArr.length - 1 == i) { + message.destroy(); + message.success("删除全部阶段成功"); + closeDeleteStage(); + localStorage.setItem("stageId", ""); + getTask(); + state.cancelModal = false; + } + }) + .catch((err) => { + if (removeArr.length - 1 == i) { + console.log("删除阶段失败", err); + message.destroy(); + message.success("删除全部阶段失败"); + state.cancelModal = false; + } + }); + } + }; + //获取任务列表 + const getTask = async () => { + await api + .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(); + }); }; function updateStageChoosd() { @@ -1659,9 +1690,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 ); } @@ -1956,10 +1993,9 @@ export default { console.log("state.level", id, state.level); state.chooseStageId = id; let final = state.level.find((item) => item.id === id); - if(final !=null){ + if (final != null) { getTableData(final.taskList); } - }; //选择单个任务 @@ -2154,6 +2190,7 @@ export default { getTableData, deleteTask, editStage, + removeAllLevel, updateTableData, changeVData, changeRow, diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue index b4186361..11556ece 100644 --- a/src/views/projectcenter/templateAdd.vue +++ b/src/views/projectcenter/templateAdd.vue @@ -78,6 +78,7 @@
route.query.projectTemplateId && api.templateDetail(route.query.projectTemplateId).then((res) => { projectInfo.value = res.data.data.projectTemplateInfo; - projectInfo.value.rangeTime = [ - projectInfo.value.beginTime, - projectInfo.value.endTime, + projectInfo.value.rangeTime = [dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"), + dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm"), ]; projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag }); @@ -253,8 +253,8 @@ const backPage = () => { function timeChange(e) { if (e && e.length === 2) { - projectInfo.value.beginTime = e[0]; - projectInfo.value.endTime = e[1]; + projectInfo.value.beginTime = dayjs(e[0]).format("YYYY-MM-DD HH:mm"), + projectInfo.value.endTime =dayjs(e[1]).format("YYYY-MM-DD HH:mm") } } @@ -281,6 +281,8 @@ const createProject = () => { } } projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0; + projectInfo.value.beginTime = dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"), + projectInfo.value.endTime =dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm") api .templateEdit({ ...projectInfo.value, diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 00cbb91d..97688ba0 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -24,12 +24,17 @@ >
- -
+
+
创建时间：
+ +
+
@@ -166,7 +171,8 @@
取消
-
确定
+
确定
+
确定
@@ -414,7 +420,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, @@ -665,6 +671,7 @@ export default { state.copy_hs = true; }; const handleSure = () => { + // 发布 if (state.pub_hs) { editReleaseStatus({ @@ -710,11 +717,13 @@ export default { } // 复制 if (state.copy_hs) { + state.addLoading = true; let resultPost = restData(state.copyItem); resultPost.assessmentName = resultPost.assessmentName + "(1)"; console.log("resultPost"); console.log(resultPost); createResearch(resultPost).then((res) => { + state.addLoading =false; console.log(res); handleCancelModal(); getTableDate(); @@ -865,6 +874,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;