Merge branch 'sqy_dev' into 'main'

fix:修改teambition上的几个问题：告警时间范围,消息配置回显错误,首页样式调整以及数据调整

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

 import { alarmLevel, statusType } from '/@/views/device/manage/config/detail.config';
 import { alarmLevel, statusType } from '/@/views/device/manage/config/detail.config';
 import { FormSchema } from '/@/components/Form';
 import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
+import dayjs from 'moment';
 export const alarmSearchSchemas: FormSchema[] = [
 export const alarmSearchSchemas: FormSchema[] = [
   {
   {
     field: 'status',
     field: 'status',
@@ -57,6 +58,7 @@ export const alarmSearchSchemas: FormSchema[] = [
     component: 'DatePicker',
     component: 'DatePicker',
     componentProps: {
     componentProps: {
       valueFormat: 'x',
       valueFormat: 'x',
+      showTime: { defaultValue: dayjs('23:59:59', 'HH:mm:ss') },
     },
     },
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },

@@ -18,6 +18,7 @@ export const formSchema: FormSchema[] = [
     label: '',
     label: '',
     component: 'ApiTreeSelect',
     component: 'ApiTreeSelect',
     componentProps: {
     componentProps: {
+      placeholder: '请选择组织',
       api: async () => {
       api: async () => {
         const data = await getOrganizationList();
         const data = await getOrganizationList();
         copyTransFun(data as any as any[]);
         copyTransFun(data as any as any[]);

@@ -8,7 +8,11 @@
         <div class="flex-auto">
         <div class="flex-auto">
           <div class="flex justify-between" style="align-items: center">
           <div class="flex justify-between" style="align-items: center">
             <div style="font-size: 1.625rem; color: #333; font-weight: bold">
             <div style="font-size: 1.625rem; color: #333; font-weight: bold">
-              <CountTo :startVal="1" :endVal="growCardList?.deviceInfo?.sumCount" />
+              <CountTo
+                v-if="growCardList?.deviceInfo?.sumCount"
+                :endVal="growCardList.deviceInfo.sumCount"
+              />
+              <CountTo v-else :endVal="0" />
             </div>
             </div>
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
           </div>
           </div>
@@ -54,10 +58,18 @@
         <div class="flex-auto">
         <div class="flex-auto">
           <div class="flex justify-between" style="align-items: center">
           <div class="flex justify-between" style="align-items: center">
             <div v-if="!isAdmin(role)" style="font-size: 1.625rem; color: #333; font-weight: bold">
             <div v-if="!isAdmin(role)" style="font-size: 1.625rem; color: #333; font-weight: bold">
-              <CountTo :end-val="growCardList?.alarmInfo?.sumCount" />
+              <CountTo
+                v-if="growCardList?.alarmInfo?.sumCount"
+                :end-val="growCardList.alarmInfo.sumCount"
+              />
+              <CountTo v-else :end-val="0" />
             </div>
             </div>
             <div style="font-size: 1.625rem; color: #333; font-weight: bold" v-else>
             <div style="font-size: 1.625rem; color: #333; font-weight: bold" v-else>
-              <CountTo :end-val="growCardList?.tenantInfo?.sumCount" />
+              <CountTo
+                v-if="growCardList?.tenantInfo?.sumCount"
+                :end-val="growCardList.tenantInfo.sumCount"
+              />
+              <CountTo v-else :end-val="0" />
             </div>
             </div>
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
           </div>
           </div>
@@ -84,23 +96,33 @@
           <div>
           <div>
             <div style="align-items: center">
             <div style="align-items: center">
               <div style="font-size: 1.625rem; color: #333; font-weight: bold">
               <div style="font-size: 1.625rem; color: #333; font-weight: bold">
-                <CountTo :end-val="growCardList?.messageInfo?.messageCount"
-              /></div>
+                <CountTo
+                  v-if="growCardList?.messageInfo?.messageCount"
+                  :end-val="growCardList.messageInfo.messageCount"
+                />
+                <CountTo v-else :end-val="0" />
+              </div>
               消息量（条）
               消息量（条）
             </div>
             </div>
             <div>
             <div>
               <span class="mr-2">数据点</span>
               <span class="mr-2">数据点</span>
               <CountTo
               <CountTo
                 style="color: #333; font-weight: bold"
                 style="color: #333; font-weight: bold"
-                :end-val="growCardList?.messageInfo?.dataPointsCount"
+                v-if="growCardList?.messageInfo?.dataPointsCount"
+                :end-val="growCardList.messageInfo.dataPointsCount"
               />
               />
+              <CountTo style="color: #333; font-weight: bold" :end-val="0" v-else />
             </div>
             </div>
           </div>
           </div>
         </div>
         </div>
         <div class="flex-auto" v-else>
         <div class="flex-auto" v-else>
           <div class="flex justify-between" style="align-items: center">
           <div class="flex justify-between" style="align-items: center">
             <div style="font-size: 1.625rem; color: #333; font-weight: bold">
             <div style="font-size: 1.625rem; color: #333; font-weight: bold">
-              <CountTo :end-val="growCardList?.customerInfo?.sumCount" />
+              <CountTo
+                v-if="growCardList?.customerInfo?.sumCount"
+                :end-val="growCardList.customerInfo.sumCount"
+              />
+              <CountTo :end-val="0" v-else />
             </div>
             </div>
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
           </div>
           </div>

@@ -54,13 +54,9 @@
         </CardMeta>
         </CardMeta>
       </Card>
       </Card>
     </div>
     </div>
-
     <Card v-else :bordered="false" :bodyStyle="{ padding: 0 }" v-bind="$attrs">
     <Card v-else :bordered="false" :bodyStyle="{ padding: 0 }" v-bind="$attrs">
       <Skeleton active :paragraph="{ rows: 10 }" :loading="!tenantTop10.length">
       <Skeleton active :paragraph="{ rows: 10 }" :loading="!tenantTop10.length">
-        <h1 style="color: rgba(0, 0, 0, 0.85); font-weight: bold; font-size: 16px">
-          租户消息量TOP10</h1
-        >
-        <Descriptions :column="1">
+        <Descriptions :column="1" style="min-height: 180px" title="租户消息量TOP10">
           <template v-for="(item, index) in tenantTop10" :key="item.name">
           <template v-for="(item, index) in tenantTop10" :key="item.name">
             <DescriptionsItem>
             <DescriptionsItem>
               <span
               <span

@@ -235,7 +235,6 @@
           }
           }
           state.dataPointList = newArray;
           state.dataPointList = newArray;
           state.messageList = newArray1;
           state.messageList = newArray1;
-          console.log(state.dataPointList, state.messageList);
         }
         }
       }
       }
     },
     },

@@ -44,6 +44,7 @@
       series: [
       series: [
         {
         {
           name: '告警数',
           name: '告警数',
+          barMaxWidth: '4%',
           type: 'bar',
           type: 'bar',
           stack: 'Total',
           stack: 'Total',
           data: props.alarmList,
           data: props.alarmList,
@@ -78,6 +79,7 @@
             type: 'bar',
             type: 'bar',
             stack: 'Total',
             stack: 'Total',
             color: '#3C78FF',
             color: '#3C78FF',
+            barMaxWidth: '4%',
             data: newValue,
             data: newValue,
           },
           },
         ],
         ],

@@ -67,12 +67,14 @@
             type: 'bar',
             type: 'bar',
             stack: 'total',
             stack: 'total',
             data: newValue,
             data: newValue,
+            barMaxWidth: '4%',
             color: '#5AEEED',
             color: '#5AEEED',
           },
           },
           {
           {
             name: '传输消息量',
             name: '传输消息量',
             type: 'bar',
             type: 'bar',
             stack: 'total',
             stack: 'total',
+            barMaxWidth: '4%',
             data: newValue1,
             data: newValue1,
             color: '#3C78FF',
             color: '#3C78FF',
           },
           },

