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

das/src/main/java/com/das/common/constant/SysAuthorityIds.java

@@ -21,4 +21,18 @@ public interface SysAuthorityIds {
      * 设备控制控制权限
      */
     Integer SYS_AUTHORITY_ID_DEVICE_CTRL=104;
+
+    /**
+     * 查看涉密数据权限
+     */
+    Integer SYS_AUTHORITY_ID_VIEW_CONFIDENTIAL_DATA=105;
+    /**
+     * AGC&AVC控制权限
+     */
+    Integer SYS_AUTHORITY_ID_AGC_AVC_CTRL=106;
+    /**
+     * 温度限值设置权限
+     */
+    Integer SYS_AUTHORITY_ID_TEMPERATURE_LIMIT_SETTING=107;
+
 }

das/src/main/java/com/das/modules/auth/service/impl/SysAuthorityServiceImpl.java

@@ -26,9 +26,13 @@ public class SysAuthorityServiceImpl implements SysAuthorityService {
     @PostConstruct
     public void init() {
         List<SysAuthority> list = new ArrayList<>();
-        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN,"SYS_AUTHORITY_ID_ADMIN","系统管理权限"));
+        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN,"ADMIN","系统管理权限"));
-        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR,"SYS_AUTHORITY_ID_DEVICE_MGR","设备台账维护权限"));
+        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR,"DEVICE_MGR","设备台账维护权限"));
-        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_VIEW,"SYS_AUTHORITY_ID_DEVICE_VIEW","设备台账浏览权限"));
+        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_VIEW,"DEVICE_VIEW","设备台账浏览权限"));
+        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_CTRL,"DEVICE_CTRL","设备控制控制权限"));
+        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_VIEW_CONFIDENTIAL_DATA,"VIEW_CONFIDENTIAL_DATA","查看涉密数据权限"));
+        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_AGC_AVC_CTRL,"AGC_AVC_CTRL","AGC&AVC控制权限"));
+        list.add(new SysAuthority(SysAuthorityIds.SYS_AUTHORITY_ID_TEMPERATURE_LIMIT_SETTING,"TEMPERATURE_LIMIT_SETTING","温度限值设置权限"));
 
         try {
             // 性能优化：先查询所有需要的权限是否存在，减少数据库访问次数

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

@@ -6,9 +6,9 @@
                      @click="handleClick(item)"
                      @contextmenu.prevent="windContextMenu($event,item)"
                 >
-                    <div class="FanList-panel" :class="{
+                    <div class="FanList-panel wind-default" :class="{
-                                'wind-mark': item.standard==1,
+                                '': item.standard==1,
-                                'wind-default': item.standard==0,
+                                '': item.standard==0,
                                 'wind-offline': item.attributeMap.processedoperationmode == 33
                                   }">
 
@@ -95,6 +95,18 @@
                        class="control-btn"
                        type="primary">锁定</el-button>
                     <el-button @click="sendManualCommand(0)" v-else class="control-btn" type="primary">解锁</el-button>
+                    <el-button
+                        class="control-btn"
+                        type="primary"
+                        @click=""
+                        v-if="realTimeData.standard == 0"
+                    >标杆设置</el-button>
+                    <el-button
+                        class="control-btn"
+                        type="primary"
+                        @click=""
+                        v-else
+                    >标杆取消</el-button>
                 </div>
             </template>
         </ContextMenu>
@@ -121,13 +133,24 @@ const getAnimationStyle = (item) => {
     const irotorspeed = item.attributeMap?.irotorspeed ?? 0
     let animationDuration;
     animationDuration = 60 / irotorspeed / 3
-
+    const processedoperationmode = item.attributeMap?.processedoperationmode ?? 0
+    if(processedoperationmode==33){
+        return {
+            'animation-duration': `0s`,
+            'animation-timing-function': 'linear',
+            'animation-iteration-count': 'infinite',
+            'animation-direction': 'normaL',
+        }
+    }else{
         return {
             'animation-duration': `${animationDuration}s`,
             'animation-timing-function': 'linear',
             'animation-iteration-count': 'infinite',
             'animation-direction': 'normaL',
         }
+    }
+
+
 
 }
 
@@ -166,7 +189,8 @@ const realTimeData = ref<any>({
     processedoperationmode: 1111,
     locked: 0,
     deviceId: '',
-    name:''
+    name:'',
+    standard:''
 })
 const windContextMenu = (event: any,curnodeData) => {
     contextMenuPos.value.x = event.pageX
@@ -175,6 +199,7 @@ const windContextMenu = (event: any,curnodeData) => {
     realTimeData.value.locked=curnodeData.attributeMap.locked
     realTimeData.value.deviceId=curnodeData.irn
     realTimeData.value.name=curnodeData.name
+    realTimeData.value.standard=curnodeData.standard
     OperateVisible.value = true
 }
 const sendCommand = (type: 'setTurbineFastStart' | 'setTurbineStop' | 'setTurbineResetStatusCode') => {