From b6d581e3dc7f85861625a6aa5e849321f0257511 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 08 八月 2024 17:29:41 +0800
Subject: [PATCH] 1.产品工艺参数清单， 增加 字段 HTechParamClassID int //工艺参数大类（Gy_TechnologyParameterClass） HSNO int //工艺次序 HStdNextTimes money //理论次序间隔 HTechParamIDStd int //对应设定值工艺参数(Gy_TechnologyParameter) （都是非必录） 2.修改报表格式
---
WebTM/WebTM.csproj.user | 7
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 93 +++++++++++++
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html | 100 +++++++++++++-
WebTM/views/质量管理/质量报表/QC_ProcessPerformancePass.html | 42 +++++
WebTM/views/质量管理/质量报表/Sc_StationOutBil_HProc.html | 152 ++++++++++++++++++--
WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html | 16 ++
WebTM/layuiadmin/Scripts/webConfig.js | 4
7 files changed, 378 insertions(+), 36 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index abfa447..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\GIT浠撳簱\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
@@ -16,8 +16,9 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <StartPageUrl>views/user/login.html</StartPageUrl>
- <StartAction>SpecificPage</StartAction>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index ba4cfc4..ddc4838 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,13 +3,13 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ /* var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- /*var WEBURL = "http://localhost:8082/API/"; *//*//寮犵憺骞挎湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
index 0828e60..6b745b2 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
@@ -570,6 +570,10 @@
"HDataForm": "璁惧閲囬泦",
"HDataUnit": "绉�",
"HDataTimes": "0",
+ "HTechParamClassID": "0",
+ "HSNO": "0",
+ "HStdNextTimes": "0",
+ "HTechParamIDStd":"0",
"HSourceBillNo": "0",
"HSourceBillType": "0",
"HSourceEntryID": "0",
@@ -661,6 +665,12 @@
, { field: 'HDataForm', title: '閲囬泦鏉ユ簮', templet: '#HDataForm-select' }
, { field: 'HDataUnit', title: '閲囬泦鏃堕棿鍗曚綅', templet: '#HDataUnit-select' }
, { field: 'HDataTimes', title: '閲囬泦鍛ㄦ湡棰戠巼', edit: 'text', totalRow: true }
+ , { field: 'HTechParamClassID', title: '宸ヨ壓鍙傛暟澶х被', hide: true }
+ , { field: 'HTechParamClassName', title: '宸ヨ壓鍙傛暟澶х被鍚嶇О', edit: 'text', event: "HTechParamClassName" } //f7
+ , { field: 'HSNO', title: '宸ヨ壓娆″簭', edit: 'text', totalRow: true }
+ , { field: 'HStdNextTimes', title: '鐞嗚娆″簭闂撮殧', edit: 'text', totalRow: true }
+ , { field: 'HTechParamIDStd', title: '瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�', hide: true }
+ , { field: 'HTechParamIDStdName', title: '瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁板��', edit: 'text', event: "HTechParamIDStdName " } //f7
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
}
@@ -943,6 +953,10 @@
"HDataForm": "鎵嬪伐褰曞叆",
"HDataUnit": "绉�",
"HDataTimes": "0",
+ "HTechParamClassID": "0",
+ "HSNO": "0",
+ "HStdNextTimes": "0",
+ "HTechParamIDStd": "0",
"HSourceBillNo": "0",
"HSourceBillType": "0",
"HSourceEntryID": "0",
@@ -1025,6 +1039,85 @@
}
});
}
+ //宸ヨ壓鍙傛暟澶х被
+ if (obj.event == "HTechParamClassName") {
+ //鎵撳紑宸ヨ壓鍙傛暟澶х被灏忕獥浣�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ヨ壓鍙傛暟澶х被',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterClass.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ "HTechParamClassID": checkStatus.data[0].HItemID,
+ "HTechParamClassName": checkStatus.data[0].宸ヨ壓鍙傛暟澶х被鍚嶇О,
+
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , end: function () {
+ //if (OptionData.length > 0) {
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // obj.update({
+ // "HTechParamClassID": OptionData[0].HItemID,
+ // "HTechParamClassName": OptionData[0].宸ヨ壓鍙傛暟澶х被鍚嶇О,
+ // });
+ // OptionData = [];
+ //}
+ }
+ });
+ }
+ //瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�
+ if (obj.event == "HTechParamIDStdName") {
+ //鎵撳紑瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�(灏忕獥浣�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁板垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameter.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ "HTechParamIDStd": checkStatus.data[0].HItemID,
+ "HTechParamIDStdName": checkStatus.data[0].瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁板悕绉�,
+
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , end: function () {
+ //if (OptionData.length > 0) {
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // obj.update({
+ // "HTechParamIDStd": OptionData[0].HItemID,
+ // "HTechParamIDStdName": OptionData[0].瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁板悕绉�,
+
+ // });
+ // OptionData = [];
+ //}
+ }
+ });
+ }
obj.event = "";
return false;
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
index 68b5abd..1cacf47 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
@@ -473,6 +473,7 @@
var HWasterQty_Work = [];//宸ュ簾
var HWasterQty_Mater = [];//鏂欏簾
var FistPass = [];//涓�娆″悎鏍肩巼
+ var target = [];//鐩爣鍊�
var HTitle = "鐩撮�氱巼瓒嬪娍鍥�";//鍥惧舰鏍囬
if (option.data.length > 0) {
for (let i = 0; i < option.data.length; i++) {
@@ -485,6 +486,7 @@
HWasterQty_Work.push(option.data[i].宸ュ簾);
HWasterQty_Mater.push(option.data[i].鏂欏簾);
FistPass.push((option.data[i].涓�娆″悎鏍肩巼).replace('%', ''));
+ target.push(('95.00%').replace('%', ''))
}
}
@@ -570,6 +572,18 @@
return value;
}
},
+ itemStyle: {
+ normal: {
+ label: {
+ show: true, //寮�鍚樉绀�
+ textStyle: { //鏁板�兼牱寮�
+ color: 'black',
+ fontSize: 16
+ }
+ }
+ },
+ color: '#00DDDD' // 璁剧疆鏌辩姸鍥捐摑鑹�
+ },
data: HBackWorkQty
},
{
@@ -582,13 +596,25 @@
tooltip: {
valueFormatter: function (value) {
return value;
- }
+ }
+ },
+ itemStyle: {
+ normal: {
+ label: {
+ show: true, //寮�鍚樉绀�
+ textStyle: { //鏁板�兼牱寮�
+ color: 'black',
+ fontSize: 16
+ }
+ }
+ },
+ color: '#FFFF00' // 璁剧疆鏌辩姸鍥鹃粍鑹�
},
data: HWasterQty_Work
},
{
name: '鏂欏簾',
- type: 'bar',
+ type: 'bar',
stack: 'Ad',
emphasis: {
focus: 'series'
@@ -598,11 +624,27 @@
return value;
}
},
+ itemStyle: {
+ normal: {
+ label: {
+ show: true, //寮�鍚樉绀�
+ textStyle: { //鏁板�兼牱寮�
+ color: 'black',
+ fontSize: 16
+ }
+ }
+ },
+ color: '#FFAA33' // 璁剧疆鏌辩姸鍥炬鑹�
+ },
data: HWasterQty_Mater
},
{
name: '涓�娆″悎鏍肩巼',
type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
tooltip: {
valueFormatter: function (value) {
return value;
@@ -611,12 +653,34 @@
itemStyle: {
normal: {
lineStyle: {
- color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ color: '#00BBFF' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
},
- color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ color: '#00BBFF' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ }
+ },
+ data: FistPass
+ },
+ {
+ name: '鐩爣鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
}
},
- data: FistPass
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ },
+ color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ }
+ },
+ data: target
}
]
};
@@ -701,12 +765,34 @@
series: [
{
name: '宸ユ枡鐜�',
- type: 'line',
+ type: 'line',
+ label: {
+ show: true
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ },
+ color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ }
+ },
data: HWorkPass
},
{
name: '鏂欏簾鐜�',
- type: 'line',
+ type: 'line',
+ label: {
+ show: true
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: '#77DDFF' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ },
+ color: '#77DDFF' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ }
+ },
data: HMaterPass
}
]
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformancePass.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformancePass.html"
index 178d0e8..8a13d45 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformancePass.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformancePass.html"
@@ -468,6 +468,7 @@
var H_X = [];//X杞存爣棰�
var HBackCount = [];//涓嶈壇鎬绘暟
var Pass = [];//鍚堟牸鐜�
+ var target = [];//鐩爣鍊�
var HTitle = "鍚堟牸鐜囪秼鍔垮浘";//鍥惧舰鏍囬
if (option.data.length > 0) {
for (let i = 0; i < option.data.length; i++) {
@@ -478,6 +479,7 @@
HBackCount.push(option.data[i].涓嶈壇鎬绘暟);
Pass.push((option.data[i].鍚堟牸鐜�).replace('%', ''));
+ target.push(('95.00%').replace('%', ''))
}
}
@@ -507,7 +509,7 @@
}
},
legend: {
- data: ['涓嶈壇鎬绘暟','鍚堟牸鐜�'],
+ data: ['涓嶈壇鎬绘暟','鍚堟牸鐜�','鐩爣鍊�'],
top: 'bottom', // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
},
@@ -552,7 +554,10 @@
series: [
{
name: '涓嶈壇鎬绘暟',
- type: 'bar',
+ type: 'bar',
+ label: {
+ show: true
+ },
barGap: 0,
emphasis: {
focus: 'series'
@@ -562,11 +567,18 @@
return value;
}
},
+ itemStyle: {
+ color: '#33CCFF' // 璁剧疆鏌辩姸鍥捐摑鑹�
+ },
data: HBackCount
},
{
name: '鍚堟牸鐜�',
type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
tooltip: {
valueFormatter: function (value) {
return value;
@@ -575,12 +587,34 @@
itemStyle: {
normal: {
lineStyle: {
- color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ color: '#0066FF' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
},
- color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ color: '#0066FF' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
}
},
data: Pass
+ },
+ {
+ name: '鐩爣鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ },
+ color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+ }
+ },
+ data: target
}
]
};
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html"
index 466b118..e89f8ea 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html"
@@ -570,6 +570,10 @@
{
name: '瀹為檯鍊�',
type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
tooltip: {
valueFormatter: function (value) {
return value;
@@ -580,6 +584,10 @@
{
name: '涓婇檺鍊�',
type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
tooltip: {
valueFormatter: function (value) {
return value;
@@ -598,6 +606,10 @@
{
name: '涓嬮檺鍊�',
type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
tooltip: {
valueFormatter: function (value) {
return value;
@@ -616,6 +628,10 @@
{
name: '鏍囧噯鍊�',
type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
tooltip: {
valueFormatter: function (value) {
return value;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/Sc_StationOutBil_HProc.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/Sc_StationOutBil_HProc.html"
index 7d16e52..791fdbf 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/Sc_StationOutBil_HProc.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/Sc_StationOutBil_HProc.html"
@@ -198,7 +198,7 @@
var option = [];
var HModName = "Sc_StationOutBil_HProc";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["骞�", "鏈�", "宸ュ簭"];
+ var titleData = ["骞�", "鏈�", "宸ュ簭鍚嶇О"];
var ins; //鐢ㄤ簬瀵煎嚭excel
@@ -462,7 +462,7 @@
sWhere += " and 鏈� = '" + HMonth + "'";
}
if (HProcName) {
- sWhere += " and 宸ュ簭鍚嶇О like '%" + HNumber + "%'";
+ sWhere += " and 宸ュ簭鍚嶇О like '%" + HProcName + "%'";
}
get_Display(sWhere);
//鍔犺浇鏌辩姸鍥�
@@ -501,31 +501,28 @@
var option_ZZT;
//鏌辩姸鍥剧粦瀹氭暟鎹�
- var H_X = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31'];//X杞存爣棰�
+ var H_X = [];//X杞存爣棰�
var HQtySumNum = [];//鐢熶骇鎬绘暟閲�
var HQtyNum = [];//鍚堟牸鎬绘暟閲�
var HBadCount = [];//涓嶈壇鏁伴噺
+ var HBackWorkQty = [];//杩斿伐鏁�
+ var FistPass = [];//涓�娆″悎鏍�
+ var Pass = [];//鍚堟牸
var HTitle = "鍚勫伐搴忚秼鍔垮浘";//鍥惧舰鏍囬
if (option.data.length > 0) {
- for (let i = 0; i < H_X.length; i++) {
- HQtySumNum.push(0);
- HQtyNum.push(0);
- HBadCount.push(0);
+ for (let i = 0; i < option.data.length; i++) {
+ H_X.push(option.data[i].鏃ユ湡);
}
// 濉厖鏁版嵁
for (let i = 0; i < option.data.length; i++) {
- let monthIndex = option.data[i].鏃ユ湡 - 1; // 鏃ユ湡浠藉湪鏁扮粍涓殑绱㈠紩锛堟敞鎰忚浆鎹负浠�0寮�濮嬶級
- HQtySumNum[monthIndex] += option.data[i].鐢熶骇鎬绘暟;
- // 澶勭悊娉ㄥ鑹巼
- let qualifiedRateString = option.data[i].鍚堟牸鏁�; //
- let qualifiedRate = parseFloat(qualifiedRateString); // 杞崲涓烘暟瀛�
- HQtyNum[monthIndex] = qualifiedRate;
+ HQtySumNum.push(option.data[i].鐢熶骇鎬绘暟);
+ HQtyNum.push(option.data[i].鍚堟牸鏁�);
+ HBadCount.push(option.data[i].涓嶈壇鏁�);
+ HBackWorkQty.push(option.data[i].杩斿伐鏁�);
+ FistPass.push((option.data[i].涓�娆″悎鏍肩巼).replace('%', ''));
+ Pass.push((option.data[i].鍚堟牸鐜�).replace('%', ''))
- // 澶勭悊鍏ㄦ鑹巼
- let firstPassRateString = option.data[i].涓嶈壇鏁�; //
- let firstPassRate = parseFloat(firstPassRateString); // 杞崲涓烘暟瀛�
- HBadCount[monthIndex] = firstPassRate;
}
}
option_ZZT = {
@@ -537,13 +534,28 @@
trigger: 'axis',
axisPointer: {
type: 'shadow'
+ },
+ formatter: function (params) {
+ let tooltipHtml = params[0].axisValue + '<br>'; // X杞存暟鍊�
+
+ params.forEach(function (item) {
+ if (item.seriesType === 'line') {
+ let valueToShow = parseFloat(item.value); // 灏嗗瓧绗︿覆杞崲涓烘暟鍊�
+ tooltipHtml += item.seriesName + ': ' + valueToShow.toFixed(3) + '%' + '<br>'; // 鎶樼嚎鍥炬暟鎹牸寮忓寲涓虹櫨鍒嗘瘮
+ } else {
+ tooltipHtml += item.seriesName + ': ' + item.value + '<br>'; // 鏌辩姸鍥炬暟鎹洿鎺ユ樉绀�
+ }
+ });
+
+ return tooltipHtml;
}
+
},
legend: {
- data: ['鐢熶骇鎬绘暟', '鑹搧鏁�', '涓嶈壇鏁�'],
+ data: ['鐢熶骇鎬绘暟', '鑹搧鏁�', '涓嶈壇鏁�','杩斿伐鏁�','涓�娆″悎鏍肩巼','鍚堟牸鐜�'],
top: 'bottom', // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
- },
+ },
toolbox: {
show: true,
orient: 'vertical',
@@ -566,7 +578,20 @@
],
yAxis: [
{
- type: 'value'
+ type: 'value',
+ name: '鏁伴噺',
+ axisLabel: {
+ formatter: '{value}'
+ }
+ },
+ {
+ type: 'value',
+ name: '鐧惧垎姣�',
+ min: 0,
+ max: 100,
+ axisLabel: {
+ formatter: '{value}%'
+ }
}
],
series: [
@@ -582,6 +607,18 @@
return value;
}
},
+ itemStyle: {
+ normal: {
+ label: {
+ show: true, //寮�鍚樉绀�
+ textStyle: { //鏁板�兼牱寮�
+ color: 'black',
+ fontSize: 16
+ }
+ }
+ },
+ color: '#BBFFEE' // 璁剧疆鏌辩姸鍥捐摑鑹�
+ },
data: HQtySumNum
},
{
@@ -594,6 +631,18 @@
valueFormatter: function (value) {
return value;
}
+ },
+ itemStyle: {
+ normal: {
+ label: {
+ show: true, //寮�鍚樉绀�
+ textStyle: { //鏁板�兼牱寮�
+ color: 'black',
+ fontSize: 16
+ }
+ }
+ },
+ color: '#00BBFF' // 璁剧疆鏌辩姸鍥捐摑鑹�
},
data: HQtyNum
},
@@ -608,7 +657,70 @@
return value;
}
},
+ itemStyle: {
+ normal: {
+ label: {
+ show: true, //寮�鍚樉绀�
+ textStyle: { //鏁板�兼牱寮�
+ color: 'black',
+ fontSize: 16
+ }
+ }
+ },
+ color: '#FF0000' // 璁剧疆鏌辩姸鍥炬鑹�
+ },
data: HBadCount
+ },
+ {
+ name: '杩斿伐鏁�',
+ type: 'bar',
+ emphasis: {
+ focus: 'series'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ label: {
+ show: true, //寮�鍚樉绀�
+ textStyle: { //鏁板�兼牱寮�
+ color: 'black',
+ fontSize: 16
+ }
+ }
+ },
+ color: '#FF0000' // 璁剧疆鏌辩姸鍥炬鑹�
+ },
+ data: HBackWorkQty
+ },
+ {
+ name: '涓�娆″悎鏍肩巼',
+ type: 'line',
+ yAxisIndex: 1, // 浣跨敤绗簩涓� yAxis 鏄剧ず鐧惧垎姣�
+ data: FistPass,
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ lineStyle: {
+ color: '#FFB6C1' // 璁剧疆鎶樼嚎鍥鹃鑹�
+ }
+ },
+ {
+ name: '鍚堟牸鐜�',
+ type: 'line',
+ yAxisIndex: 1, // 浣跨敤绗簩涓� yAxis 鏄剧ず鐧惧垎姣�
+ data: Pass,
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ lineStyle: {
+ color: '#87CEFA' // 璁剧疆鎶樼嚎鍥鹃鑹�
+ }
}
]
};
--
Gitblit v1.9.1