From 65edd151bb7a13878e378dc16da6fa3bb0ee2b17 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 14 九月 2022 15:04:22 +0800
Subject: [PATCH] 设备看板调整
---
HDEquipment.html | 81 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 41 deletions(-)
diff --git a/HDEquipment.html b/HDEquipment.html
index 6cd82c6..8b7dbb5 100644
--- a/HDEquipment.html
+++ b/HDEquipment.html
@@ -310,7 +310,6 @@
var num1 = 0;
var TLProgress = 0; //閫�鏂欑巼
var CallData = []; //楗煎浘缁撴灉鏁扮粍
-
var CAllDataX = []; //鏌辩姸鍥緓杞�
var CAllDataXval = []; //鏌辩姸鍥緔杞�
$(document).ready(function () {
@@ -343,21 +342,17 @@
interval = setInterval(function () {
$("#tb_order").bootstrapTable('refresh');
}, 10000);
- // interval1 = setInterval(function () {
- // $("#tb_order1").bootstrapTable('refresh');
- // }, 10000);
- // interval2 = setInterval(function () {
- // TLProgress = 0;
- // CallData = [];
- // CallPSQty = [];
- // CAllQty = [];
- // Chart(mychart1, mychart2);
- // }, 20000);
+ interval2 = setInterval(function () {
+ CallData = [];
+ CAllDataX = [];
+ CAllDataXval = [];
+ Chart(mychart1, mychart2);
+ }, 20000);
//鏍规嵁绐楀彛鐨勫ぇ灏忓彉鍔ㄥ浘琛� --- 閲嶇偣
- // window.onresize = function () {
- // myChart1.resize();
- // myChart2.resize();
- // }
+ window.onresize = function () {
+ myChart1.resize();
+ myChart2.resize();
+ }
})
@@ -417,11 +412,11 @@
borderColor: '#000000'
},
data: [
- { value: CallData[0], name: '杩愯' },
- { value: CallData[1], name: '鍋滄満' },
- { value: CallData[2], name: '鏈紑鏈�' },
- { value: CallData[3], name: '缁翠慨涓�' },
- { value: CallData[4], name: '淇濆吇涓�' }
+ { value: CallData[0], name: '宸ヤ綔' },
+ { value: CallData[1], name: '寰呮満' },
+ { value: CallData[2], name: '绂荤嚎' },
+ { value: CallData[3], name: '鎶ヨ' },
+ { value: CallData[4], name: '缁翠慨' }
],
}
]
@@ -443,10 +438,9 @@
},
grid: {
- left: '3%',
- right: '4%',
- bottom: '10%',
- containLabel: true
+ left: "20%",//grid 缁勪欢绂诲鍣ㄥ乏渚х殑璺濈銆�
+ right: "30px",
+ bottom: "20%" //
},
legend: {
left: 'right',
@@ -465,7 +459,6 @@
axisTick: {
alignWithLabel: true
},
-
axisLine: {
show: true,
lineStyle: {
@@ -476,6 +469,8 @@
},
axisLabel: {
show: true,
+ interval: 0, //鎺у埗X杞村埢搴﹀叏閮ㄦ樉绀�
+ rotate: 45, //鍊炬枩瑙掑害
textStyle: {
color: '#00c6ff', //鍧愭爣鍊煎緱鍏蜂綋鐨勯鑹�
fontSize: '16'
@@ -551,11 +546,12 @@
columns: [
{ field: 'column1', title: '璁惧鏁伴噺', align: "left" },
{ field: 'column2', title: '寮�鏈虹巼', align: "left" },
- { field: 'column3', title: '杩愯', align: "left" },
- { field: 'column4', title: '鍋滄満', align: "left" },
- { field: 'column5', title: '鏈紑鏈�', align: "left" },
- { field: 'column6', title: '缁翠慨涓�', align: "left" },
- { field: 'column7', title: '淇濆吇涓�', align: "left" }
+ { field: 'column3', title: '宸ヤ綔', align: "left" },
+ { field: 'column4', title: '寰呮満', align: "left" },
+ { field: 'column5', title: '绂荤嚎', align: "left" },
+ { field: 'column6', title: '鎶ヨ', align: "left" },
+ { field: 'column7', title: '缁翠慨', align: "left" }
+ //{ field: 'column7', title: '淇濆吇', align: "left" }
],
onClickRow: function (row, $element) {
@@ -582,23 +578,26 @@
success: function (data) {
for (var i = 0; i < data.Table.length; i++) {
var html1 = '';
- html1 += '<div class="col-sm-12 col-md-2" >';
- if (i == 2 || i == 4 || i == 6)
- html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#91CC75" >';
- else if (i % 2 == 0)
- html1 += '<div class="cns" id="bs' + (i + 1) + '" style="">';
- else
- html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#EE6666; color:#FFF">';
+ html1 += '<div class="col-sm-12 col-md-2" >';
+ if (data.Table[i]["璁惧鐘舵��"] == '绂荤嚎')
+ html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#9A9999">';
+ else if (data.Table[i]["璁惧鐘舵��"] == '宸ヤ綔')
+ html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#259D27">';
+ else if (data.Table[i]["璁惧鐘舵��"] == '寰呮満')
+ html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#199687">';
+ else if (data.Table[i]["璁惧鐘舵��"] == '鎶ヨ')
+ html1 += '<div class="cns" id="bs' + (i + 1) + '" style="background:#FC522A">';
+
html1 += '<dl>';
//html1 += '<img src="img/device.png">'
html1 += '<dd class="tcenter">';
- html1 += '<h1><span>璁惧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">' + data.Table[i]["璁惧鍚嶇О"] + '</span></h1>';
+ html1 += '<h1><span></span><span id="ptn' + (i + 1) + '">' + data.Table[i]["璁惧鍚嶇О"] + '</span></h1>';
html1 += '<h1><span>宸ュ崟锛�' + data.Table[i]["宸ュ崟"] + '</span></h1>';
- html1 += '<h1><span>浜у搧鍚嶇О锛�' + data.Table[i]["浜у搧鍚嶇О"] + '</span><span id="pts' + (i + 1) + '">' + '' + '</span></h1>';
- html1 += '<h1><span>浜у搧瑙勬牸鍨嬪彿锛�' + data.Table[i]["浜у搧瑙勬牸鍨嬪彿"] + '</span><span id="pts' + (i + 1) + '">' + '' + '</span></h1>';
+ html1 += '<h1><span>' + data.Table[i]["浜у搧缂栫爜"] + '</span><span id="pts' + (i + 1) + '">' + '' + '</span></h1>';
+ html1 += '<h1><span>' + data.Table[i]["浜у搧鍚嶇О"] + '</span><span id="pts' + (i + 1) + '">' + '' + '</span></h1>';
html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + data.Table[i]["璁″垝鏁伴噺"] + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + data.Table[i]["姹囨姤鎬绘暟"] + '</span></h1>';
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span>';
+ html1 += '<h1><span>璁惧鐘舵�侊細' + data.Table[i]["璁惧鐘舵��"] + '</span><span id="pts' + (i + 1) + '">' + '' + '</span></h1>';
html1 += '</div > ';
html1 += '</div>';
html1 += '</dd>';
--
Gitblit v1.9.1