diff --git a/README.md b/README.md index b71eb3d..47a3400 100644 --- a/README.md +++ b/README.md @@ -873,6 +873,18 @@ update - 增加 无数据文字提示 ## v1.0.110 +`2023.12.13` +update +- 设备设置列表 + - 优化 全部接口响应完成才加载完成 + +## v1.0.111 +`2023.12.15` +fix +- 设备设置列表 + - 修复 接口未响应完成提示加载完成 + +## v1.0.112 `2023.12.28` update - 心理监测首页 @@ -884,3 +896,27 @@ update update - 心理监测详情，周报 - 修改 legend图例位置 + +## v1.0.114 +`2024.1.3` +fix +- 心理监测详情 + - 修复 心理切换按钮导致 ”今天“ 日期参数异常的问题 + + +## v1.0.115 +`2024.1.4` +fix +- c1后台设备功耗查看页面 + - 修复 设备状态时间戳转换错误的问题 + +## v1.0.116 +`2024.1.26` +update +- ‘焦虑’文字改成‘抑郁’ + + +## v1.0.117 +`2024.3.21` +update +- ‘抑郁’文字 通过页面传过来的参数 改成‘焦虑’，否则不变 diff --git a/setup_development.sh b/setup_development.sh index d43b908..5f1276d 100644 --- a/setup_development.sh +++ b/setup_development.sh @@ -7,7 +7,7 @@ # @description: ### npm -v -npm config set registry https://registry.npm.taobao.org +npm config set registry https://registry.npmmirror.com npm install npm run build-dev image_version=`date +%Y%m%d%H%M`; diff --git a/setup_production.sh b/setup_production.sh index 1a9109f..49bb0e8 100644 --- a/setup_production.sh +++ b/setup_production.sh @@ -7,7 +7,7 @@ # @description: ### npm -v -npm config set registry https://registry.npm.taobao.org +npm config set registry https://registry.npmmirror.com npm install npm run build image_version=$version; diff --git a/setup_test.sh b/setup_test.sh index c0cae5b..e053b20 100644 --- a/setup_test.sh +++ b/setup_test.sh @@ -8,7 +8,7 @@ ### #!/bin/bash npm -v -npm config set registry https://registry.npm.taobao.org +npm config set registry https://registry.npmmirror.com npm install npm run build-test image_version=$version; diff --git a/src/config/models.js b/src/config/models.js index 99029a1..4bde4dd 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.114F'; //版本号 +export const VERSION_MODEL = '1.0.117F'; //版本号 export const IMAGE_URL = { production: 'http://zfb.ssjlai.com/web/', test: 'http://zfb.ssjlai.com/web/', @@ -24,15 +24,16 @@ export const BaiduStatisticsModel = { test: "https://hm.baidu.com/hm.js?edb76b471e997167b7782c1513382771", // 随手精灵百度流量统计 测试环境 development: "https://hm.baidu.com/hm.js?edb76b471e997167b7782c1513382771", // 随手精灵百度流量统计 测试环境 }; -// 情绪模型 + +// 抑郁文字 export const EmotionModel = { // 抑郁 depression: { name: '抑郁', type: 2, - title1: '抑郁倾向', + title1: `抑郁倾向`, article1: `

设备所检测的是个体的抑郁倾向。通过将个人的生理特征（脉搏波、心率变异性等）和行为习惯（运动、作息等）与临床诊断为抑郁症的患者的相应特征进行对比，判断出个体的抑郁倾向（即抑郁症的可能性）程度。抑郁倾向持续的时间越长、程度越严重，代表患有抑郁症的风险就越大。

`, - title2: '抑郁倾向算法原理', + title2: `抑郁倾向算法原理`, article2: `

1．研究发现，抑郁症等情绪障碍可能会引起个体外周生理系统反应的钝化，因此患者可能在面临危险、压力等应激状态下表现出较低的生理反应唤醒水平。这一点能够通过皮肤电、心率变异性等生理特征的周期性变化来判断。

2．抑郁症等情绪障碍的患者会出现明显的失眠、运动少、和生物钟紊乱，算法能够有效分析判断出这些异常的行为特征。

