feat:修改bug

This commit is contained in:
lixg
2023-01-04 16:06:58 +08:00
parent ff72f982fc
commit 3dbf35d2c1
2 changed files with 160 additions and 134 deletions

View File

@@ -6,7 +6,7 @@
placement="right"
width="60%"
@after-visible-change="afterVisibleChange"
>
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">
@@ -35,8 +35,15 @@
/>
</div>
<div class="main">
<div v-if="datasource.type !==6 || datasource.type !==9 " class="endtime">起止时间</div>
<div v-else class="endtime">起止时间{{datasource.startTime}} {{datasource.endTime}}</div>
<div
v-if="datasource.type !== 6 || datasource.type !== 9"
class="endtime"
>
起止时间
</div>
<div v-else class="endtime">
起止时间{{ datasource.startTime }} {{ datasource.endTime }}
</div>
<div class="search">
<div class="sealeft">
<div class="namecon" style="margin-right: 30px">
@@ -66,7 +73,7 @@
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchTaskList"
@click="searchTaskList"
>
<div class="img1"></div>
<div class="wz">搜索</div>
@@ -82,8 +89,8 @@
<div class="img1"></div>
<div class="wz">催促学习</div>
</div>
<div class="btn btn2" @click="exportTaskStu">
<div class="img2"></div>
<div class="btn btn2" @click="exportTaskStu">
<div class="img2"></div>
<div class="wz">导出数据</div>
</div>
</div>
@@ -125,7 +132,7 @@
import { toRefs, reactive, onMounted, onUnmounted } from "vue";
import { message } from "ant-design-vue";
// import * as api from "../../../api/index";
import * as api from '../../../api/indexTaskManage';
import * as api from "../../../api/indexTaskManage";
export default {
name: "ProjectOnlineManage",
@@ -228,13 +235,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {props.levelName}</span>
</div>
);
}
customRender: () => {
return (
<div class="racona">
<span> {props.levelName}</span>
</div>
);
},
},
{
title: "完成时间",
@@ -252,12 +259,12 @@ export default {
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.status==0?"未完成":"已完成"}</span>
</div>
);
}
return (
<div class="racona">
<span> {text.record.status == 0 ? "未完成" : "已完成"}</span>
</div>
);
},
},
];
return columns;
@@ -272,7 +279,7 @@ export default {
};
const afterVisibleChange = (bol) => {
if (bol == true) {
console.log('当前是什么类型',props.datasource.type)
console.log("当前是什么类型", props.datasource.type);
state.tableDataTotalLoading = true;
getData();
}
@@ -291,40 +298,43 @@ export default {
// 获取数据
function getData() {
if(props.datasource.type==11){
if (props.datasource.type == 11) {
// 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
console.log('我是传递的查询参数',{
pageNo:state.currentPage,
pageSize:state.pageSize,
currentStageId:props.datasource.stageId,
console.log("我是传递的查询参数", {
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
status: state.projectName,
studentName: state.name
})
api.AssessmentManagementMessage({
pageNo:state.currentPage,
pageSize:state.pageSize,
currentStageId:props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
status: state.projectName,
studentName: state.name
}).then(res=>{
console.log(res)
if(res.status==200){
state.tabledata = res.data.data.records;
state.tableDataTotal =res.data.data.total;
studentName: state.name,
});
api
.AssessmentManagementMessage({
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
status: state.projectName,
studentName: state.name,
})
.then((res) => {
console.log(res);
if (res.status == 200) {
state.tabledata = res.data.data.records;
state.tableDataTotal = res.data.data.total;
state.tableDataTotalLoading = false;
}
})
.catch((err) => {
console.log(err);
state.tableDataTotalLoading = false;
}
}).catch(err=>{
console.log(err)
state.tableDataTotalLoading = false;
state.tabledata = [];
})
}else{
state.tabledata = [];
});
} else {
state.tableDataTotalLoading = false;
state.tabledata = [];
state.tabledata = [];
}
}
@@ -338,31 +348,34 @@ export default {
function resetTaskList() {
state.tableDataTotalLoading = true;
state.currentPage = 1;
state.name = "";
state.name = "";
state.projectName = "";
getData();
}
//分页
const changePaginationStu = (page) => {
state.tableDataTotalLoading = true;
state.currentPage = page;
getData();
};
state.tableDataTotalLoading = true;
state.currentPage = page;
getData();
};
// 导出数据
function exportTaskStu() {
api.ExportTaskStudent({
pageNo:state.currentPage,
pageSize:state.pageSize,
currentStageId:props.datasource.stageId,
type: 1,
pid: props.datasource.projectId
}).then(res=>{
console.log(res)
}).catch(err=>{
console.log(err)
})
api
.ExportTaskStudent({
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
})
.then((res) => {
console.log(res);
})
.catch((err) => {
console.log(err);
});
}
return {
@@ -378,7 +391,7 @@ export default {
searchTaskList,
resetTaskList,
changePaginationStu,
exportTaskStu
exportTaskStu,
};
},
};

View File

@@ -6,7 +6,7 @@
placement="right"
width="60%"
@after-visible-change="afterVisibleChange"
>
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">
@@ -35,8 +35,15 @@
/>
</div>
<div class="main">
<div v-if="datasource.type !==6 || datasource.type !==9 " class="endtime">起止时间</div>
<div v-else class="endtime">起止时间{{datasource.startTime}} {{datasource.endTime}}</div>
<div
v-if="datasource.type !== 6 || datasource.type !== 9"
class="endtime"
>
起止时间
</div>
<div v-else class="endtime">
起止时间{{ datasource.startTime }} {{ datasource.endTime }}
</div>
<div class="search">
<div class="sealeft">
<div class="namecon" style="margin-right: 30px">
@@ -66,7 +73,7 @@
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchTaskList"
@click="searchTaskList"
>
<div class="img1"></div>
<div class="wz">搜索</div>
@@ -82,8 +89,8 @@
<div class="img1"></div>
<div class="wz">催促学习</div>
</div>
<div class="btn btn2" @click="exportTaskStu">
<div class="img2"></div>
<div class="btn btn2" @click="exportTaskStu">
<div class="img2"></div>
<div class="wz">导出数据</div>
</div>
</div>
@@ -125,7 +132,7 @@
import { toRefs, reactive, onMounted, onUnmounted } from "vue";
import { message } from "ant-design-vue";
// import * as api from "../../../api/index";
import * as api from '../../../api/indexTaskManage';
import * as api from "../../../api/indexTaskManage";
export default {
name: "RouterCommonManage",
@@ -228,13 +235,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {props.levelName}</span>
</div>
);
}
customRender: () => {
return (
<div class="racona">
<span> {props.levelName}</span>
</div>
);
},
},
{
title: "完成时间",
@@ -252,12 +259,12 @@ export default {
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.status==0?"未完成":"已完成"}</span>
</div>
);
}
return (
<div class="racona">
<span> {text.record.status == 0 ? "未完成" : "已完成"}</span>
</div>
);
},
},
];
return columns;
@@ -272,7 +279,7 @@ export default {
};
const afterVisibleChange = (bol) => {
if (bol == true) {
console.log('当前是什么类型',props.datasource.type)
console.log("当前是什么类型", props.datasource.type);
state.tableDataTotalLoading = true;
getData();
}
@@ -291,40 +298,43 @@ export default {
// 获取数据
function getData() {
if(props.datasource.type==11){
if (props.datasource.type == 11) {
// 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
console.log('我是传递的查询参数',{
pageNo:state.currentPage,
pageSize:state.pageSize,
currentStageId:props.datasource.chapterId,
console.log("我是传递的查询参数", {
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
status: state.projectName,
studentName: state.name
})
api.AssessmentManagementMessage({
pageNo:state.currentPage,
pageSize:state.pageSize,
currentStageId:props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
status: state.projectName,
studentName: state.name
}).then(res=>{
console.log(res)
if(res.status==200){
state.tabledata = res.data.data.records;
state.tableDataTotal =res.data.data.total;
studentName: state.name,
});
api
.AssessmentManagementMessage({
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
status: state.projectName,
studentName: state.name,
})
.then((res) => {
console.log(res);
if (res.status == 200) {
state.tabledata = res.data.data.records;
state.tableDataTotal = res.data.data.total;
state.tableDataTotalLoading = false;
}
})
.catch((err) => {
console.log(err);
state.tableDataTotalLoading = false;
}
}).catch(err=>{
console.log(err)
state.tableDataTotalLoading = false;
state.tabledata = [];
})
}else{
state.tabledata = [];
});
} else {
state.tableDataTotalLoading = false;
state.tabledata = [];
state.tabledata = [];
}
}
@@ -338,31 +348,34 @@ export default {
function resetTaskList() {
state.tableDataTotalLoading = true;
state.currentPage = 1;
state.name = "";
state.name = "";
state.projectName = "";
getData();
}
//分页
const changePaginationStu = (page) => {
state.tableDataTotalLoading = true;
state.currentPage = page;
getData();
};
state.tableDataTotalLoading = true;
state.currentPage = page;
getData();
};
// 导出数据
function exportTaskStu() {
api.ExportTaskStudent({
pageNo:state.currentPage,
pageSize:state.pageSize,
currentStageId:props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId
}).then(res=>{
console.log(res)
}).catch(err=>{
console.log(err)
})
api
.ExportTaskStudent({
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
})
.then((res) => {
console.log(res);
})
.catch((err) => {
console.log(err);
});
}
return {
@@ -378,7 +391,7 @@ export default {
searchTaskList,
resetTaskList,
changePaginationStu,
exportTaskStu
exportTaskStu,
};
},
};