@@ -3,6 +3,7 @@ import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { getCustomerList } from '/@/api/device/deviceManager';
 import { getCustomerList } from '/@/api/device/deviceManager';
+import dayjs from 'moment';
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
     title: '设备名称',
     title: '设备名称',
@@ -99,6 +100,7 @@ export const alarmSearchSchemas: FormSchema[] = [
     component: 'DatePicker',
     component: 'DatePicker',
     componentProps: {
     componentProps: {
       valueFormat: 'x',
       valueFormat: 'x',
+      showTime: { defaultValue: dayjs('23:59:59', 'HH:mm:ss') },
     },
     },
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },
@@ -217,7 +219,7 @@ export const childDeviceSchemas: FormSchema[] = [
     field: 'icon',
     field: 'icon',
     label: '设备配置',
     label: '设备配置',
     component: 'Select',
     component: 'Select',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: {
     componentProps: {
       maxLength: 255,
       maxLength: 255,
     },
     },
@@ -226,7 +228,7 @@ export const childDeviceSchemas: FormSchema[] = [
     field: 'icon',
     field: 'icon',
     label: '设备名称',
     label: '设备名称',
     component: 'Input',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: {
     componentProps: {
       maxLength: 255,
       maxLength: 255,
       placeholder: '请输入设备名称',
       placeholder: '请输入设备名称',

@@ -41,13 +41,13 @@ export const columns: BasicColumn[] = [
   {
   {
     title: '最后连接时间',
     title: '最后连接时间',
     dataIndex: 'lastOnlineTime',
     dataIndex: 'lastOnlineTime',
-    format: (text) => formatToDate(text, 'YYYY-MM-DD HH:mm:ss'),
+    format: (text) => text && formatToDate(text, 'YYYY-MM-DD HH:mm:ss'),
     width: 180,
     width: 180,
   },
   },
   {
   {
     title: '最后断开时间',
     title: '最后断开时间',
     dataIndex: 'lastOfflineTime',
     dataIndex: 'lastOfflineTime',
-    format: (text) => formatToDate(text, 'YYYY-MM-DD HH:mm:ss'),
+    format: (text) => text && formatToDate(text, 'YYYY-MM-DD HH:mm:ss'),
     width: 180,
     width: 180,
   },
   },
 ];
 ];
@@ -84,7 +84,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'name',
     field: 'name',
     label: '设备名称',
     label: '设备名称',
     component: 'Input',
     component: 'Input',
-    colProps: { span: 7 },
+    colProps: { span: 6 },
     componentProps: {
     componentProps: {
       maxLength: 255,
       maxLength: 255,
       placeholder: '请输入设备名称',
       placeholder: '请输入设备名称',

@@ -163,7 +163,6 @@
         actionColumn: {
         actionColumn: {
           width: 300,
           width: 300,
           title: '操作',
           title: '操作',
-          dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },
           fixed: 'right',
           fixed: 'right',
         },
         },

@@ -36,34 +36,13 @@
         setDrawerProps({ confirmLoading: false });
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
         isUpdate.value = !!data?.isUpdate;
         if (unref(isUpdate)) {
         if (unref(isUpdate)) {
-          console.log(data);
-          // const config = data.record.config;
-          // for (const key in config) {
-          //   Reflect.set(data.record, key + '', config[key]);
-          // }
-          // await setFieldsValue({
-          //   ...data.record,
-          // });
-          await setFieldsValue({
-            accessKeyId: data.record.config.accessKeyId,
-            accessKeySecret: data.record.config.accessKeySecret,
-            platformTypeDictText: data.record.platformTypeDictText,
-            messageTypeDictText: data.record.messageTypeDictText,
-            messageType: data.record.messageType,
-            platformType: data.record.platformType,
-            configName: data.record.configName,
-            createTime: data.record.createTime,
-            creator: data.record.creator,
-            enabled: data.record.enabled,
-            id: data.record.id,
-            key: data.record.key,
-            pendingStatus: data.record.pendingStatus,
-            remark: data.record.remark,
-            status: data.record.status,
-            tenantId: data.record.tenantId,
-            updateTime: data.record.updateTime,
-            updater: data.record.updater,
-          });
+          const { config } = data.record;
+          for (const key in config) {
+            Reflect.set(data.record, key + '', config[key]);
+          }
+          const editRecord = JSON.parse(JSON.stringify(data.record));
+          Reflect.deleteProperty(editRecord, 'config');
+          await setFieldsValue(editRecord);
         }
         }
       });
       });
 
 

