Browse Source

update

- c1后台设备功耗查看页面
    - 电量查看
        - 修复 时间排序错误的问题
- 心理监测详情
    - 返回 增加"返回"文字
test
chenJinxu 11 months ago
parent
commit
5d69e8bee8
6 changed files with 24 additions and 4 deletions
  1. +10
    -1
      README.md
  2. +1
    -1
      src/config/models.js
  3. +3
    -0
      src/views/gps-card-frontend/device-power/index.scss
  4. +6
    -0
      src/views/gps-card-frontend/device-power/index.vue
  5. +2
    -1
      src/views/health/psychological/index.vue
  6. +2
    -1
      src/views/health/psychological/report/index.vue

+ 10
- 1
README.md View File

@@ -850,4 +850,13 @@ feat
`2023.12.7`
update
- c1后台设备功耗查看页面
- 优化 设备状态文字
- 优化 设备状态文字

## v1.0.108
`2023.12.8`
update
- c1后台设备功耗查看页面
- 电量查看
- 修复 时间排序错误的问题
- 心理监测详情
- 返回 增加"返回"文字

+ 1
- 1
src/config/models.js View File

@@ -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/',


+ 3
- 0
src/views/gps-card-frontend/device-power/index.scss View File

@@ -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%;


+ 6
- 0
src/views/gps-card-frontend/device-power/index.vue View File

@@ -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 => {


+ 2
- 1
src/views/health/psychological/index.vue View File

@@ -1,8 +1,9 @@
<template>
<div class="psychological-container">
<van-nav-bar :title="emoName + '监测'" :border="true" :left-arrow="true" @click-left="onNavBack">
<van-nav-bar :title="emoName + '监测'" :border="true" :left-arrow="true" @click-left="onNavBack">
<template #left>
<van-icon name="arrow-left" size="24" style="padding: 0"/>
<span>返回</span>
</template>
</van-nav-bar>
<div class="tab-bar">


+ 2
- 1
src/views/health/psychological/report/index.vue View File

@@ -8,9 +8,10 @@
<template>
<!-- 周/月报 -->
<div class="report">
<van-nav-bar title="心理监测周报" :border="true" @click-left="onNavBack">
<van-nav-bar title="心理监测周报" :border="true" @click-left="onNavBack">
<template #left >
<van-icon name="arrow-left" size="24" style="padding: 0" v-show="params.isShowLeft"/>
<span v-show="params.isShowLeft">返回</span>
</template>
</van-nav-bar>
<div class="main">


Loading…
Cancel
Save