jay.chang/ibms-dome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

能源管理頁面衝突解決

Browse Source
This commit is contained in:
Celeste6666 2023-02-02 17:30:09 +08:00
commit 270e0855fc
7 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Backend/Controllers/BuildInfoController.cs
View File

@ -47,7 +47,7 @@ namespace Backend.Controllers
try try
{ {
var sqlString = @$"SELECT A.priority, A.building_tag, A.full_name, A.ip_address, A.ip_port, (SELECT COUNT(*) FROM floor f WHERE f.deleted = 0 AND f.building_tag = A.building_tag) AS 'floorNum', A.created_at, var sqlString = @$"SELECT A.priority, A.building_tag, A.full_name, A.ip_address, A.ip_port, (SELECT COUNT(*) FROM floor f WHERE f.deleted = 0 AND f.building_tag = A.building_tag) AS 'floorNum', A.created_at,
A.orgName_3D, A.extName_3D A.orgName_3D, A.extName_3D, forge_light_group
FROM building A FROM building A
WHERE A.deleted = 0 WHERE A.deleted = 0
ORDER BY A.priority ASC, A.created_at DESC"; ORDER BY A.priority ASC, A.created_at DESC";

5
Backend/Models/BuildModel.cs
View File

@ -22,6 +22,11 @@ namespace Backend.Models
public string extName_3D { get; set; } public string extName_3D { get; set; }
public string urn_3D { get; set; } public string urn_3D { get; set; }
//public string Created_at { get; set; } //建立時間 //public string Created_at { get; set; } //建立時間
/// <summary>
/// 0single_1group；燈控是否為群控/單獨(個別燈具)控制
/// </summary>
public Int16 forge_light_group { get; set; }
} }
public class BuildFloor : Actor public class BuildFloor : Actor

4
Backend/appsettings.Development.json
View File

@ -16,8 +16,8 @@
"MySqlDBConfig": { "MySqlDBConfig": {
"Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
"Port": "js2LutKe+rdjzdxMPQUrvQ==", "Port": "js2LutKe+rdjzdxMPQUrvQ==",
"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30
//"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
"Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
"Password": "FVAPxztxpY4gJJKQ/se4bQ==" "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
} }

2
Backend/appsettings.json
View File

@ -16,7 +16,7 @@
"MySqlDBConfig": { "MySqlDBConfig": {
"Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
"Port": "js2LutKe+rdjzdxMPQUrvQ==", "Port": "js2LutKe+rdjzdxMPQUrvQ==",
//"Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱 // "Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱
"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
"Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
"Password": "FVAPxztxpY4gJJKQ/se4bQ==" "Password": "FVAPxztxpY4gJJKQ/se4bQ=="

14
Frontend/_energyManagement.html
View File

@ -268,13 +268,13 @@
ytAjax = new YourTeam.Ajax(url, objSendData, function (res) { ytAjax = new YourTeam.Ajax(url, objSendData, function (res) {
if (!res || res.code != "0000" || !res.data) { if (!res || res.code != "0000" || !res.data) {
} else { } else {
let strHtml = ''; let strHtml = '';
$.each(res.data.history_Main_Systems, (index, mainSysObj) => { $.each(res.data.history_Main_Systems, (index, mainSysObj) => {
$.each(mainSysObj.history_Sub_systems, (index2, subSysObj) => { $.each(mainSysObj.history_Sub_systems, (index2, subSysObj) => {
subSysList.push(subSysObj); subSysList.push(subSysObj);
if ((type == 0 || (type == 3 && mainSysObj.main_system_tag == "ELEV")) && filNotShowSysSub.indexOf(subSysObj.sub_system_tag) == -1) { if ((type == 0 || (type == 3 && mainSysObj.main_system_tag == "ELEV")) && filNotShowSysSub.indexOf(subSysObj.sub_system_tag) == -1) {
strHtml += `<div class="col-sm-12 col-xl-4 mb-2"> strHtml += `<div class="col-sm-12 col-xl-4 mb-2">
<div class="card elecCard cur-poi" data-id="${mainSysObj.main_system_tag}_${subSysObj.sub_system_tag}" data-name="${subSysObj.full_name}"> <div class="card elecCard cur-poi" data-id="${mainSysObj.main_system_tag}_${subSysObj.sub_system_tag}" data-name="${subSysObj.full_name}">
<div class="card-body"> <div class="card-body">
<h4 class="card-title color-white">${subSysObj.full_name}用電</h4> <h4 class="card-title color-white">${subSysObj.full_name}用電</h4>

4
FrontendWebApi/ApiControllers/DeviceManageController.cs
View File

@ -176,7 +176,7 @@ namespace FrontendWebApi.ApiControllers
/// <summary> /// <summary>
/// 東別列表 /// 棟別列表
/// </summary> /// </summary>
/// <param name="account"></param> /// <param name="account"></param>
/// <returns></returns> /// <returns></returns>
@ -188,7 +188,7 @@ namespace FrontendWebApi.ApiControllers
try try
{ {
var sqlString = $@"select building_tag, full_name, urn_3D from building where deleted = 0 order by priority"; var sqlString = $@"select building_tag, full_name, urn_3D, forge_light_group from building where deleted = 0 order by priority";
var bl = await backendRepository.GetAllAsync<BuildList>(sqlString); var bl = await backendRepository.GetAllAsync<BuildList>(sqlString);
apiResult.Code = "0000"; apiResult.Code = "0000";

4
FrontendWebApi/Models/Device.cs
View File

@ -19,6 +19,10 @@ namespace FrontendWebApi.Models
public string full_name { get; set; } public string full_name { get; set; }
public string building_tag { get; set; } public string building_tag { get; set; }
public string urn_3D { get; set; } public string urn_3D { get; set; }
/// <summary>
/// 0single_1group；燈控是否為群控/單獨(個別燈具)控制
/// </summary>
public Int16 forge_light_group { get; set; }
} }
public class FloorList public class FloorList