From 97a1caa3eccfa6d7cb09db9f56ba4bc28ce0ae1d Mon Sep 17 00:00:00 2001 From: dev01 Date: Tue, 17 Jan 2023 15:35:31 +0800 Subject: [PATCH] =?UTF-8?q?[Frontend][=E5=85=A8=E5=9F=9F=E5=8A=9F=E8=83=BD?= =?UTF-8?q?]=20chart.js=20=E5=A5=97=E4=BB=B6=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20|=20=E6=89=80=E6=9C=89=20chart=20=E5=9C=96=E8=A1=A8?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BE=9D=E7=89=88=E6=9C=AC=E5=BE=AE=E8=AA=BF?= =?UTF-8?q?=20|=20index.html=20=E9=83=A8=E5=88=86=E8=A8=BB=E8=A7=A3?= =?UTF-8?q?=E8=A3=9C=E4=B8=8A=20|=20[=E5=84=80=E9=8C=B6=E6=9D=BF]=20?= =?UTF-8?q?=E5=9C=93=E9=A4=85=E5=9C=96=E5=A4=A7=E5=B0=8F=E8=AA=BF=E6=95=B4?= =?UTF-8?q?=20|=20=E5=9C=96=E8=A1=A8=E6=A0=BC=E7=B7=9A=E6=A8=A3=E5=BC=8F?= =?UTF-8?q?=E8=AA=BF=E6=95=B4=20|=20[=E9=9B=BB=E6=A2=AF=E7=B3=BB=E7=B5=B1]?= =?UTF-8?q?=20=E5=8F=96=E5=BE=97=20nodeid=20=E7=A8=8B=E5=BA=8F=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/_dashboard.html | 60 ++++++++++++-------------------- Frontend/_sysElevator.html | 5 +-- Frontend/index.html | 70 ++++++++++++++++++++------------------ 3 files changed, 61 insertions(+), 74 deletions(-) diff --git a/Frontend/_dashboard.html b/Frontend/_dashboard.html index b830198..1c59f01 100644 --- a/Frontend/_dashboard.html +++ b/Frontend/_dashboard.html @@ -171,10 +171,10 @@
-
+
-
+
@@ -191,10 +191,10 @@
-
+
-
+
@@ -480,22 +480,21 @@ display: true, }, scales: { - xAxes: [{ + x: { offset: true, - gridLines: { color: color.fusion._500 }, + grid: { color: color.fusion._500 }, ticks: { callback: function (value, index, ticks) { return value } }, - }], - yAxes: [{ - + }, + y: { + beginAtZero: true, ticks: { min: 0, - beginAtZero: true }, - }] + } }, tooltips: { callbacks: { @@ -570,22 +569,21 @@ display: true, }, scales: { - xAxes: [{ + x: { offset: true, - gridLines: { color: color.fusion._500 }, + grid: { color: color.fusion._500 }, ticks: { callback: function (value, index, ticks) { return value } }, - }], - yAxes: [{ - + }, + y: { + beginAtZero: true, ticks: { min: 0, - beginAtZero: true }, - }] + } }, tooltips: { callbacks: { @@ -630,14 +628,13 @@ unit: '個', fill: true, backgroundColor: [color.danger._500, color.info._300], - //data: errRecArr.map(x => parseInt((Math.random() * (1500 - 300) + 300))), data: datas, } ] } let errRecChartOptions = { - //maintainAspectRatio: false, + maintainAspectRatio: false, responsive: true, legend: { display: true, @@ -645,8 +642,6 @@ tooltips: { enabled: true, }, - - } // This will get the first returned node in the jQuery collection. @@ -676,14 +671,13 @@ unit: '個', fill: true, backgroundColor: [color.danger._500, color.info._300], - //data: errChkArr.map(x => parseInt((Math.random() * (1500 - 300) + 300))), data: datas, } ] } let errChkChartOptions = { - //maintainAspectRatio: false, + maintainAspectRatio: false, responsive: true, legend: { display: true, @@ -691,8 +685,6 @@ tooltips: { enabled: true, }, - - } if (errChkChart == null) { @@ -723,14 +715,13 @@ unit: '個', fill: true, backgroundColor: [color.danger._500, color.info._300], - //data: worOrdErrArr.map(x => parseInt((Math.random() * (1500 - 300) + 300))), data: datas, } ] } let worOrdErrChartOptions = { - //maintainAspectRatio: false, + maintainAspectRatio: false, responsive: true, legend: { display: true, @@ -770,14 +761,13 @@ unit: '個', fill: true, backgroundColor: [color.danger._500, color.info._300], - //data: worOrdFinArr.map(x => parseInt((Math.random() * (1500 - 300) + 300))), data: datas, } ] } let worOrdFinChartOptions = { - //maintainAspectRatio: false, + maintainAspectRatio: false, responsive: true, legend: { display: true, @@ -822,15 +812,7 @@ }) } - //function timeOutGetData() { - // let timeOut3s = setInterval(() => { - // getAlarmSub(); - // }, 3000) - // let timeOut5m = setInterval(() => { - // getElectricBaja(); - // }, 5 * 60 * 1000) - // timeOuters = timeOuters.concat([timeOut3s, timeOut5m]); - //} + function show3DModel() { launchViewerNoTools(pageAct.urn, (viewer) => { diff --git a/Frontend/_sysElevator.html b/Frontend/_sysElevator.html index b83f6d9..1f6330f 100644 --- a/Frontend/_sysElevator.html +++ b/Frontend/_sysElevator.html @@ -2415,10 +2415,11 @@ forge3DElev.bajaEndCallback = function () { // 從資料庫設定不可視模型的類型，若沒有取道該小類不可視類型，則套用資料庫設定預設類型 if (forgeInvType) { - setInviForge(forgeInvType, this.getNodeIds); + setInviForge(forgeInvType, this.getNodeIds()); } else { - setInviForge(forgeInvTypeDef, this.getNodeIds); + setInviForge(forgeInvTypeDef, this.getNodeIds()); } + setTransparentBuilding(0); endPageLoading(); } diff --git a/Frontend/index.html b/Frontend/index.html index 9030a83..a7aa382 100644 --- a/Frontend/index.html +++ b/Frontend/index.html @@ -1,4 +1,4 @@ - +