From a1bbb3bd2b762475cb93e8b435513803d463f7c8 Mon Sep 17 00:00:00 2001 From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com> Date: Tue, 22 Nov 2022 22:46:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E5=85=B3=E8=81=94=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=8E=B7=E5=8F=96=E5=88=97=E8=A1=A8=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAddDetail.vue | 166 +++++++++++++--------- 1 file changed, 100 insertions(+), 66 deletions(-) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 6780fa61..f7915e81 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -703,7 +703,7 @@ title="关联项目" placement="right" width="80%" - @after-visible-change="afterVisibleChange" + @after-visible-change="afterProjVisibleChange" >
@@ -1051,7 +1051,7 @@ 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 dayjs from "dayjs"; import { toDate } from "../../api/method"; import UnlockMode from "../../components/drawers/UnlockMode.vue"; export default { @@ -1173,7 +1173,6 @@ export default { time: "2022-07-15 14:00", }, ], - drawertableData: [], // drawertableData: [ // { // key: 1, @@ -1261,6 +1260,7 @@ export default { // time: "2022-07-20 14:00:03", // }, // ], + drawertableData: [], currentPage: 1, tableDataTotal: 0, pageSize: 10, @@ -1326,8 +1326,8 @@ export default { picUrl: null, //项目抽屉参数 time: undefined, - assessmentId: null, - assessmentName: "", + projId: null, //选项选到的id + projName: "", //选项选到的name projectId: null, projectTaskId: null, chooseStageId: null, @@ -1454,52 +1454,59 @@ export default { state.EditWorkId = id; state.routerTaskId = eleId; }; - // 作业和考试的抽屉 + // 作业抽屉 const showDrawerAddHomework = (id, eleId) => { console.log("homework==============", id, state.isactive); state.addhomeworkvisible = true; state.EditWorkId = id; state.routerTaskId = eleId; }; + //考试抽屉 const showDrawerAddTest = (id, eleId) => { state.addtestvisible = true; state.EditTestId = id; state.routerTaskId = eleId; }; - //测试评估投票抽屉 + //测试抽屉 const showDrawerAddEval = (id, eleId) => { // state.addevalVisible = true; state.addevalvisible = true; state.EditEvalId = id; state.routerTaskId = eleId; }; + //评估抽屉 const showDrawerAddInvist = (id, eleId) => { // state.addinvistVisible = true; state.addinvistvisible = true; state.routerTaskId = eleId; state.EditInvistId = id; }; + //投票抽屉 const showDrawerAddVote = (id, eleId) => { // state.addhomeworkvisible = true; state.addvotevisible = true; state.EditVoteId = id; state.routerTaskId = eleId; }; + //直播抽屉 const showDrawerAddLive = (id, eleId) => { state.addlivevisible = true; state.EditLiveId = id; state.routerTaskId = eleId; }; + //外链抽屉 const showDrawerAddRef = (id, eleId) => { state.addrefvisible = true; state.EditRefId = id; state.routerTaskId = eleId; }; + //讨论抽屉 const showDrawerAddDiscuss = (id, eleId) => { state.adddiscussvisible = true; state.EditDiscussId = id; state.routerTaskId = eleId; }; + //活动抽屉 const showDrawerAddActive = (id, eleId) => { state.addactivevisible = true; state.EditActiveId = id; @@ -1511,7 +1518,7 @@ export default { state.EditActiveId = id; state.routerTaskId = eleId; }; - // tableData数据赋值方法 + //tableData数据赋值方法 const dataAssignment = (id) => { console.log(state.level); for (let i = 0; i < state.level.length; i++) { @@ -1579,9 +1586,10 @@ export default { const closeDrawer = () => { state.visible = false; }; - - const afterVisibleChange = (bool) => { - console.log("visible", bool); + const afterProjVisibleChange = (bol) => { + if(bol == true){ + getAllProjText() + } }; const showAddStu = () => { state.AddSvisible = true; @@ -1698,38 +1706,9 @@ export default { { title: "项目名称", dataIndex: "name", - // dataIndex: "projectName", key: "projectName", width: 200, - // align: "center", ellipsis: true, - // scopedSlots: { customRender: "action" }, //引入的插槽 - customRender: (text) => { - // console.log(text.record.key); - if (!text.record.children) { - return ( -
- { - // console.log("改变了", text.record.key); - if (state.projectChecked === text.record.key) { - state.projectChecked = null; - } else { - state.projectChecked = text.record.key; - } - }} - > - {text.text} -
- ); - } else { - return {text.text}; - } - }, }, { title: "项目经理", @@ -1741,7 +1720,6 @@ export default { { title: "创建人", dataIndex: "creator", - // width: "30%", key: "creater", width: 100, align: "center", @@ -2008,45 +1986,100 @@ export default { "selected", selected ); - console.log(selectedRows.assessmentId); - state.assessmentId = selectedRows.assessmentId; - state.assessmentName = selectedRows.name; + state.projId = selectedRows.parentId; + state.projName = selectedRows.name; }, }; const getTableDate = (drawertableData) => { - let data = drawertableData; - let array = []; - data.map((value, index) => { + console.log(drawertableData,'drawertableDatadrawertableDatadrawertableDatadrawertableData') + let data = drawertableData + let array = [] + data.map((value)=>{ + if(value.type ==3){ let obj = { - key: index, - assessmentId: value.assessmentId, - num: value.essayQuestionVoList.length, - name: value.assessmentName ? value.assessmentName : "-", - creator: value.createUser ? value.createUser : "-", - time: dayjs(value.createTime).format("YYYY-MM-DD"), - }; - array.push(obj); - }); + key: value.projectId, + parentId:value.parentId, + name: value.name, + manager:value.manager, + creator: value.createName, + // time: dayjs(value.createTime).format("YYYY-MM-DD"), + }; + array.push(obj); + } + else if(value.type == 2){ + value.subList.map((item)=>{ + let obj = { + key: value.projectId, + parentId:value.parentId, + name: value.name, + manager:value.manager, + creator: value.createName, + // time: dayjs(value.createTime).format("YYYY-MM-DD"), + children:[{ + key: item.projectId, + parentId:item.parentId, + name: item.name, + manager:item.manager, + creator: item.createName, + // time: dayjs(value.createTime).format("YYYY-MM-DD"), + }] + } + array.push(obj); + }) + } + else{ + value.subList.map((item)=>{ + item.subList.map((items)=>{ + let obj = { + key: value.projectId, + parentId:value.parentId, + name: value.name, + manager:value.manager, + creator: value.createName, + // time: dayjs(value.createTime).format("YYYY-MM-DD"), + children:[{ + key: item.projectId, + parentId:item.parentId, + name: item.name, + manager:item.manager, + creator: item.createName, + children:[{ + key: items.projectId, + parentId:items.parentId, + name: items.name, + manager:items.manager, + creator: items.createName, + }] + // time: dayjs(value.createTime).format("YYYY-MM-DD"), + }] + } + array.push(obj); + }) + }) + } + }) + state.drawertableData = array; + console.log(state.drawertableData,"------------state.drawertableData---------------"); }; //获取全部项目信息接口 const getAllProjText = () => { apiProj .getProjectList({ - beginTime: 0, - createName: "", - endTime: 0, - manager: "", - name: "", - pageNo: 0, - pageSize: 0, - status: 0, + "beginTime": 0, + "createName": "", + "endTime": "", + "manager": "", + "name": "", + "pageNo": 1, + "pageSize": 10, + "status": 0 }) .then((res) => { let arr = res.data.data.rows; if (res.status === 200) { getTableDate(arr); - console.log("---------------项目信息---------------------------"); + console.log("---------------项目信息---------------------------",res.data.data); } }) .catch((err) => { @@ -2055,6 +2088,7 @@ export default { // state.createLoading = false; }); }; + //不需要下面这个添加应该 没选数据 const updateTask = () => { RouterEditTask({ chapterId: state.isactive, @@ -2092,7 +2126,7 @@ export default { closeDrawer, showModal, closeModal, - afterVisibleChange, + afterProjVisibleChange, showAddStu, showImpStu, // drawercolumns, From 1636fbfd6f73317c88254c861b2149874a8d5148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com> Date: Wed, 23 Nov 2022 15:35:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat=20:=20=E6=A8=A1=E6=9D=BF=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=EF=BC=8C=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 5 +- src/views/projectcenter/LibraryAdd.vue | 14 +-- src/views/projectcenter/TemplateLibrary.vue | 99 +++++++-------------- src/views/projectcenter/temTask.vue | 9 +- src/views/projectcenter/templateAdd.vue | 82 +++-------------- 5 files changed, 58 insertions(+), 151 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 9056d61c..9b93baab 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -22,7 +22,7 @@ export default createStore({ assessmentName: "", routerId: null, - + projectTemplateId:null, orgtreeList: [], }, getters: {}, @@ -43,6 +43,9 @@ export default createStore({ }, getOrgtreeList(state, orgtreeList) { state.orgtreeList = orgtreeList; + }, + SET_projectTemplateId (state,projectTemplateId) { + state.projectTemplateId = projectTemplateId; } }, actions: {}, diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 9ca65c2e..8f698d99 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -565,9 +565,11 @@ import { ref, reactive, defineComponent, toRefs, onMounted} from "vue"; import { message } from "ant-design-vue"; import * as api from "@/api/indexTemplate" import { useRouter } from "vue-router"; +import { useStore } from "vuex"; export default defineComponent({ name: "LibraryAdd", setup() { + const store = useStore(); const state = reactive({ //任务大纲列表 taskSyllabus: [ @@ -761,11 +763,12 @@ export default defineComponent({ onMounted(() => {getDetail()}); // 获取详情 const getDetail = () => { - api.templateDetail(1).then(res => { + api.templateDetail(store.state.projectTemplateId).then(res => { state.taskSyllabus = [] console.log(res); state.projectInfo.name = res.data.data.projectTemplateInfo.name - state.projectInfo.beginTime = res.data.data.projectTemplateInfo.createTime + let time = new Date(Number(res.data.data.projectTemplateInfo.createTime)) + state.projectInfo.beginTime = time.toLocaleDateString() state.projectInfo.manager = res.data.data.projectTemplateInfo.manager state.projectInfo.notice = res.data.data.projectTemplateInfo.notice state.projectInfo.sourceBelongId = res.data.data.projectTemplateInfo.sourceBelongId @@ -811,7 +814,7 @@ export default defineComponent({ "notice": state.projectInfo.notice, "noticeFlag": 0, "picUrl": "", - "projectTemplateId": 0, + "projectTemplateId": store.state.projectTemplateId, "remark": "", "sourceBelongId": 0, "status": 0, @@ -860,7 +863,7 @@ export default defineComponent({ const stateEdit = () => { let obj={ "name": "", - "projectTemplateId": 0, + "projectTemplateId": store.state.projectTemplateId, "remark": "", "stageId": 0 } @@ -880,7 +883,7 @@ export default defineComponent({ "flag": true, "name": "", "projectTaskId": 0, - "projectTemplateId": 0, + "projectTemplateId": store.state.projectTemplateId, "stageId": 0, "type": 0 } @@ -920,7 +923,6 @@ export default defineComponent({