MES-WEB-LayUI.git

			@@ -67,120 +67,36 @@
			<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="HEquipNumber" id="HEquipNumber" value="" 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 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="HMouldNumber" id="HMouldNumber" value="" 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="HMouldName" id="HMouldName" value="" readonly>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<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;">ç©æåç§°</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-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 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="HEquipNumber" id="HEquipNumber" value="" readonly>
			</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 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 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 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="HMouldNumber" id="HMouldNumber" value="" readonly>
			</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 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="HMouldName" id="HMouldName" value="" readonly>
			</div>
			</div>
			</div>
			@@ -406,80 +322,7 @@
			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 = {
			@@ -502,15 +345,7 @@
			$("#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 = "";
			@@ -535,6 +370,7 @@
			var HMin = [];//ä¸éå¼
			var HTitle = HTitle1;//ä¸»æ é¢
			var HTitles = HTitle2;//å¯æ é¢

			if (option.data.length > 0) {
			for (let i = 0; i < option.data.length ; i++) {
			H_X.push(option.data[i].å·¥èºæ¬¡åº);
			@@ -548,15 +384,29 @@
			HStd.push(option.data[i].æ åå¼);
			}
			}
			option_ZZT = {
			title: [{
			text: HTitle,
			left: 'center'
			}, {
			subtext: HTitles,
			const HMinNumbers = HMin.map(value => parseInt(value, 10));
			const HMaxNumbers = HMax.map(value => parseInt(value, 10));

			// è®¡ç®æå°å¼åæå¤§å¼
			const minValue = Math.min(...HMinNumbers);
			const maxValue = Math.max(...HMaxNumbers);
			option_ZZT = {
			title: {

			text: HTitles,
			left: 'center',
			top: '5%'
			}],
			textStyle: {
			color: 'black',
			fontSize: 18, // å¡å¿è®°ä½è®¾ç½®æåå¤§å°åªè½æ¯æ°å
			fontWeight: 'normal'
			},
			subtext: HTitle,
			subtextStyle: {
			color: 'black',
			fontSize: 18,
			fontWeight: 'normal'
			}
			},
			tooltip: {
			trigger: 'axis'
			},
			@@ -588,9 +438,9 @@
			yAxis: [
			{
			type: 'value',
			min: parseInt($("#HMin").val(), 10) - 10, // è®¾ç½®æå°å¼
			max: parseInt($("#HMax").val(), 10) + 10, // è®¾ç½®æå¤§å¼
			interval: Math.floor(((parseInt($("#HMax").val(), 10) + 10) - (parseInt($("#HMin").val(), 10) - 10))/10) // è®¾ç½®é´è·
			min: minValue - 10, // è®¾ç½®æå°å¼
			max: maxValue + 10, // è®¾ç½®æå¤§å¼
			interval: Math.floor(((maxValue + 10) - (minValue - 10)) / 10) // è®¾ç½®é´è·
			}
			],
			series: [