From 82f7ef088753d7dedb30e2a2b858ed2d65c5dc46 Mon Sep 17 00:00:00 2001 From: dev01 Date: Wed, 23 Nov 2022 09:08:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[Frontend][=E7=B3=BB=E7=B5=B1=E7=9B=A3?= =?UTF-8?q?=E6=8E=A7]=20Card=20=E9=97=9C=E9=96=89=E6=8C=89=E9=88=95?= =?UTF-8?q?=E8=88=87tab=E5=90=8C=E5=88=97=20|=20card=E5=85=A7=E5=AE=B9?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E6=8B=89=E5=AF=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/_sysMonAll.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html index f8ffc8a..29d1b1e 100644 --- a/Frontend/_sysMonAll.html +++ b/Frontend/_sysMonAll.html @@ -195,10 +195,7 @@ let devName = $(ele).data("name"); //full_name $(ele).YTTooltip({ html: `
-
- -
-
+
@@ -208,6 +205,7 @@ +
From 821d787ceb7110d6a2cb65abc60ab8d63deae51b Mon Sep 17 00:00:00 2001 From: wanli Date: Wed, 23 Nov 2022 11:11:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[Frontend]=20=E9=80=8F=E9=81=8Ebaja=20?= =?UTF-8?q?=E5=8F=96=E5=BE=97=E8=A8=AD=E5=82=99=E7=9A=84=E7=95=B0=E5=B8=B8?= =?UTF-8?q?=E8=B3=87=E8=A8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/_sysMonAll.html | 71 ++++++++++------------------------- Frontend/js/n4js/alarmbaja.js | 37 ++---------------- 2 files changed, 23 insertions(+), 85 deletions(-) diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html index 29d1b1e..51cd5d7 100644 --- a/Frontend/_sysMonAll.html +++ b/Frontend/_sysMonAll.html @@ -232,9 +232,8 @@ console.log($(oriEle).data("number")) //基本資料tab block $("#info").html(drawInfoTabBlo(devGuid)); + loadErr($(oriEle).data("number")); loadOpeRecTable(devGuid); - //loadErrRecTable2($(oriEle).data("number")); - loadErrRecTable(); } }) }) @@ -285,10 +284,20 @@ let opeRecTable = new YourTeam.JqDataTables.getTableByAjax(url, tag, null, columns, column_defs, null, null, null, null, null, null, "tpi"); } - function loadErrRecTable() { + function loadErr(allPath) { + if (allPath != undefined && allPath != null) { + let _pathArr = allPath.split("_");//TPE_B1_ELEV_EL_R2F_NA_ELEV1_N1 + let _devicePath = _pathArr[0] + "_" + _pathArr[1] + "_" + _pathArr[2] + "_" + _pathArr[3] + "_" + _pathArr[4] + "_" + _pathArr[5]; + getOneDeviceAlarmTop10ByBaja(_devicePath, callbackForErr); + } + else { + console.log("no device"); + } + } + + function callbackForErr(result) { let tag = "#errRecTable"; let datas; - //getOneDeviceAlarmTop10ByBaja(_devicePath, callback); let column_defs = [ { "targets": [0], "width": "15%", "sortable": true }, @@ -312,61 +321,19 @@ "data": "ackState", }, { - "title": "發生/賦歸時間", - "data": "timestamp", - "width": "45%", + "title": "發生/完成時間", + "data": "normalTime", + "render": function (data, type, row) { + return row.timestamp + "
" + data; + }, }, ]; - //let callback = function (result) { - // datas = result; - //} - let result = '{"count": 2,"data":[{ "uuid": "43dc7846-bd96-4be2-ab35-f11aec729c60","msgText": "","ackState": "1","timestamp": "2022-Nov-16 10:30:24.951 AM UTC+08:00"},{"uuid": "7c309846-d862-4a8b-803b-cdc8e0efa092","msgText": "","ackState": "1","timestamp": "2022-Nov-16 10:00:24.893 AM UTC+08:00"}]}'; let json_object = JSON.parse(result); datas = json_object['data']; errRecTable = new YourTeam.JqDataTables.getTableByStatic(tag, datas, columns, column_defs, null, null, null, null, "tpi"); + } - //function loadErrRecTable2(allPath) { - // if (allPath != undefined && allPath != null) { - // let _pathArr = allPath.split("_");//TPE_B1_ELEV_EL_R2F_NA_ELEV1_N1 - // let _devicePath = _pathArr[0] + "_" + _pathArr[1] + "_" + _pathArr[2] + "_" + _pathArr[3] + "_" + _pathArr[4] + "_" + _pathArr[5]; - // //getOneDeviceAlarmTop10ByBaja(_devicePath, callback); - // console.log("devicePath: " + _devicePath); - // let result = '{"count": 2,"0": { "uuid": "43dc7846-bd96-4be2-ab35-f11aec729c60","timestamp": "2022-Nov-16 10:30:24.951 AM UTC+08:00","sourceName": "TPE_B1_ELEV_EL_R2F_NA_ELEV1_N1_TRIP","sourceState": "1","msgText": "","ackState": "1","normalTime": "1970-Jan-1 08:00:00.000 AM UTC+08:00"},"1": {"uuid": "7c309846-d862-4a8b-803b-cdc8e0efa092","timestamp": "2022-Nov-16 10:00:24.893 AM UTC+08:00","sourceName": "TPE_B1_ELEV_EL_R2F_NA_ELEV1_N1_TRIP","sourceState": "0","msgText": "","ackState": "1","normalTime": "2022-Nov-16 10:15:24.939 AM UTC+08:00"}}'; - // let result_Json = JSON.parse(result) - // var eachTable = $('.each-table tbody'); - - // for (var i = 0; i < result_Json['count']; i++) - // { - // item = result_Json[i.toString()]; - // eachTable.append( - // '' + - // '' + item.uuid + '' + - // '' + item.msgText + '' + - // '' + (item.ackState = 1 ? item.normalTime : '未確認') + '' + - // '' + item.timestamp + '' + - // ''); - // } - - // } - - // let callback = function (result) { - // var eachTable = $('.each-table tbody'); - // $.each(result, function (index, element) { - // eachTable.append( - // '' + - // '' + element[index].uuid + '' + - // '' + element[index].msgText + '' + - // '' + (element[index].ackState = 1 ? element[index].normalTime : '未確認') + '' + - // '' + element[index].timestamp + '' + - // ''); - // }); - // } - //} - // } - - - \ No newline at end of file diff --git a/Frontend/js/n4js/alarmbaja.js b/Frontend/js/n4js/alarmbaja.js index c75b46f..8daf612 100644 --- a/Frontend/js/n4js/alarmbaja.js +++ b/Frontend/js/n4js/alarmbaja.js @@ -88,35 +88,6 @@ function getAlarmByBaja(startDate_millisecond, endDate_millisecond, isRecover, i * @param {any} devicePath * @param {any} callback */ -// function getOneDeviceAlarmTop10ByBaja(devicePath, callback) { -// var _result = ""; -// var _ss = ""; -// var _index = 0; -// //{ "count":2,"data": [{ "time": "2022/11/14 15:00:00", "errId": "0001", "ackCheck": "未確認", "errReason": "燈泡故障" }, { "time": "2022/11/14 15:00:00", "errId": "0002", "ackCheck": "未確認", "errReason": "燈泡故障" }]} -// require(['baja!'], function (baja) { -// baja.Ord.make("local:|foxs:|alarm:|bql:select top 10 timestamp, ackState, alarmData, alarmData.sourceName, sourceState, uuid, alarmData.msgText, normalTime where alarmData.sourceName like '%" + devicePath + "%' order by timestamp desc").get() -// .then(function (table) { -// return table.cursor({ -// each: function (record) { -// if (_index == 0) -// _ss += '{"uuid":"' + record.get('uuid') + '", "msgText":"' + record.get('alarmData').get('msgText') + '", "ackState":"' + record.get('ackState') + '", "timestamp":"' + record.get('timestamp') + '"}'; -// else -// _ss += ',{"uuid":"' + record.get('uuid') + '", "msgText":"' + record.get('alarmData').get('msgText') + '", "ackState":"' + record.get('ackState') + '", "timestamp":"' + record.get('timestamp') + '"}'; -// _index++; -// }, -// after: function () { -// _result += '{' + '"count": ' + _index +', "data":['; - -// _result += _ss+']'; -// _result += '}'; -// if (typeof callback === 'function') { -// callback(_result); -// } -// } -// }); -// }); -// }); -// } function getOneDeviceAlarmTop10ByBaja(devicePath, callback) { var _result = ""; var _ss = ""; @@ -136,16 +107,16 @@ function getOneDeviceAlarmTop10ByBaja(devicePath, callback) { var _timestampTemp = new Date(record.get('timestamp').toString()); _occurrenceTime += _timestampTemp.getFullYear().toString() + "-" + addzero(_timestampTemp.getMonth() + 1).toString() + "-" + addzero(_timestampTemp.getDate()).toString() + " " + addzero(_timestampTemp.getHours()).toString() + ":" + addzero(_timestampTemp.getMinutes()).toString() + ":" + addzero(_timestampTemp.getSeconds()).toString(); - //var _occurrenceTime = _timestamp.format("yyyy-MM-dd hh:mm:ss");//.toLocaleString(); var _normaltime = new Date(record.get('normalTime').toString()); _normalTime += _normaltime.getFullYear().toString() + "-" + addzero(_normaltime.getMonth() + 1).toString() + "-" + addzero(_normaltime.getDate()).toString() + " " + addzero(_normaltime.getHours()).toString() + ":" + addzero(_normaltime.getMinutes()).toString() + ":" + addzero(_normaltime.getSeconds()).toString(); - var _msgText = record.get('alarmData').get('msgText') == 1 ? _occurrenceTime : "未確認"; + var _msgText = record.get('alarmData').get('msgText'); + var _ackText = record.get('ackState') == 1 ? _occurrenceTime : "未確認"; if (_index == 0) - _ss += '{"uuid":"' + _resultUuid[0] + '", "msgText":"' + _msgText + '", "ackState":"' + record.get('ackState') + '", "timestamp":"' + _occurrenceTime + '", "normalTime":"' + _normalTime + '"}'; + _ss += '{"uuid":"' + _resultUuid[0] + '", "msgText":"' + _msgText + '", "ackState":"' + _ackText + '", "timestamp":"' + _occurrenceTime + '", "normalTime":"' + _normalTime + '"}'; else - _ss += ',{"uuid":"' + _resultUuid[0] + '", "msgText":"' + _msgText + '", "ackState":"' + record.get('ackState') + '", "timestamp":"' + _occurrenceTime + '", "normalTime":"' + _normalTime + '"}'; + _ss += ',{"uuid":"' + _resultUuid[0] + '", "msgText":"' + _msgText + '", "ackState":"' + _ackText + '", "timestamp":"' + _occurrenceTime + '", "normalTime":"' + _normalTime + '"}'; _index++; }, after: function () { From e5c7b5077d3afab1bfe016312d0df858b610c49f Mon Sep 17 00:00:00 2001 From: wanli Date: Wed, 23 Nov 2022 12:39:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[Backend]=20N4=E5=90=8C=E6=AD=A5=E8=B3=87?= =?UTF-8?q?=E6=96=99=20=E6=94=B9=E5=8F=96=E7=B7=9A=E4=B8=8A=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NiagaraDataSynchronizeController.cs | 5 +++-- .../Services/Implement/webRequestService.cs | 20 +++++++++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Backend/Controllers/NiagaraDataSynchronizeController.cs b/Backend/Controllers/NiagaraDataSynchronizeController.cs index 5687558..17027ae 100644 --- a/Backend/Controllers/NiagaraDataSynchronizeController.cs +++ b/Backend/Controllers/NiagaraDataSynchronizeController.cs @@ -40,11 +40,12 @@ namespace Backend.Controllers try { List ds; - string url_slot = "slot:/Arena/H|"; + string url_slot = "slot:/TPE/B1|"; string top100 = " top 100 "; webRequestService svc = new webRequestService(); string bql = url_slot + "bql:select " + top100 + " * from control:ControlPoint "; - ds = svc.obixQuery("http://60.251.164.125:8080/obix/config/Arena/Program/ObixQuery/query/", bql); + //ds = svc.obixQuery("http://192.168.0.136:8080/obix/config/Arena/Program/ObixQuery/query/", bql); + ds = svc.obixQuery("http://localhost:8080/obix/config/Program/ObixQuery/query/", bql); apiResult.Code = "0000"; apiResult.Data = ds; diff --git a/Backend/Services/Implement/webRequestService.cs b/Backend/Services/Implement/webRequestService.cs index 57022a0..51bdae0 100644 --- a/Backend/Services/Implement/webRequestService.cs +++ b/Backend/Services/Implement/webRequestService.cs @@ -11,6 +11,7 @@ using System.Text; using System.Xml.Linq; using Repository.BackendRepository.Implement; using Repository.BackendRepository; +using Ubiety.Dns.Core; namespace Backend.Services.Implement { @@ -24,9 +25,24 @@ namespace Backend.Services.Implement String encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(username + ":" + password)); String API_Url = urlString; + + HttpWebRequest Postrequest = (HttpWebRequest)WebRequest.Create(API_Url); + Postrequest.Method = "POST"; + Postrequest.Headers.Add("Authorization", "Basic " + encoded); + Postrequest.PreAuthenticate = true; + + using (var streamWriter = new StreamWriter(Postrequest.GetRequestStream())) + { + string json = ""; + + streamWriter.Write(json); + } + HttpWebResponse response = (HttpWebResponse)Postrequest.GetResponse(); + var responseString = new StreamReader(response.GetResponseStream()).ReadToEnd(); + XmlDocument xmlDoc = new XmlDocument(); - //xmlDoc.LoadXml(responseString); - xmlDoc.Load("N4v1021.xml");//N4v1021 + xmlDoc.LoadXml(responseString); + //xmlDoc.Load("N4v1021.xml");//N4v1021 //xmlDoc.Save("N4.xml"); From acd7906d2c982442baebb6bc106c67f307214d68 Mon Sep 17 00:00:00 2001 From: dev01 Date: Wed, 23 Nov 2022 15:36:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[FrontendWebApi]=20DeviceManagement=20GetMa?= =?UTF-8?q?inSub=20=E5=A2=9E=E5=8A=A0=20device=5Fkind=20flashing=20?= =?UTF-8?q?=E6=AC=84=E4=BD=8D=20|=20GetDeivceList=20=E5=A2=9E=E5=8A=A0=20d?= =?UTF-8?q?evice=5Fkind=20=E9=BB=9E=E4=BD=8D=E5=90=8D=E7=A8=B1=E6=AC=84?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiControllers/DeviceManageController.cs | 11 +++++++---- FrontendWebApi/Models/Device.cs | 3 +++ FrontendWebApi/Models/HistoryClass.cs | 7 +++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs index 135e395..2e85807 100644 --- a/FrontendWebApi/ApiControllers/DeviceManageController.cs +++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs @@ -61,7 +61,7 @@ namespace FrontendWebApi.ApiControllers { var dbsub = await frontendRepository.GetAllAsync( @$"select distinct v1.system_key main_name, v1.system_value main_system_tag, v2.system_key sub_name, v2.system_value sub_system_tag, v1.system_priority, v2.system_priority, - dk.device_normal_color, dk.device_close_color, dk.device_error_color + dk.device_normal_color, dk.device_close_color, dk.device_error_color,dk.device_normal_flashing, dk.device_close_flashing, dk.device_error_flashing -- di.full_name as device_item_name, di.points as device_item_points, di.unit as device_item_unit, di.is_show_riserDiagram as device_item_is_show_riserDiagram, -- di.is_controll as device_item_is_controll, di.is_bool as device_item_is_bool, di.is_link as device_item_is_link from role_auth a @@ -93,6 +93,9 @@ namespace FrontendWebApi.ApiControllers history_Sub_System.device_normal_color = sub.device_normal_color; history_Sub_System.device_close_color = sub.device_close_color; history_Sub_System.device_error_color = sub.device_error_color; + history_Sub_System.device_normal_flashing = sub.device_normal_flashing; + history_Sub_System.device_close_flashing = sub.device_close_flashing; + history_Sub_System.device_error_flashing = sub.device_error_flashing; history_Main_System.History_Sub_systems.Add(history_Sub_System); } @@ -224,9 +227,9 @@ namespace FrontendWebApi.ApiControllers { List dl = new List(); sqlString = $@"select d.device_guid, d.full_name, d.device_coordinate, dk.device_image, d.device_number, CONCAT('{baseURL}', '{deviceKindFilePath}', dk.device_image) AS device_image_url, - dk.device_normal_point_id, dk.device_normal_point_guid, dk.device_normal_point_col, dk.device_normal_point_value, dk.device_normal_flashing, - dk.device_close_point_id, dk.device_close_point_guid, dk.device_close_point_col, dk.device_close_point_value, dk.device_close_flashing, - dk.device_error_point_id, dk.device_error_point_guid, dk.device_error_point_col, dk.device_error_point_value, dk.device_error_flashing + dk.device_normal_point_id, dk.device_normal_point_guid, dk.device_normal_point_col, dk.device_normal_point_value, dk.device_normal_flashing, dk.device_normal_point_name, + dk.device_close_point_id, dk.device_close_point_guid, dk.device_close_point_col, dk.device_close_point_value, dk.device_close_flashing, dk.device_close_point_name, + dk.device_error_point_id, dk.device_error_point_guid, dk.device_error_point_col, dk.device_error_point_value, dk.device_error_flashing, dk.device_error_point_name from device d left join device_kind dk on d.device_building_tag = dk.device_building_tag and d.device_system_tag = dk.device_system_tag and d.device_name_tag = dk.device_name_tag diff --git a/FrontendWebApi/Models/Device.cs b/FrontendWebApi/Models/Device.cs index c0f4595..810ca87 100644 --- a/FrontendWebApi/Models/Device.cs +++ b/FrontendWebApi/Models/Device.cs @@ -54,16 +54,19 @@ namespace FrontendWebApi.Models public string device_normal_point_id { get; set; } public string device_normal_point_guid { get; set; } public string device_normal_point_col { get; set; } + public string device_normal_point_name { get; set; } public string device_normal_point_value { get; set; } public string device_normal_flashing { get; set; } public string device_close_point_id { get; set; } public string device_close_point_guid { get; set; } public string device_close_point_col { get; set; } + public string device_close_point_name { get; set; } public string device_close_point_value { get; set; } public string device_close_flashing { get; set; } public string device_error_point_id { get; set; } public string device_error_point_guid { get; set; } public string device_error_point_col { get; set; } + public string device_error_point_name { get; set; } public string device_error_point_value { get; set; } public string device_error_flashing { get; set; } public List Device_nodes { get; set; } diff --git a/FrontendWebApi/Models/HistoryClass.cs b/FrontendWebApi/Models/HistoryClass.cs index 802dea2..048b3c6 100644 --- a/FrontendWebApi/Models/HistoryClass.cs +++ b/FrontendWebApi/Models/HistoryClass.cs @@ -70,6 +70,10 @@ namespace FrontendWebApi.Models public byte device_item_is_controll { get; set; } public byte device_item_is_bool { get; set; } public byte device_item_is_link { get; set; } + + public string device_normal_flashing { get; set; } + public string device_close_flashing { get; set; } + public string device_error_flashing { get; set; } } public class HistoryFind @@ -114,6 +118,9 @@ namespace FrontendWebApi.Models public string device_normal_color { get; set; } public string device_close_color { get; set; } public string device_error_color { get; set; } + public string device_normal_flashing { get; set; } + public string device_close_flashing { get; set; } + public string device_error_flashing { get; set; } } public class History_PostDevice { From 2c248f485a0fbef2e059e0493c7eadfb66d0706e Mon Sep 17 00:00:00 2001 From: dev01 Date: Wed, 23 Nov 2022 15:38:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[Frontend][=E7=B3=BB=E7=B5=B1=E7=9B=A3?= =?UTF-8?q?=E6=8E=A7]=20niagara=20=E8=A8=82=E9=96=B1=E4=B8=B2=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/_sysElevator.html | 78 +++++++----------------------- Frontend/_sysMonAll.html | 98 +++++++++++++++++++++++++++++++++++--- Frontend/index.html | 1 + 3 files changed, 109 insertions(+), 68 deletions(-) diff --git a/Frontend/_sysElevator.html b/Frontend/_sysElevator.html index 0ed4f28..b807e7f 100644 --- a/Frontend/_sysElevator.html +++ b/Frontend/_sysElevator.html @@ -8,8 +8,8 @@ } table.elevator-build td { padding: 0.2rem 0.5rem; - height: 40px; - width: 55px; + height: 50px; + width: 45px; border: 1px solid #000; } elevator .elevator-body, elevator .elevator-header { @@ -27,9 +27,11 @@
- - -
+
+ +
+
+