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/views/质量管理/质量报表/Sc_StationOutBil_HProc.html | 152 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 132 insertions(+), 20 deletions(-)
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