diff --git a/src/api/harmonic-boot/cockpit/cockpit.ts b/src/api/harmonic-boot/cockpit/cockpit.ts index acd50c5..34ed61b 100644 --- a/src/api/harmonic-boot/cockpit/cockpit.ts +++ b/src/api/harmonic-boot/cockpit/cockpit.ts @@ -252,4 +252,13 @@ export function analyseWave(data: any) { }) } +// 暂态监测点下拉框接口 +export function getSimpleLine() { + return request({ + url: '/cs-device-boot/csline/getSimpleLine', + method: 'get' + }) +} + + diff --git a/src/components/cockpit/transientDetails/components/transientList.vue b/src/components/cockpit/transientDetails/components/transientList.vue index c88768a..7048b12 100644 --- a/src/components/cockpit/transientDetails/components/transientList.vue +++ b/src/components/cockpit/transientDetails/components/transientList.vue @@ -68,7 +68,6 @@ const getSimpleLineList = async () => { options.value = res.data } - const tableStore: any = new TableStore({ url: '/cs-harmonic-boot/event/pageEvent', method: 'POST', @@ -109,7 +108,7 @@ const tableStore: any = new TableStore({ width: '100', formatter: (row: any) => { // 当暂态类型不是电压暂升时,计算暂降深度 = 100 - 特征幅值 - if (row.tag !== '电压暂升') { + if (row.row.tag !== '电压暂升') { const amplitude = parseFloat(row.row.amplitude) if (!isNaN(amplitude)) { return 100 - amplitude @@ -192,7 +191,7 @@ const tableStore: any = new TableStore({ icon: 'el-icon-DataLine', render: 'basicButton', disabled: row => { - return !(!row.wavePath && row.evtParamTm < 20) + return !!row.wavePath } } ] diff --git a/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue b/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue index 5630198..ee5b582 100644 --- a/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue +++ b/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue @@ -109,7 +109,7 @@ const tableStore: any = new TableStore({ width: '100', formatter: (row: any) => { // 当暂态类型不是电压暂升时,计算暂降深度 = 100 - 特征幅值 - if (row.tag !== '电压暂升') { + if (row.row.tag !== '电压暂升') { const amplitude = parseFloat(row.row.amplitude) if (!isNaN(amplitude)) { return 100 - amplitude