Merge branch 'fix/DEFECT-1462' into 'main_dev'

fix: 实时数据折线图时间显示改为日期加时间

See merge request yunteng/thingskit-front!775

@@ -146,7 +146,7 @@
       series.value.forEach((item) => {
       series.value.forEach((item) => {
         if (item.id === deviceId && item.attribute === attribute && value) {
         if (item.id === deviceId && item.attribute === attribute && value) {
           item.data.push({
           item.data.push({
-            name: formatToDateTime(list.time, 'HH:mm:ss'),
+            name: formatToDateTime(list.time, 'YYYY-MM-DD HH:mm:ss'),
             value: value,
             value: value,
           });
           });
           if (item.data.length > unref(maxDataPoints)) {
           if (item.data.length > unref(maxDataPoints)) {
@@ -155,7 +155,7 @@
         }
         }
       });
       });
     });
     });
-    list.time && timeList.value.push(formatToDateTime(list.time, 'HH:mm:ss'));
+    list.time && timeList.value.push(formatToDateTime(list.time, 'YYYY-MM-DD HH:mm:ss'));
     if (unref(timeList).length > unref(maxDataPoints)) {
     if (unref(timeList).length > unref(maxDataPoints)) {
       timeList.value.shift();
       timeList.value.shift();
     }
     }

@@ -89,10 +89,10 @@
     return isBoolean(flag) ? flag : true;
     return isBoolean(flag) ? flag : true;
   });
   });
 
 
-  const isAlarm = computed(() => {
+  const isAlarmHistory = computed(() => {
     const frontId = props.sourceInfo.frontId;
     const frontId = props.sourceInfo.frontId;
     if (
     if (
-      frontId == 'DeviceAlarm' ||
+      // frontId == 'DeviceAlarm' ||
       frontId == 'DeviceAlarmHistory' ||
       frontId == 'DeviceAlarmHistory' ||
       frontId == 'StatisticsComponent7'
       frontId == 'StatisticsComponent7'
     ) {
     ) {
@@ -101,6 +101,14 @@
       return false;
       return false;
     }
     }
   });
   });
+  const isAlarm = computed(() => {
+    const frontId = props.sourceInfo.frontId;
+    if (frontId == 'DeviceAlarm') {
+      return false;
+    } else {
+      return true;
+    }
+  });
 
 
   async function handleCopy() {
   async function handleCopy() {
     const id = props.sourceInfo.id;
     const id = props.sourceInfo.id;
@@ -150,8 +158,11 @@
       </Tooltip>
       </Tooltip>
 
 
       <div v-if="!getIsSharePage" class="flex items-center w-16 justify-evenly">
       <div v-if="!getIsSharePage" class="flex items-center w-16 justify-evenly">
-        <Tooltip v-if="!isCustomerUser && hasTrendQueryIcon" :title="isAlarm ? '时间' : '趋势'">
-          <FieldTimeOutlined v-if="isAlarm" class="text-lg" @click="handleAlarmModal" />
+        <Tooltip
+          v-if="!isCustomerUser && hasTrendQueryIcon && isAlarm"
+          :title="isAlarmHistory ? '时间' : '趋势'"
+        >
+          <FieldTimeOutlined v-if="isAlarmHistory" class="text-lg" @click="handleAlarmModal" />
           <AreaChartOutlined v-else class="text-lg" @click="handleOpenTrendModal" />
           <AreaChartOutlined v-else class="text-lg" @click="handleOpenTrendModal" />
         </Tooltip>
         </Tooltip>
         <AuthDropDown
         <AuthDropDown