@@ -135,7 +135,6 @@ export default {
visible: props.Tvisible,
CVvisible:false, //查看投票抽屉
name: "",
- open: false,
pageNo: 1,
pageSize: 10,
currentPage: 1,
@@ -344,6 +343,10 @@ export default {
ListOpera();
const closeDrawer = () => {
ctx.emit("update:Tvisible", false);
+ state.currentPage = 1
+ state.name = ""
+ state.projectName = ""
+ state.tabledata = []
};
const afterVisibleChange = (bol) => {
if ( bol == true ) {
@@ -356,11 +359,43 @@ export default {
//催促
const godie = () => {
message.destroy()
- message.success("催促学习成功")
+ message.success("催促"+props.title+"成功")
};
const onChange = (pageNumber) => {
console.log("Page: ", pageNumber);
};
+ //渲染到列表中
+ const getTableDate = (tableData) => {
+ let data = tableData;
+ let array = [];
+ data.map((value, index) => {
+ if(props.itemsType ==12 ){
+ let obj = {
+ key: index+1,
+ workNum:"",
+ userName:value.useInfoBo.userName,
+ deptName:value.useInfoBo.deptName,
+ jobName:value.useInfoBo.jobName,
+ time:"",
+ status:"",
+ operation:"",
+ };
+ array.push(obj);
+ }else{
+ let obj = {
+ key: index+1,
+ workNum:"",
+ userName:value.userName,
+ deptName:value.deptName,
+ jobName:value.jobName,
+ time:"",
+ status:"",
+ };
+ array.push(obj);
+ }
+ });
+ state.tabledata = array;
+ };
//获取任务管理列表
const getManageList = () => {
let obj = {
@@ -376,10 +411,10 @@ export default {
.then((res) => {
state.pageNo = res.data.data.pageNo;
state.pageSize = res.data.data.pageSize;
- for (let i = 0; i < res.data.data.rows.length; i++) {
- state.tabledata.push(res.data.data.rows[i].userInfoBo);
- }
- ListOpera();
+ // for (let i = 0; i < res.data.data.rows.length; i++) {
+ // state.tabledata.push(res.data.data.rows[i].userInfoBo);
+ // }
+ getTableDate(res.data.data.rows)
})
.catch((err) => {
console.log(err,'sss');
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index fb2c6782..bd8c1aac 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -298,6 +298,9 @@ export default {
ListOpera();
const closeDrawer = () => {
ctx.emit("update:Wvisible", false);
+ state.name = ""
+ state.currentPage = 1
+ state.projectName = ""
};
const afterVisibleChange = (bol) => {
if ( bol == true ) {
@@ -319,7 +322,38 @@ export default {
const onChange = (pageNumber) => {
console.log("Page: ", pageNumber);
};
-
+ //渲染到列表中
+ const getTableDate = (tableData) => {
+ let data = tableData;
+ let array = [];
+ data.map((value, index) => {
+ if(props.itemsType ==12 ){
+ let obj = {
+ key: index+1,
+ workNum:"",
+ userName:value.useInfoBo.userName,
+ deptName:value.useInfoBo.deptName,
+ jobName:value.useInfoBo.jobName,
+ time:"",
+ status:"",
+ operation:"",
+ };
+ array.push(obj);
+ }else{
+ let obj = {
+ key: index+1,
+ workNum:"",
+ userName:value.userName,
+ deptName:value.deptName,
+ jobName:value.jobName,
+ time:"",
+ status:"",
+ };
+ array.push(obj);
+ }
+ });
+ state.tabledata = array;
+ };
//获取任务管理列表
const getManageList = () => {
let obj = {
@@ -335,10 +369,10 @@ export default {
.then((res) => {
state.pageNo = res.data.data.pageNo;
state.pageSize = res.data.data.pageSize;
- state.pageSize = res.data.data.pageSize;
- for (let i = 0; i < res.data.data.rows.length; i++) {
- state.tabledata.push(res.data.data.rows[i].userInfoBo);
- }
+ // for (let i = 0; i < res.data.data.rows.length; i++) {
+ // state.tabledata.push(res.data.data.rows[i].userInfoBo);
+ // }
+ getTableDate(res.data.data.rows)
})
.catch(() => {
});
@@ -377,10 +411,10 @@ export default {
//重置任务列表
const resetTaskList = () => {
- state.name = "";
- state.projectName = "";
- state.tabledata = [];
- // getManageList();
+ state.name = ""
+ state.currentPage = 1
+ state.projectName = ""
+ getManageList();
};
return {
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 94a1a82f..5df24870 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1348,7 +1348,7 @@ export default {
//在线抽屉
const showDrawerAddOnline = (id, eleId) => {
state.addonlinevisible = true;
- state.EditWorkId = id;
+ state.EditOnlineId = id;
state.routerTaskId = eleId;
};
//面授抽屉
@@ -1360,12 +1360,11 @@ export default {
//案例抽屉
const showDrawerAddCase = (id, eleId) => {
state.addcasevisible = true;
- state.EditWorkId = id;
+ state.EditCaseId = id;
state.routerTaskId = eleId;
};
// 作业抽屉
const showDrawerAddHomework = (id, eleId) => {
- console.log("homework==============", id, state.isactive);
state.addhomeworkvisible = true;
state.EditWorkId = id;
state.routerTaskId = eleId;
@@ -1390,7 +1389,6 @@ export default {
};
//投票抽屉
const showDrawerAddVote = (id, eleId) => {
- // state.addhomeworkvisible = true;
state.addvotevisible = true;
state.EditVoteId = id;
state.routerTaskId = eleId;
@@ -1432,10 +1430,6 @@ export default {
if (state.level[i].chapterId === id) {
let array = [];
state.chooseProjectList = JSON.stringify(state.level[i].taskList);
- // console.log(
- // "goggoo",
- // Object.prototype.toString.call(state.chooseProjectList)
- // );
state.level[i].taskList.forEach((element) => {
let obj = {
id: element.routerTaskId,
@@ -1465,7 +1459,6 @@ export default {
const getDetail = () => {
GetRouterDetail(state.routerId)
.then((res) => {
- console.log("res.data.data.chapterList", res.data.data.chapterList);
//给level赋初始值
state.level = res.data.data.chapterList;
state.styTitle = res.data.data.routerInfo.name;
@@ -1526,7 +1519,6 @@ export default {
{
title: "姓名",
dataIndex: "name",
- // width: "30%",
key: "name",
width: 60,
align: "left",
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 3cb12a90..c9087527 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -10,19 +10,11 @@
@click="showCancel"
/>