@@ -150,6 +159,7 @@ export default {
createName: "", // 创建者名称
startTime: "", // 开始时间
endTime: "", // 结束时间
+ publishTime: "", // 创建时间
option: [], // 组织列表
boeRouterInfoName: "", // 路径名称
selectedRowKeys: [], // 选中的列
@@ -188,16 +198,16 @@ export default {
// cloumns 表头
const columns = ref([
+ // {
+ // title: "编号",
+ // dataIndex: "num",
+ // key: "num",
+ // ellipsis: true,
+ // align: "center",
+ // width: 120,
+ // },
{
- title: "编号",
- dataIndex: "num",
- key: "num",
- ellipsis: true,
- align: "center",
- width: 120,
- },
- {
- title: "路径名称",
+ title: "路径图名称",
dataIndex: "boeRouterInfoName",
ellipsis: true,
key: "boeRouterInfoName",
@@ -236,6 +246,22 @@ export default {
align: "center",
width: 120,
},
+ {
+ title: "参与人数",
+ dataIndex: "participantsTotal",
+ ellipsis: true,
+ key: "participantsTotal",
+ align: "center",
+ width: 120,
+ },
+ {
+ title: "参与率",
+ dataIndex: "participantsRate",
+ ellipsis: true,
+ key: "participantsRate",
+ align: "center",
+ width: 120,
+ },
{
title: "完成人数",
dataIndex: "completionNumber",
@@ -244,6 +270,14 @@ export default {
align: "center",
width: 120,
},
+ {
+ title: "完成率",
+ dataIndex: "completedRate",
+ ellipsis: true,
+ key: "completedRate",
+ align: "center",
+ width: 120,
+ },
{
title: "发布时间",
dataIndex: "publishTime",
@@ -252,14 +286,6 @@ export default {
align: "center",
width: 120,
},
- {
- title: "创建人",
- dataIndex: "createName",
- ellipsis: true,
- key: "createName",
- align: "center",
- width: 120,
- },
{
title: "路径状态",
dataIndex: "status",
@@ -268,6 +294,14 @@ export default {
align: "center",
width: 120,
},
+ {
+ title: "创建人",
+ dataIndex: "createName",
+ ellipsis: true,
+ key: "createName",
+ align: "center",
+ width: 120,
+ },
{
title: "操作",
dataIndex: "operation",
@@ -342,8 +376,9 @@ export default {
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
routerName: state.routerName,
createName: state.createName,
- startTime: state.startTime,
- endTime: state.endTime,
+ startTime: state.publishTime[0],
+ endTime: state.publishTime[1],
+ // publishTime: state.publishTime,
name: state.name,
});
if (res) {
@@ -362,6 +397,7 @@ export default {
const reset = async () => {
state.tableLoading = true;
state.createName = "";
+ state.publishTime = [];
state.routerName = "";
state.orgId = state.resetOrgId;
state.selectedRowKeys = [];
@@ -387,6 +423,9 @@ export default {
} else {
const params = {
createName: state.createName,
+ // publishTime: state.publishTime,
+ startTime: state.publishTime[0],
+ endTime: state.publishTime[1],
routerName: state.routerName,
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
};
@@ -426,6 +465,9 @@ export default {
} else {
const params = {
createName: state.createName,
+ // publishTime: state.publishTime,
+ startTime: state.publishTime[0],
+ endTime: state.publishTime[1],
routerName: state.routerName,
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
};
@@ -480,7 +522,7 @@ export default {
.select {
margin-right: 20px;
margin-bottom: 20px;
- width: calc((100% - 76px - 220px) / 3);
+ width: calc((100% - 76px - 240px) / 4);
}
.btnz {