Merge remote-tracking branch 'origin/master'

src/views/pms/device/monitor/TdDeviceInfo.vue

@@ -161,7 +161,8 @@ const getChart = async (range) =>{
   loading.value = true
   await IotStatApi.getDeviceInfoChart(params.code, topic.value, range[0], range[1]).then(res=>{
     result.value = res
-      loading.value = false
+    debugger
+    loading.value = false
   })
 }
 // 初始化图表
@@ -180,8 +181,8 @@ const renderChart = async () => {
     tooltip: { trigger: 'axis', },
     xAxis: {
       type: 'category',
-      // data: result.map(d => formatTime(d.timestamp)),
-      data: result.value.map(item => Object.keys(item)[0]),
+      data: result.value.map(d => dayjs(d.timestamp).format('YYYY-MM-DD HH:mm:ss')),
+      // data: result.value.map(item => Object.keys(item)[0]),
       axisLabel: { rotate: 45 }, // X轴标签旋转防止重叠
       inverse: true,
     },
@@ -193,11 +194,11 @@ const renderChart = async () => {
       end: 100   // 初始显示范围结束位置:ml-citation{ref="7" data="citationList"}
     }],
     series: [{
-      // data: result.map(d => d.value),
-      data: result.value.map(item => {
-        const key = Object.keys(item)[0]; // 获取当前元素的key
-        return item[key][0][topic.value]; // 提取value数组中第一个对象的属性
-      }),
+      data: result.value.map(d => d.value),
+      // data: result.value.map(item => {
+      //   const key = Object.keys(item)[0]; // 获取当前元素的key
+      //   return item[key][0][topic.value]; // 提取value数组中第一个对象的属性
+      // }),
       type: 'line',
       smooth: true,
       areaStyle: {} // 显示区域填充