diff --git a/common/api/message.js b/common/api/message.js index 5dd92ed..ea068bb 100644 --- a/common/api/message.js +++ b/common/api/message.js @@ -7,7 +7,7 @@ import config from '../js/config'; */ export function updateStatus(eventIds) { return request({ - url: 'cs-harmonic-boot/eventUser/updateStatus', + url: '/cs-harmonic-boot/eventUser/updateStatus', method: 'post', header: { 'Content-Type': 'application/json', diff --git a/manifest.json b/manifest.json index 461b613..60d65b1 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "灿能物联", "appid" : "__UNI__88BC25B", "description" : "", - "versionName" : "1.2.9", - "versionCode" : 129, + "versionName" : "1.3.1", + "versionCode" : 131, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 876b882..ada19fc 100644 --- a/pages.json +++ b/pages.json @@ -214,7 +214,7 @@ { "path": "pages/message/reportDetail", "style": { - "navigationBarTitleText": "异常设备详情" + "navigationBarTitleText": "设备告警详情" } }, { @@ -394,7 +394,7 @@ { "path": "pages/message/steadyDetail", "style": { - "navigationBarTitleText": "越限监测点详情" + "navigationBarTitleText": "稳态事件详情" } }, { diff --git a/pages/message/report.vue b/pages/message/report.vue index f919b93..316aa87 100644 --- a/pages/message/report.vue +++ b/pages/message/report.vue @@ -50,7 +50,7 @@ export default { }, jump(item) { let str = JSON.stringify(item).replace(/%/g, '百分比') - uni.navigateTo({ url: '/pages/message/steadyDetail?detail=' + encodeURIComponent(str) }) + uni.navigateTo({ url: '/pages/message/reportDetail?detail=' + encodeURIComponent(str) }) }, }, } diff --git a/pages/message/reportDetail.vue b/pages/message/reportDetail.vue index 92ad923..27fc054 100644 --- a/pages/message/reportDetail.vue +++ b/pages/message/reportDetail.vue @@ -7,13 +7,13 @@ 基础信息 - {{ detail.showName }} - - {{ item.showName + ':' + item.value + (item.unit || '') }} - 设备名称:{{ detail.equipmentName }} 项目名称:{{ detail.projectName }} 工程名称:{{ detail.engineeringName }} + 告警名称:{{ detail.showName }} + + {{ item.showName + ':' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }} + diff --git a/pages/message/runDetail.vue b/pages/message/runDetail.vue index 92ad923..2b4510a 100644 --- a/pages/message/runDetail.vue +++ b/pages/message/runDetail.vue @@ -7,13 +7,13 @@ 基础信息 - {{ detail.showName }} - - {{ item.showName + ':' + item.value + (item.unit || '') }} - 设备名称:{{ detail.equipmentName }} 项目名称:{{ detail.projectName }} 工程名称:{{ detail.engineeringName }} + 事件名称:{{ detail.showName }} + + {{ item.showName + ':' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }} + diff --git a/pages/message/steadyDetail.vue b/pages/message/steadyDetail.vue index 92ad923..2b4510a 100644 --- a/pages/message/steadyDetail.vue +++ b/pages/message/steadyDetail.vue @@ -7,13 +7,13 @@ 基础信息 - {{ detail.showName }} - - {{ item.showName + ':' + item.value + (item.unit || '') }} - 设备名称:{{ detail.equipmentName }} 项目名称:{{ detail.projectName }} 工程名称:{{ detail.engineeringName }} + 事件名称:{{ detail.showName }} + + {{ item.showName + ':' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }} + diff --git a/pages/message/transient.vue b/pages/message/transient.vue index cd9a80a..073c8b7 100644 --- a/pages/message/transient.vue +++ b/pages/message/transient.vue @@ -11,7 +11,9 @@ > - {{ item2.showName + ':' + item2.value + (item2.unit || '') }} + {{ + item2.showName + ':' + (item2.value == 3.1415926 ? '-' : item2.value) + (item2.unit || '') + }} diff --git a/pages/message/transientDetail.vue b/pages/message/transientDetail.vue index 808246b..75b5756 100644 --- a/pages/message/transientDetail.vue +++ b/pages/message/transientDetail.vue @@ -7,13 +7,13 @@ 基础信息 - {{ detail.showName }} - - {{ item.showName + ':' + item.value + (item.unit || '') }} - 设备名称:{{ detail.equipmentName }} 项目名称:{{ detail.projectName }} 工程名称:{{ detail.engineeringName }} + 事件名称:{{ detail.showName }} + + {{ item.showName + ':' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }} + 瞬时波形图