From 5cc53f0d0dcd63307ccc5357f3e58ff97d9152ab Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Thu, 2 Nov 2023 11:18:58 +0800 Subject: [PATCH] 2023-11-2 --- src/views/component/detailCpn.vue | 543 +++++++++++++++++++++++ src/views/component/table.vue | 7 +- src/views/dashboard/index.vue | 2 +- src/views/system/components/linkWith.vue | 1 + 4 files changed, 548 insertions(+), 5 deletions(-) create mode 100644 src/views/component/detailCpn.vue diff --git a/src/views/component/detailCpn.vue b/src/views/component/detailCpn.vue new file mode 100644 index 0000000..6693a39 --- /dev/null +++ b/src/views/component/detailCpn.vue @@ -0,0 +1,543 @@ + + + + + diff --git a/src/views/component/table.vue b/src/views/component/table.vue index bc8c64d..a22218f 100644 --- a/src/views/component/table.vue +++ b/src/views/component/table.vue @@ -250,10 +250,7 @@ @detail=" (row) => { $router.push({ - path: '/assetsDetail', - query: { - id: row.id - } + path: $route.path + '/detail/' + row.id }) } " @@ -454,6 +451,8 @@ export default { fieldRes?.forEach((i, index) => { i._relations = relation.find( (j) => j.link_table_name.split("_")[1] === i.field + ) || relation.find( + (j) => j.local_key === i.field ); if (i.select_item && typeof i.select_item === "object") { let keys = Object.keys(i.select_item); diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 118ce83..ec0a353 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,7 +2,7 @@
- +

通知

diff --git a/src/views/system/components/linkWith.vue b/src/views/system/components/linkWith.vue index 484efd1..26be0e2 100644 --- a/src/views/system/components/linkWith.vue +++ b/src/views/system/components/linkWith.vue @@ -268,6 +268,7 @@ export default { async getFields(tableName) { const res = await realTableShow({ table_name: tableName }); console.log(res); + res['id'] = 'integer'; return res || {}; }, async getRealTables() {