` diff --git a/src/main.js b/src/main.js index 6a66672..1e17f7e 100644 --- a/src/main.js +++ b/src/main.js @@ -14,9 +14,10 @@ import '@/assets/css/reset.scss'; import dayjs from 'dayjs'; // ui库按需引入 import 'vant/lib/index.css'; +import { replaceAll } from '@/utils'; // 引入echarts import * as echarts from 'echarts'; -import { BaiduStatisticsModel } from '@/config/models'; +import { BaiduStatisticsModel} from '@/config/models'; import { Button, Calendar, @@ -128,6 +129,7 @@ Vue.config.productionTip = false; Vue.prototype.$dayjs = dayjs; Vue.prototype.$echarts = echarts; Vue.prototype.$bus = new Vue(); +Vue.prototype.$replaceAll = replaceAll; router.afterEach((to, from, next) => { // 创建百度统计js setTimeout(()=>{ diff --git a/src/store/index.js b/src/store/index.js index fadbe53..04eb52a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -24,6 +24,7 @@ export default new Vuex.Store({ fromSsjl: '', active: null, //点击左边树形图下标 tabClick: '', //心理监测点击tab + appType: '', //应用类型 }, mutations: { imei(state, imei) { @@ -70,6 +71,11 @@ export default new Vuex.Store({ state.tabClick = tabClick; window.localStorage[prefix + 'tabClick'] = tabClick; }, + appType(state, appType) { + state.appType = appType; + window.localStorage[prefix + 'appType'] = appType; + }, + }, getters: { @@ -117,7 +123,11 @@ export default new Vuex.Store({ if (state.tabClick != '') return state.tabClick; return window.localStorage[prefix + 'tabClick'] == null ? '' : window.localStorage[prefix + 'tabClick']; }, - + appType: state => { + if (state.appType != '') return state.appType; + return window.localStorage[prefix + 'appType'] == null ? '' : window.localStorage[prefix + 'appType']; + }, + }, actions: {}, modules: {} diff --git a/src/utils/index.js b/src/utils/index.js index db99691..0666ba1 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -5,7 +5,7 @@ * @FilePath: \AntpayFrontEnd\src\utils\index.js * @description: 工具类 */ - +import store from "@/store"; /** * 判断是否为空 @@ -88,4 +88,34 @@ export function isShowAntpay(array) { } else { return false; } -} \ No newline at end of file +} + +// 将传入内容的某个文字全部替换成指定的文字 +/** + * + * @param {*} target 目标字符串 + * @param {*} searchValue 要搜索和替换的子串 + * @param {*} replacement 替换的新字符串 + * @returns + */ +export function replaceAll(target, searchValue, replacement) { + // 应用类型，目前1 是健康好蕴，其他则不替换 + const appTypeList = ['1']; + const appType = store.getters.appType; + if(appTypeList.indexOf(appType) > -1) { + if(isNotNull(target) && isNotNull(searchValue)) { + if(target.includes(searchValue)) { + return target.replace(new RegExp(searchValue, 'g'), replacement); + } else { + return target + } + + } else { + return target + } + + } else { + return target + } + + } \ No newline at end of file diff --git a/src/views/gps-card-frontend/device-power/index.vue b/src/views/gps-card-frontend/device-power/index.vue index d1483a2..8389aa9 100644 --- a/src/views/gps-card-frontend/device-power/index.vue +++ b/src/views/gps-card-frontend/device-power/index.vue @@ -19,37 +19,20 @@
- +
- {{ item.text }} + {{ item.text }}
-
-

+

+

最近一次离线时间：{{ lastTime }}

@@ -103,7 +86,7 @@ export default { created() { this.loadParams(); }, - mounted() {}, + mounted() { }, methods: { loadParams() { let params = this.$route.query; @@ -141,6 +124,7 @@ export default { ) { this.filterData = data[this.echarts.type].data /* .list.propertyInfo */; + console.log("this.filterData", this.filterData); } else if (this.echarts.type === "offline") { this.filterData = data.Offline.data; } @@ -398,24 +382,22 @@ export default { }, formatter: function (params) { return `${params[0].marker}${params[0].data.time}
- ${ - params[0].data.type === "offline" - ? "最近离线时间:" + params[0].data.lastTime - : "" - }
- ${ - params[0].data.type === "offline" - ? "离线次数:" + params[0].data.value + "次" - : params[0].data.type === "status" - ? "rssi值:" + params[0].data.value - : "电量:" + params[0].data.value - }`; + ${params[0].data.type === "offline" + ? "最近离线时间:" + params[0].data.lastTime + : "" + }
+ ${params[0].data.type === "offline" + ? "离线次数:" + params[0].data.value + "次" + : params[0].data.type === "status" + ? "rssi值:" + params[0].data.value + : "电量:" + params[0].data.value + }`; }, }, }; } }) - .catch(() => {}) + .catch(() => { }) .finally(() => { this.$toast.clear(); }); diff --git a/src/views/gps-card-frontend/device-setting/index.vue b/src/views/gps-card-frontend/device-setting/index.vue index 7c82063..082126c 100644 --- a/src/views/gps-card-frontend/device-setting/index.vue +++ b/src/views/gps-card-frontend/device-setting/index.vue @@ -8,16 +8,17 @@