fix: bug#11373

src/views/init-home/Basic/index.vue

@@ -257,21 +257,7 @@ import { getImage } from '@/utils/comm.ts';
 import { Form, message } from 'jetlinks-ui-components';
 import { FILE_UPLOAD } from '@/api/comm';
 import {
-    getSystemPermission,
     save,
-    addRole,
-    getRoleMenu,
-    updateRoleMenu,
-    getResourcesCurrent,
-    saveNetwork,
-    saveProtocol,
-    getProtocol,
-    saveAccessConfig,
-    saveProduct,
-    saveDevice,
-    changeDeploy,
-    deployDevice,
-    saveInit,
 } from '@/api/initHome';
 import { LocalStore } from '@/utils/comm';
 import { TOKEN_KEY } from '@/utils/variable';

src/views/init-home/Role/index.vue

@@ -104,48 +104,99 @@ const addRoleData = async () => {
             return resolve(true);
         }
         let Count = 0;
-        keys.value.forEach(async (item, index) => {
+        let allPromise = [];
-            const _itemData = RoleData[item];
+        allPromise = keys.value.map(async (item, index) => {
-            // 添加该角色
+            return await saveRoleData(item);
-            const res = await addRole(_itemData);
+            // const _itemData = RoleData[item];
-            if (res.status === 200) {
+            // // 添加该角色
-                const menuTree = await getRoleMenu(res.result.id);
+            // const res = await addRole(_itemData);
-                if (menuTree.status === 200) {
+            // if (res.status === 200) {
-                    const _roleData = (RoleMenuData[item] as []).filter(
+            //     const menuTree = await getRoleMenu(res.result.id);
-                        (roleItem: any) => {
+            //     if (menuTree.status === 200) {
-                            const _menu = findMenuByRole(
+            //         const _roleData = (RoleMenuData[item] as []).filter(
-                                menuTree.result,
+            //             (roleItem: any) => {
-                                roleItem.code,
+            //                 const _menu = findMenuByRole(
-                            );
+            //                     menuTree.result,
-                            if (_menu) {
+            //                     roleItem.code,
-                                roleItem.id = _menu.id;
+            //                 );
-                                roleItem.parentId = _menu.parentId;
+            //                 if (_menu) {
-                                roleItem.createTime = _menu.createTime;
+            //                     roleItem.id = _menu.id;
-                                return true;
+            //                     roleItem.parentId = _menu.parentId;
-                            }
+            //                     roleItem.createTime = _menu.createTime;
-                            return false;
+            //                     return true;
-                        },
+            //                 }
-                    );
+            //                 return false;
-                    //更新权限
+            //             },
-                    const roleRes = await updateRoleMenu(res.result.id, {
+            //         );
-                        menus: _roleData,
+            //         //更新权限
-                    });
+            //         const roleRes = await updateRoleMenu(res.result.id, {
-                    if (roleRes.status === 200) {
+            //             menus: _roleData,
-                        Count += 1;
+            //         });
-                    }
+            //         if (roleRes.status === 200) {
-                    if (index === keys.value.length - 1) {
+            //             // Count += 1;
-                        resolve(Count === keys.value.length);
+            //             resolve(true);
-                    }
+            //         }
-                } else if (index === keys.value.length - 1) {
+            //         // if (index === keys.value.length - 1) {
-                    resolve(Count === keys.value.length);
+            //         //     resolve(Count === keys.value.length);
+            //         // }
+            //     } else if (index === keys.value.length - 1) {
+            //         resolve(Count === keys.value.length);
+            //     }
+            // } else if (index === keys.value.length - 1) {
+            //     resolve(Count === keys.value.length);
+            //     roleData.isSucessRole = 2;
+            // } else {
+            //     resolve(false);
+            // }
+        });
+        Promise.all(allPromise).then((item) => {
+            resolve(
+                item.every((i) => {
+                    return i;
+                }),
+            );
+        });
+    });
+};
+
+const saveRoleData = (item: any) => {
+    return new Promise(async (resolve) => {
+        const _itemData = RoleData[item];
+        // 添加该角色
+        const res = await addRole(_itemData);
+        if (res.status === 200) {
+            const menuTree = await getRoleMenu(res.result.id);
+            if (menuTree.status === 200) {
+                const _roleData = (RoleMenuData[item] as []).filter(
+                    (roleItem: any) => {
+                        const _menu = findMenuByRole(
+                            menuTree.result,
+                            roleItem.code,
+                        );
+                        if (_menu) {
+                            roleItem.id = _menu.id;
+                            roleItem.parentId = _menu.parentId;
+                            roleItem.createTime = _menu.createTime;
+                            return true;
+                        }
+                        return false;
+                    },
+                );
+                //更新权限
+                const roleRes = await updateRoleMenu(res.result.id, {
+                    menus: _roleData,
+                });
+                if (roleRes.status === 200) {
+                    resolve(true);
+                } else {
+                    resolve(false);
                 }
-            } else if (index === keys.value.length - 1) {
+            } else {
-                resolve(Count === keys.value.length);
-                roleData.isSucessRole = 2;
-            }else{
                 resolve(false);
             }
-        });
+        } else {
+            resolve(false);
+        }
     });
 };
 defineExpose({

src/views/init-home/index.vue

@@ -60,12 +60,10 @@
     </div>
 </template>
 <script setup lang="ts">
-import { getImage } from '@/utils/comm.ts';
 import Basic from './Basic/index.vue';
 import Role from './Role/index.vue';
 import Menu from './Menu/index.vue';
 import InitData from './InitData/index.vue';
-import { modalState, formState, logoState } from './data/interface';
 import { getInit, saveInit } from '@/api/initHome';
 import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable';
 import { FILE_UPLOAD } from '@/api/comm';
@@ -110,6 +108,7 @@ const submitData = async () => {
         return;
     }
     const roleRes = await roleRef.value.submitRole();
+    console.log(roleRes);
     if (!roleRes) {
         loading.value = false;
         return;
@@ -140,8 +139,8 @@ const judgeInitSet = async () => {
     }
 };
 onBeforeMount(() => {
-  // judgeInitSet();
+    // judgeInitSet();
-})
+});
 </script>
 <style scoped lang="less">
 .page-container {

vite.config.ts

@@ -92,8 +92,8 @@ export default defineConfig(({ mode}) => {
               [env.VITE_APP_BASE_API]: {
                   // target: 'http://192.168.33.22:8800',
                   // target: 'http://192.168.32.244:8881',
-                  target: 'http://120.77.179.54:8844', // 120测试
+                //   target: 'http://120.77.179.54:8844', // 120测试
-                //   target: 'http://192.168.33.46:8844', // 本地开发环境
+                  target: 'http://192.168.33.46:8844', // 本地开发环境
                   ws: 'ws://192.168.33.46:8844',
                   changeOrigin: true,
                   rewrite: (path) => path.replace(/^\/api/, '')