From 54ddbb9eba145dfdcee0c3d28bdd1a91aec34122 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 31 一月 2024 15:50:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/IpadIndex.html | 66 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 0864503..7745b58 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -38,6 +38,9 @@
var HICMOBillNo = ""; //浠诲姟鍗曞彿
var HMaterName = ""; //浜у搧鍚嶇О
var HMaterID = 0; //浜у搧ID
+ var HProQty = []; //鏃堕棿鐐逛骇閲�
+ var HBadQty = []; //涓嶈壇鏁伴噺
+ var HBadReason = []; //涓嶈壇鍘熷洜
//娉ㄦ剰锛氶�夐」鍗� 渚濊禆 element 妯″潡锛屽惁鍒欐棤娉曡繘琛屽姛鑳芥�ф搷浣�
layui.config({
base: '../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -51,9 +54,9 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
-
- var mychart1 = echarts.init(document.getElementById('mychart1'));
- var mychart2 = echarts.init(document.getElementById('mychart2'));
+ //window 鍏ㄥ眬鍙橀噺
+ window.mychart1 = echarts.init(document.getElementById('mychart1'));
+ window.mychart2 = echarts.init(document.getElementById('mychart2'));
element.on('tab(TabTest)', function (data) {
Mychart(mychart1, mychart2);
@@ -64,7 +67,7 @@
TSLoad();
});
function TSLoad() {
- $("#topleft").html("");
+ $("#topleft").html("");
var HUserName = sessionStorage["HUserName"]; //sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
$.ajax({
url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
@@ -139,6 +142,9 @@
wktag = 0;
$("#btomleft").html("");
$("#topright").html("");
+ HProQty = []; //鏃堕棿鐐逛骇閲�
+ HBadQty = []; //涓嶈壇鏁伴噺
+ HBadReason = []; //涓嶈壇鍘熷洜
var partid = $(obj).parent().attr("id"); //鑾峰彇鐖剁骇id
var eqpid = "eqpid" + i; //鑾峰彇鎸囧畾璧勬簮鏍峰紡ID
var HSourceID = $("#" + eqpid + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(璧勬簮ID)
@@ -159,6 +165,8 @@
var LoadData1 = data.data.h_p_JIT_GetWorkBillListInfoBySource;
var LoadData2 = data.data.h_p_JIT_GetWorkBillListInfoBySource1;
+ var LoadData3 = data.data.h_p_JIT_GetWorkBillListInfoBySource2; //鏃堕棿鐐逛骇閲�
+ var LoadData4 = data.data.h_p_JIT_GetWorkBillListInfoBySource3; //涓嶈壇鍒嗘瀽
if (LoadData1.length > 0) //宸ュ崟鍒楄〃鏁版嵁
{
@@ -240,13 +248,40 @@
$("#topright").append(html1);
}
}
+ if (LoadData3.length > 0) //褰撳墠鐘舵�佹暟鎹�
+ {
+ let k = 0; //LoadData3 鏁版嵁鏁扮粍鐨勪笅鏍�
+ for (let i = 8; i < 21; i++) {
+ let IsAdd = false; //鏄惁瑕佺疮鍔� LoadData3 鏁版嵁鏁扮粍鐨勪笅鏍囧��
+ for (let j = 0; j < LoadData3.length; k) {
+ if (i == LoadData3[k].鏃堕棿鐐�) { //濡傛灉 i锛�8--20锛� 鏃堕棿鐐规湁浜ч噺锛屽垯鎶婁骇閲忓啓鍏ユ暟缁� HProQty锛屽惁鍒欏啓鍏� 0
+ HProQty.push(LoadData3[k].浜ч噺)
+ IsAdd = true;
+ break;
+ } else {
+ HProQty.push(0)
+ break;
+ }
+ }
+ if (k < LoadData3.length - 1 && IsAdd == true) {
+ k++;
+ }
+ }
+ }
+ if (LoadData4.length > 0) {
+ for (let i = 0; i < LoadData4.length; i++) {
+ HBadReason.push(LoadData4[i].涓嶈壇鍘熷洜);
+ HBadQty.push(LoadData4[i].涓嶈壇鏁伴噺);
+ }
+ }
+ //鍒锋柊鍥捐〃鏁版嵁
+ Mychart(mychart1, mychart2);
},
error: function (err) {
layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
return false;
}
});
-
}
}
@@ -392,6 +427,7 @@
function Mychart(mychart1, mychart2) {
+ //鐢熶骇鏁堢巼
option1 = {
title: {
text: '褰撳墠璁惧鏃ョ敓浜ф晥鐜�'
@@ -416,7 +452,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: ['08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00']
+ data: ['08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00']
},
yAxis: {
type: 'value'
@@ -426,14 +462,14 @@
name: '褰撳墠璁惧鏃ョ敓浜ф晥鐜�',
type: 'line',
stack: '鎬婚噺',
- data: [120, 132, 101, 134, 90, 230, 210]
+ data: HProQty
}
]
};
-
+ //涓嶈壇鍒嗘瀽
option2 = {
title: {
- text: '褰撳墠璁惧褰撴棩涓嶈壇鍘熷洜瀵规瘮'
+ text: '褰撳墠璁惧鏈懆涓嶈壇鍘熷洜瀵规瘮'
},
legend: {
data: ['涓嶈壇鍘熷洜']
@@ -445,7 +481,7 @@
containLabel: true
},
xAxis: {
- data: ['涓嶈壇1', '涓嶈壇浜�', '涓嶈壇涓�', '涓嶈壇鍥�']
+ data: HBadReason
},
yAxis: {},
series: [{
@@ -454,7 +490,7 @@
itemStyle: {
normal: {
color: function (params) {
- var colorList = ['#2eddc1', '#FCCE10', '#E87C25', '#27727B', '#9efdc6'];
+ var colorList = ['#2eddc1', '#FCCE10', '#E87C25', '#27727B', '#9efdc6', '#F00DC6', '#8317E5', '#29086A', '#D8E848', '#17ADE5', '#FF1F86', '#A27E90', '#71BCCE', '#11715012', '#DBF7B2',];
return colorList[params.dataIndex]
},
label: {
@@ -464,7 +500,7 @@
}
}
},
- data: [220, 182, 191, 234]
+ data: HBadQty
}]
};
@@ -778,7 +814,7 @@
if (wktag == 0) {
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
- }
+ }
var IsCheck = false;
@@ -837,7 +873,7 @@
});
}
-
+
}
//涓婃枡闃查敊鍗�
@@ -1038,7 +1074,7 @@
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
<ul class="layui-tab-title">
<li class="layui-this">宸ュ崟鍒楄〃</li>
- <li style="pointer-events: none; background-color:rgb(0 0 0 / 10%);">鏁堢巼/涓嶈壇鍒嗘瀽</li>
+ <li>鏁堢巼/涓嶈壇鍒嗘瀽</li><!--style="pointer-events: none; background-color:rgb(0 0 0 / 10%);"-->
</ul>
<div class="layui-tab-content content3">
<div class="layui-tab-item layui-show">
--
Gitblit v1.9.1