From 1494aeec816ddad60d0b318e48cb40fb3b8290ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=8E=89=E9=9C=9E?= Date: Wed, 3 Jul 2024 10:02:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/components/menus/menuTree.vue | 2 +- .../backend/components/menus/menuVertical.vue | 5 ++-- .../src/layouts/backend/container/classic.vue | 4 ++-- ui/dasadmin/src/styles/app.scss | 24 +++++++++++++++++++ .../backend/auth/menuManagement/index.vue | 2 +- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/ui/dasadmin/src/layouts/backend/components/menus/menuTree.vue b/ui/dasadmin/src/layouts/backend/components/menus/menuTree.vue index ca1ce300..c0de96c5 100644 --- a/ui/dasadmin/src/layouts/backend/components/menus/menuTree.vue +++ b/ui/dasadmin/src/layouts/backend/components/menus/menuTree.vue @@ -81,7 +81,7 @@ const onClickSubMenu = (menu: RouteRecordRaw) => { :deep(div) { background-color: rgba(0, 100, 170, 0.15) !important; color: #0064aa !important; - border-radius: 10px; + border-radius: 6px; font-weight: 600; margin-bottom: 10px; > .icon { diff --git a/ui/dasadmin/src/layouts/backend/components/menus/menuVertical.vue b/ui/dasadmin/src/layouts/backend/components/menus/menuVertical.vue index 7702298c..a9ca45a6 100644 --- a/ui/dasadmin/src/layouts/backend/components/menus/menuVertical.vue +++ b/ui/dasadmin/src/layouts/backend/components/menus/menuVertical.vue @@ -73,8 +73,9 @@ onBeforeRouteUpdate((to) => { padding: 10px 20px 30px 20px; --el-menu-bg-color: transparent; --el-menu-active-color: #ffffff; - li { - border-radius: 10px; + li, + div { + border-radius: 6px; } } diff --git a/ui/dasadmin/src/layouts/backend/container/classic.vue b/ui/dasadmin/src/layouts/backend/container/classic.vue index dffeaab8..a0c07a0d 100644 --- a/ui/dasadmin/src/layouts/backend/container/classic.vue +++ b/ui/dasadmin/src/layouts/backend/container/classic.vue @@ -49,10 +49,10 @@ const navTabs = useNavTabs() box-shadow: 0px 0px 20px 0px rgba(0, 100, 170, 0.09); } .logo-img { - width: 28px; + width: 46px; } .website-name { - padding-left: 4px; + padding-left: 10px; font-size: var(--el-font-size-extra-large); font-weight: 600; overflow: hidden; diff --git a/ui/dasadmin/src/styles/app.scss b/ui/dasadmin/src/styles/app.scss index 352565d8..928e52b4 100644 --- a/ui/dasadmin/src/styles/app.scss +++ b/ui/dasadmin/src/styles/app.scss @@ -31,6 +31,30 @@ body, // --el-color-primary: #0064AA } +.treeMain { + .el-tree { + .el-tree-node__content { + height: 40px; + border-radius: 6px; + + } + + .el-tree-node.is-current { + >.el-tree-node__content { + background-color: var(--el-color-primary); + color: #ffffff; + } + } + } +} + +.el-table__header { + .el-table__cell { + background-color: #EFF0F1 !important; + } + +} + // 阿里 iconfont Symbol引用css .iconfont-icon { width: 1em; diff --git a/ui/dasadmin/src/views/backend/auth/menuManagement/index.vue b/ui/dasadmin/src/views/backend/auth/menuManagement/index.vue index ac35ecd5..434eb5d3 100644 --- a/ui/dasadmin/src/views/backend/auth/menuManagement/index.vue +++ b/ui/dasadmin/src/views/backend/auth/menuManagement/index.vue @@ -7,7 +7,7 @@ Date: Wed, 3 Jul 2024 10:21:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/service/impl/SysIotModelServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java index 7127ea29..30acdb91 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java @@ -70,6 +70,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { QueryWrapper sysIotModelQueryWrapper = new QueryWrapper<>(); sysIotModelQueryWrapper.eq("iot_model_code", sysIotModelDto.getIotModelCode()); + sysIotModelQueryWrapper.eq("id", sysIotModelDto.getId()); SysIotModel sysIotModelQuery = sysIotModelMapper.selectOne(sysIotModelQueryWrapper); if (!(sysIotModelQuery == null)){ throw new ServiceException("更新的物模型编码code重复"); @@ -88,8 +89,8 @@ public class SysIotModelServiceImpl implements SysIotModelService { public void deleteSysIotModel(SysIotModelDto sysIotModelDto) { sysIotModelMapper.deleteById(sysIotModelDto.getId()); // 删除绑定的物模型属性和动作 - sysIotModelFieldMapper.delete(new QueryWrapper().eq("iot_model_id",sysIotModelDto.getId())); - sysIotModelServiceMapper.delete(new QueryWrapper().eq("iot_model_id",sysIotModelDto.getId())); +// sysIotModelFieldMapper.delete(new QueryWrapper().eq("iot_model_id",sysIotModelDto.getId())); +// sysIotModelServiceMapper.delete(new QueryWrapper().eq("iot_model_id",sysIotModelDto.getId())); } @Override @@ -156,6 +157,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { QueryWrapper sysIotModelFieldQueryWrapper = new QueryWrapper<>(); sysIotModelFieldQueryWrapper.eq("attribute_code", sysIotModelFieldDto.getAttributeCode()); + sysIotModelFieldQueryWrapper.eq("id", sysIotModelFieldDto.getId()); SysIotModelField sysIotModelFieldQuery = sysIotModelFieldMapper.selectOne(sysIotModelFieldQueryWrapper); if (!(sysIotModelFieldQuery == null)){ throw new ServiceException("物模型属性修改的code已经存在"); @@ -220,6 +222,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { QueryWrapper sysIotModelFieldQueryWrapper = new QueryWrapper<>(); sysIotModelFieldQueryWrapper.eq("service_code", sysIotModelServiceDto.getServiceCode()); + sysIotModelFieldQueryWrapper.eq("id", sysIotModelServiceDto.getId()); SysIotModelField sysIotModelFieldQuery = sysIotModelFieldMapper.selectOne(sysIotModelFieldQueryWrapper); if (!(sysIotModelFieldQuery == null)){ throw new ServiceException("物模型动作更新code已经存在");