From 006097a63ec647406b2ffc4006131c240ef78768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= Date: Wed, 23 Nov 2022 14:47:44 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E9=9D=A2=E6=8E=88=20=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexFace.js | 5 +- src/api/indexNotice.js | 2 +- src/components/drawers/ AssessmentList.vue | 53 ++--- src/components/drawers/AddFaceteach.vue | 224 ++++++++++++++++++++- src/components/drawers/AddHomework.vue | 16 +- src/components/drawers/NoticeHis.vue | 11 +- src/components/drawers/NoticePub.vue | 6 +- src/components/drawers/SelFacet.vue | 2 +- src/components/drawers/StuScoreDetail.vue | 6 +- src/views/examine/CourseReviewed.vue | 2 +- src/views/examine/ProjectReviewed.vue | 223 +++++++++++++++++++- src/views/learningpath/LevelAddDetail.vue | 30 ++- src/views/projectcenter/TaskAdd.vue | 18 +- 13 files changed, 534 insertions(+), 64 deletions(-) diff --git a/src/api/indexFace.js b/src/api/indexFace.js index 731e8fc1..51ff5214 100644 --- a/src/api/indexFace.js +++ b/src/api/indexFace.js @@ -1,4 +1,7 @@ import http from "./config"; //获取面授课开课详情 -export const queryFaceDetailById = (offcoursePlanId) => http.post(`http://localhost:8080/api/admin/offcourse/detailPlan?offcoursePlanId=` + offcoursePlanId + ``) \ No newline at end of file +export const queryFaceDetailById = (offcoursePlanId) => http.post(`http://localhost:8080/manageApi/admin/offcourse/detailPlan?offcoursePlanId=` + offcoursePlanId + ``) + +//新建或编辑面授课开课 +export const editPlan = (obj) => http.post('/admin/offcourse/editPlan', obj) \ No newline at end of file diff --git a/src/api/indexNotice.js b/src/api/indexNotice.js index 19a34f98..cda183fa 100644 --- a/src/api/indexNotice.js +++ b/src/api/indexNotice.js @@ -6,7 +6,7 @@ import http from "./config"; // projectId: projectId, // } // }); -export const noticeList = (projectId) => http.post(`http://localhost:8080/manageApi/admin/project/noticeList?projectId=` + projectId + ``) +export const noticeList = (obj) => http.post('/admin/project/noticeList', obj) //发布项目公告 export const publishNotice = (obj) => http.post('/admin/project/publishNotice', obj) diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue index 1b7d4992..234da65a 100644 --- a/src/components/drawers/ AssessmentList.vue +++ b/src/components/drawers/ AssessmentList.vue @@ -1,3 +1,4 @@ + @@ -78,32 +78,34 @@ export default { // components: { // }, props: { - assessmentVisible: { + assessmentVisible: { type: Boolean, default: false, - }, - + }, + isface: { + type: Number, + default: null, + }, }, setup(props, ctx) { const state = reactive({ - assessmentVisible:false, - assessment:null, - inputV1:"", + assessmentVisible: false, + assessment: null, + inputV1: "", currentPage: 1, pageSize: 10, tableDataTotal: 0, tableData: [], - selectedRowKeys:[], + selectedRowKeys: [], }); const closeDrawer = () => { ctx.emit("update:assessmentVisible", false); }; const afterVisibleChange = (bool) => { console.log("state getAllInvistText", bool); - if(props.assessmentVisible){ + if (props.assessmentVisible) { getAllInvistText(); } - }; const tableDataFunc = () => { const columns = [ @@ -142,11 +144,16 @@ export default { }; const rowSelection = { type: "radio", - onSelect:(selectedRows)=>{ + onSelect: (selectedRows) => { state.assessment = selectedRows; - console.log("selectedRows=======",state.assessment); - ctx.emit("checkedAss", state.assessment); - state.selectedRowKeys = [] + console.log("selectedRows=======", state.assessment); + if (props.isface == 1) { + ctx.emit("faceAssess", state.assessment); + } else { + ctx.emit("checkedAss", state.assessment); + } + + state.selectedRowKeys = []; closeDrawer(); }, }; @@ -166,7 +173,7 @@ export default { data.map((value, index) => { let obj = { key: index, - assessmentId:value.assessmentId, + assessmentId: value.assessmentId, num: value.essayQuestionVoList.length, name: value.assessmentName ? value.assessmentName : "-", creator: value.createUser ? value.createUser : "-", @@ -174,17 +181,16 @@ export default { }; array.push(obj); }); - state.selectedRowKeys = [], - state.tableData = array; + (state.selectedRowKeys = []), (state.tableData = array); }; //获取全部评估信息接口 const getAllInvistText = () => { api .queryAssessmentDetailList({ - assessmentName:state.inputV1, - pageNo: state.currentPage, - pageSize: state.pageSize, - }) + assessmentName: state.inputV1, + pageNo: state.currentPage, + pageSize: state.pageSize, + }) .then((res) => { let arr = res.data.data.rows; if (res.status === 200) { @@ -199,7 +205,6 @@ export default { }); }; - //重置评估信息 const resetInvist = () => { state.inputV1 = ""; @@ -243,7 +248,7 @@ export default { justify-content: space-between; .main_left { padding-right: 30px; - margin-top:32px; + margin-top: 32px; .main_item { display: flex; align-items: center; diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index c366534a..6acf985d 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -48,7 +48,24 @@ 选择课程：
- + + {{ chooseCourseName }}
@@ -259,7 +276,22 @@ 需要评估 - + + {{ chooseMentName }}
@@ -271,12 +303,35 @@
+
- +
+
+ {{ chooseWorkName }} +
配置考试： @@ -295,7 +350,13 @@ 附件：
- + +
@@ -304,6 +365,11 @@ + @@ -315,21 +381,24 @@ import AddTest from "../../components/drawers/AddTest.vue"; import { ProjectEditTask, RouterEditTask } from "@/api/indexTask"; // import * as method from "../../api/method" import { message } from "ant-design-vue"; -import { queryFaceDetailById } from "../../api/indexFace"; +import { queryFaceDetailById, editPlan } from "../../api/indexFace"; import dayjs from "dayjs"; +import AssessmentList from "../drawers/ AssessmentList.vue"; +// import { toDate } from "../../api/method"; export default { name: "AddFaceteach", components: { SelFacet, AddHomework, AddTest, + AssessmentList, }, props: { addfaceteachVisible: { type: Boolean, default: false, }, - EditEvalId: { + EditFaceId: { // 要编辑的workId type: Number, default: null, @@ -390,13 +459,42 @@ export default { checkedHolidy: false, checkedAssessment: false, chooseTime: [], + fileList: [], + chooseCourse: null, //选择的在线课程 + chooseCourseName: null, //选择的课程的名字 + face: true, //面授传给配置作业的标识 + chooseWork: null, //配置的work + chooseWorkName: null, //配置的work名字 + chooseMent: null, + chooseMentName: null, + assessmentVisible: false, + isface: 1, }); + const clear = () => { + state.inputV1 = null; + state.inputV2 = null; + state.inputV3 = null; + state.inputV4 = null; + state.inputV5 = null; + state.inputV6 = null; + state.inputV7 = null; + state.chooseTime = []; + state.textV1 = null; + state.radioV1 = ""; + state.radioV2 = ""; + state.checkedHolidy = false; + state.checkedAssessment = false; + state.chooseMent = null; + state.chooseWork = null; + state.chooseCourse = null; + }; const closeDrawer = () => { ctx.emit("update:addfaceteachVisible", false); state.radioV1 = ""; state.radioV2 = ""; localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); + clear(); }; const afterVisibleChange = (bool) => { if (bool && props.edit) { @@ -427,7 +525,7 @@ export default { //查询面授 const queryFaceTeach = () => { //暂时写一个假的offcoursePlanId - queryFaceDetailById(2).then((res) => { + queryFaceDetailById(props.EditFaceId).then((res) => { // state.inputV1 = res.data.data.name; // state.inputV2 = res.data.data.teacherId; console.log("获取到了面授课开课详情", res.data.data); @@ -447,6 +545,7 @@ export default { state.inputV5 = result.beforeStart; state.inputV6 = result.afterStart; state.inputV7 = result.beforeEnd; + state.fileList = JSON.parse(result.attach); // state.radioV1 = result. state.checkedHolidy = result.completeType == 1 @@ -473,10 +572,79 @@ export default { }; //新建或编辑面授 - const updateFaceTeach = () => {}; - const upDateTable = () => {}; + // 新增任务 + const updateFaceTeach = () => { + if ( + state.inputV1 == "" || + state.chooseCourse == null || + state.inputV2 == "" || + state.chooseTime == [] || + state.inputV3 == "" || + state.inputV4 == "" + ) { + message.destroy(); + return message.warning("请输入必填字段"); + } else { + let obj = { + address: state.inputV4, + afterStart: state.inputV6, + applyFlag: 1, + attach: JSON.stringify(state.fileList), + beforeEnd: state.inputV7, + beforeStart: state.inputV5, + // beginTime: dayjs(state.chooseTime[0]).format("YYYY-MM-DD"), + beginTime: parseInt( + new Date(state.chooseTime[0].$d).getTime() / 1000 + ), + completeType: state.radioV1 == "1" ? 2 : 1, + description: state.textV1, + // endTime: dayjs(state.chooseTime[1]).format("YYYY-MM-DD"), + endTime: parseInt(new Date(state.chooseTime[0].$d).getTime() / 1000), + evalFlag: state.checkedAssessment == true ? 1 : 0, + evaluateId: + state.chooseMent == null ? 0 : state.chooseMent.assessmentId, + homeWorkId: 0, + name: state.inputV1, + noProjectMember: state.radioV2 == "1" ? 0 : 1, + offcourseId: 0, + offcoursePlanId: props.edit ? props.EditFaceId : 0, + projectMember: state.radioV2 == "1" ? 1 : 0, + signFlag: 0, + signWordFlag: 0, + teacherId: 0, + testId: 0, + }; + + if (props.edit) { + editPlan(obj) + .then((res) => { + updateTask(res); + closeDrawer(); + }) + .catch((err) => { + message.error(`添加失败${err}`); + }); + } else { + editPlan(obj) + .then((res) => { + updateTask(res); + closeDrawer(); + }) + .catch((err) => { + message.error(`添加失败${err}`); + }); + } + } + }; + const upDateTable = (value) => { + console.log("gg", value); + console.log("gg", value[0].name); + state.chooseCourse = value[0]; + state.chooseCourseName = value[0].name; + }; //更新任务列表 + // 新增编辑或新增项目任务 const updateTask = (res) => { if (props.isLevel == 1) { let editObj1 = { @@ -511,17 +679,44 @@ export default { ProjectEditTask(editObj) .then(() => { message.success( - `${props.EditTestId ? "编辑" : "新增"}阶段任务成功` + `${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` ); ctx.emit("changeData", false); }) .catch(() => { - message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); + message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { console.log(""); } }; + const closeTag = () => { + state.chooseCourse = null; + state.chooseCourseName = null; + }; + const closeTagWork = () => { + state.chooseWork = null; + state.chooseWorkName = null; + }; + const getWork = (value) => { + console.log("getWork", value); + state.chooseWork = value; + state.chooseWorkName = value.workName; + console.log("getWorkName", value.workName); + }; + const handleChange = ({ file, fileList }) => { + if (file.status !== "uploading") { + console.log(file, fileList); + } + }; + const showAssessment = () => { + state.assessmentVisible = true; + }; + const faceAssess = (value) => { + console.log(value); + state.chooseMent = value; + state.chooseMentName = value.name; + }; return { ...toRefs(state), showDrawerSelFacet, @@ -534,6 +729,13 @@ export default { updateFaceTeach, updateTask, upDateTable, + closeTag, + getWork, + closeTagWork, + clear, + handleChange, + showAssessment, + faceAssess, // change, }; }, diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 1f5f6d76..0f2a48df 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -77,7 +77,7 @@ @@ -96,7 +96,7 @@
取消 - 确定 + 确定
@@ -164,6 +164,10 @@ export default { type: Number, default: null, }, + face: { + type: Boolean, + default: false, + }, }, setup(props, ctx) { const formState = reactive({ @@ -362,6 +366,13 @@ export default { } }; + const cle = () => { + console.log("xx", formState); + if (props.face) { + ctx.emit("getWork", formState); + } + }; + return { afterVisibleChange, closeDrawer, @@ -375,6 +386,7 @@ export default { formRef, // layout, rules, + cle, ...toRefs(state), }; }, diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue index 953cf8aa..023a452c 100644 --- a/src/components/drawers/NoticeHis.vue +++ b/src/components/drawers/NoticeHis.vue @@ -62,12 +62,17 @@ export default { state.notice = array; }; const getNotice = () => { - noticeList(props.projectId) + let obj = { + pageNo: 1, + pageSize: 10, + projectId: props.projectId, + }; + noticeList(obj) .then((res) => { console.log("获取公告列表成功"); let result = res.data.data; - if (result.length > 0) { - setNoticeData(result); + if (result.total > 0) { + setNoticeData(result.rows); } }) .catch((err) => { diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue index fe4cb355..e98f695e 100644 --- a/src/components/drawers/NoticePub.vue +++ b/src/components/drawers/NoticePub.vue @@ -56,10 +56,10 @@ export default { return message.warning("请输入公告内容"); } else { let obj = { - createId: state.projectInfo.createId, - createName: state.projectInfo.createName, + // createId: state.projectInfo.createId, + // createName: state.projectInfo.createName, notice: state.noticeContent, - noticeId: 0, + // noticeId: 0, projectId: props.projectId, title: "", }; diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue index 92941fe6..79eeabc4 100644 --- a/src/components/drawers/SelFacet.vue +++ b/src/components/drawers/SelFacet.vue @@ -216,7 +216,7 @@ export default { state.selectedRowKeys = selectedRowKeys; state.selectedRows = selectedRows; - console.log(selectedRows); + console.log("选择了", state.selectedRows[0].name); }; const closeDrawer = () => { ctx.emit("update:selfacetVisible", false); diff --git a/src/components/drawers/StuScoreDetail.vue b/src/components/drawers/StuScoreDetail.vue index b137242c..d287d101 100644 --- a/src/components/drawers/StuScoreDetail.vue +++ b/src/components/drawers/StuScoreDetail.vue @@ -53,7 +53,7 @@ diff --git a/src/views/research/ResearchAdd copy.vue b/src/views/research/ResearchAdd copy.vue deleted file mode 100644 index b2ad3d38..00000000 --- a/src/views/research/ResearchAdd copy.vue +++ /dev/null @@ -1,760 +0,0 @@ - - - - From dd2d68922378082ddbf8209dac4d38f75efd4062 Mon Sep 17 00:00:00 2001 From: kclf <1195754634@qq.com> Date: Wed, 23 Nov 2022 15:47:09 +0800 Subject: [PATCH 03/13] t --- src/views/courselibrary/CoursewareManage.vue | 434 ++----------------- 1 file changed, 30 insertions(+), 404 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 866101c4..30681725 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2117,13 +2117,12 @@ - + - + - + diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 338437fd..2d283673 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -486,6 +486,19 @@ />
项目
+
+ +
@@ -708,43 +721,8 @@ -
- -
-
-
关联项目
- -
-
- - -
-
- - -
-
- -
+ +
@@ -1055,6 +1033,7 @@ import AddInvist from "../../components/drawers/AddInvist.vue"; import AddVote from "../../components/vote/AddVote.vue"; import AddLive from "../../components/drawers/AddLive.vue"; import AddRef from "../../components/drawers/AddRef.vue"; +import AddProject from "../../components/drawers/AddProject.vue"; import AddFaceteach from "../../components/drawers/AddFaceteach.vue"; import * as api from "../../api/indexLevel"; import { GetRouterDetail } from "../../api/indexTask"; @@ -1063,9 +1042,9 @@ import { storage } from "../../api/storage"; import { deleteStudyTask } from "../../api/indexStudy"; import draggable from "vuedraggable"; import { editTask } from "../../api/indexTaskadd"; -import * as apiProj from "../../api/index.js"; + import { RouterEditTask } from "@/api/indexTask"; -import dayjs from "dayjs"; + import { toDate } from "../../api/method"; import UnlockMode from "../../components/drawers/UnlockMode.vue"; export default { @@ -1087,6 +1066,7 @@ export default { draggable, UnlockMode, AddFaceteach, + AddProject, }, setup() { const state = reactive({ @@ -1267,7 +1247,7 @@ export default { EditVoteId: "", EditFaceId: "", //项目 - EditProjId: "", + EditProjectId: "", routerTaskId: "", chapterId: "", stageId: "", @@ -1485,7 +1465,7 @@ export default { //打开项目抽屉 const showDrawerAddProj = (id, eleId) => { state.addprojvisible = true; - state.EditActiveId = id; + state.EditProjectId = id; state.routerTaskId = eleId; }; //关闭项目抽屉 @@ -1557,11 +1537,7 @@ export default { message.error(err); }); }; - const afterProjVisibleChange = (bol) => { - if(bol == true){ - getAllProjText() - } - }; + const showAddStu = () => { state.AddSvisible = true; }; @@ -1947,69 +1923,7 @@ export default { console.log("阶段改变", value, option); state.removeStageId = option.chapterId; }; - //项目抽屉用的 - const onProjSelectChange = (selectedRowKeys,selectedRows) => { - state.selectedProjRowKeys = selectedRowKeys - // if(selectedRowKeys.length>1){ - // return - // } - state.projId = selectedRows[0].projectId - state.projName = selectedRows[0].name - console.log(state.projId,'------------------'); - // console.log(selectedRowKeys,selectedRows); - } - const getTableDate = (data) => { - let array = [] - data.map((value)=>{ - if(value.type == 3){ - let obj = { - key: value.projectId, - parentId:value.parentId, - projectId:value.projectId, - name: value.name, - manager:value.manager, - time: dayjs(value.createTime).format("YYYY-MM-DD"), - } - array.push(obj) - } - else { - let obj = { - key: value.projectId, - parentId:value.parentId, - name: value.name, - manager:value.manager, - time: dayjs(value.createTime).format("YYYY-MM-DD"), - children: value.subList ? getTableDate(value.subList) : [] , - } - array.push(obj) - } - }) - return array - }; - //获取全部项目信息接口 - const getAllProjText = () => { - apiProj - .getProjectList({ - "beginTime": 0, - "createName": "", - "endTime": "", - "manager": "", - "name": "", - "pageNo": 1, - "pageSize": 10, - "status": 0 - }) - .then((res) => { - let arr = res.data.data.rows; - if (res.status === 200) { - state.drawertableData = getTableDate(arr); - } - }) - .catch(() => { - message.destroy() - message.error("获取全部项目信息接口失败") - }); - }; + //添加关卡项目 const updateTask = () => { RouterEditTask({ @@ -2044,7 +1958,6 @@ export default { tableDataFunc2, showModal, closeModal, - afterProjVisibleChange, showAddStu, showImpStu, // drawercolumns, @@ -2084,9 +1997,7 @@ export default { showChangeModal, closeChangeModal, handleChangeStage, - onProjSelectChange, - getTableDate, - getAllProjText, + updateTask, showDeleteChapter, diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index e271b643..68654ef3 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -99,6 +99,9 @@ export default defineComponent({ const state = reactive({ value1: null, time:null, + currentPage: 1, + pageSize: 10, + total:0, tableData1: [ { key: "1", @@ -168,9 +171,9 @@ export default defineComponent({ state.tableData = data; }; const pagination = reactive({ - current: 1, - total: 50, - defaultPageSize: 10, + current: state.currentPage, + total: state.total, + defaultPageSize: state.pageSize, onChange: (id) => { pagination.current = id; getLibraryList() }, }) getTableDate1(); @@ -181,14 +184,12 @@ export default defineComponent({ // 获取模板列表 const getLibraryList = () => { - let date = Math.ceil(new Date(state.time).getTime() / 1000); - + let date = Math.ceil(new Date(state.time).getTime() / 1000); let obj = { - // "create_time": state.time, - "beginTime":date, + "createTime" : date==0?null:date, "name": state.value1, "pageNo": pagination.current, - "pageSize": 10, + "pageSize": state.pageSize, } api.templateList(obj).then((res) => { state.tableData1 = [] From 08a77174d975c305da3b73562e87c14d761e38a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com> Date: Thu, 24 Nov 2022 14:15:40 +0800 Subject: [PATCH 11/13] =?UTF-8?q?feat:=20=E6=A8=A1=E6=9D=BF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=9B=9E=E4=BC=A0=EF=BC=8C=E9=98=B6=E6=AE=B5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=B7=E6=96=B0=EF=BC=8C=E9=98=B6=E6=AE=B5=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexTemplate.js | 3 +++ src/views/projectcenter/LibraryAdd.vue | 20 +++------------ src/views/projectcenter/TemplateLibrary.vue | 6 +++-- src/views/projectcenter/temTask.vue | 6 +++-- src/views/projectcenter/templateAdd.vue | 28 +++++++++++---------- 5 files changed, 29 insertions(+), 34 deletions(-) diff --git a/src/api/indexTemplate.js b/src/api/indexTemplate.js index be42523c..ef8b4745 100644 --- a/src/api/indexTemplate.js +++ b/src/api/indexTemplate.js @@ -19,3 +19,6 @@ export const editTask = (obj) => http.post('/admin/project/template/editTask',ob export const handleTemplates = (obj) => http.post('/admin/project/template/handle',obj); // 模板库列表 export const templateList = (obj) => http.post(`/admin/project/template/list`,obj); +// 发布项目公告 +export const publishNotice = (obj) => http.post(`/admin/project/template/publishNotice`,obj); + diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 8f698d99..71bef498 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -33,7 +33,7 @@
-
返回
@@ -802,23 +802,9 @@ export default defineComponent({ // 发布公告 const addNotice = () => { let obj = { - "beginTime": 0, - "boeFlag": 0, - "category": 0, - "courseSyncFlag": 0, - "endTime": 0, - "level": 0, - "manager": "", - "managerId": "", - "name": "", "notice": state.projectInfo.notice, - "noticeFlag": 0, - "picUrl": "", - "projectTemplateId": store.state.projectTemplateId, - "remark": "", - "sourceBelongId": 0, - "status": 0, - "systemId": 0 + "projectId": store.state.projectTemplateId, + "title": "" }; api.templateEdit(obj).methods(obj).then(res => { message.success("公告发布成功") diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index 68654ef3..08e768c6 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -184,12 +184,14 @@ export default defineComponent({ // 获取模板列表 const getLibraryList = () => { - let date = Math.ceil(new Date(state.time).getTime() / 1000); + let date = Math.ceil(new Date(state.time).getTime() / 1000); + let obj = { + // "create_time": state.time, "createTime" : date==0?null:date, "name": state.value1, "pageNo": pagination.current, - "pageSize": state.pageSize, + "pageSize": state.pageSize } api.templateList(obj).then((res) => { state.tableData1 = [] diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue index e334703e..79c83c22 100644 --- a/src/views/projectcenter/temTask.vue +++ b/src/views/projectcenter/temTask.vue @@ -1528,13 +1528,16 @@ let stageList = res.data.data.stageList; //阶段数组 let result = stageList.find((item) => item.templateStageId == stage); console.log("又找到了", result); + changebgc(res.data.data.stageList[0].templateStageId); getTableData(result.taskList); + } else { let arr = res.data.data.stageList[0].taskList; console.log("任务列表", arr); + changebgc(res.data.data.stageList[0].templateStageId); getTableData(arr); // state.isActive = true; - changebgc(res.data.data.stageList[0].templateStageId); + } // 每次都获取了第一条taskList @@ -1542,7 +1545,6 @@ // console.log("任务列表", stage, arr); // getTableData(arr); } - let stagearr = res.data.data.stageList; let arrlist = state.curLevel; console.log(stagearr, 111111); diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue index faab4b1c..6ba7468f 100644 --- a/src/views/projectcenter/templateAdd.vue +++ b/src/views/projectcenter/templateAdd.vue @@ -47,7 +47,6 @@ } " v-model:value="projectInfo.category" - placeholder="管理者" style="width: 100%" :options="classifyList" @change="classificationChange" @@ -121,7 +120,8 @@
@@ -141,7 +141,8 @@ return triggerNode.parentNode || document.body; } " - :value="projectInfo.manager" + + :value="classifySelect1" mode="multiple" placeholder="请选择项目经理" style="width: 100%" @@ -319,6 +320,7 @@ import * as api from "../../api/indexTemplate"; import { storage } from "../../api/storage"; import {useStore} from "vuex"; // import { toDate } from "../../api/method"; +import dayjs from "dayjs"; export default { name: "projectAdd", @@ -358,7 +360,7 @@ export default { valueE: null, valueE1: null, valueE2: null, - classifySelect1: [], + classifySelect1: ['李俊国'], classifySelect2: [], classifySelect3: [], classifySelect4: [], @@ -370,16 +372,16 @@ export default { totalPages: 0, //总页数 viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null, projectInfo:{ - beginTime:null, - endTime:null, + choosedTime:'', name: null, manager: null, notice: null, - sourceBelongId: null, + sourceBelongId: 1, + category:1, remark: "", courseSyncFlag: false, - level: null, - systemId: null, + level: 1, + systemId: 2, boeFlag: false, } }); @@ -468,7 +470,7 @@ export default { } if (info.file.status === "error") { loading.value = false; - message.error("upload error"); + message.error("upload error"); } }; @@ -628,9 +630,9 @@ export default { "name": state.projectInfo.name, "category": state.projectInfo.category, "picUrl": "x", - "beginTime": state.projectInfo.rangevalue || 1, - "endTime": state.projectInfo.rangevalue || 1, - "manager": state.projectInfo.manager, + "beginTime": Number(dayjs(state.projectInfo.choosedTime[0]).format("YYYY-MM-DD")) || 1, + "endTime": Number(dayjs(state.projectInfo.choosedTime[1]).format("YYYY-MM-DD")) || 1, + "manager": state.classifySelect1.toString(), "managerId": state.projectInfo.managerId || 0, "sourceBelongId": state.projectInfo.sourceBelongId, "level": state.projectInfo.level, From 646df5f2b59cb87243dbcfeb7e685c137c544a98 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Thu, 24 Nov 2022 14:27:29 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddProject.vue | 317 ++++++++++++++++++-------- 1 file changed, 224 insertions(+), 93 deletions(-) diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 8ee7b715..09741fb7 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -1,46 +1,97 @@