diff --git a/.gitignore b/.gitignore index 9491a2f..bdac7ba 100644 --- a/.gitignore +++ b/.gitignore @@ -360,4 +360,5 @@ MigrationBackup/ .ionide/ # Fody - auto-generated XML schema -FodyWeavers.xsd \ No newline at end of file +FodyWeavers.xsd +/Backend/wwwroot/upload/floor_map.zip diff --git a/Backend/wwwroot/upload/floor_map/7acfc931-98d5-4dd3-a0d8-297fc546edfc.svg b/Backend/wwwroot/upload/floor_map/7acfc931-98d5-4dd3-a0d8-297fc546edfc.svg new file mode 100644 index 0000000..34d11ed --- /dev/null +++ b/Backend/wwwroot/upload/floor_map/7acfc931-98d5-4dd3-a0d8-297fc546edfc.svg @@ -0,0 +1,1393 @@ + + + + diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html index 99a7704..25dbb39 100644 --- a/Frontend/_sysMonAll.html +++ b/Frontend/_sysMonAll.html @@ -1,42 +1,39 @@ 
-
- +
+ +
- +
@@ -68,12 +65,12 @@ } else { let strHtml = ``; $.each(res.data, (index, floObj) => { - strHtml += "
" - strHtml += `` + strHtml += `
` + strHtml += `` $.each(floObj.device_list, (index2, devObj) => { console.log(">>>> url: " + baseImgUrl + " , img: " + varPathImg + ", icon: " + devObj.device_master_icon); - strHtml += `
+ strHtml += `
... ${devObj.full_name} @@ -144,9 +141,13 @@ $("[name=devItem]").each((index, ele) => { let devNum = $(ele).data("number"); //設備編號 let devGuid = $(ele).data("id"); //guid + let devName = $(ele).data("name"); //full_name $(ele).YTTooltip({ html: `
+
+ +
@@ -177,7 +178,7 @@ var tab = new YT.Tab({ tabName: "cardTab" }) console.log($(oriEle).data("number")) //基本資料tab block - $("#info").append(drawInfoTabBlo(devGuid)) + $("#info").html(drawInfoTabBlo(devGuid)); loadOpeRecTable(devGuid); //loadErrRecTable2($(oriEle).data("number")); loadErrRecTable(); @@ -200,7 +201,7 @@ let columns = [ { "title": "類型", - "data": "work_type", + "data": "work_type_name", }, { "title": "項目", @@ -213,14 +214,14 @@ { "title": "發生/完成時間", "data": "finishTime", - "render": function (data,type,row) { + "render": function (data, type, row) { return row.createdAt + "
" + data; }, }, ]; - - + + //let callback = function () { // $('#opeRecTable').wrap("
"); //不採用datatable內建scrollbody，會導致thead跑掉 @@ -228,7 +229,7 @@ // api.columns.adjust(); //} - let opeRecTable = new YourTeam.JqDataTables.getTableByAjax(url, tag, null, columns, column_defs,null, null, null, null, null, null, "tpi"); + let opeRecTable = new YourTeam.JqDataTables.getTableByAjax(url, tag, null, columns, column_defs, null, null, null, null, null, null, "tpi"); } function loadErrRecTable() { @@ -269,7 +270,7 @@ 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); + errRecTable = new YourTeam.JqDataTables.getTableByStatic(tag, datas, columns, column_defs, null, null, null, null, "tpi"); } //function loadErrRecTable2(allPath) { diff --git a/Frontend/_sysMonFloor.html b/Frontend/_sysMonFloor.html index e77d534..1b3d71a 100644 --- a/Frontend/_sysMonFloor.html +++ b/Frontend/_sysMonFloor.html @@ -15,6 +15,7 @@ var currentData = []; var allDeviceRowData = []; //所有設備原始資料 var global_emergency_alarm_device_number = []; + var zoomToggle = 3; $(function () { initChart(); getFloData(); @@ -132,7 +133,7 @@ function initChart() { let chartDom = $("#floChart")[0]; - floChart = echarts.init(chartDom, null, { width: 'auto' }); + floChart = echarts.init(chartDom, null, { width: 'auto'}); } function chartHandler(url) { @@ -168,11 +169,11 @@ roam: true, scaleLimit: { //限制放大縮小倍數 max: 32, - min: 2.5 + min: 1 }, layoutSize: '100%', layoutCenter: [], - zoom: 2.5, + zoom: 1.2, silent: true }, series: [ @@ -565,7 +566,7 @@ obj.symbolSize = 60 } console.log(item.zoom) - if (item.zoom > 8) { + if (item.zoom > zoomToggle) { obj.symbolSize = 10 } res.push(obj); @@ -771,7 +772,7 @@ zoom = floChart.getOption().geo[0].zoom; } - if (zoom <= 8) { + if (zoom <= zoomToggle) { floChart.setOption({ series: [{ symbolOffset: [0, 0], diff --git a/Frontend/css/site.css b/Frontend/css/site.css index 8b2a49b..18013f4 100644 --- a/Frontend/css/site.css +++ b/Frontend/css/site.css @@ -4,6 +4,7 @@ } + /* ================================================================ */ /* 單一方法 */ /* ================================================================ */ diff --git a/Frontend/img/logo.png b/Frontend/img/logo.png index e264f5a..3b7ac69 100644 Binary files a/Frontend/img/logo.png and b/Frontend/img/logo.png differ diff --git a/Frontend/js/yourteam/yourteam.jquery.datatables.js b/Frontend/js/yourteam/yourteam.jquery.datatables.js index ba00827..15ac1b6 100644 --- a/Frontend/js/yourteam/yourteam.jquery.datatables.js +++ b/Frontend/js/yourteam/yourteam.jquery.datatables.js @@ -144,6 +144,9 @@ function fnInitJqDataTablesAjax(apiUrl, tag, sendData = null, columns, columns_d if (sendData == null) { sendData = function (json) { console.log("讀取列表", json) + if (json.code && json.code == "0000") { + return json.data; + } return json; } }