Merge branch 'main_dev' into ft

@@ -79,6 +79,7 @@ interface TrendParamsType {
     | 'CUSTOMER_TREND'
     | 'TENANT_TREND'
     | 'CUSTOMER_MESSAGE_STATISTICAL'
+    | 'CUSTOMER_ALARM_STATISTICAL'
     | 'CUSTOMER_MESSAGE_STATISTICAL';
 }
 // 获取租户趋势或者客户趋势数据

@@ -58,10 +58,10 @@
             <div> {{ !isAdmin(role) ? `产品数` : '产品数' }}</div>
           </div>
         </div>
-        <div v-if="!isAdmin(role)" class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
+        <div v-if="!isAdmin(role)" class="pt-4" style="border-top: 2px solid #f0f2f5">
           今日新增 {{ toThousands(growCardList?.productInfo?.todayAdd) }}</div
         >
-        <div v-else class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
+        <div v-else class="pt-4" style="border-top: 2px solid #f0f2f5">
           今日新增 {{ toThousands(growCardList?.productInfo?.todayAdd) }}</div
         >
       </Card>
@@ -92,7 +92,7 @@
             <div> 设备数 </div>
           </div>
         </div>
-        <div class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
+        <div class="pt-4" style="border-top: 2px solid #f0f2f5">
           今日新增 {{ toThousands(growCardList?.deviceInfo?.todayAdd) }}
         </div>
       </Card>
@@ -143,10 +143,10 @@
             <div> {{ !isAdmin(role) ? `告警数` : '租户总量' }}</div>
           </div>
         </div>
-        <div v-if="!isAdmin(role)" class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
+        <div v-if="!isAdmin(role)" class="pt-4" style="border-top: 2px solid #f0f2f5">
           今日新增 {{ toThousands(growCardList?.alarmInfo?.todayAdd) }}</div
         >
-        <div v-else class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
+        <div v-else class="pt-4" style="border-top: 2px solid #f0f2f5">
           今日新增 {{ toThousands(growCardList?.tenantInfo?.todayAdd) }}</div
         >
       </Card>
@@ -167,8 +167,8 @@
                 style="font-size: 1.625rem; color: #333; font-weight: bold"
               >
                 <CountTo
-                  v-if="growCardList?.messageInfo?.todayMessageAdd"
-                  :end-val="growCardList.messageInfo.todayMessageAdd"
+                  v-if="growCardList?.messageInfo?.messageCount"
+                  :end-val="growCardList.messageInfo.messageCount"
                 />
                 <CountTo v-else :end-val="0" />
               </div>
