From 0f06f45d3abc6cfc575c0bf1ca3eee776a80bc60 Mon Sep 17 00:00:00 2001 From: huanghao1412 Date: Tue, 16 Jul 2024 09:49:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceRunningState/config.ts | 18 +++++++++++++++--- .../DeviceRunningState/index.vue | 9 +++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/packages/components/CustomComponents/CustomComponents/DeviceRunningState/config.ts b/src/packages/components/CustomComponents/CustomComponents/DeviceRunningState/config.ts index 0cbe1659..3d48f0b5 100644 --- a/src/packages/components/CustomComponents/CustomComponents/DeviceRunningState/config.ts +++ b/src/packages/components/CustomComponents/CustomComponents/DeviceRunningState/config.ts @@ -8,9 +8,21 @@ export const option = {} export const customData = { title: '设备运行状态', config: JSON.stringify([ - {"id":84,"label":"动力设备","code":"DL","remark":" 高压柜、低压柜、UPS、蓄电池等关于电的动力设备","icon":" ","father_id":0,"complete_id":"84","complete_name":"动力设备","sort":0,"is_leaf_node":false,"father_type":null,"need_data_num":0}, - {"id":87,"label":"环境设备","code":"HJ","remark":"温湿度、空调、漏水、气体等监测或影响环境因素的设备 ","icon":" ","father_id":0,"complete_id":"87","complete_name":"环境设备","sort":0,"is_leaf_node":false,"father_type":null,"need_data_num":0}, - {"id":90,"label":"安防设备","code":"AF","remark":" 视频、门禁、红外、消防及其他安防类设备","icon":" ","father_id":0,"complete_id":"90","complete_name":"安防设备","sort":0,"is_leaf_node":false,"father_type":null,"need_data_num":0} + { + "code": "DLSB" + }, + { + "code": "ZNSB" + }, + { + "code": "HJSB" + }, + { + "code": "AFSB" + }, + { + "code": "QTSB" + } ]), showInterval: true, } diff --git a/src/packages/components/CustomComponents/CustomComponents/DeviceRunningState/index.vue b/src/packages/components/CustomComponents/CustomComponents/DeviceRunningState/index.vue index 95b45b98..63fde47c 100644 --- a/src/packages/components/CustomComponents/CustomComponents/DeviceRunningState/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/DeviceRunningState/index.vue @@ -92,6 +92,15 @@ const getData = async() => { systemDatas.value = systemDatas.value.filter((e: any) => { return config.find((v: any) => v.code === e.device_code) }) + let map:any = {} + config.forEach((item: any, i: number) => { + map[item.code] = i + }) + systemDatas.value.sort((a: any, b: any) => { + let ai = map[a.device_code] + let bi = map[b.device_code] + return ai - bi + }) } const params = { levels: [1, 2, 3],