diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 4e0d9df..d54feca 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -6,7 +6,7 @@ - + @@ -36,7 +36,7 @@ transition: opacity 1.5s; } .sidebar-name-logo { - width: 150px; + width: 94%; object-fit: contain; } diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index f53dd33..e636a66 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -89,3 +89,7 @@ text-align: right; } } + +.el-menu-item,.el-submenu__title,.el-table,.el-descriptions,.v-table .el-table__header th { + font-size: 15px!important; +} diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index e260bcf..42c6114 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -79,7 +79,7 @@ } } .el-submenu .is-active{ - background-color: $menuHover !important; + // background-color: $menuHover !important; } diff --git a/src/views/assets/component/addHandles.vue b/src/views/assets/component/addHandles.vue new file mode 100644 index 0000000..2a25838 --- /dev/null +++ b/src/views/assets/component/addHandles.vue @@ -0,0 +1,826 @@ + + + + diff --git a/src/views/assets/detail.vue b/src/views/assets/detail.vue index 3098ae6..a7df23c 100644 --- a/src/views/assets/detail.vue +++ b/src/views/assets/detail.vue @@ -47,7 +47,6 @@ @@ -110,7 +109,7 @@ - +

关联土地

@@ -122,7 +121,6 @@ @@ -134,7 +132,7 @@ - +
关联房产
@@ -649,6 +647,7 @@ export default { prop: "operate", label: "查看", align: 'center', + fixed: "right", customFn: row => (
diff --git a/src/views/component/dialog.vue b/src/views/component/dialog.vue index 4f6eeb2..23d0609 100644 --- a/src/views/component/dialog.vue +++ b/src/views/component/dialog.vue @@ -652,10 +652,6 @@ export default { } } }); - document.documentElement.style.setProperty( - "--column-num", - newVal.length > 8 ? "2" : "1" - ); }, //immediate: true, }, diff --git a/src/views/component/drawer.vue b/src/views/component/drawer.vue index 439da55..4269472 100644 --- a/src/views/component/drawer.vue +++ b/src/views/component/drawer.vue @@ -9,7 +9,6 @@ >