@@ -185,7 +185,44 @@
                     !isAdmin(role)
                       ? `今日消息数：${
                           growCardList?.messageInfo?.todayMessageAdd
-                        } 近30日新增 ${toThousands(growCardList?.messageInfo?.messageCount)}`
+                        } 今日消息点数 ${toThousands(
+                          growCardList?.messageInfo?.todayDataPointsAdd
+                        )}`
+                      : `客户总量：${growCardList?.customerInfo?.sumCount} 今日新增 ${toThousands(
+                          growCardList?.customerInfo?.todayAdd
+                        )}`
+                  }}
+                </template>
+                <img
+                  v-if="isAdmin(role)"
+                  src="/src/assets/images/tip.png"
+                  style="width: 1.125rem; height: 1.125rem"
+                />
+              </Tooltip>
+            </div>
+            <div> {{ !isAdmin(role) ? `消息数` : '客户总量' }}</div>
+          </div>
+          <div class="flex-auto" v-if="!isAdmin(role)">
+            <div class="flex justify-between" style="align-items: center">
+              <div
+                v-if="!isAdmin(role)"
+                style="font-size: 1.625rem; color: #333; font-weight: bold"
+              >
+                <CountTo
+                  v-if="growCardList?.messageInfo?.dataPointsCount"
+                  :end-val="growCardList.messageInfo.dataPointsCount"
+                />
+                <CountTo v-else :end-val="0" />
+              </div>
+              <Tooltip>
+                <template #title>
+                  {{
+                    !isAdmin(role)
+                      ? `今日消息数：${
+                          growCardList?.messageInfo?.todayMessageAdd
+                        } 今日消息点数 ${toThousands(
+                          growCardList?.messageInfo?.todayDataPointsAdd
+                        )}`
                       : `客户总量：${growCardList?.customerInfo?.sumCount} 今日新增 ${toThousands(
                           growCardList?.customerInfo?.todayAdd
                         )}`
@@ -194,15 +231,20 @@
                 <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
               </Tooltip>
             </div>
-            <div> {{ !isAdmin(role) ? `今日消息数` : '客户总量' }}</div>
+            <div> {{ !isAdmin(role) ? `消息点数` : '' }}</div>
           </div>
         </div>
-        <div v-if="!isAdmin(role)" class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
-          近30日新增 {{ toThousands(growCardList?.messageInfo?.messageCount) }}</div
-        >
-        <div v-else class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
-          近30日新增 {{ toThousands(growCardList?.customerInfo?.todayAdd) }}</div
-        >
+        <div class="flex justify-between" style="border-top: 2px solid #f0f2f5">
+          <div v-if="!isAdmin(role)" class="pt-4">
+            今日消息数 {{ toThousands(growCardList?.messageInfo?.todayMessageAdd) }}</div
+          >
+          <div v-if="!isAdmin(role)" class="pt-4">
+            今日消息点数 {{ toThousands(growCardList?.messageInfo?.todayDataPointsAdd) }}</div
+          >
+          <div v-else class="pt-4">
+            近30日新增 {{ toThousands(growCardList?.customerInfo?.todayAdd) }}</div
+          >
+        </div>
       </Card>
     </div>
     <!-- 首页饼图 -->

@@ -10,15 +10,15 @@
       <div class="extra-date">
         <template v-for="(item, index) in dateList" :key="item.value">
           <span
-            @click="quickQueryDate(index, item.value, role === 'CUSTOMER_USER' && 'customer')"
+            @click="
+              quickQueryDate(index, item.value, role === RoleEnum.CUSTOMER_USER, item.interval)
+            "
             :class="{ active: index === activeIndex }"
             >{{ item.label }}</span
           >
         </template>
         <DatePicker
-          @change="
-            (_, DateString) => onDateChange(_, DateString, role === 'CUSTOMER_USER' && 'customer')
-          "
+          @change="(_, DateString) => onDateChange(_, DateString, role === RoleEnum.CUSTOMER_USER)"
           v-model:value="dateValue"
         />
       </div>
@@ -102,7 +102,7 @@
   import { Card, DatePicker } from 'ant-design-vue';
   import VisitAnalysis from './VisitAnalysis.vue';
   import VisitAnalysisBar from './VisitAnalysisBar.vue';
-  import { isAdmin } from '/@/enums/roleEnum';
+  import { RoleEnum, isAdmin } from '/@/enums/roleEnum';
   import { useWebSocket } from '@vueuse/core';
   import { getAuthCache } from '/@/utils/auth';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
@@ -137,10 +137,10 @@
   const activeIndex = ref(3);
   const dateValue = ref();
   const dateList = ref([
-    { label: '1小时', value: 3600000 },
-    { label: '1天', value: 86400000 },
-    { label: '7天', value: 604800000 },
-    { label: '30天', value: 2592000000 },
+    { label: '1小时', value: 1000 * 60 * 60, interval: 1000 * 60 * 5 },
+    { label: '1天', value: 1000 * 60 * 60 * 24, interval: 1000 * 60 * 30 },
+    { label: '7天', value: 1000 * 60 * 60 * 24 * 7, interval: 1000 * 60 * 60 * 2 },
+    { label: '30天', value: 1000 * 60 * 60 * 24 * 30, interval: 1000 * 60 * 60 * 24 },
   ]);
 
   // web Socket
@@ -354,17 +354,16 @@
     send(sendValue);
   }
   // 选择日期
-  async function onDateChange(_, dateString, roleType = '') {
-    console.log(_, dateString, roleType);
+  async function onDateChange(_, dateString, isCustomer: boolean) {
     activeIndex.value = -1;
     const dateTime = Number(formatToDateTime(dateString, 'x'));
     if (!dateString) return;
-    if (roleType === 'customer') {
+    if (isCustomer) {
       if (activeKey.value === '1') {
         const data = await getTrendData({
           startTs: dateTime,
           endTs: dateTime + 86400000,
-          interval: 7200000,
+          interval: 1000 * 60 * 30,
           trend: 'CUSTOMER_ALARM_STATISTICAL',
         });
         customerAlarmList.value = data;
@@ -372,7 +371,7 @@
         const data = await getTrendData({
           startTs: dateTime,
           endTs: dateTime + 86400000,
-          interval: 7200000,
+          interval: 1000 * 60 * 30,
           trend: 'CUSTOMER_MESSAGE_STATISTICAL',
         });
         customerMessageList.value = data;
@@ -390,7 +389,7 @@
                   : ['transportMsgCountHourly', 'transportDataPointsCountHourly'],
               startTs: dateTime,
               endTs: dateTime + 86400000,
-              interval: 7200000,
+              interval: 1000 * 60 * 30,
               limit: 12,
               agg: 'SUM',
             },
@@ -403,17 +402,16 @@
   const customerAlarmList = ref([]);
   const customerMessageList = ref([]);
   // 快速选择时间
-  async function quickQueryDate(index: number, value: number, roleType = '') {
+  async function quickQueryDate(
+    index: number,
+    value: number,
+    isCustomer: boolean,
+    interval: number
+  ) {
     if (activeIndex.value === index) return;
     activeIndex.value = index;
     dateValue.value = '';
-    let interval = 300000;
-    if (value === 86400000) {
-      interval = 7200000;
-    } else if (value === 604800000 || value === 2592000000) {
-      interval = 86400000;
-    }
-    if (roleType === 'customer') {
+    if (isCustomer) {
       if (activeKey.value === '1') {
         const data = await getTrendData({
           startTs: Date.now() - value,

@@ -6,19 +6,45 @@
     @tabChange="onTabChange"
     v-if="!isAdmin(role)"
   >
+    <template #messageStatistics>
+      <span>消息量统计</span>
+      <Tooltip>
+        <template #title>
+          <div>传输消息量: 即设备上报的消息数量,设备每上报一次数据量+1.</div>
+          <div class="mt-1">
+            传输数据点:
+            即设备每次上报的消息所包含的数据点,例如一条直连设备消息包含以下内容:{"ph":7,"humidity":65},则此消息有两个数据点.
+          </div>
+        </template>
+        <QuestionCircleOutlined class="ml-2" />
+      </Tooltip>
+    </template>
     <template #tabBarExtraContent>
       <div class="extra-date">
+        <Tooltip>
+          <template #title>
+            <div> 30天: 查询最近30天的数据,间隔时间为1天.</div>
+            <div>7天: 查询最近7天的数据,间隔时间为2小时.</div>
+            <div>1天: 查询最近1天的数据,间隔时间为30分钟.</div>
+            <div>1小时: 查询最近1小时的数据,间隔时间为5分钟.</div>
+            <div>
+              间隔时间:
+              以当前时间作为结束时间,往前推移对应天数或小时的时间作为开始时间,然后在此时间区间内进行分组聚合查询.
+            </div>
+          </template>
+          <QuestionCircleOutlined class="!mr-1" />
+        </Tooltip>
         <template v-for="(item, index) in dateList" :key="item.value">
           <span
-            @click="quickQueryDate(index, item.value, role === 'CUSTOMER_USER' && 'customer')"
+            @click="
+              quickQueryDate(index, item.value, role === RoleEnum.CUSTOMER_USER, item.interval)
+            "
             :class="{ active: index === activeIndex }"
             >{{ item.label }}</span
           >
         </template>
         <DatePicker
-          @change="
-            (_, DateString) => onDateChange(_, DateString, role === 'CUSTOMER_USER' && 'customer')
-          "
+          @change="(_, DateString) => onDateChange(_, DateString, role === RoleEnum.CUSTOMER_USER)"
           v-model:value="dateValue"
         />
       </div>
@@ -98,10 +124,11 @@
 </template>
 <script lang="ts" setup>
   import { ref, reactive } from 'vue';
-  import { Card, DatePicker } from 'ant-design-vue';
+  import { Card, DatePicker, Tooltip } from 'ant-design-vue';
+  import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   // import VisitAnalysis from './VisitAnalysis.vue';
   import VisitAnalysisBar from './VisitAnalysisBar.vue';
-  import { isAdmin } from '/@/enums/roleEnum';
+  import { RoleEnum, isAdmin } from '/@/enums/roleEnum';
   import { useWebSocket } from '@vueuse/core';
   import { getAuthCache } from '/@/utils/auth';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
@@ -129,17 +156,19 @@
     // },
     {
       key: '2',
-      tab: '消息量统计',
+      // tab: '消息量统计',
+      slots: { tab: 'messageStatistics' },
     },
   ];
+
   // 快速选择日期
   const activeIndex = ref(3);
   const dateValue = ref();
   const dateList = ref([
-    { label: '1小时', value: 3600000 },
-    { label: '1天', value: 86400000 },
-    { label: '7天', value: 604800000 },
-    { label: '30天', value: 2592000000 },
+    { label: '1小时', value: 1000 * 60 * 60, interval: 1000 * 60 * 5 },
+    { label: '1天', value: 1000 * 60 * 60 * 24, interval: 1000 * 60 * 30 },
+    { label: '7天', value: 1000 * 60 * 60 * 24 * 7, interval: 1000 * 60 * 60 * 2 },
+    { label: '30天', value: 1000 * 60 * 60 * 24 * 30, interval: 1000 * 60 * 60 * 24 },
   ]);
 
   // web Socket
@@ -359,17 +388,16 @@
     send(sendValue);
   }
   // 选择日期
-  async function onDateChange(_, dateString, roleType = '') {
-    console.log(_, dateString, roleType);
+  async function onDateChange(_, dateString, isCustomer: boolean) {
     activeIndex.value = -1;
     const dateTime = Number(formatToDateTime(dateString, 'x'));
     if (!dateString) return;
-    if (roleType === 'customer') {
+    if (isCustomer) {
       if (activeKey.value === '1') {
         const data = await getTrendData({
           startTs: dateTime,
           endTs: dateTime + 86400000,
-          interval: 7200000,
+          interval: 1000 * 60 * 30,
           trend: 'CUSTOMER_ALARM_STATISTICAL',
         });
         customerAlarmList.value = data;
@@ -377,7 +405,7 @@
         const data = await getTrendData({
           startTs: dateTime,
           endTs: dateTime + 86400000,
-          interval: 7200000,
+          interval: 1000 * 60 * 30,
           trend: 'CUSTOMER_MESSAGE_STATISTICAL',
         });
         customerMessageList.value = data;
@@ -395,7 +423,7 @@
                   : ['transportMsgCountHourly', 'transportDataPointsCountHourly'],
               startTs: dateTime,
               endTs: dateTime + 86400000,
-              interval: 7200000,
+              interval: 1000 * 60 * 30,
               limit: 12,
               agg: 'SUM',
             },
@@ -408,17 +436,17 @@
   const customerAlarmList = ref([]);
   const customerMessageList = ref([]);
   // 快速选择时间
-  async function quickQueryDate(index: number, value: number, roleType = '') {
+  async function quickQueryDate(
+    index: number,
+    value: number,
+    isCustomer: boolean,
+    interval: number
+  ) {
     if (activeIndex.value === index) return;
     activeIndex.value = index;
     dateValue.value = '';
-    let interval = 300000;
-    if (value === 86400000) {
-      interval = 7200000;
-    } else if (value === 604800000 || value === 2592000000) {
-      interval = 86400000;
-    }
-    if (roleType === 'customer') {
+    console.log(interval);
+    if (isCustomer) {
       if (activeKey.value === '1') {
         const data = await getTrendData({
           startTs: Date.now() - value,

@@ -44,7 +44,7 @@
         type: 'time',
       },
       legend: {
-        data: ['传输数据点', '传输消息量'],
+        data: ['总计传输数据点', '总计传输消息量'],
         left: 'center',
         formatter: (name) => {
           return name === '传输数据点' ? `${name} ${dataPointTotal}` : `${name} ${messageTotal}`;
@@ -60,7 +60,7 @@
       },
       series: [
         {
-          name: '传输数据点',
+          name: '总计传输数据点',
           type: 'line',
           stack: 'total',
           data: props.dataPointList,
@@ -68,7 +68,7 @@
           color: '#5AEEED',
         },
         {
-          name: '传输消息量',
+          name: '总计传输消息量',
           type: 'line',
           stack: 'total',
           // barWidth: '10%',

@@ -18,7 +18,6 @@
             :treeData="treeData"
             :replace-fields="{ title: 'name', key: 'id' }"
             :checkedKeys="roleMenus"
-            @check="handleCheckClick"
             title="菜单分配"
           />
         </Spin>
@@ -31,7 +30,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema, KeysTypeEnum, RoleMenuDictEnum } from './role.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { BasicTree, TreeItem } from '/@/components/Tree';
+  import { BasicTree, TreeActionType, TreeItem } from '/@/components/Tree';
   import { useMessage } from '/@/hooks/web/useMessage';
   const { t } = useI18n(); //加载国际化
   // 加载菜单数据
@@ -55,9 +54,8 @@
       const isUpdate = ref<boolean>(true);
       const treeData = ref<TreeData[]>([]);
       const roleMenus = ref<string[]>([]);
-      const allCheckedKeys = ref<string[]>([]);
       const roleId = ref<string>('');
-      const treeRef = ref();
+      const treeRef = ref<Nullable<TreeActionType>>();
       const checked = ref<string[]>([]); //需要选中的节点
       const spinning = ref(false);
 
@@ -80,7 +78,6 @@
       const { isTenantAdmin, isSysadmin, getRole } = useRole();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(
         async (data: { isUpdate: boolean; record: RoleListItem }) => {
-          allCheckedKeys.value = [];
           resetFields();
           roleId.value = '';
           // 在打开弹窗时清除所有选择的菜单
@@ -129,10 +126,10 @@
               roleId.value = data.record.id;
 
               //通过角色id去获取角色对应的菜单的ids
-              allCheckedKeys.value = roleMenus.value = await getMenusIdsByRoleId(data.record.id);
+              roleMenus.value = await getMenusIdsByRoleId(data.record.id);
               excludeHalfCheckedKeys(unref(treeData));
               await nextTick();
-              treeRef.value.setCheckedKeys(roleMenus.value);
+              unref(treeRef)?.setCheckedKeys(roleMenus.value);
               setFieldsValue(data.record);
             } else {
             }
@@ -150,13 +147,14 @@
         setDrawerProps({ confirmLoading: true });
         const { createMessage } = useMessage();
         try {
+          const menu = (unref(treeRef)?.getCheckedKeys() as string[]) || [];
           const values = await validate();
           const req = {
             id: roleId.value,
             name: values.name,
             remark: values.remark,
             status: values.status,
-            menu: unref(allCheckedKeys) || [],
+            menu,
           };
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           saveOrUpdateRoleInfoWithMenu(req).then(() => {
@@ -170,10 +168,6 @@
           }, 300);
         }
       }
-      // Tree check事件
-      const handleCheckClick = (checkedNodes, { halfCheckedKeys }) => {
-        allCheckedKeys.value = [...checkedNodes, ...halfCheckedKeys];
-      };
 
       const getPermissionByRole = async (roleType: RoleEnum) => {
         try {
@@ -254,8 +248,6 @@
         treeData,
         roleMenus,
         treeRef,
-        handleCheckClick,
-        allCheckedKeys,
       };
     },
   });

@@ -15,7 +15,6 @@
             :treeData="treeData"
             :replaceFields="{ title: 'name', key: 'id' }"
             :checkedKeys="roleMenus"
-            @check="handleCheckClick"
             checkable
             toolbar
             ref="treeRef"
@@ -31,7 +30,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './role.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { BasicTree, TreeItem } from '/@/components/Tree';
+  import { BasicTree, TreeActionType, TreeItem } from '/@/components/Tree';
   const { t } = useI18n(); //加载国际化
   // 加载菜单数据
   import { getAdminMenuList, getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
@@ -55,9 +54,8 @@
       const isUpdate = ref(true);
       const treeData = ref<TreeData[]>([]);
       const roleMenus = ref<string[]>([]);
-      const allCheckedKeys = ref<string[]>([]);
       const roleId = ref('');
-      const treeRef = ref();
+      const treeRef = ref<Nullable<TreeActionType>>(null);
       const checked = ref<string[]>([]); //需要选中的节点
       const spinning = ref(false);
 
@@ -79,7 +77,6 @@
 
       const { isPlatformAdmin } = useRole();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-        allCheckedKeys.value = [];
         resetFields();
         roleId.value = '';
         // 在打开弹窗时清除所有选择的菜单
@@ -111,11 +108,11 @@
             roleId.value = data.record.id;
 
             //通过角色id去获取角色对应的菜单的ids
-            allCheckedKeys.value = roleMenus.value = await getMenusIdsByRoleId(data.record.id);
+            roleMenus.value = await getMenusIdsByRoleId(data.record.id);
             excludeHalfCheckedKeys(unref(treeData));
 
             await nextTick();
-            treeRef.value.setCheckedKeys(roleMenus.value);
+            treeRef.value?.setCheckedKeys(roleMenus.value);
             setFieldsValue(data.record);
           } else {
           }
@@ -131,6 +128,7 @@
         setDrawerProps({ loading: true });
         setDrawerProps({ confirmLoading: true });
         const { createMessage } = useMessage();
+        const menu = (unref(treeRef)?.getCheckedKeys() as string[]) || [];
         try {
           const values = await validate();
           const req = {
@@ -139,7 +137,7 @@
             remark: values.remark,
             status: values.status,
             roleType: RoleEnum.TENANT_ADMIN,
-            menu: unref(allCheckedKeys) || [],
+            menu,
           };
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           const res = await saveOrUpdateRoleInfoWithMenu(req);
@@ -157,10 +155,6 @@
           }, 300);
         }
       }
-      // Tree check事件
-      const handleCheckClick = (checkedNodes, { halfCheckedKeys }) => {
-        allCheckedKeys.value = [...checkedNodes, ...halfCheckedKeys];
-      };
 
       const getPermissionByRole = async (roleType: RoleEnum) => {
         try {
@@ -241,7 +235,6 @@
         treeData,
         roleMenus,
         treeRef,
-        handleCheckClick,
       };
     },
   });