From 75bc98ff981323d6d4de86868a68f701acc19dee Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 14 九月 2022 15:55:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/TV.kanbanUI
---
js/webConfig.js | 5
HDEquipment.html | 281 ++++++++++++++++++++++------------------------
KB_ProductionEquipmentOutputAnalysis.html | 51 ++++----
3 files changed, 168 insertions(+), 169 deletions(-)
diff --git a/HDEquipment.html b/HDEquipment.html
index 6cd82c6..fd94e46 100644
--- a/HDEquipment.html
+++ b/HDEquipment.html
@@ -18,6 +18,7 @@
<script src="js/jquery.SuperSlide.2.1.3.js"></script>
<script src='js/template.js'></script>
<script src="js/jquery.qrcode.min.js"></script>
+ <script src="js/webConfig.js"></script>
<style>
.clock {
font-family: 'BebasNeueRegular', Arial, Helvetica, sans-serif;
@@ -28,33 +29,30 @@
margin-top: -75px;
margin-right: 5px;
color: #09d1ea;
-
}
- .clock #Date {
- text-align: center;
- text-shadow: 0 0 0px #00c6ff;
+ .clock #Date {
+ text-align: center;
+ text-shadow: 0 0 0px #00c6ff;
+ }
+ .clock ul {
+ width: 450px;
+ margin: 0 auto;
+ padding: 0px;
+ list-style: none;
+ text-align: right;
+ margin-left: 15px;
+ position: relative;
+ }
- }
-
- .clock ul {
- width: 450px;
- margin: 0 auto;
- padding: 0px;
- list-style: none;
- text-align: right;
- margin-left: 15px;
- position: relative;
- }
-
- .clock ul li {
- display: inline;
- font-size: 24px;
- text-align: left;
- font-family: 'BebasNeueRegular', Arial, Helvetica, sans-serif;
- text-shadow: 0 0 0px #00c6ff;
- }
+ .clock ul li {
+ display: inline;
+ font-size: 24px;
+ text-align: left;
+ font-family: 'BebasNeueRegular', Arial, Helvetica, sans-serif;
+ text-shadow: 0 0 0px #00c6ff;
+ }
body {
padding-left: 50px;
@@ -62,7 +60,6 @@
}
.title {
-
font-size: 44px;
font-family: PingFangSC;
font-weight: 500;
@@ -165,28 +162,27 @@
float: left;
}
- #cList1 li {
- float: left;
- height: 450px;
- color: #00c6ff;
- font-size: 20px;
- /*鏂囧瓧灞呬腑*/
- text-align: center;
- /*display: flex;*/
- }
+ #cList1 li {
+ float: left;
+ height: 450px;
+ color: #00c6ff;
+ font-size: 20px;
+ /*鏂囧瓧灞呬腑*/
+ text-align: center;
+ /*display: flex;*/
+ }
- #cList1 li span {
- /*鏂囧瓧灞呬腑*/
- display: inline-block;
- height: 100%;
- /*鏂囧瓧灞呬腑*/
-
- /*鏂囧瓧绔栨帓*/
- writing-mode: vertical-lr;
- /*浠庡乏鍚戝彸 浠庡彸鍚戝乏鏄� writing-mode: vertical-rl;*/
- writing-mode: tb-lr;
- /*IE娴忚鍣ㄧ殑浠庡乏鍚戝彸 浠庡彸鍚戝乏鏄� writing-mode: tb-rl锛�*/
- }
+ #cList1 li span {
+ /*鏂囧瓧灞呬腑*/
+ display: inline-block;
+ height: 100%;
+ /*鏂囧瓧灞呬腑*/
+ /*鏂囧瓧绔栨帓*/
+ writing-mode: vertical-lr;
+ /*浠庡乏鍚戝彸 浠庡彸鍚戝乏鏄� writing-mode: vertical-rl;*/
+ writing-mode: tb-lr;
+ /*IE娴忚鍣ㄧ殑浠庡乏鍚戝彸 浠庡彸鍚戝乏鏄� writing-mode: tb-rl锛�*/
+ }
#cList2 {
height: 450px;
@@ -207,15 +203,14 @@
border: none;
}
- .table>caption+thead>tr:first-child>td,
- .table>caption+thead>tr:first-child>th,
- .table>colgroup+thead>tr:first-child>td,
- .table>colgroup+thead>tr:first-child>th,
- .table>thead:first-child>tr:first-child>td,
- .table>thead:first-child>tr:first-child>th {
+ .table > caption + thead > tr:first-child > td,
+ .table > caption + thead > tr:first-child > th,
+ .table > colgroup + thead > tr:first-child > td,
+ .table > colgroup + thead > tr:first-child > th,
+ .table > thead:first-child > tr:first-child > td,
+ .table > thead:first-child > tr:first-child > th {
background-color: #000;
color: #3bff72;
-
}
.fixed-table-container tbody td .th-inner,
@@ -310,7 +305,6 @@
var num1 = 0;
var TLProgress = 0; //閫�鏂欑巼
var CallData = []; //楗煎浘缁撴灉鏁扮粍
-
var CAllDataX = []; //鏌辩姸鍥緓杞�
var CAllDataXval = []; //鏌辩姸鍥緔杞�
$(document).ready(function () {
@@ -343,48 +337,43 @@
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();
+ }
})
-
function Chart(mychart1, mychart2) {
- $.ajax({
- url: "http://localhost:12298/api/loaddata/SearchGetWorkStepBillPie",
- dataType: "JSON",
- async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
- type: "Get",
- data: { "CallHouseCode": CallHouseCode },
- success: function (data) {
- //楗煎浘
- CallData.push(data.Table[0]["column3"]);
- CallData.push(data.Table[0]["column4"]);
- CallData.push(data.Table[0]["column5"]);
- CallData.push(data.Table[0]["column6"]);
- CallData.push(data.Table[0]["column7"]);
- //鏌辩姸鍥�
- $.each(data.Table1 ,function (index, val) {
- CAllDataX.push(val.countDay);
- CAllDataXval.push(val.HName);
- });
- },
- error: function (data) {
+ $.ajax({
+ url: GetWEBURL() + "/loaddata/SearchGetWorkStepBillPie",
+ dataType: "JSON",
+ async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
+ type: "Get",
+ data: { "CallHouseCode": CallHouseCode },
+ success: function (data) {
+ //楗煎浘
+ CallData.push(data.Table[0]["column3"]);
+ CallData.push(data.Table[0]["column4"]);
+ CallData.push(data.Table[0]["column5"]);
+ CallData.push(data.Table[0]["column6"]);
+ CallData.push(data.Table[0]["column7"]);
+ //鏌辩姸鍥�
+ $.each(data.Table1, function (index, val) {
+ CAllDataX.push(val.countDay);
+ CAllDataXval.push(val.HName);
+ });
+ },
+ error: function (data) {
- }
- })
+ }
+ })
const colorList = ['#91CC75 ', '#5470C6', '#73C0DE', '#EE6666', '#FAC858']
option1 = {
@@ -417,16 +406,16 @@
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: '缁翠慨' }
],
}
]
};
-
+
option2 = {
title: {
text: '鎬讳骇鍊�',
@@ -443,10 +432,9 @@
},
grid: {
- left: '3%',
- right: '4%',
- bottom: '10%',
- containLabel: true
+ left: "20%",//grid 缁勪欢绂诲鍣ㄥ乏渚х殑璺濈銆�
+ right: "30px",
+ bottom: "20%" //
},
legend: {
left: 'right',
@@ -465,7 +453,6 @@
axisTick: {
alignWithLabel: true
},
-
axisLine: {
show: true,
lineStyle: {
@@ -476,6 +463,8 @@
},
axisLabel: {
show: true,
+ interval: 0, //鎺у埗X杞村埢搴﹀叏閮ㄦ樉绀�
+ rotate: 45, //鍊炬枩瑙掑害
textStyle: {
color: '#00c6ff', //鍧愭爣鍊煎緱鍏蜂綋鐨勯鑹�
fontSize: '16'
@@ -528,7 +517,7 @@
}
function TopData() {
$('#tb_order').bootstrapTable({
- url: 'http://localhost:12298/api/loaddata/EquipMentData',
+ url: GetWEBURL() + '/loaddata/EquipMentData',
//data: dataJson,
method: 'get', //璇锋眰鏂瑰紡锛�*锛�
dataType: "json",
@@ -551,11 +540,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) {
@@ -573,45 +563,48 @@
})
}
function BottomData() {
- $.ajax({
- url: "http://localhost:12298/api/loaddata/SearchGetWorkStepBillList",
- dataType: "JSON",
- async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
- type: "Get",
- data: { "CallHouseCode": CallHouseCode },
- 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">';
+ $.ajax({
+ url: GetWEBURL() + "/loaddata/SearchGetWorkStepBillList",
+ dataType: "JSON",
+ async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
+ type: "Get",
+ data: { "CallHouseCode": CallHouseCode },
+ success: function (data) {
+ for (var i = 0; i < data.Table.length; i++) {
+ var html1 = '';
- 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>宸ュ崟锛�' + 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>璁″垝鏁伴噺锛�</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 += '</div > ';
- html1 += '</div>';
- html1 += '</dd>';
- html1 += '</dl>';
- html1 += '</div>';
- html1 += '</div>';
- $("#btomleft").append(html1);
- }
- },
- error: function (data) {
+ 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>宸ュ崟锛�' + 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>璁″垝鏁伴噺锛�</span><span>' + data.Table[i]["璁″垝鏁伴噺"] + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + data.Table[i]["姹囨姤鎬绘暟"] + '</span></h1>';
+ html1 += '<h1><span>璁惧鐘舵�侊細' + data.Table[i]["璁惧鐘舵��"] + '</span><span id="pts' + (i + 1) + '">' + '' + '</span></h1>';
+ html1 += '</div > ';
+ html1 += '</div>';
+ html1 += '</dd>';
+ html1 += '</dl>';
+ html1 += '</div>';
+ html1 += '</div>';
+ $("#btomleft").append(html1);
+ }
+ },
+ error: function (data) {
+
+ }
+ })
//for (var i = 0; i < 20; i++) {
// var html1 = '';
diff --git a/KB_ProductionEquipmentOutputAnalysis.html b/KB_ProductionEquipmentOutputAnalysis.html
index a50a20a..238bdd5 100644
--- a/KB_ProductionEquipmentOutputAnalysis.html
+++ b/KB_ProductionEquipmentOutputAnalysis.html
@@ -17,6 +17,7 @@
<script src="js/jquery.SuperSlide.2.1.3.js"></script>
<script src='js/template.js'></script>
<script src="js/jquery.qrcode.min.js"></script>
+ <script src="js/webConfig.js"></script>
<style>
.clock0 {
font-family: 'BebasNeueRegular', Arial, Helvetica, sans-serif;
@@ -377,36 +378,36 @@
var mychart5 = echarts.init(document.getElementById('mychart5'));
Chart(mychart1, mychart2, mychart3, mychart4, mychart5);
DataTable();
- // 瀹氭椂鍣�
+ // 瀹氭椂鍣�
interval = setInterval(function () {
hours = [];
hoursqty = [];
- CloseProgress = 0; //瀹屽伐鐜�
- LineName = []; //娴佹按绾挎暟缁�
- LineOrderQty = []; //娴佹按绾垮綋澶╄鍗曟�讳换鍔℃暟閲忔暟缁�
- LineOrderCloseQty = []; //娴佹按绾垮綋澶╄鍗曟�诲畬鎴愭暟閲忔暟缁�
- Week = 0; //鏈懆鍒嗘瀽
- Month = 0; //鏈湀鍒嗘瀽
+ closeprogress = 0; //瀹屽伐鐜�
+ linename = []; //娴佹按绾挎暟缁�
+ lineorderqty = []; //娴佹按绾垮綋澶╄鍗曟�讳换鍔℃暟閲忔暟缁�
+ lineordercloseqty = []; //娴佹按绾垮綋澶╄鍗曟�诲畬鎴愭暟閲忔暟缁�
+ week = 0; //鏈懆鍒嗘瀽
+ month = 0; //鏈湀鍒嗘瀽
Chart(mychart1, mychart2, mychart3, mychart4, mychart5);
}, 20000);
setInterval(function () {
//num+=1;
- //$("#tb_order").bootstrapTable('refreshOptions',{offset:num}); // pageNumber:1, 鎸囧畾椤电爜涓虹1椤�
- $("#tb_order").bootstrapTable('refresh');
+ //$("#tb_order").bootstraptable('refreshoptions',{offset:num}); // pagenumber:1, 鎸囧畾椤电爜涓虹1椤�
+ $("#tb_order").bootstraptable('refresh');
}, 10000);
//鏍规嵁绐楀彛鐨勫ぇ灏忓彉鍔ㄥ浘琛� --- 閲嶇偣
window.onresize = function () {
- myChart1.resize();
- myChart2.resize();
- myChart3.resize();
- myChart4.resize();
- myChart5.resize();
+ mychart1.resize();
+ mychart2.resize();
+ mychart3.resize();
+ mychart4.resize();
+ mychart5.resize();
}
})
function Chart(mychart1, mychart2, mychart3, mychart4, mychart5) {
$.ajax({
- url: "http://localhost:12298/api/loaddata/KB_ProductData",
+ url: GetWEBURL() + "/loaddata/KB_ProductData",
dataType: "JSON",
async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
type: "Get",
@@ -840,7 +841,7 @@
function DataTable() {
$('#tb_order').bootstrapTable({
- url: 'http://localhost:12298/api/loaddata/KB_ProductTableData',
+ url: GetWEBURL() + '/loaddata/KB_ProductTableData',
//data: dataJson,
method: 'get', //璇锋眰鏂瑰紡锛�*锛�
dataType: "json",
@@ -925,27 +926,27 @@
};
return temp;
}
- //閫夋嫨浜嬩欢
- function selectOnchang(obj) {
- LineCode = obj.options[obj.selectedIndex].value;
- Chart(mychart1, mychart2, mychart3, mychart4, mychart5)
- //DataTable();
- $('#tb_order').bootstrapTable('refresh');
+ //閫夋嫨浜嬩欢
+ function selectOnchang(obj) {
+ LineCode = obj.options[obj.selectedIndex].value;
+ Chart(mychart1, mychart2, mychart3, mychart4, mychart5)
+ //DataTable();
+ $('#tb_order').bootstrapTable('refresh');
}
function showHospitalCode() {
$.ajax({
- url: "http://localhost:12298/api/loaddata/Gy_Source",//璺宠浆鍒版帶鍒跺櫒HospitalController
+ url: GetWEBURL() + "/loaddata/Gy_Source",//璺宠浆鍒版帶鍒跺櫒HospitalController
type: "get",
success: function (Data) {
var hospitals = JSON.parse(Data);//鍙嶅簭鍒楀寲
var content = '';
$.each(hospitals.data, function (i, n) {
- content += "<option value='" + n.HNumber + "'>" + n.HName + "</option>";
+ content += "<option value='" + n.HNumber + "'>" + n.HNumber + '-' + n.HName + "</option>";
});
$("#hospitalCodeSelect").append(content);//append 娣诲姞杩涘幓骞跺睍绀�
$("#hospitalCodeSelect").find("option[value='" + hospitals.data[0].HNumber + "']").attr("selected", true);
$("#hospitalCodeSelect").selectpicker('refresh');
-
+
}
})
}
diff --git a/js/webConfig.js b/js/webConfig.js
new file mode 100644
index 0000000..233a711
--- /dev/null
+++ b/js/webConfig.js
@@ -0,0 +1,5 @@
+锘縡unction GetWEBURL() {
+ //var WEBURL = "http://183.129.128.86:9090/KanBanApi/"; //鍑礉濂堢壒鏈嶅姟鍣ㄥ湴鍧�
+ var WEBURL = "http://192.168.1.253:12298/Api/";
+ return WEBURL
+}
\ No newline at end of file
--
Gitblit v1.9.1