Merge branch 'ft-dev' into 'main'

fix:修复菜单列表多个请求问题

See merge request huang/yun-teng-iot-front!49

@@ -15,7 +15,7 @@ enum ScreenManagerApi {
   SCREEN_ADD_URL = '/sceneLinkage',
   SCREEN_DELETE_URL = '/sceneLinkage',
   SCREEN_UPDATE_URL = '/sceneLinkage/update',
-  SCREEN_ORGANIZATION_URL = '/organization/me/organizations',
+  SCREEN_ORGANIZATION_URL = '/organization/me/list',
   SCREEN_CHANGE_STATUS = '/sceneLinkage/updateSceneStatus',
   SCREEN_GET_BY_DEPTID = '/sceneLinkage/device/',
 }

 import type { Router, RouteRecordRaw } from 'vue-router';
-
 import { usePermissionStoreWithOut } from '/@/store/modules/permission';
-
 import { PageEnum } from '/@/enums/pageEnum';
 import { useUserStoreWithOut } from '/@/store/modules/user';
-
 import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
-
 import { RootRoute } from '/@/router/routes';
-
 import { router } from '/@/router';
 import { getMenuList } from '/@/api/sys/menu';
 import { USER_INFO_KEY } from '/@/enums/cacheEnum';
@@ -71,7 +66,10 @@ export function createPermissionGuard(router: Router) {
     }
 
     if (from.path === LOGIN_PATH && userInfo.value?.needSetPwd == false) {
-      const getMenuListData = await getMenuList();
+      const getMenuListData1 =
+        window.localStorage.getItem('menuListStorage') || (await getMenuList());
+      const getMenuListData = JSON.parse(getMenuListData1);
+      // const getMenuListData = await getMenuList();
       const getHomePage = getMenuListData.find((f) => {
         return f.path == '/dashboard/workbench';
       });
@@ -85,72 +83,19 @@ export function createPermissionGuard(router: Router) {
           router.push(routeF);
         }, 200);
       }
-      // setTimeout(() => {
-      //   console.log('无需修改密码，跳到首页');
-      //   router.push('/dashboard/workbench');
-      // }, 200);
     }
 
     if (from.path === LOGIN_PATH && userInfo.value?.needSetPwd == true) {
-      // console.log('需要修改密码，跳到修改密码');
       setTimeout(() => {
         router.push('/system/password');
       }, 200);
     }
 
