From 742c7847a2b9a98c39b5690fdfc2bfa67d09fb0b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 25 二月 2026 15:46:20 +0800
Subject: [PATCH] 华舟页面调整
---
WebTM/views/仓存管理/生产入库单/Kf_ProductInBillList.html | 110 ++++--
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 695 ++++++++++++++++++++------------------
WebTM/views/IpadIndex.html | 102 +++++
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html | 7
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 113 ++++--
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 4
6 files changed, 618 insertions(+), 413 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 6ea745c..1f462fd 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鎶ュ伐骞冲彴</title>
@@ -61,7 +62,8 @@
, table = layui.table
, form = layui.form
, laydate = layui.laydate
- , element = layui.element;
+ , element = layui.element
+ ;
//window 鍏ㄥ眬鍙橀噺
window.mychart1 = echarts.init(document.getElementById('mychart1'));
window.mychart2 = echarts.init(document.getElementById('mychart2'));
@@ -85,11 +87,13 @@
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data) {
var LoadData = data.data.h_p_JIT_GetSourceInfoByUser;
-
+ // 鍗庤垷鍒嗙粍鍐呭
+ var LoadingTabsContact = {}
if (LoadData.length > 0)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
HSBName = LoadData[0].HSourceName;
for (var i = 1; i <= LoadData.length + 1; i++) {
+ // sessionStorage["Organization"] == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�"
if (sessionStorage["Organization"] == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
if (i <= LoadData.length) {
var html1 = '';
@@ -130,7 +134,9 @@
html1 += '</dl>';
html1 += '</div>';
html1 += '</div>';
- $("#topleft").append(html1);
+
+ // 浣跨敤涓嶅彲瑙佸璞℃殏瀛樻覆鏌撶殑html
+ $("#topleftTemp").append(html1);
$("#ts" + i + "").append('<span class="layui-icon layui-icon-delete delete" onclick="Delete(event,this,' + i + ')"></span>'); //鍦ㄥ綋鍓峝iv鍚庤拷鍔犲姞涓�涓猻pan鍒犻櫎
//鏍规嵁杩斿洖鐨� 閫変腑鏍囧織HNowFlag璁剧疆閫変腑鐨勮祫婧�
@@ -139,19 +145,31 @@
$("#ts" + i + "").addClass('check'); // 娣诲姞褰撳墠鍏冪礌鐨勬牱寮�
Check(this, i);
}
+ if (LoadData[i - 1].HSourceNumber.substring(0, 2) == 'ZS') {
+ var GroupName = LoadData[i - 1].HSourceNumber.substring(3, 4)
+ if (!LoadingTabsContact[GroupName]) {
+ LoadingTabsContact[GroupName] = []
+ }
+ LoadingTabsContact[GroupName].push($("#topleftTemp").html())
+ }
+
+ $("#topleftTemp").empty()
+
+
}
else {
- var html1 = '';
- html1 += '<div class="layui-col-sm12 layui-col-md2">';
- html1 += '<div class="cnt1 ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
- html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>';
- html1 += '</div>';
- html1 += '</div>';
- $("#topleft").append(html1);
+ // var html1 = '';
+ // html1 += '<div class="layui-col-sm12 layui-col-md2">';
+ // html1 += '<div class="cnt1 ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
+ // html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>';
+ // html1 += '</div>';
+ // html1 += '</div>';
+ // $("#topleft").append(html1);
}
} else {
if (i <= LoadData.length) {
+
var html1 = '';
html1 += '<div class="layui-col-sm12 layui-col-md3">';
html1 += '<div class="cnt ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
@@ -193,6 +211,7 @@
html1 += '</dl>';
html1 += '</div>';
html1 += '</div>';
+
$("#topleft").append(html1);
$("#ts" + i + "").append('<span class="layui-icon layui-icon-delete delete" onclick="Delete(event,this,' + i + ')"></span>'); //鍦ㄥ綋鍓峝iv鍚庤拷鍔犲姞涓�涓猻pan鍒犻櫎
@@ -216,6 +235,50 @@
}
}
+
+ if (sessionStorage["Organization"] == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+ // 鍗庤垷 浣跨敤鍒嗙粍鏍囩
+ var divParent = document.createElement("div")
+ divParent.classList.add("layui-tab")
+ divParent.classList.add("layui-tab-card")
+ var tabTitle = document.createElement("ul")
+ var tabContent = document.createElement("div")
+ tabTitle.classList.add("layui-tab-title")
+ tabContent.classList.add("layui-tab-content")
+ var index = 0
+ for (var key in LoadingTabsContact) {
+ var liItem = document.createElement("li")
+ liItem.innerText = key
+ var tabItem = document.createElement("div")
+ tabItem.classList.add("layui-tab-item")
+ tabItem.classList.add("layui-row")
+ tabItem.classList.add("layui-col-space10")
+
+ if (index == 0) {
+ liItem.classList.add("layui-this")
+ tabItem.classList.add("layui-show")
+ }
+
+ for (var j = 0; j < LoadingTabsContact[key].length; j++) {
+ tabItem.innerHTML += LoadingTabsContact[key][j]
+ }
+ tabTitle.appendChild(liItem)
+ tabContent.appendChild(tabItem)
+ var html1 = '';
+ html1 += '<div class="layui-col-sm12 layui-col-md2">';
+ html1 += '<div class="cnt1 ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
+ html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>';
+ html1 += '</div>';
+ html1 += '</div>';
+ tabItem.innerHTML += html1;
+ index++
+ }
+ divParent.appendChild(tabTitle)
+ divParent.appendChild(tabContent)
+
+ $("#topleft").append(divParent)
+ }
+
}
else {
var html1 = '';
@@ -897,6 +960,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
+ scrollbar: false,
content: '鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
@@ -938,6 +1002,7 @@
, id: 'LAY_layuipro' //璁惧畾涓�涓猧d锛岄槻姝㈤噸澶嶅脊鍑�
, btn: ['纭畾', '鍙栨秷']
, btnAlign: 'c'
+ , scrollbar: false
, moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
, content: '<div style="padding: 50px; line-height: 22px; font-weight: 300;text-align:center;">璁惧缂栧彿:' + HSourceName1 + '<br>宸ュ崟鍙�:' + workcode + '<br>浜у搧鍚嶇О:' + HMaterName + '<br></div>'
, btn1: function (index, layero, e) {
@@ -983,6 +1048,7 @@
closeBtn: 1,
shift: 2,
area: ['95%', '95%'],
+ scrollbar: false,
maxmin: true,
content: '鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID + '&HProcID=' + HProcID,
end: function () {
@@ -1071,6 +1137,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
+ scrollbar: false,
content: '鐢熶骇绠＄悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
@@ -1110,6 +1177,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
+ scrollbar: false,
content: '鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
@@ -1252,6 +1320,7 @@
title: '鏂板鍋滃伐鎭㈠鍗�',
closeBtn: 1,
shift: 2,
+ scrollbar: false,
area: ['100%', '100%'],
maxmin: true,
content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐鎭㈠鍗�/Sc_MESStopRestoreWorkBill.html?OperationType=2&linterid=&HSouceBillType=',
@@ -1291,6 +1360,7 @@
, anim: 0
, content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID + '&HSourceEntryID=' + HSourceEntryID + '', 'yes']
, resize: false
+ , scrollbar: false
, cancel: function () {
}
, end: function () {
@@ -1365,6 +1435,7 @@
, anim: 0
, content: ['鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
, resize: false
+ , scrollbar: false
, cancel: function () {
}
@@ -1394,6 +1465,7 @@
, anim: 0
, content: ['鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID + '&HBillSubType=寰憰鍝�', 'yes']
, resize: false
+ , scrollbar: false
, cancel: function () {
}
@@ -1469,6 +1541,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
+ scrollbar: false,
content: '杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CurrentWork.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
@@ -1546,6 +1619,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
+ scrollbar: false,
content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillType.html',
end: function () {
@@ -1609,6 +1683,7 @@
closeBtn: 1,
shift: 2,
area: ['100%', '100%'],
+ scrollbar: false,
maxmin: true,
content: '璐ㄩ噺绠＄悊/妫�楠屽彇鏍疯繕鏍峰崟/QC_Add_TakeSampleCheckBill.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
@@ -1699,6 +1774,8 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
+ scrollbar: false,
+
content: '璐ㄩ噺绠＄悊/寮傚父鍙嶉/OA_ErrMsgBackSelfQuery_BGT.html?OperationType=2',
end: function () {
@@ -1798,6 +1875,7 @@
<div class="layui-row layui-col-space10" id="topleft">
</div>
+ <div style="display: none;" id="topleftTemp"> </div>
</div>
</fieldset>
</div>
@@ -1821,7 +1899,8 @@
</ul>
<div class="layui-tab-content content3">
<div class="layui-tab-item layui-show">
- <div class="layui-row layui-col-space10" id="btomleft" style="height:600px;display:block;overflow-y:auto;">
+ <div class="layui-row layui-col-space10" id="btomleft"
+ style="height:600px;display:block;overflow-y:auto;">
</div>
</div>
@@ -2014,4 +2093,5 @@
</div>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
index c2a3ab4..270dc47 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鐢熶骇鍏ュ簱鍗曞垪琛�</title>
@@ -26,6 +27,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -42,62 +44,76 @@
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes" lay-verify="HStockOrgID">
+ <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes"
+ lay-verify="HStockOrgID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -105,26 +121,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
+ lay-filter="Comparator1" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -132,7 +155,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -140,19 +164,25 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
+ lay-filter="Comparator2" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -160,7 +190,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -224,7 +255,7 @@
var OperationType = params[params[0]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑鍒楄〃
var ViewName = params[params[1]]; //鎵�璋冪敤鐨勮鍥�
//#endregion
-
+
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HBillType) || document.title;
@@ -501,7 +532,7 @@
//浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
case 'btn_Drop': set_DropBill(1);
break;
-
+
//鍙嶄綔搴熸寜閽�
case 'btn_DeDrop': set_DropBill(2);
break;
@@ -559,6 +590,7 @@
, area: ['100%', '100%']
, title: HPageTitle + '- 鏂板'
, shift: 0 //寮瑰嚭鍔ㄧ敾
+ , scrollbar: false
, content: '../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillEdit.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1'
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
@@ -581,6 +613,7 @@
, area: ['100%', '100%']
, title: HPageTitle + '- 缂栬緫'
, shift: 0 //寮瑰嚭鍔ㄧ敾
+ , scrollbar: false
, content: '../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillEdit.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=0&closeType=1'
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
@@ -610,6 +643,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , scrollbar: false
, content: ['../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html?BillType=' + BillType + '&InterID=' + InterID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
//, end : function () {
@@ -643,6 +677,7 @@
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
, content: '../../鍖呰鍑哄叆搴撴槑缁�/Kf_PackStockDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
, resize: false
+ , scrollbar: false
, btn: ["纭畾", "鍙栨秷"]
, end: function () {
//鍒锋柊椤甸潰,
@@ -850,6 +885,7 @@
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
, content: [contentUrl, "yes"]
+ , scrollbar: false
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -953,7 +989,7 @@
com1 = "like'%" + ColContent1 + "'";
bre1ak;
case "9":
- com1 = "like'" + ColContent1 + "%'";
+ com1 = "like'" + ColContent1 + "%'";
break;
case "10":
com1 = "not like'%" + ColContent1 + "%'";
@@ -974,7 +1010,7 @@
com2 = "like'%" + ColContent2 + "'";
bre1ak;
case "9":
- com2 = "like'" + ColContent2 + "%'";
+ com2 = "like'" + ColContent2 + "%'";
break;
case "10":
com2 = "not like'%" + ColContent2 + "%'";
@@ -1016,7 +1052,7 @@
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
, content: '../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
-
+ , scrollbar: false
, resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
end: function () { //褰撳叧闂椂璋冪敤
get_FastQuery(table, option);
@@ -1027,7 +1063,7 @@
})
}
});
- //#endregion
+ //#endregion
//#region 鍒楄〃鍒锋柊
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -1064,8 +1100,9 @@
col.push({
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, style: 'cursor: pointer;' });
- }else {
+ }, style: 'cursor: pointer;'
+ });
+ } else {
switch (data[i].Type) {
//int
case 'DateTime':
@@ -1109,7 +1146,7 @@
ins = table.render(option);
layer.close(ajaxLoad);
//鑷畾涔夎繃婊や笅鎷夋鍔犺浇
-
+
if ($("#ColName option").length < 1) {
ColFilter();
}
@@ -1530,4 +1567,5 @@
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index 2831e66..e0966d0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -59,13 +59,13 @@
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍣ㄥ叿缂栧彿</label>
+ <label class="layui-form-label">妯″叿缂栧彿</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍣ㄥ叿鍚嶇О</label>
+ <label class="layui-form-label">妯″叿鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
</div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
index 02b61de..42b10ff 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
@@ -924,7 +924,12 @@
if (Source) {
sWhere += " and 鐢熶骇璧勬簮 like '%" + Source + "%'";
}
- sWhere += " and 鍒跺崟浜� !='鑷姩鐢熸垚'";
+ if(sessionStorage["Organization"] == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�"){
+
+ }else {
+ sWhere += " and 鍒跺崟浜� !='鑷姩鐢熸垚'";
+ }
+
//if (HOrgID) {
// sWhere += " and HOrgID = '" + HOrgID + "'";
//}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 3b0ce6b..4f3e496 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�</title>
@@ -22,6 +23,7 @@
<script src="../../../layuiadmin/modules//tableFilter2.js"></script>
<script src="../../../layuiadmin/MESLanguage.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -34,11 +36,12 @@
<div class="layui-inline">
<span id="BT_GD">鏇村</span>
</div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" id="BT_HStatus">鐘舵��</label>
<div class="layui-input-block">
- <select name="HStatus" id="HStatus" lay-filter="HStatus" style="width:190px;" class="ForFilteringSchemes">
+ <select name="HStatus" id="HStatus" lay-filter="HStatus" style="width:190px;"
+ class="ForFilteringSchemes">
<option value="-1" selected="selected">鍏ㄩ儴</option>
<option value="0">鏈鏍�</option>
<option value="1">宸插鏍�</option>
@@ -58,29 +61,36 @@
<div class="layui-inline">
<label class="layui-form-label" id="BT_HInitTimeCycle">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ <select name="HInitTimeCycle" id="HInitTimeCycle"
+ class="ForFilteringSchemes" lay-filter="HInitTimeCycle"
+ style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" id="BT_HBeginDate">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" id="BT_HEndDate">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
</div>
<div class="layui-colla-content">
@@ -91,58 +101,75 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;" id="BT_HWorkBillNo">浠诲姟鍗曞彿</label>
+ <label class="layui-form-label" style="width: 85px;"
+ id="BT_HWorkBillNo">浠诲姟鍗曞彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HWorkBillNo" id="HWorkBillNo">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HWorkBillNo" id="HWorkBillNo">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;" id="BT_HBillNo">鍗曟嵁鍙�</label>
+ <label class="layui-form-label" style="width: 85px;"
+ id="BT_HBillNo">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HBillNo" id="HBillNo">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;" id="BT_HProcExchBillNo">宸ュ簭娴佽浆鍗″彿</label>
+ <label class="layui-form-label" style="width: 85px;"
+ id="BT_HProcExchBillNo">宸ュ簭娴佽浆鍗″彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HProcExchBillNo" id="HProcExchBillNo">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HProcExchBillNo" id="HProcExchBillNo">
</div>
</div>
</div>
<div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;" id="BT_HNumber">浜у搧浠ｇ爜</label>
+ <label class="layui-form-label" style="width: 85px;"
+ id="BT_HNumber">浜у搧浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;" id="BT_HName">褰撳墠宸ュ簭</label>
+ <label class="layui-form-label" style="width: 85px;"
+ id="BT_HName">褰撳墠宸ュ簭</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HName"
+ id="HName">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="" id="BT_checkHWasterQty">鎶ュ簾鏁伴噺涓嶄负0</label>
+ <label class="layui-form-label" style=""
+ id="BT_checkHWasterQty">鎶ュ簾鏁伴噺涓嶄负0</label>
<div class="layui-input-block">
- <input type="checkbox" name="checkHWasterQty" class="ForFilteringSchemes" id="checkHWasterQty" lay-skin="primary" lay-filter="checkHWasterQty" title="">
+ <input type="checkbox" name="checkHWasterQty"
+ class="ForFilteringSchemes" id="checkHWasterQty" lay-skin="primary"
+ lay-filter="checkHWasterQty" title="">
</div>
</div>
</div>
<div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;" id="BT_HEmpNumber">鎿嶄綔鍛樹唬鐮�</label>
+ <label class="layui-form-label" style="width: 85px;"
+ id="BT_HEmpNumber">鎿嶄綔鍛樹唬鐮�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HEmpNumber" id="HEmpNumber">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HEmpNumber" id="HEmpNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;" id="BT_HEmpName">鎿嶄綔鍛樺悕绉�</label>
+ <label class="layui-form-label" style="width: 85px;"
+ id="BT_HEmpName">鎿嶄綔鍛樺悕绉�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HEmpName" id="HEmpName">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HEmpName" id="HEmpName">
</div>
</div>
- </div>
+ </div>
<div id="filter-row">
<!--杩囨护妗唄tml-->
</div>
@@ -544,6 +571,7 @@
, title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
, closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
, shade: 0.6 //閬僵閫忔槑搴�
+ , scrollbar: false
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
, content: ['Cj_StationOutBill.html?OperationType=4&linterid=' + data[0].hmainid + '&HSouceBillType=&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes'] //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
@@ -931,7 +959,7 @@
break;
//璇诲彇鏂规
case 'set_ReadScheme': set_ReadScheme();
- break;
+ break;
};
});
@@ -1022,6 +1050,7 @@
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
, content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , scrollbar: false
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -1128,7 +1157,7 @@
}, error: function () {
layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
}
- })
+ })
}
//#endregion
@@ -1149,6 +1178,7 @@
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
, content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName1 + '&colName=' + colName, "yes"]
+ , scrollbar: false
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -1262,6 +1292,7 @@
, closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
+ , scrollbar: false
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
, content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName2 + '&colName=' + colName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
@@ -1377,6 +1408,7 @@
, closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
+ , scrollbar: false
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
, content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName3 + '&colName=' + colName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
@@ -1492,6 +1524,7 @@
, closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
+ , scrollbar: false
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
, content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName4 + '&colName=' + colName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
@@ -1608,6 +1641,7 @@
, area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
+ , scrollbar: false
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + 1 + '&MyMsg=' + linterid.toString() + '&Type=Cj_StationOutBill', 'yes']
@@ -1736,6 +1770,7 @@
, title: '宸ュ簭妫�楠屽崟-缂栬緫'
, shade: 0.6
, maxmin: false
+ , scrollbar: false
, anim: 0
, content: ['../../璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3791&HICMOEntryID=0', 'yes']
, resize: false
@@ -1764,6 +1799,7 @@
, title: '宸ュ簭妫�楠屽崟-缂栬緫'
, shade: 0.6
, maxmin: false
+ , scrollbar: false
, anim: 0
, content: ['../../鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdDisposeBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=&HSouceBillType=3791', 'yes']
, resize: false
@@ -1811,6 +1847,7 @@
, maxmin: false
, anim: 0
, content: ['../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill_New.html?OperationType=' + 6 + '&linterid=' + linterid.toString() + '&HEntry=0&HProcNo=' + 0 + '&HEntryID=' + 0 + '', 'yes']
+ , scrollbar: false
, resize: false
, cancel: function () {
btnIs();
@@ -1838,6 +1875,7 @@
, maxmin: false
, anim: 0
, content: ['../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_Sup.html?OperationType=1&linterid=' + linterid.toString() + '&HEntry=', 'yes']
+ , scrollbar: false
, resize: false
, cancel: function () {
btnIs();
@@ -1858,6 +1896,7 @@
, maxmin: false
, anim: 0
, content: ['Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=0&closeType=1', 'yes']
+ , scrollbar: false
, resize: false
, cancel: function () {
btnIs();
@@ -1890,6 +1929,7 @@
, maxmin: false
, anim: 0
, content: ['Cj_StationOutBill.html?OperationType=4&linterid=' + data[0].hmainid + '&HSouceBillType=&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
+ , scrollbar: false
, resize: false
, cancel: function () {
btnIs();
@@ -2021,7 +2061,7 @@
sWhere += buildFilterWhere(ColName1, Comparator1, ColContent1, Logical_judgement, sWhere);
sWhere += buildFilterWhere(ColName2, Comparator2, ColContent2, Logical_judgement1, sWhere);
//鎷彿鍖归厤
- sWhere=fixParenthesesMatching(sWhere);
+ sWhere = fixParenthesesMatching(sWhere);
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= ''" + HBeginDate + "''";
}
@@ -2180,7 +2220,7 @@
});
layer.close(wait);
}
-
+
//#region 鏌ヨ-鍒嗛〉
function get_DisplayPage(sWhere) {
var wait = layer.load();//閬僵
@@ -2280,11 +2320,11 @@
ins = table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
-
+
tableFilterIns = table.render(optionPage);
tableFilter.render(tableFilterIns);
-
+
layer.close(ajaxLoad);
if ($("#ColName option").length < 1) {
ColFilter();
@@ -2322,7 +2362,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
type: "GET",
- data: { "HInterID": data[0].hmainid, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ data: { "HInterID": data[0].hmainid, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
success: function (result) {
if (result.count == 1) {
get_FastQuery();
@@ -2360,8 +2400,8 @@
$("#HInitTimeCycle").val("29");
}
- //#endregion
-
+ //#endregion
+
//閫�鍑�
function get_Exit() {
Pub_Close(2);
@@ -2635,7 +2675,7 @@
type: "GET",
async: false,
url: GetWEBURL() + "/Xt_User/UserDeptlistPlaylist", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HUserID": sessionStorage["Czybm"]},
+ data: { "HUserID": sessionStorage["Czybm"] },
success: function (result) {
if (result.count == 1) {
if (result.data.length > 0) {
@@ -2645,7 +2685,7 @@
res = res.slice(0, -1);
res = ` and HDeptID in (${res})`
}
-
+
}
}, error: function (err) {
res = " and 1 = 0";
@@ -2950,4 +2990,5 @@
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index 6e582d3..43dca09 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -27,15 +27,15 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="width: 65%; height: calc(135vh); float: left; background-color: rgb(255 255 255) ">
<div id="top" style="width:100%;height:calc(60vh);">
- <div id="top-left" style="width: 30%; height: calc(40vh); float: left;">
+ <div id="top-left" style="width: 20%; height: calc(40vh); float: left;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 30px;"><span
style="font-weight:bolder">璁惧</span></label>
</div>
<div>
- <img src="../../../layuiadmin/layui/images/device.png"
+ <!-- <img src="../../../layuiadmin/layui/images/device.png"
onerror="javascript:this.src='../../../layuiadmin/layui/images/erro.png';this.onerror = null"
- style="width:40%;height:calc(15vh);float:left" />
+ style="width:40%;height:calc(15vh);float:left" /> -->
<div style="float:left;margin-left:5%;">
<dl>
<dd>
@@ -55,13 +55,13 @@
</div>
</div>
</div>
- <div id="center-center"
+ <!-- <div id="center-center"
style="width: 15%; height: calc(40vh); float: left; margin-left: 0.2%;">
<div id="chart1" style="width: 75%; height: calc(40vh); left: 2%; float: left;">
</div>
- </div>
+ </div> -->
<div id="center-right"
- style="width: 500px; height: calc(40vh); float: left;margin-top:5%;">
+ style="width: 75%; height: calc(40vh); float: left;margin-top:5%;">
<div class="layui-row" style="margin-bottom: 30px;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 65px;">鏉″舰鐮�:</label>
@@ -74,18 +74,19 @@
</div>
</div>
<div class="layui-row" style="margin-bottom: 15px;">
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">宸ュ簭:</label>
- <div class="layui-input-block" style="margin-left: 9px;">
+ <div class="layui-input-inline"
+ style="margin-left: 9px; width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HProcName" value=""
lay-verify="HProcName" id="HProcName"
- style="background-color: #efefef4d; width: 43%; display: inline-block;"
+ style="background-color: #efefef4d; width: 80%; display: inline-block;"
readonly>
<input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID"
value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
lay-submit="" lay-filter="btnHProcID" id="btnHProcID"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ style="padding: 0 10px;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -98,116 +99,131 @@
style="width: 150px; background-color: #efefef4d; " readonly>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">鐢熶骇璧勬簮:</label>
- <div class="layui-input-block" style="margin-left: 9px;">
+ <div class="layui-input-inline"
+ style="margin-left: 9px; width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HSourceName" value=""
lay-verify="HSourceName" id="HSourceName"
- style="background-color: #efefef4d; width: 43%; display: inline-block;"
+ style="background-color: #efefef4d; width: 80%; display: inline-block;"
readonly>
<input type="hidden" name="HSourceID" id="HSourceID"
lay-verify="HSourceID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
lay-submit="" lay-filter="btnHSourceID" id="btnHSourceID"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ style="padding: 0 10px;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
</div>
<div class="layui-row" style="margin-bottom: 15px;">
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">宸ヤ綔涓績:</label>
- <div class="layui-input-block" style="margin-left: 9px;">
+ <div class="layui-input-inline"
+ style="margin-left: 9px; width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HCenterName" value=""
lay-verify="HCenterName" id="HCenterName"
- style="background-color: #efefef4d; width: 43%; display: inline-block;"
+ style="background-color: #efefef4d; width: 80%; display: inline-block;"
readonly>
<input type="hidden" name="HCenterID" id="HCenterID"
lay-verify="HCenterID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
lay-submit="" lay-filter="btnHCenterID" id="btnHCenterID"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ style="padding: 0 10px;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">鐢熶骇鐝粍:</label>
- <div class="layui-input-block" style="margin-left: 9px;">
+ <div class="layui-input-inline"
+ style="margin-left: 9px; width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HGroupName" value=""
lay-verify="HGroupName" id="HGroupName"
- style="background-color: #efefef4d; width: 43%; display: inline-block;"
+ style="background-color: #efefef4d; width: 80%; display: inline-block;"
readonly>
<input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID"
value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
lay-submit="" lay-filter="btnHGroupID" id="btnHGroupID"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ style="padding: 0 10px; margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
</div>
<div class="layui-row" style="margin-bottom: 15px;">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 65px;">鍚堟牸鏁伴噺:<label
+ <div class="layui-inline layui-col-xs6">
+ <label class="layui-form-label" style="width: 6em;">鍚堟牸鏁伴噺:<label
style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 95px;">
- <input type="text" class="layui-input layui-input-number" name="HQty" value="0"
- lay-verify="HQty" id="HQty" style="width: 150px;">
+ <div class="layui-input-inline" style="width: calc(100% - 12em);">
+ <input type="text" class="layui-input layui-input-number" name="HQty"
+ value="0" lay-verify="HQty" id="HQty" style="width: 100%;">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">閲嶉噺:<label
style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 95px;">
- <input type="text" class="layui-input layui-input-number" name="HWeight" value="0"
- lay-verify="HWeight" id="HWeight" style="width: 150px;">
+ <div class="layui-input-inline" style="width: calc(100% - 150px);">
+ <input type="text" class="layui-input layui-input-number" name="HWeight"
+ value="0" lay-verify="HWeight" id="HWeight" style="width: 100%;">
</div>
</div>
</div>
<div class="layui-row" style="margin-bottom: 15px;">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 65px;">绠辨暟:<label
- style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 95px;">
- <input type="text" class="layui-input layui-input-number" name="HPieceQty" value=""
- lay-verify="HPieceQty" id="HPieceQty" style="width: 150px;">
+ <div class="layui-inline layui-col-xs6">
+ <label class="layui-form-label" style="width: 65px;">姣忕鏁伴噺:</label>
+ <div class="layui-input-block" style="width: calc(100% - 150px);">
+ <input type="text" class="layui-input layui-input-number" name="HPerQty"
+ value="" lay-verify="HPerQty" id="HPerQty" style="width: 100%;">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 65px;">鐢熶骇鐝:<label
+ </div>
+ <div class="layui-row" style="margin-bottom: 15px;">
+ <div class="layui-inline layui-col-xs6">
+ <label class="layui-form-label" style="width: 65px;">绠辨暟:<label
style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 9px;">
+ <div class="layui-input-block" style="width: calc(100% - 150px);">
+ <input type="text" class="layui-input layui-input-number"
+ name="HPieceQty" value="1" lay-verify="HPieceQty" id="HPieceQty"
+ style="width: 100%;">
+ </div>
+ </div>
+ <div class="layui-inline layui-col-xs6">
+ <label class="layui-form-label" style="width: 6em;">鐢熶骇鐝:<label
+ style="color:red"> * </label></label>
+ <div class="layui-input-inline"
+ style="margin-left: 9px; width: calc(100% - 12em)">
<input type="text" class="layui-input" name="HShiftsName" value=""
lay-verify="HShiftsName" id="HShiftsName"
- style="background-color: #efefef4d; width: 43%; display: inline-block;"
+ style="background-color: #efefef4d; width: 80%; display: inline-block;"
readonly>
<input type="hidden" name="HShiftsID" id="HShiftsID"
lay-verify="HShiftsID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
lay-submit="" lay-filter="HWorkShiftList" id="HWorkShiftList"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ style="padding: 0 10px; margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
</div>
<div class="layui-row" style="margin-bottom: 15px;">
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">鎿嶄綔宸�:<label
style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 9px;">
+ <div class="layui-input-inline"
+ style="margin-left: 9px; width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HEmpName" value=""
lay-verify="HEmpName" id="HEmpName"
- style="background-color: #efefef4d; width: 43%; display: inline-block;"
+ style="background-color: #efefef4d; width: 80%; display: inline-block;"
readonly>
<input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID"
value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ style="padding: 0 10px; margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -219,94 +235,98 @@
value="0" style="width: 150px;">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">鎶�鏈憳:</label>
- <div class="layui-input-block" style="margin-left: 9px;">
+ <div class="layui-input-inline"
+ style="margin-left: 9px; width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HEmp4Name" value=""
lay-verify="HEmp4Name" id="HEmp4Name"
- style="background-color: #efefef4d; width: 43%; display: inline-block;"
+ style="background-color: #efefef4d; width: 80%; display: inline-block;"
readonly>
<input type="hidden" name="HEmpID4" id="HEmpID4" lay-verify="HEmpID4"
value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
lay-submit="" lay-filter="btnHEmp4ID" id="btnHEmp4ID"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ style="padding: 0 10px;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
</div>
<div class="layui-row" style="margin-bottom: 15px;">
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">鏈轰慨宸�:</label>
- <div class="layui-input-block" style="margin-left: 9px;">
+ <div class="layui-input-inline"
+ style="margin-left: 9px; width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HEmp2Name" value=""
lay-verify="HEmp2Name" id="HEmp2Name"
- style="background-color: #efefef4d; width: 43%; display: inline-block;"
+ style="background-color: #efefef4d; width: 80%; display: inline-block;"
readonly>
<input type="hidden" name="HEmpID2" id="HEmpID2" lay-verify="HEmpID2"
value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
lay-submit="" lay-filter="btnHEmp2ID" id="btnHEmp2ID"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ style="padding: 0 10px;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">妯″叿宸�:</label>
- <div class="layui-input-block" style="margin-left: 9px;">
+ <div class="layui-input-inline"
+ style="margin-left: 9px; width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HEmp3Name" value=""
lay-verify="HEmp3Name" id="HEmp3Name"
- style="background-color: #efefef4d; width: 43%; display: inline-block;"
+ style="background-color: #efefef4d; width: 80%; display: inline-block;"
readonly>
<input type="hidden" name="HEmpID3" id="HEmpID3" lay-verify="HEmpID3"
value="0">
<button class="layui-btn layuiadmin-btn-order" type="button"
lay-submit="" lay-filter="btnHEmp3ID" id="btnHEmp3ID"
- style="padding: 0 10px;float: right;margin-right: 3px;">
+ style="padding: 0 10px; margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
</div>
<div class="layui-row" style="margin-bottom: 15px;">
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">鍗曟嵁鏃ユ湡:</label>
- <div class="layui-input-block" style="margin-left: 95px;">
+ <div class="layui-input-block"
+ style="margin-left: 95px; width: calc(100% - 150px);">
<input type="date" class="layui-input" name="HDate" lay-verify="HDate"
- style="width: 150px;" autocomplete="off" id="HDate">
+ style="width: 100%;" autocomplete="off" id="HDate">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">鍗曟嵁鍙�:</label>
- <div class="layui-input-block" style="margin-left: 95px;">
+ <div class="layui-input-inline" style="width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HBillNo" value=""
lay-verify="HBillNo"
- style="width: 150px; background-color: #efefef4d; font-size: 12.5px;"
+ style="width: 100%; background-color: #efefef4d; font-size: 12.5px;"
autocomplete="off" id="HBillNo" readonly>
<input type="hidden" name="HInterID" id="HInterID">
</div>
</div>
</div>
<div class="layui-row" style="margin-bottom: 15px;">
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">鐢熶骇璁㈠崟:</label>
- <div class="layui-input-block" style="margin-left: 95px;">
+ <div class="layui-input-block" style="width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HICMOBillNo" value=""
lay-verify="HICMOBillNo"
- style="width: 150px; background-color: #efefef4d; font-size: 13px;"
+ style="width: 100%; background-color: #efefef4d; font-size: 13px;"
autocomplete="off" id="HICMOBillNo" readonly>
<input type="hidden" name="HICMOInterID" id="HICMOInterID">
<input type="hidden" name="HICMOEntryID" id="HICMOEntryID">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">娴佽浆鍗�:</label>
- <div class="layui-input-block" style="margin-left: 95px;">
+ <div class="layui-input-inline" style="width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HProcExchBillNo" value=""
lay-verify="HProcExchBillNo"
- style="width: 150px; background-color: #efefef4d; font-size: 13px;"
+ style="width: 100%; background-color: #efefef4d; font-size: 13px;"
autocomplete="off" id="HProcExchBillNo" readonly>
<input type="hidden" class="layui-input" name="lngBillKey"
id="lngBillKey">
@@ -316,44 +336,44 @@
</div>
</div>
<div class="layui-row" style="margin-bottom: 15px;">
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">鐗╂枡浠ｇ爜:</label>
- <div class="layui-input-block" style="margin-left: 95px;">
+ <div class="layui-input-inline" style="width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HMaterNumber" value=""
lay-verify="HMaterNumber"
- style="width: 150px; background-color: #efefef4d; font-size: 13px;"
+ style="width: 100%; background-color: #efefef4d; font-size: 13px;"
autocomplete="off" id="HMaterNumber" readonly>
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">鐗╂枡鍚嶇О:</label>
- <div class="layui-input-block" style="margin-left: 95px;">
+ <div class="layui-input-inline" style="width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HMaterName" value=""
lay-verify="HMaterName"
- style="width: 150px; background-color: #efefef4d; font-size: 13px;"
+ style="width: 100%; background-color: #efefef4d; font-size: 13px;"
autocomplete="off" id="HMaterName" readonly>
</div>
</div>
</div>
<div class="layui-row" style="margin-bottom: 15px;">
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">瑙勬牸鍨嬪彿:</label>
- <div class="layui-input-block" style="margin-left: 95px;">
+ <div class="layui-input-inline" style="width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HMaterModel" value=""
lay-verify="HMaterModel"
- style="width: 150px; background-color: #efefef4d; font-size: 13px;"
+ style="width: 100%; background-color: #efefef4d; font-size: 13px;"
autocomplete="off" id="HMaterModel" readonly>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">璁￠噺鍗曚綅:</label>
- <div class="layui-input-block" style="margin-left: 95px;">
+ <div class="layui-input-inline" style="width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HUnitName" value=""
lay-verify="HUnitName"
- style="width: 150px; background-color: #efefef4d;"
- autocomplete="off" id="HUnitName" readonly>
+ style="width: 100%; background-color: #efefef4d;" autocomplete="off"
+ id="HUnitName" readonly>
<input type="hidden" name="HUnitID" id="HUnitID">
<input type="hidden" name="eventType" id="eventType" value="Add">
<input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0">
@@ -443,29 +463,29 @@
</div>
</div>
<div class="layui-row" style="margin-bottom: 15px; ">
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">妯″叿缂栧彿</label>
- <div class="layui-input-block" style="margin-left: 95px;">
+ <div class="layui-input-inline" style="width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HMouldNo" id="HMouldNo"
- value="" style="width: 150px;" readonly>
+ value="" style="width: 100%;" readonly>
<input type="hidden" class="layui-input" name="HMouldID" id="HMouldID"
value="0">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">妯″叿鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 95px;">
+ <div class="layui-input-block" style="width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HMouldName" id="HMouldName"
- value="" style="width: 150px;" readonly>
+ value="" style="width: 100%;" readonly>
</div>
</div>
</div>
<div class="layui-row" style="margin-bottom: 15px;">
- <div class="layui-inline">
+ <div class="layui-inline layui-col-xs6">
<label class="layui-form-label" style="width: 65px;">妯″叿鍨嬪彿</label>
- <div class="layui-input-block" style="margin-left: 95px;">
+ <div class="layui-input-inline" style="width: calc(100% - 150px);">
<input type="text" class="layui-input" name="HModel" id="HModel"
- value="" style="width: 150px;" readonly>
+ value="" style="width: 100%;" readonly>
</div>
</div>
<div class="layui-inline" style="display: none">
@@ -501,7 +521,7 @@
</div>
</div>
- <div id="center" style="width: 100%; height: calc(55vh); margin-top: 1%;">
+ <!-- <div id="center" style="width: 100%; height: calc(55vh); margin-top: 1%;">
<div id="center-left" style="width: 30%; height: calc(40vh); float: left;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 30px;"><span
@@ -527,7 +547,7 @@
<div id="chart2" style="width: 75%; height: calc(40vh); left: 2%; float: left;">
</div>
</div>
- </div>
+ </div> -->
<!--<div id="bottom" style="width: 100%; height: calc(20vh);">
<div id="bottom-left" style="width: 100%; height: calc(10vh);">
<div style="text-align: left; width: 100%; height: calc(20vh); margin-left:410px ">
@@ -667,239 +687,239 @@
//#endregion
//#region 銆愪华琛ㄧ洏銆�
- var chart1 = echarts.init(document.getElementById("chart1"));
-
- var colorTemplate1 = [[0.2, "rgba(255,0,0,0.8)"], [0.8, "rgba(0,255,255,0.8)"], [1, "rgba(0,255,0,0.8)"]];
-
- var data1 = [{
- name: "瀹屾垚鐜�",
- value: HFinishRate.toFixed(2),
- }];
-
- // 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
- var option = {
- //backgroundColor: "#000",
- tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
- show: true,
- formatter: "{b}锛歿c}%",
- backgroundColor: "rgba(50,50,50,0.7)", // 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
- borderColor: "#333", // 鎻愮ず妗嗘诞灞傜殑杈规棰滆壊銆�...
- borderWidth: 0, // 鎻愮ず妗嗘诞灞傜殑杈规瀹姐��...
- padding: 5, // 鎻愮ず妗嗘诞灞傚唴杈硅窛锛屽崟浣峱x锛岄粯璁ゅ悇鏂瑰悜鍐呰竟璺濅负5锛屾帴鍙楁暟缁勫垎鍒瀹氫笂鍙充笅宸﹁竟璺濄��...
- textStyle: { // 鎻愮ず妗嗘诞灞傜殑鏂囨湰鏍峰紡銆�...
- // color ,fontStyle ,fontWeight ,fontFamily ,fontSize ,lineHeight ,.......
- },
- },
- series: [
- {
- name: "鍗曚华琛ㄧ洏绀轰緥", // 绯诲垪鍚嶇О,鐢ㄤ簬tooltip鐨勬樉绀猴紝legend 鐨勫浘渚嬬瓫閫夛紝鍦� setOption 鏇存柊鏁版嵁鍜岄厤缃」鏃剁敤浜庢寚瀹氬搴旂殑绯诲垪銆�
- type: "gauge", // 绯诲垪绫诲瀷
- progress: {
- show: true
- },
- radius: "100%", // 鍙傛暟:number, string銆� 浠〃鐩樺崐寰�,榛樿 75% 锛屽彲浠ユ槸鐩稿浜庡鍣ㄩ珮瀹戒腑杈冨皬鐨勪竴椤圭殑涓�鍗婄殑鐧惧垎姣旓紝涔熷彲浠ユ槸缁濆鐨勬暟鍊笺��
- center: ["50%", "50%"], // 浠〃鐩樹綅缃�(鍦嗗績鍧愭爣)
- startAngle: 225, // 浠〃鐩樿捣濮嬭搴�,榛樿 225銆傚渾蹇� 姝ｅ彸鎵嬩晶涓�0搴︼紝姝ｄ笂鏂逛负90搴︼紝姝ｅ乏鎵嬩晶涓�180搴︺��
- endAngle: -45, // 浠〃鐩樼粨鏉熻搴�,榛樿 -45
- clockwise: true, // 浠〃鐩樺埢搴︽槸鍚︽槸椤烘椂閽堝闀�,榛樿 true銆�
- min: 0, // 鏈�灏忕殑鏁版嵁鍊�,榛樿 0 銆傛槧灏勫埌 minAngle銆�
- max: 100, // 鏈�澶х殑鏁版嵁鍊�,榛樿 100 銆傛槧灏勫埌 maxAngle銆�
- splitNumber: 10, // 浠〃鐩樺埢搴︾殑鍒嗗壊娈垫暟,榛樿 10銆�
- axisLine: { // 浠〃鐩樿酱绾�(杞粨绾�)鐩稿叧閰嶇疆銆�
- show: true, // 鏄惁鏄剧ず浠〃鐩樿酱绾�(杞粨绾�),榛樿 true銆�
- lineStyle: { // 浠〃鐩樿酱绾挎牱寮忋��
- color: colorTemplate1, //浠〃鐩樼殑杞寸嚎鍙互琚垎鎴愪笉鍚岄鑹茬殑澶氭銆傛瘡娈电殑 缁撴潫浣嶇疆(鑼冨洿鏄痆0,1]) 鍜� 棰滆壊 鍙互閫氳繃涓�涓暟缁勬潵琛ㄧず銆傞粯璁ゅ彇鍊硷細[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
- opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
- width: 5, //杞寸嚎瀹藉害,榛樿 30銆�
- shadowBlur: 20, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
- shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
- }
- },
- splitLine: { // 鍒嗛殧绾挎牱寮忋��
- show: true, // 鏄惁鏄剧ず鍒嗛殧绾�,榛樿 true銆�
- length: 0, // 鍒嗛殧绾跨嚎闀裤�傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 30銆�
- lineStyle: { // 鍒嗛殧绾挎牱寮忋��
- color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
- opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
- width: 2, //绾垮害,榛樿 2銆�
- type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
- shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
- shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
- }
- },
- axisTick: { // 鍒诲害(绾�)鏍峰紡銆�
- show: false, // 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
- splitNumber: 5, // 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
- length: 8, // 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
- lineStyle: { // 鍒诲害绾挎牱寮忋��
- color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
- opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
- width: 1, //绾垮害,榛樿 1銆�
- type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
- shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
- shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
- },
- },
- axisLabel: { // 鍒诲害鏍囩銆�
- show: false, // 鏄惁鏄剧ず鏍囩,榛樿 true銆�
- distance: 5, // 鏍囩涓庡埢搴︾嚎鐨勮窛绂�,榛樿 5銆�
- color: "#1E1E1E", // 鏂囧瓧鐨勯鑹�,榛樿 #fff銆�
- fontSize: 9, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 5銆�
- formatter: "{value}", // 鍒诲害鏍囩鐨勫唴瀹规牸寮忓櫒锛屾敮鎸佸瓧绗︿覆妯℃澘鍜屽洖璋冨嚱鏁颁袱绉嶅舰寮忋�� 绀轰緥:// 浣跨敤瀛楃涓叉ā鏉匡紝妯℃澘鍙橀噺涓哄埢搴﹂粯璁ゆ爣绛� {value},濡�:formatter: '{value} kg'; // 浣跨敤鍑芥暟妯℃澘锛屽嚱鏁板弬鏁板垎鍒负鍒诲害鏁板��,濡俧ormatter: function (value) {return value + 'km/h';}
- },
- pointer: { // 浠〃鐩樻寚閽堛��
- show: true, // 鏄惁鏄剧ず鎸囬拡,榛樿 true銆�
- length: "70%", // 鎸囬拡闀垮害锛屽彲浠ユ槸缁濆鏁板�硷紝涔熷彲浠ユ槸鐩稿浜庡崐寰勭殑鐧惧垎姣�,榛樿 80%銆�
- width: 5, // 鎸囬拡瀹藉害,榛樿 8銆�
- },
- itemStyle: { // 浠〃鐩樻寚閽堟牱寮忋��
- color: "auto", // 鎸囬拡棰滆壊锛岄粯璁�(auto)鍙栨暟鍊兼墍鍦ㄧ殑鍖洪棿鐨勯鑹�
- opacity: 1, // 鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
- borderWidth: 0, // 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
- borderType: "solid", // 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
- borderColor: "#000", // 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
- shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
- shadowColor: "#fff", // 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
- },
- emphasis: { // 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
- itemStyle: {
- //楂樹寒 鍜屾甯� 涓よ�呭叿鏈夊悓鏍风殑閰嶇疆椤�,鍙槸鍦ㄤ笉鍚岀姸鎬佷笅閰嶇疆椤圭殑鍊间笉鍚屻��
- }
- },
- title: { // 浠〃鐩樻爣棰樸��
- show: true, // 鏄惁鏄剧ず鏍囬,榛樿 true銆�
- offsetCenter: [0, "120%"],//鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
- color: "#1E1E1E", // 鏂囧瓧鐨勯鑹�,榛樿 #333銆�
- fontSize: 20, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
- },
- detail: { // 浠〃鐩樿鎯咃紝鐢ㄤ簬鏄剧ず鏁版嵁銆�
- show: true, // 鏄惁鏄剧ず璇︽儏,榛樿 true銆�
- offsetCenter: [0, "70%"],// 鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
- color: "auto", // 鏂囧瓧鐨勯鑹�,榛樿 auto銆�
- fontSize: 30, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
- formatter: "{value}%", // 鏍煎紡鍖栧嚱鏁版垨鑰呭瓧绗︿覆
- },
- data: data1
- }
- ]
- };
- // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃
- chart1.setOption(option);
-
-
- var chart2 = echarts.init(document.getElementById("chart2"));
-
- var data2 = [{
- name: "鍚堟牸鐜�",
- value: HQualifiedRate.toFixed(2),
- }];
-
- // 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
- var option2 = {
- //backgroundColor: "#000",
- tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
- show: true,
- formatter: "{b}锛歿c}%",
- backgroundColor: "rgba(50,50,50,0.7)", // 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
- borderColor: "#333", // 鎻愮ず妗嗘诞灞傜殑杈规棰滆壊銆�...
- borderWidth: 0, // 鎻愮ず妗嗘诞灞傜殑杈规瀹姐��...
- padding: 5, // 鎻愮ず妗嗘诞灞傚唴杈硅窛锛屽崟浣峱x锛岄粯璁ゅ悇鏂瑰悜鍐呰竟璺濅负5锛屾帴鍙楁暟缁勫垎鍒瀹氫笂鍙充笅宸﹁竟璺濄��...
- textStyle: { // 鎻愮ず妗嗘诞灞傜殑鏂囨湰鏍峰紡銆�...
- // color ,fontStyle ,fontWeight ,fontFamily ,fontSize ,lineHeight ,.......
- },
- },
- series: [
- {
- name: "鍗曚华琛ㄧ洏绀轰緥", // 绯诲垪鍚嶇О,鐢ㄤ簬tooltip鐨勬樉绀猴紝legend 鐨勫浘渚嬬瓫閫夛紝鍦� setOption 鏇存柊鏁版嵁鍜岄厤缃」鏃剁敤浜庢寚瀹氬搴旂殑绯诲垪銆�
- type: "gauge", // 绯诲垪绫诲瀷
- radius: "100%", // 鍙傛暟:number, string銆� 浠〃鐩樺崐寰�,榛樿 75% 锛屽彲浠ユ槸鐩稿浜庡鍣ㄩ珮瀹戒腑杈冨皬鐨勪竴椤圭殑涓�鍗婄殑鐧惧垎姣旓紝涔熷彲浠ユ槸缁濆鐨勬暟鍊笺��
- center: ["50%", "50%"], // 浠〃鐩樹綅缃�(鍦嗗績鍧愭爣)
- startAngle: 225, // 浠〃鐩樿捣濮嬭搴�,榛樿 225銆傚渾蹇� 姝ｅ彸鎵嬩晶涓�0搴︼紝姝ｄ笂鏂逛负90搴︼紝姝ｅ乏鎵嬩晶涓�180搴︺��
- endAngle: -45, // 浠〃鐩樼粨鏉熻搴�,榛樿 -45
- clockwise: true, // 浠〃鐩樺埢搴︽槸鍚︽槸椤烘椂閽堝闀�,榛樿 true銆�
- min: 0, // 鏈�灏忕殑鏁版嵁鍊�,榛樿 0 銆傛槧灏勫埌 minAngle銆�
- max: 100, // 鏈�澶х殑鏁版嵁鍊�,榛樿 100 銆傛槧灏勫埌 maxAngle銆�
- splitNumber: 10, // 浠〃鐩樺埢搴︾殑鍒嗗壊娈垫暟,榛樿 10銆�
- axisLine: { // 浠〃鐩樿酱绾�(杞粨绾�)鐩稿叧閰嶇疆銆�
- show: true, // 鏄惁鏄剧ず浠〃鐩樿酱绾�(杞粨绾�),榛樿 true銆�
- lineStyle: { // 浠〃鐩樿酱绾挎牱寮忋��
- color: colorTemplate1, //浠〃鐩樼殑杞寸嚎鍙互琚垎鎴愪笉鍚岄鑹茬殑澶氭銆傛瘡娈电殑 缁撴潫浣嶇疆(鑼冨洿鏄痆0,1]) 鍜� 棰滆壊 鍙互閫氳繃涓�涓暟缁勬潵琛ㄧず銆傞粯璁ゅ彇鍊硷細[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
- opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
- width: 5, //杞寸嚎瀹藉害,榛樿 30銆�
- shadowBlur: 20, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
- shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
- }
- },
- splitLine: { // 鍒嗛殧绾挎牱寮忋��
- show: true, // 鏄惁鏄剧ず鍒嗛殧绾�,榛樿 true銆�
- length: 0, // 鍒嗛殧绾跨嚎闀裤�傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 30銆�
- lineStyle: { // 鍒嗛殧绾挎牱寮忋��
- color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
- opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
- width: 2, //绾垮害,榛樿 2銆�
- type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
- shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
- shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
- }
- },
- axisTick: { // 鍒诲害(绾�)鏍峰紡銆�
- show: false, // 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
- splitNumber: 5, // 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
- length: 8, // 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
- lineStyle: { // 鍒诲害绾挎牱寮忋��
- color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
- opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
- width: 1, //绾垮害,榛樿 1銆�
- type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
- shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
- shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
- },
- },
- axisLabel: { // 鍒诲害鏍囩銆�
- show: false, // 鏄惁鏄剧ず鏍囩,榛樿 true銆�
- distance: 5, // 鏍囩涓庡埢搴︾嚎鐨勮窛绂�,榛樿 5銆�
- color: "#1E1E1E", // 鏂囧瓧鐨勯鑹�,榛樿 #fff銆�
- fontSize: 9, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 5銆�
- formatter: "{value}", // 鍒诲害鏍囩鐨勫唴瀹规牸寮忓櫒锛屾敮鎸佸瓧绗︿覆妯℃澘鍜屽洖璋冨嚱鏁颁袱绉嶅舰寮忋�� 绀轰緥:// 浣跨敤瀛楃涓叉ā鏉匡紝妯℃澘鍙橀噺涓哄埢搴﹂粯璁ゆ爣绛� {value},濡�:formatter: '{value} kg'; // 浣跨敤鍑芥暟妯℃澘锛屽嚱鏁板弬鏁板垎鍒负鍒诲害鏁板��,濡俧ormatter: function (value) {return value + 'km/h';}
- },
- pointer: { // 浠〃鐩樻寚閽堛��
- show: true, // 鏄惁鏄剧ず鎸囬拡,榛樿 true銆�
- length: "70%", // 鎸囬拡闀垮害锛屽彲浠ユ槸缁濆鏁板�硷紝涔熷彲浠ユ槸鐩稿浜庡崐寰勭殑鐧惧垎姣�,榛樿 80%銆�
- width: 5, // 鎸囬拡瀹藉害,榛樿 8銆�
- },
- itemStyle: { // 浠〃鐩樻寚閽堟牱寮忋��
- color: "auto", // 鎸囬拡棰滆壊锛岄粯璁�(auto)鍙栨暟鍊兼墍鍦ㄧ殑鍖洪棿鐨勯鑹�
- opacity: 1, // 鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
- borderWidth: 0, // 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
- borderType: "solid", // 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
- borderColor: "#000", // 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
- shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
- shadowColor: "#fff", // 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
- },
- emphasis: { // 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
- itemStyle: {
- //楂樹寒 鍜屾甯� 涓よ�呭叿鏈夊悓鏍风殑閰嶇疆椤�,鍙槸鍦ㄤ笉鍚岀姸鎬佷笅閰嶇疆椤圭殑鍊间笉鍚屻��
- }
- },
- title: { // 浠〃鐩樻爣棰樸��
- show: true, // 鏄惁鏄剧ず鏍囬,榛樿 true銆�
- offsetCenter: [0, "120%"],//鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
- color: "#1E1E1E", // 鏂囧瓧鐨勯鑹�,榛樿 #333銆�
- fontSize: 20, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
- },
- detail: { // 浠〃鐩樿鎯咃紝鐢ㄤ簬鏄剧ず鏁版嵁銆�
- show: true, // 鏄惁鏄剧ず璇︽儏,榛樿 true銆�
- offsetCenter: [0, "70%"],// 鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
- color: "auto", // 鏂囧瓧鐨勯鑹�,榛樿 auto銆�
- fontSize: 30, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
- formatter: "{value}%", // 鏍煎紡鍖栧嚱鏁版垨鑰呭瓧绗︿覆
- },
- data: data2
- }
- ]
- };
- // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃
- chart2.setOption(option2);
+ //var chart1 = echarts.init(document.getElementById("chart1"));
+ //
+ //var colorTemplate1 = [[0.2, "rgba(255,0,0,0.8)"], [0.8, "rgba(0,255,255,0.8)"], [1, "rgba(0,255,0,0.8)"]];
+ //
+ //var data1 = [{
+ // name: "瀹屾垚鐜�",
+ // value: HFinishRate.toFixed(2),
+ //}];
+ //
+ //// 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
+ //var option = {
+ // //backgroundColor: "#000",
+ // tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
+ // show: true,
+ // formatter: "{b}锛歿c}%",
+ // backgroundColor: "rgba(50,50,50,0.7)", // 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
+ // borderColor: "#333", // 鎻愮ず妗嗘诞灞傜殑杈规棰滆壊銆�...
+ // borderWidth: 0, // 鎻愮ず妗嗘诞灞傜殑杈规瀹姐��...
+ // padding: 5, // 鎻愮ず妗嗘诞灞傚唴杈硅窛锛屽崟浣峱x锛岄粯璁ゅ悇鏂瑰悜鍐呰竟璺濅负5锛屾帴鍙楁暟缁勫垎鍒瀹氫笂鍙充笅宸﹁竟璺濄��...
+ // textStyle: { // 鎻愮ず妗嗘诞灞傜殑鏂囨湰鏍峰紡銆�...
+ // // color ,fontStyle ,fontWeight ,fontFamily ,fontSize ,lineHeight ,.......
+ // },
+ // },
+ // series: [
+ // {
+ // name: "鍗曚华琛ㄧ洏绀轰緥", // 绯诲垪鍚嶇О,鐢ㄤ簬tooltip鐨勬樉绀猴紝legend 鐨勫浘渚嬬瓫閫夛紝鍦� setOption 鏇存柊鏁版嵁鍜岄厤缃」鏃剁敤浜庢寚瀹氬搴旂殑绯诲垪銆�
+ // type: "gauge", // 绯诲垪绫诲瀷
+ // progress: {
+ // show: true
+ // },
+ // radius: "100%", // 鍙傛暟:number, string銆� 浠〃鐩樺崐寰�,榛樿 75% 锛屽彲浠ユ槸鐩稿浜庡鍣ㄩ珮瀹戒腑杈冨皬鐨勪竴椤圭殑涓�鍗婄殑鐧惧垎姣旓紝涔熷彲浠ユ槸缁濆鐨勬暟鍊笺��
+ // center: ["50%", "50%"], // 浠〃鐩樹綅缃�(鍦嗗績鍧愭爣)
+ // startAngle: 225, // 浠〃鐩樿捣濮嬭搴�,榛樿 225銆傚渾蹇� 姝ｅ彸鎵嬩晶涓�0搴︼紝姝ｄ笂鏂逛负90搴︼紝姝ｅ乏鎵嬩晶涓�180搴︺��
+ // endAngle: -45, // 浠〃鐩樼粨鏉熻搴�,榛樿 -45
+ // clockwise: true, // 浠〃鐩樺埢搴︽槸鍚︽槸椤烘椂閽堝闀�,榛樿 true銆�
+ // min: 0, // 鏈�灏忕殑鏁版嵁鍊�,榛樿 0 銆傛槧灏勫埌 minAngle銆�
+ // max: 100, // 鏈�澶х殑鏁版嵁鍊�,榛樿 100 銆傛槧灏勫埌 maxAngle銆�
+ // splitNumber: 10, // 浠〃鐩樺埢搴︾殑鍒嗗壊娈垫暟,榛樿 10銆�
+ // axisLine: { // 浠〃鐩樿酱绾�(杞粨绾�)鐩稿叧閰嶇疆銆�
+ // show: true, // 鏄惁鏄剧ず浠〃鐩樿酱绾�(杞粨绾�),榛樿 true銆�
+ // lineStyle: { // 浠〃鐩樿酱绾挎牱寮忋��
+ // color: colorTemplate1, //浠〃鐩樼殑杞寸嚎鍙互琚垎鎴愪笉鍚岄鑹茬殑澶氭銆傛瘡娈电殑 缁撴潫浣嶇疆(鑼冨洿鏄痆0,1]) 鍜� 棰滆壊 鍙互閫氳繃涓�涓暟缁勬潵琛ㄧず銆傞粯璁ゅ彇鍊硷細[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
+ // opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ // width: 5, //杞寸嚎瀹藉害,榛樿 30銆�
+ // shadowBlur: 20, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ // shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ // }
+ // },
+ // splitLine: { // 鍒嗛殧绾挎牱寮忋��
+ // show: true, // 鏄惁鏄剧ず鍒嗛殧绾�,榛樿 true銆�
+ // length: 0, // 鍒嗛殧绾跨嚎闀裤�傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 30銆�
+ // lineStyle: { // 鍒嗛殧绾挎牱寮忋��
+ // color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
+ // opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ // width: 2, //绾垮害,榛樿 2銆�
+ // type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
+ // shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ // shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ // }
+ // },
+ // axisTick: { // 鍒诲害(绾�)鏍峰紡銆�
+ // show: false, // 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
+ // splitNumber: 5, // 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
+ // length: 8, // 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
+ // lineStyle: { // 鍒诲害绾挎牱寮忋��
+ // color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
+ // opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ // width: 1, //绾垮害,榛樿 1銆�
+ // type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
+ // shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ // shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ // },
+ // },
+ // axisLabel: { // 鍒诲害鏍囩銆�
+ // show: false, // 鏄惁鏄剧ず鏍囩,榛樿 true銆�
+ // distance: 5, // 鏍囩涓庡埢搴︾嚎鐨勮窛绂�,榛樿 5銆�
+ // color: "#1E1E1E", // 鏂囧瓧鐨勯鑹�,榛樿 #fff銆�
+ // fontSize: 9, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 5銆�
+ // formatter: "{value}", // 鍒诲害鏍囩鐨勫唴瀹规牸寮忓櫒锛屾敮鎸佸瓧绗︿覆妯℃澘鍜屽洖璋冨嚱鏁颁袱绉嶅舰寮忋�� 绀轰緥:// 浣跨敤瀛楃涓叉ā鏉匡紝妯℃澘鍙橀噺涓哄埢搴﹂粯璁ゆ爣绛� {value},濡�:formatter: '{value} kg'; // 浣跨敤鍑芥暟妯℃澘锛屽嚱鏁板弬鏁板垎鍒负鍒诲害鏁板��,濡俧ormatter: function (value) {return value + 'km/h';}
+ // },
+ // pointer: { // 浠〃鐩樻寚閽堛��
+ // show: true, // 鏄惁鏄剧ず鎸囬拡,榛樿 true銆�
+ // length: "70%", // 鎸囬拡闀垮害锛屽彲浠ユ槸缁濆鏁板�硷紝涔熷彲浠ユ槸鐩稿浜庡崐寰勭殑鐧惧垎姣�,榛樿 80%銆�
+ // width: 5, // 鎸囬拡瀹藉害,榛樿 8銆�
+ // },
+ // itemStyle: { // 浠〃鐩樻寚閽堟牱寮忋��
+ // color: "auto", // 鎸囬拡棰滆壊锛岄粯璁�(auto)鍙栨暟鍊兼墍鍦ㄧ殑鍖洪棿鐨勯鑹�
+ // opacity: 1, // 鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ // borderWidth: 0, // 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
+ // borderType: "solid", // 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
+ // borderColor: "#000", // 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
+ // shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ // shadowColor: "#fff", // 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ // },
+ // emphasis: { // 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
+ // itemStyle: {
+ // //楂樹寒 鍜屾甯� 涓よ�呭叿鏈夊悓鏍风殑閰嶇疆椤�,鍙槸鍦ㄤ笉鍚岀姸鎬佷笅閰嶇疆椤圭殑鍊间笉鍚屻��
+ // }
+ // },
+ // title: { // 浠〃鐩樻爣棰樸��
+ // show: true, // 鏄惁鏄剧ず鏍囬,榛樿 true銆�
+ // offsetCenter: [0, "120%"],//鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
+ // color: "#1E1E1E", // 鏂囧瓧鐨勯鑹�,榛樿 #333銆�
+ // fontSize: 20, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
+ // },
+ // detail: { // 浠〃鐩樿鎯咃紝鐢ㄤ簬鏄剧ず鏁版嵁銆�
+ // show: true, // 鏄惁鏄剧ず璇︽儏,榛樿 true銆�
+ // offsetCenter: [0, "70%"],// 鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
+ // color: "auto", // 鏂囧瓧鐨勯鑹�,榛樿 auto銆�
+ // fontSize: 30, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
+ // formatter: "{value}%", // 鏍煎紡鍖栧嚱鏁版垨鑰呭瓧绗︿覆
+ // },
+ // data: data1
+ // }
+ // ]
+ //};
+ //// 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃
+ //chart1.setOption(option);
+ //
+ //
+ //var chart2 = echarts.init(document.getElementById("chart2"));
+ //
+ //var data2 = [{
+ // name: "鍚堟牸鐜�",
+ // value: HQualifiedRate.toFixed(2),
+ //}];
+ //
+ //// 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
+ //var option2 = {
+ // //backgroundColor: "#000",
+ // tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
+ // show: true,
+ // formatter: "{b}锛歿c}%",
+ // backgroundColor: "rgba(50,50,50,0.7)", // 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
+ // borderColor: "#333", // 鎻愮ず妗嗘诞灞傜殑杈规棰滆壊銆�...
+ // borderWidth: 0, // 鎻愮ず妗嗘诞灞傜殑杈规瀹姐��...
+ // padding: 5, // 鎻愮ず妗嗘诞灞傚唴杈硅窛锛屽崟浣峱x锛岄粯璁ゅ悇鏂瑰悜鍐呰竟璺濅负5锛屾帴鍙楁暟缁勫垎鍒瀹氫笂鍙充笅宸﹁竟璺濄��...
+ // textStyle: { // 鎻愮ず妗嗘诞灞傜殑鏂囨湰鏍峰紡銆�...
+ // // color ,fontStyle ,fontWeight ,fontFamily ,fontSize ,lineHeight ,.......
+ // },
+ // },
+ // series: [
+ // {
+ // name: "鍗曚华琛ㄧ洏绀轰緥", // 绯诲垪鍚嶇О,鐢ㄤ簬tooltip鐨勬樉绀猴紝legend 鐨勫浘渚嬬瓫閫夛紝鍦� setOption 鏇存柊鏁版嵁鍜岄厤缃」鏃剁敤浜庢寚瀹氬搴旂殑绯诲垪銆�
+ // type: "gauge", // 绯诲垪绫诲瀷
+ // radius: "100%", // 鍙傛暟:number, string銆� 浠〃鐩樺崐寰�,榛樿 75% 锛屽彲浠ユ槸鐩稿浜庡鍣ㄩ珮瀹戒腑杈冨皬鐨勪竴椤圭殑涓�鍗婄殑鐧惧垎姣旓紝涔熷彲浠ユ槸缁濆鐨勬暟鍊笺��
+ // center: ["50%", "50%"], // 浠〃鐩樹綅缃�(鍦嗗績鍧愭爣)
+ // startAngle: 225, // 浠〃鐩樿捣濮嬭搴�,榛樿 225銆傚渾蹇� 姝ｅ彸鎵嬩晶涓�0搴︼紝姝ｄ笂鏂逛负90搴︼紝姝ｅ乏鎵嬩晶涓�180搴︺��
+ // endAngle: -45, // 浠〃鐩樼粨鏉熻搴�,榛樿 -45
+ // clockwise: true, // 浠〃鐩樺埢搴︽槸鍚︽槸椤烘椂閽堝闀�,榛樿 true銆�
+ // min: 0, // 鏈�灏忕殑鏁版嵁鍊�,榛樿 0 銆傛槧灏勫埌 minAngle銆�
+ // max: 100, // 鏈�澶х殑鏁版嵁鍊�,榛樿 100 銆傛槧灏勫埌 maxAngle銆�
+ // splitNumber: 10, // 浠〃鐩樺埢搴︾殑鍒嗗壊娈垫暟,榛樿 10銆�
+ // axisLine: { // 浠〃鐩樿酱绾�(杞粨绾�)鐩稿叧閰嶇疆銆�
+ // show: true, // 鏄惁鏄剧ず浠〃鐩樿酱绾�(杞粨绾�),榛樿 true銆�
+ // lineStyle: { // 浠〃鐩樿酱绾挎牱寮忋��
+ // color: colorTemplate1, //浠〃鐩樼殑杞寸嚎鍙互琚垎鎴愪笉鍚岄鑹茬殑澶氭銆傛瘡娈电殑 缁撴潫浣嶇疆(鑼冨洿鏄痆0,1]) 鍜� 棰滆壊 鍙互閫氳繃涓�涓暟缁勬潵琛ㄧず銆傞粯璁ゅ彇鍊硷細[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
+ // opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ // width: 5, //杞寸嚎瀹藉害,榛樿 30銆�
+ // shadowBlur: 20, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ // shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ // }
+ // },
+ // splitLine: { // 鍒嗛殧绾挎牱寮忋��
+ // show: true, // 鏄惁鏄剧ず鍒嗛殧绾�,榛樿 true銆�
+ // length: 0, // 鍒嗛殧绾跨嚎闀裤�傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 30銆�
+ // lineStyle: { // 鍒嗛殧绾挎牱寮忋��
+ // color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
+ // opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ // width: 2, //绾垮害,榛樿 2銆�
+ // type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
+ // shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ // shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ // }
+ // },
+ // axisTick: { // 鍒诲害(绾�)鏍峰紡銆�
+ // show: false, // 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
+ // splitNumber: 5, // 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
+ // length: 8, // 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
+ // lineStyle: { // 鍒诲害绾挎牱寮忋��
+ // color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
+ // opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ // width: 1, //绾垮害,榛樿 1銆�
+ // type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
+ // shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ // shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ // },
+ // },
+ // axisLabel: { // 鍒诲害鏍囩銆�
+ // show: false, // 鏄惁鏄剧ず鏍囩,榛樿 true銆�
+ // distance: 5, // 鏍囩涓庡埢搴︾嚎鐨勮窛绂�,榛樿 5銆�
+ // color: "#1E1E1E", // 鏂囧瓧鐨勯鑹�,榛樿 #fff銆�
+ // fontSize: 9, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 5銆�
+ // formatter: "{value}", // 鍒诲害鏍囩鐨勫唴瀹规牸寮忓櫒锛屾敮鎸佸瓧绗︿覆妯℃澘鍜屽洖璋冨嚱鏁颁袱绉嶅舰寮忋�� 绀轰緥:// 浣跨敤瀛楃涓叉ā鏉匡紝妯℃澘鍙橀噺涓哄埢搴﹂粯璁ゆ爣绛� {value},濡�:formatter: '{value} kg'; // 浣跨敤鍑芥暟妯℃澘锛屽嚱鏁板弬鏁板垎鍒负鍒诲害鏁板��,濡俧ormatter: function (value) {return value + 'km/h';}
+ // },
+ // pointer: { // 浠〃鐩樻寚閽堛��
+ // show: true, // 鏄惁鏄剧ず鎸囬拡,榛樿 true銆�
+ // length: "70%", // 鎸囬拡闀垮害锛屽彲浠ユ槸缁濆鏁板�硷紝涔熷彲浠ユ槸鐩稿浜庡崐寰勭殑鐧惧垎姣�,榛樿 80%銆�
+ // width: 5, // 鎸囬拡瀹藉害,榛樿 8銆�
+ // },
+ // itemStyle: { // 浠〃鐩樻寚閽堟牱寮忋��
+ // color: "auto", // 鎸囬拡棰滆壊锛岄粯璁�(auto)鍙栨暟鍊兼墍鍦ㄧ殑鍖洪棿鐨勯鑹�
+ // opacity: 1, // 鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ // borderWidth: 0, // 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
+ // borderType: "solid", // 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
+ // borderColor: "#000", // 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
+ // shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ // shadowColor: "#fff", // 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ // },
+ // emphasis: { // 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
+ // itemStyle: {
+ // //楂樹寒 鍜屾甯� 涓よ�呭叿鏈夊悓鏍风殑閰嶇疆椤�,鍙槸鍦ㄤ笉鍚岀姸鎬佷笅閰嶇疆椤圭殑鍊间笉鍚屻��
+ // }
+ // },
+ // title: { // 浠〃鐩樻爣棰樸��
+ // show: true, // 鏄惁鏄剧ず鏍囬,榛樿 true銆�
+ // offsetCenter: [0, "120%"],//鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
+ // color: "#1E1E1E", // 鏂囧瓧鐨勯鑹�,榛樿 #333銆�
+ // fontSize: 20, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
+ // },
+ // detail: { // 浠〃鐩樿鎯咃紝鐢ㄤ簬鏄剧ず鏁版嵁銆�
+ // show: true, // 鏄惁鏄剧ず璇︽儏,榛樿 true銆�
+ // offsetCenter: [0, "70%"],// 鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
+ // color: "auto", // 鏂囧瓧鐨勯鑹�,榛樿 auto銆�
+ // fontSize: 30, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
+ // formatter: "{value}%", // 鏍煎紡鍖栧嚱鏁版垨鑰呭瓧绗︿覆
+ // },
+ // data: data2
+ // }
+ // ]
+ //};
+ //// 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃
+ //chart2.setOption(option2);
//#endregion
@@ -1209,6 +1229,9 @@
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+
+
function set_ClearBill() {
get_CriticalPartsList();
$("#HPRDOrgID").val(sessionStorage["OrganizationID"]);
@@ -1244,8 +1267,25 @@
topBtns: 123,
rightBtns: false,
listening: true,
+ hideEnd: function () {
+ calcQty()
+ }
})
}
+
+ //#region 璁＄畻绠辨暟
+ function calcQty() {
+ var HPerQty = $("#HPerQty").val()
+ var HQty = $("#HQty").val()
+ var HPieceQty = $("#HPieceQty").val()
+ // 绠辨暟鍜屾瘡绠辨暟閲忛兘涓嶄负0锛屽垯璁＄畻鍚堟牸鏁伴噺
+ if (HPerQty && HPieceQty) {
+ console.log(HPieceQty * 1.0 * HPerQty)
+ $("#HQty").val(HPieceQty * 1.0 * HPerQty)
+ }
+ }
+ //#endregion
+
//鑾峰彇鏈�澶у崟鎹彿
function MaxBillNO() {
@@ -1930,6 +1970,7 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+
//鐢熶骇鐝
function GetHWorkShiftsValue(obj) {
$("#HShiftsID").val(obj[0].HInterID); //褰撳墠宸ュ簭ID
--
Gitblit v1.9.1