From c0e2ae2f716d7e87027689d5c42d6fc70eda9fba Mon Sep 17 00:00:00 2001 From: dev01 Date: Fri, 18 Nov 2022 10:50:46 +0800 Subject: [PATCH] =?UTF-8?q?[Frontend]=20datatable=20ajax=20=E8=AE=80?= =?UTF-8?q?=E5=8F=96=E5=88=A4=E6=96=B7=E6=98=AF=E5=90=A6=E7=82=BA=E5=BE=8C?= =?UTF-8?q?=E7=AB=AFAPI=20Object=20=E5=8F=A6=E5=AD=98=E5=8F=96datas=20|=20?= =?UTF-8?q?[=E7=B3=BB=E7=B5=B1=E7=9B=A3=E6=8E=A7]=20tooltip=20=E8=B7=B3?= =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E8=A8=AD=E5=82=99=E5=90=8D=E7=A8=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- .../7acfc931-98d5-4dd3-a0d8-297fc546edfc.svg | 1393 +++++++++++++++++ Frontend/_sysMonAll.html | 12 +- Frontend/_sysMonFloor.html | 5 +- Frontend/css/site.css | 1 + .../js/yourteam/yourteam.jquery.datatables.js | 3 + 6 files changed, 1410 insertions(+), 7 deletions(-) create mode 100644 Backend/wwwroot/upload/floor_map/7acfc931-98d5-4dd3-a0d8-297fc546edfc.svg 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..f5d2e40 100644 --- a/Frontend/_sysMonAll.html +++ b/Frontend/_sysMonAll.html @@ -1,6 +1,6 @@  @@ -73,7 +73,7 @@ $.each(floObj.device_list, (index2, devObj) => { console.log(">>>> url: " + baseImgUrl + " , img: " + varPathImg + ", icon: " + devObj.device_master_icon); - strHtml += `
+ strHtml += `
... ${devObj.full_name} @@ -144,9 +144,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: `
+
+ +
@@ -200,7 +204,7 @@ let columns = [ { "title": "類型", - "data": "work_type", + "data": "work_type_name", }, { "title": "項目", @@ -269,7 +273,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..1bfcd1a 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(); @@ -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/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; } }