mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-11 11:56:46 +08:00
Merge branch 'report_test0818' of http://10.251.129.121/boeu/fe-manage into report_test0818
This commit is contained in:
@@ -39,7 +39,7 @@
|
|||||||
v-model:value="orgId"
|
v-model:value="orgId"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
placeholder="请选择归属组织"
|
placeholder="请选择归属组织"
|
||||||
:allowClear="allowClear"
|
:allowClear = false
|
||||||
:fieldNames="{
|
:fieldNames="{
|
||||||
label: 'orgName',
|
label: 'orgName',
|
||||||
value: 'organizationId',
|
value: 'organizationId',
|
||||||
@@ -162,7 +162,6 @@ export default {
|
|||||||
state.option = res.data?.result.orgTreeList;
|
state.option = res.data?.result.orgTreeList;
|
||||||
state.orgId = res.data?.result.treeNodeList;
|
state.orgId = res.data?.result.treeNodeList;
|
||||||
state.resetOrgId = res.data?.result.treeNodeList;
|
state.resetOrgId = res.data?.result.treeNodeList;
|
||||||
state.allowClear = true;
|
|
||||||
getTableData();
|
getTableData();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -276,8 +275,8 @@ export default {
|
|||||||
author: state.author,
|
author: state.author,
|
||||||
authorName: state.authorName,
|
authorName: state.authorName,
|
||||||
// publishTime: state.publishTime,
|
// publishTime: state.publishTime,
|
||||||
startTime: state.publishTime[0]+" 00:00:00",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59",
|
||||||
boeRouterInfoName: state.boeRouterInfoName,
|
boeRouterInfoName: state.boeRouterInfoName,
|
||||||
});
|
});
|
||||||
if (res) {
|
if (res) {
|
||||||
@@ -332,8 +331,8 @@ export default {
|
|||||||
title: state.title,
|
title: state.title,
|
||||||
author: state.author,
|
author: state.author,
|
||||||
// publishTime: state.publishTime,
|
// publishTime: state.publishTime,
|
||||||
startTime: state.publishTime[0]+" 00:00:00",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59",
|
||||||
};
|
};
|
||||||
axios({
|
axios({
|
||||||
method: "post",
|
method: "post",
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ export default {
|
|||||||
type: null,
|
type: null,
|
||||||
createName: "",
|
createName: "",
|
||||||
publishTime: "", // 发布时间
|
publishTime: "", // 发布时间
|
||||||
allowClear: true,
|
allowClear: false,
|
||||||
option: [],
|
option: [],
|
||||||
selectedRowKeys: [],
|
selectedRowKeys: [],
|
||||||
typeOption:[]
|
typeOption:[]
|
||||||
@@ -190,7 +190,7 @@ export default {
|
|||||||
state.option = res.data?.result.orgTreeList;
|
state.option = res.data?.result.orgTreeList;
|
||||||
state.orgId = res.data?.result.treeNodeList;
|
state.orgId = res.data?.result.treeNodeList;
|
||||||
state.resetOrgId = res.data?.result.treeNodeList;
|
state.resetOrgId = res.data?.result.treeNodeList;
|
||||||
state.allowClear = true
|
state.allowClear = false
|
||||||
getTableData();
|
getTableData();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -206,8 +206,8 @@ export default {
|
|||||||
type: state.type ? state.type[state.type.length - 1]:null,
|
type: state.type ? state.type[state.type.length - 1]:null,
|
||||||
createName: state.createName,
|
createName: state.createName,
|
||||||
// publishTime: state.publishTime,
|
// publishTime: state.publishTime,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59",
|
||||||
};
|
};
|
||||||
const res = await api.boeuCourseListPageV2(params);
|
const res = await api.boeuCourseListPageV2(params);
|
||||||
if (res) {
|
if (res) {
|
||||||
@@ -445,8 +445,8 @@ export default {
|
|||||||
type: state.type ? state.type[state.type.length - 1]:null,
|
type: state.type ? state.type[state.type.length - 1]:null,
|
||||||
createName: state.createName,
|
createName: state.createName,
|
||||||
// publishTime: state.publishTime,
|
// publishTime: state.publishTime,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59",
|
||||||
};
|
};
|
||||||
axios({
|
axios({
|
||||||
method: "post",
|
method: "post",
|
||||||
@@ -495,8 +495,8 @@ export default {
|
|||||||
type: state.type ? state.type[state.type.length - 1]:null,
|
type: state.type ? state.type[state.type.length - 1]:null,
|
||||||
createName: state.createName,
|
createName: state.createName,
|
||||||
// publishTime: state.publishTime,
|
// publishTime: state.publishTime,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59",
|
||||||
};
|
};
|
||||||
axios({
|
axios({
|
||||||
method: "post",
|
method: "post",
|
||||||
@@ -563,8 +563,8 @@ export default {
|
|||||||
type: state.type ? state.type[state.type.length - 1]:null,
|
type: state.type ? state.type[state.type.length - 1]:null,
|
||||||
createName: state.createName,
|
createName: state.createName,
|
||||||
// publishTime: state.publishTime,
|
// publishTime: state.publishTime,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59",
|
||||||
};
|
};
|
||||||
axios({
|
axios({
|
||||||
method: "post",
|
method: "post",
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
v-model:value="orgId"
|
v-model:value="orgId"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
placeholder="请选择归属组织"
|
placeholder="请选择归属组织"
|
||||||
:allowClear="allowClear"
|
:allowClear = false
|
||||||
:fieldNames="{
|
:fieldNames="{
|
||||||
label: 'orgName',
|
label: 'orgName',
|
||||||
value: 'organizationId',
|
value: 'organizationId',
|
||||||
@@ -221,9 +221,6 @@ export default {
|
|||||||
state.option = res.data?.result.orgTreeList;
|
state.option = res.data?.result.orgTreeList;
|
||||||
state.orgId = res.data?.result.treeNodeList;
|
state.orgId = res.data?.result.treeNodeList;
|
||||||
state.resetOrgId = res.data?.result.treeNodeList;
|
state.resetOrgId = res.data?.result.treeNodeList;
|
||||||
res.data?.result?.userType === 1
|
|
||||||
? (state.allowClear = true)
|
|
||||||
: (state.allowClear = false);
|
|
||||||
getTableData();
|
getTableData();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
:options="option"
|
:options="option"
|
||||||
placeholder="请选择组织"
|
placeholder="请选择组织"
|
||||||
v-model:value="orgId"
|
v-model:value="orgId"
|
||||||
:allowClear="allowClear"
|
:allowClear= false
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
:fieldNames="{
|
:fieldNames="{
|
||||||
label: 'name',
|
label: 'name',
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
v-model:value="orgId"
|
v-model:value="orgId"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
placeholder="请选择归属组织"
|
placeholder="请选择归属组织"
|
||||||
:allowClear="allowClear"
|
:allowClear = false
|
||||||
:fieldNames="{
|
:fieldNames="{
|
||||||
label: 'orgName',
|
label: 'orgName',
|
||||||
value: 'organizationId',
|
value: 'organizationId',
|
||||||
@@ -143,11 +143,9 @@ import downLoad from "../../utils/downLoad";
|
|||||||
import Cookies from "vue-cookies";
|
import Cookies from "vue-cookies";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import { useStore } from "vuex";
|
|
||||||
export default {
|
export default {
|
||||||
name: "LearningPathMap",
|
name: "LearningPathMap",
|
||||||
setup() {
|
setup() {
|
||||||
const store = useStore();
|
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
tableLoading: false, // table加载图标
|
tableLoading: false, // table加载图标
|
||||||
tableDataTotal: 0, // 数据总条数
|
tableDataTotal: 0, // 数据总条数
|
||||||
@@ -379,8 +377,8 @@ export default {
|
|||||||
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
||||||
routerName: state.routerName,
|
routerName: state.routerName,
|
||||||
createName: state.createName,
|
createName: state.createName,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] + " 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] == 'undefined' ? null : state.publishTime[1] + " 23:59:59",
|
||||||
// publishTime: state.publishTime,
|
// publishTime: state.publishTime,
|
||||||
name: state.name,
|
name: state.name,
|
||||||
});
|
});
|
||||||
@@ -427,8 +425,8 @@ export default {
|
|||||||
const params = {
|
const params = {
|
||||||
createName: state.createName,
|
createName: state.createName,
|
||||||
// publishTime: state.publishTime,
|
// publishTime: state.publishTime,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] + " 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] == 'undefined' ? null : state.publishTime[1] + " 23:59:59",
|
||||||
routerName: state.routerName,
|
routerName: state.routerName,
|
||||||
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
||||||
};
|
};
|
||||||
@@ -469,8 +467,8 @@ export default {
|
|||||||
const params = {
|
const params = {
|
||||||
createName: state.createName,
|
createName: state.createName,
|
||||||
// publishTime: state.publishTime,
|
// publishTime: state.publishTime,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] + " 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] == 'undefined' ? null : state.publishTime[1] + " 23:59:59",
|
||||||
routerName: state.routerName,
|
routerName: state.routerName,
|
||||||
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
v-model:value="orgId"
|
v-model:value="orgId"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
placeholder="请选择归属组织"
|
placeholder="请选择归属组织"
|
||||||
:allowClear="allowClear"
|
:allowClear=false
|
||||||
:fieldNames="{
|
:fieldNames="{
|
||||||
label: 'orgName',
|
label: 'orgName',
|
||||||
value: 'organizationId',
|
value: 'organizationId',
|
||||||
@@ -341,8 +341,8 @@ export default {
|
|||||||
name: state.name,
|
name: state.name,
|
||||||
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
||||||
creator: state.creator,
|
creator: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
},
|
},
|
||||||
headers: {
|
headers: {
|
||||||
token: Cookies.get("token"),
|
token: Cookies.get("token"),
|
||||||
@@ -475,8 +475,8 @@ export default {
|
|||||||
? state.orgId[state.orgId.length - 1]
|
? state.orgId[state.orgId.length - 1]
|
||||||
: null,
|
: null,
|
||||||
createName: state.creator,
|
createName: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
},
|
},
|
||||||
responseType: "blob",
|
responseType: "blob",
|
||||||
headers: {
|
headers: {
|
||||||
@@ -495,8 +495,8 @@ export default {
|
|||||||
? state.orgId[state.orgId.length - 1]
|
? state.orgId[state.orgId.length - 1]
|
||||||
: null,
|
: null,
|
||||||
createName: state.creator,
|
createName: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
},
|
},
|
||||||
responseType: "blob",
|
responseType: "blob",
|
||||||
headers: {
|
headers: {
|
||||||
@@ -515,8 +515,8 @@ export default {
|
|||||||
? state.orgId[state.orgId.length - 1]
|
? state.orgId[state.orgId.length - 1]
|
||||||
: null,
|
: null,
|
||||||
createName: state.creator,
|
createName: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
},
|
},
|
||||||
responseType: "blob",
|
responseType: "blob",
|
||||||
headers: {
|
headers: {
|
||||||
@@ -535,8 +535,8 @@ export default {
|
|||||||
? state.orgId[state.orgId.length - 1]
|
? state.orgId[state.orgId.length - 1]
|
||||||
: null,
|
: null,
|
||||||
createName: state.creator,
|
createName: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
},
|
},
|
||||||
responseType: "blob",
|
responseType: "blob",
|
||||||
headers: {
|
headers: {
|
||||||
@@ -555,8 +555,8 @@ export default {
|
|||||||
? state.orgId[state.orgId.length - 1]
|
? state.orgId[state.orgId.length - 1]
|
||||||
: null,
|
: null,
|
||||||
createName: state.creator,
|
createName: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
},
|
},
|
||||||
responseType: "blob",
|
responseType: "blob",
|
||||||
headers: {
|
headers: {
|
||||||
@@ -573,8 +573,8 @@ export default {
|
|||||||
name: state.name,
|
name: state.name,
|
||||||
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
||||||
createName: state.creator,
|
createName: state.creator,
|
||||||
startCreateTime: state.publishTime[0]+" 00:00:01",
|
startCreateTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endCreateTime: state.publishTime[1]+" 23:59:59",
|
endCreateTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
},
|
},
|
||||||
responseType: "blob",
|
responseType: "blob",
|
||||||
headers: {
|
headers: {
|
||||||
@@ -597,8 +597,8 @@ export default {
|
|||||||
//考试列表
|
//考试列表
|
||||||
const res = await api.boeuExamPageList({
|
const res = await api.boeuExamPageList({
|
||||||
creator: state.creator,
|
creator: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
||||||
testName: state.name,
|
testName: state.name,
|
||||||
page: state.pageNo,
|
page: state.pageNo,
|
||||||
@@ -619,8 +619,8 @@ export default {
|
|||||||
//案例列表
|
//案例列表
|
||||||
const res = await api.boeuCasePageList({
|
const res = await api.boeuCasePageList({
|
||||||
author: state.creator,
|
author: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
||||||
title: state.name,
|
title: state.name,
|
||||||
page: state.pageNo,
|
page: state.pageNo,
|
||||||
@@ -646,8 +646,8 @@ export default {
|
|||||||
? state.orgId[state.orgId.length - 1]
|
? state.orgId[state.orgId.length - 1]
|
||||||
: null,
|
: null,
|
||||||
createName: state.creator,
|
createName: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
});
|
});
|
||||||
const list = res.data.result.rows.map((item) => {
|
const list = res.data.result.rows.map((item) => {
|
||||||
return {
|
return {
|
||||||
@@ -665,8 +665,8 @@ export default {
|
|||||||
teachingName: state.name,
|
teachingName: state.name,
|
||||||
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
||||||
createName: state.creator,
|
createName: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
});
|
});
|
||||||
const list = res.data.result.rows?.map((item) => {
|
const list = res.data.result.rows?.map((item) => {
|
||||||
return {
|
return {
|
||||||
@@ -684,8 +684,8 @@ export default {
|
|||||||
routerName: state.name,
|
routerName: state.name,
|
||||||
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
||||||
createName: state.creator,
|
createName: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
});
|
});
|
||||||
const list = res.data.result.rows?.map((item) => {
|
const list = res.data.result.rows?.map((item) => {
|
||||||
return {
|
return {
|
||||||
@@ -703,8 +703,8 @@ export default {
|
|||||||
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
||||||
createName: state.creator,
|
createName: state.creator,
|
||||||
projectName: state.name,
|
projectName: state.name,
|
||||||
startCreateTime: state.publishTime[0]+" 00:00:01",
|
startCreateTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endCreateTime: state.publishTime[1]+" 23:59:59",
|
endCreateTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
});
|
});
|
||||||
if (res) {
|
if (res) {
|
||||||
const fun = (arr) => {
|
const fun = (arr) => {
|
||||||
|
|||||||
@@ -130,8 +130,8 @@ export default {
|
|||||||
title: state.title,
|
title: state.title,
|
||||||
createName: state.createName,
|
createName: state.createName,
|
||||||
// publishTime: state.publishTime,
|
// publishTime: state.publishTime,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
pageNo: state.pageNo,
|
pageNo: state.pageNo,
|
||||||
pageSize: state.pageSize,
|
pageSize: state.pageSize,
|
||||||
};
|
};
|
||||||
@@ -249,8 +249,8 @@ export default {
|
|||||||
title: state.title,
|
title: state.title,
|
||||||
createName: state.createName,
|
createName: state.createName,
|
||||||
// publishTime: state.publishTime,
|
// publishTime: state.publishTime,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
pageNo: state.pageNo,
|
pageNo: state.pageNo,
|
||||||
pageSize: state.pageSize,
|
pageSize: state.pageSize,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -169,8 +169,8 @@ export default {
|
|||||||
}
|
}
|
||||||
if (state.publishTime.length>0) {
|
if (state.publishTime.length>0) {
|
||||||
// params.publishTime = state.publishTime;
|
// params.publishTime = state.publishTime;
|
||||||
params.startTime = state.publishTime[0]+" 00:00:00";
|
params.startTime = typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+" 00:00:00";
|
||||||
params.endTime = state.publishTime[1]+" 23:59:59";
|
params.endTime = typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59";
|
||||||
}
|
}
|
||||||
axios({
|
axios({
|
||||||
method: "post",
|
method: "post",
|
||||||
@@ -202,8 +202,8 @@ export default {
|
|||||||
title: state.title,
|
title: state.title,
|
||||||
createName: state.createName,
|
createName: state.createName,
|
||||||
// publishTime: state.publishTime,
|
// publishTime: state.publishTime,
|
||||||
startTime: state.publishTime[0]+" 00:00:00",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+" 00:00:00",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59",
|
||||||
page: state.pageNo,
|
page: state.pageNo,
|
||||||
size: state.pageSize
|
size: state.pageSize
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
v-model:value="orgId"
|
v-model:value="orgId"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
placeholder="请选择归属组织"
|
placeholder="请选择归属组织"
|
||||||
:allowClear="allowClear"
|
:allowClear=false
|
||||||
:fieldNames="{
|
:fieldNames="{
|
||||||
label: 'orgName',
|
label: 'orgName',
|
||||||
value: 'organizationId',
|
value: 'organizationId',
|
||||||
@@ -424,8 +424,8 @@ export default {
|
|||||||
// userNo: state.userNo,
|
// userNo: state.userNo,
|
||||||
testName: state.testName,
|
testName: state.testName,
|
||||||
creator: state.creator,
|
creator: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59",
|
||||||
// name: state.name,
|
// name: state.name,
|
||||||
departmentId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
departmentId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
||||||
// bandCode: state.band,
|
// bandCode: state.band,
|
||||||
@@ -465,8 +465,8 @@ export default {
|
|||||||
// name: state.name,
|
// name: state.name,
|
||||||
testName: state.testName,
|
testName: state.testName,
|
||||||
creator: state.creator,
|
creator: state.creator,
|
||||||
startTime: state.publishTime[0]+" 00:00:01",
|
startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00",
|
||||||
endTime: state.publishTime[1]+" 23:59:59",
|
endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59",
|
||||||
departmentId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
departmentId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
|
||||||
// bandCode: state.band,
|
// bandCode: state.band,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
v-model:value="orgId"
|
v-model:value="orgId"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
placeholder="请选择归属组织"
|
placeholder="请选择归属组织"
|
||||||
:allowClear="allowClear"
|
:allowClear=false
|
||||||
:fieldNames="{
|
:fieldNames="{
|
||||||
label: 'orgName',
|
label: 'orgName',
|
||||||
value: 'organizationId',
|
value: 'organizationId',
|
||||||
@@ -229,8 +229,8 @@ export default {
|
|||||||
params.createName = state.createName;
|
params.createName = state.createName;
|
||||||
params.projectName = state.projectName;
|
params.projectName = state.projectName;
|
||||||
// params.publishTime = state.publishTime;
|
// params.publishTime = state.publishTime;
|
||||||
params.startPublishTime = state.publishTime[0]+" 00:00:01";
|
params.startPublishTime =typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+" 00:00:01";
|
||||||
params.endPublishTime = state.publishTime[1]+" 23:59:59";
|
params.endPublishTime = typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59";
|
||||||
params.page = state.pageNo;
|
params.page = state.pageNo;
|
||||||
params.size = state.pageSize;
|
params.size = state.pageSize;
|
||||||
params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null;
|
params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null;
|
||||||
@@ -278,8 +278,8 @@ export default {
|
|||||||
params.createName = state.createName;
|
params.createName = state.createName;
|
||||||
params.projectName = state.projectName;
|
params.projectName = state.projectName;
|
||||||
// params.publishTime = state.publishTime;
|
// params.publishTime = state.publishTime;
|
||||||
params.startPublishTime = state.publishTime[0]+" 00:00:01";
|
params.startPublishTime =typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+" 00:00:01";
|
||||||
params.endPublishTime = state.publishTime[1]+" 23:59:59";
|
params.endPublishTime = typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59";
|
||||||
params.page = state.pageNo;
|
params.page = state.pageNo;
|
||||||
params.size = state.pageSize;
|
params.size = state.pageSize;
|
||||||
params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null;
|
params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null;
|
||||||
@@ -347,8 +347,8 @@ export default {
|
|||||||
params.createName = state.createName;
|
params.createName = state.createName;
|
||||||
params.projectName = state.projectName;
|
params.projectName = state.projectName;
|
||||||
// params.publishTime = state.publishTime;
|
// params.publishTime = state.publishTime;
|
||||||
params.startPublishTime = state.publishTime[0]+" 00:00:01";
|
params.startPublishTime =typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+" 00:00:01";
|
||||||
params.endPublishTime = state.publishTime[1]+" 23:59:59";
|
params.endPublishTime = typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59";
|
||||||
params.page = state.pageNo;
|
params.page = state.pageNo;
|
||||||
params.size = state.pageSize;
|
params.size = state.pageSize;
|
||||||
params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null;
|
params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null;
|
||||||
|
|||||||
Reference in New Issue
Block a user