building_tag 開頭若為數字則需要補上 $3 | Jquery selector 無法含有$，因應調整$3拿掉程序上需要時再補上
This commit is contained in:
parent
f1b138ce7b
commit
7e07ac738b
@ -18,10 +18,10 @@
|
||||
"Port": "js2LutKe+rdjzdxMPQUrvQ==",
|
||||
//"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30
|
||||
//"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
|
||||
//"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
|
||||
"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
|
||||
//"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel
|
||||
//"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office
|
||||
"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut
|
||||
//"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut
|
||||
//"Database": "2U+9jYGy0dCbMzLaguBXow==", //tpe_dome_mall
|
||||
"Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
|
||||
"Password": "FVAPxztxpY4gJJKQ/se4bQ=="
|
||||
|
||||
@ -419,11 +419,11 @@
|
||||
let devNum =
|
||||
tarElePath.split("/")[0] +
|
||||
"/" +
|
||||
tarElePath.split("/")[1].split("_").slice(0, 8).join("_");
|
||||
tarElePath.split("/")[1].split("_").slice(0, 9).join("_");
|
||||
let devPath =
|
||||
tarElePath.split("/")[0] +
|
||||
"/" +
|
||||
tarElePath.split("/")[1].split("_").slice(0, 8).join("_");
|
||||
tarElePath.split("/")[1].split("_").slice(0, 9).join("_");
|
||||
|
||||
let today =
|
||||
displayDate(new Date(), "date").replaceAll("/", "-") + "T00:00:00";
|
||||
@ -439,7 +439,7 @@
|
||||
|
||||
// 今日用電量
|
||||
getElectricMeterDayDataByBaja(
|
||||
devNum + "_KWH",
|
||||
devNum,
|
||||
n4Sup,
|
||||
today,
|
||||
tomorrow,
|
||||
@ -453,7 +453,7 @@
|
||||
|
||||
// 今日用電量 (每小時)
|
||||
getElectricMeterHourDataByBaja(
|
||||
devNum + "_KWH",
|
||||
devNum,
|
||||
n4Sup,
|
||||
yesterday,
|
||||
tomorrow,
|
||||
@ -477,7 +477,7 @@
|
||||
|
||||
// 昨日用電量
|
||||
getElectricMeterDayDataByBaja(
|
||||
devNum + "_KWH",
|
||||
devNum,
|
||||
n4Sup,
|
||||
yesterday,
|
||||
today,
|
||||
@ -491,7 +491,7 @@
|
||||
|
||||
// 本週與上週用電量 (每天)
|
||||
getElectricMeterDayDataByBaja(
|
||||
devNum + "_KWH",
|
||||
devNum,
|
||||
n4Sup,
|
||||
prevTwoWeek,
|
||||
tomorrow,
|
||||
@ -1030,6 +1030,7 @@
|
||||
|
||||
onEvent("click", "button[id^=sysSubCardBtn]", function () {
|
||||
let subSysTag = $(this).data("id");
|
||||
$(`#subSysBtn${subSysTag}`).click();
|
||||
debugger
|
||||
$(`#subSysBtn${subSysTag}[data-building-tag='${buildingTagOnJquery(pageAct.buiTag)}']`).click();
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -54,6 +54,7 @@
|
||||
|
||||
$(function () {
|
||||
$(loadEle).Loading("start");
|
||||
debugger
|
||||
getBuildMenu((arr, data) => {
|
||||
buildMenuData = data;
|
||||
if (arr.indexOf(4) != -1) {
|
||||
@ -203,7 +204,7 @@
|
||||
)
|
||||
) {
|
||||
//顯示正常燈號
|
||||
$(`#${matchDevice.device_number}_status`)
|
||||
$(`#${deviceNumber(matchDevice.device_number)}_status`)
|
||||
.attr("data-light-type", "normal")
|
||||
.data("light-type", "normal");
|
||||
|
||||
@ -218,7 +219,7 @@
|
||||
({ device_number }) => device_number === matchDevice.device_number
|
||||
)
|
||||
) {
|
||||
$(`#${matchDevice.device_number}_status`)
|
||||
$(`#${deviceNumber(matchDevice.device_number)}_status`)
|
||||
.attr("data-light-type", "close")
|
||||
.data("light-type", "close");
|
||||
|
||||
@ -236,11 +237,11 @@
|
||||
)
|
||||
) {
|
||||
if (pageAct.sysSubTag === "L1") {
|
||||
$(`#${matchDevice.device_number}_status`)
|
||||
$(`#${deviceNumber(matchDevice.device_number)}_status`)
|
||||
.attr("data-light-error-type", "error")
|
||||
.data("light-error-type", "error");
|
||||
} else {
|
||||
$(`#${matchDevice.device_number}_status`)
|
||||
$(`#${deviceNumber(matchDevice.device_number)}_status`)
|
||||
.attr("data-light-type", "error")
|
||||
.data("light-type", "error");
|
||||
}
|
||||
@ -249,7 +250,7 @@
|
||||
data.point_name == errDevPoiName &&
|
||||
data.value !== matchDevice.device_error_point_value
|
||||
) {
|
||||
$(`#${matchDevice.device_number}_status`)
|
||||
$(`#${deviceNumber(matchDevice.device_number)}_status`)
|
||||
.attr("data-light-error-type", "")
|
||||
.data("light-error-type", "");
|
||||
alarmDbIdList = alarmDbIdList.filter(
|
||||
@ -457,7 +458,7 @@
|
||||
// 從設備訂閱更新每個設備卡片即時點位
|
||||
function setDevItemPoiValBySub(data) {
|
||||
let pointSpan = $(
|
||||
`.card.device-wrap[data-number=${data.device_number_full}] span[name=devItemPoiVal]`
|
||||
`.card.device-wrap[data-number=${deviceNumber(data.device_number_full)}] span[name=devItemPoiVal]`
|
||||
);
|
||||
if (pointSpan && pointSpan.data("point") == data.point_name) {
|
||||
// console.log(data)
|
||||
@ -602,6 +603,7 @@
|
||||
|
||||
if (!res.data || res.data.length == 0) {
|
||||
endPageLoading();
|
||||
$(loadEle).Loading("close");
|
||||
} else {
|
||||
// 訂閱 baja 設備
|
||||
if (pageAct.sysSubTag !== "L1" && pageAct.sysSubTag !== "M12") {
|
||||
@ -695,7 +697,7 @@
|
||||
function drawStateTabBlo(devNum) {
|
||||
let devPath = devNum.replaceAll("_", "/");
|
||||
let position =
|
||||
$(`.card.device-wrap[data-number=${devNum}]`).data("position") || "left";
|
||||
$(`.card.device-wrap[data-number=${deviceNumber(devNum)}]`).data("position") || "left";
|
||||
let width = buildMenuData[position + "_icon_click_url_width"]
|
||||
? buildMenuData[position + "_icon_click_url_width"] + "px"
|
||||
: "100%";
|
||||
|
||||
@ -1326,7 +1326,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
|
||||
"yt:tab:change",
|
||||
"[data-tabname=buildTab]",
|
||||
function (e, arg) {
|
||||
pageAct.buiTag = $(this).prop("id").split("buildTab")[1];
|
||||
pageAct.buiTag = buildingTagOnProcess($(this).prop("id").split("buildTab")[1]);
|
||||
pageAct.buiName = $(this).text();
|
||||
pageAct.urn = $(this).data("urn");
|
||||
$(this).parents("ul").find("a").removeClass("active");
|
||||
@ -1474,7 +1474,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
|
||||
$(`#subSysBtn${lastPageAct.sysSubTag}`).click();
|
||||
} else {
|
||||
$(
|
||||
`#subSysBtn${lastPageAct.sysSubTag}[data-building-tag=${pageAct.buiTag}]`
|
||||
`#subSysBtn${lastPageAct.sysSubTag}[data-building-tag=${buildingTagOnJquery(pageAct.buiTag)}]`
|
||||
).click();
|
||||
}
|
||||
} else {
|
||||
@ -2227,7 +2227,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
|
||||
""
|
||||
);
|
||||
a.html(
|
||||
`<span id="buildTab${building.building_tag}" data-tabname="buildTab" data-urn="${building.urn_3D}">${building.building_name}</span>`
|
||||
`<span id="buildTab${buildingTagOnJquery(building.building_tag)}" data-tabname="buildTab" data-urn="${building.urn_3D}">${building.building_name}</span>`
|
||||
);
|
||||
li.append(a);
|
||||
let ul = creEle("ul", null, null, null, [
|
||||
@ -2255,7 +2255,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
|
||||
{
|
||||
page: page,
|
||||
tabname: "systemMonitor",
|
||||
"building-tag": building.building_tag,
|
||||
"building-tag": buildingTagOnJquery(building.building_tag),
|
||||
},
|
||||
"topFunBtn"
|
||||
);
|
||||
|
||||
@ -1253,3 +1253,26 @@ function setTopBuildingText(){
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
function buildingTagOnJquery(building_tag){
|
||||
let frontSyntax = building_tag.slice(0,2);
|
||||
if(frontSyntax == "$3"){
|
||||
return building_tag.slice(2,building_tag.length);
|
||||
}
|
||||
return building_tag;
|
||||
}
|
||||
|
||||
function buildingTagOnProcess(building_tag){
|
||||
if(!isNaN(parseInt(building_tag.slice(0,1)))){
|
||||
building_tag = "$3" + building_tag;
|
||||
}
|
||||
return building_tag;
|
||||
}
|
||||
|
||||
function deviceNumber(devNum){
|
||||
if(devNum.includes("$3")){
|
||||
devNum = devNum.replaceAll("$3","");
|
||||
}
|
||||
return devNum;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user