From 5d69e8bee80b76fb852858ca34b4169c2fd0bc83 Mon Sep 17 00:00:00 2001 From: chenJinxu <2183691628@qq.com> Date: Fri, 8 Dec 2023 11:22:15 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20c1=E5=90=8E=E5=8F=B0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=8A=9F=E8=80=97=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=20=20=20=20=20-=20=E7=94=B5=E9=87=8F=E6=9F=A5=E7=9C=8B=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20-=20=E4=BF=AE=E5=A4=8D=20=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=8E=92=E5=BA=8F=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20-=20=E5=BF=83=E7=90=86=E7=9B=91=E6=B5=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20=20=20=20=20-=20=E8=BF=94=E5=9B=9E=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0"=E8=BF=94=E5=9B=9E"=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 ++++++++++- src/config/models.js | 2 +- src/views/gps-card-frontend/device-power/index.scss | 3 +++ src/views/gps-card-frontend/device-power/index.vue | 6 ++++++ src/views/health/psychological/index.vue | 3 ++- src/views/health/psychological/report/index.vue | 3 ++- 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index de64dea..c6dc1f4 100644 --- a/README.md +++ b/README.md @@ -850,4 +850,13 @@ feat `2023.12.7` update - c1后台设备功耗查看页面 - - 优化 设备状态文字 \ No newline at end of file + - 优化 设备状态文字 + +## v1.0.108 +`2023.12.8` +update +- c1后台设备功耗查看页面 + - 电量查看 + - 修复 时间排序错误的问题 +- 心理监测详情 + - 返回 增加"返回"文字 \ No newline at end of file diff --git a/src/config/models.js b/src/config/models.js index 1b9fc2e..8d1ea84 100644 --- a/src/config/models.js +++ b/src/config/models.js @@ -5,7 +5,7 @@ * @FilePath: \TelpoH5FrontendWeb\src\config\models.js * @description: */ -export const VERSION_MODEL = '1.0.107F'; //版本号 +export const VERSION_MODEL = '1.0.108F'; //版本号 export const IMAGE_URL = { production: 'http://zfb.ssjlai.com/web/', test: 'http://zfb.ssjlai.com/web/', diff --git a/src/views/gps-card-frontend/device-power/index.scss b/src/views/gps-card-frontend/device-power/index.scss index e608c81..8162661 100644 --- a/src/views/gps-card-frontend/device-power/index.scss +++ b/src/views/gps-card-frontend/device-power/index.scss @@ -55,6 +55,9 @@ text-align: left; font-weight: bold; padding-left: 1px; + @media screen and (max-width: 550px) and (min-width: 200px){ + font-size: 16px; + } } .echart { height: 30%; diff --git a/src/views/gps-card-frontend/device-power/index.vue b/src/views/gps-card-frontend/device-power/index.vue index 1ba963e..268ee75 100644 --- a/src/views/gps-card-frontend/device-power/index.vue +++ b/src/views/gps-card-frontend/device-power/index.vue @@ -247,12 +247,18 @@ export default { value: item.value, time: this.$dayjs(this.$dayjs(Number(item.time))).format("YYYY/MM/DD hh:mm"), } + }).sort((date1, date2) => { + // 日期升序排序 + return date2.time < date1.time ? 1 : -1 }); this.tableData = result.map(item => { return { value: item.value, time: this.$dayjs(this.$dayjs(Number(item.time))).format("YYYY/MM/DD hh:mm") } + }).sort((date1, date2) => { + // 日期升序排序 + return date2.time < date1.time ? 1 : -1 }).reverse(); } this.xAxisData = this.data.map(item => { diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue index a7d08e1..11476d2 100644 --- a/src/views/health/psychological/index.vue +++ b/src/views/health/psychological/index.vue @@ -1,8 +1,9 @@