${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;
}
}