From 371cda9c766a25362200306c6642822fbafb5e6d Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期一, 12 八月 2024 08:51:56 +0800 Subject: [PATCH] 增加工艺参数大类分析报表方法,新增字段 HTechParamClassID int //工艺参数大类(Gy_TechnologyParameterClass) HSNO int //工艺次序 HStdNextTimes money //理论次序间隔 HTechParamIDStd int //对应设定值工艺参数(Gy_TechnologyParameter) --- WebTM/WebTM.csproj.user | 2 WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 28 + WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html | 10 WebTM/views/质量管理/质量报表/QC_TechnologyParameterClass.html | 956 +++++++++++++++++++++++++++++++++++++++++++++++++++++ WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 33 + WebTM/WebTM.csproj | 1 6 files changed, 1,014 insertions(+), 16 deletions(-) diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj index 9055d58..850d4f9 100644 --- a/WebTM/WebTM.csproj +++ b/WebTM/WebTM.csproj @@ -465,6 +465,7 @@ <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_RegistrationForTestingReport.html" /> <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_MoistureContentDataLedger.html" /> <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" /> + <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_TechnologyParameterClass.html" /> <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\SB_TechnologyParameterList.html" /> <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_ProcessPerformanceFirstPass.html" /> <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\Sc_StationOutBil_HProc.html" /> diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user index e39639b..005e8c8 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>Debug|Any CPU</LastActiveSolutionConfig> + <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html" index 6b745b2..646bc95 100644 --- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html" +++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html" @@ -674,7 +674,30 @@ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' } ]] } - option.data = []; + var rowdata = [ + { + "HTechParamID": 0, + "HTechParamNumber": "", + "HTechParamName": "", + "HTechParamUnitID": 0, + "HTechParamUnitName": "", + "HStd": "0", + "HMax": "0", + "HMin": "0", + "HDataForm": "璁惧閲囬泦", + "HDataUnit": "绉�", + "HDataTimes": "0", + "HTechParamClassID": "0", + "HSNO": "0", + "HStdNextTimes": "0", + "HTechParamIDStd": "0", + "HSourceBillNo": "0", + "HSourceBillType": "0", + "HSourceEntryID": "0", + "HSourceInterID": "0" + } + ]; + option.data = rowdata; table.render(option); } @@ -939,7 +962,8 @@ return layer.msg('璇烽�夋嫨鏁版嵁'); } - table.cache["mainTable"].splice(0, 1); + // table.cache["mainTable"].splice(0, 1); + table.cache["mainTable"] = table.cache["mainTable"].filter(row => row.HTechParamID !== 0 && row.HTechParamID !== undefined); for (var rowData of checkStatus.data) { var NewRow = { "HTechParamID": rowData.HItemID, 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 aaa6ef8..2bd5a84 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" @@ -556,29 +556,42 @@ , cols: [[ { type: 'checkbox', totalRowText: '鍚堣琛�' } , { type: 'numbers', title: '搴忓彿', width: 100 } + , { field: 'HTechParamClassID', title: '宸ヨ壓鍙傛暟澶х被', width: 100 ,hide: true,} + , { field: 'HTechParamClassName', title: '宸ヨ壓鍙傛暟鍚嶇О', width: 120, style: 'background-color:#efefef4d;' } , { field: 'HTechParamID', title: 'HTechParamID', width: 100, hide: true, style: 'background-color:#efefef4d;' } , { field: 'HTechParamNumber', title: '宸ヨ壓鍙傛暟浠g爜', width: 110, edit: 'text', event: "HTechParamNumber" } //F7 - , { field: 'HTechParamName', title: '宸ヨ壓鍙傛暟鍚嶇О', width: 110, style: 'background-color:#efefef4d;' } + , { field: 'HTechParamName', title: '宸ヨ壓鍙傛暟鍚嶇О', width: 110, style: 'background-color:#efefef4d;' } , { field: 'HTechParamUnitID', title: 'HTechParamUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' } , { field: 'HTechParamUnitNumber', title: '宸ヨ壓鍙傛暟鍗曚綅浠g爜', width: 130, edit: 'text', event: "HTechParamUnitNumber" } //F7 , { field: 'HTechParamUnitName', title: '宸ヨ壓鍙傛暟鍗曚綅鍚嶇О', width: 130, style: 'background-color:#efefef4d;' } + , { field: 'HSNO', title: '宸ヨ壓娆″簭', width: 110, style: 'background-color:#efefef4d;' } + , { field: 'HTechParamIDStd', title: 'HTechParamIDStd', width: 100, hide: true, style: 'background-color:#efefef4d;' } + , { field: 'HTechParamIDStdName', title: '璁惧璁惧畾鍊煎伐鑹哄弬鏁�', width: 130, edit: 'text', event: "HTechParamIDStdName" } + , { field: 'HResultStd', title: '璁惧璁惧畾鍊�', width: 130, edit: 'text' } , { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: 'text' } , { field: 'HStd', title: '鏍囧噯鍊�', width: 100, edit: 'text' } , { field: 'HMax', title: '涓婇檺', width: 100, edit: 'text' } , { field: 'HMin', title: '涓嬮檺', width: 100, edit: 'text' } - , { field: 'HResult', title: '妫�娴嬬粨鏋�', width: 100, templet: "#HResult" } + , { field: 'HResult', title: '妫�娴嬬粨鏋�', width: 100, templet: "#HResult" } , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' } , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 } ]] } var rowdata = [{ - "HTechParamID": "0" + + "HTechParamClassID": "0" + , "HTechParamClassName": "" + , "HTechParamID": "0" , "HTechParamNumber": "" , "HTechParamName": "" + ,"HSNO":"0" , "HTechParamUnitID": "0" , "HTechParamUnitNumber": "" , "HTechParamUnitName": "" + , "HTechParamIDStd": "0" + , "HTechParamIDStdName": "" + ,"HResultStd":"" , "HVaule": "" , "HStd": "" , "HMax": "" @@ -892,12 +905,18 @@ , data = checkStatus.data; //鏂板琛岃〃鏍兼暟鎹� var NewRow = { - "HTechParamID": "0" + "HTechParamClassID": "0" + , "HTechParamClassName": "" + , "HTechParamID": "0" , "HTechParamNumber": "" , "HTechParamName": "" + , "HSNO": "0" , "HTechParamUnitID": "0" , "HTechParamUnitNumber": "" , "HTechParamUnitName": "" + , "HTechParamIDStd": "0" + , "HTechParamIDStdName": "" + , "HResultStd": "" , "HVaule": "" , "HStd": "" , "HMax": "" @@ -1363,12 +1382,18 @@ for (var i = 0; i < result.data.length; i++) { rowdata.push( { + "HTechParamClassID": result.data[i]["HTechParamClassID"], + "HTechParamClassName": result.data[i]["宸ヨ壓鍙傛暟澶х被鍚嶇О"], "HTechParamID": result.data[i]["HTechParamID"], "HTechParamNumber": result.data[i]["宸ヨ壓鍙傛暟浠g爜"], "HTechParamName": result.data[i]["宸ヨ壓鍙傛暟鍚嶇О"], "HTechParamUnitID": result.data[i]["HTechParamUnitID"], "HTechParamUnitNumber": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅浠g爜"], "HTechParamUnitName": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅鍚嶇О"], + "HSNO": result.data[i]["宸ヨ壓娆″簭"], + "HTechParamIDStd": result.data[i]["HTechParamIDStd"], + "HTechParamIDStdName": result.data[i]["瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�"], + "HResultStd": "", "HVaule": "", "HStd": result.data[i]["鏍囧噯鍊�"], "HMax": result.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_TechnologyParameterClass.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_TechnologyParameterClass.html" new file mode 100644 index 0000000..c075202 --- /dev/null +++ "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_TechnologyParameterClass.html" @@ -0,0 +1,956 @@ +锘�<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>宸ヨ壓鍙傛暟澶х被鍒嗘瀽鎶ヨ〃</title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all"> + <script src="../../../layuiadmin/layui/layui.js"></script> + <script src="../../../layuiadmin/HideButton.js"></script> + <script src="../../../layuiadmin/PubCustom.js"></script> + <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script> + <script src="../../../layuiadmin/Scripts/json2.js"></script> + <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> + <script src="../../../layuiadmin/Scripts/webConfig.js"></script> + <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script> + +</head> +<body> + <div class="layui-fluid"> + <div class="layui-col-md12"> + <div class="layui-card" style="padding: 1px"> + <div class="layui-card-body" style="padding: 1px;"> + <form class="layui-form" action="" lay-filter="component-form-group"> + <div class="layui-collapse"> + <div class="layui-colla-item"> + <div class="layui-colla-title layui-inline"> + <div class="layui-inline"> + <span>鏇村</span> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭娴佽浆鍗�</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" lay-verify="HProcExchBillNo" name="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcExch" id="btnHProcExch" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 75%; display: inline-block;" readonly> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓鍙傛暟澶х被</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" lay-verify="HTechParamName" name="HTechParamName" id="HTechParamName" value="" style="background-color: #efefef4d; width: 75%; display: inline-block;" readonly> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHTechParam" id="btnHTechParam" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;"> + <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 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" style="width: 85px;">鐗╂枡鍚嶇О</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HMaterName" id="HMaterName" readonly> + </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" name="HEquipName" id="HEquipName" value="" readonly> + </div> + </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="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> + <div> + <div style="width:99%;height:calc(100vh);"> + <table class="" id="mainTable" lay-filter="mainTable"></table> + </div> + <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;"> + </div> + </div> + <script type="text/html" id="toolbarDemo"> + <div class="layui-btn-container"> + <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button> + <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button> + </div> + </script> + + </form> + </div> + </div> + </div> + </div> + + <script> + layui.config({ + base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� + }).extend({ + index: 'lib/index', //涓诲叆鍙fā鍧� + }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () { + //#region 鍏叡鍙橀噺 + var $ = layui.$ + , admin = layui.admin + , layer = layui.layer + , table = layui.table + , form = layui.form + , element = layui.element + , laypage = layui.laypage + , laydate = layui.laydate + //鏌ヨ鏉′欢 + var sWhere = ""; + var option = []; + var HModName = "SB_TechnologyParameterList"; + //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� + var titleData = ["骞�", "鏈�", "宸ュ簭"]; + + + var ins; //鐢ㄤ簬瀵煎嚭excel + //#endregion + + //#region 杩涘叆椤甸潰鏃㈠姞杞� + //鍒濆鍖栫晫闈� + set_ClearBill(); + //#endregion + + //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� + //澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(mainTable)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id); + switch (obj.event) { + //鍒锋柊 + case 'get_Refresh': get_Refresh(); + break; + //閫�鍑烘寜閽� + case 'get_Exit': Pub_Close(2); + break; + //瀵煎嚭excel + case 'get_export': + get_Export(); + break; + //鍒楄缃� + case 'set_HideColumn': get_HideColumn(); + break; + }; + }); + //鏌ヨ鎸夐挳 + form.on('submit(btnSearch)', function (data) { + get_FastQuery(); + }); + // 閲嶇疆鎸夐挳 + form.on('submit(btnReSearch)', function (data) { + set_ClearQuery(); + }); + //#endregion + + //#region 鐐瑰嚮琛岄�変腑楂樹寒 + table.on('row(mainTable)', function (obj) { + //閫変腑琛屾敼鍙橀鑹� + var flag = !obj.tr.find(':checkbox:first').prop('checked'); + obj.tr.find(':checkbox').prop('checked', flag); + if (flag) { + obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡 + $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹� + } else { + obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡 + $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊 + } + //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊 + layui.each(table.cache.mainTable, function (i, l) { + if (obj.tr.index() == l.LAY_TABLE_INDEX) { + l.LAY_CHECKED = flag; + } + }); + }) + //#endregion + + //#region 姝ら〉闈㈡墍鏈夋柟娉� + // 鍒濆鍖栫晫闈� + function set_ClearBill() { + set_InitGrid(); //鍒濆鍖栬〃鏍� + get_FastQuery(); + ////鍔犺浇鎶樼嚎鍥� + set_Graphics(); + + } + //鍒濆鍖栬〃鏍� + function set_InitGrid() { + option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + , totalRow: true + , height: 'full-50' + , page: true + , cellMinWidth: 90 + , limit: 50 + , data: [] + , limits: [50, 500, 5000, 20000] + , cols: [[ + { type: 'checkbox', totalRowText: '鍚堣琛�' } + , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true } + , { field: '璁惧缂栫爜', title: '璁惧缂栫爜', sort: true } + , { field: '宸ヨ壓鍙傛暟澶х被', title: '宸ヨ壓鍙傛暟澶х被', sort: true } + , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟', sort: true } + , { field: '鍗曚綅 ', title: '鍗曚綅 ', sort: true } + , { field: '宸ヨ壓娆″簭', title: '宸ヨ壓娆″簭', sort: true } + , { field: '涓婇檺鍊�', title: '涓婇檺鍊�', sort: true } + , { field: '鏍囧噯鍊�', title: '鏍囧噯鍊�', sort: true } + , { field: '涓嬮檺鍊�', title: '涓嬮檺鍊�', sort: true } + , { field: '瀹為檯鍊�', title: '瀹為檯鍊�', sort: true } + + ]] + }; + table.render(option) + } + + //鏌ヨ + function get_Display(sWhere) { + var index = layer.load(0, { shade: false }); + var ajaxLoad = layer.load(); + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + $.ajax({ + url: GetWEBURL() + '/QC_CustomerAppealReport/GtetQc_TechnologyParameterClassList', + type: "GET", + async:false, + data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, + success: function (data1) { + if (data1.count == 1) { + var data = []; + var col = []; + //缁欑┖鐨勬暟缁勮祴鍊� + for (var key in data1.list) { + data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType }); + } + //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋 + col.push({ type: 'checkbox', fixed: 'left' }); + for (var i = 0; i < data.length; i++) { + if ($.inArray(data[i].name, titleData) > -1) { + col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� + } + else { + switch (data[i].Type) { + case 'DateTime': + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 }); + break; + default: + col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 }); + } + } + } + + //鍔ㄦ�佹樉绀哄垪鍚� + option = { + elem: '#mainTable' + , toolbar: '#toolbarDemo' + , cols: [col] + , data: data1.data + , height: 'full-80' + , page: true + , limits: [50, 500, 5000, 50000] + , limit: 50 + , cellMinWidth: 90 + } + ins = table.render(option); + + //鍒锋柊琛ㄦ牸鏁版嵁 + DisPlay_HideColumn(); + //鍔犺浇鎶樼嚎鍥� + set_Graphics(); + + layer.close(ajaxLoad); + if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") { + ColFilter(); + } + + } else { + layer.close(ajaxLoad); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + layer.close(index); + } + //蹇�熸煡璇� + function get_FastQuery() { + var HProcExchBillNo = $("#HProcExchBillNo").val(); + var HProcName = $("#HProcName").val(); + var HTechParamName = $("#HTechParamName").val(); + var HEquipName = $("#HEquipName").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; + } + 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 (HProcExchBillNo != "" && HProcName != "" && HTechParamName != "") { + sWhere = { + HProcExchBillNo: HProcExchBillNo + , HProcName: HProcName + , HTechParamName: HTechParamName + , HEquipName: HEquipName + } + get_Display(JSON.stringify(sWhere)); + sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 + } + + } + //閲嶇疆蹇�熸煡璇� + function set_ClearQuery() { + $("#HProcExchBillNo").val(); + $("#HProcName").val(); + $("#HTechParamName").val(); + $("#HMaterName").val(); + $("#HEquipName").val(); + + $("#btnSearch").click(); + $("#ColContent").val(""); + $("#ColName").val("0"); + $("#Comparator").val("0"); + $("#ColContent2").val(""); + $("#ColName2").val("0"); + $("#Comparator2").val("0"); + $("#ColContent1").val(""); + $("#ColName1").val("0"); + $("#Comparator1").val("0"); + form.render('select'); + + sWhere = ""; + } + //鍒锋柊 + function get_Refresh() { + $("#btnSearch").trigger('click'); + } + + //#region 銆愭姌绾垮浘銆� + function set_Graphics() { + var chartDom = document.getElementById('histogram'); + var myChart = echarts.init(chartDom); + var option_ZZT; + + //鎶樼嚎鍥剧粦瀹氭暟鎹� + var H_X = [];//X杞存爣棰� + 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].瀹為檯鍊�); + HMax.push( option.data[i].涓婇檺鍊�); + HMin.push(option.data[i].涓嬮檺鍊�); + HStd.push(option.data[i].鏍囧噯鍊�); + } + } + option_ZZT = { + title: { + text: HTitle, + left: 'center' + }, + tooltip: { + trigger: 'axis' + }, + legend: { + data: ['瀹為檯鍊�', '涓婇檺鍊�', '涓嬮檺鍊�','鏍囧噯鍊�'], + top: 'bottom', + left: 'center' + }, + toolbox: { + show: true, + orient: 'vertical', + left: 'right', + top: 'center', + feature: { + mark: { show: true }, + dataView: { show: true, readOnly: false }, + magicType: { show: true, type: ['line', 'bar', 'stack'] }, + restore: { show: true }, + saveAsImage: { show: true } + } + }, + xAxis: [ + { + type: 'category', + axisTick: { show: false }, + data: H_X + } + ], + yAxis: [ + { + type: 'value' + } + ], + series: [ + { + name: '瀹為檯鍊�', + type: 'line', + label: { + show: true, + formatter: '{c}' + }, + tooltip: { + valueFormatter: function (value) { + return value; + } + }, + 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 + } + ] + }; + + + option_ZZT && myChart.setOption(option_ZZT); + } + //#endregion + + //#region 瀵煎嚭Execel + function get_Export() { + var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel"; + + //閫昏緫瀹℃牳鏂规硶 + $.ajax({ + type: "GET", + url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] }, + success: function (result) { + if (result.count == 1) { + table.exportFile(ins.config.id, option.data, "xls"); + } else { + layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + //#endregion + + //宸ュ簭娴佽浆鍗″脊绐� + form.on('submit(btnHProcExch)', function () { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '宸ュ簭娴佽浆鍗″垪琛�', + closeBtn: 1, + shift: 2, + area: ['90%', '90%'], + maxmin: true, + content: ['../../../views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + $("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�); + $("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О); + $("#HProcName").val(checkStatus.data[0].褰撳墠宸ュ簭); + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + get_EquipList(); + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + }, + success: function (layero, index) { + + } + }); + }); + + //宸ュ簭 + form.on('submit(btnHProc)', function () { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '宸ュ簭鍒楄〃', + closeBtn: 1, + shift: 2, + area: ['90%', '90%'], + maxmin: true, + content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О); + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + }, + success: function (layero, index) { + + } + }); + }); + + //宸ヨ壓鍙傛暟 + form.on('submit(btnHTechParam)', function () { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '宸ュ簭鍒楄〃', + closeBtn: 1, + shift: 2, + area: ['90%', '90%'], + maxmin: true, + content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + $("#HTechParamName").val(checkStatus.data[0].宸ヨ壓鍙傛暟鍚嶇О); + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + }, + success: function (layero, index) { + + } + }); + }); + + //鏍规嵁娴佽浆鍗¤幏鍙栬澶囩偣妫�琛ㄧ殑 璁惧 + function get_EquipList() { + + var HProcExchBillNo = $("#HProcExchBillNo").val(); + $.ajax({ + url: GetWEBURL() + "/QC_CustomerAppealReport/Get_EquipList", + type: "GET", + async: false, + data: { "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"] }, + success: function (result) { + if (result.count == 1) { + var data = result.data; + $("#HEquipName").val(data[0]["HName"]); + + } else { + layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }, + error: function (err) { + layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }) + } + + + //#region 闅愯棌鍒楄缃� + function get_HideColumn() { + var colName = ""; + var contentUrl = ""; + for (var i = 1; i < option.cols[0].length; i++) { + colName += option.cols[0][i]["title"] + ","; + } + var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞 + var urlLen = urlStr.split('/'); + for (var i = 0; i < urlLen.length - 4; i++) { + contentUrl += "../"; + } + colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜 + + contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName; + + layer.open({ + type: 2 + , skin: "layui-layer-rim" //鍔犱笂杈规 + , title: "闅愯棌鍒楄缃�" //鏍囬 + , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡 + , shift: 2 //寮瑰嚭鍔ㄧ敾 + , area: ["50%", "90%"] //绐椾綋澶у皬 + , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀� + , content: [contentUrl, "yes"] + , btn: ["纭畾", "鍙栨秷"] + , btn1: function (index, laero) { + //鍒锋柊琛ㄦ牸鏁版嵁 + DisPlay_HideColumn(); + //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹� + layer.close(index);//鍏抽棴寮圭獥 + } + }) + } + //#endregion + + //#region 鏄剧ず鍒楁暟鎹� + function DisPlay_HideColumn() { + $.ajax({ + url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', + type: "GET", + async: false, + data: { "HModName": HModName, "user": sessionStorage["HUserName"] }, + success: function (data1) { + if (data1.data.length != 0) { + + var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁 + //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� + + dataCol = data1.data[0].HGridString.split(','); + + for (var i = 0; i < option.cols[0].length - 1; i++) { + var dataCols = dataCol[i].split('|'); + //闅愯棌鍒� + if (dataCols[1] == 1) { + option.cols[0][i + 1]["hide"] = true; + } + //璁剧疆鍒楀 + if (dataCols[3] > 0) { + option.cols[0][i + 1]["width"] = dataCols[3]; + } + //璁剧疆鍐呭瀛椾綋澶у皬 + if (data1.data[0].HFontSize != 0) { + option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;"; + } else { + option.cols[0][i + 1]["style"] = "font-size:100%"; + } + //璁剧疆鍒楀 + //if (data1.data[0].HColumnWidth != 0) { + // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;"; + //} else { + // option.cols[0][i + 1]["width"] = ""; + //} + //鏄剧ず鍒� + if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) { + option.cols[0][i + 1]["hide"] = false; + } + //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�) + switch (dataCols[2]) { + case "L": + option.cols[0][i + 1]["align"] = "left"; + break; + case "M": + option.cols[0][i + 1]["align"] = "center"; + break; + case "R": + option.cols[0][i + 1]["align"] = "right"; + break; + } + } + + //鍙栨秷鍐荤粨鍒� + for (var i = 1; i < option.cols[0].length - 1; i++) { + if (option.cols[0][i]["fixed"] != null) { + option.cols[0][i]["fixed"] = null; + } + else { + break; + } + } + //鍐荤粨鍒� + if (data1.data[0].HFixCols != 0) { + for (var i = 0; i < data1.data[0].HFixCols; i++) { + if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) { + data1.data[0].HFixCols += 1; + } + option.cols[0][i + 1]["fixed"] = "left"; + } + } + table.render(option); + } else { + table.render(option); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }) + } + //#endregion + + //#region 鍒楁槑鏄剧ず涓嬫媺妗� + function ColFilter() { + var Organization = '<option value="0" selected="selected" ></option>'; + for (var i = 1; i < option.cols[0].length; i++) { + if (option.cols[0][i].hide != true) { + Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>'; + } + } + $("#ColName").empty(); + $("#ColName").append(Organization); + $("#ColName1").empty(); + $("#ColName1").append(Organization); + $("#ColName2").empty(); + $("#ColName2").append(Organization); + form.render('select'); + } + //#endregion + + //浠ヤ笂鏄痩ayui妯″潡 + }); + </script> + +</body> +</html> \ No newline at end of file diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html" index e89f8ea..2df83ed 100644 --- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html" +++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html" @@ -465,15 +465,7 @@ } get_Display(JSON.stringify(sWhere)); sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 - } else { - layer.alert('璇烽�夋嫨 娴佽浆鍗�,宸ュ簭,宸ヨ壓鍙傛暟鍚�,鍦ㄧ偣鍑绘悳绱�', { - title: '鎻愮ず', - style: 'background-color: #f8f9fa; color: #333;' // 鑷畾涔夋牱寮� - }); - } - - - + } } //閲嶇疆蹇�熸煡璇� function set_ClearQuery() { -- Gitblit v1.9.1