From 06f5c6c7439b899ec609bfe5be1447561e707bd6 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Thu, 24 Nov 2022 04:08:51 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=BA=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BB=BB=E5=8A=A1=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexInvist.js | 13 +++--- src/api/indexTaskadd.js | 4 +- src/components/drawers/ AssessmentList.vue | 7 ++- src/components/drawers/AddActive.vue | 17 +++++++ src/components/drawers/AddDiscuss.vue | 10 +++-- src/components/drawers/AddInvist.vue | 50 ++++++++++++++++++++- src/views/projectcenter/TaskAdd.vue | 6 +-- src/views/projectcenter/TemplateLibrary.vue | 15 +++++-- src/views/projectcenter/temTask.vue | 26 +++++------ 9 files changed, 113 insertions(+), 35 deletions(-) diff --git a/src/api/indexInvist.js b/src/api/indexInvist.js index 31bb417f..77be057e 100644 --- a/src/api/indexInvist.js +++ b/src/api/indexInvist.js @@ -38,16 +38,15 @@ import http from "./config"; // 接口-请求 //创建评估 -export const createAppraiseMessage = (obj) => http.post('/survey/createAppraiseMessage', obj,); -//删除评估信息 -export const deleteAppraise = (obj) => http.post('/survey/deleteAppraise', { params: obj }) //根据ID获取评估信息详情 -export const queryAppraiseDetailById = (obj) => http.post('/survey/queryAppraiseDetailById', { params: obj }) - -//修改评估信息 -export const updateAppraiseMessage = (obj) => http.post('/survey/updateAppraiseMessage', obj) +export const queryAppraiseDetailById = (obj) => http.post('/assessment/queryAssessmentDetailById', obj,{ + headers: { + 'token': '123', + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', + } + }) //获取全部评估信息接口 export const queryAssessmentDetailList = (obj) => http.post('/assessment/queryAssessmentDetailList', obj) diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js index b88140e7..3a4567d3 100644 --- a/src/api/indexTaskadd.js +++ b/src/api/indexTaskadd.js @@ -25,4 +25,6 @@ export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', ob export const planList = (obj) => http.post('/admin/offcourse/planList', obj) //获取面授课列表 -export const list = (obj) => http.post('/admin/offcourse/list', obj) \ No newline at end of file +export const list = (obj) => http.post('/admin/offcourse/list', obj) + +export const addTempTask = (obj) => http.post('/admin/project//template/editTask', obj) \ No newline at end of file diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue index 234da65a..bb3b9803 100644 --- a/src/components/drawers/ AssessmentList.vue +++ b/src/components/drawers/ AssessmentList.vue @@ -86,6 +86,10 @@ export default { type: Number, default: null, }, + titleTag: { + type: Boolean, + default: false, + } }, setup(props, ctx) { const state = reactive({ @@ -100,9 +104,10 @@ export default { }); const closeDrawer = () => { ctx.emit("update:assessmentVisible", false); + ctx.emit("update:titleTag", true); }; const afterVisibleChange = (bool) => { - console.log("state getAllInvistText", bool); + console.log("state getAllInvistText", bool,"======",props.titleTag); if (props.assessmentVisible) { getAllInvistText(); } diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 3951753b..16281b21 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -380,6 +380,23 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { + apiTask + .addTempTask({ + courseId: res.data.data.activityId, + duration: res.data.data.activityDuration, + name: res.data.data.activityName, + projectTemplateId: props.projectTemplateId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 9, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); + console.log(""); } }; diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index ca05cb6c..f2440d46 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -192,10 +192,12 @@ export default { }); } else if (props.isLevel == 2) { apiTask.addTask({ - courseId: res.data.data.discussId, - name: res.data.data.discussName, - routerId: props.routerId, - routerTaskId: props.routerTaskId || 0, + courseId: res.data.data.discussId, + duration: res.data.data.discussExplain, + name: res.data.data.discussName, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, type: 8, }); } else if (props.isLevel == 3) { diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 2ba29abd..30e1d95b 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -23,12 +23,15 @@
-
+
已选择 0 条
+ + +
已选择 1 条; @@ -45,6 +48,28 @@ >创建时间： {{ assessment.time }}
+
+ 已选择 1 条; + 名称： {{ assessment1.createName }} + + 题数： {{ assessment1.essayQuestionVoList.length }} + + 创建人： {{ assessment1.createUser }} + + 创建时间： {{ assessment1.createTime }} + +
+ +
+ + +
@@ -55,6 +80,7 @@
@@ -77,6 +103,7 @@ import * as apiTask from "../../api/indexTaskadd"; import { message } from "ant-design-vue"; import AssessmentList from "./ AssessmentList.vue"; import { RouterEditTask } from "@/api/indexTask"; +import * as api from "../../api/indexInvist"; export default { name: "AddInvist", components: { @@ -139,10 +166,13 @@ export default { assessmentId: null, assessmentName: "", assessment: null, + assessment1: null, assessmentVisible: false, + titleTag:false, }); const getCheckedAss = (ass) => { state.assessment = ass; + state.assessment1 =null; }; const closeDrawer = () => { ctx.emit("update:addinvistVisible", false); @@ -159,8 +189,24 @@ export default { state.assessmentId = null; state.assessmentName = ""; state.assessment = null; + queryInfo(); + + }; + const queryInfo = () => { + if (props.edit) { + state.titleTg =false; + //编辑讨 + api + .queryAppraiseDetailById({ assessmentId: props.EditInvistId }) + .then((res) => { + //更新讨论信息 + state.assessment1=res.data.data; + + }) + .catch(() => { + }); + } }; - const updateTask = () => { if (state.assessment == null) { return message.warning("请选择评估"); diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 351d9b8d..44cb118b 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1854,7 +1854,7 @@ export default { state.addactivevisible = true; state.EditActiveId = id; state.projectTaskId = eleId; - console.log("active=======", id); + }; const showDrawerAddEval = (id, eleId) => { state.addevalvisible = true; @@ -1863,12 +1863,12 @@ export default { state.projectTaskId = eleId; }; const showDrawerAddInvist = (id, eleId) => { - console.log(id, eleId, "213312"); + state.EditInvistId = id; state.addinvistvisible = true; state.projectTaskId = eleId; }; const showDrawerAddVote = (id, eleId) => { - console.log(id, eleId, "95835325932953295325"); + state.addvotevisible = true; state.EditVoteId = id; state.projectTaskId = eleId; diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index 0eaf0d2f..e271b643 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -15,7 +15,7 @@
创建时间： - { + let date = Math.ceil(new Date(state.time).getTime() / 1000); + let obj = { - "beginTime": 0, - "name": "", + // "create_time": state.time, + "beginTime":date, + "name": state.value1, "pageNo": pagination.current, "pageSize": 10, - "status": 0 } api.templateList(obj).then((res) => { state.tableData1 = [] @@ -222,13 +226,16 @@ export default defineComponent({ } const searchLevel = () => { getLibraryList(); + /* setTimeout(() => { const result = state.tableData1.filter(item => item.name.includes(state.value1)) state.tableData1 = result; },100) + */ }; const resetLevel = () => { state.value1 = ''; + state.time = ''; getLibraryList(); getTableDate1() }; diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue index 85ce4986..e334703e 100644 --- a/src/views/projectcenter/temTask.vue +++ b/src/views/projectcenter/temTask.vue @@ -176,7 +176,7 @@ @changeData="updateTableData" :isLevel="isLevel" v-model:edit="edit" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId" v-model:EditOnlineId="EditOnlineId" @@ -216,7 +216,7 @@ @changeData="updateTableData" :isLevel="isLevel" v-model:edit="edit" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId" v-model:EditCaseId="EditCaseId" @@ -239,7 +239,7 @@ @changeData="updateTableData" v-model:isLevel="isLevel" v-model:edit="edit" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:EditWorkId="EditWorkId" v-model:projectTaskId="projectTaskId" @@ -262,7 +262,7 @@ @changeData="updateTableData" :isLevel="isLevel" v-model:edit="edit" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:EditTestId="EditTestId" v-model:projectTaskId="projectTaskId" @@ -284,7 +284,7 @@ v-model:addliveVisible="addlivevisible" :isLevel="isLevel" @changeData="updateTableData" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:edit="edit" v-model:EditLiveId="EditLiveId" @@ -307,7 +307,7 @@ v-model:addrefVisible="addrefvisible" :isLevel="isLevel" @changeData="updateTableData" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:edit="edit" v-model:EditRefId="EditRefId" @@ -330,7 +330,7 @@ v-model:adddiscussVisible="adddiscussvisible" v-model:edit="edit" :isLevel="isLevel" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:EditDiscussId="EditDiscussId" v-model:projectTaskId="projectTaskId" @@ -351,7 +351,7 @@
{ @@ -1964,7 +1965,6 @@ //打开测评的弹窗 const showEditEvalDrawer = (id, eleId) => { - console.log("222222222222222222222", id); state.addevalvisible = true; state.projectTaskId = eleId; state.EditRefId = id; From a1cc50245473946b1d3acd2459fde4df7ac83b70 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Thu, 24 Nov 2022 09:58:36 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=BA=93=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddProject.vue | 443 ++++++++++++++++++++ src/views/learningpath/LevelAddDetail.vue | 137 ++---- src/views/projectcenter/TemplateLibrary.vue | 17 +- 3 files changed, 476 insertions(+), 121 deletions(-) create mode 100644 src/components/drawers/AddProject.vue diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue new file mode 100644 index 00000000..8ee7b715 --- /dev/null +++ b/src/components/drawers/AddProject.vue @@ -0,0 +1,443 @@ + + + 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 3/9] =?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 4/9] =?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 @@ \ No newline at end of file diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue index 70749429..dab3e4e4 100644 --- a/src/components/drawers/SelectTest.vue +++ b/src/components/drawers/SelectTest.vue @@ -1,466 +1,497 @@ +
+ + +
+ + + + + + + + + if (state.name !== "" || state.projectName !== "") { + api + .taskStudentList(objser) + .then((res) => { + state.pageNo = res.data.data.pageNo; + state.pageSize = res.data.data.pageSize; + state.pageSize = res.data.data.pageSize; + let newArr = []; + for (let i = 0; i < res.data.data.rows.length; i++) { + if (res.data.data.rows[i].userInfoBo.userName == state.name) + newArr.push(res.data.data.rows[i].userInfoBo); + } + state.tabledata = newArr; + }) + .catch(() => {}); + } + }; + + //重置任务列表 + const resetTaskList = () => { + state.inputPname = ""; + state.inputCname = ""; + state.tableData = []; + state.selectedRowKeys = []; + state.SelectTestData = []; + state.currentPage = 1; + getManageList(); + }; + return { + ...toRefs(state), + closeDrawer, + afterVisibleChange, + getTableDate, + onSelectChange, + CreatSTText, + newTest, + tableDataFunc, + onChange, + getManageList, + searchTaskList, + resetTaskList, + }; + }, +}; + +} + +.addExamModal { + .ant-modal { + width: 80% !important; + } +} + \ No newline at end of file diff --git a/src/views/courselibrary/CourseManage.vue b/src/views/courselibrary/CourseManage.vue index c128f5d5..b0db9bb5 100644 --- a/src/views/courselibrary/CourseManage.vue +++ b/src/views/courselibrary/CourseManage.vue @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-09 09:26:26 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-22 20:13:01 + * @LastEditTime: 2022-11-24 16:16:10 * @FilePath: /fe-manage/src/views/courselibrary/CourseManage.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -11,8 +11,8 @@
@@ -20,12 +20,14 @@