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

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

ui/dasadmin/src/views/backend/dashboard.vue

@@ -484,6 +484,7 @@ const StatusListData = () => {
                             igenpower: item.attributeMap.igenpower,
                             ikwhthisday: item.attributeMap.ikwhthisday,
                             iturbineoperationmode: state,
+                            locked: item.attributeMap.locked,
                         }
                 }
             });
@@ -515,18 +516,6 @@ const powerChartData: { time: any; values: any } = {
     time: {},
     values: {},
 }
-/*const powerChartData = {
-    time: {
-        iGenPower:['00:00','00:05','00:10','00:15'],
-        iTheoreticalPower:['00:00','00:05','00:10','00:15'],
-        iWindSpeed:['00:00','00:05','00:10','00:15']
-    },
-    values: {
-        iGenPower:[0,5,2,7],
-        iTheoreticalPower:[0,0,0,0],
-        iWindSpeed:[3,8,9,1]
-    },
-}*/
 const initpowerChart = () => {
     const powerChart = state.charts.powerChart ?? echarts.init(powerChartRef.value as unknown as HTMLElement)
     const option = {
@@ -1127,10 +1116,9 @@ const tabhandleClick = () => {
         inittrendChart(trendChartType.value)
     })
 }
+
 onMounted(() => {
     getAllChartData()
-    //inittrendChart(trendChartType.value)
-    //initpowerChart()
     createScroll()
     overviewList()
     StatusListData()

ui/dasadmin/src/views/backend/home/windMatrix.vue

@@ -56,6 +56,9 @@
                                 </el-col>
                             </el-row>
                         </div>
+                        <div class="fanlist-bottom">
+                            <el-tag v-if="item.attributeMap.locked === 1" class="tag-panel is-danger">已锁定</el-tag>
+                        </div>
 
                     </div>
                 </div>
@@ -183,7 +186,8 @@ const animationDuration=reactive({
         .fanlist-main{
             width: 100%;
             display: flex;
-            padding: 10px;
+            /*padding: 10px;*/
+            padding: 10px 10px 0 10px;
             text-align: center;
             .fanlist-pic{
                 display: flex;
@@ -241,7 +245,7 @@ const animationDuration=reactive({
                 }
             }
             .fanlist-text{
-                margin-top:30px;
+                margin-top:20px;
                 display: flex;
                 flex-direction: column;
                 .content-number{
@@ -255,5 +259,14 @@ const animationDuration=reactive({
             }
 
         }
+        .fanlist-bottom{
+            display: flex;
+            justify-content: end;
+            height: 24px;
+            .tag-panel{
+                border-radius: 0 0 8px 0;
+                line-height: 20px;
+            }
+        }
     }
 </style>