+
@@ -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();
};
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index 123bbb57..eae03011 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -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);
@@ -235,67 +219,72 @@ export default {
const onChange = (pageNumber) => {
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);
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index e7ed4d26..163d0d6a 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -43,7 +43,11 @@