From 6ecc8e01fdf6c5f34f6316e503e1cf016953181c Mon Sep 17 00:00:00 2001 From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com> Date: Tue, 22 Nov 2022 18:25:24 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fit:=E6=B7=BB=E5=8A=A0=E6=A1=88=E4=BE=8B=20?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=B5=8B=E8=AF=84=E3=80=81=E8=AF=95=E5=8D=B7?= =?UTF-8?q?=20=E3=80=81=E5=9B=9B=E4=B8=AA=E7=AE=A1=E7=90=86=E7=9A=84?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=9D=A1=E4=BB=B6=20=E6=B7=BB=E5=8A=A0=E6=A1=88?= =?UTF-8?q?=E4=BE=8B=E6=9C=80=E5=A4=9A=E9=80=89=E6=8B=A9=E4=B8=A4=E6=9D=A1?= =?UTF-8?q?=20=E9=80=89=E6=8B=A9=E8=AF=95=E5=8D=B7=E3=80=81=E6=B5=8B?= =?UTF-8?q?=E8=AF=84=E6=9C=80=E5=A4=9A=E9=80=89=E6=8B=A9=E4=B8=80=E6=9D=A1?= =?UTF-8?q?=E5=8F=AF=E5=8F=8D=E9=80=89=E5=88=9B=E5=BB=BA=E6=B5=8B=E8=AF=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddCase.vue | 24 ++++++++---------- src/components/drawers/AddEval.vue | 4 +++ src/components/drawers/AddTest.vue | 33 ++++++++++++++---------- src/components/drawers/EvList.vue | 36 +++++++++++++++++++-------- src/components/drawers/FaceManage.vue | 28 +++++++++++++-------- src/components/drawers/SelectTest.vue | 24 ++++++++++++++---- src/components/drawers/TestManage.vue | 5 +++- src/components/drawers/TimeManage.vue | 4 ++- src/components/drawers/WorkManage.vue | 6 +++-- 9 files changed, 108 insertions(+), 56 deletions(-) diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 293ac1e7..22c806dc 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -150,8 +150,10 @@ export default { localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); }; - const afterVisibleChange = () => { - getAllCaseText() + const afterVisibleChange = (bol) => { + if ( bol == true ) { + getAllCaseText() + } }; const tableDataFunc = () => { const columns = [ @@ -182,6 +184,9 @@ export default { return columns; }; const onSelectChange = (selectedRowKeys,selectedRows)=> { + if(selectedRowKeys.length>2){ + return + } state.selectedRowKeys = selectedRowKeys; state.apiTaskList = selectedRows; }; @@ -251,18 +256,6 @@ export default { }); } else if (props.isLevel == 2) { if(state.apiTaskList.length > 1){ - // for((item,index) in state.apiTaskList){ - // apiTask - // .addTask({ - // "courseId": item.caseId, - // "duration": 0, - // "flag": true, - // "name": item.caseName, - // "projectId": props.projectId, - // "projectTaskId": props.projectTaskId, - // "stageId": props.chooseStageId, - // "type": 3, - // }) for(let i = 0;i <= state.apiTaskList.length;i++){ apiTask .addTask({ @@ -455,6 +448,9 @@ export default { .ant-table-selection-column { padding: 0px !important; padding-left: 15px !important; + .ant-table-selection{ + display: none; + } } .ant-table-thead > tr > th { background-color: rgba(239, 244, 252, 1); diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 0a58aef2..2f3ece39 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -215,6 +215,8 @@ export default { projectId: props.projectId, projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId, + evaluationTypeId: state.evaluationTypeId, + evaluationTypeName: state.evaluationTypeName, type: 10, }) .then(( ) => { @@ -230,6 +232,8 @@ export default { name: res.data.data.evaluationName, routerId: props.routerId, routerTaskId: props.routerTaskId || 0, + evaluationTypeId: state.evaluationTypeId, + evaluationTypeName: state.evaluationTypeName, type: 10, }) .then(( ) => { diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 82c24cf7..e16ef4d4 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -78,15 +78,16 @@
- - + + 选择试卷 + + {{ paperName }} +
@@ -709,8 +716,8 @@ export default { .catch(() => { message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); }); - } else if (props.isLevel == 3) { - console.log(""); + } else if (props.isLevel == 3) { + console.log(""); } }; diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index 5bb04782..257dbd95 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -36,7 +36,7 @@
搜索
-
+
重置
@@ -50,7 +50,7 @@ :data-source="tableData" :loading="tableDataTotal === -1 ? true : false" :pagination="false" - :row-selection="{ selectedRowKeys:selectedRowKeys,onSelect:onSelect,onChange:onSelectChange}" + :row-selection="{ selectedRowKeys:selectedRowKeys,onChange:onSelectChange}" />
{ - state.evaluationTypeName = record.title - state.evaluationTypeId = record.quiz_code - }; - const onSelectChange = (selectedRowKeys)=> { + // const onSelect = (record)=> { + // state.evaluationTypeName = record.title + // state.evaluationTypeId = record.quiz_code + // }; + const onSelectChange = (selectedRowKeys,selectedRows)=> { + if(state.selectedRowKeys.length>1){ + return + } state.selectedRowKeys = selectedRowKeys + state.evaluationTypeName = selectedRows[0].record.title + state.evaluationTypeId = selectedRows[0].quiz_code } const closeDrawer = () => { ctx.emit("update:EvalListVisible", false); }; - const afterVisibleChange = () => { - getAllEvalText(); + const afterVisibleChange = (bol) => { + if ( bol == true ) { + getAllEvalText(); + } }; const checkFinish =() =>{ let EvListDate = { @@ -204,15 +211,24 @@ .catch(()=>{ }) } + //重置测评列表 + const resetData = ()=> { + state.currentPage = 1; + state.tableData = []; + state.selectedRowKeys = []; + state.evaluationTypeId = null; + state.evaluationTypeName = ""; + getAllEvalText(); + } return { ...toRefs(state), afterVisibleChange, closeDrawer, onSelectChange, - onSelect, getTableDataList, checkFinish, changePagination, + resetData, }; }, }; diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index c87e5671..c9040848 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -98,7 +98,6 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, - onSelect: onSelect, }" />
@@ -194,12 +193,20 @@ export default { selectedRowKeys: [], tabledata: [ { + key:1, workNum:1, status:"已完成", operation:"", }, { - workNum:1, + key:2, + workNum:2, + status:"未完成", + operation:"", + }, + { + key:3, + workNum:2, status:"未完成", operation:"", } @@ -341,18 +348,21 @@ export default { const closeDrawer = () => { ctx.emit("update:Fvisible", false); }; - const afterVisibleChange = () => { - getManageList() + const afterVisibleChange = (bol) => { + if ( bol == true ) { + getManageList() + } + }; const selectProjectName = (value) => { state.projectName = value; }; const onSelectChange = (selectedRowKeys) => { - state.selectedRowKeys = selectedRowKeys; + if(selectedRowKeys.length > 2){ + return + } + state.selectedRowKeys = selectedRowKeys; }; - const onSelect = (record) => { - console.log(record); - } const allStuOver = ()=> { state.ASOvervisible = true @@ -457,7 +467,6 @@ export default { closeDrawer, afterVisibleChange, onSelectChange, - onSelect, allStuOver, showEntryScore, godie, @@ -672,7 +681,6 @@ export default { .tableBox { .ant-table-selection-column { padding: 0px !important; - // padding-left: 45px !important; } .ant-pagination-item, .ant-pagination-prev, diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue index 74cdee07..5141cb5b 100644 --- a/src/components/drawers/SelectTest.vue +++ b/src/components/drawers/SelectTest.vue @@ -126,8 +126,10 @@ ctx.emit("update:STvisible", false); }; - const afterVisibleChange = () => { + const afterVisibleChange = (bol) => { + if (bol == true) { getManageList() + } }; const tableDataFunc = ()=> { @@ -186,6 +188,9 @@ state.SelectTestData = record }; const onSelectChange = (selectedRowKeys) => { + if(selectedRowKeys.length>1){ + return + } state.selectedRowKeys = selectedRowKeys; } @@ -232,7 +237,7 @@ }); }; - //搜索任务列表 + //搜索任务列表 没接口 const searchTaskList = () => { let objser = { name: "", @@ -264,9 +269,12 @@ //重置任务列表 const resetTaskList = () => { - state.name = ""; - state.projectName = ""; - state.tabledata = []; + state.inputPname = ""; + state.inputCname = ""; + state.tableData = []; + state.selectedRowKeys = []; + state.SelectTestData = []; + state.currentPage = 1; getManageList(); }; return { @@ -398,6 +406,12 @@ } } .tab { + + .ant-table-selection-column { + .ant-table-selection{ + display: none; + } + } th.h { background-color: #eff4fc !important; } diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue index 6d753120..54cf82fd 100644 --- a/src/components/drawers/TestManage.vue +++ b/src/components/drawers/TestManage.vue @@ -394,8 +394,11 @@ export default { const closeDrawer = () => { ctx.emit("update:TMvisible", false); }; - const afterVisibleChange = () => { + const afterVisibleChange = (bol) => { + if ( bol == true ) { getManageList(); + } + }; const selectProjectName = (value, index) => { console.log("value", value, index); diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue index 4dfb6a1c..c4a18e21 100644 --- a/src/components/drawers/TimeManage.vue +++ b/src/components/drawers/TimeManage.vue @@ -345,8 +345,10 @@ export default { const closeDrawer = () => { ctx.emit("update:Tvisible", false); }; - const afterVisibleChange = () => { + const afterVisibleChange = (bol) => { + if ( bol == true ) { getManageList(); + } }; const selectProjectName = (value) => { state.projectName = value; diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue index cf404496..8916b350 100644 --- a/src/components/drawers/WorkManage.vue +++ b/src/components/drawers/WorkManage.vue @@ -299,8 +299,10 @@ export default { const closeDrawer = () => { ctx.emit("update:Wvisible", false); }; - const afterVisibleChange = () => { - getManageList(); + const afterVisibleChange = (bol) => { + if ( bol == true ) { + getManageList(); + } }; const selectProjectName = (value) => { state.projectName = value; From 66fc7c8c13448850491c877973567e89e591fdfa Mon Sep 17 00:00:00 2001 From: lixg Date: Tue, 22 Nov 2022 20:43:02 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/config.js | 3 +- src/api/index1.js | 6 +- src/components/NavLeft.vue | 10 +- src/components/drawers/OwnPower.vue | 148 +++------ src/components/drawers/Ownership.vue | 185 +++++------ src/components/drawers/ProjectOwn.vue | 247 ++++++++------ src/views/courselibrary/CourseManage.vue | 23 +- src/views/projectcenter/ProjectAdd.vue | 374 ++++++++++++---------- src/views/projectcenter/ProjectManage.vue | 71 +++- src/views/projectcenter/TaskPage.vue | 73 +++-- 10 files changed, 600 insertions(+), 540 deletions(-) diff --git a/src/api/config.js b/src/api/config.js index f545226a..e51593fd 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-21 15:13:50 + * @LastEditTime: 2022-11-22 20:17:22 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -29,6 +29,7 @@ http.interceptors.request.use( config.headers.token = 123456; //测试1111 } else { console.log("当前请求页面无token,请执行操作！！！"); + // 此处测试默认配置token config.headers.token = "123456"; // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2Njg4NjI2MTAsImV4cCI6MTY2ODg2OTgxMCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.defa91ecb2b61d9b20d858db0c2c8d7d80dea4613cb2559a22569b7df36b3f6b"; diff --git a/src/api/index1.js b/src/api/index1.js index 6e5402e5..bc2d71bd 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-04 22:45:31 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-21 16:39:08 + * @LastEditTime: 2022-11-22 18:04:47 * @FilePath: /fe-manage/src/api/index1.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -87,6 +87,10 @@ export const billboard = (obj) => http.post('/admin/project/billboard', obj); //获取字典信息 export const getDict = (obj) => http.post('/dict/getList', obj) +//获取组织树 +export const getOrgTree = (obj) => http.post('/admin/router/orgList', obj) + + // 获取组织结构树 export const orgtree = () => http.get('/org/tree'); diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index ce679c18..41e7257d 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -192,8 +192,8 @@ src="../assets/images/navleft/certificate.png" />
- - 证书中心 + 证书中心 +
@@ -202,7 +202,8 @@ src="../assets/images/navleft/system.png" />
- 系统管理 + 系统管理 +
@@ -219,6 +220,9 @@ mode="inline" @click="handleClick" > + + 审核 + 学习 diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue index 5ca07e8a..a91eace8 100644 --- a/src/components/drawers/OwnPower.vue +++ b/src/components/drawers/OwnPower.vue @@ -6,7 +6,7 @@ width="85%" @after-visible-change="afterVisibleChange" > -
+
归属权
@@ -121,80 +122,30 @@
-
-
已选
- -
-
-
- 全部清除 -
-
-
-
快速选人
-
-
-
- +
+
当前归属：
{{ item.name }}
-
-
-
- 查看更多 - -
-
-
-
- 收起 - -
+
+ 转移归属权
-
@@ -202,8 +153,6 @@
- - @@ -567,7 +516,6 @@ export default { }, ], - //快速选人------------------------------------- valueSelectboe: null, //快速选人的选择组织 choosepeople: [], //总的数组 @@ -576,14 +524,12 @@ export default { showHidden: false, //是否显示收回 selectedRowKeys: [], //表格选中的key //快速选人------------------------------------- - }); const closeDrawer = () => { state.activeKey = "1"; ctx.emit("update:ownpowervisible", false); }; - const afterVisibleChange = (bool) => { console.log("state", bool); }; @@ -690,8 +636,6 @@ export default { // 结束 快速选人------------------------------------------------------------------ - - //全部清除 const deleteAll = () => { //快速选人------------------------------------- @@ -701,10 +645,9 @@ export default { state.showHidden = false; //是否显示收回 state.selectedRowKeys = []; //表格选中的key //快速选人------------------------------------- - }; return { - ...toRefs(state), + ...toRefs(state), afterVisibleChange, closeDrawer, onSelectChange, @@ -715,10 +658,7 @@ export default { morePeopleShow, morePeopleHidden, - - deleteAll, - }; }, }; @@ -726,7 +666,7 @@ export default { diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 9958aeb4..9979a4ce 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -307,6 +307,10 @@ @change="classificationChange4" placeholder="请选择培训分类" :disabled="viewDetail ? true : false" + :fieldNames="{ + label: 'dictName', + value: 'dictCode', + }" />
@@ -420,153 +424,17 @@ export default { const store = useStore(); // 编辑页面跳转过来时候，自动填充表格 const routers = useRoute(); - const isEdit = ref(false); - let peojectID = ""; - console.log("store.state.orgtreeList", store.state.orgtreeList); - if (routers.query.projectId) { - storage.set("projectAddId", routers.query.projectId); - isEdit.value = true; - peojectID = routers.query.projectId; - // 需要编辑 - api - .getProjectDetail({ projectId: routers.query.projectId }) - .then((res) => { - if (res.status == 200 && res.data.code == 200) { - let info = res.data.data.projectInfo; - console.log(info); - // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 * - projectName.value = info.name; - state.classifySelect = classifyList.value[1]; // info.category - imageUrl.value = info.picUrl; - - let start = toDate(info.beginTime / 1000, "YYYY/MM/DD"); - let end = toDate(info.endTime / 1000, "YYYY/MM/DD"); - state.rangevalue = [ - dayjs(start, "YYYY/MM/DD"), - dayjs(end, "YYYY/MM/DD"), - ]; - - let manageName = info.manager.split(","); - let manageValue = info.managerId.split(","); - let optionsManage = []; - for (let i = 0; i < manageName.length; i++) { - let obj = { - label: manageName[i], - value: manageValue[i], - }; - optionsManage.push(obj); - } - console.log(optionsManage); - state.classifySelect1 = optionsManage; - state.classifySelect2 = - classifyList2.value[info.sourceBelongId - 1]; - remark.value = info.remark; - state.checked = info.boeFlag ? info.boeFlag : false; - state.classifySelect3 = classifyList3.value[info.level]; - state.classifySelect4 = classifyList4.value[info.systemId - 1]; - state.checked1 = info.boeFlag ? info.boeFlag : false; - // fileList1.value = info.attach.split(","); - - projectType = 1; - picUrl = info.picUrl; - beginTime = Number(info.beginTime / 1000); - endTime = Number(info.endTime / 1000); - manager = info.manager; - managerId = info.managerId; - sourceBelongIdC = Number(info.sourceBelongId); - courseSyncFlag = info.courseSyncFlag; - levels = info.level; - systemid = info.systemId; - boeFlag = info.boeFlag; - } - }) - .catch((err) => { - console.log(err); - }); - } else { - if (storage.get("projectAddId")) { - isEdit.value = true; - peojectID = storage.get("projectAddId"); - // 需要编辑 - api - .getProjectDetail({ projectId: storage.get("projectAddId") }) - .then((res) => { - if (res.status == 200 && res.data.code == 200) { - let info = res.data.data.projectInfo; - console.log("我是从本地存储获取的id", info); - projectName.value = info.name; - state.classifySelect = classifyList.value[1]; // info.category - imageUrl.value = info.picUrl; - - let start = toDate(info.beginTime / 1000, "YYYY/MM/DD"); - let end = toDate(info.endTime / 1000, "YYYY/MM/DD"); - state.rangevalue = [ - dayjs(start, "YYYY/MM/DD"), - dayjs(end, "YYYY/MM/DD"), - ]; - - let manageName = info.manager.split(","); - let manageValue = info.managerId.split(","); - let optionsManage = []; - for (let i = 0; i < manageName.length; i++) { - let obj = { - label: manageName[i], - value: manageValue[i], - }; - optionsManage.push(obj); - } - console.log(optionsManage); - state.classifySelect1 = optionsManage; - state.classifySelect2 = - classifyList2.value[info.sourceBelongId - 1]; - remark.value = info.remark; - state.checked = info.boeFlag ? info.boeFlag : false; - state.classifySelect3 = classifyList3.value[info.level]; - state.classifySelect4 = classifyList4.value[info.systemId - 1]; - state.checked1 = info.boeFlag ? info.boeFlag : false; - - projectType = 1; - picUrl = info.picUrl; - beginTime = Number(info.beginTime / 1000); - endTime = Number(info.endTime / 1000); - manager = info.manager; - managerId = info.managerId; - sourceBelongIdC = Number(info.sourceBelongId); - courseSyncFlag = info.courseSyncFlag; - levels = info.level; - systemid = info.systemId; - boeFlag = info.boeFlag; - } - }) - .catch((err) => { - console.log(err); - }); - } - } - - const backPage = () => { - storage.remove("projectAddId"); - setTimeout(() => { - router.push({ - path: "/projectmanage", - }); - }, 400); - }; - const router = useRouter(); const state = reactive({ - classifySelect: null, - classifySelectId: null, - checked: false, - checked1: false, - valueE: null, - valueE1: null, - valueE2: null, - classifySelect1: [], - classifySelect2: null, - classifySelect3: [], - classifySelect4: [], - rangevalue: [], + classifySelect: null, //分类选择信息 + projectType: null, //分类选择的id + checked: false, //同步学习记录 + checked1: false, //BOEU实施 + classifySelect1: [], //选中项目经理名称数组 + classifySelect2: null, //选中的资源归属信息 + classifySelect3: null, //选中的项目级别信息 + classifySelect4: null, //选中的培训分类信息 + rangevalue: [], //项目时间 currentPage: 1, //当前页 tableDataTotal: -1, //模版列表总数 @@ -574,10 +442,21 @@ export default { totalPages: 0, //总页数 viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null, }); - - const projectName = ref(""); - //分类 + //分类列表 const classifyList = ref([]); + + //项目封面 + const imageUrl = ref(""); + // 项目级别 + const classifyList3 = ref([ + // { value: 1, label: "集团级" }, + ]); + + // 培训分类 + const classifyList4 = ref([ + // { value: 1, label: "集团级" }, + ]); + //获取分类、封面图、项目级别、培训分类-----------字典配置------------------------------- const getDictList = (param) => { let obj = { pageNo: 1, @@ -595,11 +474,15 @@ export default { if (param === "projectPic") { if (res.data.data.rows.length > 0) { imageUrl.value = res.data.data.rows[0].dictValue; + picUrl = res.data.data.rows[0].dictValue; } } if (param === "projectLevel") { classifyList3.value = res.data.data.rows; } + if (param === "projectSys") { + classifyList4.value = res.data.data.rows; + } } }) .catch((err) => { @@ -609,11 +492,164 @@ export default { getDictList("projectClass"); getDictList("projectPic"); getDictList("projectLevel"); + getDictList("projectSys"); + //获取分类、封面图、项目级别、培训分类---------------字典配置--------------------------- - let projectType = ""; + const isEdit = ref(false); + let peojectID = ""; //项目id + console.log("store.state.orgtreeList", store.state.orgtreeList); + const editProject = () => { + if (routers.query.projectId) { + storage.set("projectAddId", routers.query.projectId); + isEdit.value = true; + peojectID = routers.query.projectId; + // 需要编辑 + api + .getProjectDetail({ projectId: routers.query.projectId }) + .then((res) => { + if (res.status == 200 && res.data.code == 200) { + let info = res.data.data.projectInfo; + console.log( + "classifyList.value.find(item=>item.dictCode===info.category)", + classifyList.value.find((item) => { + if (item.dictCode == 11) { + return item.dictName; + } + // return item.dictName; + }), + classifyList.value, + info.category + ); + + console.log(info); + // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 * + projectName.value = info.name; //项目名称 + // state.classifySelect =classifyList.value.find(item=>item.dictCode===info.category) ; // info.category 项目分类 + state.projectType = 1; //分类选择的id + + imageUrl.value = info.picUrl; //封面图 + + let start = toDate(info.beginTime / 1000, "YYYY/MM/DD"); //开始时间 + let end = toDate(info.endTime / 1000, "YYYY/MM/DD"); //结束时间 + state.rangevalue = [ + dayjs(start, "YYYY/MM/DD"), + dayjs(end, "YYYY/MM/DD"), + ]; + + let manageName = info.manager.split(","); //项目经理 + let manageValue = info.managerId.split(","); //项目经理id数组 + let optionsManage = []; + for (let i = 0; i < manageName.length; i++) { + let obj = { + label: manageName[i], + value: manageValue[i], + }; + optionsManage.push(obj); + } + console.log(optionsManage); + state.classifySelect1 = optionsManage; + state.classifySelect2 = + classifyList2.value[info.sourceBelongId - 1]; + remark.value = info.remark; + state.checked = info.boeFlag ? info.boeFlag : false; + state.classifySelect3 = classifyList3.value[info.level]; + state.classifySelect4 = classifyList4.value[info.systemId - 1]; + state.checked1 = info.boeFlag ? info.boeFlag : false; + // fileList1.value = info.attach.split(","); + + picUrl = info.picUrl; + beginTime = Number(info.beginTime / 1000); + endTime = Number(info.endTime / 1000); + manager = info.manager; + managerId = info.managerId; + sourceBelongIdC = Number(info.sourceBelongId); + courseSyncFlag = info.courseSyncFlag; + levels = info.level; + systemid = info.systemId; + boeFlag = info.boeFlag; + } + }) + .catch((err) => { + console.log(err); + }); + } else { + if (storage.get("projectAddId")) { + isEdit.value = true; + peojectID = storage.get("projectAddId"); + // 需要编辑 + api + .getProjectDetail({ projectId: storage.get("projectAddId") }) + .then((res) => { + if (res.status == 200 && res.data.code == 200) { + let info = res.data.data.projectInfo; + console.log("我是从本地存储获取的id", info); + projectName.value = info.name; + state.classifySelect = classifyList.value[1]; // info.category 分类选择的信息 + state.projectType = 1; //分类选择的id + imageUrl.value = info.picUrl; + + let start = toDate(info.beginTime / 1000, "YYYY/MM/DD"); + let end = toDate(info.endTime / 1000, "YYYY/MM/DD"); + state.rangevalue = [ + dayjs(start, "YYYY/MM/DD"), + dayjs(end, "YYYY/MM/DD"), + ]; + + let manageName = info.manager.split(","); + let manageValue = info.managerId.split(","); + let optionsManage = []; + for (let i = 0; i < manageName.length; i++) { + let obj = { + label: manageName[i], + value: manageValue[i], + }; + optionsManage.push(obj); + } + console.log(optionsManage); + state.classifySelect1 = optionsManage; + state.classifySelect2 = + classifyList2.value[info.sourceBelongId - 1]; + remark.value = info.remark; + state.checked = info.boeFlag ? info.boeFlag : false; + state.classifySelect3 = classifyList3.value[info.level]; + state.classifySelect4 = classifyList4.value[info.systemId - 1]; + state.checked1 = info.boeFlag ? info.boeFlag : false; + + picUrl = info.picUrl; + beginTime = Number(info.beginTime / 1000); + endTime = Number(info.endTime / 1000); + manager = info.manager; + managerId = info.managerId; + sourceBelongIdC = Number(info.sourceBelongId); + courseSyncFlag = info.courseSyncFlag; + levels = info.level; + systemid = info.systemId; + boeFlag = info.boeFlag; + } + }) + .catch((err) => { + console.log(err); + }); + } + } + }; + editProject(); + + const backPage = () => { + storage.remove("projectAddId"); + setTimeout(() => { + router.push({ + path: "/projectmanage", + }); + }, 400); + }; + + const projectName = ref(""); //项目名称 + + //选择分类 const classificationChange = (value) => { console.log(`selected ${value}`); - projectType = value; + state.projectType = value; //分类选择的id }; function getBase64(img, callback) { @@ -625,8 +661,8 @@ export default { const fileList = ref([]); const fileList1 = ref([]); const loading = ref(false); - const imageUrl = ref(""); - let picUrl = ""; + + let picUrl = ""; //项目封面 const handleChange = (info) => { if (info.file.status === "uploading") { @@ -727,7 +763,6 @@ export default { beginTime = new Date(dateString[0]).getTime() / 1000; endTime = new Date(dateString[1]).getTime() / 1000; }; - // 项目经理 后续接口调用 const classifyList1 = ref([ { value: 1, label: "李俊国" }, @@ -735,6 +770,7 @@ export default { { value: 3, label: "刘孟君" }, ]); + //选择处理项目经理 let manager = ""; let managerId = ""; const classificationChange1 = (key, options) => { @@ -774,28 +810,14 @@ export default { sourceBelongIdC = key; }; - // 项目级别 - const classifyList3 = ref([ - // { value: 1, label: "集团级" }, - // { value: 2, label: "组织级" }, - // { value: 3, label: "现地级" }, - // { value: 4, label: "部门级" }, - ]); - + //选择项目级别 let levels = ""; const classificationChange3 = (key) => { console.log(`selected ${key}`, classifyList3); levels = key; }; - // 培训分类 - const classifyList4 = ref([ - { value: 1, label: "集团级" }, - { value: 2, label: "组织级" }, - { value: 3, label: "现地级" }, - { value: 4, label: "部门级" }, - ]); - + //选择培训分类 let systemid = ""; const classificationChange4 = (key) => { console.log(`selected ${key}`, classifyList4); @@ -824,7 +846,9 @@ export default { console.log(info); // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 * projectName.value = info.name; - state.classifySelect = classifyList.value[1]; // info.category + state.classifySelect = classifyList.value[1]; // info.category 分类选择的信息 + state.projectType = 1; //分类选择的id + imageUrl.value = info.picUrl; let start = toDate(info.beginTime / 1000, "YYYY/MM/DD"); @@ -855,7 +879,6 @@ export default { state.checked1 = info.boeFlag ? info.boeFlag : false; // fileList1.value = info.attach.split(","); - projectType = 1; picUrl = info.picUrl; beginTime = Number(info.beginTime / 1000); endTime = Number(info.endTime / 1000); @@ -924,19 +947,22 @@ export default { // 项目说明 const remark = ref(""); + //同步学习记录------------------------------------ let courseSyncFlag = 0; const changeChecked = () => { console.log(state.checked); state.checked ? (state.checked = false) : (state.checked = true); courseSyncFlag = state.checked ? 1 : 0; }; - + //同步学习记录------------------------------------ + //BOEU实施-------------------------------------- let boeFlag = 0; const changeChecked1 = () => { console.log(state.checked1); state.checked1 ? (state.checked1 = false) : (state.checked1 = true); boeFlag = state.checked1 ? 1 : 0; }; + //BOEU实施-------------------------------------- const removeFile = (file) => { const index = fileList1.value.indexOf(file); @@ -980,7 +1006,7 @@ export default { let obj = { projectId: Number(peojectID), name: projectName["value"], - category: projectType, + category: state.projectType, //分类选择的id picUrl: picUrl, beginTime: beginTime, endTime: endTime, @@ -1037,7 +1063,7 @@ export default { } else { let obj = { name: projectName["value"], - category: projectType, + category: state.projectType, //分类选择的id picUrl: picUrl, beginTime: beginTime, endTime: endTime, diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 950929d5..19b9b82e 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -2047,13 +2047,16 @@ export default { customRender: (value) => { return (
- {value.record.status == 0 + {value.record.status == 0 || + value.record.status == 1 || + value.record.status == 2 || + value.record.status == -2 ? "草稿" - : value.record.status == 1 && + : value.record.status == 3 && Number(value.record.beginTime) < Math.ceil(new Date().getTime() / 1000) ? "进行中" - : value.record.status == 1 && + : value.record.status == 3 && Number(value.record.beginTime) > Math.ceil(new Date().getTime() / 1000) && value.record.type !== 1 && @@ -2074,6 +2077,36 @@ export default { width: 100, align: "center", }, + { + title: "是否审核", + dataIndex: "status", + // width: "30%", + key: "status", + width: 100, + align: "center", + customRender: (value) => { + { + console.log("获取项目", value); + } + return ( +
+ {value.record.type !== 3 + ? "-" + : value.record.status == 0 + ? "未审核" + : value.record.status == 1 + ? "审核中" + : value.record.status == 2 || + value.record.status == 3 || + value.record.status == -1 + ? "已审核" + : value.record.status == -2 + ? "未通过" + : "-"} +
+ ); + }, + }, { title: "创建时间", dataIndex: "createTime", @@ -2094,7 +2127,10 @@ export default { customRender: (value) => { // console.log("value", value.record.type, value.record.status); return value.record.type === 1 ? ( - value.record.status === 0 ? ( + value.record.status === 0 || + value.record.status === 1 || + value.record.status === 2 || + value.record.status === -2 ? (
{ @@ -2214,7 +2250,7 @@ export default {
- ) : value.record.status === 1 ? ( + ) : value.record.status === 3 ? (
查看
@@ -2404,7 +2440,10 @@ export default {
) ) : value.record.type === 2 ? ( - value.record.status === 0 ? ( + value.record.status === 0 || + value.record.status === 1 || + value.record.status === 2 || + value.record.status === -2 ? (
{ @@ -2515,7 +2554,7 @@ export default {
- ) : value.record.status === 1 ? ( + ) : value.record.status === 3 ? (
查看
@@ -2812,7 +2851,23 @@ export default {
- {value.record.status === 0 ? ( + {value.record.status === 0 || value.record.status === -2 ? ( + {}} + style="cursor:pointer" + class="operation3" + > + 提交审核 + + ) : value.record.status === 1 ? ( + {}} + style="cursor:pointer" + class="operation3" + > + 撤回审核 + + ) : value.record.status === 2 ? ( { console.log("value.record", value.record); diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index d46173ad..5e63abc7 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -794,7 +794,7 @@
-
+
选择时间：
-
学分排行 Top10
+
积分排行 Top10
-
学识排行 Top10
+
学时排行 Top10
Date: Tue, 22 Nov 2022 22:46:03 +0800 Subject: [PATCH 3/8] =?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 4/8] =?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({ 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 059f1b3a544d9ba6bbc28406cdb2727705a0e0f1 Mon Sep 17 00:00:00 2001 From: lixg Date: Wed, 23 Nov 2022 15:41:55 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8F=8A=E6=92=A4=E5=9B=9E=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/config.js | 4 +- src/views/projectcenter/ProjectManage.vue | 101 +++++++++++++++++++++- 2 files changed, 101 insertions(+), 4 deletions(-) diff --git a/src/api/config.js b/src/api/config.js index e51593fd..414e5c3b 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-22 20:17:22 + * @LastEditTime: 2022-11-23 09:59:26 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -26,7 +26,7 @@ http.interceptors.request.use( const token = localStorage.getItem("token"); if (token) { // config.headers.token = token; - config.headers.token = 123456; //测试1111 + config.headers.token = token; //测试1111 } else { console.log("当前请求页面无token,请执行操作！！！"); diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 19b9b82e..e07e7dba 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -1055,6 +1055,68 @@
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要提交审核吗 +
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要撤回审核吗 +
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+ @@ -1102,6 +1164,9 @@ export default { backModal: false, //撤回弹窗 closeBack: false, //撤回弹窗关闭图标 reminderModal: false, //温馨提示弹窗 + reviewModal: false, //提交审核 + recallReviewModal: false, //撤回审核 + ProjOwnervisible: false, ProjPvisible: false, ProjCheckvisible: false, @@ -2000,6 +2065,28 @@ export default { }); }; + //打开提交审核弹窗 + const showReviewModal = () => { + state.reviewModal = true; + }; + //确认提交审核 + const reviewProject = () => {}; + //关闭提交审核弹窗 + const closeReviewModal = () => { + state.reviewModal = false; + }; + + //打开撤回审核弹窗 + const showRecallReviewModal = () => { + state.recallReviewModal = true; + }; + //确认提交审核 + const recallReviewProject = () => {}; + //关闭提交审核弹窗 + const closeRecallReviewModal = () => { + state.recallReviewModal = false; + }; + // 数据接入 - end - onMounted(() => { @@ -2853,7 +2940,9 @@ export default {
{value.record.status === 0 || value.record.status === -2 ? ( {}} + onClick={() => { + showReviewModal(); + }} style="cursor:pointer" class="operation3" > @@ -2861,7 +2950,9 @@ export default { ) : value.record.status === 1 ? ( {}} + onClick={() => { + showRecallReviewModal(); + }} style="cursor:pointer" class="operation3" > @@ -3205,6 +3296,12 @@ export default { showProjCheck, showProjManage, closeProjectPub, + showReviewModal, + reviewProject, + closeReviewModal, + showRecallReviewModal, + recallReviewProject, + closeRecallReviewModal, tableData, columns, 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 7/8] 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 @@ - + - + -