diff --git a/src/views/HomePage/index.vue b/src/views/HomePage/index.vue index f626fb8..525edc6 100644 --- a/src/views/HomePage/index.vue +++ b/src/views/HomePage/index.vue @@ -300,7 +300,7 @@ export default defineComponent({ getRank() { let obj = Object.assign({pageNum: 1,pageSize: 10},this.form) this.proxy.$post("/statistics/data3", obj).then(res => { - let data = res.data; + let data = res.data.records; this.tableData = data; }).catch(() => {}); }, diff --git a/src/views/MatManage/_matList/config.js b/src/views/MatManage/_matList/config.js index dbf6686..ffe20a2 100644 --- a/src/views/MatManage/_matList/config.js +++ b/src/views/MatManage/_matList/config.js @@ -7,8 +7,9 @@ export function statusFormatter(row) { } }; export function groupFormatter(row) { - switch(row.groupId) { - case 0: return '未分组' - default: return row.groupId; + if(row.groupName) { + return row.groupName + } else { + return '未分组' } } \ No newline at end of file diff --git a/src/views/MatManage/_matList/index.vue b/src/views/MatManage/_matList/index.vue index a67e95d..81f0e32 100644 --- a/src/views/MatManage/_matList/index.vue +++ b/src/views/MatManage/_matList/index.vue @@ -46,7 +46,7 @@ - + + + +