diff --git a/Backend/App_Data/bajaJsList.ods b/Backend/App_Data/bajaJsList.ods new file mode 100644 index 0000000..8f63b6d Binary files /dev/null and b/Backend/App_Data/bajaJsList.ods differ diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html index b5904df..896e0f5 100644 --- a/Frontend/_sysMonAll.html +++ b/Frontend/_sysMonAll.html @@ -5,8 +5,8 @@
-
-
+
+
@@ -51,30 +51,48 @@ \ No newline at end of file diff --git a/Frontend/_sysMonFloor.html b/Frontend/_sysMonFloor.html index a1f9ae3..d88f236 100644 --- a/Frontend/_sysMonFloor.html +++ b/Frontend/_sysMonFloor.html @@ -29,215 +29,223 @@ function chartHandler() { floChart.clear(); - $.get(`${baseImgUrl}/upload/floor_map/c0de2199-e62b-4f82-b7f7-abacd4e1cd17.svg`, function (svg) { + /*let url = `${baseApiUrl}/upload/graph_manage/de08e7ee-9839-4403-90e5-754dec4e389b.jpg`*/ + let url = `${baseImgUrl}/upload/floor_map/2e5be49c-f8e8-4977-b5b6-db4d95ff9691.svg` - if (svg == undefined || svg == null) { - return; - } + download(url) - echarts.registerMap('floor_svg', { svg: svg }); + //ytAjax = new YourTeam.Ajax(url, null, function (res) { + // if (svg == undefined || svg == null) { + // return; + // } - option = { - // animationDurationUpdate: 1500, - tooltip: { - formatter: function (params) { - if (params.data.device_node_guid != undefined && params.data.device_node_guid != null && params.data.device_node_guid != "") { - return `名稱：${params.data.device_node_full_name}
- Guid：${params.data.device_node_guid}` - } - else { - return `名稱：${params.data.device_full_name}
- Guid：${params.data.device_guid}` - } - } - }, - toolbox: { //工具欄 - show: false - }, - geo: { - map: 'floor_svg', - roam: true, - scaleLimit: { //限制放大縮小倍數 - max: 32, - min: 2.5 - }, - layoutSize: '100%', - layoutCenter: ['50%', '50%'], - zoom: 2.5, - silent: true - }, - series: [ - { //不管有無被選擇(圓點) - type: 'scatter', - coordinateSystem: 'geo', - geoIndex: 0, - symbol: 'circle', - symbolSize: 10, - symbolOffset: [10, 10], - label: { - show: false - }, - data: currentData, - z: 2 - }, - { //未選擇的設備(icon) - type: 'scatter', - coordinateSystem: 'geo', - geoIndex: 0, - symbolSize: 30, - label: { - formatter: '{b}', - position: 'bottom', - show: true, - backgroundColor: 'orange' - }, - emphasis: { - label: { - show: true, - fontSize: '20', - fontWeight: 'bold', - color: 'yellow' - } - }, - selectedMode: 'single', - data: null, - z: 1 - }, - { //被選擇的設備(icon) - type: 'effectScatter', - coordinateSystem: 'geo', - geoIndex: 0, - showEffectOn: 'render', - symbolSize: 30, - label: { - formatter: '{b}', - position: 'bottom', - show: true, - backgroundColor: 'orange' - }, - emphasis: { - label: { - show: true, - fontSize: '20', - fontWeight: 'bold', - color: 'yellow' - } - }, - selectedMode: 'single', - data: null, - z: 1 - }, - { //編輯模式底下的設備(圓點，只會有一個) - type: 'scatter', - coordinateSystem: 'geo', - geoIndex: 0, - symbol: 'circle', - symbolSize: 10, - symbolOffset: [10, 10], - label: { - show: false - }, - data: currentData, - z: 2 - }, - { //編輯模式底下的設備(icon，只會有一個) - type: 'scatter', - coordinateSystem: 'geo', - geoIndex: 0, - symbolSize: 30, - label: { - formatter: '{b}', - position: 'bottom', - show: true, - backgroundColor: 'orange' - }, - emphasis: { - label: { - show: true, - fontSize: '20', - fontWeight: 'bold', - color: 'yellow' - } - }, - data: null, - z: 1 - }, - ], - }; + // echarts.registerMap('floor_svg', { svg: svg }); - floChart.setOption(option); + // option = { + // // animationDurationUpdate: 1500, + // tooltip: { + // formatter: function (params) { + // if (params.data.device_node_guid != undefined && params.data.device_node_guid != null && params.data.device_node_guid != "") { + // return `名稱：${params.data.device_node_full_name}
+ // Guid：${params.data.device_node_guid}` + // } + // else { + // return `名稱：${params.data.device_full_name}
+ // Guid：${params.data.device_guid}` + // } + // } + // }, + // toolbox: { //工具欄 + // show: false + // }, + // geo: { + // map: 'floor_svg', + // roam: true, + // scaleLimit: { //限制放大縮小倍數 + // max: 32, + // min: 2.5 + // }, + // layoutSize: '100%', + // layoutCenter: ['50%', '50%'], + // zoom: 2.5, + // silent: true + // }, + // series: [ + // { //不管有無被選擇(圓點) + // type: 'scatter', + // coordinateSystem: 'geo', + // geoIndex: 0, + // symbol: 'circle', + // symbolSize: 10, + // symbolOffset: [10, 10], + // label: { + // show: false + // }, + // data: currentData, + // z: 2 + // }, + // { //未選擇的設備(icon) + // type: 'scatter', + // coordinateSystem: 'geo', + // geoIndex: 0, + // symbolSize: 30, + // label: { + // formatter: '{b}', + // position: 'bottom', + // show: true, + // backgroundColor: 'orange' + // }, + // emphasis: { + // label: { + // show: true, + // fontSize: '20', + // fontWeight: 'bold', + // color: 'yellow' + // } + // }, + // selectedMode: 'single', + // data: null, + // z: 1 + // }, + // { //被選擇的設備(icon) + // type: 'effectScatter', + // coordinateSystem: 'geo', + // geoIndex: 0, + // showEffectOn: 'render', + // symbolSize: 30, + // label: { + // formatter: '{b}', + // position: 'bottom', + // show: true, + // backgroundColor: 'orange' + // }, + // emphasis: { + // label: { + // show: true, + // fontSize: '20', + // fontWeight: 'bold', + // color: 'yellow' + // } + // }, + // selectedMode: 'single', + // data: null, + // z: 1 + // }, + // { //編輯模式底下的設備(圓點，只會有一個) + // type: 'scatter', + // coordinateSystem: 'geo', + // geoIndex: 0, + // symbol: 'circle', + // symbolSize: 10, + // symbolOffset: [10, 10], + // label: { + // show: false + // }, + // data: currentData, + // z: 2 + // }, + // { //編輯模式底下的設備(icon，只會有一個) + // type: 'scatter', + // coordinateSystem: 'geo', + // geoIndex: 0, + // symbolSize: 30, + // label: { + // formatter: '{b}', + // position: 'bottom', + // show: true, + // backgroundColor: 'orange' + // }, + // emphasis: { + // label: { + // show: true, + // fontSize: '20', + // fontWeight: 'bold', + // color: 'yellow' + // } + // }, + // data: null, + // z: 1 + // }, + // ], + // }; - floChart.getZr().on('click', function (params) { - console.log("click", params); - var pixelPoint = [params.offsetX, params.offsetY]; - var dataPoint = floChart.convertFromPixel({ geoIndex: 0 }, pixelPoint); - console.log(dataPoint); + // floChart.setOption(option); - if (floor_map_mode == "edit") { + // floChart.getZr().on('click', function (params) { + // console.log("click", params); + // var pixelPoint = [params.offsetX, params.offsetY]; + // var dataPoint = floChart.convertFromPixel({ geoIndex: 0 }, pixelPoint); + // console.log(dataPoint); - temp_device_on_floor_map = [{ - device_guid: selected_temp_device.device_guid, - device_full_name: selected_temp_device.device_full_name, - device_node_guid: selected_temp_device.device_node_guid ? selected_temp_device.device_node_guid : null, - device_node_full_name: selected_temp_device.device_node_full_name ? selected_temp_device.device_node_full_name : null, - status: selected_temp_device.status, - value: dataPoint - }]; + // if (floor_map_mode == "edit") { - - } + // temp_device_on_floor_map = [{ + // device_guid: selected_temp_device.device_guid, + // device_full_name: selected_temp_device.device_full_name, + // device_node_guid: selected_temp_device.device_node_guid ? selected_temp_device.device_node_guid : null, + // device_node_full_name: selected_temp_device.device_node_full_name ? selected_temp_device.device_node_full_name : null, + // status: selected_temp_device.status, + // value: dataPoint + // }]; - // currentData.push([dataPoint[0], dataPoint[1], 1]); - // floChart.setOption(option); - }); + // } - floChart.on('selectchanged', function (params) { - - console.log("selectchanged", params); - // currentData.push([dataPoint[0], dataPoint[1], 1]); - // floChart.setOption(option); - currentData = $.map(currentData, function (item) { - item.selected = false; - return item; - }); + // // currentData.push([dataPoint[0], dataPoint[1], 1]); + // // floChart.setOption(option); + // }); - if (params.selected.length > 0) { - currentData[params.selected[0].seriesIndex - 1].selected = true; - } + // floChart.on('selectchanged', function (params) { - - }); + // console.log("selectchanged", params); + // // currentData.push([dataPoint[0], dataPoint[1], 1]); + // // floChart.setOption(option); - // floChart.getZr().on('mousewheel', function (params) { - // console.log(params) - // }) - floChart.on('georoam', function (params) { - - var zoom = floChart.getOption().geo[0].zoom; + // currentData = $.map(currentData, function (item) { + // item.selected = false; + // return item; + // }); - if (zoom <= 2.5) { - ResetFloorMap(); - floChart.setOption({ - geo: { - roam: 'scale' - }, - }); - } else { - floChart.setOption({ - geo: { - roam: true - }, - }); - } + // if (params.selected.length > 0) { + // currentData[params.selected[0].seriesIndex - 1].selected = true; + // } - - }); - }) - .fail(function () { - toast_warning("查無該樓層地圖") - floChart.clear(); - }); + + // }); + + // // floChart.getZr().on('mousewheel', function (params) { + // // console.log(params) + // // }) + // floChart.on('georoam', function (params) { + + // var zoom = floChart.getOption().geo[0].zoom; + + // if (zoom <= 2.5) { + // ResetFloorMap(); + // floChart.setOption({ + // geo: { + // roam: 'scale' + // }, + // }); + // } else { + // floChart.setOption({ + // geo: { + // roam: true + // }, + // }); + // } + + + // }); + //}).send(); + //$.get(`${baseImgUrl}/device/GetFloorSvg/c0de2199-e62b-4f82-b7f7-abacd4e1cd17.svg`, function (svg) { + + + //}) + // .fail(function () { + // toast_warning("查無該樓層地圖") + // floChart.clear(); + // }); } \ No newline at end of file diff --git a/Frontend/_systemMonitor.html b/Frontend/_systemMonitor.html index 5cf2d1d..402b514 100644 --- a/Frontend/_systemMonitor.html +++ b/Frontend/_systemMonitor.html @@ -5,11 +5,9 @@
-

電錶系統

-
- - - +

+
+
@@ -19,20 +17,46 @@ \ No newline at end of file diff --git a/Frontend/img/defdev.png b/Frontend/img/defdev.png new file mode 100644 index 0000000..42e7855 Binary files /dev/null and b/Frontend/img/defdev.png differ diff --git a/Frontend/index.html b/Frontend/index.html index 1c1654c..40bf6c9 100644 --- a/Frontend/index.html +++ b/Frontend/index.html @@ -25,6 +25,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li + @@ -1114,19 +1115,17 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
- + -
- 分公司一 - 分公司二 - 分公司三 +
- +
首頁
@@ -2055,18 +2054,23 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li + + - + + diff --git a/Frontend/js/init.js b/Frontend/js/init.js index c53c427..0cfa7bb 100644 --- a/Frontend/js/init.js +++ b/Frontend/js/init.js @@ -6,4 +6,14 @@ var varApiUrl = "/api/"; //API路徑 var varPathImg = "/Upload/Images/"; var varPathFile = "/Upload/Files/"; var statusArr = { 1: "啟用", 0: "未啟用", 9: "刪除" }; -var objSendData = { Data: null }; \ No newline at end of file +var objSendData = { Data: null }; + +//重新轉址 for Niagara4 +var temp_cuurent_Url_pathname = window.location.pathname.split("/").slice(0, 3); +var redirectionUrl = window.location.origin + "/" + + temp_cuurent_Url_pathname[temp_cuurent_Url_pathname.length - 1].replace(":%5E", "/") + "/" + + window.location.pathname.split("/").slice(3).join("/"); +//判斷url是否包含"ord"，如果有重新轉址 +if (temp_cuurent_Url_pathname.findIndex(x => x == "ord") > -1) { + document.location.href = redirectionUrl.substr(0, redirectionUrl.length - 1); +} \ No newline at end of file diff --git a/Frontend/js/n4js/alarmbaja.js b/Frontend/js/n4js/alarmbaja.js new file mode 100644 index 0000000..f3281f1 --- /dev/null +++ b/Frontend/js/n4js/alarmbaja.js @@ -0,0 +1,110 @@ + +/** + * 取得異常資料 by baja + * @param {any} startDate_millisecond + * @param {any} endDate_millisecond + * @param {any} isRecover + * @param {any} isAck + * @param {any} alarmClass + * @param {any} callback + */ +function getAlarmByBaja(startDate_millisecond, endDate_millisecond, isRecover, isAck, alarmClass, callback) { + let _sourceTmp; + var _result = ""; + var _ss = ""; + var _bfName = ""; + var _sourceName = ""; + var _index = 0; + var _recoverState = isRecover ? "!= null" : "= null" + var _ackState = isAck ? "= 1" : "!= 1"; + + require(['baja!'], function (baja) { + baja.Ord.make("local:|foxs:|alarm:|bql:select timestamp, ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime from openAlarms where alarmClass = '" + alarmClass + "' and timestamp.millis > " + startDate_millisecond + " and timestamp.millis < " + endDate_millisecond + " and normalTime " + _recoverState + " order by timestamp asc").get() + .then(function (table) { + return table.cursor({ + each: function (record) { + _sourceTmp = (record.get('alarmData').get('sourceName')).toString().split('_'); + _bfName = _sourceTmp[1] + "-" + _sourceTmp[4]; + _sourceName = _sourceTmp[7] + "-" + _sourceTmp[8]; + _ss += ', "' + _index + '": {"buildingFloorName_zh":"' + _bfName + '", "uuid":"' + record.get('uuid') + '", "timestamp":"' + record.get('timestamp') + '", "alarmClass":"' + record.get('alarmClass') + '", "sourceName_zh":"' + _sourceName + '", "msgText":"' + record.get('alarmData').get('msgText') + '", "ackState":"' + record.get('ackState') + '", "normalTime":"' + record.get('normalTime') + '"}'; + _index++; + }, + after: function () { + _result += '{' + '"count": ' + _index; + _result += _ss; + _result += '}'; + if (typeof callback === 'function') { + callback(_result); + } + } + }); + }); + }); +} + +/** + * 取得單一設備最新10筆異常資料 by baja + * @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); + } + } + }); + }); + }); +} + +/** + * 在單一系統下，取得各個設備的異常狀態 + * @param {any} systemPath + * @param {any} callback + */ +function getOneSystemAlarmStateByBaja(systemPath, callback) { + var _result = ""; + var _ss = ""; + var _index = 0; + + require(['baja!'], function (baja) { + baja.Ord.make("local:|foxs:|alarm:|bql:select alarmData, alarmData.sourceName, sourceState, uuid where alarmData.sourceName like '%" + systemPath + "%' order by timestamp desc").get() + .then(function (table) { + return table.cursor({ + each: function (record) { + _ss += ', "' + _index + '": {"uuid":"' + record.get('uuid') + '", "sourceName":"' + record.get('alarmData').get('sourceName') + '", "sourceState":"' + record.get('sourceState') + '"}'; + _index++; + }, + after: function () { + _result += '{' + '"count": ' + _index; + _result += _ss; + _result += '}'; + if (typeof callback === 'function') { + callback(_result); + } + } + }); + }); + }); +} + diff --git a/Frontend/js/n4js/bajatest.js b/Frontend/js/n4js/bajatest.js index 59e87a7..171fad3 100644 --- a/Frontend/js/n4js/bajatest.js +++ b/Frontend/js/n4js/bajatest.js @@ -1,79 +1,3 @@  -/** - * 取得歷史資料 by baja - * @param {any} devicePath - * @param {any} startDate_millisecond - * @param {any} endDate_millisecond - * @param {any} deviceName - * @param {any} company - * @param {any} callback - */ -function getHistoryDataByBaja(devicePath, startDate_millisecond, endDate_millisecond, deviceName, company, callback) { - var _result = ""; - var _ss = ""; - var _index = 0; - require(['baja!'], function (baja) { - baja.Ord.make('local:|foxs:|history:/' + company + '/' + devicePath + '|bql:select * from control:ControlPoint where timestamp.millis > ' + startDate_millisecond + ' and timestamp.millis < ' + endDate_millisecond).get() - .then(function (table) { - return table.cursor({ - each: function (record) { - _ss += ', "' + _index + '": {"deviceName":"' + deviceName + '", "value":' + record.get('value') + ', "timestamp":"' + record.get('timestamp') + '"}'; - _index++; - }, - after: function () { - _result += '{' + '"count": ' + _index; - _result += _ss; - _result += '}'; - if (typeof callback === 'function') { - callback(_result); - } - } - }); - }); - }); -} - -/** - * 取得異常資料 by baja - * @param {any} startDate_millisecond - * @param {any} endDate_millisecond - * @param {any} isRecover - * @param {any} isAck - * @param {any} alarmClass - * @param {any} callback - */ -function getAlarmByBaja(startDate_millisecond, endDate_millisecond, isRecover, isAck, alarmClass, callback) { - let _sourceTmp; - var _result = ""; - var _ss = ""; - var _bfName = ""; - var _sourceName = ""; - var _index = 0; - var _recoverState = isRecover ? "!= null" : "= null" - var _ackState = isAck ? "= 1" : "!= 1"; - - require(['baja!'], function (baja) { - baja.Ord.make("local:|foxs:|alarm:|bql:select timestamp, ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime from openAlarms where alarmClass = '" + alarmClass + "' and timestamp.millis > " + startDate_millisecond + " and timestamp.millis < " + endDate_millisecond + " and normalTime " + _recoverState + " order by timestamp asc").get() - .then(function (table) { - return table.cursor({ - each: function (record) { - _sourceTmp = (record.get('alarmData').get('sourceName')).toString().split('_'); - _bfName = _sourceTmp[1] + "-" + _sourceTmp[4]; - _sourceName = _sourceTmp[7] + "-" + _sourceTmp[8]; - _ss += ', "' + _index + '": {"buildingFloorName_zh":"' + _bfName + '", "uuid":"' + record.get('uuid') + '", "timestamp":"' + record.get('timestamp') + '", "alarmClass":"' + record.get('alarmClass') + '", "sourceName_zh":"' + _sourceName + '", "msgText":"' + record.get('alarmData').get('msgText') + '", "ackState":"' + record.get('ackState') + '", "normalTime":"' + record.get('normalTime') + '"}'; - _index++; - }, - after: function () { - _result += '{' + '"count": ' + _index; - _result += _ss; - _result += '}'; - if (typeof callback === 'function') { - callback(_result); - } - } - }); - }); - }); -} \ No newline at end of file diff --git a/Frontend/js/n4js/historybaja.js b/Frontend/js/n4js/historybaja.js new file mode 100644 index 0000000..0464754 --- /dev/null +++ b/Frontend/js/n4js/historybaja.js @@ -0,0 +1,37 @@ + +/** + * 取得歷史資料 by baja + * @param {any} devicePath + * @param {any} startDate_millisecond + * @param {any} endDate_millisecond + * @param {any} deviceName + * @param {any} company + * @param {any} callback + */ +function getHistoryDataByBaja(devicePath, startDate_millisecond, endDate_millisecond, deviceName, company, callback) { + var _result = ""; + var _ss = ""; + var _index = 0; + + require(['baja!'], function (baja) { + baja.Ord.make('local:|foxs:|history:/' + company + '/' + devicePath + '|bql:select * from control:ControlPoint where timestamp.millis > ' + startDate_millisecond + ' and timestamp.millis < ' + endDate_millisecond).get() + .then(function (table) { + return table.cursor({ + each: function (record) { + _ss += ', "' + _index + '": {"deviceName":"' + deviceName + '", "value":' + record.get('value') + ', "timestamp":"' + record.get('timestamp') + '"}'; + _index++; + }, + after: function () { + _result += '{' + '"count": ' + _index; + _result += _ss; + _result += '}'; + if (typeof callback === 'function') { + callback(_result); + } + } + }); + }); + }); +} + + diff --git a/Frontend/js/site.js b/Frontend/js/site.js index 5f28270..3aecd08 100644 --- a/Frontend/js/site.js +++ b/Frontend/js/site.js @@ -1 +1,45 @@ - \ No newline at end of file +$(function () { + $(".dropdown-menu.dropdown-select-menu").each((index, value) => { + setDropdownItem(value) + }) + +}) + +/** + * fn 定義 | 手動初始化 Bootstrap dropdown select + */ +$.fn.droSetItem = function () { + setDropdownItem(this); + return this; +} + +/** + * 設置 bootstrap dropdown 為下拉選單 + * @param {any} menuEle .dropdown-menu element + */ +function setDropdownItem(menuEle) { + if ($(menuEle).find(".dropdown-item.active").length == 0) { + $(menuEle).find(".dropdown-item").first().addClass("active"); + } + + let actText = $(menuEle).find(".dropdown-item.active").first().text(); + let actEleId = $(menuEle).prop("id"); + $(`.dropdown-toggle[data-target=${actEleId}]`).text(actText); + $(menuEle).trigger("active:change", $(menuEle).find(".dropdown-item.active")); + + //點選選項 add active class + onEvent("click", ".dropdown-menu.dropdown-select-menu .dropdown-item", function () { + $(this).parent(".dropdown-menu.dropdown-select-menu").find(".dropdown-item").removeClass("active"); + $(this).addClass("active"); + setDropdownItem($(this).parent(".dropdown-menu.dropdown-select-menu")); + }) +} + +/** + * 預設設備圖像 + * @param {any} obj + */ +function defDev(obj) { + let defSrc = 'img/defdev.png'; + obj.src = defSrc; +} diff --git a/Frontend/js/style.js b/Frontend/js/style.js index 86f2f69..d696dd2 100644 --- a/Frontend/js/style.js +++ b/Frontend/js/style.js @@ -1338,8 +1338,9 @@ async function download(url, filename) { } -function onEvent(type,selector,callback) { - $("body").on(type, selector, callback) +function onEvent(type, selector, callback) { + $("body").off(type, selector); + $("body").on(type, selector, callback); } /** diff --git a/Frontend/js/yourteam/plugins/yt-tab/yt-tab.js b/Frontend/js/yourteam/plugins/yt-tab/yt-tab.js index e921973..0e50fa8 100644 --- a/Frontend/js/yourteam/plugins/yt-tab/yt-tab.js +++ b/Frontend/js/yourteam/plugins/yt-tab/yt-tab.js @@ -10,11 +10,14 @@ * */ var YT = YT || {}; -var _ytTabInited = [] +var _ytTabInited = []; + $(function () { - }) +/** + * 初始全頁面 yt tab + * */ function initTabsByEle() { $("[data-tabname][data-target]:not([data-tabrole=child])").each(function (index, value) { let tabName = $(value).data("tabname"); @@ -31,25 +34,31 @@ class YourTeamTab { this.init() } - init = function() { + init = function () { + if (_ytTabInited.indexOf(this.tabName) != -1) { + _ytTabInited.splice($.inArray(this.tabName, _ytTabInited), 1); + $(`[data-tabname=${this.tabName}][data-target]`).off("click").unbind("click"); + } this.event(); $(`[data-tabname=${this.tabName}][data-tabrole=child]`).css("display", "none"); - $(`[data-tabname=${this.tabName}][data-target]`).first().click(); + $(`[data-tabname=${this.tabName}][data-target]`).first().trigger("click"); + _ytTabInited.push(this.tabName); } event = function () { let clsObj = this; - // custom tab - // example : - // - //
- $("body").on("click", `[data-tabname=${this.tabName}][data-target]`, function () { + + // Tab Item 按鈕 click + $(`[data-tabname=${this.tabName}][data-target]`).off("click").on("click", function (e) { let target = $(this).data("target"); let obj = this; - $(`[data-tabname=${clsObj.tabName}][data-target]:not([data-tabrole=child])`).removeClass("active") - $(obj).addClass("active") + $(`[data-tabname=${clsObj.tabName}][data-target]:not([data-tabrole=child])`).removeClass("active"); + $(obj).addClass("active"); + // 觸發 yt:tab:change事件 + $(obj).trigger("yt:tab:change"); let tabName = $(target).data("tabname"); if (tabName) { + // 找出該觸發對象 block if ($(target).data("tabrole") == "child") { $(obj).trigger("yt:tab:show"); $(`[data-tabname='${tabName}'][data-tabrole='child']`).css("opacity", 0).hide(); diff --git a/Frontend/js/yourteam/plugins/yt-tooltip/yt-tooltip.js b/Frontend/js/yourteam/plugins/yt-tooltip/yt-tooltip.js index f224792..5396020 100644 --- a/Frontend/js/yourteam/plugins/yt-tooltip/yt-tooltip.js +++ b/Frontend/js/yourteam/plugins/yt-tooltip/yt-tooltip.js @@ -30,6 +30,7 @@ $.fn.YTTooltip = function (option) { toggle: option.toggle || "click", hideTooltipEvent: hideTooltipEvent, onShow: option.onShow || null, + group: option.group || null, }; if (obj.toggle == "hover") { @@ -42,7 +43,6 @@ $.fn.YTTooltip = function (option) { //顯示 tooltip 程序 及 存入已顯示紀錄arr if (!tooId || obj.isShowArr.indexOf(tooId) == -1) { let ranId = Math.floor((Math.random() * (9999999 - 1000000)) + 1000000); - obj.isShowArr.push(ranId); let clone = $(obj.html); //body 元素 高寬 let bodyWidth = $("body")[0].offsetWidth; @@ -54,12 +54,24 @@ $.fn.YTTooltip = function (option) { let height = $(this)[0].offsetHeight; $(this).data("yttooltipid", ranId); - $(clone).attr("id", "yt_tooltip_" + ranId) + $(clone).attr("id", "yt_tooltip_" + ranId); + if (obj.group) { + $(clone).data("group", obj.group).attr("data-group", obj.group); + } + //同一 group tooltip 先隱藏 (只顯示一個) + if (obj.group) { + $(`body [id^=yt_tooltip_][data-group=${obj.group}]`).each((index, groTooEle) => { + let eleId = $(groTooEle).prop("id").split("yt_tooltip_")[1]; + obj.hideTooltipEvent(eleId); + }) + } $("body").append(clone); + //push 已顯示紀錄 + obj.isShowArr.push(ranId); obj.tooltipDiv = clone; //顯示 tooltip $(clone).css({ "display": display, "position": "absolute" }); - obj.onShow ? obj.onShow(clone,obj) : ""; + obj.onShow ? obj.onShow(clone,obj.ele,obj) : ""; //tooltip 高寬 let toolWidth = $(clone)[0].offsetWidth; let toolHeight = $(clone)[0].offsetHeight; @@ -108,13 +120,14 @@ $.fn.YTTooltip = function (option) { function hideTooltipEvent(tooId) { - $("#yt_tooltip_" + tooId).hide(); - setTimeout(function () { - if ($("#yt_tooltip_" + tooId).css("display") == "none") { - obj.isShowArr.splice($.inArray(tooId, obj.isShowArr), 1); - $("#yt_tooltip_" + tooId).remove(); - } - }, 100) + $("#yt_tooltip_" + tooId).remove(); + obj.isShowArr.splice($.inArray(tooId, obj.isShowArr), 1); + //setTimeout(function () { + // if ($("#yt_tooltip_" + tooId).css("display") == "none") { + // obj.isShowArr.splice($.inArray(tooId, obj.isShowArr), 1); + // $("#yt_tooltip_" + tooId).remove(); + // } + //}, 100) } diff --git a/Frontend/js/yourteam/yourteam.ajax.class.js b/Frontend/js/yourteam/yourteam.ajax.class.js index ca1ea94..a8fb407 100644 --- a/Frontend/js/yourteam/yourteam.ajax.class.js +++ b/Frontend/js/yourteam/yourteam.ajax.class.js @@ -27,6 +27,7 @@ class Ajax { this.type = type; this.dataType = dataType; this.sendData = sendData; + this.extSuccessFunction = successFunction; /*if (successFunction) this.successFunction = successFunction;*/ if (errorFunction) this.errorFunction = errorFunction; return this; @@ -128,9 +129,9 @@ class Ajax { if (sendData) { this.sendData = sendData; } - //if (successFunction) { - // this.successFunction = successFunction; - //} + if (successFunction) { + this.successFunction = successFunction; + } if (errorFunction) { this.errorFunction = errorFunction; } @@ -148,11 +149,11 @@ class Ajax { //processData: false, beforeSend: this.beforeSendFunction, - success:(data) => this.successFunction(data,successFunction), + success: (data) => this.successFunction(data, this.extSuccessFunction), error: this.errorFunction, complete: this.completeFunction, statusCode: { - 201: (data) => this.successFunction(data,successFunction), + 201: (data) => this.successFunction(data, this.extSuccessFunction), } }); } diff --git a/Frontend/js/yourteam/yourteam.jquery.datatables.js b/Frontend/js/yourteam/yourteam.jquery.datatables.js index 6059d25..e8979b8 100644 --- a/Frontend/js/yourteam/yourteam.jquery.datatables.js +++ b/Frontend/js/yourteam/yourteam.jquery.datatables.js @@ -58,52 +58,52 @@ function fnInitJqDataTablesNoData(tag, dataSet = null, columns = null, columnDef "columns": columns, "aoColumnDefs": columnDefs, "stateSave": true, - "pagingType": "full_numbers_custom", + "pagingType": "simple", "destroy": false, "initComplete": initComplete, "drawCallback": fnDrawCallBack, - "rowsGroup": rowsGroup, - "rowGroup": rowGroup, + //"rowsGroup": rowsGroup, + //"rowGroup": rowGroup, "retrieve": true, - "responsive": { - details: { + //"responsive": { + // details: { - target: '.dt-mobile-btn', - type: "column", - renderer: function (api, rowIdx, columns) { - var data = $.map(columns, function (col, i) { - return col.hidden ? - '' + - '' + col.title + ':' + ' ' + - '' + col.data + '' + - '' : - ''; - }).join(''); + // target: '.dt-mobile-btn', + // type: "column", + // renderer: function (api, rowIdx, columns) { + // var data = $.map(columns, function (col, i) { + // return col.hidden ? + // '' + + // '' + col.title + ':' + ' ' + + // '' + col.data + '' + + // '' : + // ''; + // }).join(''); - return data ? - $('').append(data) : - false; - }, + // return data ? + // $('
').append(data) : + // false; + // }, - }, - }, + // }, + //}, } let time = 0; table = $(tag).DataTable(oTable); table.on('processing', function (e, settings, processing) { - //過100ms的讀取才秀出loading - setTimeout(function () { - time == 1 ? loadingSetting("show", "dtProcessing") : ""; - }, 100); + ////過100ms的讀取才秀出loading + //setTimeout(function () { + // time == 1 ? loadingSetting("show", "dtProcessing") : ""; + //}, 100); - if (processing && time == 0) { //第一次讀取processing = true - time = 1; - } else if (!processing && time == 1 ) { //結束讀取後processing = false - loadingSetting("hide", "dtProcessing"); - time = 0; - } + //if (processing && time == 0) { //第一次讀取processing = true + // time = 1; + //} else if (!processing && time == 1 ) { //結束讀取後processing = false + // loadingSetting("hide", "dtProcessing"); + // time = 0; + //} }) table.on('responsive-display', function (e, datatable, row, showHide, update ) { table.columns.adjust(); @@ -222,16 +222,16 @@ function fnInitJqDataTablesAjax(apiUrl, tag, sendData = null, columns, columns_d table = $(tag).DataTable(oTable); table.on('processing', function (e, settings, processing) { //過100ms的讀取才秀出loading - setTimeout(function () { - time == 1 ? loadingSetting("show", "dtProcessing") : ""; - }, 100); + //setTimeout(function () { + // time == 1 ? loadingSetting("show", "dtProcessing") : ""; + //}, 100); - if (processing && time != 1) { //第一次讀取processing = true - time = 1; - } else if (!processing && time == 1) { //結束讀取後processing = false - loadingSetting("hide", "dtProcessing"); - time = 0; - } + //if (processing && time != 1) { //第一次讀取processing = true + // time = 1; + //} else if (!processing && time == 1) { //結束讀取後processing = false + // loadingSetting("hide", "dtProcessing"); + // time = 0; + //} }) } catch (e) { @@ -369,16 +369,16 @@ function fnInitJqDataTablesServerSideAjax(apiUrl, tag, sendData, columns, column console.log($.fn.DataTable.ext.pager) table.on('processing', function (e, settings, processing) { //過100ms的讀取才秀出loading - setTimeout(function () { - time == 1 ? loadingSetting("show", "pageload") : ""; - }, 100); + //setTimeout(function () { + // time == 1 ? loadingSetting("show", "pageload") : ""; + //}, 100); - if (processing && time == 0) { //第一次讀取processing = true - time = 1; - } else if (!processing && time == 1 && tableStatus != 2){ //結束讀取後processing = false - loadingSetting("hide", "pageload"); - time = 0; - } + //if (processing && time == 0) { //第一次讀取processing = true + // time = 1; + //} else if (!processing && time == 1 && tableStatus != 2){ //結束讀取後processing = false + // loadingSetting("hide", "pageload"); + // time = 0; + //} }) table.on('xhr', function (e, settings, json, xhr) { @@ -608,15 +608,15 @@ function serverSideExecLimit() { //tableStatus = 2 | 已觸發執行，不可接受執行(超出執行條件) if (tableStatus == 2) { - showAlert("danger", "執行次數過多！") - loadingSetting("show","dtServerSide"); //出現loading - setTimeout(function () { - loadingSetting("hide", "dtServerSide"); - pageEventNum = searchEventNum = orderEventNum = 0 //執行次數復歸 - timeNum = 0 //秒數歸零 - tableStatus = 0 //狀態復歸 - clearInterval(calEventTime) //計數關閉 - }, 5000) + //showAlert("danger", "執行次數過多！") + //loadingSetting("show","dtServerSide"); //出現loading + //setTimeout(function () { + // loadingSetting("hide", "dtServerSide"); + // pageEventNum = searchEventNum = orderEventNum = 0 //執行次數復歸 + // timeNum = 0 //秒數歸零 + // tableStatus = 0 //狀態復歸 + // clearInterval(calEventTime) //計數關閉 + //}, 5000) } } } diff --git a/Frontend/lib/notifications/toastr/toastr.js b/Frontend/lib/notifications/toastr/toastr.js deleted file mode 100644 index 1f80439..0000000 --- a/Frontend/lib/notifications/toastr/toastr.js +++ /dev/null @@ -1,476 +0,0 @@ -/* - * Toastr - * Copyright 2012-2015 - * Authors: John Papa, Hans Fjällemark, and Tim Ferrell. - * All Rights Reserved. - * Use, reproduction, distribution, and modification of this code is subject to the terms and - * conditions of the MIT license, available at http://www.opensource.org/licenses/mit-license.php - * - * ARIA Support: Greta Krafsig - * - * Project: https://github.com/CodeSeven/toastr - */ -/* global define */ -(function (define) { - define(['jquery'], function ($) { - return (function () { - var $container; - var listener; - var toastId = 0; - var toastType = { - error: 'error', - info: 'info', - success: 'success', - warning: 'warning' - }; - - var toastr = { - clear: clear, - remove: remove, - error: error, - getContainer: getContainer, - info: info, - options: {}, - subscribe: subscribe, - success: success, - version: '2.1.4', - warning: warning - }; - - var previousToast; - - return toastr; - - //////////////// - - function error(message, title, optionsOverride) { - return notify({ - type: toastType.error, - iconClass: getOptions().iconClasses.error, - message: message, - optionsOverride: optionsOverride, - title: title - }); - } - - function getContainer(options, create) { - if (!options) { options = getOptions(); } - $container = $('#' + options.containerId); - if ($container.length) { - return $container; - } - if (create) { - $container = createContainer(options); - } - return $container; - } - - function info(message, title, optionsOverride) { - return notify({ - type: toastType.info, - iconClass: getOptions().iconClasses.info, - message: message, - optionsOverride: optionsOverride, - title: title - }); - } - - function subscribe(callback) { - listener = callback; - } - - function success(message, title, optionsOverride) { - return notify({ - type: toastType.success, - iconClass: getOptions().iconClasses.success, - message: message, - optionsOverride: optionsOverride, - title: title - }); - } - - function warning(message, title, optionsOverride) { - return notify({ - type: toastType.warning, - iconClass: getOptions().iconClasses.warning, - message: message, - optionsOverride: optionsOverride, - title: title - }); - } - - function clear($toastElement, clearOptions) { - var options = getOptions(); - if (!$container) { getContainer(options); } - if (!clearToast($toastElement, options, clearOptions)) { - clearContainer(options); - } - } - - function remove($toastElement) { - var options = getOptions(); - if (!$container) { getContainer(options); } - if ($toastElement && $(':focus', $toastElement).length === 0) { - removeToast($toastElement); - return; - } - if ($container.children().length) { - $container.remove(); - } - } - - // internal functions - - function clearContainer (options) { - var toastsToClear = $container.children(); - for (var i = toastsToClear.length - 1; i >= 0; i--) { - clearToast($(toastsToClear[i]), options); - } - } - - function clearToast ($toastElement, options, clearOptions) { - var force = clearOptions && clearOptions.force ? clearOptions.force : false; - if ($toastElement && (force || $(':focus', $toastElement).length === 0)) { - $toastElement[options.hideMethod]({ - duration: options.hideDuration, - easing: options.hideEasing, - complete: function () { removeToast($toastElement); } - }); - return true; - } - return false; - } - - function createContainer(options) { - $container = $('
') - .attr('id', options.containerId) - .addClass(options.positionClass); - - $container.appendTo($(options.target)); - return $container; - } - - function getDefaults() { - return { - tapToDismiss: true, - toastClass: 'toast', - containerId: 'toast-container', - debug: false, - - showMethod: 'fadeIn', //fadeIn, slideDown, and show are built into jQuery - showDuration: 300, - showEasing: 'swing', //swing and linear are built into jQuery - onShown: undefined, - hideMethod: 'fadeOut', - hideDuration: 1000, - hideEasing: 'swing', - onHidden: undefined, - closeMethod: false, - closeDuration: false, - closeEasing: false, - closeOnHover: true, - - extendedTimeOut: 1000, - iconClasses: { - error: 'toast-error', - info: 'toast-info', - success: 'toast-success', - warning: 'toast-warning' - }, - iconClass: 'toast-info', - positionClass: 'toast-top-right', - timeOut: 5000, // Set timeOut and extendedTimeOut to 0 to make it sticky - titleClass: 'toast-title', - messageClass: 'toast-message', - escapeHtml: false, - target: 'body', - closeHtml: '', - closeClass: 'toast-close-button', - newestOnTop: true, - preventDuplicates: false, - progressBar: false, - progressClass: 'toast-progress', - rtl: false - }; - } - - function publish(args) { - if (!listener) { return; } - listener(args); - } - - function notify(map) { - var options = getOptions(); - var iconClass = map.iconClass || options.iconClass; - - if (typeof (map.optionsOverride) !== 'undefined') { - options = $.extend(options, map.optionsOverride); - iconClass = map.optionsOverride.iconClass || iconClass; - } - - if (shouldExit(options, map)) { return; } - - toastId++; - - $container = getContainer(options, true); - - var intervalId = null; - var $toastElement = $('
'); - var $titleElement = $('
'); - var $messageElement = $('
'); - var $progressElement = $('
'); - var $closeElement = $(options.closeHtml); - var progressBar = { - intervalId: null, - hideEta: null, - maxHideTime: null - }; - var response = { - toastId: toastId, - state: 'visible', - startTime: new Date(), - options: options, - map: map - }; - - personalizeToast(); - - displayToast(); - - handleEvents(); - - publish(response); - - if (options.debug && console) { - console.log(response); - } - - return $toastElement; - - function escapeHtml(source) { - if (source == null) { - source = ''; - } - - return source - .replace(/&/g, '&') - .replace(/"/g, '"') - .replace(/'/g, ''') - .replace(//g, '>'); - } - - function personalizeToast() { - setIcon(); - setTitle(); - setMessage(); - setCloseButton(); - setProgressBar(); - setRTL(); - setSequence(); - setAria(); - } - - function setAria() { - var ariaValue = ''; - switch (map.iconClass) { - case 'toast-success': - case 'toast-info': - ariaValue = 'polite'; - break; - default: - ariaValue = 'assertive'; - } - $toastElement.attr('aria-live', ariaValue); - } - - function handleEvents() { - if (options.closeOnHover) { - $toastElement.hover(stickAround, delayedHideToast); - } - - if (!options.onclick && options.tapToDismiss) { - $toastElement.click(hideToast); - } - - if (options.closeButton && $closeElement) { - $closeElement.click(function (event) { - if (event.stopPropagation) { - event.stopPropagation(); - } else if (event.cancelBubble !== undefined && event.cancelBubble !== true) { - event.cancelBubble = true; - } - - if (options.onCloseClick) { - options.onCloseClick(event); - } - - hideToast(true); - }); - } - - if (options.onclick) { - $toastElement.click(function (event) { - options.onclick(event); - hideToast(); - }); - } - } - - function displayToast() { - $toastElement.hide(); - - $toastElement[options.showMethod]( - {duration: options.showDuration, easing: options.showEasing, complete: options.onShown} - ); - - if (options.timeOut > 0) { - intervalId = setTimeout(hideToast, options.timeOut); - progressBar.maxHideTime = parseFloat(options.timeOut); - progressBar.hideEta = new Date().getTime() + progressBar.maxHideTime; - if (options.progressBar) { - progressBar.intervalId = setInterval(updateProgress, 10); - } - } - } - - function setIcon() { - if (map.iconClass) { - $toastElement.addClass(options.toastClass).addClass(iconClass); - } - } - - function setSequence() { - if (options.newestOnTop) { - $container.prepend($toastElement); - } else { - $container.append($toastElement); - } - } - - function setTitle() { - if (map.title) { - var suffix = map.title; - if (options.escapeHtml) { - suffix = escapeHtml(map.title); - } - $titleElement.append(suffix).addClass(options.titleClass); - $toastElement.append($titleElement); - } - } - - function setMessage() { - if (map.message) { - var suffix = map.message; - if (options.escapeHtml) { - suffix = escapeHtml(map.message); - } - $messageElement.append(suffix).addClass(options.messageClass); - $toastElement.append($messageElement); - } - } - - function setCloseButton() { - if (options.closeButton) { - $closeElement.addClass(options.closeClass).attr('role', 'button'); - $toastElement.prepend($closeElement); - } - } - - function setProgressBar() { - if (options.progressBar) { - $progressElement.addClass(options.progressClass); - $toastElement.prepend($progressElement); - } - } - - function setRTL() { - if (options.rtl) { - $toastElement.addClass('rtl'); - } - } - - function shouldExit(options, map) { - if (options.preventDuplicates) { - if (map.message === previousToast) { - return true; - } else { - previousToast = map.message; - } - } - return false; - } - - function hideToast(override) { - var method = override && options.closeMethod !== false ? options.closeMethod : options.hideMethod; - var duration = override && options.closeDuration !== false ? - options.closeDuration : options.hideDuration; - var easing = override && options.closeEasing !== false ? options.closeEasing : options.hideEasing; - if ($(':focus', $toastElement).length && !override) { - return; - } - clearTimeout(progressBar.intervalId); - return $toastElement[method]({ - duration: duration, - easing: easing, - complete: function () { - removeToast($toastElement); - clearTimeout(intervalId); - if (options.onHidden && response.state !== 'hidden') { - options.onHidden(); - } - response.state = 'hidden'; - response.endTime = new Date(); - publish(response); - } - }); - } - - function delayedHideToast() { - if (options.timeOut > 0 || options.extendedTimeOut > 0) { - intervalId = setTimeout(hideToast, options.extendedTimeOut); - progressBar.maxHideTime = parseFloat(options.extendedTimeOut); - progressBar.hideEta = new Date().getTime() + progressBar.maxHideTime; - } - } - - function stickAround() { - clearTimeout(intervalId); - progressBar.hideEta = 0; - $toastElement.stop(true, true)[options.showMethod]( - {duration: options.showDuration, easing: options.showEasing} - ); - } - - function updateProgress() { - var percentage = ((progressBar.hideEta - (new Date().getTime())) / progressBar.maxHideTime) * 100; - $progressElement.width(percentage + '%'); - } - } - - function getOptions() { - return $.extend({}, getDefaults(), toastr.options); - } - - function removeToast($toastElement) { - if (!$container) { $container = getContainer(); } - if ($toastElement.is(':visible')) { - return; - } - $toastElement.remove(); - $toastElement = null; - if ($container.children().length === 0) { - $container.remove(); - previousToast = undefined; - } - } - - })(); - }); -}(typeof define === 'function' && define.amd ? define : function (deps, factory) { - if (typeof module !== 'undefined' && module.exports) { //Node - module.exports = factory(require('jquery')); - } else { - window.toastr = factory(window.jQuery); - } -})); diff --git a/Frontend/lib/notifications/toastr/toastr.min.css b/Frontend/lib/notifications/toastr/toastr.min.css new file mode 100644 index 0000000..064afd0 --- /dev/null +++ b/Frontend/lib/notifications/toastr/toastr.min.css @@ -0,0 +1 @@ +.toast-title{font-weight:700}.toast-message{-ms-word-wrap:break-word;word-wrap:break-word}.toast-message a,.toast-message label{color:#FFF}.toast-message a:hover{color:#CCC;text-decoration:none}.toast-close-button{position:relative;right:-.3em;top:-.3em;float:right;font-size:20px;font-weight:700;color:#FFF;-webkit-text-shadow:0 1px 0 #fff;text-shadow:0 1px 0 #fff;opacity:.8;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=80);filter:alpha(opacity=80);line-height:1}.toast-close-button:focus,.toast-close-button:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=40);filter:alpha(opacity=40)}.rtl .toast-close-button{left:-.3em;float:left;right:.3em}button.toast-close-button{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none}.toast-top-center{top:0;right:0;width:100%}.toast-bottom-center{bottom:0;right:0;width:100%}.toast-top-full-width{top:0;right:0;width:100%}.toast-bottom-full-width{bottom:0;right:0;width:100%}.toast-top-left{top:12px;left:12px}.toast-top-right{top:12px;right:12px}.toast-bottom-right{right:12px;bottom:12px}.toast-bottom-left{bottom:12px;left:12px}#toast-container{position:fixed;z-index:999999;pointer-events:none}#toast-container *{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}#toast-container>div{position:relative;pointer-events:auto;overflow:hidden;margin:0 0 6px;padding:15px 15px 15px 50px;width:300px;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-position:15px center;background-repeat:no-repeat;-moz-box-shadow:0 0 12px #999;-webkit-box-shadow:0 0 12px #999;box-shadow:0 0 12px #999;color:#FFF;opacity:.8;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=80);filter:alpha(opacity=80)}#toast-container>div.rtl{direction:rtl;padding:15px 50px 15px 15px;background-position:right 15px center}#toast-container>div:hover{-moz-box-shadow:0 0 12px #000;-webkit-box-shadow:0 0 12px #000;box-shadow:0 0 12px #000;opacity:1;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=100);filter:alpha(opacity=100);cursor:pointer}#toast-container>.toast-info{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=)!important}#toast-container>.toast-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=)!important}#toast-container>.toast-success{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==)!important}#toast-container>.toast-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=)!important}#toast-container.toast-bottom-center>div,#toast-container.toast-top-center>div{width:300px;margin-left:auto;margin-right:auto}#toast-container.toast-bottom-full-width>div,#toast-container.toast-top-full-width>div{width:96%;margin-left:auto;margin-right:auto}.toast{background-color:#030303}.toast-success{background-color:#51A351}.toast-error{background-color:#BD362F}.toast-info{background-color:#2F96B4}.toast-warning{background-color:#F89406}.toast-progress{position:absolute;left:0;bottom:0;height:4px;background-color:#000;opacity:.4;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=40);filter:alpha(opacity=40)}@media all and (max-width:240px){#toast-container>div{padding:8px 8px 8px 50px;width:11em}#toast-container>div.rtl{padding:8px 50px 8px 8px}#toast-container .toast-close-button{right:-.2em;top:-.2em}#toast-container .rtl .toast-close-button{left:-.2em;right:.2em}}@media all and (min-width:241px) and (max-width:480px){#toast-container>div{padding:8px 8px 8px 50px;width:18em}#toast-container>div.rtl{padding:8px 50px 8px 8px}#toast-container .toast-close-button{right:-.2em;top:-.2em}#toast-container .rtl .toast-close-button{left:-.2em;right:.2em}}@media all and (min-width:481px) and (max-width:768px){#toast-container>div{padding:15px 15px 15px 50px;width:25em}#toast-container>div.rtl{padding:15px 50px 15px 15px}} \ No newline at end of file diff --git a/Frontend/lib/notifications/toastr/toastr.min.js b/Frontend/lib/notifications/toastr/toastr.min.js new file mode 100644 index 0000000..7c0c07c --- /dev/null +++ b/Frontend/lib/notifications/toastr/toastr.min.js @@ -0,0 +1,2 @@ +!function(e){e(["jquery"],function(e){return function(){function t(e,t,n){return g({type:O.error,iconClass:m().iconClasses.error,message:e,optionsOverride:n,title:t})}function n(t,n){return t||(t=m()),v=e("#"+t.containerId),v.length?v:(n&&(v=d(t)),v)}function o(e,t,n){return g({type:O.info,iconClass:m().iconClasses.info,message:e,optionsOverride:n,title:t})}function s(e){C=e}function i(e,t,n){return g({type:O.success,iconClass:m().iconClasses.success,message:e,optionsOverride:n,title:t})}function a(e,t,n){return g({type:O.warning,iconClass:m().iconClasses.warning,message:e,optionsOverride:n,title:t})}function r(e,t){var o=m();v||n(o),u(e,o,t)||l(o)}function c(t){var o=m();return v||n(o),t&&0===e(":focus",t).length?void h(t):void(v.children().length&&v.remove())}function l(t){for(var n=v.children(),o=n.length-1;o>=0;o--)u(e(n[o]),t)}function u(t,n,o){var s=!(!o||!o.force)&&o.force;return!(!t||!s&&0!==e(":focus",t).length)&&(t[n.hideMethod]({duration:n.hideDuration,easing:n.hideEasing,complete:function(){h(t)}}),!0)}function d(t){return v=e("
").attr("id",t.containerId).addClass(t.positionClass),v.appendTo(e(t.target)),v}function p(){return{tapToDismiss:!0,toastClass:"toast",containerId:"toast-container",debug:!1,showMethod:"fadeIn",showDuration:300,showEasing:"swing",onShown:void 0,hideMethod:"fadeOut",hideDuration:1e3,hideEasing:"swing",onHidden:void 0,closeMethod:!1,closeDuration:!1,closeEasing:!1,closeOnHover:!0,extendedTimeOut:1e3,iconClasses:{error:"toast-error",info:"toast-info",success:"toast-success",warning:"toast-warning"},iconClass:"toast-info",positionClass:"toast-top-right",timeOut:5e3,titleClass:"toast-title",messageClass:"toast-message",escapeHtml:!1,target:"body",closeHtml:'',closeClass:"toast-close-button",newestOnTop:!0,preventDuplicates:!1,progressBar:!1,progressClass:"toast-progress",rtl:!1}}function f(e){C&&C(e)}function g(t){function o(e){return null==e&&(e=""),e.replace(/&/g,"&").replace(/"/g,""").replace(/'/g,"'").replace(//g,">")}function s(){c(),u(),d(),p(),g(),C(),l(),i()}function i(){var e="";switch(t.iconClass){case"toast-success":case"toast-info":e="polite";break;default:e="assertive"}I.attr("aria-live",e)}function a(){E.closeOnHover&&I.hover(H,D),!E.onclick&&E.tapToDismiss&&I.click(b),E.closeButton&&j&&j.click(function(e){e.stopPropagation?e.stopPropagation():void 0!==e.cancelBubble&&e.cancelBubble!==!0&&(e.cancelBubble=!0),E.onCloseClick&&E.onCloseClick(e),b(!0)}),E.onclick&&I.click(function(e){E.onclick(e),b()})}function r(){I.hide(),I[E.showMethod]({duration:E.showDuration,easing:E.showEasing,complete:E.onShown}),E.timeOut>0&&(k=setTimeout(b,E.timeOut),F.maxHideTime=parseFloat(E.timeOut),F.hideEta=(new Date).getTime()+F.maxHideTime,E.progressBar&&(F.intervalId=setInterval(x,10)))}function c(){t.iconClass&&I.addClass(E.toastClass).addClass(y)}function l(){E.newestOnTop?v.prepend(I):v.append(I)}function u(){if(t.title){var e=t.title;E.escapeHtml&&(e=o(t.title)),M.append(e).addClass(E.titleClass),I.append(M)}}function d(){if(t.message){var e=t.message;E.escapeHtml&&(e=o(t.message)),B.append(e).addClass(E.messageClass),I.append(B)}}function p(){E.closeButton&&(j.addClass(E.closeClass).attr("role","button"),I.prepend(j))}function g(){E.progressBar&&(q.addClass(E.progressClass),I.prepend(q))}function C(){E.rtl&&I.addClass("rtl")}function O(e,t){if(e.preventDuplicates){if(t.message===w)return!0;w=t.message}return!1}function b(t){var n=t&&E.closeMethod!==!1?E.closeMethod:E.hideMethod,o=t&&E.closeDuration!==!1?E.closeDuration:E.hideDuration,s=t&&E.closeEasing!==!1?E.closeEasing:E.hideEasing;if(!e(":focus",I).length||t)return clearTimeout(F.intervalId),I[n]({duration:o,easing:s,complete:function(){h(I),clearTimeout(k),E.onHidden&&"hidden"!==P.state&&E.onHidden(),P.state="hidden",P.endTime=new Date,f(P)}})}function D(){(E.timeOut>0||E.extendedTimeOut>0)&&(k=setTimeout(b,E.extendedTimeOut),F.maxHideTime=parseFloat(E.extendedTimeOut),F.hideEta=(new Date).getTime()+F.maxHideTime)}function H(){clearTimeout(k),F.hideEta=0,I.stop(!0,!0)[E.showMethod]({duration:E.showDuration,easing:E.showEasing})}function x(){var e=(F.hideEta-(new Date).getTime())/F.maxHideTime*100;q.width(e+"%")}var E=m(),y=t.iconClass||E.iconClass;if("undefined"!=typeof t.optionsOverride&&(E=e.extend(E,t.optionsOverride),y=t.optionsOverride.iconClass||y),!O(E,t)){T++,v=n(E,!0);var k=null,I=e("
"),M=e("
"),B=e("
"),q=e("
"),j=e(E.closeHtml),F={intervalId:null,hideEta:null,maxHideTime:null},P={toastId:T,state:"visible",startTime:new Date,options:E,map:t};return s(),r(),a(),f(P),E.debug&&console&&console.log(P),I}}function m(){return e.extend({},p(),b.options)}function h(e){v||(v=n()),e.is(":visible")||(e.remove(),e=null,0===v.children().length&&(v.remove(),w=void 0))}var v,C,w,T=0,O={error:"error",info:"info",success:"success",warning:"warning"},b={clear:r,remove:c,error:t,getContainer:n,info:o,options:{},subscribe:s,success:i,version:"2.1.3",warning:a};return b}()})}("function"==typeof define&&define.amd?define:function(e,t){"undefined"!=typeof module&&module.exports?module.exports=t(require("jquery")):window.toastr=t(window.jQuery)}); +//# sourceMappingURL=toastr.js.map diff --git a/Frontend/login.html b/Frontend/login.html index d0f5227..0a0456b 100644 --- a/Frontend/login.html +++ b/Frontend/login.html @@ -15,6 +15,7 @@ + @@ -26,7 +27,7 @@
@@ -69,14 +70,14 @@ - - + + - + @@ -180,15 +181,11 @@ //rel = JSON.stringify(rel); if (rel.code != "0000") { - if (rel.code == "9999") { - toast_error(rel.msg); - } - else { - toast_ok(rel.msg); - } + toast_error(rel.msg || "系統內部發生錯誤，請聯絡系統管理員"); return; } else { + toast_ok(rel.msg); localStorage.setItem('JWT-Authorization', rel.data.token); location.href = "index.html"; return; diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs index 95c2bf0..5a586fd 100644 --- a/FrontendWebApi/ApiControllers/DeviceManageController.cs +++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs @@ -132,7 +132,7 @@ namespace FrontendWebApi.ApiControllers try { - var sqlString = $@"select floor_tag, full_name from floor where deleted = 0 and building_tag = @building_tag"; + var sqlString = $@"select full_name as floor_tag from floor where deleted = 0 and building_tag = @building_tag"; var param = new { @building_tag = fd.building_tag }; var fl = await backendRepository.GetAllAsync(sqlString, param); @@ -175,17 +175,17 @@ namespace FrontendWebApi.ApiControllers try { - var sqlString = $@"select floor_tag, full_name, InitMapName as map_name, floor_map_name + '.svg' as floor_map_name from floor where deleted = 0 and building_tag = @building_tag and full_name = ifnull(@floor_tag, full_name)"; + var sqlString = $@"select full_name, InitMapName as map_name, floor_map_name + '.svg' as floor_map_name from floor where deleted = 0 and building_tag = @building_tag and full_name = ifnull(@floor_tag, full_name)"; var param = new { @building_tag = fd.building_tag, @floor_tag = fd.floor_tag }; var fl = await backendRepository.GetAllAsync(sqlString, param); foreach (var f in fl) { List dl = new List(); - sqlString = $@"select d.device_guid, d.device_last_name, d.status, d.device_coordinate, dm.device_master_icon + sqlString = $@"select d.device_guid, d.full_name, d.status, d.device_coordinate, dm.device_master_icon,d.device_number from device d - left join device_master dm on d.device_building_tag = dm.device_building_tag and d.device_name_tag = dm.device_name_tag and dm.deleted = 0 - where deleted = 0 and device_system_tag = @main_system_tag and device_building_tag = @building_tag and device_floor_tag = ifnull(@floor_tag, device_floor_tag)"; + left join device_master dm on d.device_building_tag = dm.device_building_tag and d.device_name_tag = dm.device_name_tag + where d.deleted = 0 and d.device_system_tag = @main_system_tag and d.device_building_tag = @building_tag and d.device_floor_tag = ifnull(@floor_tag, d.device_floor_tag)"; var dlParam = new { @main_system_tag = fd.main_system_tag, @building_tag = fd.building_tag, @floor_tag = fd.floor_tag }; dl = await backendRepository.GetAllAsync(sqlString, dlParam); f.device_list = dl; diff --git a/FrontendWebApi/Models/Device.cs b/FrontendWebApi/Models/Device.cs index 17c17f4..71cf0a7 100644 --- a/FrontendWebApi/Models/Device.cs +++ b/FrontendWebApi/Models/Device.cs @@ -30,6 +30,7 @@ namespace FrontendWebApi.Models public class DeviceLists { public string device_guid { get; set; } + public string device_number { get; set; } public string full_name { get; set; } public string device_coordinate { get; set; } public string device_coordinate_3d { get; set; } diff --git a/FrontendWebApi/wwwroot/upload/26121072-5f50-4638-bee9-0ff8c9319350.svg b/FrontendWebApi/wwwroot/upload/26121072-5f50-4638-bee9-0ff8c9319350.svg new file mode 100644 index 0000000..38360db --- /dev/null +++ b/FrontendWebApi/wwwroot/upload/26121072-5f50-4638-bee9-0ff8c9319350.svg @@ -0,0 +1,3016 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +