From 4063c6a92d50f655884ffd15b64f1feaf8ccc280 Mon Sep 17 00:00:00 2001 From: ko1234 Date: Mon, 2 Dec 2024 09:32:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=B5=B1=E7=9B=A3=E6=8E=A7=20:=20?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=94=B9=E7=94=A8main=5Fid=E4=BE=86=E7=95=B6?= =?UTF-8?q?spriteDbId=20=E3=80=81=202D=E5=AE=9A=E4=BD=8D=E9=BB=9E=E9=A0=90?= =?UTF-8?q?=E8=A8=AD=E9=A1=8F=E8=89=B2=E6=94=B9=E6=88=90#009100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/System.vue | 4 ++-- src/views/system/SystemFloor.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/system/System.vue b/src/views/system/System.vue index 00476a7..614b59e 100644 --- a/src/views/system/System.vue +++ b/src/views/system/System.vue @@ -63,11 +63,11 @@ const getData = async () => { ...dev, forge_dbid: parseInt(dev.forge_dbid), room_dbid: parseInt(dev.room_dbid), - device_coordinate_3d: JSON.parse(dev.device_coordinate_3d), + device_coordinate_3d: dev.device_coordinate_3d ? JSON.parse(dev.device_coordinate_3d) : "", alarmMsg: "", is_show: true, currentColor: dev.device_normal_point_color, - spriteDbId: 10 + index, + spriteDbId: 10 + dev.main_id, sensorTypes: dev.points.map(({ points }) => points), floor_guid: d.floor_guid, is2DActive: false diff --git a/src/views/system/SystemFloor.vue b/src/views/system/SystemFloor.vue index c526cc5..a7153b8 100644 --- a/src/views/system/SystemFloor.vue +++ b/src/views/system/SystemFloor.vue @@ -36,7 +36,7 @@ const defaultOption = (map, data = []) => { ...sameOption, symbolSize: 10, itemStyle: { - color: data?.[0]?.[3]?.device_normal_color || "#b02a02", + color: data?.[0]?.[3]?.device_normal_color || "#009100", }, data, }, @@ -44,7 +44,7 @@ const defaultOption = (map, data = []) => { ...sameOption, symbolSize: 20, itemStyle: { - color: data?.[0]?.[3]?.device_normal_color || "#b02a02", + color: data?.[0]?.[3]?.device_normal_color || "#009100", }, data: [], }