From a34a440533ae5c44a47b49b1d5eb7777236aede5 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 20 Feb 2023 10:49:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.config.json | 4 ++-- .../host-config/host-config.component.ts | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/proxy.config.json b/proxy.config.json index 11d61cc..734510d 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,11 +1,11 @@ { "/api": { - "target": "http://121.36.37.70:8080/", + "target": "http://10.156.134.54:8080/", "secure": false, "changeOrigin": true }, "/signalr": { - "target": "http://121.36.37.70:8080/", + "target": "http://10.156.134.54:8080/", "secure": false, "ws": true, "logLevel": "debug" diff --git a/src/app/system-management/host-config/host-config.component.ts b/src/app/system-management/host-config/host-config.component.ts index b18d240..930dc72 100644 --- a/src/app/system-management/host-config/host-config.component.ts +++ b/src/app/system-management/host-config/host-config.component.ts @@ -319,6 +319,7 @@ sources:`; arrowArr[0].endY; let customArea = []; if ( + item.dimensionedPointsObj && item.dimensionedPointsObj.polygonOfmonitor && item.dimensionedPointsObj.polygonOfmonitor.length !== 0 ) { @@ -362,6 +363,7 @@ sources:`; arrowArr[0].endY; let customArea = []; if ( + item.dimensionedPointsObj && item.dimensionedPointsObj.polygonOfmonitor && item.dimensionedPointsObj.polygonOfmonitor.length !== 0 ) { @@ -423,6 +425,7 @@ sources:`; let str3 = '[' + str + ',' + str2 + ']'; let customArea = []; if ( + item.dimensionedPointsObj && item.dimensionedPointsObj.polygonOfmonitor && item.dimensionedPointsObj.polygonOfmonitor.length !== 0 ) { @@ -441,14 +444,19 @@ sources:`; custom-area: [${customArea}] `; } else { + console.log(888, item); let customArea = []; if (item.type == 0) { - item.dimensionedPointsObj.polygon.forEach((element) => { - customArea.push(element.x); - customArea.push(element.y); - }); + item.dimensionedPointsObj + ? item.dimensionedPointsObj.polygon.forEach((element) => { + customArea.push(element.x); + customArea.push(element.y); + }) + : null; } else { + console.log(item.dimensionedPointsObj); if ( + item.dimensionedPointsObj && item.dimensionedPointsObj.polygonOfmonitor && item.dimensionedPointsObj.polygonOfmonitor.length !== 0 ) {