@@ -90,13 +90,13 @@ export const searchFormSchema: FormSchema[] = [
     field: 'status',
     field: 'status',
     label: '状态',
     label: '状态',
     component: 'Select',
     component: 'Select',
+    colProps: { span: 6 },
     componentProps: {
     componentProps: {
       options: [
       options: [
         { label: '已启用', value: 1 },
         { label: '已启用', value: 1 },
         { label: '已禁用', value: 0 },
         { label: '已禁用', value: 0 },
       ],
       ],
     },
     },
-    colProps: { span: 6 },
   },
   },
 ];
 ];
 
 
@@ -156,7 +156,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 36,
       maxLength: 36,
       placeholder: '请输入accessKeyId',
       placeholder: '请输入accessKeyId',
     },
     },
-
     ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
     ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   },
   {
   {
@@ -205,7 +204,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 255,
       maxLength: 255,
       placeholder: '请输入用户名',
       placeholder: '请输入用户名',
     },
     },
-
     component: 'Input',
     component: 'Input',
     ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
     ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
   },
@@ -213,7 +211,6 @@ export const formSchema: FormSchema[] = [
     field: 'password',
     field: 'password',
     label: '密码',
     label: '密码',
     required: true,
     required: true,
-
     component: 'InputPassword',
     component: 'InputPassword',
     ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
     ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
   },
   },
@@ -256,7 +253,6 @@ export const formSchema: FormSchema[] = [
       maxLength: 255,
       maxLength: 255,
       placeholder: '请输入备注',
       placeholder: '请输入备注',
     },
     },
-
     component: 'InputTextArea',
     component: 'InputTextArea',
   },
   },
   {
   {

@@ -97,7 +97,7 @@
       function showData(record: Recordable) {
       function showData(record: Recordable) {
         Modal.info({
         Modal.info({
           title: '当前配置',
           title: '当前配置',
-          width: 480,
+          width: 600,
           content: h(JsonPreview, { data: JSON.parse(JSON.stringify(record.config)) }),
           content: h(JsonPreview, { data: JSON.parse(JSON.stringify(record.config)) }),
         });
         });
       }
       }