-    // if (from.path === LOGIN_PATH) {
-    //   const getMenuListData = await getMenuList();
-    //   // getMenuList().then((res) => {
-    //   if (getMenuListData) {
-    //     const getHomePage = getMenuListData.map((f) => {
-    //       if (f?.children) {
-    //         const getFilterPath = f.children.filter((f1) => {
-    //           return f1.path == '/system/password';
-    //         });
-    //         return getFilterPath;
-    //       }
-    //     });
-    //     console.log(getHomePage?.at(-1)[0]?.path);
-    //     // getHomePage?.at(-1)[0]?.path == '/system/password'
-    //     if (userInfo.value?.needSetPwd == false) {
-    //       setTimeout(() => {
-    //         router.push('/dashboard/workbench');
-    //       }, 10);
-    //     }
-    //     if (userInfo.value?.needSetPwd == true && getHomePage?.at(-1)[0]?.path == undefined) {
-    //       setTimeout(() => {
-    //         router.push('/system/password');
-    //       }, 10);
-    //     }
-    //   }
-    //   // });
-    // }
-
     if (
       from.path === LOGIN_PATH &&
       to.name === PAGE_NOT_FOUND_ROUTE.name &&
       to.fullPath !== (userStore.getUserInfo.homePath || PageEnum.BASE_HOME)
     ) {
-      // console.log('404页面', 'res');
-      // Jump to the 404 page after processing the login
-      const getMenuListData = await getMenuList();
-      // getMenuList().then((res) => {
-      if (getMenuListData) {
-        const getHomePage = getMenuListData.find((f) => {
-          return f.path == '/dashboard/workbench';
-        });
-        if (getHomePage?.path == '/dashboard/workbench') {
-          setTimeout(() => {
-            router.push('/dashboard/workbench');
-          }, 10);
-        } else {
-          const routeF = res[0]?.children[0]?.path || res[0].path;
-          setTimeout(() => {
-            router.push(routeF);
-          }, 10);
-        }
-      }
-      // });
       next(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
       return;
     }

@@ -19,6 +19,8 @@ import { PageEnum } from '/@/enums/pageEnum';
 import { router as navRouter } from '/@/router';
 import { USER_INFO_KEY } from '/@/enums/cacheEnum';
 import { getAuthCache } from '/@/utils/auth';
+import { createStorage } from '/@/utils/cache/index';
+
 interface PermissionState {
   // Permission code list
   permCodeList: string[] | number[];
@@ -228,6 +230,8 @@ export const usePermissionStore = defineStore({
             } else {
               this.changePermissionCode();
               routeList = (await getMenuList()) as AppRouteRecordRaw[];
+              // createStorage('menuListCache', JSON.stringify(routeList));
+              window.localStorage.setItem('menuListStorage', JSON.stringify(routeList));
             }
           } catch (error) {
             console.error(error);

@@ -87,20 +87,20 @@
         isUpdate.value = !!data?.isUpdate;
         if (!unref(isUpdate)) {
           current.value = 0;
-          switch (current.value) {
-            case 0:
-              proxy.$refs.DeviceProfileStep1Ref.customResetFunc();
-              break;
-            case 1:
-              proxy.$refs.DeviceProfileStep2Ref.customResetAndFunc();
-              break;
-            case 2:
-            // proxy.$refs.DeviceProfileStep3Ref.customResetFunc();
-            // break;
-            case 3:
-              proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
-              break;
-          }
+          // switch (current.value) {
+          //   case 0:
+          //     proxy.$refs.DeviceProfileStep1Ref.customResetFunc();
+          //     break;
+          //   case 1:
+          //     proxy.$refs.DeviceProfileStep2Ref.customResetAndFunc();
+          //     break;
+          //   case 2:
+          //   // proxy.$refs.DeviceProfileStep3Ref.customResetFunc();
+          //   // break;
+          //   case 3:
+          //     proxy.$refs.DeviceProfileStep4Ref.customResetAndFunc();
+          //     break;
+          // }
         }
         if (unref(isUpdate)) {
           current.value = 0;

@@ -34,7 +34,12 @@
       </BasicTable>
     </CollapseContainer>
     <CollapseContainer title="筛选器预览" class="border mb-8">
-      <BasicTable :resizeHeightOffset="200" :columns="columnsView" :dataSource="detailData" />
+      <BasicTable
+        :resizeHeightOffset="200"
+        :columns="columnsView"
+        :dataSource="detailData"
+        :pagination="false"
+      />
     </CollapseContainer>
     <BasicForm :showResetButton="false" :showSubmitButton="false" @register="registerForm" />
   </BasicModal>
@@ -81,6 +86,7 @@
         columns,
         bordered: true,
         showIndexColumn: false,
+        pagination: false,
         actionColumn: {
           width: 180,
           title: '操作',

@@ -22,21 +22,19 @@ export const step1Schemas: FormSchema[] = [
     label: '请选择规则链',
     component: 'ApiSelect',
     componentProps: {
-      // api: async () => {
-      //   const data = await deviceConfigGetRuleChain();
-      //   const returnData = data.map((m) => {
-      //     return {
-      //       labelField: m.name,
-      //       valueField: m.id.id,
-      //     };
-      //   });
-      //   console.log(returnData);
-      //   return returnData;
-      // },
-      api: deviceConfigGetRuleChain,
-      labelField: 'name',
-      valueField: '',
-      // resultField: '',
+      api: async () => {
+        const data = await deviceConfigGetRuleChain();
+        const returnData = data.map((m) => {
+          return {
+            getValueField: m.name,
+            getKeyField: m.id.id,
+          };
+        });
+        return returnData;
+      },
+      labelField: 'getValueField',
+      valueField: 'getKeyField',
+      immediate: true,
     },
   },
   // {

+{
+  "name": "设备测试3",
+  "defaultRuleChainId": "354c7210-5d97-11ec-8ac9-f38ed935ea2a",
+  "description": "设备测试3",
+  "transportType": "CoAP",
+  "profileData": {
+    "alarms": [
+      {
+        "alarmType": "设备测试3",
+        "propagate": true,
+        "propagateRelationTypes": [
+          "设备测试3"
+        ],
+        "createRules": {
+          "MAJOR": {
+            "alarmDetails": "设备测试3",
+            "schedule": {
+              "type": "ANY_TIME"
+            },
+            "condition": {
+              "condition": [
+                {
+                  "key": {
+                    "type": "TIME_SERIES",
+                    "key": "CO2"
+                  },
+                  "valueType": "COMPLEX",
+                  "predicate": {
+                    "operation": "LESS_OR_EQUAL",
+                    "value": {
+                      "defaultValue": 2
+                    },
+                    "type": "COMPLEX"
+                  }
+                }
+              ],
+              "spec": {
+                "type": "DURATION"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  "alarmProfile": {
+    "alarmContactId": "a3004ddd-db8f-487c-aea0-4f6f3efc59a9",
+    "messageMode": "PHONE_MESSAGE"
+  }
+}

@@ -91,6 +91,7 @@
       function getAllFields(getV) {
         const values = getFieldsValue();
         getValueData.value = values;
+        console.log(getValueData.value);
         getV = getValueData.value;
         return getV;
       }

@@ -167,12 +167,26 @@ export const formSchema: FormSchema[] = [
           if (v == undefined) {
             formModel.deviceId = undefined;
             const { updateSchema } = formActionType;
-            updateSchema({
-              field: 'deviceId',
-              componentProps: {
-                options: undefined,
+            updateSchema(
+              {
+                field: 'deviceId',
+                componentProps: {
+                  options: undefined,
+                },
               },
-            });
+              {
+                field: 'deviceId1',
+                componentProps: {
+                  options: undefined,
+                },
+              },
+              {
+                field: 'deviceId2',
+                componentProps: {
+                  options: undefined,
+                },
+              }
+            );
           } else {
             getData.value = v;
           }

@@ -88,6 +88,7 @@
           triggersArray.push(getTriggerChildValues);
           doConditionsArray.push(getconditionChildValues);
           getValuesFormData = getFieldsValue();
+          console.log('触发器',triggersArray)
           Object.assign(getAllFormData, getValuesFormData);
           getAllFormData.triggers = triggersArray;
           getAllFormData.doConditions = doConditionsArray;