diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts index 187d387..b657bfb 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts @@ -53,53 +53,178 @@ export const columns: BasicColumn[] = [ { title: '平时成绩1', align: "center", - dataIndex: 'cj1' + dataIndex: 'cj1', + children: [ + { + title: '成绩类型', + dataIndex: 'cj1mc', + width: 100, + customRender:({text}) =>{ + text = !text ? "" : (text.length > 0 ? text.substr(0,text.indexOf("[")) : ""); + return text; + }, + }, + { + title: '分数', + dataIndex: 'cj1', + width: 100, + }, + { + title: '占比', + dataIndex: 'cj1mc', + width: 100, + customRender:({text}) =>{ + text = !text ? "" : (text.length > 0 ? text.substr(text.indexOf("["),text.indexOf("]")) : ""); + return text; + } + }, + ], }, { title: '平时成绩2', align: "center", - dataIndex: 'cj2' + dataIndex: 'cj2', + children: [ + { + title: '成绩类型', + dataIndex: 'cj2mc', + width: 100, + customRender:({text}) =>{ + text = !text ? "" : (text.length > 0 ? text.substr(0,text.indexOf("[")) : ""); + return text; + }, + }, + { + title: '分数', + dataIndex: 'cj2', + width: 100, + }, + { + title: '占比', + dataIndex: 'cj2mc', + width: 100, + customRender:({text}) =>{ + text = !text ? "" : (text.length > 0 ? text.substr(text.indexOf("["),text.indexOf("]")) : ""); + return text; + } + }, + ], }, { title: '平时成绩3', align: "center", - dataIndex: 'cj3' + dataIndex: 'cj3', + children: [ + { + title: '成绩类型', + dataIndex: 'cj3mc', + width: 100, + customRender:({text}) =>{ + text = !text ? "" : (text.length > 0 ? text.substr(0,text.indexOf("[")) : ""); + return text; + }, + }, + { + title: '分数', + dataIndex: 'cj3', + width: 100, + }, + { + title: '占比', + dataIndex: 'cj3mc', + width: 100, + customRender:({text}) =>{ + text = !text ? "" : (text.length > 0 ? text.substr(text.indexOf("["),text.indexOf("]")) : ""); + return text; + } + }, + ], }, { title: '期中成绩', align: "center", - dataIndex: 'cj4' + dataIndex: 'cj4', + children: [ + { + title: '成绩类型', + dataIndex: 'cj5mc', + width: 100, + customRender:({text}) =>{ + text = !text ? "" : (text.length > 0 ? text.substr(0,text.indexOf("[")) : ""); + return text; + }, + }, + { + title: '分数', + dataIndex: 'cj4', + width: 100, + }, + { + title: '占比', + dataIndex: 'cj4mc', + width: 100, + customRender:({text}) =>{ + text = !text ? "" : (text.length > 0 ? text.substr(text.indexOf("["),text.indexOf("]")) : ""); + return text; + } + }, + ], }, { title: '期末成绩', align: "center", - dataIndex: 'cj5' - }, - { - title: '平时成绩1', - align: "center", - dataIndex: 'cj1mc' - }, - { - title: '平时成绩2', - align: "center", - dataIndex: 'cj2mc' - }, - { - title: '平时成绩3', - align: "center", - dataIndex: 'cj3mc' - }, - { - title: '期中成绩', - align: "center", - dataIndex: 'cj4mc' - }, - { - title: '期末成绩', - align: "center", - dataIndex: 'cj5mc' + dataIndex: 'cj5', + children: [ + { + title: '成绩类型', + dataIndex: 'cj5mc', + width: 100, + customRender:({text}) =>{ + text = !text ? "" : (text.length > 0 ? text.substr(0,text.indexOf("[")) : ""); + return text; + }, + }, + { + title: '分数', + dataIndex: 'cj5', + width: 100, + }, + { + title: '占比', + dataIndex: 'cj4mc', + width: 100, + customRender:({text}) =>{ + text = !text ? "" : (text.length > 0 ? text.substr(text.indexOf("["),text.indexOf("]")) : ""); + return text; + } + }, + ], }, + // { + // title: '平时成绩1', + // align: "center", + // dataIndex: 'cj1mc' + // }, + // { + // title: '平时成绩2', + // align: "center", + // dataIndex: 'cj2mc' + // }, + // { + // title: '平时成绩3', + // align: "center", + // dataIndex: 'cj3mc' + // }, + // { + // title: '期中成绩', + // align: "center", + // dataIndex: 'cj4mc' + // }, + // { + // title: '期末成绩', + // align: "center", + // dataIndex: 'cj5mc' + // }, { title: '总成绩', align: "center", diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue index 73f1819..69c2c95 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue @@ -18,31 +18,30 @@