From 276ef603890683c0554592d9b0a1eb6a4f8522fa Mon Sep 17 00:00:00 2001 From: guanj Date: Fri, 29 May 2026 16:23:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=98=E5=88=B6=E5=85=B3=E9=94=AE=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E6=A6=82=E8=A7=88=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api/harmonic.js | 12 +- .../Cn-MultipleTree/Cn-MultipleTree.vue | 79 +- components/Cn-device-card/Cn-device-card.vue | 12 +- .../Cn-filterInformation.vue | 2 +- .../Cn-icon-transient/Cn-icon-transient.vue | 4 +- pages.json | 6 + pages/device/APF/detail.vue | 1550 ++++++++--------- pages/device/APF/report.vue | 4 +- pages/device/realTime/index.vue | 264 ++- pages/index/comp/apply.vue | 11 +- pages/index/comp/monitoringPoint.vue | 830 ++++++--- pages/index/comp/steadyState.vue | 2 + pages/index/comp/targetInfo.vue | 245 +++ pages/index/comp/transient.vue | 9 +- pages/index/index.vue | 2 +- pages/index/mine.vue | 2 +- pages/message/message.vue | 6 +- pages/message/messageDetail.vue | 8 +- pages/message1/alarm.vue | 8 +- pages/message1/comp/alarmDetails.vue | 6 +- pages/message1/comp/steadyStateDetails.vue | 8 +- pages/message1/comp/transientDetails.vue | 96 +- pages/message1/comp/waveform.vue | 237 +++ pages/message1/index.scss | 4 +- pages/message1/run.vue | 5 +- pages/message1/steadyState.vue | 12 +- pages/message1/transient.vue | 10 +- .../uni-card/components/uni-card/uni-card.vue | 2 +- 28 files changed, 2202 insertions(+), 1234 deletions(-) create mode 100644 pages/index/comp/targetInfo.vue create mode 100644 pages/message1/comp/waveform.vue diff --git a/common/api/harmonic.js b/common/api/harmonic.js index f620b72..af0e0bc 100644 --- a/common/api/harmonic.js +++ b/common/api/harmonic.js @@ -10,7 +10,7 @@ export function getModuleState(params) { } export function getBaseRealData(id) { return request({ - url: '/cs-harmonic-boot/realData/getBaseRealData?lineId='+id, + url: '/cs-harmonic-boot/realData/getBaseRealData?lineId=' + id, method: 'post', }) } @@ -46,4 +46,12 @@ export function queryAppHarmonicLine(params) { 'Content-Type': 'application/json', }, }) -} \ No newline at end of file +} +// 暂态事件波形分析 +export function analyseWave(params) { + return request({ + url: '/cs-harmonic-boot/event/analyseWave', + method: 'get', + params, + }) +} diff --git a/components/Cn-MultipleTree/Cn-MultipleTree.vue b/components/Cn-MultipleTree/Cn-MultipleTree.vue index be863c8..2681411 100644 --- a/components/Cn-MultipleTree/Cn-MultipleTree.vue +++ b/components/Cn-MultipleTree/Cn-MultipleTree.vue @@ -3,26 +3,14 @@ - 取消 + + 取消 {{ title }} - 确定 + 确定 - + - + - 工程名称：{{ device.engineeringName }} + 工程：{{ device.engineeringName }} - 项目名称：{{ device.projectName }} + 项目：{{ device.projectName }} @@ -61,11 +61,11 @@ - - {{ item.text - }} - - - - 最新数据时间： {{ time }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/pages/device/APF/report.vue b/pages/device/APF/report.vue index 3436e2f..4578c6b 100644 --- a/pages/device/APF/report.vue +++ b/pages/device/APF/report.vue @@ -19,8 +19,8 @@ {{ item.equipmentName }} - 工程名称：{{ item.engineeringName }} - 项目名称：{{ item.projectName }} + 工程：{{ item.engineeringName }} + 项目：{{ item.projectName }} diff --git a/pages/device/realTime/index.vue b/pages/device/realTime/index.vue index 630f466..21febb7 100644 --- a/pages/device/realTime/index.vue +++ b/pages/device/realTime/index.vue @@ -6,20 +6,16 @@ - 监测点名称： + 监测点名称： + {{ lineList[lineKey].name }} - + + + 所属工程：{{ device.engineeringName }} @@ -29,10 +25,9 @@ - 通讯状态：{{ device.runStatus == 1 ? '离线' : '在线' }} + 通讯状态：{{ device.runStatus == + 1 ? '离线' : '在线' }} @@ -47,80 +42,78 @@ {{ disabled ? `刷新(${countdown}s)` : '刷新' }} + - + - + - + 电压有效值(kV) - - + + 基波电压/电流
幅值(相位) - + - + - + 电流有效值(A) - - - - - A相 - B相 - C相 - - - {{ value.name }} - {{ value.A }} - {{ value.B }} - {{ value.C }} + + + + + + + + {{ child.name }} + + + + {{ child.A }} + + + + {{ child.B }} + + + + {{ child.C }} + + + + @@ -173,12 +166,17 @@ export default { { name: '电压有效值(kV)', A: '/', B: '/', C: '/' }, { name: '电流有效值(A)', A: '/', B: '/', C: '/' }, { name: '基波电压幅值(kV)', A: '/', B: '/', C: '/' }, - { name: '基波电压相位(°)', A: '/', B: '/', C: '/' }, { name: '基波电流幅值(A)', A: '/', B: '/', C: '/' }, + { name: '基波电压相位(°)', A: '/', B: '/', C: '/' }, { name: '基波电流相位(°)', A: '/', B: '/', C: '/' }, { name: '电压偏差(%)', A: '/', B: '/', C: '/' }, { name: '电压总谐波畸变率(%)', A: '/', B: '/', C: '/' }, ], + phaseColors: [ + { name: 'A相', color: '#F1B22E' }, + { name: 'B相', color: '#2BA471' }, + { name: 'C相', color: '#D54941' }, + ], disabled: false, countdown: 30, lineId: '00B78D00A87A1', @@ -267,6 +265,14 @@ export default { }, methods: { + // 将指标列表按每行两个分组 + chunkedChildren(children) { + const result = [] + for (let i = 0; i < children.length; i += 2) { + result.push(children.slice(i, i + 2)) + } + return result + }, initEcharts0() { return { tooltip: { show: false }, @@ -783,8 +789,8 @@ export default { { name: '电压有效值(kV)', A: data.vRmsA, B: data.vRmsB, C: data.vRmsC }, { name: '电流有效值(A)', A: data.iRmsA, B: data.iRmsB, C: data.iRmsC }, { name: '基波电压幅值(kV)', A: data.v1A, B: data.v1B, C: data.v1C }, - { name: '基波电压相位(°)', A: data.v1AngA, B: data.v1AngB, C: data.v1AngC }, { name: '基波电流幅值(A)', A: data.i1A, B: data.i1B, C: data.i1C }, + { name: '基波电压相位(°)', A: data.v1AngA, B: data.v1AngB, C: data.v1AngC }, { name: '基波电流相位(°)', A: data.i1AngA, B: data.i1AngB, C: data.i1AngC }, { name: '电压偏差(%)', A: data.vDevA, B: data.vDevB, C: data.vDevC }, { name: '电压总谐波畸变率(%)', A: data.vThdA, B: data.vThdB, C: data.vThdC }, @@ -800,7 +806,7 @@ export default { ], ) * 1.2) / - 10, + 10, ) * 10 this.echartsDataV1.series[0].max = vMax this.echartsDataV2.series[0].max = vMax @@ -820,7 +826,7 @@ export default { ], ) * 1.2) / - 10, + 10, ) * 10 this.echartsDataA1.series[0].max = aMax this.echartsDataA2.series[0].max = aMax @@ -873,8 +879,8 @@ export default { { name: '电压有效值(kV)', A: '/', B: '/', C: '/' }, { name: '电流有效值(A)', A: '/', B: '/', C: '/' }, { name: '基波电压幅值(kV)', A: '/', B: '/', C: '/' }, - { name: '基波电压相位(°)', A: '/', B: '/', C: '/' }, { name: '基波电流幅值(A)', A: '/', B: '/', C: '/' }, + { name: '基波电压相位(°)', A: '/', B: '/', C: '/' }, { name: '基波电流相位(°)', A: '/', B: '/', C: '/' }, { name: '电压偏差(%)', A: '/', B: '/', C: '/' }, { name: '电压总谐波畸变率(%)', A: '/', B: '/', C: '/' }, @@ -993,30 +999,38 @@ export default { padding: 20rpx; background-color: #fff; } + // padding: 20rpx; .info-card { background-image: url('/static/background.png'); - background-position: center center; /* 水平+垂直居中 */ - background-repeat: no-repeat; /* 不平铺 */ - background-size: 100% 100%; /* 覆盖整个容器（可选，根据需求调整） */ + background-position: center center; + /* 水平+垂直居中 */ + background-repeat: no-repeat; + /* 不平铺 */ + background-size: 100% 100%; + /* 覆盖整个容器（可选，根据需求调整） */ color: #fff; padding: 20rpx 40rpx; border-radius: 20rpx; + .info-item { display: flex; align-items: center; font-size: 28rpx; margin-bottom: 10rpx; + view { // font-size: 28rpx; // .nav-menu { // font-size: 32rpx; // } } + &:last-child { margin-bottom: 0rpx; } } + .status { .status-normal { // font-weight: bold; @@ -1024,33 +1038,92 @@ export default { } } - .data-table { + .params-wrap { margin-top: 20rpx; background-color: #fff; + border-radius: 10rpx; overflow: hidden; - .table-header, - .table-row { - display: flex; - justify-content: space-between; - padding: 15rpx 30rpx; - height: 20px; - border-bottom: 1rpx solid #eee; - text { - flex: 1; - text-align: center; - font-size: 28rpx; - // color: #333; - &:first-child { - text-align: left; - flex: 2; - } - } - } - .table-header { - // background-color: #fafafa; - font-weight: bold; + } + + .legend-row { + display: flex; + gap: 20rpx; + align-items: center; + justify-content: flex-end; + padding: 0rpx 20rpx 0; + background-color: #fff; + } + + .legend-item { + display: flex; + align-items: center; + gap: 8rpx; + } + + .legend-dot { + width: 16rpx; + height: 16rpx; + border-radius: 50%; + } + + .legend-text { + font-size: 24rpx; + color: #666666; + } + + .params-section { + padding: 16rpx 16rpx 20rpx; + } + + .double-row { + display: grid; + grid-template-columns: repeat(2, 1fr); + gap: 16rpx; + margin-bottom: 16rpx; + + &:last-child { + margin-bottom: 0; } } + + .param-group { + min-width: 0; + background: #f3f3f3; + border-radius: 16rpx; + padding: 16rpx 8rpx 12rpx; + } + + .param-title { + font-size: 26rpx; + color: #666666; + margin-bottom: 8rpx; + padding-left: 4rpx; + } + + .phase-vertical { + display: flex; + align-items: stretch; + } + + .phase-item-vertical { + flex: 1; + display: flex; + justify-content: center; + align-items: center; + padding: 4rpx; + } + + .phase-value-vertical { + font-size: 28rpx; + font-weight: 700; + } + + .phase-divider { + width: 1px; + background: #d2d2d2; + margin: 8rpx 0; + } + .time-bar { display: flex; justify-content: space-between; @@ -1059,50 +1132,59 @@ export default { background-color: #fff; margin: 20rpx 0 0; border-radius: 10rpx; + .time { display: flex; align-items: center; flex: 1; font-size: 28rpx; + text { margin-left: 20rpx; } } } } + .chartBox { background-color: #fff; padding: 0 0rpx 20rpx; display: flex; padding-bottom: 55rpx; + .middle { display: flex; position: relative; height: 600rpx; margin: 0 10rpx; flex: 1; + .echart1 { position: absolute; height: 500rpx; top: 0; } } + .chart { width: 170rpx; height: 200rpx; margin-bottom: 5rpx; } + .text { text-align: center; font-size: 28rpx; position: absolute; } + .text_center { bottom: -5px; left: 50%; transform: translateX(-50%) translateY(50%); } } + .mini-btn { font-size: 24rpx; border-radius: 45rpx; diff --git a/pages/index/comp/apply.vue b/pages/index/comp/apply.vue index 58f5e6b..1c18ac5 100644 --- a/pages/index/comp/apply.vue +++ b/pages/index/comp/apply.vue @@ -61,9 +61,9 @@ }} - 工程名称：{{ item.engineeringName }} - 项目名称：{{ item.projectName }} - 设备名称：{{ item.equipmentName }} + 工程：{{ item.engineeringName }} + 项目：{{ item.projectName }} + 设备：{{ item.equipmentName }} @@ -92,6 +92,11 @@ ? '，相别：' + item.evtParamPhase : '' }} + {{ + item.landPoint != null && item.landPoint !== '' + ? '，落点区域：' + item.landPoint + : '' + }} diff --git a/pages/index/comp/monitoringPoint.vue b/pages/index/comp/monitoringPoint.vue index 1c00b90..31da32f 100644 --- a/pages/index/comp/monitoringPoint.vue +++ b/pages/index/comp/monitoringPoint.vue @@ -1,119 +1,283 @@ - \ No newline at end of file + +.card-header-info { + flex: 1; + min-width: 0; +} + +.point-name { + display: block; + font-size: 30rpx; + font-weight: 700; + color: #333333; + margin-bottom: 8rpx; +} + +.meta-row { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 6rpx 12rpx; +} + +.meta-item { + font-size: 26rpx; + color: #666666; + line-height: 1.3; +} + +.meta-time { + display: block; + margin-top: 8rpx; + font-size: 26rpx; + color: #666666; + line-height: 1.3; +} + +.params-section { + padding: 20rpx 16rpx; +} + +.double-row { + display: grid; + grid-template-columns: repeat(2, 1fr); + gap: 16rpx; + margin-bottom: 16rpx; + + &:last-child { + margin-bottom: 0; + } +} + +.param-group { + min-width: 0; + background: #f3f3f3; + border-radius: 16rpx; + padding: 16rpx 8rpx 12rpx; +} + +.param-title { + font-size: 24rpx; + color: #666666; + margin-bottom: 8rpx; + padding-left: 4rpx; +} + +.phase-vertical { + display: flex; + align-items: stretch; +} + +.phase-item-vertical { + flex: 1; + display: flex; + justify-content: center; + align-items: center; + padding: 4rpx; +} + +.phase-value-vertical { + font-size: 28rpx; + font-weight: 700; +} + +.phase-divider { + width: 1px; + background: #d2d2d2; + margin: 8rpx 0; +} + +.more-btn { + margin: 0 20rpx 20rpx; + height: 72rpx; + line-height: 72rpx; + text-align: center; + border: 1rpx solid #376cf380; + background-color: #266FFF10; + border-radius: 16rpx; + + text { + font-size: 28rpx; + color: #376cf3; + font-weight: 500; + } +} + +.ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.indicator-popup { + background: #ffffff; + overflow: hidden; +} + +.indicator-popup-header { + display: flex; + align-items: center; + justify-content: space-between; + padding: 18rpx 32rpx; + border-bottom: 1rpx solid #eef2f6; +} + +.indicator-popup-cancel { + font-size: 27rpx; + color: #666666; + min-width: 80rpx; +} + + +.indicator-popup-confirm { + font-size: 28rpx; + color: #376cf3; + min-width: 80rpx; + text-align: right; +} + +.indicator-popup-list { + max-height: 60vh; + padding: 16rpx 0; + box-sizing: border-box; +} + +.indicator-popup-empty { + padding: 80rpx 0; + text-align: center; + font-size: 28rpx; + color: #999999; +} + +.indicator-popup-item { + display: flex; + align-items: center; + justify-content: space-between; + padding: 28rpx 32rpx; + font-size: 28rpx; + color: #333333; + + &--active { + color: #376cf3; + background: #376cf310; + } +} + diff --git a/pages/index/comp/steadyState.vue b/pages/index/comp/steadyState.vue index 937bb7a..a2ee1fe 100644 --- a/pages/index/comp/steadyState.vue +++ b/pages/index/comp/steadyState.vue @@ -332,6 +332,8 @@ export default { /* 图标区域（按类型区分背景色） */ .event-icon { background-color: #376cf320; + width: 90rpx; + height: 90rpx; } .event-tags { diff --git a/pages/index/comp/targetInfo.vue b/pages/index/comp/targetInfo.vue new file mode 100644 index 0000000..21b54f7 --- /dev/null +++ b/pages/index/comp/targetInfo.vue @@ -0,0 +1,245 @@ + + + + + diff --git a/pages/index/comp/transient.vue b/pages/index/comp/transient.vue index 5d3cd1b..6089ef3 100644 --- a/pages/index/comp/transient.vue +++ b/pages/index/comp/transient.vue @@ -39,9 +39,9 @@ {{ item.lineName }} - 工程名称：{{ item.engineeringName }} - 项目名称：{{ item.projectName }} - 设备名称：{{ item.deviceName }} + 工程：{{ item.engineeringName }} + 项目：{{ item.projectName }} + 设备：{{ item.deviceName }} @@ -327,9 +327,10 @@ export default { .device-body-item { display: flex; // justify-content: space-between; - font-size: 28rpx; + font-size: 26rpx; color: #666666; line-height: 1.5; + } diff --git a/pages/index/index.vue b/pages/index/index.vue index f18aabe..309481c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -37,7 +37,7 @@ diff --git a/pages/index/mine.vue b/pages/index/mine.vue index 88b5746..8fd2d47 100644 --- a/pages/index/mine.vue +++ b/pages/index/mine.vue @@ -76,7 +76,7 @@ 关注工程配置 diff --git a/pages/message/message.vue b/pages/message/message.vue index e2f5388..1a86ca3 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -18,10 +18,10 @@ {{ item.equipmentName }} - 工程名称：{{ item.engineeringName }} - 项目名称：{{ item.projectName }} + 工程：{{ item.engineeringName }} + 项目：{{ item.projectName }} 监测点名称：{{ item.lineName }} + >监测点：{{ item.lineName }} 基础信息 - 设备名称：{{ detail.equipmentName }} - 项目名称：{{ detail.projectName }} - 工程名称：{{ detail.engineeringName }} - 事件名称：{{ detail.showName }} + 设备：{{ detail.equipmentName }} + 项目：{{ detail.projectName }} + 工程：{{ detail.engineeringName }} + 事件：{{ detail.showName }} {{ item.showName + '：' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }} diff --git a/pages/message1/alarm.vue b/pages/message1/alarm.vue index ef88c90..be17ba9 100644 --- a/pages/message1/alarm.vue +++ b/pages/message1/alarm.vue @@ -28,7 +28,7 @@ 告警终端总数：{{ item.warnNums }}台 - 在线率偏低 + 在线率偏低 完整性偏低 事件触发终端告警：{{ item.warnCounts }}次 @@ -92,7 +92,7 @@ export default { let str = JSON.stringify(item).replace(/%/g, '百分比') uni.navigateTo({ url: '/pages/message1/comp/alarmDetails?detail=' + encodeURIComponent(str) }) item.isRead = 1 - + }, // 下拉 refresherrefresh() { @@ -155,4 +155,8 @@ export default { /deep/ .uni-scroll-view-refresher { display: none; } + +.event-header { + margin-bottom: 0rpx !important; +} diff --git a/pages/message1/comp/alarmDetails.vue b/pages/message1/comp/alarmDetails.vue index 4419213..a9cb286 100644 --- a/pages/message1/comp/alarmDetails.vue +++ b/pages/message1/comp/alarmDetails.vue @@ -34,8 +34,8 @@ item.devType == 'Direct_Connected_Device' ? '治理设备' : '监测设备' }} - 工程名称：{{ item.engineeringName }} - 项目名称：{{ item.projectName }} + 工程：{{ item.engineeringName }} + 项目：{{ item.projectName }} @@ -55,7 +55,7 @@ 数据完整性： - 监测点名称 + 监测点 完整性 基础信息 - 工程名称：{{ detail.engineeringName }} - 项目名称：{{ detail.projectName }} - 设备名称：{{ detail.devName }} - 监测点名称：{{ detail.lineName }} + 工程：{{ detail.engineeringName }} + 项目：{{ detail.projectName }} + 设备：{{ detail.devName }} + 监测点：{{ detail.lineName }} 越限详情： {{ detail.overLimitDesc }} diff --git a/pages/message1/comp/transientDetails.vue b/pages/message1/comp/transientDetails.vue index cbf6eac..4fbf467 100644 --- a/pages/message1/comp/transientDetails.vue +++ b/pages/message1/comp/transientDetails.vue @@ -6,14 +6,15 @@ 基础信息 - 工程名称：{{ detail.engineeringName }} - 项目名称：{{ detail.projectName }} - 设备名称：{{ detail.equipmentName }} - 监测点名称：{{ detail.lineName }} + 工程：{{ detail.engineeringName }} + 项目：{{ detail.projectName }} + 设备：{{ detail.equipmentName }} + 监测点：{{ detail.lineName }} 暂态类型：{{ detail.showName }} 持续时间：{{ detail.evtParamTm }}s 幅值：{{ detail.evtParamVVaDepth }}% 相别：{{ detail.evtParamPhase }} + 落点区域：{{ detail.landPoint }} 瞬时波形图 - + 暂无 --> + + + 暂无 RMS波形图 - + 暂无 --> + + + 暂无 @@ -46,14 +57,21 @@ import { updateStatus } from '@/common/api/message' import ITIC from './ITIC.vue' import F47 from './F47.vue' +import waveform from './waveform.vue' +import { analyseWave } from '@/common/api/harmonic.js'; export default { - components: { ITIC, F47 }, + components: { ITIC, F47, waveform }, data() { return { loading: true, detail: {}, detailTab: 0, + listWaveData: [], + listRmsData: [], + unit: [], + list: {}, + } }, computed: { @@ -74,6 +92,7 @@ export default { }, }, onLoad(options) { + console.log("🚀 ~ options:", options) this.detail = JSON.parse(decodeURIComponent(options.detail).replace(/百分比/g, '%')) this.detail.rmsPics && (this.detail.rmsPics = this.$config.static + this.detail.rmsPics) this.detail.instantPics && (this.detail.instantPics = this.$config.static + this.detail.instantPics) @@ -84,6 +103,31 @@ export default { eventIds: [this.detail.id], }) } + analyseWave({ + eventId: this.detail.id, + isApp: true + }).then(res => { + this.list = res.data + this.uni = [] + // 数据 + this.listWaveData = this.bindChartClickEvent(this.list.listWaveData) + this.listRmsData = this.bindChartClickEvent(this.list.listRmsData) + // 单位 + this.unit = this.list.waveTitle.slice(1).reduce((acc, _, i, arr) => { + if (i % 3 === 0) { + const group = arr.slice(i, i + 3); + const type = group[0]?.startsWith('U') ? 'kV' : + group[0]?.startsWith('I') ? 'A' : ''; + acc.push(type); + } + return acc; + }, []); + }) + + + + + }, methods: { onDetailTabChange(e) { @@ -94,6 +138,44 @@ export default { url: `/pages/message1/comp/preview?url=${encodeURIComponent(url)}`, }) }, + bindChartClickEvent(data) { + let unit = this.list.waveTitle.slice(1).reduce((acc, _, i, arr) => { + const group = arr.slice(i, i + 3); + const type = group[0]?.startsWith('U') ? 'kV' : + group[0]?.startsWith('I') ? 'A' : ''; + acc.push(type); + return acc; + + }, []); + + const result = []; + // 从第2列开始遍历（索引1），每3个一列分组 + for (let i = 1; i < data[0].length; i += 3) { + + + const group = { + A: data.map(row => [row[0], this.calculate(row[i], unit[i])]), // 每组第1个 → A + B: data.map(row => [row[0], this.calculate(row[i + 1], unit[i])]), // 每组第2个 → B + C: data.map(row => [row[0], this.calculate(row[i + 2], unit[i])]), // 每组第3个 → C + }; + result.push(group); + } + return result; + }, + calculate(num, key) { + if (num === null) return null + let nums = '' + switch (key) { + case 'kV': + nums = num * Number(this.list.pt) / 1000 + break + case 'A': + nums = num * Number(this.list.ct) + break + } + return nums + } + }, } diff --git a/pages/message1/comp/waveform.vue b/pages/message1/comp/waveform.vue new file mode 100644 index 0000000..a16fadf --- /dev/null +++ b/pages/message1/comp/waveform.vue @@ -0,0 +1,237 @@ + + + diff --git a/pages/message1/index.scss b/pages/message1/index.scss index 41055be..fe94fe3 100644 --- a/pages/message1/index.scss +++ b/pages/message1/index.scss @@ -150,7 +150,7 @@ gap: 8rpx; } .event-desc text { - font-size: 28rpx; + font-size: 24rpx; color: #666666; line-height: 1.2; } @@ -172,7 +172,7 @@ /* 详情文本 */ .event-detail { - font-size: 28rpx; + font-size: 26rpx; color: #666666; line-height: 1.5; padding-top: 10rpx; diff --git a/pages/message1/run.vue b/pages/message1/run.vue index 963af06..d26c048 100644 --- a/pages/message1/run.vue +++ b/pages/message1/run.vue @@ -25,8 +25,8 @@ == 'Direct_Connected_Device' ? '治理设备' : '监测设备' }} - 工程名称：{{ item.engineeringName }} - 项目名称：{{ item.projectName }} + 工程：{{ item.engineeringName }} + 项目：{{ item.projectName }} 事件时间：{{ item.startTime2 }} @@ -155,4 +155,5 @@ export default { /deep/ .uni-scroll-view-refresher { display: none; } + diff --git a/pages/message1/steadyState.vue b/pages/message1/steadyState.vue index 8031b86..07ed25d 100644 --- a/pages/message1/steadyState.vue +++ b/pages/message1/steadyState.vue @@ -54,9 +54,9 @@ {{ item.lineName }} - 工程名称：{{ item.engineeringName }} - 项目名称：{{ item.projectName }} - 设备名称：{{ item.devName }} + 工程：{{ item.engineeringName }} + 项目：{{ item.projectName }} + 设备：{{ item.devName }} @@ -117,9 +117,9 @@ {{ item.lineName }} - 工程名称：{{ item.engineeringName }} - 项目名称：{{ item.projectName }} - 设备名称：{{ item.devName }} + 工程：{{ item.engineeringName }} + 项目：{{ item.projectName }} + 设备：{{ item.devName }} diff --git a/pages/message1/transient.vue b/pages/message1/transient.vue index 9080acb..2b29481 100644 --- a/pages/message1/transient.vue +++ b/pages/message1/transient.vue @@ -59,9 +59,9 @@ }} - 工程名称：{{ item.engineeringName }} - 项目名称：{{ item.projectName }} - 设备名称：{{ item.equipmentName }} + 工程：{{ item.engineeringName }} + 项目：{{ item.projectName }} + 设备：{{ item.equipmentName }} @@ -86,6 +86,10 @@ item.evtParamPhase != null && item.evtParamPhase !== '' ? '，相别：' + item.evtParamPhase : '' + }} {{ + item.landPoint != null && item.landPoint !== '' + ? '，落点区域：' + item.landPoint + : '' }} diff --git a/uni_modules/uni-card/components/uni-card/uni-card.vue b/uni_modules/uni-card/components/uni-card/uni-card.vue index 8cd6887..c4cd13c 100644 --- a/uni_modules/uni-card/components/uni-card/uni-card.vue +++ b/uni_modules/uni-card/components/uni-card/uni-card.vue @@ -138,7 +138,7 @@ padding: 0 $uni-spacing-sm; border-radius: 20rpx; overflow: hidden; - font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif; + // font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif; background-color: #fff; flex: 1;