Merge branch 'fix/problem/06-12' into 'main_dev'

perf: 优化场景联动，执行条件开启后不可删除

See merge request yunteng/thingskit-front!1376

@@ -28,6 +28,7 @@ import { RouteRecordRaw } from 'vue-router';
 import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
 import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
 import { createLocalStorage } from '/@/utils/cache/index';
 import { createLocalStorage } from '/@/utils/cache/index';
 import { getEntitiesId } from '/@/api/dashboard/index';
 import { getEntitiesId } from '/@/api/dashboard/index';
+import { useRole } from '/@/hooks/business/useRole';
 
 
 interface PlatInfoType {
 interface PlatInfoType {
   id: string;
   id: string;
@@ -283,7 +284,10 @@ export const useUserStore = defineStore({
         title: t('sys.app.logoutTip'),
         title: t('sys.app.logoutTip'),
         content: t('sys.app.logoutMessage'),
         content: t('sys.app.logoutMessage'),
         onOk: async () => {
         onOk: async () => {
-          await logoutApi(null, 'modal'); //新增退出登录接口
+          const { isPlatformAdmin } = useRole();
+          if (!isPlatformAdmin.value) {
+            await logoutApi(null, 'modal'); //新增退出登录接口
+          }
           await this.logout(true);
           await this.logout(true);
         },
         },
       });
       });

@@ -247,11 +247,11 @@ export const alarmSchemasForm: FormSchema[] = [
       disabled: true,
       disabled: true,
     },
     },
   },
   },
-  {
-    field: 'details',
-    label: '详情',
-    component: 'InputTextArea',
-  },
+  // {
+  //   field: 'details',
+  //   label: '详情',
+  //   component: 'InputTextArea',
+  // },
 ];
 ];
 
 
 export function getAlarmStatus({
 export function getAlarmStatus({

@@ -143,7 +143,12 @@
             </div>
             </div>
             <Tooltip title="删除">
             <Tooltip title="删除">
               <Icon
               <Icon
-                v-if="!disabledDrawer && flipFlopListElRef.length > 1"
+                v-if="
+                  !disabledDrawer &&
+                  (type === FlipFlopComponentTypeEnum.FLIP_FLOP
+                    ? flipFlopListElRef.length > 1
+                    : true)
+                "
                 class="ml-2 cursor-pointer"
                 class="ml-2 cursor-pointer"
                 icon="fluent:delete-off-20-regular"
                 icon="fluent:delete-off-20-regular"
                 size="20"
                 size="20"