+
-
@@ -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 @@
-
+