fix:修好bug

@@ -42,7 +42,7 @@ export const getAccountList = (params: AccountParams) =>
  */
 export const getOrganizationList = (params?: OrganizationListItem) =>
   defHttp.get<OrganizationListGetResultModel>({
-    url: Api.BaseOrganization + '/me/organizations',
+    url: Api.BaseOrganization + '/me/list',
     params,
   });
 

+// import { getMenuList } from '/@/api/sys/menu';
+// import { reactive } from 'vue';
+
+// const isDolang = reactive({
+//   key: 1,
+//   value: '',
+// });
+// //这里判断是否含有首页
+// async function doMenu() {
+//   const routeList = await getMenuList();
+//   const getHomePage = routeList.find((f) => {
+//     return f.path == '/dashboard';
+//   });
+//   if (getHomePage?.path == '/dashboard') {
+//     // router.push('/dashboard');
+//   } else {
+//     const route = routeList[0].path + '';
+//     isDolang.key = 1;
+//     isDolang.value = route;
+//     return isDolang;
+//     // router.push(route);
+//   }
+// }
+
+// setTimeout(() => {
+//   doMenu();
+// }, 1000);
+
+// console.log(isDolang.value);
+// console.log(typeof isDolang.value);
+
+// setTimeout(() => {
+//   console.log(isDolang);
+// }, 1500);
+
 export enum PageEnum {
   // basic login path
   BASE_LOGIN = '/login',
   // basic home path
-  BASE_HOME = '/dashboard',
+  BASE_HOME = '/system/account',
+  // BASE_HOME = '/dashboard',
   // error page path
   ERROR_PAGE = '/exception',
   // error log page path

-import type { AppRouteModule } from '/@/router/types';
+// import type { AppRouteModule } from '/@/router/types';
 
-import { LAYOUT } from '/@/router/constant';
-import { t } from '/@/hooks/web/useI18n';
+// import { LAYOUT } from '/@/router/constant';
+// import { t } from '/@/hooks/web/useI18n';
 
-const dashboard: AppRouteModule = {
-  path: '/dashboard',
-  name: 'Dashboard',
-  component: LAYOUT,
-  redirect: '/dashboard/analysis',
-  meta: {
-    orderNo: 10,
-    icon: 'ion:grid-outline',
-    title: t('routes.dashboard.dashboard'),
-  },
-  children: [
-    {
-      path: 'analysis',
-      name: 'Analysis',
-      component: () => import('/@/views/dashboard/analysis/index.vue'),
-      meta: {
-        // affix: true,
-        title: t('routes.dashboard.analysis'),
-      },
-    },
-    {
-      path: 'workbench',
-      name: 'Workbench',
-      component: () => import('/@/views/dashboard/workbench/index.vue'),
-      meta: {
-        title: t('routes.dashboard.workbench'),
-      },
-    },
-  ],
-};
+// const dashboard: AppRouteModule = {
+//   path: '/dashboard',
+//   name: 'Dashboard',
+//   component: LAYOUT,
+//   redirect: '/dashboard/analysis',
+//   meta: {
+//     orderNo: 10,
+//     icon: 'ion:grid-outline',
+//     title: t('routes.dashboard.dashboard'),
+//   },
+//   children: [
+//     {
+//       path: 'analysis',
+//       name: 'Analysis',
+//       component: () => import('/@/views/dashboard/analysis/index.vue'),
+//       meta: {
+//         // affix: true,
+//         title: t('routes.dashboard.analysis'),
+//       },
+//     },
+//     {
+//       path: 'workbench',
+//       name: 'Workbench',
+//       component: () => import('/@/views/dashboard/workbench/index.vue'),
+//       meta: {
+//         title: t('routes.dashboard.workbench'),
+//       },
+//     },
+//   ],
+// };
 
-export default dashboard;
+// export default dashboard;

@@ -96,7 +96,7 @@ export const useMultipleTabStore = defineStore({
       const len = this.tabList.length;
       const { path } = unref(router.currentRoute);
 
-      let toPath: PageEnum | string = PageEnum.BASE_HOME;
+      let toPath: PageEnum | string = BASE_HOME;
 
       if (len > 0) {
         const page = this.tabList[len - 1];

 import type { AppRouteRecordRaw, Menu } from '/@/router/types';
-
 import { defineStore } from 'pinia';
 import { store } from '/@/store';
 import { useI18n } from '/@/hooks/web/useI18n';
@@ -8,22 +7,16 @@ import { useAppStoreWithOut } from './app';
 import { toRaw } from 'vue';
 import { transformObjToRoute, flatMultiLevelRoutes } from '/@/router/helper/routeHelper';
 import { transformRouteToMenu } from '/@/router/helper/menuHelper';
-
 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 { getPermCode } from '/@/api/sys/user';
-
 import { useMessage } from '/@/hooks/web/useMessage';
 import { PageEnum } from '/@/enums/pageEnum';
-
+import { router } from '/@/router';
 interface PermissionState {
   // Permission code list
   permCodeList: string[] | number[];
@@ -177,7 +170,7 @@ export const usePermissionStore = defineStore({
 
           createMessage.loading({
             content: t('sys.app.menuLoading'),
-            duration: 1,
+            duration: 0.5,
           });
 
           // !Simulate to obtain permission codes from the background,
@@ -186,6 +179,16 @@ export const usePermissionStore = defineStore({
           try {
             this.changePermissionCode();
             routeList = (await getMenuList()) as AppRouteRecordRaw[];
+            //这里判断是否含有首页
+            const getHomePage = routeList.find((f) => {
+              return f.path == '/dashboard';
+            });
+            if (getHomePage?.path == '/dashboard') {
+              router.push('/dashboard');
+            } else {
+              const route = routeList[0].path + '';
+              router.push(route);
+            }
           } catch (error) {
             console.error(error);
           } // Dynamically introduce components
@@ -203,7 +206,7 @@ export const usePermissionStore = defineStore({
           routes = [PAGE_NOT_FOUND_ROUTE, ...routeList];
           break;
       }
-
+      console.log('错误页');
       routes.push(ERROR_LOG_ROUTE);
       patchHomeAffix(routes);
       return routes;

@@ -26,14 +26,7 @@ import { router } from '/@/router';
 const globSetting = useGlobSetting();
 const urlPrefix = globSetting.urlPrefix;
 const { createMessage, createErrorModal } = useMessage();
-
 const getJwtTokenInfo = getAuthCache(REFRESH_TOKEN_KEY);
-const getRefreshTokenInfo = getAuthCache(JWT_TOKEN_KEY);
-// console.log(getJwtTokenInfo);
-// console.log(getRefreshTokenInfo);
-const getRefreshTokenInfo1 = getAuthCache(PROJ_CFG_KEY);
-
-// console.log(getRefreshTokenInfo1);
 
 /**
  * @description: 数据处理，方便区分多种处理方式

-import { BasicColumn } from '/@/components/Table';
-import { FormSchema } from '/@/components/Table';
+import { BasicColumn, FormSchema } from '/@/components/Table';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
+
 // 表格列数据
 export const columns: BasicColumn[] = [
   {

@@ -67,6 +67,7 @@
       const [registerTable, { reload }] = useTable({
         api: getAlarmContact,
         columns,
+        clickToRowSelect: false,
         formConfig: {
           labelWidth: 120,
           schemas: searchFormSchema,

-<template>
-  <Card title="最新动态" v-bind="$attrs">
-    <template #extra>
-      <a-button type="link" size="small">更多</a-button>
-    </template>
-    <List item-layout="horizontal" :data-source="dynamicInfoItems">
-      <template #renderItem="{ item }">
-        <ListItem>
-          <ListItemMeta>
-            <template #description>
-              {{ item.date }}
-            </template>
-            <!-- eslint-disable-next-line -->
-            <template #title> {{ item.name }} <span v-html="item.desc"> </span> </template>
-            <template #avatar>
-              <Icon :icon="item.avatar" :size="30" />
-            </template>
-          </ListItemMeta>
-        </ListItem>
-      </template>
-    </List>
-  </Card>
-</template>
-<script lang="ts" setup>
-  import { Card, List } from 'ant-design-vue';
-  import { dynamicInfoItems } from './data';
-  import { Icon } from '/@/components/Icon';
-
-  const ListItem = List.Item;
-  const ListItemMeta = List.Item.Meta;
-</script>

-<template>
-  <Card title="项目" v-bind="$attrs">
-    <template #extra>
-      <a-button type="link" size="small">更多</a-button>
-    </template>
-
-    <template v-for="item in items" :key="item">
-      <CardGrid class="!md:w-1/3 !w-full">
-        <span class="flex">
-          <Icon :icon="item.icon" :color="item.color" size="30" />
-          <span class="text-lg ml-4">{{ item.title }}</span>
-        </span>
-        <div class="flex mt-2 h-10 text-secondary"> {{ item.desc }} </div>
-        <div class="flex justify-between text-secondary">
-          <span>{{ item.group }}</span>
-          <span>{{ item.date }}</span>
-        </div>
-      </CardGrid>
-    </template>
-  </Card>
-</template>
-<script lang="ts">
-  import { defineComponent } from 'vue';
-  import { Card } from 'ant-design-vue';
-  import { Icon } from '/@/components/Icon';
-  import { groupItems } from './data';
-
-  export default defineComponent({
-    components: { Card, CardGrid: Card.Grid, Icon },
-    setup() {
-      return { items: groupItems };
-    },
-  });
-</script>

-<template>
-  <Card title="快捷导航" v-bind="$attrs">
-    <template v-for="item in navItems" :key="item">
-      <CardGrid>
-        <span class="flex flex-col items-center">
-          <Icon :icon="item.icon" :color="item.color" size="20" />
-          <span class="text-md mt-2">{{ item.title }}</span>
-        </span>
-      </CardGrid>
-    </template>
-  </Card>
-</template>
-<script lang="ts" setup>
-  import { Card } from 'ant-design-vue';
-  import { navItems } from './data';
-  import { Icon } from '/@/components/Icon';
-
-  const CardGrid = Card.Grid;
-</script>

-<template>
-  <Card title="销售统计" :loading="loading">
-    <div ref="chartRef" :style="{ width, height }"></div>
-  </Card>
-</template>
-<script lang="ts" setup>
-  import { Ref, ref, watch } from 'vue';
-  import { Card } from 'ant-design-vue';
-  import { useECharts } from '/@/hooks/web/useECharts';
-
-  const props = defineProps({
-    loading: Boolean,
-    width: {
-      type: String as PropType<string>,
-      default: '100%',
-    },
-    height: {
-      type: String as PropType<string>,
-      default: '400px',
-    },
-  });
-
-  const chartRef = ref<HTMLDivElement | null>(null);
-  const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
-  watch(
-    () => props.loading,
-    () => {
-      if (props.loading) {
-        return;
-      }
-      setOptions({
-        legend: {
-          bottom: 0,
-          data: ['Visits', 'Sales'],
-        },
-        tooltip: {},
-        radar: {
-          radius: '60%',
-          splitNumber: 8,
-          indicator: [
-            {
-              text: '2017',
-              max: 100,
-            },
-            {
-              text: '2017',
-              max: 100,
-            },
-            {
-              text: '2018',
-              max: 100,
-            },
-            {
-              text: '2019',
-              max: 100,
-            },
-            {
-              text: '2020',
-              max: 100,
-            },
-            {
-              text: '2021',
-              max: 100,
-            },
-          ],
-        },
-        series: [
-          {
-            type: 'radar',
-            symbolSize: 0,
-            areaStyle: {
-              shadowBlur: 0,
-              shadowColor: 'rgba(0,0,0,.2)',
-              shadowOffsetX: 0,
-              shadowOffsetY: 10,
-              opacity: 1,
-            },
-            data: [
-              {
-                value: [90, 50, 86, 40, 50, 20],
-                name: 'Visits',
-                itemStyle: {
-                  color: '#b6a2de',
-                },
-              },
-              {
-                value: [70, 75, 70, 76, 20, 85],
-                name: 'Sales',
-                itemStyle: {
-                  color: '#67e0e3',
-                },
-              },
-            ],
-          },
-        ],
-      });
-    },
-    { immediate: true }
-  );
-</script>

-interface GroupItem {
-  title: string;
-  icon: string;
-  color: string;
-  desc: string;
-  date: string;
-  group: string;
-}
-
-interface NavItem {
-  title: string;
-  icon: string;
-  color: string;
-}
-
-interface DynamicInfoItem {
-  avatar: string;
-  name: string;
-  date: string;
-  desc: string;
-}
-
-export const navItems: NavItem[] = [
-  {
-    title: '首页',
-    icon: 'ion:home-outline',
-    color: '#1fdaca',
-  },
-  {
-    title: '仪表盘',
-    icon: 'ion:grid-outline',
-    color: '#bf0c2c',
-  },
-  {
-    title: '组件',
-    icon: 'ion:layers-outline',
-    color: '#e18525',
-  },
-  {
-    title: '系统管理',
-    icon: 'ion:settings-outline',
-    color: '#3fb27f',
-  },
-  {
-    title: '权限管理',
-    icon: 'ion:key-outline',
-    color: '#4daf1bc9',
-  },
-  {
-    title: '图表',
-    icon: 'ion:bar-chart-outline',
-    color: '#00d8ff',
-  },
-];
-
-export const dynamicInfoItems: DynamicInfoItem[] = [
-  {
-    avatar: 'dynamic-avatar-1|svg',
-    name: '威廉',
-    date: '刚刚',
-    desc: `在 <a>开源组</a> 创建了项目 <a>Vue</a>`,
-  },
-  {
-    avatar: 'dynamic-avatar-2|svg',
-    name: '艾文',
-    date: '1个小时前',
-    desc: `关注了 <a>威廉</a> `,
-  },
-  {
-    avatar: 'dynamic-avatar-3|svg',
-    name: '克里斯',
-    date: '1天前',
-    desc: `发布了 <a>个人动态</a> `,
-  },
-  {
-    avatar: 'dynamic-avatar-4|svg',
-    name: 'Vben',
-    date: '2天前',
-    desc: `发表文章 <a>如何编写一个Vite插件</a> `,
-  },
-  {
-    avatar: 'dynamic-avatar-5|svg',
-    name: '皮特',
-    date: '3天前',
-    desc: `回复了 <a>杰克</a> 的问题 <a>如何进行项目优化？</a>`,
-  },
-  {
-    avatar: 'dynamic-avatar-6|svg',
-    name: '杰克',
-    date: '1周前',
-    desc: `关闭了问题 <a>如何运行项目</a> `,
-  },
-  {
-    avatar: 'dynamic-avatar-1|svg',
-    name: '威廉',
-    date: '1周前',
-    desc: `发布了 <a>个人动态</a> `,
-  },
-  {
-    avatar: 'dynamic-avatar-1|svg',
-    name: '威廉',
-    date: '2021-04-01 20:00',
-    desc: `推送了代码到 <a>Github</a>`,
-  },
-];
-
-export const groupItems: GroupItem[] = [
-  {
-    title: 'Github',
-    icon: 'carbon:logo-github',
-    color: '',
-    desc: '不要等待机会，而要创造机会。',
-    group: '开源组',
-    date: '2021-04-01',
-  },
-  {
-    title: 'Vue',
-    icon: 'ion:logo-vue',
-    color: '#3fb27f',
-    desc: '现在的你决定将来的你。',
-    group: '算法组',
-    date: '2021-04-01',
-  },
-  {
-    title: 'Html5',
-    icon: 'ion:logo-html5',
-    color: '#e18525',
-    desc: '没有什么才能比努力更重要。',
-    group: '上班摸鱼',
-    date: '2021-04-01',
-  },
-  {
-    title: 'Angular',
-    icon: 'ion:logo-angular',
-    color: '#bf0c2c',
-    desc: '热情和欲望可以突破一切难关。',
-    group: 'UI',
-    date: '2021-04-01',
-  },
-  {
-    title: 'React',
-    icon: 'bx:bxl-react',
-    color: '#00d8ff',
-    desc: '健康的身体是实目标的基石。',
-    group: '技术牛',
-    date: '2021-04-01',
-  },
-  {
-    title: 'Js',
-    icon: 'ion:logo-javascript',
-    color: '#4daf1bc9',
-    desc: '路是走出来的，而不是空想出来的。',
-    group: '架构组',
-    date: '2021-04-01',
-  },
-];

-<template>
-  <PageWrapper>
-    <template #headerContent> <WorkbenchHeader /> </template>
-    <div class="lg:flex">
-      <div class="lg:w-7/10 w-full !mr-4 enter-y">
-        <ProjectCard :loading="loading" class="enter-y" />
-        <DynamicInfo :loading="loading" class="!my-4 enter-y" />
-      </div>
-      <div class="lg:w-3/10 w-full enter-y">
-        <QuickNav :loading="loading" class="enter-y" />
-
-        <Card class="!my-4 enter-y" :loading="loading">
-          <img class="xl:h-50 h-30 mx-auto" src="../../../assets/svg/illustration.svg" />
-        </Card>
-
-        <SaleRadar :loading="loading" class="enter-y" />
-      </div>
-    </div>
-    <BasicModal
-      @register="register"
-      v-bind="$attrs"
-      :mask="true"
-      :showCancelBtn="false"
-      :showOkBtn="false"
-      :canFullscreen="false"
-      :closable="false"
-      :maskStyle="maskColor"
-      :height="600"
-      :width="1500"
-      :maskClosable="false"
-      title="请修改密码"
-      :helpMessage="['请您修改密码']"
-    >
-      <PasswordDialog />
-    </BasicModal>
-  </PageWrapper>
-</template>
-<script lang="ts" setup>
-  import PasswordDialog from '/@/views/system/password/index.vue';
-  import { BasicModal, useModal } from '/@/components/Modal';
-  import { getAuthCache } from '/@/utils/auth';
-  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
-  import { ref, onMounted } from 'vue';
-  import { Card } from 'ant-design-vue';
-  import { PageWrapper } from '/@/components/Page';
-  import WorkbenchHeader from './components/WorkbenchHeader.vue';
-  import ProjectCard from './components/ProjectCard.vue';
-  import QuickNav from './components/QuickNav.vue';
-  import DynamicInfo from './components/DynamicInfo.vue';
-  import SaleRadar from './components/SaleRadar.vue';
-
-  const maskColor = ref({ backgroundColor: 'grey' });
-  const statusModel = ref(false);
-  const [register, { openModal }] = useModal();
-  onMounted(() => {
-    const userInfo: object = getAuthCache(USER_INFO_KEY);
-    if (userInfo.needSetPwd == true) {
-      statusModel.value = true;
-      openModal(statusModel.value);
-    } else if (userInfo.needSetPwd == false) {
-      openModal(statusModel.value);
-    }
-  });
-  //Yunteng123456!!!
-  //Password123456!
-  //System123456!
-  //Testrole123456!
-  const loading = ref(false);
-  setTimeout(() => {
-    loading.value = false;
-  }, 1500);
-</script>

@@ -25,8 +25,8 @@
       :height="600"
       :width="1500"
       :maskClosable="false"
-      title="请修改密码"
-      :helpMessage="['请您修改密码']"
+      title="请您修改初始密码"
+      :helpMessage="['请您修改初始密码']"
     >
       <PasswordDialog />
     </BasicModal>
@@ -47,7 +47,7 @@
   const statusModel = ref(false);
   const [register, { openModal }] = useModal();
   onMounted(() => {
-    const userInfo: object = getAuthCache(USER_INFO_KEY);
+    const userInfo = getAuthCache(USER_INFO_KEY);
     if (userInfo.needSetPwd == true) {
       statusModel.value = true;
       openModal(statusModel.value);

@@ -47,26 +47,27 @@
       const getTitle = computed(() => (!unref(isUpdate) ? '新增设备配置' : '编辑设备配置'));
       const [register] = useModalInner((data) => {
         isUpdate.value = !!data?.isUpdate;
+        if (!unref(isUpdate)) {
+          current.value = 0;
+        }
       });
       function handleStepPrev() {
         current.value--;
       }
-      function handleStep1Next(step1Values: any) {
+      function handleStep1Next() {
         current.value++;
-        console.log(step1Values);
       }
-      function handleStep2Next(step2Values: any) {
+      function handleStep2Next() {
         current.value++;
-        console.log(step2Values);
       }
       function handleRedo() {
         current.value = 0;
       }
       const handleSubmit = () => {
-        console.log(1);
+        console.log();
       };
       const handleCancel = () => {
-        console.log(1);
+        console.log();
       };
       return {
         handleSubmit,

@@ -46,7 +46,6 @@
     },
     setup(props) {
       const statusMapRef = ref(new Map<string | number, MapValue>());
-
       const { query } = useRoute();
       const go = useGo();
       const redo = useRedo();

@@ -97,12 +97,11 @@
         // console.log(record);
         try {
           let ids = [record.id];
-          await delOrganization(ids).then(() => {
-            createMessage.success('删除组织成功');
-            handleSuccess();
-          });
+          await delOrganization(ids);
+          createMessage.success('删除组织成功');
+          handleSuccess();
         } catch (e) {
-          return Promise.reject(e);
+          return e;
         }
       }