From 613e7feaf40fd86a9c14fbc27674843c0fa56dc8 Mon Sep 17 00:00:00 2001 From: xuziqiang <1344691446@qq.com> Date: Wed, 26 Jun 2024 14:58:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/view/organizationManage/departmentManage/index.vue | 5 ++--- .../src/view/organizationManage/usermanage/index.vue | 2 +- lib/saas/theme/global.less | 8 ++++++++ lib/saas/view/service/list-table.vue | 5 +++-- lib/saas/view/system/application.vue | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue index 0e8063e..8456a04 100644 --- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue +++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue @@ -323,7 +323,6 @@ watchEffect(() => { if (selectRef.value) { getUserTree().then(() => { - return; if (!roleTreeData.value?.length) { selectRoleRef.value = {}; roleFormData.value = {}; @@ -595,7 +594,7 @@ // 部门选择 const SelectApartmentTree = (selectedKeys: any, info: any) => { - console.log(info); + console.log(info, 'SelectApartmentTree'); // 部门切换需要调整角色tab roleActiveKey.value = 1; @@ -784,7 +783,7 @@ padding: @ns-gap; background-color: @white; border-radius: @ns-border-radius; - box-shadow: @ns-content-box-shadow; + // box-shadow: @ns-content-box-shadow; } .tree { diff --git a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue index 3eb3549..1daf894 100644 --- a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue +++ b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue @@ -607,7 +607,7 @@ > div { border-radius: @ns-border-radius; background-color: @white; - box-shadow: @ns-content-box-shadow; + // box-shadow: @ns-content-box-shadow; flex: 1; } .top:first-child { diff --git a/lib/saas/theme/global.less b/lib/saas/theme/global.less index 1b3ae3e..48f8c5d 100644 --- a/lib/saas/theme/global.less +++ b/lib/saas/theme/global.less @@ -163,6 +163,14 @@ a { color: @primary-color; } +.ant-tabs .ns-table-search { + border-top-left-radius: 0px !important; + border-top-right-radius: 0px !important; +} +.ant-tabs .ns-table-main { + border-bottom-left-radius: 0px !important; + border-bottom-right-radius: 0px !important; +} // 自定义的title样式 .ns-title-extra-box { diff --git a/lib/saas/view/service/list-table.vue b/lib/saas/view/service/list-table.vue index 3e37069..f7e41e0 100644 --- a/lib/saas/view/service/list-table.vue +++ b/lib/saas/view/service/list-table.vue @@ -121,7 +121,7 @@ .ns-table-main { background-color: @white; border-radius: @ns-border-radius; - box-shadow: @ns-content-box-shadow; + // box-shadow: @ns-box-shadow; } .ns-table-container { @@ -136,7 +136,8 @@ padding: 0px @gap; margin-top: @ns-gap; background-color: @white; - box-shadow: @ns-content-box-shadow; + overflow-y: auto; + // box-shadow: @ns-content-box-shadow; // border-top: @border-gap; // margin: 16px; diff --git a/lib/saas/view/system/application.vue b/lib/saas/view/system/application.vue index 8469f34..2f325aa 100644 --- a/lib/saas/view/system/application.vue +++ b/lib/saas/view/system/application.vue @@ -339,7 +339,7 @@ height: 100%; background-color: @white; border-radius: @ns-border-radius; - // overflow-y: auto; + overflow-y: auto; // overflow-x: hidden; // margin: 0 16px 16px 16px; }