From 571130c2bfed797d15c31457a7d9be104120fc23 Mon Sep 17 00:00:00 2001 From: dev01 Date: Mon, 9 Jan 2023 19:15:27 +0800 Subject: [PATCH] =?UTF-8?q?[Frontend][=E5=85=A8=E5=9F=9F=E5=8A=9F=E8=83=BD?= =?UTF-8?q?]=20YTTab=20=E7=A8=8B=E5=BA=8F=E8=AA=BF=E6=95=B4=20|=20[?= =?UTF-8?q?=E7=B3=BB=E7=B5=B1=E7=9B=A3=E6=8E=A7]=20=E6=BA=AB=E5=BA=A6?= =?UTF-8?q?=E6=A2=9Dui=E8=A3=9C=E4=B8=8A=20|=20=E8=87=AA=E5=8B=95=E9=A0=88?= =?UTF-8?q?=E9=87=8F=E7=B7=A8=E8=BC=AF=E7=A8=8B=E5=BA=8F=E5=BB=BA=E7=BD=AE?= =?UTF-8?q?=20|=20=E8=87=AA=E5=8B=95=E9=A0=88=E9=87=8F=E5=9C=96=E8=A1=A8?= =?UTF-8?q?=E5=BB=BA=E7=BD=AE=20|=20[FrontendWebApi]=20GetAutDemVal=20vari?= =?UTF-8?q?able=20automated=5Fdemand=5Fresponse=20=E5=8F=96=E5=BE=97?= =?UTF-8?q?=E8=87=AA=E5=8B=95=E9=A0=88=E9=87=8F=20api=20=E5=BB=BA=E7=BD=AE?= =?UTF-8?q?=20|=20=E7=B7=A8=E8=BC=AF=E8=87=AA=E5=8B=95=E9=A0=88=E9=87=8F?= =?UTF-8?q?=20api=20=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/_sysMonAll.html | 23 +++++-- Frontend/css/site.css | 14 ++++ Frontend/index.html | 45 +++++++++---- Frontend/js/forge/forgemodel.js | 38 ++++++++++- Frontend/js/site.js | 40 ++++++++++-- Frontend/js/style.js | 34 +++++++++- .../yourteam/plugins/yt-navbar/yt-navbar.js | 2 +- Frontend/js/yourteam/plugins/yt-tab/yt-tab.js | 65 +++++++++++++++++-- 8 files changed, 231 insertions(+), 30 deletions(-) diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html index 72defa2..0e2778f 100644 --- a/Frontend/_sysMonAll.html +++ b/Frontend/_sysMonAll.html @@ -74,7 +74,10 @@ `; break; case 3: - strHtml = `
`; + strHtml = `
+ ${setTopHeatBar()} +
+
`; break; } @@ -92,11 +95,12 @@ } myBaja.setSubscribeDevicesByBql(ordPath); myBaja.setSubscribeDevicesCallBack(function (data) { - + console.log(data) let matchDevice = allDevList.filter(x => x.device_number == data.device_number_full)[0]; if (!matchDevice) { return false; } + console.log(data) //將訂閱值塞入 subDeviceData if (subDeviceData.findIndex(x => x.device_number == matchDevice.device_number) == -1) { let obj = {}; @@ -142,10 +146,10 @@ }); } + function lightDevForgeSpotLig(devObj) { - let position = isJSON(devObj.device_coordinate_3d) ? JSON.parse(devObj.device_coordinate_3d) : {}; - newLight(position); + } // 從設備訂閱更新每個設備卡片即時點位 @@ -211,6 +215,12 @@ return strHtml; } + // 設置 Forge 3D 溫度條 + function setTopHeatBar() { + let strHtml = ``; + return strHtml; + } + // forge 3D 異常點位變紅色 function setForgeHotSpotColor(device) { let subData = subDeviceData.filter(x => x.device_number == device.device_number)[0] @@ -331,14 +341,19 @@ ` return strHtml; } + function iframeResize(obj) { obj.style.height = obj.contentWindow.document.documentElement.scrollHeight + 'px'; } + function show3DModel(urn) { $(loadEle).Loading("start"); + getLightData(allDevList); launchViewerForHotspot(urn, (viewer, nodeIds) => { + showHeat("[name=forgeHeatBar]"); let devDbIds = allDevList.map(x => x.forge_dbid); /*hideAllObjects(devDbIds);*/ + setTransparentBuilding(0, devDbIds); $(loadEle).Loading("close"); diff --git a/Frontend/css/site.css b/Frontend/css/site.css index 8258bc3..a878acc 100644 --- a/Frontend/css/site.css +++ b/Frontend/css/site.css @@ -93,6 +93,20 @@ input:-webkit-autofill { background-color: rgba(0, 0, 0, 0.15) !important; } .device-wrap .card-body #info, .device-wrap .card-body #errRec, .device-wrap .card-body #opeRec { min-width: 500px; } .scrolledTable { overflow-y: auto; clear: both; max-height:100%;} +/*a[data-tabname="topFunBtn"] { color: #fff } + +a[data-tabname="topFunBtn"].active { color: #886ab5 } +a[data-tabname="topFunBtn"]:hover { color: var(--theme-primary-50); } + +.userblock { + color:#fff; +} +.userblock:hover { color: var(--theme-primary-50); } +.dropdown.show .userblock { color: var(--theme-primary-50) !important; }*/ +.page-header a {color:#fff !important;} +.page-header a:hover { color: var(--theme-primary-50) !important; } +.page-header a.active { color: var(--theme-primary-500) !important; } +.dropdown.show a { color: var(--theme-primary-50) !important; } @media screen and (max-width: 576px) { .yt-left-navbar { width: 100%; max-width: 100%; margin-top: 0; } } diff --git a/Frontend/index.html b/Frontend/index.html index b097139..f3eeba6 100644 --- a/Frontend/index.html +++ b/Frontend/index.html @@ -180,7 +180,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li