From fda28cff8d6ed7ce1acf878f3a23f8e77ecd53cf Mon Sep 17 00:00:00 2001
From: 陈雯静 <1134865194@qq.com>
Date: 星期三, 28 二月 2024 14:28:38 +0800
Subject: [PATCH] 1
---
WebTM/views/IpadIndex.html | 166 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 115 insertions(+), 51 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 9c2bfd7..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) //宸ュ崟鍒楄〃鏁版嵁
{
@@ -180,21 +188,21 @@
html1 += '<h1><span>宸ュ崟鍙凤細</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
html1 += '<h1 style="display:none;"><span>浜у搧ID锛�</span><span id="materid' + (i + 1) + '">' + LoadData1[i].HMaterID + '</span></h1>';
- html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">' + LoadData1[i].HMaterName + '</span></h1>';
+ html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">[' + LoadData1[i].HMaterNumber + ']-[' + LoadData1[i].HMaterName + ']</span></h1>';
html1 += '<h1><span>浜у搧鍨嬪彿锛�</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + LoadData1[i].HDateFinishQty + '</span></h1>';
switch (LoadData1[i].HICMOStatus) {
case "寰呯敓浜�":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">棰嗘枡鐘舵�侊細</span><span>' + LoadData1[i].棰嗘枡鐘舵�� + '</span></h1>';
break;
case "鐢熶骇涓�":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">棰嗘枡鐘舵�侊細</span><span>' + LoadData1[i].棰嗘枡鐘舵�� + '</span></h1>';
break;
case "鎸傝捣":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">棰嗘枡鐘舵�侊細</span><span>' + LoadData1[i].棰嗘枡鐘舵�� + '</span></h1>';
break;
case "瀹屽伐":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">棰嗘枡鐘舵�侊細</span><span>' + LoadData1[i].棰嗘枡鐘舵�� + '</span></h1>';
break;
default:
}
@@ -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;
}
});
-
}
}
@@ -379,6 +414,7 @@
HSourceBillType = $("#st" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟绫诲瀷)
HICMOInterID = $("#df" + i + "").html(); //鐢熶骇璁㈠崟涓诲唴鐮�
HICMOEntryID = $("#ds" + i + "").html(); //鐢熶骇璁㈠崟瀛愬唴鐮�
+ HICMOBillNo = $("#wk" + i + "").html(); //鐢熶骇璁㈠崟鍙�
HMaterName = $("#ptn" + i + "").html(); //浜у搧鍚嶇О
HMaterID = $("#materid" + i + "").html(); //浜у搧ID
@@ -391,6 +427,7 @@
function Mychart(mychart1, mychart2) {
+ //鐢熶骇鏁堢巼
option1 = {
title: {
text: '褰撳墠璁惧鏃ョ敓浜ф晥鐜�'
@@ -415,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'
@@ -425,14 +462,14 @@
name: '褰撳墠璁惧鏃ョ敓浜ф晥鐜�',
type: 'line',
stack: '鎬婚噺',
- data: [120, 132, 101, 134, 90, 230, 210]
+ data: HProQty
}
]
};
-
+ //涓嶈壇鍒嗘瀽
option2 = {
title: {
- text: '褰撳墠璁惧褰撴棩涓嶈壇鍘熷洜瀵规瘮'
+ text: '褰撳墠璁惧鏈懆涓嶈壇鍘熷洜瀵规瘮'
},
legend: {
data: ['涓嶈壇鍘熷洜']
@@ -444,7 +481,7 @@
containLabel: true
},
xAxis: {
- data: ['涓嶈壇1', '涓嶈壇浜�', '涓嶈壇涓�', '涓嶈壇鍥�']
+ data: HBadReason
},
yAxis: {},
series: [{
@@ -453,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: {
@@ -463,7 +500,7 @@
}
}
},
- data: [220, 182, 191, 234]
+ data: HBadQty
}]
};
@@ -648,10 +685,10 @@
content: '鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID,
end: function () {
- },
+ },
});
- /* window.open("../../../views/鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=" + HMaterID + "&HSourceNo=" + workcode + "&HSourceEntryID=" + HSourceEntryID);*/
+ /* window.open("../../../views/鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=" + HMaterID + "&HSourceNo=" + workcode + "&HSourceEntryID=" + HSourceEntryID);*/
}
//姹囨姤鎸夐挳鐐瑰嚮浜嬩欢
@@ -778,38 +815,65 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '浜ч噺姹囨姤鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['100%', '100%'],
- maxmin: true,
- content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
- end: function () {
- },
- success: function (dom, index) {
- var data = [];
- data.push({
- "workcode": workcode,
- "HSourceID": HSourceID1,
- "HSourceName": HSourceName1,
- "HICMOInterID": HICMOInterID,
- "HICMOEntryID": HICMOEntryID,
- "HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
- "Czybm": sessionStorage["Czybm"],
- //"HEmpID": "0", //sessionStorage["HEmpID"]
- "HSourceBillType": HSourceBillType
- });
+ var IsCheck = false;
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
+ //鏍规嵁绯荤粺鍙傛暟鎺у埗锛屽垽鏂敓浜ц鍗曟槸鍚﹀仛浜嗛浠舵楠屽崟鍜屽伐搴忔楠屽崟锛屽鏋滄湁鍏朵腑涓�绉嶆楠屽崟娌″仛锛屽垯涓嶈鍋氱敓浜ф眹鎶ュ崟
+ $.ajax({
+ url: GetWEBURL() + "/ReportPlatForm/IsCheck",
+ type: "GET",
+ data: { "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HICMOBillNo": HICMOBillNo },
+ async: false,
+ success: function (data) {
+ if (data.code == 0) {
+ layer.alert(data.Message);
+ return false;
+ } else {
+ IsCheck = true;
+ }
},
+ error: function (err) {
+ layer.alert(data.Message);
+ return false;
+ }
});
+
+ if (IsCheck == true) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜ч噺姹囨姤鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "workcode": workcode,
+ "HSourceID": HSourceID1,
+ "HSourceName": HSourceName1,
+ "HICMOInterID": HICMOInterID,
+ "HICMOEntryID": HICMOEntryID,
+ "HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
+ "Czybm": sessionStorage["Czybm"],
+ //"HEmpID": "0", //sessionStorage["HEmpID"]
+ "HSourceBillType": HSourceBillType
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+ });
+ }
+
+
}
//涓婃枡闃查敊鍗�
@@ -1010,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">
@@ -1042,7 +1106,7 @@
<div class="layui-row layui-col-space10">
<div class="layui-col-sm12 layui-col-md4" onclick="OpenWork(event,this)">
<div class="cnt bottomright">
- <span class="layui-icon layui-icon-pause imgicon"></span>
+ <span class="layui-icon layui-icon-play imgicon"></span>
<span class="imgtitle">寮�宸�</span>
</div>
</div>
@@ -1071,7 +1135,7 @@
<div class="layui-row layui-col-space10">
<div class="layui-col-sm12 layui-col-md4" onclick="SOP(event,this)">
<div class="cnt bottomright">
- <span class="layui-icon layui-icon-pause imgicon"></span>
+ <span class="layui-icon layui-icon-read imgicon"></span>
<span class="imgtitle">浣滀笟鎸囧涔�</span>
</div>
</div>
@@ -1117,7 +1181,7 @@
<div class="layui-row layui-col-space10">
<div class="layui-col-sm12 layui-col-md4" onclick="OpenStop(event,this)">
<div class="cnt bottomright">
- <span class="layui-icon layui-icon-play imgicon"></span>
+ <span class="layui-icon layui-icon-pause imgicon"></span>
<span class="imgtitle">鍋滃伐</span>
</div>
</div>
--
Gitblit v1.9.1