diff --git a/pages/message/run.vue b/pages/message/run.vue index 316e7f4..0a291fe 100644 --- a/pages/message/run.vue +++ b/pages/message/run.vue @@ -1,30 +1,26 @@ - \ No newline at end of file +/deep/ .uni-badge { + background-color: unset !important; + color: #dd524d !important; + font-size: 28rpx !important; +} + diff --git a/pages/message/runDetail.vue b/pages/message/runDetail.vue index c1cddcd..c91f287 100644 --- a/pages/message/runDetail.vue +++ b/pages/message/runDetail.vue @@ -7,24 +7,13 @@ 基础信息 - {{ detail.title }} - - {{ detail.engineeringName + '' + detail.projectName }} - + {{ detail.showName }} + 设备名称:{{ detail.title }} + 项目名称:{{ detail.projectName }} + 工程名称:{{ detail.engineeringName }} {{ item.showName + ':' + item.value + (item.unit || '') }} - - - - 瞬时波形图 - - - - RMS波形图 - @@ -43,7 +32,9 @@ export default { console.log(options.detail) this.detail = JSON.parse(decodeURIComponent(options.detail).replace(/百分比/g, '%')) this.loading = false - updateStatus([this.detail.id]) + if (this.detail.status != 1) { + updateStatus([this.detail.id]) + } }, methods: {}, } diff --git a/pages/message/transient.vue b/pages/message/transient.vue index fe1f03c..a394ef9 100644 --- a/pages/message/transient.vue +++ b/pages/message/transient.vue @@ -3,16 +3,13 @@ - - {{ item.engineeringName + '' + item.projectName }} - {{ item2.showName + ':' + item2.value + (item2.unit || '') }} @@ -45,7 +42,7 @@ export default { this.store.params.type = 0 this.store.firstCallBack = (res) => { this.store.data.forEach((item) => { - item.title = item.equipmentName + dictData.find((item2) => item2.code === item.tag)?.name + item.title = dictData.find((item2) => item2.code === item.tag)?.name }) console.log(this.store.data) this.loading = false diff --git a/pages/message/transientDetail.vue b/pages/message/transientDetail.vue index 8ade0bd..80a2ec7 100644 --- a/pages/message/transientDetail.vue +++ b/pages/message/transientDetail.vue @@ -1,54 +1,57 @@ - \ No newline at end of file +