From c06a9d7e8514a25c4363fc5031a18c2c64eab9cb Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Thu, 21 Dec 2023 14:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8E=BB=E6=8E=89=E9=9B=86?= =?UTF-8?q?=E4=B8=AD=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/AlertMock.ts | 1 - src/components/alarm/alarmInfoEnum.ts | 3 ++- src/components/alarm/setAlarmText.vue | 12 ------------ .../properties/ConcentrationDividingLineProperty.vue | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/api/AlertMock.ts b/src/api/AlertMock.ts index 9e31f90..3823b34 100644 --- a/src/api/AlertMock.ts +++ b/src/api/AlertMock.ts @@ -9,7 +9,6 @@ export function mockLocalDemoTestSet( alertType: string, data: { lineId: number; - rtuId: number; deviceInfos: { deviceName: string; deviceType: string }[]; status: string; groupId?: string; diff --git a/src/components/alarm/alarmInfoEnum.ts b/src/components/alarm/alarmInfoEnum.ts index eaeed2f..51150f1 100644 --- a/src/components/alarm/alarmInfoEnum.ts +++ b/src/components/alarm/alarmInfoEnum.ts @@ -114,7 +114,8 @@ export const GuardConfigTypeData = { }, }; -export function isArraysEqual(arr1: string[], arr2: string[]) { +type findType = string | number; +export function isArraysEqual(arr1: findType[], arr2: findType[]) { if (arr1.length !== arr2.length) { return false; } diff --git a/src/components/alarm/setAlarmText.vue b/src/components/alarm/setAlarmText.vue index 585165c..d0f3ae6 100644 --- a/src/components/alarm/setAlarmText.vue +++ b/src/components/alarm/setAlarmText.vue @@ -19,14 +19,6 @@ lazy-rules :rules="[(val) => val || '请输入线路ID!']" /> - ({ lineId: '', - rtuId: '', alertType: '', deviceInfos: [], status: '', @@ -221,7 +211,6 @@ async function onSubmit() { try { const params = { lineId: +setAlartTextData.value.lineId, - rtuId: +setAlartTextData.value.rtuId, deviceInfos: setAlartTextData.value.deviceInfos, status: setAlartTextData.value.status, groupId: setAlartTextData.value.groupId, @@ -266,7 +255,6 @@ function clearSelect() { function onReset() { setAlartTextData.value = { lineId: lineStore.lineId as unknown as string, - rtuId: '', alertType: '', deviceInfos: [], status: '', diff --git a/src/components/draw-app/properties/ConcentrationDividingLineProperty.vue b/src/components/draw-app/properties/ConcentrationDividingLineProperty.vue index e5c8024..ab8281d 100644 --- a/src/components/draw-app/properties/ConcentrationDividingLineProperty.vue +++ b/src/components/draw-app/properties/ConcentrationDividingLineProperty.vue @@ -115,7 +115,7 @@ onMounted(() => { .queryStore.queryByType(Station.Type); centralizedStations.value = [{ label: '', value: 0 }]; stations.forEach((station) => { - if (station.datas.concentrationStations) { + if (station.datas.concentrationStations || station.datas.depots) { centralizedStations.value.push({ label: station.datas.name, value: station.datas.id,