Merge branch 'sqy_dev' into 'main'

fix:为表格统一添加上标题,修复首页骨架屏没数据问题,换图标,换logo,修复路由,修复角色菜单不能正常清除,设备列表跳转修复’-2个commit

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

@@ -2,7 +2,7 @@
 VITE_PORT = 8083
 
 # spa-title
-VITE_GLOB_APP_TITLE = Things Kit
+VITE_GLOB_APP_TITLE = ThingsKit
 
 # spa shortname
 # VITE_GLOB_APP_SHORT_NAME = Yunteng IOT

@@ -12,5 +12,5 @@ export const PageEnum = {
   //消息配置
   MESSAGE_CONFIG: '/config/message',
   //设备配置
-  DEVICE_PROFILE: '/deviceManager/deviceProfile',
+  DEVICE_PROFILE: '/device/profiles',
 };

@@ -61,9 +61,7 @@
   // components
   import { Dropdown, Menu } from 'ant-design-vue';
 
-  import { defineComponent, computed, getCurrentInstance, ref, reactive } from 'vue';
-
-  import { DOC_URL } from '/@/settings/siteSetting';
+  import { defineComponent, computed, ref, reactive } from 'vue';
 
   import { useUserStore } from '/@/store/modules/user';
   import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
@@ -72,7 +70,6 @@
   import { useModal } from '/@/components/Modal';
   import headerImg from '/@/assets/images/header.jpg';
   import { propTypes } from '/@/utils/propTypes';
-  import { openWindow } from '/@/utils';
   import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
@@ -101,7 +98,6 @@
         realName: '',
       });
       const userInfo = getAuthCache(USER_INFO_KEY);
-      const { proxy } = getCurrentInstance();
       const personalRef = ref(null);
       const { prefixCls } = useDesign('header-user-dropdown');
       const { t } = useI18n();
@@ -124,26 +120,17 @@
       function handleLoginOut() {
         userStore.confirmLoginOut();
       }
