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

Fix/defect 1433

See merge request yunteng/thingskit-scada!96

@@ -15400,7 +15400,7 @@ class HandleDataSource {
 
         dataList.forEach(item => {
             const [timespan, value] = item
-            xAxisData[action](new Date(Number(timespan)).toLocaleTimeString())
+            xAxisData[action](timespan)
             seriesValue[action](Number(value))
         })
         return {
@@ -15435,11 +15435,14 @@ class HandleDataSource {
                 data: xAxisData,
                 boundaryGap: true,
                 axisLabel: {
-                    rotate: 70
+                    formatter(value) {
+                        const date = new Date(Number(value))
+                        return `${date.toLocaleDateString()}\n${date.toLocaleTimeString()}`
+                    }
                 },
                 axisPointer: {
                     label: {
-                        formatter() {
+                        formatter(value) {
                             return attr
                         }
                     }
@@ -15474,7 +15477,7 @@ class HandleDataSource {
 
         for (let i = dataList.length - 1; i >= 0; i--) {
             const [timespan, value] = dataList[i]
-            xAxisData.push(new Date(Number(timespan)).toLocaleTimeString())
+            xAxisData.push(timespan)
             seriesValue.push(Number(value))
         }
 
@@ -15502,7 +15505,11 @@ class HandleDataSource {
                 data: [attrName]
             },
             xAxis: {
-                data: xAxisData
+                data: xAxisData,
+                formatter(value) {
+                    const date = new Date(Number(value))
+                    return `${date.toLocaleDateString()}\n${date.toLocaleTimeString()}`
+                }
             },
             series: [
                 {