Merge branch 'f-dev' into 'main'

fix：DEFECT-432 修复超级管理员分配菜单权限和按钮权限问题和修改场景联动 See merge request huang/yun-teng-iot-front!230

Merge branch 'f-dev' into 'main'
fix：DEFECT-432 修复超级管理员分配菜单权限和按钮权限问题和修改场景联动 See merge request huang/yun-teng-iot-front!230
xp.Huang
2 parents 68faed32 2d59d1d6
Showing 5 changed files with 203 additions and 83 deletions
src/api/ruleengine/ruleengineApi.ts
src/store/modules/permission.ts
src/views/rule/linkedge/SceneLinkAgeDrawer.vue
src/views/rule/linkedge/config/config.data.ts
src/views/rule/linkedge/cpns/Trigger-Condition.vue
--- a/src/api/ruleengine/ruleengineApi.ts
View file @1eab6b9
+++ b/src/api/ruleengine/ruleengineApi.ts
View file @1eab6b9
@@ -17,9 +17,10 @@ enum ScreenManagerApi {
   SCREEN_UPDATE_URL = '/sceneLinkage/update',
   SCREEN_ORGANIZATION_URL = '/organization/me/list',
   SCREEN_CHANGE_STATUS = '/convert/update/scene',
-  SCREEN_GET_BY_DEPTID = '/sceneLinkage/device/',
-  GET_ATTRBUTELIST = '/deviceProfile/devices/keys/timeseries',
+  SCREEN_GET_BY_DEPTID = '/sceneLinkage/device',
+  GET_ATTRBUTELIST = '/device/keys',
   ALARM_PROFILE = '/alarm/profile/',
+  MASTER_GET_DEVICE = '/device/list/master',
 }
 /**
@@ -55,6 +56,16 @@ export const screenLinkPageAddApi = (params: ScreenAddModel, isUpdate: boolean) 
 };
 /**
+ * 获取主设备列表（exclude子设备）
+ * @param params organizationId
+ */
+export const byOganizationIdGetMasterDevice = (params) => {
+  return defHttp.get({
+    url: ScreenManagerApi.MASTER_GET_DEVICE + '/' + params,
+  });
+};
+
+/**
  * 删除场景联动
  * @param params pageSize page name
  */
