Merge branch 'v1.4.0_dev' into 'main_dev'

V1.4.0 dev

See merge request yunteng/thingskit-front!1366

@@ -5,6 +5,7 @@ export interface HomeStatisticsRecordType {
   customerInfo: TotalInfo;
   customerInfo: TotalInfo;
   productInfo: TotalInfo;
   productInfo: TotalInfo;
   messageInfo: MessageInfo;
   messageInfo: MessageInfo;
+  alarmNoticeInfo: AlarmNoticeInfo;
 }
 }
 
 
 export interface TotalInfo {
 export interface TotalInfo {
@@ -29,3 +30,8 @@ export interface MessageInfo {
   todayMessageAdd: number;
   todayMessageAdd: number;
   todayDataPointsAdd: number;
   todayDataPointsAdd: number;
 }
 }
+
+export interface AlarmNoticeInfo {
+  sumCount: number;
+  todayAdd: number;
+}

@@ -22,6 +22,22 @@ enum Api {
   ResetCode = '/noauth/reset_code/',
   ResetCode = '/noauth/reset_code/',
   ResetPassword = '/noauth/reset/',
   ResetPassword = '/noauth/reset/',
   APP_GET_TOKEN = '/third/login/id/',
   APP_GET_TOKEN = '/third/login/id/',
+  AUTH_LOGOUT = '/auth/logout',
+}
+
+/**
+ * @description: user logout api
+ */
+export function logoutApi(_, mode: ErrorMessageMode = 'modal') {
+  return defHttp.post(
+    {
+      url: Api.AUTH_LOGOUT,
+    },
+    {
+      errorMessageMode: mode,
+      joinPrefix: false,
+    }
+  );
 }
 }
 
 
 /**
 /**

+export enum PermissionEnum {
+  TENANT_SUB_ADMINISTRATOR = 4, //租户子管理员
+}

@@ -19,7 +19,7 @@ import {
   RefreshTokenParams,
   RefreshTokenParams,
   SmsLoginParams,
   SmsLoginParams,
 } from '/@/api/sys/model/userModel';
 } from '/@/api/sys/model/userModel';
-import { doRefreshToken, getMyInfo, loginApi, smsCodeLoginApi } from '/@/api/sys/user';
+import { doRefreshToken, getMyInfo, loginApi, logoutApi, smsCodeLoginApi } from '/@/api/sys/user';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { router } from '/@/router';
 import { router } from '/@/router';
@@ -240,7 +240,6 @@ export const useUserStore = defineStore({
       // setAuthCache(REFRESH_TOKEN_KEY, undefined);
       // setAuthCache(REFRESH_TOKEN_KEY, undefined);
       // this.setSessionTimeout(false);
       // this.setSessionTimeout(false);
       // // goLogin && router.push(PageEnum.BASE_LOGIN);
       // // goLogin && router.push(PageEnum.BASE_LOGIN);
-
       this.setToken(undefined);
       this.setToken(undefined);
       this.setSessionTimeout(false);
       this.setSessionTimeout(false);
       setAuthCache(REFRESH_TOKEN_KEY, undefined);
       setAuthCache(REFRESH_TOKEN_KEY, undefined);
@@ -284,6 +283,7 @@ export const useUserStore = defineStore({
         title: t('sys.app.logoutTip'),
         title: t('sys.app.logoutTip'),
         content: t('sys.app.logoutMessage'),
         content: t('sys.app.logoutMessage'),
         onOk: async () => {
         onOk: async () => {
+          await logoutApi(null, 'modal'); //新增退出登录接口
           await this.logout(true);
           await this.logout(true);
         },
         },
       });
       });

@@ -90,7 +90,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { ref, onMounted, defineComponent, Ref } from 'vue';
+  import { ref, onMounted, defineComponent, Ref, computed } from 'vue';
   import { Card } from 'ant-design-vue';
   import { Card } from 'ant-design-vue';
   import { getHomeData } from '/@/api/dashboard';
   import { getHomeData } from '/@/api/dashboard';
   import { isAdmin } from '/@/enums/roleEnum';
   import { isAdmin } from '/@/enums/roleEnum';
@@ -109,6 +109,8 @@
   import msgPicture from '/@/assets/images/msg-count.png';
   import msgPicture from '/@/assets/images/msg-count.png';
   import tenantPicture from '/@/assets/images/zh.png';
   import tenantPicture from '/@/assets/images/zh.png';
   import customerPicture from '/@/assets/images/kf.png';
   import customerPicture from '/@/assets/images/kf.png';
+  import { useUserStore } from '/@/store/modules/user';
+  import { PermissionEnum } from '/@/enums/permissionEnum';
 
 
   interface RecordType {
   interface RecordType {
     value: number;
     value: number;
@@ -156,8 +158,23 @@
   ];
   ];
 
 
   const { isSysadmin, isPlatformAdmin } = useRole();
   const { isSysadmin, isPlatformAdmin } = useRole();
+
+  const userStore = useUserStore();
+
+  const hasTenantSubAdminPermission = computed(() => {
+    return userStore.getUserInfo?.level === PermissionEnum.TENANT_SUB_ADMINISTRATOR;
+  });
+
   const handleTransformStatisticalInfo = (record: HomeStatisticsRecordType) => {
   const handleTransformStatisticalInfo = (record: HomeStatisticsRecordType) => {
-    const { deviceInfo, productInfo, alarmInfo, messageInfo, customerInfo, tenantInfo } = record;
+    const {
+      deviceInfo,
+      productInfo,
+      alarmInfo,
+      messageInfo,
+      customerInfo,
+      tenantInfo,
+      alarmNoticeInfo,
+    } = record;
 
 
     const productTotal: StatisticalItemType = {
     const productTotal: StatisticalItemType = {
       images: productPicture,
       images: productPicture,
@@ -226,10 +243,25 @@
       todayTotals: [{ label: '今日新增', value: customerInfo?.todayAdd }],
       todayTotals: [{ label: '今日新增', value: customerInfo?.todayAdd }],
     };
     };
 
 
+    const alarmNoticeInfoTotal: StatisticalItemType = {
+      images: msgPicture,
+      totals: [{ label: '告警通知数', value: alarmNoticeInfo?.sumCount }],
+      tooltips: [
+        { label: '告警通知数', value: alarmNoticeInfo?.sumCount },
+        { label: '今日新增', value: alarmNoticeInfo?.todayAdd },
+      ],
+      todayTotals: [{ label: '今日新增', value: alarmNoticeInfo?.todayAdd }],
+    };
+
     if (unref(isSysadmin) || unref(isPlatformAdmin)) {
     if (unref(isSysadmin) || unref(isPlatformAdmin)) {
       statisticalPanelList.value = [deviceTotal, tenantTotal, customerTotal];
       statisticalPanelList.value = [deviceTotal, tenantTotal, customerTotal];
     } else {
     } else {
-      statisticalPanelList.value = [productTotal, deviceTotal, alarmTotal, messageTotal];
+      statisticalPanelList.value = [
+        productTotal,
+        deviceTotal,
+        alarmTotal,
+        hasTenantSubAdminPermission.value ? alarmNoticeInfoTotal : messageTotal,
+      ];
     }
     }
   };
   };
 
 

@@ -4,7 +4,7 @@
     v-bind="$attrs"
     v-bind="$attrs"
     :active-tab-key="activeKey"
     :active-tab-key="activeKey"
     @tabChange="onTabChange"
     @tabChange="onTabChange"
-    v-if="!isAdmin(role)"
+    v-if="!isAdmin(role) && !hasTenantSubAdminPermission"
   >
   >
     <template #messageStatistics>
     <template #messageStatistics>
       <span>消息量统计</span>
       <span>消息量统计</span>
@@ -169,7 +169,7 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { ref, reactive, unref } from 'vue';
+  import { ref, reactive, unref, computed } from 'vue';
   import { Card, DatePicker, Tooltip, Button } from 'ant-design-vue';
   import { Card, DatePicker, Tooltip, Button } from 'ant-design-vue';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   // import VisitAnalysis from './VisitAnalysis.vue';
   // import VisitAnalysis from './VisitAnalysis.vue';
@@ -186,6 +186,8 @@
   import { getTrendData } from '/@/api/dashboard';
   import { getTrendData } from '/@/api/dashboard';
   import { useGlobSetting } from '/@/hooks/setting';
   import { useGlobSetting } from '/@/hooks/setting';
   import { RangePickerValue } from 'ant-design-vue/lib/date-picker/interface';
   import { RangePickerValue } from 'ant-design-vue/lib/date-picker/interface';
+  import { useUserStore } from '/@/store/modules/user';
+  import { PermissionEnum } from '/@/enums/permissionEnum';
 
 
   defineExpose({
   defineExpose({
     isAdmin,
     isAdmin,
@@ -208,6 +210,12 @@
     },
     },
   ];
   ];
 
 
+  const userStore = useUserStore();
+
+  const hasTenantSubAdminPermission = computed(() => {
+    return userStore.getUserInfo?.level === PermissionEnum.TENANT_SUB_ADMINISTRATOR;
+  });
+
   // 快速选择日期
   // 快速选择日期
   const activeIndex = ref(3);
   const activeIndex = ref(3);
   const dateValue = ref();
   const dateValue = ref();

@@ -58,7 +58,7 @@
             });
             });
           }
           }
           getTenantRoles(data.record.tenantId).then((result) => {
           getTenantRoles(data.record.tenantId).then((result) => {
-            const { ...params } = data.record;
+            const { icon: _, ...params } = data.record; // icon这个字段不能回显
             //为表单赋值
             //为表单赋值
             setFieldsValue({
             setFieldsValue({
               ...params,
               ...params,

@@ -43,6 +43,7 @@ export interface UserInfo {
   phoneNumber?: string;
   phoneNumber?: string;
   email?: string;
   email?: string;
   tenantId?: string;
   tenantId?: string;
+  level?: number;
 }
 }
 
 
 export interface BeforeMiniState {
 export interface BeforeMiniState {