feat:任务大纲管理传值更改 抽屉打开重新刷新

This commit is contained in:
dongwug
2022-11-11 18:07:48 +08:00
parent b5f3c234c9
commit ce0e80402a
5 changed files with 287 additions and 285 deletions

View File

@@ -49,7 +49,7 @@
<div class="img1"></div>
<div class="wz">搜索</div>
</div>
<div class="btn btn2" @click="searchTaskList">
<div class="btn btn2" @click="resetTaskList">
<div class="img2"></div>
<div class="wz">重置</div>
</div>
@@ -171,9 +171,10 @@ export default {
setup(props, ctx) {
const state = reactive({
Evisible: false, //录入成绩抽屉
name: null,
name: "",
showmodal: false, //勾选提示框
closable: false, //modal右上角的关闭按钮
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: 100,
@@ -184,23 +185,18 @@ export default {
projectNameList: [
{
id: 1,
value: "项目一",
label: "项目一",
value: "-1",
label: "未开始",
},
{
id: 2,
value: "项目二",
label: "项目二",
value: "0",
label: "进行中",
},
{
id: 3,
value: "项目三",
label: "项目三",
},
{
id: 4,
value: "项目四",
label: "项目四",
value: "1",
label: "已完成",
},
],
tabledata: [
@@ -258,7 +254,7 @@ export default {
});
const selectProjectName = (value, index) => {
console.log("value", value, index);
state.projectName = value
state.projectName = value;
};
const closeDrawer = () => {
ctx.emit("update:Fvisible", false);
@@ -303,47 +299,16 @@ export default {
const getManageList = () => {
let obj = {
name: "",
pageNo: 0,
pageSize: 0,
pageNo: state.pageNo,
pageSize: state.pageSize,
projectId: 27,
projectTaskId: props.projectTaskId,
status: 0,
status: -1,
};
api
.taskStudentList(obj)
.then((res) => {
console.log("获取面授任务管理列表成功", 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]);
//需要确认值 赋给tablecolumns
console.log('state.tabledata',state.tabledata);
}
})
.catch((err) => {
console.log("获取面授任务列表失败", err);
});
};
//搜索任务列表
const searchTaskList = () => {
let objser = {
name: state.name,
pageNo: 0,
pageSize: 0,
projectTaskId: props.projectTaskId,
status: state.projectName,
};
api
.taskStudentList(objser)
.then((res) => {
console.log("获取任务管理列表成功", res);
// state.pageNo = res.data.data.pageNo
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++) {
@@ -351,16 +316,49 @@ export default {
}
})
.catch((err) => {
console.log("获取任务列表失败", err);
console.log("获取面授任务列表失败", err);
});
};
//搜索任务列表
const searchTaskList = () => {
let objser = {
name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
projectId: 27,
projectTaskId: props.projectTaskId,
status: -1,
};
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((err) => {
console.log("搜索任务列表失败", err);
});
}
};
//重置任务列表
const resetTaskList = () => {
state.name = "",
state.projectName="";
state.name = "";
state.projectName = "";
state.tabledata = [];
getManageList();
};
let timer;
onMounted(() => {
setTimeout(() => {

View File

@@ -43,7 +43,11 @@
</div>
</div>
<div class="btns">
<div class="btn btn1" style="margin-right: 20px" @click="searchTaskList">
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchTaskList"
>
<div class="img1"></div>
<div class="wz">搜索</div>
</div>
@@ -123,50 +127,46 @@ export default {
projectTaskId: {
type: Number,
default: null,
}
},
},
setup(props, ctx) {
const state = reactive({
name: null,
open: false,
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: 100,
projectName:'',
projectName: "",
projectNameList: [
{
id: 1,
value: "项目一",
label: "项目一",
value: "-1",
label: "未开始",
},
{
id: 2,
value: "项目二",
label: "项目二",
value: "0",
label: "进行中",
},
{
id: 3,
value: "项目三",
label: "项目三",
},
{
id: 4,
value: "项目四",
label: "项目四",
value: "1",
label: "已完成",
},
],
tabledata: [
{
key: 1,
name: "哈哈",
bum: "产品部",
gangw: "产品经理",
comp: "-",
score: "-",
time: "-",
state: "未完成",
},
// {
// key: 1,
// name: "哈哈",
// bum: "产品部",
// gangw: "产品经理",
// comp: "-",
// score: "-",
// time: "-",
// state: "未完成",
// },
],
tablecolumns: [
{
@@ -213,7 +213,7 @@ export default {
});
const selectProjectName = (value, index) => {
console.log("value", value, index);
state.projectName = value
state.projectName = value;
};
const closeDrawer = () => {
ctx.emit("update:TMvisible", false);
@@ -229,47 +229,16 @@ export default {
const getManageList = () => {
let obj = {
name: "",
pageNo: 0,
pageSize: 0,
pageNo: state.pageNo,
pageSize: state.pageSize,
projectId: 27,
projectTaskId: props.projectTaskId,
status: 0,
status: -1,
};
api
.taskStudentList(obj)
.then((res) => {
console.log("获取测试任务管理列表成功", 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]);
//需要确认值 赋给tablecolumns
console.log('state.tabledata',state.tabledata);
}
})
.catch((err) => {
console.log("获取测试任务列表失败", err);
});
};
//搜索任务列表
const searchTaskList = () => {
let objser = {
name: state.name,
pageNo: 0,
pageSize: 0,
projectTaskId: props.projectTaskId,
status: state.projectName,
};
api
.taskStudentList(objser)
.then((res) => {
console.log("获取任务管理列表成功", res);
// state.pageNo = res.data.data.pageNo
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++) {
@@ -277,14 +246,45 @@ export default {
}
})
.catch((err) => {
console.log("获取任务列表失败", err);
console.log("获取测试任务列表失败", err);
});
};
//搜索任务列表
const searchTaskList = () => {
let objser = {
name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
projectId: 27,
projectTaskId: props.projectTaskId,
status: -1,
};
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((err) => {
console.log("搜索任务列表失败", err);
});
}
};
//重置任务列表
const resetTaskList = () => {
state.name = "",
state.projectName="";
state.name = "";
state.projectName = "";
state.tabledata = [];
getManageList();
};

View File

@@ -123,61 +123,45 @@ export default {
projectTaskId: {
type: Number,
default: null,
}
},
},
setup(props, ctx) {
const state = reactive({
name: null,
visible: props.Tvisible,
name: "",
open: false,
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: 100,
projectName:'',
projectName: "",
projectNameList: [
{
id: 1,
value: "项目一",
label: "项目一",
value: "-1",
label: "未开始",
},
{
id: 2,
value: "项目二",
label: "项目二",
value: "0",
label: "进行中",
},
{
id: 3,
value: "项目三",
label: "项目三",
},
{
id: 4,
value: "项目四",
label: "项目四",
value: "1",
label: "已完成",
},
],
tabledata: [
{
key: 1,
userName: "哈哈",
deptName: "产品部",
gangw: "产品经理",
time: "-",
state: "未完成",
},
// {
// endStudyTime: 0,
// name: "",
// projectTaskId: 0,
// status: 0,
// studentId: 0,
// userInfoBo: {
// deptName: "1",
// jobName: "2",
// userId: 0,
// userName: "3"
// }
// }
// key: 1,
// userName: "哈哈",
// deptName: "产品部",
// gangw: "产品经理",
// time: "-",
// state: "未完成",
// },
],
tablecolumns: [
{
@@ -224,7 +208,7 @@ export default {
});
const selectProjectName = (value, index) => {
console.log("value", value, index);
state.projectName = value
state.projectName = value;
};
const closeDrawer = () => {
ctx.emit("update:Tvisible", false);
@@ -236,66 +220,71 @@ export default {
console.log("Page: ", pageNumber);
};
// watch(props.visible, ()=>{
// getManageList()
// },{immediate:true});
//获取任务管理列表
const getManageList = () => {
let obj = {
name: "",
pageNo: 0,
pageSize: 0,
pageNo: state.pageNo,
pageSize: state.pageSize,
projectId: 27,
// projectTaskId: 370,
projectTaskId: props.projectTaskId,
status: 0,
status: -1,
};
api
.taskStudentList(obj)
.then((res) => {
console.log("获取时间任务管理列表成功", res);
// state.pageNo = res.data.data.pageNo
console.log("csscas成功");
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);
//需要确认值 赋给tablecolumns
console.log('state.tabledata',state.tabledata);
}
})
.catch((err) => {
console.log("获取时间任务列表失败", err);
console.log("获取时间任务列表失败cc", err);
});
};
//搜索任务列表
const searchTaskList = () => {
let objser = {
name: state.name,
pageNo: 0,
pageSize: 0,
name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
projectId: 27,
projectTaskId: props.projectTaskId,
status: state.projectName,
status: -1,
};
api
.taskStudentList(objser)
.then((res) => {
console.log("获取任务管理列表成功", 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);
}
})
.catch((err) => {
console.log("获取任务列表失败", err);
});
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((err) => {
console.log("搜索任务列表失败", err);
});
}
};
//重置任务列表
const resetTaskList = () => {
state.name = "",
state.projectName="";
state.name = "";
state.projectName = "";
state.tabledata = [];
getManageList();
};
@@ -303,7 +292,7 @@ export default {
onMounted(() => {
setTimeout(() => {
getManageList();
}, 1000);
}, 500);
timer = setInterval(() => {
state.open = false;
}, 3000);

View File

@@ -43,7 +43,11 @@
</div>
</div>
<div class="btns">
<div class="btn btn1" style="margin-right: 20px" @click="searchTaskList">
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchTaskList"
>
<div class="img1"></div>
<div class="wz">搜索</div>
</div>
@@ -124,7 +128,7 @@
</template>
<script>
import { toRefs, reactive,onMounted } from "vue";
import { toRefs, reactive, onMounted } from "vue";
import WorkDetail from "../drawers/WorkDetail.vue";
import * as api from "../../api/index";
export default {
@@ -138,7 +142,7 @@ export default {
projectTaskId: {
type: Number,
default: null,
}
},
},
setup(props, ctx) {
@@ -147,42 +151,38 @@ export default {
visible: false, //导出数据弹窗
close: false, //导出弹窗的关闭按钮
WDvisible: false, //作业详情
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: 100,
projectName:'',
projectName: "",
projectNameList: [
{
id: 1,
value: "项目一",
label: "项目一",
value: "-1",
label: "未开始",
},
{
id: 2,
value: "项目二",
label: "项目二",
value: "0",
label: "进行中",
},
{
id: 3,
value: "项目三",
label: "项目三",
},
{
id: 4,
value: "项目四",
label: "项目四",
value: "1",
label: "已完成",
},
],
tabledata: [
{
key: 1,
userName: "哈哈",
deptName: "产品部",
jobName: "产品经理",
comp: "好好学习",
time: "-",
state: "未完成",
},
// {
// key: 1,
// userName: "哈哈",
// deptName: "产品部",
// jobName: "产品经理",
// comp: "好好学习",
// time: "-",
// state: "未完成",
// },
],
tablecolumns: [
{
@@ -229,7 +229,7 @@ export default {
});
const selectProjectName = (value, index) => {
console.log("value", value, index);
state.projectName = value
state.projectName = value;
};
const closeDrawer = () => {
ctx.emit("update:Wvisible", false);
@@ -251,47 +251,16 @@ export default {
const getManageList = () => {
let obj = {
name: "",
pageNo: 0,
pageSize: 0,
pageNo: state.pageNo,
pageSize: state.pageSize,
projectId: 27,
projectTaskId: props.projectTaskId,
status: 0,
status: -1,
};
api
.taskStudentList(obj)
.then((res) => {
console.log("获取作业任务管理列表成功", 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]);
//需要确认值 赋给tablecolumns
console.log('state.tabledata',state.tabledata);
}
})
.catch((err) => {
console.log("获取作业任务列表失败", err);
});
};
//搜索任务列表
const searchTaskList = () => {
let objser = {
name: state.name,
pageNo: 0,
pageSize: 0,
projectTaskId: props.projectTaskId,
status: state.projectName,
};
api
.taskStudentList(objser)
.then((res) => {
console.log("获取任务管理列表成功", res);
// state.pageNo = res.data.data.pageNo
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++) {
@@ -299,14 +268,45 @@ export default {
}
})
.catch((err) => {
console.log("获取任务列表失败", err);
console.log("获取作业任务列表失败", err);
});
};
//搜索任务列表
const searchTaskList = () => {
let objser = {
name: "",
pageNo: state.pageNo,
pageSize: state.pageSize,
projectId: 27,
projectTaskId: props.projectTaskId,
status: -1,
};
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((err) => {
console.log("搜索任务列表失败", err);
});
}
};
//重置任务列表
const resetTaskList = () => {
state.name = "",
state.projectName="";
state.name = "";
state.projectName = "";
state.tabledata = [];
getManageList();
};
@@ -314,7 +314,7 @@ export default {
setTimeout(() => {
getManageList();
}, 1000);
})
});
return {
...toRefs(state),
selectProjectName,

View File

@@ -220,7 +220,9 @@
<div class="split"></div>
<div class="onerow">
<div class="taskmain">任务大纲</div>
<button class="btn" @click="showFaceIn" v-if="morFaceT">批量面授报名</button>
<button class="btn" @click="showFaceIn" v-if="morFaceT">
批量面授报名
</button>
<router-link to="/taskadd">
<button to="/taskadd" class="edit">
<img
@@ -407,9 +409,9 @@
item.type == '11' ||
item.type == '12' ||
item.type == '9'
? showTime( item.name,item.projectTaskId)
? showTime(item.name, item.projectTaskId)
: item.type == '5' || item.type == '10'
? showTest( item.name,item.projectTaskId)
? showTest(item.name, item.projectTaskId)
: item.type == '2'
? showFace(item.projectTaskId)
: item.type == '4'
@@ -908,10 +910,16 @@
</a-tabs>
</div>
<!-- 时间管理抽屉 -->
<time-manage v-model:Tvisible="visible" :title="showTimeText" :projectTaskId="projectTaskId"/>
<time-manage
v-model:Tvisible.sync="visible"
v-if="visible"
:projectTaskId="projectTaskId"
:title="showTimeText"
/>
<!-- 面授管理抽屉 -->
<face-manage
v-model:Fvisible="FaceVisivle"
v-model:Fvisible.sync="FaceVisivle"
v-if="FaceVisivle"
:projectTaskId="projectTaskId"
/>
<!-- 学员小组管理创建小组抽屉 -->
@@ -921,7 +929,11 @@
<!-- 学员管理-导入学员抽屉 -->
<import-stu v-model:Importvisible="Importvisible" />
<!-- 查看学员 传入查看学员的id-->
<see-stu v-model:Seevisible="Seevisible" v-model:checkStuId="checkStuId" v-model:projectId="projectId"/>
<see-stu
v-model:Seevisible="Seevisible"
v-model:checkStuId="checkStuId"
v-model:projectId="projectId"
/>
<!-- 学员换组 -->
<change-group v-model:Changevisible="Changevisible" />
<!-- 组员名单抽屉 -->
@@ -932,12 +944,14 @@
<active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
<!-- 作业管理抽屉 -->
<work-manage
v-model:Wvisible="Wvisible"
v-model:Wvisible.sync="Wvisible"
v-if="Wvisible"
:projectTaskId="projectTaskId"
/>
<!-- 考试管理抽屉 -->
<test-manage
v-model:TMvisible="TMvisible"
v-model:TMvisible.sync="TMvisible"
v-if="Wvisible"
:title="showTestText"
:projectTaskId="projectTaskId"
/>
@@ -1455,7 +1469,8 @@ export default {
selectedRowKeys: [], //选择的学员
selectedRows: [], //选择的学员的id值
chooseDeleteOne: [], //删除的单个学员id
projectTaskId:"", //项目任务id
// projectId:"", //项目任务id
projectTaskId: "", //项目任务任务id
//进度排行学员
rankjindu: [{ value: "学员", label: "学员" }],
valuestu1: "学员",
@@ -1517,8 +1532,8 @@ export default {
noticeChecked: true,
noticeContent: "",
TaskFaceImpStuvisible: false, //批量面授报名
morFaceT:false, //批量面授报名按钮
faceArr:[], //任务大纲列表所有name
morFaceT: false, //批量面授报名按钮
faceArr: [], //任务大纲列表所有name
//进度排行表
jindutabledata: [
{
@@ -1986,7 +2001,6 @@ export default {
level: null, //项目级别
systemId: null, //培训体系
picUrl: null,
});
// 输入接入 -- start --
@@ -2005,32 +2019,26 @@ export default {
.getProjectDetail(objtl)
.then((res) => {
if (res.status == 200) {
console.log("res", res);
console.log("阶段列表", res.data.data.stageList);
console.log('任务id',res.data.data.stageList[0].taskList[0].projectTaskId)
for (let i = 0; i < res.data.data.stageList.length; i++) {
for (let k = 0; k < res.data.data.stageList[i].taskList.length; k++) {
for (
let k = 0;
k < res.data.data.stageList[i].taskList.length;
k++
) {
if (res.data.data.stageList[i].taskList[k].name == "面授") {
//此处设置出现按钮参数
state.morFaceT = true
console.log(state.morFaceT,'state.morFaceT');
break
state.morFaceT = true;
break;
}
}
}
//暂时传个固定的id用 到时候看数据里面是否有在更换
state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId
// state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId
let leng = res.data.data.stageList.length;
if (leng > 0) {
//获取任务列表 阶段
let taskarr = res.data.data.stageList;
state.taskSyllabus = taskarr;
console.log("123456789", state.taskSyllabus);
//需要里面数据看是否有projectTaskId给管理弹窗
// console.log(res.data.data.stageList[0].taskList[0].name, "ggg");
}
}
})
@@ -2164,10 +2172,10 @@ export default {
state.TaskFaceImpStuvisible = true;
};
//新增
const showTime = (name,id) => {
console.log("点击管理");
const showTime = (name, id) => {
console.log("点击管理并传了id");
state.visible = true;
state.showTimeText = name ;
state.showTimeText = name;
state.projectTaskId = id;
};
//新增
@@ -2175,7 +2183,7 @@ export default {
//面授管理的抽屉
// console.log("点击管理");
state.FaceVisivle = true;
state.projectTaskId= id
state.projectTaskId = id;
};
const showSubset = () => {
//面授管理的抽屉
@@ -2198,13 +2206,13 @@ export default {
//作业管理的抽屉
const showWork = (id) => {
state.Wvisible = true;
state.projectTaskId = id
state.projectTaskId = id;
};
//考试管理的抽屉
const showTest = (name, id) => {
state.TMvisible = true;
state.showTestText = name ;
state.projectTaskId = id
state.showTestText = name;
state.projectTaskId = id;
};
const showStuAdd = () => {
state.Stuvisible = true;
@@ -2744,7 +2752,14 @@ export default {
state.checkedSty = info.courseSyncFlag == 1 ? true : false;
state.checkedBOEU = info.boeFlag == 1 ? true : false;
state.picUrl = info.picUrl;
state.sourceBelong = info.sourceBelongId==1?"项目一":info.sourceBelongId==2?"项目二":info.sourceBelongId==3?"项目三":"-"
state.sourceBelong =
info.sourceBelongId == 1
? "项目一"
: info.sourceBelongId == 2
? "项目二"
: info.sourceBelongId == 3
? "项目三"
: "-";
});
};
//获取小组列表