@@ -99,13 +110,8 @@ export const getOrganizationAlarmConfig = (params: { organizationId }) => {
 /**
  * 获取设备属性列表
  */
-export const getAttribute = () => {
-  return defHttp.get(
-    {
-      url: ScreenManagerApi.GET_ATTRBUTELIST,
-    },
-    {
-      joinPrefix: false,
-    }
-  );
+export const getAttribute = (orgId, deviceIds) => {
+  return defHttp.get({
+    url: ScreenManagerApi.GET_ATTRBUTELIST + '/' + orgId + '?' + deviceIds,
+  });
 };
--- a/src/store/modules/permission.ts
View file @1eab6b9
+++ b/src/store/modules/permission.ts
View file @1eab6b9
@@ -11,12 +11,11 @@ import projectSetting from '/@/settings/projectSetting';
 import { PermissionModeEnum } from '/@/enums/appEnum';
 import { asyncRoutes } from '/@/router/routes';
 import { ERROR_LOG_ROUTE, PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
-import { filter } from '/@/utils/helper/treeHelper';
-import { getMenuList } from '/@/api/sys/menu';
+import { filter, forEach } from '/@/utils/helper/treeHelper';
+import { getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
 import { getPermCode } from '/@/api/sys/user';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { PageEnum } from '/@/enums/pageEnum';
-import { router as navRouter } from '/@/router';
 import { MENU_LIST, USER_INFO_KEY } from '/@/enums/cacheEnum';
 import { getAuthCache, setAuthCache } from '/@/utils/auth';
 import { createStorage } from '/@/utils/cache/index';
@@ -90,8 +89,48 @@ export const usePermissionStore = defineStore({
       this.lastBuildMenuTime = 0;
     },
     async changePermissionCode() {
+      const filterMenu = (allMenuList, menuIdsList) => {
+        return allMenuList
+          .filter((item) => {
+            return menuIdsList.indexOf(item.id) > -1;
+          })
+          .map((subItem) => {
+            subItem = Object.assign({}, subItem);
+            if (subItem.children) {
+              subItem.children = filterMenu(subItem.children, menuIdsList);
+            }
+            return subItem;
+          });
+      };
+      const userInfo: any = getAuthCache(USER_INFO_KEY);
+      const isSysAdmin = 'SYS_ADMIN';
+      const routeList = (await getMenuList(2)) as AppRouteRecordRaw[];
+      let getSysPermission = [];
+      /**
+       * 否则不是超级管理员-获取对应角色的权限列表
+       */
       const codeList = await getPermCode();
       this.setPermCodeList(codeList);
+      /**
+       * 如果是超级管理员则获取对应权限列表
+       */
+      if (userInfo.roles.includes(isSysAdmin) || userInfo.realName == '超级管理员') {
+        const getMenuIds = await getMenusIdsByRoleId(userInfo.plainRoles[0].roleId);
+        //根据对应的使用者的菜单数组和所有菜单数组对象进行过滤，返回最终需要的菜单
+        const newMenu = filterMenu(routeList, getMenuIds);
+        /**
+         * 递归获取对应所有菜单的权限列表
+         */
+        function lookForAllId(data = [], arr = []) {
+          for (const item of data) {
+            arr.push(item.permission);
+            if (item.children && item.children.length) lookForAllId(item.children, arr);
+          }
+          return arr;
+        }
+        getSysPermission = lookForAllId(newMenu);
+        this.setPermCodeList(getSysPermission);
+      }
     },
     async buildRoutesAction(): Promise<AppRouteRecordRaw[]> {
       const { t } = useI18n();
@@ -183,70 +222,87 @@ export const usePermissionStore = defineStore({
           // !Simulate to obtain permission codes from the background,
           // this function may only need to be executed once, and the actual project can be put at the right time by itself
           let routeList: AppRouteRecordRaw[] = [];
-          try {
-            const userInfo = getAuthCache(USER_INFO_KEY);
-            if (userInfo?.needSetPwd == true) {
-              routeList = [
-                {
-                  name: 'routes.common.system.system',
-                  parentId: '',
-                  children: [
-                    {
-                      id: 'a8ffa8c5-637e-476b-a9e6-b60cebe95718',
-                      createTime: '2021-09-10 20:50:55',
-                      updateTime: '2021-11-16 18:58:24',
-                      name: 'routes.common.system.modifyPassword',
-                      parentId: 'a8ffa8c5-637e-471b-a9e6-b60cebe95713',
-                      children: [],
-                      path: '/system/changePassword',
-                      type: 'SYSADMIN',
-                      permission: 'system:password:view',
-                      sort: 6,
-                      component: '/system/changePassword/index',
-                      meta: {
-                        icon: 'bx:bx-home',
-                        title: 'routes.common.system.modifyPassword',
-                        menuType: '1',
-                        ignoreKeepAlive: true,
-                        hideMenu: false,
-                        status: '0',
-                      },
-                      redirect: '',
+          const userInfo: any = getAuthCache(USER_INFO_KEY);
+          const filterMenu = (allMenuList, menuIdsList) => {
+            return allMenuList
+              .filter((item) => {
+                return menuIdsList.indexOf(item.id) > -1;
+              })
+              .map((subItem) => {
+                subItem = Object.assign({}, subItem);
+                if (subItem.children) {
+                  subItem.children = filterMenu(subItem.children, menuIdsList);
+                }
+                return subItem;
+              });
+          };
+          if (userInfo?.needSetPwd == true) {
+            routeList = [
+              {
+                name: 'routes.common.system.system',
+                parentId: '',
+                children: [
+                  {
+                    id: 'a8ffa8c5-637e-476b-a9e6-b60cebe95718',
+                    createTime: '2021-09-10 20:50:55',
+                    updateTime: '2021-11-16 18:58:24',
+                    name: 'routes.common.system.modifyPassword',
+                    parentId: 'a8ffa8c5-637e-471b-a9e6-b60cebe95713',
+                    children: [],
+                    path: '/system/changePassword',
+                    type: 'SYSADMIN',
+                    permission: 'system:password:view',
+                    sort: 6,
+                    component: '/system/changePassword/index',
+                    meta: {
+                      icon: 'bx:bx-home',
+                      title: 'routes.common.system.modifyPassword',
+                      menuType: '1',
+                      ignoreKeepAlive: true,
+                      hideMenu: false,
+                      status: '0',
                     },
-                  ],
-                  path: '/system',
-                  type: 'SYSADMIN',
-                  permission: '',
-                  sort: 6,
-                  component: 'LAYOUT',
-                  meta: {
-                    icon: 'bx:bx-home',
-                    title: 'routes.common.system.system',
-                    status: '0',
-                    menuType: '0',
+                    redirect: '',
                   },
-                  redirect: '/system/systemManagement',
+                ],
+                path: '/system',
+                type: 'SYSADMIN',
+                permission: '',
+                sort: 6,
+                component: 'LAYOUT',
+                meta: {
+                  icon: 'bx:bx-home',
+                  title: 'routes.common.system.system',
+                  status: '0',
+                  menuType: '0',
                 },
-              ] as AppRouteRecordRaw[];
-            } else {
-              this.changePermissionCode();
-              routeList = (await getMenuList(1)) as AppRouteRecordRaw[];
-              createStorage('MENU_LIST', JSON.stringify(routeList));
-              setAuthCache('MENU_LIST', routeList);
+                redirect: '/system/systemManagement',
+              },
+            ] as AppRouteRecordRaw[];
+          } else {
+            this.changePermissionCode();
+            routeList = (await getMenuList(1)) as AppRouteRecordRaw[];
+            const isSysAdmin = 'SYS_ADMIN';
+            /**
+             * 解决超级管理员分配菜单权限问题
+             */
+            if (userInfo.roles.includes(isSysAdmin) || userInfo.realName == '超级管理员') {
+              const getMenuIds = await getMenusIdsByRoleId(userInfo.plainRoles[0].roleId);
+              //根据对应的使用者的菜单数组和所有菜单数组对象进行过滤，返回最终需要的菜单
+              const newMenu = filterMenu(routeList, getMenuIds);
+              routeList = newMenu;
             }
-          } catch (error) {
-            console.error(error);
-          } // Dynamically introduce components
+            createStorage('MENU_LIST', JSON.stringify(routeList));
+            setAuthCache('MENU_LIST', routeList);
+          }
+          // Dynamically introduce components
           routeList = transformObjToRoute(routeList);
-
           //  Background routing to menu structure
           const backMenuList = transformRouteToMenu(routeList);
           this.setBackMenuList(backMenuList);
-
           // remove meta.ignoreRoute item
           routeList = filter(routeList, routeRemoveIgnoreFilter);
           routeList = routeList.filter(routeRemoveIgnoreFilter);
-
           routeList = flatMultiLevelRoutes(routeList);
           routes = [PAGE_NOT_FOUND_ROUTE, ...routeList];
           break;
--- a/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @1eab6b9
+++ b/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @1eab6b9
@@ -21,6 +21,7 @@
               class="mt-4"
               title="触发器"
               :index="index"
+              :provideOrgid="provideOrgid"
               :ref="skipUnwrap.triggerItemRefs"
               @delete="deleteTriggerOrCondition"
             />
@@ -42,6 +43,7 @@
               class="mt-4"
               title="执行条件"
               :index="index"
+              :provideOrgid="provideOrgid"
               :ref="skipUnwrap.conditionItemRefs"
               @delete="deleteTriggerOrCondition"
             />
@@ -94,8 +96,10 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import {
     screenLinkPageAddApi,
-    screenLinkPageByDeptIdGetDevice,
+    // screenLinkPageByDeptIdGetDevice,
     getOrganizationAlarmConfig,
+    byOganizationIdGetMasterDevice,
+    getAttribute,
   } from '/@/api/ruleengine/ruleengineApi';
   import TriggerOrCondition from './cpns/Trigger-Condition.vue';
   import Action from './cpns/Action.vue';
@@ -104,6 +108,7 @@
   const emit = defineEmits(['register', 'success']);
+  const provideOrgid = ref('');
   const { createMessage } = useMessage();
   const triggerData = ref([]);
   const conditionData = ref([]);
@@ -120,6 +125,7 @@
   let getConditionFormValue = ref([]);
   let getActionFormValue = ref([]);
   const editEntryIdData = ref([]);
+  let editAttrIdData = [];
   const editAlarmConfigData = ref([]);
   const isUpdate = ref(false);
   const id = ref(undefined);
@@ -151,21 +157,25 @@
       await setFieldsValue(data.record);
       id.value = recordId;
       tenantId.value = recordTenantId;
+      provideOrgid.value = organizationId;
       // 获取当前组织下的设备列表
-      const options = await screenLinkPageByDeptIdGetDevice({
-        organizationId,
-      });
+      const options = await byOganizationIdGetMasterDevice(organizationId);
       // 获取当前组织下的告警配置
       const alarmConfig = await getOrganizationAlarmConfig({ organizationId });
+      // 获取当前组织下的属性列表
+      const attrList = await getAttribute(
+        organizationId,
+        triggers.map((m) => m.entityId).join(',')
+      );
       // 生成回显时对应得组件数量
       triggerData.value = [...new Array(triggers.length).keys()];
       conditionData.value = [...new Array(doConditions.length).keys()];
       actionData.value = [...new Array(doActions.length).keys()];
       // 回显设备列表
-      editEntryIdData.value = options.items.map((item) => {
+      editEntryIdData.value = options.map((item) => {
         return {
-          value: item.tbDeviceId,
+          value: item.id,
           label: item.name,
         };
       });
@@ -176,11 +186,15 @@
         };
       });
       deviceList.value = editEntryIdData.value;
+      //回显属性列表
+      editAttrIdData = attrList;
       nextTick(() => {
         setEditFields(skipUnwrap.triggerItemRefs, editEntryIdData);
         setEditFields(skipUnwrap.conditionItemRefs, editEntryIdData);
         setEditFields(skipUnwrap.actionItemRefs, editEntryIdData);
         setEditAlarmConfig(skipUnwrap.actionItemRefs, editAlarmConfigData);
+        setEditAttr(skipUnwrap.triggerItemRefs, editAttrIdData);
+        setEditAttr(skipUnwrap.conditionItemRefs, editAttrIdData);
       });
       const map = {
@@ -198,12 +212,15 @@
           unref(skipUnwrap.triggerItemRefs)[index].isUpdate = true;
           unref(skipUnwrap.triggerItemRefs)[index].alarmScheduleRef.scheduleData =
             trigger.triggerCondition.schedule;
+          const getAttrKeyOption = trigger?.triggerCondition?.condition?.condition.map(
+            (m) => m.key.key
+          );
           unref(skipUnwrap.triggerItemRefs)[index].setFieldsFormValueFun({
             triggered: trigger?.triggerCondition?.condition?.spec?.type,
             device: trigger?.entityType,
             triggerType: trigger?.triggerType,
             type1: trigger?.triggerCondition?.condition?.condition[0]?.key?.type,
-            type2: trigger?.triggerCondition?.condition?.condition[0]?.key?.key,
+            type2: getAttrKeyOption,
             operationType: trigger?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: trigger?.triggerCondition?.alarmDetails,
             entityId: trigger?.entityId,
@@ -270,12 +287,15 @@
           unref(skipUnwrap.conditionItemRefs)[index].isUpdate = true;
           unref(skipUnwrap.conditionItemRefs)[index].alarmScheduleRef.scheduleData =
             condition.triggerCondition.schedule;
+          const getAttrKeyOption = condition?.triggerCondition?.condition?.condition.map(
+            (m) => m.key.key
+          );
           unref(skipUnwrap.conditionItemRefs)[index].setFieldsFormValueFun({
             triggered: condition?.triggerCondition?.condition?.spec?.type,
             device: condition?.entityType,
             triggerType: condition?.triggerType,
             type1: condition?.triggerCondition?.condition?.condition[0]?.key?.type,
-            type2: condition?.triggerCondition?.condition?.condition[0]?.key?.key,
+            type2: getAttrKeyOption,
             operationType: condition?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: condition?.triggerCondition?.alarmDetails,
             entityId: condition?.entityId,
@@ -471,17 +491,26 @@
       item.updateEditFieldAlarmConfig(alarmConfigList);
     });
   };
+  //设置设备属性的options
+  const setEditAttr = (linkAge, attrList) => {
+    unref(linkAge).map((item) => {
+      item.updateFieldAttr(attrList);
+    });
+  };
+
   // 监听组织变化更新设备列表
   const deviceList = ref([]);
   const alarmConfigList = ref([]);
+  let watchAttrList = [];
   watch(organizationId, async (newValue: string) => {
     if (!newValue) return;
-    const { items } = await screenLinkPageByDeptIdGetDevice({ organizationId: newValue });
-    deviceList.value = items.map((item) => ({ label: item.name, value: item.tbDeviceId }));
+    provideOrgid.value = newValue;
+    const items = await byOganizationIdGetMasterDevice(newValue);
+    deviceList.value = items.map((item) => ({ label: item.name, value: item.id }));
+    watchAttrList = await getAttribute(newValue, null);
     setFields(skipUnwrap.triggerItemRefs, true);
     setFields(skipUnwrap.conditionItemRefs, true);
     setFields(skipUnwrap.actionItemRefs, true);
-
     const data = await getOrganizationAlarmConfig({ organizationId: newValue });
     alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id }));
     setAlarmConfig(skipUnwrap.actionItemRefs, true);
@@ -492,6 +521,7 @@
     unref(linkAge).map((item) => {
       isOrganizationChange && item.resetFieldsValueFunc();
       item.updateFieldDeviceId(deviceList);
+      item.updateFieldAttr(watchAttrList);
     });
   }
   function setAlarmConfig(linkAge, isOrganizationChange = false) {
@@ -602,3 +632,10 @@
     });
   };
 </script>
+
+<style lang="less" scoped>
+  ///统一下拉选择框宽度,否则超出默认宽度会造成页面样式错乱
+  :deep(.ant-select-selector) {
+    max-width: 14.2rem;
+  }
+</style>
--- a/src/views/rule/linkedge/config/config.data.ts
View file @1eab6b9
+++ b/src/views/rule/linkedge/config/config.data.ts
View file @1eab6b9
@@ -257,7 +257,7 @@ export const trigger_condition_schema: FormSchema[] = [
   {
     field: 'type2',
     label: '',
-    component: 'AutoComplete',
+    component: 'Select',
     componentProps: {
       placeholder: '请选择属性',
     },
--- a/src/views/rule/linkedge/cpns/Trigger-Condition.vue
View file @1eab6b9
+++ b/src/views/rule/linkedge/cpns/Trigger-Condition.vue
View file @1eab6b9
@@ -69,7 +69,7 @@
   import AlarmSchedule from './AlarmSchedule.vue';
   import { useModal } from '/@/components/Modal';
-  defineProps({
+  const props = defineProps({
     title: {
       type: String,
       required: true,
@@ -78,6 +78,10 @@
       type: Number,
       required: true,
     },
+    provideOrgid: {
+      type: String,
+      default: '',
+    },
   });
   const emit = defineEmits(['delete']);
   const isUpdate = ref(false);
@@ -101,19 +105,35 @@
         options: deviceList,
         onChange(e) {
           if (e) {
-            updateFieldAttributeFunc();
+            updateFieldAttributeFunc(e);
           }
         },
       },
     });
   };
+  const updateFieldAttr = (attrList: any[]) => {
+    const attrMapList = attrList?.map((m) => {
+      return {
+        label: m,
+        value: m,
+      };
+    });
+    updateSchema({
+      field: 'type2',
+      componentProps: {
+        placeholder: '请选择属性',
+        options: attrMapList,
+      },
+    });
+  };
   const resetFieldsValueFunc = () => resetFields();
   // 回显数据函数
   const setFieldsFormValueFun = (fieldsValue) => {
     setFieldsValue(fieldsValue);
   };
-  const updateFieldAttributeFunc = async () => {
-    const data = await getAttribute();
+  const updateFieldAttributeFunc = async (e) => {
+    const joinDeviceIds = e.join(',');
+    const data = await getAttribute(props.provideOrgid, joinDeviceIds);
     const options = data.map((m) => {
       return {
         label: m,
@@ -178,6 +198,7 @@
   defineExpose({
     getFieldsValueFunc,
     updateFieldDeviceId,
+    updateFieldAttr,
     resetFieldsValueFunc,
     setFieldsFormValueFun,
     childGetFieldsValue,