-
-      // open doc
-      function openDoc() {
-        openWindow(DOC_URL);
-      }
-
       function handleMenuClick(e: { key: MenuEvent }) {
         switch (e.key) {
           case 'logout':
             handleLoginOut();
             break;
-          case 'doc':
-            openDoc();
+          case 'personal':
+            openPersonalFunc();
             break;
           case 'lock':
             handleLock();
             break;
-          case 'personal':
-            openPersonalFunc();
-            break;
           case 'changePassword':
             changePassword();
             break;

@@ -29,14 +29,24 @@ export function createPermissionGuard(router: Router) {
       return;
     }
 
+    const token = userStore.getJwtToken;
     // Whitelist can be directly entered
+    // 路由守卫拦截, 如果是已经登陆情况, 就不要回到登陆页面了;
     if (whitePathList.includes(to.path as PageEnum)) {
+      if (to.path === LOGIN_PATH && token) {
+        const isSessionTimeout = userStore.getSessionTimeout;
+        try {
+          // await userStore.afterLoginAction();
+          if (!isSessionTimeout) {
+            next((to.query?.redirect as string) || '/');
+            return;
+          }
+        } catch {}
+      }
       next();
       return;
     }
 
-    const token = userStore.getJwtToken;
-
     // token does not exist
     if (!token) {
       // You can access without permission. You need to set the routing meta.ignoreAuth to true

@@ -101,14 +101,14 @@ export const useUserStore = defineStore({
       setAuthCache(REFRESH_TOKEN_KEY, refreshToken);
     },
     setToken(info: string | undefined) {
-      this.token = info;
-      setAuthCache(TOKEN_KEY, info);
+      this.jwtToken = info;
+      setAuthCache(JWT_TOKEN_KEY, info);
     },
     setRoleList(roleList: RoleEnum[]) {
       this.roleList = roleList;
       setAuthCache(ROLES_KEY, roleList);
     },
-    setUserInfo(info: UserInfo) {
+    setUserInfo(info: UserInfo | null) {
       this.userInfo = info;
       this.lastUpdateTime = new Date().getTime();
       setAuthCache(USER_INFO_KEY, info);
@@ -190,18 +190,23 @@ export const useUserStore = defineStore({
     /**
      * @description: logout
      */
-    async logout() {
+    async logout(goLogin = false) {
       // try {
       //   await doLogout();
       // } catch {
       //   console.log('注销Token失败');
       // }
-      this.resetState();
-      setAuthCache(JWT_TOKEN_KEY, undefined);
-      setAuthCache(REFRESH_TOKEN_KEY, undefined);
+      // this.resetState();
+      // setAuthCache(JWT_TOKEN_KEY, undefined);
+      // setAuthCache(REFRESH_TOKEN_KEY, undefined);
       // this.setSessionTimeout(false);
-      // goLogin && router.push(PageEnum.BASE_LOGIN);
-      await router.push(PageEnum.BASE_LOGIN);
+      // // goLogin && router.push(PageEnum.BASE_LOGIN);
+
+      this.setToken(undefined);
+      this.setSessionTimeout(false);
+      setAuthCache(REFRESH_TOKEN_KEY, undefined);
+      this.setUserInfo(null);
+      goLogin && router.push(PageEnum.BASE_LOGIN);
       window.localStorage.clear();
       window.localStorage.removeItem('updateUserInfo');
     },
@@ -228,7 +233,7 @@ export const useUserStore = defineStore({
         title: t('sys.app.logoutTip'),
         content: t('sys.app.logoutMessage'),
         onOk: async () => {
-          await this.logout();
+          await this.logout(true);
         },
       });
     },

@@ -74,6 +74,7 @@
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       // 表格hooks
       const [registerTable, { reload }] = useTable({
+        title: '告警联系人列表',
         api: getAlarmContact,
         columns,
         clickToRowSelect: false,

@@ -34,6 +34,7 @@
 
     setup() {
       const [registerTable, { reload }] = useTable({
+        title: '告警记录列表',
         api: getDeviceAlarm,
         columns: alarmColumns,
         formConfig: {

@@ -56,8 +56,8 @@
       </Card>
     </div>
     <Card v-else :bordered="false" :bodyStyle="{ padding: 0 }" v-bind="$attrs">
-      <Skeleton active :paragraph="{ rows: 10 }" :loading="!tenantTop10.length">
-        <Descriptions :column="1" style="min-height: 180px" title="租户消息量TOP10">
+      <Skeleton active :paragraph="{ rows: 10 }" :loading="!tenantTop10">
+        <Descriptions :column="1" title="租户消息量TOP10" v-if="tenantTop10.length">
           <template v-for="(item, index) in tenantTop10" :key="item.name">
             <DescriptionsItem>
               <span
@@ -114,6 +114,7 @@
                     {{ item.name }}
                   </Tooltip>
                 </div>
+
                 <div class="flex w-7/10">
                   <Progress
                     :showInfo="false"
@@ -142,6 +143,7 @@
             </DescriptionsItem>
           </template>
         </Descriptions>
+        <Empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
       </Skeleton>
       <h1 style="color: rgba(0, 0, 0, 0.85); font-weight: bold; font-size: 16px">
         本月即将过期租户</h1
@@ -269,7 +271,9 @@
       const tenantTop10 = ref<{ name: string; count: number }[]>([]);
       onMounted(async () => {
         if (isAdmin(props.role)) {
-          tenantTop10.value = await getTenantTop10();
+          const res = await getTenantTop10();
+          if (res) tenantTop10.value = res;
+          else tenantTop10.value = [];
           return;
         }
         const notice = await notifyMyGetrPageApi({ page: 1, pageSize: 5 });

@@ -64,14 +64,14 @@ export const step1Schemas: FormSchema[] = [
 
         onChange() {
           setFieldsValue({
-            gateWayId: null,
+            gatewayId: null,
           });
         },
       };
     },
   },
   {
-    field: 'gateWayId',
+    field: 'gatewayId',
     label: '网关设备',
     required: true,
     component: 'ApiSelect',

@@ -15,7 +15,7 @@
         <Step title="添加设备凭证" />
       </Steps>
     </div>
-    <div class="mt-5">
+    <div class="mt-4">
       <DeviceStep1
         @next="handleStep1Next"
         ref="DeviceStep1Ref"
@@ -70,13 +70,14 @@
       const [register, { closeModal }] = useModalInner((data) => {
         isUpdate.value = data?.isUpdate;
         if (unref(isUpdate)) {
-          unref(DeviceStep1Ref)?.parentSetFieldsValue(data.record);
+          const { record } = data;
           unref(DeviceStep1Ref)?.parentSetFieldsValue({
-            profile: data.record.deviceProfile.name,
-            profileId: data.record.profileId,
-            deviceType: data.record.deviceType,
+            ...record,
+            profile: record.deviceProfile.name,
+            profileId: record.profileId,
+            deviceType: record.deviceType,
           });
-          deviceInfo.value = data.record.deviceInfo;
+          deviceInfo.value = record.deviceInfo;
           unref(DeviceStep1Ref)?.disabledDeviceType(true);
         } else {
           unref(DeviceStep1Ref)?.disabledDeviceType(false);
@@ -107,6 +108,7 @@
         unref(DeviceStep2Ref)?.resetFieldsValueAndStatus();
       }
       // 提交
+      const msg = computed(() => (unref(isUpdate) ? '更新设备成功' : '新增设备成功'));
       async function handleOk() {
         if (current.value === 0) {
           // 验证
@@ -114,10 +116,12 @@
           if (!valid) return;
           stepState.value = unref(DeviceStep1Ref)?.parentGetFieldsValue();
         } else {
+          // !!!此处需要删除地图的属性，否则会报堆栈溢出的错误 Uncaught RangeError: Maximum call stack size exceeded
+          Reflect.deleteProperty(stepState.value, 'map');
+          Reflect.deleteProperty(stepState.value, 'marker');
           if (unref(DeviceStep2Ref)?.getFieldsValue().addAgree) {
             const valid = await unref(DeviceStep2Ref)?.validate();
             if (!valid) return;
-
             // 第二页验证通过情况
             stepState.value = {
               ...unref(stepState),
@@ -126,11 +130,10 @@
           }
         }
         // 验证成功 --调-- 新增或者编辑接口
-        const msg = computed(() => (unref(stepState).id ? '更新设备成功' : '新增设备成功'));
-        // 此处需要删除地图的属性，否则会报堆栈溢出的错误 Uncaught RangeError: Maximum call stack size exceeded
+        // !!!此处需要删除地图的属性，否则会报堆栈溢出的错误 Uncaught RangeError: Maximum call stack size exceeded
         Reflect.deleteProperty(DeviceStep1Ref.value.positionState, 'map');
         Reflect.deleteProperty(DeviceStep1Ref.value.positionState, 'marker');
-        if (unref(stepState).id) {
+        if (unref(isUpdate)) {
           const editData = {
             ...unref(stepState),
             deviceInfo: {
@@ -138,7 +141,6 @@
               ...DeviceStep1Ref.value?.positionState,
             },
           };
-
           await createOrEditDevice(editData);
         } else {
           const createData = {

@@ -194,7 +194,6 @@
       }
       // 取消分配客户
       async function handleCancelDispatchCustomer(record: Recordable) {
-        console.log('record', record);
         await cancelDispatchCustomer(record);
         handleSuccess();
       }
@@ -210,7 +209,8 @@
       async function handleEdit(record: Recordable) {
         if (record.deviceType === 'SENSOR') {
           const res = await getGATEWAY(record.tbDeviceId);
-          Reflect.set(record, 'gateWayId', res.id);
+          console.log(res);
+          Reflect.set(record, 'gatewayId', res.id);
         }
         openModal(true, {
           isUpdate: true,
@@ -221,6 +221,7 @@
       function handleSuccess() {
         reload();
       }
+      // 140049ee-6b8c-4ce1-93d4-00faeddf9719
       function handleSelect(organization) {
         searchInfo.organizationId = organization;
         handleSuccess();

@@ -70,6 +70,7 @@
       );
       const NotifyManagerDrawerRef = ref();
       const [registerTable, { reload }] = useTable({
+        title: '通知列表',
         api: notifyGetTableApi,
         columns,
         formConfig: {

@@ -14,7 +14,7 @@
       <PageWrapper dense contentFullHeight contentBackground>
         <div class="detail-notice-info">
           <span class="mr-6"
-            ><UserOutlined class="mr-2" />发送者:{{ dataSource?.user?.realName }}</span
+            ><UserOutlined class="mr-2" />发送者:{{ dataSource?.sysNotice?.senderName }}</span
           >
           <span class="mr-6"
             ><SolutionOutlined class="mr-2" />通知类型:{{
@@ -74,5 +74,6 @@
     border-bottom: 1px solid #ccc;
     padding-top: 5px;
     padding-bottom: 5px;
+    margin-bottom: 16px;
   }
 </style>

@@ -30,6 +30,7 @@
     setup() {
       const [registerModal, { openModal }] = useModal();
       const [registerTable, { reload }] = useTable({
+        title: '我的通知',
         api: notifyMyGetrPageApi,
         columns,
         formConfig: {

@@ -120,7 +120,7 @@
         registerTable,
         { reload, getSelectRowKeys, getSelectRows, setLoading, clearSelectedRowKeys },
       ] = useTable({
-        title: '数据转换列表',
+        title: '数据流转列表',
         clickToRowSelect: false,
         columns,
         api: getConvertApi,

@@ -80,6 +80,8 @@
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         resetFields();
         roleId.value = '';
+        // 在打开弹窗时清除所有选择的菜单
+        treeRef.value && treeRef.value.checkAll(false);
         isUpdate.value = data.isUpdate;
         // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
         if (!unref(treeData).length) {
@@ -101,7 +103,6 @@
             }
           }
           treeRef.value.setCheckedKeys(roleMenus.value);
-          console.log(originMenus.value);
           roleId.value = data.record.id;
           setFieldsValue(data.record);
         }

@@ -58,7 +58,7 @@
       const [registerDrawer, { openDrawer }] = useDrawer();
       const { createMessage } = useMessage();
       const [registerTable, { reload, getSelectRowKeys }] = useTable({
-        title: '',
+        title: '租户配置列表',
         clickToRowSelect: false,
         api: getTableTenantProfileApi,
         columns,

@@ -92,7 +92,7 @@
         },
       ];
       const [tenantTable, { reload, setLoading }] = useTable({
-        title: '租户',
+        title: '租户列表',
         api: getTenantPage,
         columns: getBasicColumns(),
         useSearchForm: true,

@@ -82,6 +82,8 @@
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         resetFields();
         roleId.value = '';
+        // 在打开弹窗时清除所有选择的菜单
+        treeRef.value && treeRef.value.checkAll(false);
         isUpdate.value = data.isUpdate;
         // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
         if (!unref(treeData).length) {