diff --git a/src/assets/logo.png b/src/assets/logo.png index 6d73fe2..a84c764 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index d3fec75..4e0d9df 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -36,7 +36,7 @@ transition: opacity 1.5s; } .sidebar-name-logo { - width: 145px; + width: 150px; object-fit: contain; } @@ -62,8 +62,8 @@ align-items: center; & .sidebar-logo { - width: 38px; - height: 38px; + width: 32px; + height: 32px; vertical-align: middle; margin-right: 12px; } diff --git a/src/settings.js b/src/settings.js index f8a112c..0982525 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,6 +1,6 @@ module.exports = { -//无锡交通产业集团 - title: '无锡交通产业集团', +//无锡交通产业集团,资产管理平台 + title: '无锡交通产业集团资产管理平台', /** * @type {boolean} true | false diff --git a/src/utils/createTable.js b/src/utils/createTable.js index cf5e1a4..a5b7814 100644 --- a/src/utils/createTable.js +++ b/src/utils/createTable.js @@ -31,7 +31,7 @@ export async function resolveFormInfo(customFormId) { i._relations = relation.find( (j) => j.link_table_name.split("_")[1] === i.field ); - if (i.select_item && typeof i.select_item === "object") { + if (i.select_item && typeof i.select_item === "object" && !(i.select_item instanceof Array)) { let keys = Object.keys(i.select_item); i._params = keys.map((key) => { return { diff --git a/src/views/assets/component/addFiles.vue b/src/views/assets/component/addFiles.vue new file mode 100644 index 0000000..e89ce16 --- /dev/null +++ b/src/views/assets/component/addFiles.vue @@ -0,0 +1,610 @@ + + + diff --git a/src/views/assets/fileList.vue b/src/views/assets/fileList.vue index 3980e98..c11e4fb 100644 --- a/src/views/assets/fileList.vue +++ b/src/views/assets/fileList.vue @@ -21,6 +21,12 @@ >查询 + @@ -64,13 +70,15 @@ > + +