Merge branch 'feat-c1' into test

src/views/gps-card-frontend/device-power/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-10-10 15:29:50
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-10-13 14:41:57
+ * @LastEditTime: 2023-10-16 10:47:19
  * @FilePath: \TelpoH5FrontendWeb\src\views\gps-card-frontend\device-power\index.vue
  * @description:
 -->
@@ -28,7 +28,7 @@
                 </div>
             </div>
         </div>
-        <div class="details-container" v-if="data.length > 0">
+        <div class="details-container" v-if="btnActive === 0 && data.length > 0 || tableData.length > 0 && btnActive === 1">
             <Echart :option="chartOption" v-show="btnActive === 0"/>
             <Table :columns="titleList" :data="tableData" v-show="btnActive === 1"/>
         </div>
@@ -135,7 +135,8 @@ export default {
                             value: item.value,
                             time: this.$dayjs(this.$dayjs(Number(item.time))).format("YYYY/MM/DD hh:mm")
                         }
-                    });
+                    }).reverse();
+                    console.log("this.filterData", this.filterData, this.tableData);
                     // 图表筛选过滤只显示 rssi <= 2的数据
                     this.data = this.filterData.map(item => {
                         // 序列化json
@@ -198,7 +199,7 @@ export default {
                     }, []).sort(function(date1, date2) {
                         // 日期升序排序
                         return date2.time < date1.time ? 1 : -1
-                    });
+                    }).reverse();
                 } else {
                     this.titleList = [
                         { title: '时间', width: '40%', key: 'time'},
@@ -223,7 +224,7 @@ export default {
                             value: item.value,
                             time: this.$dayjs(this.$dayjs(Number(item.time))).format("YYYY/MM/DD hh:mm")
                         }
-                    });
+                    }).reverse();
                 }
                 this.xAxisData = this.data.map(item => {
                     return this.$dayjs(item.time).format("MM/DD");