Merge remote-tracking branch 'origin/main'

das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java

@@ -318,7 +318,11 @@ public class NodeMessageServiceImpl implements NodeMessageService {
             deviceEventInfo.setEventLevel(0);
             deviceEventInfo.setConfirmed(0);
             if (!StringUtils.isEmpty(eventType) && eventType.equals("遥信变位")){
-                deviceEventInfo.setEventText(fieldName + eventType + "负归");
+                if (item.getAttrValue().equals(0)){
+                    deviceEventInfo.setEventText(fieldName + " 复归");
+                }else {
+                    deviceEventInfo.setEventText(fieldName + " 动作");
+                }
             }
             else{
                 deviceEventInfo.setEventText(fieldName + eventType + ",属性值为："+item.getAttrValue()+",越限值为："+item.getLimitValue());

ui/dasadmin/src/layouts/backend/components/menus/menuTree.vue

@@ -12,7 +12,9 @@
         <template v-else>
             <el-menu-item :index="menu.path" :key="menu.path" @click="onClickMenu(menu)">
                 <Icon :color="config.getColorVal('menuColor')" :name="menu.meta?.icon ? menu.meta?.icon : config.layout.menuDefaultIcon" />
-                <span>{{ menu.meta?.menuDesc ? menu.meta?.menuDesc : $t('noTitle') }}</span>
+
+                <!-- <span>{{ menu.meta?.menuDesc ? menu.meta?.menuDesc : $t('noTitle') }}</span> -->
+                <template #title>{{ menu.meta?.menuDesc ? menu.meta?.menuDesc : $t('noTitle') }}</template>
             </el-menu-item>
         </template>
     </template>
@@ -89,6 +91,15 @@ const onClickSubMenu = (menu: RouteRecordRaw) => {
         }
     }
 }
+.el-menu--collapse {
+    .is-active {
+        :deep(div) {
+            > .icon {
+                color: #ffffff !important;
+            }
+        }
+    }
+}
 .el-menu-item.is-active {
     background-color: #0064aa;
 }