sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.jsspisoft.com/ry-das

Browse Source
This commit is contained in:
谷成伟 2024-07-03 13:18:01 +08:00
commit 4b253694af
6 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
View File

@ -70,6 +70,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
QueryWrapper<SysIotModel> 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<SysIotModelField>().eq("iot_model_id",sysIotModelDto.getId()));
sysIotModelServiceMapper.delete(new QueryWrapper<SysIotModelServices>().eq("iot_model_id",sysIotModelDto.getId()));
// sysIotModelFieldMapper.delete(new QueryWrapper<SysIotModelField>().eq("iot_model_id",sysIotModelDto.getId()));
// sysIotModelServiceMapper.delete(new QueryWrapper<SysIotModelServices>().eq("iot_model_id",sysIotModelDto.getId()));
}
@Override
@ -156,6 +157,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
QueryWrapper<SysIotModelField> 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<SysIotModelField> 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已经存在");

2
ui/dasadmin/src/layouts/backend/components/menus/menuTree.vue
View File

@ -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 {

5
ui/dasadmin/src/layouts/backend/components/menus/menuVertical.vue
View File

@ -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;
}
}
</style>

4
ui/dasadmin/src/layouts/backend/container/classic.vue
View File

@ -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;

24
ui/dasadmin/src/styles/app.scss
View File

@ -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;

2
ui/dasadmin/src/views/backend/auth/menuManagement/index.vue
View File

@ -7,7 +7,7 @@
<!-- </el-header> -->
<el-main class="treeMain">
<el-tree
style="max-width: 600px; margin-top: 2.2%; font-size: 16px"
style="max-width: 600px; margin-top: 2.2%"
:data="menuData"
:props="defaultProps"
node-key="id"