From 86adc14df69b6dd9856dff3d9c60d312aa718027 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 27 九月 2024 15:49:39 +0800
Subject: [PATCH] 设备点检记录单pda结果未勾选不允许保存, 取样单增加增加下拉框字段 送测类型 首件,实验,巡检 TestType varchar(50) 设备工艺参数趋势分析图,增加下拉框类型(手动输入,设备采集),人工输入:取设备工艺参数点检
---
WebTM/WebTM.csproj.user | 28 +++
WebTM/views/质量管理/质量报表/QC_SkillExamMonthSumReport.html | 19 +-
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 34 ++++
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 12 +
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html | 1
WebTM/views/质量管理/检验取样还样单/QC_Add_TakeSampleCheckBill.html | 20 ++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldLifeUseBillList.html | 4
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html | 8
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 6
WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html | 285 ++++++++++++++--------------------------
10 files changed, 203 insertions(+), 214 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 502622a..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -12,5 +12,29 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
- <ProjectExtensions />
+ <ProjectExtensions>
+ <VisualStudio>
+ <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+ <WebProjectProperties>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
+ <AspNetDebugging>True</AspNetDebugging>
+ <SilverlightDebugging>False</SilverlightDebugging>
+ <NativeDebugging>False</NativeDebugging>
+ <SQLDebugging>False</SQLDebugging>
+ <ExternalProgram>
+ </ExternalProgram>
+ <StartExternalURL>
+ </StartExternalURL>
+ <StartCmdLineArguments>
+ </StartCmdLineArguments>
+ <StartWorkingDirectory>
+ </StartWorkingDirectory>
+ <EnableENC>True</EnableENC>
+ <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
+ </WebProjectProperties>
+ </FlavorProperties>
+ </VisualStudio>
+ </ProjectExtensions>
</Project>
\ 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html"
index d85c89f..73d3eb7 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html"
@@ -269,8 +269,8 @@
, { field: '閮ㄩ棬', title: '閮ㄩ棬', sort: true, width: 165 }
, { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', sort: true, width: 165, totalRow: true }
, { field: '鍘熷墿浣欏鍛�', title: '鍘熷墿浣欏鍛�', sort: true, width: 165, totalRow: true }
- , { field: '鏈鑰楃敤', title: '涓婃鑰楃敤', sort: true, width: 165, totalRow: true }
- , { field: '鏈鍓╀綑瀵垮懡', title: '涓婃鍓╀綑瀵垮懡', sort: true, width: 165, totalRow: true }
+ , { field: '鏈鑰楃敤', title: '鏈鑰楃敤', sort: true, width: 165, totalRow: true }
+ , { field: '鏈鍓╀綑瀵垮懡', title: '鏈鍓╀綑瀵垮懡', sort: true, width: 165, totalRow: true }
, { field: '璋冩暣鍘熷洜', title: '璋冩暣鍘熷洜', sort: true, width: 165 }
, { field: '鎽樿', title: '鎽樿', sort: true, width: 165 }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
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_MouldFile.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_MouldFile.html"
index b2ee8de..8eafd39 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_MouldFile.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_MouldFile.html"
@@ -410,6 +410,17 @@
</button>
</div>
</div>
+ <div class="layui-inline" style="margin-left:10px;">
+ <label class="layui-form-label">鍣ㄥ叿鍙敤鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HMouldUseStatus" lay-filter="HMouldUseStatus" id="HMouldUseStatus">
+ <option value="姝ｅ父" selected="selected">姝ｅ父</option>
+ <option value="寮傚父">寮傚父</option>
+ <option value="淇濆吇">淇濆吇</option>
+ <option value="缁翠慨">缁翠慨</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -1744,6 +1755,7 @@
$("#HNowSPID").val(d.data[0].褰撳墠浠撲綅ID);
$("#HNowSPName").val(d.data[0].褰撳墠浠撲綅);
$("#HMouldStatus").val(d.data[0].妯″叿鐘舵��);
+ $("#HMouldUseStatus").val(d.data[0].妯″叿鍙敤鐘舵��);
var HCycleUnit = d.data[0].鍛ㄦ湡鍗曚綅;
var HCheckCycle = d.data[0].淇濆吇鍛ㄦ湡;
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/Sc_Add_MouldMaintainPlanBillList.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/Sc_Add_MouldMaintainPlanBillList.html"
index ad76b61..4b0114d 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/Sc_Add_MouldMaintainPlanBillList.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/Sc_Add_MouldMaintainPlanBillList.html"
@@ -496,7 +496,28 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
- var sMainSub = sMainStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"] + ";" + sSubStr;
+ var num = [];
+ if (OperationType==3) {
+ //鑾峰彇瀛愯〃鏁版嵁
+ for (var i = 0; i < table.cache["mainTable_plan"].length; i++) {
+ if (table.cache["mainTable_plan"][i] != "") {
+ table.cache["mainTable_plan"][i].LAY_TABLE_INDEX = i;
+ if (table.cache["mainTable_plan"][i].HRelationFlag == "鏈偣妫�") {
+ table.cache["mainTable_plan"][i].HRelationFlag = false
+ } else {
+ table.cache["mainTable_plan"][i].HRelationFlag = true
+ }
+ if (table.cache["mainTable_plan"][i].HSendFlag == "鏈彂閫�") {
+ table.cache["mainTable_plan"][i].HSendFlag = false
+ } else {
+ table.cache["mainTable_plan"][i].HSendFlag = true
+ }
+ num.push(table.cache["mainTable_plan"][i])
+ }
+ }
+ }
+ var sSubStr2 = JSON.stringify(num);
+ var sMainSub = sMainStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"] + ";" + sSubStr + ";" +sSubStr2;
if (AllowLoadData(sSubStr1)) {
$.ajax(
{
@@ -515,13 +536,12 @@
}
else {
layer.alert(data.Message, { icon: 5 });
- //console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
layer.closeAll("loading");
},
error: function (err) {
layer.alert("閿欒:" + err, { icon: 5 });
- //console.log("Reason" + sMainStr);
+
}
});
}
@@ -593,6 +613,7 @@
, page: false
, totalRow: true
, cellMinWidth: 120
+ , limit: 500
, height: 500
, cols: [columns]
, done: function (res, curr, count) {
@@ -623,6 +644,7 @@
, totalRow: true
, page: false
, cellMinWidth: 120
+ , limit: 500
, height: 500
, cols: [columns]
, done: function (res, curr, count) {
@@ -646,9 +668,9 @@
, { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
, { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
, { field: 'HSendFlag', title: '鍙戦�佹爣璁�' }
- , { field: 'HErrBeginQty', title: '棰勮寮�濮嬫鏁�' }
- , { field: 'HUseNowQty', title: '褰撳墠浣跨敤娆℃暟' }
- , { field: 'HUseEndQty', title: '缁撴潫浣跨敤娆℃暟' }
+ , { field: 'HErrBeginQty', edit: 'text', title: '棰勮寮�濮嬫鏁�' }
+ , { field: 'HUseNowQty', edit: 'text', title: '褰撳墠浣跨敤娆℃暟' }
+ , { field: 'HUseEndQty', edit: 'text', title: '缁撴潫浣跨敤娆℃暟' }
];
option_plan = {
id: 'mainTable_plan'
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/Sc_MouldMaintainRuleBillEdit.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/Sc_MouldMaintainRuleBillEdit.html"
index 5d58e4d..f28cb72 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/Sc_MouldMaintainRuleBillEdit.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/Sc_MouldMaintainRuleBillEdit.html"
@@ -452,6 +452,7 @@
, totalRow: true
, page: false
, cellMinWidth: 120
+ , limit: 500
, height: 500
, cols: [columns]
, done: function (res, curr, count) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index c0ab9c1..c2ba757 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -856,10 +856,12 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- else {
- return true;
- }
+ if (sSubStr[i].HDotCheckResult != true) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁撴灉淇℃伅涓哄嬀閫�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
}
+ return true;
}
else {
return true;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index f77c1dc..b9c55dc 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -1292,9 +1292,9 @@
return item;
});
- layui.table.reload('mainTable', {
- data: updatedData
- });
+ //layui.table.reload('mainTable', {
+ // data: updatedData
+ //});
// 鍙栨秷缂栬緫鐘舵��
cell.removeAttr('contenteditable');
//鍙栨秷鍐掓场
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
index 3839f0b..f6bc5cd 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
@@ -264,13 +264,18 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎶ュ簾鍐呭</label>
- <div class="layui-input-inline" style="width:300px;height:15px">
- <textarea placeholder="璇疯緭鍏ユ姤搴熷唴瀹�" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
+ <label class="layui-form-label">閫佹祴绫诲瀷:</label>
+ <div class="layui-input-inline">
+ <select name="TestType" lay-filter="TestType" id="TestType">
+ <option value="棣栨">棣栨</option>
+ <option value="宸℃">宸℃</option>
+ <option value="鏈">鏈</option>
+ <option value="瀹為獙">瀹為獙</option>
+ </select>
</div>
</div>
</div>
- <div class="layui-form-item">
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">浜у搧鍗曢噸1:</label>
<div class="layui-input-inline">
@@ -287,6 +292,12 @@
<label class="layui-form-label">浜у搧鍗曢噸3:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HProdWeight3" lay-verify="HProdWeight3" id="HProdWeight3" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎶ュ簾鍐呭</label>
+ <div class="layui-input-inline" style="width:300px;height:15px">
+ <textarea placeholder="璇疯緭鍏ユ姤搴熷唴瀹�" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
</div>
</div>
</div>
@@ -626,6 +637,7 @@
, "HProdWeight1": data[0]["浜у搧鍗曢噸1"] //浜у搧鍗曢噸1
, "HProdWeight2": data[0]["浜у搧鍗曢噸2"] //浜у搧鍗曢噸2
, "HProdWeight3": data[0]["浜у搧鍗曢噸3"] //浜у搧鍗曢噸3
+ , "TestType": data[0]["閫佹祴绫诲瀷"] //閫佹祴绫诲瀷
, "HGroupID": data[0]["HGroupID"] //鐝粍ID
, "HGroupName": data[0]["鐢熶骇鐝粍"] //鐝粍鍚嶇О
, "HShiftsID": data[0]["HShiftsID"] //鐝ID
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_EquipMentCollectionTechParam.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_EquipMentCollectionTechParam.html"
index 77749c2..8a23004 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_EquipMentCollectionTechParam.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_EquipMentCollectionTechParam.html"
@@ -55,7 +55,15 @@
</button>
</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="HEquipType" id="HEquipType" class=" ForFilteringSchemes" lay-verify="HEquipType">
+ <option value="鎵嬪姩杈撳叆">鎵嬪姩杈撳叆</option>
+ <option value="璁惧閲囬泦">璁惧閲囬泦</option>
+ </select>
+ </div>
+ </div>
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓鍙傛暟</label>
@@ -82,92 +90,6 @@
<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>
-
- </div>
-
-
- <div class="layui-colla-content" style="padding: 0px; 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>
- </div>
- </div>
- <div class="layui-inline">
- <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="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <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="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" 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="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <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="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" 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="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
</div>
</div>
</div>
@@ -319,7 +241,7 @@
url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_EquipMentCollectionTechParamList',
type: "GET",
async:false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -388,98 +310,18 @@
var HProcName = $("#HProcName").val();
var HTechParamName = $("#HTechParamName").val();
var HDate = $("#HDate").val(); //寮�濮嬫棩鏈�
- var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
-
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+ var HEquipType = $("#HEquipType").val();
+
+ if (HEquipNumber != "" || HTechParamName != "") {
+ sWhere = {
+ HEquipNumber: HEquipNumber
+ , HTechParamName: HTechParamName
+ , HDate: HDate
+ , HDate1: HDate1
+ , HEquipType: HEquipType
}
- sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
-
-
- if (HEquipNumber) {
- sWhere += " and 璁惧缂栫爜 = '" + HEquipNumber + "'";
- }
- if (HTechParamName) {
- sWhere += " and 宸ヨ壓浜ф暟 = '" + HTechParamName + "'";
- }
- if (HDate) {
- sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) <= '" + HDate1 + "'";
- }
- if (HEquipNumber != "" || HTechParamName!="") {
- get_Display(sWhere);
+ get_Display(JSON.stringify(sWhere));
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -519,16 +361,25 @@
//鎶樼嚎鍥剧粦瀹氭暟鎹�
var H_X = [];//X杞存爣棰�
- var HVaule = [];//瀹為檯鍊�
+ var HVaule = [];//瀹為檯鍊�
+ var HStd = [];//鏍囧噯鍊�
+ var HMax = [];//涓婄嚎鍊�
+ var HMin = [];//涓嬮檺鍊�
var HTitle = "璁惧宸ヨ壓鍙傛暟瓒嬪娍鍒嗘瀽鍥�";//鍥惧舰鏍囬
if (option.data.length > 0) {
for (let i = 0; i < option.data.length ; i++) {
H_X.push(option.data[i].閲囬泦鏃ユ湡);
}
// 濉厖鏁版嵁
- for (let i = 0; i < option.data.length; i++) {
-
- HVaule.push(option.data[i].鏁伴噰鍊�);
+ for (let i = 0; i < option.data.length; i++) {
+ if ($("#HEquipType").val() == "鎵嬪姩杈撳叆") {
+ HMax.push(option.data[i].涓婇檺鍊�);
+ HMin.push(option.data[i].涓嬮檺鍊�);
+ HStd.push(option.data[i].鏍囧噯鍊�);
+ HVaule.push(option.data[i].瀹為檯鍊�);
+ } else {
+ HVaule.push(option.data[i].鏁伴噰鍊�);
+ }
}
}
@@ -545,7 +396,7 @@
trigger: 'axis'
},
legend: {
- data: ['鏁伴噰鍊�'],
+ data: ['鏁伴噰鍊�', '涓婇檺鍊�', '涓嬮檺鍊�', '鏍囧噯鍊�'],
top: 'bottom',
left: 'center'
},
@@ -591,6 +442,72 @@
}
},
data: HVaule
+ },
+ {
+ name: '涓婇檺鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'red' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'red' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HMax
+ },
+ {
+ name: '涓嬮檺鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'red' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'red' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HMin
+ },
+ {
+ name: '鏍囧噯鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'green' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HStd
}
]
};
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_SkillExamMonthSumReport.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_SkillExamMonthSumReport.html"
index ad3ba45..3df14e2 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_SkillExamMonthSumReport.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_SkillExamMonthSumReport.html"
@@ -51,14 +51,7 @@
</button>
</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>
- </div>
- </div>-->
+
<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>
@@ -766,7 +759,10 @@
type: 'bar',
barWidth: 30,
barGap: 0,
- label: labelOption,
+ label: {
+ ...labelOption,
+ color: '#0066CC' // 璁剧疆鏍囩棰滆壊涓鸿摑鑹�
+ },
emphasis: {
focus: 'series'
},
@@ -785,7 +781,10 @@
type: 'line',
barWidth: 10,
barGap: 0,
- label: labelOption1,
+ label: {
+ ...labelOption,
+ color: '#FF0000' // 璁剧疆鏍囩棰滆壊涓鸿摑鑹�
+ },
emphasis: {
focus: 'series'
},
--
Gitblit v1.9.1