From 60e5625a72ec4cb4ad44007131cf76f913aa596e Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 11 七月 2024 15:00:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 2
WebTM/WebTM.csproj.user | 7
WebTM/layuiadmin/Scripts/webConfig2.js | 8
WebTM/views/grf/取样卡.grf | 347 ++++++++++++++++++++++++++++++++++++++
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 106 ++++++++---
WebTM/views/系统管理/用户管理/Xt_UserGroupListEdit.html | 14
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 36 ++-
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 6
WebTM/WebTM.csproj | 1
9 files changed, 469 insertions(+), 58 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 335c39d..7780b28 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -988,6 +988,7 @@
<Content Include="views\grf\閫佽揣鍗�%28A4绾�%29.grf" />
<Content Include="views\grf\閫佽揣鍗�%28鏍囩绾�%29.grf" />
<Content Include="views\grf\閫佽揣鍗�.grf" />
+ <Content Include="views\grf\鍙栨牱鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index f9eae75..ab663c7 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:\缂栫爜\1\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>E:\鏅轰簯mes\mes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
@@ -16,9 +16,8 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <StartPageUrl>
- </StartPageUrl>
- <StartAction>CurrentPage</StartAction>
+ <StartPageUrl>views/user/login.html</StartPageUrl>
+ <StartAction>SpecificPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
diff --git a/WebTM/layuiadmin/Scripts/webConfig2.js b/WebTM/layuiadmin/Scripts/webConfig2.js
index 5c32bf2..f0c9aff 100644
--- a/WebTM/layuiadmin/Scripts/webConfig2.js
+++ b/WebTM/layuiadmin/Scripts/webConfig2.js
@@ -1,13 +1,13 @@
锘縡unction GetWEBURL() {
- //var WEBURL = "http://localhost:8082/SMEAPI/"; //鏈湴鐜
- var WEBURL = 'http://30.10.7.6:8080/WebAPI/'; //鏂帿灏斿鎴风幆澧� 澶栫綉
+ var WEBURL = "http://localhost:8082/SMEAPI/"; //鏈湴鐜
+ //var WEBURL = 'http://30.10.7.6:8080/WebAPI/'; //鏂帿灏斿鎴风幆澧� 澶栫綉
//var WEBURL = 'http://10.11.18.195:8080/WebAPI/'; //鏂帿灏斿鎴风幆澧�
//WEBURL = "http://192.168.2.168:8082/WebAPI/"; //鏈湴鐜
return WEBURL
}
function GetWEBURL1() {
- //var WEBURL = "http://localhost:8082/SMEAPI/"; //鏈湴鐜
- var WEBURL = 'http://30.10.7.6:8080/WebAPI/'; //鏂帿灏斿鎴风幆澧� 澶栫綉
+ var WEBURL = "http://localhost:8082/SMEAPI/"; //鏈湴鐜
+ //var WEBURL = 'http://30.10.7.6:8080/WebAPI/'; //鏂帿灏斿鎴风幆澧� 澶栫綉
//var WEBURL = 'http://10.11.18.195:8080/WebAPI/'; //鏂帿灏斿鎴风幆澧�
//WEBURL = "http://192.168.2.168:8082/WebAPI/"; //鏈湴鐜
return WEBURL
diff --git "a/WebTM/views/grf/\345\217\226\346\240\267\345\215\241.grf" "b/WebTM/views/grf/\345\217\226\346\240\267\345\215\241.grf"
new file mode 100644
index 0000000..aa1915e
--- /dev/null
+++ "b/WebTM/views/grf/\345\217\226\346\240\267\345\215\241.grf"
@@ -0,0 +1,347 @@
+锘縶
+ "Version":"6.5.0.0",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "LeftMargin":0,
+ "TopMargin":0,
+ "RightMargin":0,
+ "BottomMargin":0
+ },
+ "DetailGrid":{
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"娴佽浆鍗＄紪鍙�"
+ },
+ {
+ "Name":"鐢熶骇璧勬簮"
+ },
+ {
+ "Name":"鎵瑰彿"
+ },
+ {
+ "Name":"浜у搧鍚嶇О"
+ },
+ {
+ "Name":"妫�娴嬫椂闂�"
+ }
+ ]
+ },
+ "ColumnContent":{
+ },
+ "ColumnTitle":{
+ "Height":0.608542
+ },
+ "Group":[
+ {
+ "Name":"娴佽浆鍗″彿",
+ "GroupHeader":{
+ },
+ "GroupFooter":{
+ }
+ }
+ ]
+ },
+ "Parameter":[
+ {
+ "Name":"MFGPartNumber",
+ "Format":"MFGPartNumber"
+ }
+ ],
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader1",
+ "Height":19.394,
+ "Control":[
+ {
+ "Type":"FreeGrid",
+ "Name":"FreeGrid1",
+ "Left":1.77271,
+ "Top":4.23333,
+ "Border":{
+ "Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
+ },
+ "ColumnCount":6,
+ "RowCount":8,
+ "FreeGridColumn":[
+ {
+ "index":1,
+ "Width":2.03729
+ },
+ {
+ "index":2,
+ "Width":3.99521
+ },
+ {
+ "index":3,
+ "Width":2.01083
+ },
+ {
+ "index":4,
+ "Width":3.62479
+ },
+ {
+ "index":5,
+ "Width":2.11667
+ },
+ {
+ "index":6,
+ "Width":3.54542
+ }
+ ],
+ "FreeGridRow":[
+ {
+ "index":1,
+ "Height":1.45521
+ },
+ {
+ "index":2,
+ "Height":1.56104
+ },
+ {
+ "index":3,
+ "Height":1.5875
+ },
+ {
+ "index":4,
+ "Height":1.71979
+ },
+ {
+ "index":5,
+ "Height":2.32833
+ },
+ {
+ "index":6,
+ "Height":1.95792
+ },
+ {
+ "index":7,
+ "Height":2.30188
+ },
+ {
+ "index":8,
+ "Height":2.09021
+ }
+ ],
+ "FreeGridCell":[
+ {
+ "row":1,
+ "col":1,
+ "Text":"椤圭洰鍚嶇О"
+ },
+ {
+ "row":1,
+ "col":2,
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox2",
+ "Width":3.81,
+ "Height":1.40229,
+ "DataField":"浜у搧鍚嶇О"
+ }
+ ]
+ },
+ {
+ "row":1,
+ "col":3,
+ "Text":"宸ュ簭鍚嶇О"
+ },
+ {
+ "row":1,
+ "col":5,
+ "Text":"鏈哄彴鍙�/妯″彿"
+ },
+ {
+ "row":1,
+ "col":6,
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox1",
+ "Left":0.396875,
+ "Top":0.396875,
+ "Width":2.59292,
+ "Height":0.608542,
+ "DataField":"鐢熶骇璧勬簮"
+ }
+ ]
+ },
+ {
+ "row":2,
+ "col":1,
+ "Text":"閫佹祴鏃堕棿"
+ },
+ {
+ "row":2,
+ "col":2,
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox4",
+ "Left":0.211667,
+ "Top":0.211667,
+ "Width":3.38667,
+ "Height":1.19063,
+ "DataField":"妫�娴嬫椂闂�"
+ }
+ ]
+ },
+ {
+ "row":2,
+ "col":3,
+ "Text":"鎵瑰彿"
+ },
+ {
+ "row":2,
+ "col":4,
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox3",
+ "Left":0.396875,
+ "Top":0.211667,
+ "Width":2.80458,
+ "Height":0.978958,
+ "DataField":"鎵瑰彿"
+ }
+ ]
+ },
+ {
+ "row":2,
+ "col":5,
+ "Text":"閫佹祴浜哄憳"
+ },
+ {
+ "row":3,
+ "col":1,
+ "Text":"娴嬭瘯绫诲瀷"
+ },
+ {
+ "row":3,
+ "col":2,
+ "Text":" 灏哄:(棣栨銆佸贰妫�銆佹湯妫�)\r\n\r\n 鍔熻兘:(棣栨銆佸贰妫�銆佹湯妫� )",
+ "ColSpan":3
+ },
+ {
+ "row":3,
+ "col":5,
+ "Text":"鏁版嵁鎺ユ敹浜�"
+ },
+ {
+ "row":4,
+ "col":1,
+ "Text":"妫�娴嬪唴瀹�"
+ },
+ {
+ "row":4,
+ "col":2,
+ "ColSpan":5
+ },
+ {
+ "row":5,
+ "col":1,
+ "ColSpan":6
+ },
+ {
+ "row":6,
+ "col":1,
+ "Text":"閫佹祴鍗曞彿"
+ },
+ {
+ "row":6,
+ "col":2,
+ "ColSpan":2
+ },
+ {
+ "row":6,
+ "col":4,
+ "Text":"棰勪及鏃堕棿"
+ },
+ {
+ "row":6,
+ "col":5,
+ "ColSpan":2
+ },
+ {
+ "row":7,
+ "col":1,
+ "WordWrap":true,
+ "Text":"娴嬮噺寮�濮嬫椂闂�"
+ },
+ {
+ "row":7,
+ "col":2,
+ "ColSpan":2
+ },
+ {
+ "row":7,
+ "col":4,
+ "Text":"娴嬮噺瀹屾垚鏃堕棿"
+ },
+ {
+ "row":7,
+ "col":5,
+ "ColSpan":2
+ },
+ {
+ "row":8,
+ "col":1,
+ "Text":"娴嬮噺浜哄憳"
+ },
+ {
+ "row":8,
+ "col":2,
+ "ColSpan":2
+ },
+ {
+ "row":8,
+ "col":4,
+ "Text":"澶囨敞"
+ },
+ {
+ "row":8,
+ "col":5,
+ "ColSpan":2
+ }
+ ]
+ },
+ {
+ "Type":"Barcode",
+ "Name":"Barcode1",
+ "Left":13.9965,
+ "Top":0.608542,
+ "Width":3.20146,
+ "Height":2.80458,
+ "BarcodeType":"QRCode",
+ "CaptionPosition":"None",
+ "Text":"[#娴佽浆鍗＄紪鍙�#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox1",
+ "Left":6.00604,
+ "Top":0.79375,
+ "Width":6.58813,
+ "Height":1.61396,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":240000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"浜у搧閲忔祴閫佹鍗�"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html"
index 9feba6e..f4bd930 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html"
@@ -76,12 +76,14 @@
<label class="layui-form-label" style="width: 85px;">绾у埆</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<select name="HLev" id="HLev" lay-verify="HLev">
- <option value="1鎬荤粡鐞嗙骇">1鎬荤粡鐞�</option>
- <option value="2鍓�荤骇">2鍓�荤粡鐞�</option>
- <option value="2璐ㄩ噺鎬荤洃">2璐ㄩ噺鎬荤洃</option>
- <option value="3閮ㄩ暱绾�">3閮ㄩ暱绾�</option>
- <option value="4涓荤绾�">4涓荤绾�</option>
- <option value="5鐝粍闀跨骇">5鐝粍闀跨骇</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>
</select>
</div>
</div>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index 99ef182..718d72b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -1853,7 +1853,7 @@
//瀛愯〃 璧嬪��
rowdata.push(
{
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁� == null ? 0 : data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁� == null ? 0 : data[i].鎷掔粷鏁�,
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index fd83cf8..4001f8b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -284,6 +284,7 @@
, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
, "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
, "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
+ , "HControlUpperLimit": 0, "HControlLowerLimit":0
};
switch (obj.event) {
//鏂板涓�琛�
@@ -931,6 +932,8 @@
, { field: 'HDownLimitTxt', title: '涓嬮檺鍊兼枃鏈�', edit: 'text' }
, { field: 'HUpOffSetTxt', title: '涓婂亸宸枃鏈�', edit: 'text' }
, { field: 'HDownOffSetTxt', title: '涓嬪亸宸枃鏈�', edit: 'text' }
+ , { field: 'HControlUpperLimit', title: '鎺у埗涓婇檺', edit: 'text' }
+ , { field: 'HControlLowerLimit', title: '鎺у埗涓嬮檺', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
@@ -1000,6 +1003,7 @@
, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
, "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
, "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
+ , "HControlUpperLimit": 0, "HControlLowerLimit": 0
}];
table.render(option);
}
@@ -1017,6 +1021,7 @@
, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
, "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
, "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
+ , "HControlUpperLimit": 0, "HControlLowerLimit": 0
}];
table.render(option);
}
@@ -1174,6 +1179,7 @@
"HDownLimitTxt": data[i].涓嬮檺鍊兼枃鏈�, "HUpOffSetTxt": data[i].涓婂亸宸枃鏈�, "HDownOffSetTxt": data[i].涓嬪亸宸枃鏈�,
"HQualityStdName": data[i].璐ㄩ噺鏍囧噯鍚嶇О, "HInspectMethodName": data[i].妫�楠屾柟娉曞悕绉�, "HInspectInstruMentName": data[i].妫�楠屼华鍣ㄥ悕绉�,
"HInspectBasisName": data[i].妫�楠屼緷鎹悕绉�, "HSampleSchemeName": data[i].瀛愭娊鏍锋柟妗堝悕绉�
+ , "HControlUpperLimit": data[i].鎺у埗涓婇檺, "HControlLowerLimit": data[i].鎺у埗涓嬮檺
});
}
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_InspectionFormReport.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_InspectionFormReport.html"
index e00d64c..ce876cc 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_InspectionFormReport.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_InspectionFormReport.html"
@@ -96,7 +96,9 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">涓婇檺</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HUpLoad" id="HUpLoad">
+ <input type="text" class="layui-input" name="HUpLimit" id="HUpLimit" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HControlUpperLimit" id="HControlUpperLimit" >
+ <input type="hidden" class="layui-input" name="HControlLowerLimit" id="HControlLowerLimit" >
</div>
</div>
</div>
@@ -112,21 +114,21 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">娴嬮噺鍗曚綅</label>
+ <label class="layui-form-label" style="width: 85px;">绌村彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" id="HUnitName">
+ <input type="text" class="layui-input" id="HMouldNum" name="HMouldNum">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏍囧噯鍊�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" id="HStandard">
+ <input type="text" class="layui-input" name="HTargetVal" id="HTargetVal">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">涓嬮檺</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" id="HDownLoad">
+ <input type="text" class="layui-input" name="HDownLimit" id="HDownLimit" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -162,10 +164,10 @@
</div>
<div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
- <div id="histogram_Avg" style="width:99.5%;height:calc(35vh);margin-top:5px;">
+ <div id="histogram_Avg" style="width:99.5%;height:calc(100vh);margin-top:5px;">
</div>
- <div id="histogram_Diff" style="width:99.5%;height:calc(35vh);margin-top:5px;">
+ <div id="histogram_Diff" style="width:99.5%;height:calc(100vh);margin-top:15px;">
</div>
</div>
@@ -372,13 +374,18 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
- var limit = parseInt($("#limit").val());//鏍锋湰鏁�
- option.data = data1.data;
- optionAVG = data1.data[limit + 1];
- optionS = data1.data[limit + 2];
- table.render(option);
layer.close(wait);
- set_Line();
+ var limit = parseInt($("#limit").val());//鏍锋湰鏁�
+ if (limit > data1.data.length - 3) {
+ layer.msg("鍙栨牱鏁伴噺瓒呰繃瀹為檯鏁伴噺!", { icon: 5 });
+ } else {
+ option.data = data1.data;
+ optionAVG = data1.data[limit + 1];
+ optionS = data1.data[limit + 2];
+ table.render(option);
+ set_Line();
+ }
+
} else {
layer.close(wait);
layer.alert(data1.Message, { icon: 5 });
@@ -443,8 +450,8 @@
}
}
- for (let i = 1; i <= Days; i++) {
- H_X.push(i);
+ for (let i = 0; i <= Days; i++) {
+ H_X.push(i + 1);
}
option_ZXT_Avg = {
@@ -463,7 +470,10 @@
data: H_X
},
yAxis: {
- type: 'value'
+ type: 'value',
+ min: parseInt($("#HTargetVal").val()) + parseInt($("#HDownLimit").val()) - 1, // 璁剧疆鏈�灏忓��
+ max: parseInt($("#HTargetVal").val()) + parseInt($("#HUpLimit").val()) + 1, // 璁剧疆鏈�澶у��
+ interval: 0.1, // 璁剧疆闂磋窛
},
series: [
{
@@ -484,14 +494,21 @@
globalCoord: false// 缂虹渷涓� false
}
},
+ itemStyle: { normal: { label: { show: true } } },
markLine: {
symbol: 'none',//鍘绘帀绠ご
data: [
- { type: 'max', name: 'Max', lineStyle: { color: 'red' } },
- { type: 'average', name: 'Avg', lineStyle: { color: 'blue' } },
- { type: 'min', name: 'Min', lineStyle: { color: 'green' } },
+ { yAxis: $("#HUpLimit").val(), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } },
+ {
+ yAxis: $("#HDownLimit").val(), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }
+ },
+ {
+ yAxis: $("#HControlUpperLimit").val(), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
+ },
+ {
+ yAxis: $("#HControlLowerLimit").val(), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
+ }
]
-
},
}
]
@@ -540,14 +557,15 @@
globalCoord: false// 缂虹渷涓� false
}
},
- markLine: {
- symbol: 'none',//鍘绘帀绠ご
- data: [
- { type: 'max', name: 'Max', lineStyle: { color: 'red' } },
- { type: 'average', name: 'Avg', lineStyle: { color: 'blue' } },
- { type: 'min', name: 'Min', lineStyle: { color: 'green' } },
- ]
- },
+ itemStyle: { normal: { label: { show: true } } },
+ //markLine: {
+ // symbol: 'none',//鍘绘帀绠ご
+ // data: [
+ // { type: 'max', name: 'Max', lineStyle: { color: 'red' } },
+ // { type: 'average', name: 'Avg', lineStyle: { color: 'blue' } },
+ // { type: 'min', name: 'Min', lineStyle: { color: 'green' } },
+ // ]
+ //},
}
]
};
@@ -599,6 +617,7 @@
var limit = $("#limit").val();//鏍锋湰鏁�
var HMaterID = $("#HMaterID").val();//鐗╂枡
var HQCCheckItemID = $("#HQCCheckItemID").val();//妫�楠岄」鐩�
+ var HMouldNum = $("#HMouldNum").val();//绌村彿
if (limit == 0) {
return layer.msg("鏍锋湰鏁伴噺涓嶈兘涓�0!");
@@ -619,6 +638,7 @@
, limit: limit
, HMaterID: HMaterID
, HQCCheckItemID: HQCCheckItemID
+ , HMouldNum: HMouldNum
}
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -673,12 +693,42 @@
//鑾峰彇鏁版嵁
$("#HQCCheckItemID").val(checkStatus.data[0].HItemID);
$("#HQCCheckItemNumber").val(checkStatus.data[0].浠ｇ爜);
+
+ btnCheckProjectList();
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
})
}
+ //妫�楠屾柟妗�
+ function btnCheckProjectList() {
+ var sWheres = " and 妫�楠岄」鐩唬鐮�='" + $("#HQCCheckItemNumber").val() + "'";
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/QC_Management/MES_QC_CheckProjectListProjectDetaiList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWheres, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(wait);
+ $("#HUpLimit").val(data1.data[0].涓婇檺鍊�);
+ $("#HDownLimit").val(data1.data[0].涓嬮檺鍊�);
+ $("#HTargetVal").val(data1.data[0].鐩爣鍊�);
+ $("#HControlUpperLimit").val(data1.data[0].鎺у埗涓婇檺);
+ $("#HControlLowerLimit").val(data1.data[0].鎺у埗涓嬮檺);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index ea35527..f8bee57 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -243,20 +243,20 @@
<div class="layui-row">
<!--<div class="layui-col-xs6 layui-inline">
- <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">杈呮暟閲�</label>
<div class="layui-input-inline">
@@ -275,7 +275,12 @@
<input type="text" class="layui-input" name="HSplitColorQty" id="HSplitColorQty" style="float: left;" value="0">
</div>
</div>
-
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">妯＄┐鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="float: left;" value="">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs3 layui-inline">
@@ -2288,6 +2293,7 @@
, "HAuxQty2": data.杈呮暟閲�2
, "HAuxUnit2": data.HAuxUnit2
, "HAuxUnitName2": data.杈呭姪鍗曚綅2
+ , "HMouldNum": data.妯＄┐鍙�
, "HName": data.璁㈠崟绛夌骇
--
Gitblit v1.9.1