MES-WEB-LayUI.git

			@@ -39,7 +39,7 @@
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-inline" style="display:none">
			<label class="layui-form-label">è½¦é´</label>
			<div class="layui-input-block" style="width: 190px;">
			<select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
			@@ -90,90 +90,7 @@
			</select>
			</div>
			</div>
			</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>
			</div>
			<div>
			@@ -410,81 +327,6 @@
			var HMaterName = $("#HMaterName").val();//ç©æåç§°
			var HBatchWork = $("#HBatchWork").val();//æ¯å¦éäº§
			var HDivisionName = $("#HDivisionName").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;
			}

			sWhere = {
			HYear: HYear
			@@ -511,16 +353,7 @@
			$("#HBatchWork").val("");
			$("#HDivisionName").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");
			$("#btnSearch").click();
			form.render('select');

			sWhere = "";
			@@ -643,15 +476,15 @@
			},
			itemStyle: {
			normal: {
			color: '#808080', // ä¿®æ£ä½ç½®ï¼å°é¢è²è®¾ç½®å¨è¿é
			label: {
			show: true, //å¼å¯æ¾ç¤º
			textStyle: { //æ°å¼æ ·å¼
			show: true,
			textStyle: {
			color: 'black',
			fontSize: 16
			}
			}
			},
			color: '#1E90FF' // è®¾ç½®æ±ç¶å¾èè²
			}
			},
			data: HBackWorkQty
			},
			@@ -665,25 +498,25 @@
			tooltip: {
			valueFormatter: function (value) {
			return value;
			}
			}
			},
			itemStyle: {
			normal: {
			color: '#FF0000', // ä¿®æ£ä½ç½®ï¼å°é¢è²è®¾ç½®å¨è¿é
			label: {
			show: true, //å¼å¯æ¾ç¤º
			textStyle: { //æ°å¼æ ·å¼
			show: true,
			textStyle: {
			color: 'black',
			fontSize: 16
			}
			}
			},
			color: '#FFFF00' // è®¾ç½®æ±ç¶å¾é»è²
			}
			},
			data: HWasterQty_Work
			},
			{
			name: 'æåº',
			type: 'bar',
			type: 'bar',
			stack: 'Ad',
			emphasis: {
			focus: 'series'
			@@ -695,15 +528,15 @@
			},
			itemStyle: {
			normal: {
			color: '#FFFF00', // ä¿®æ£ä½ç½®ï¼å°é¢è²è®¾ç½®å¨è¿é
			label: {
			show: true, //å¼å¯æ¾ç¤º
			textStyle: { //æ°å¼æ ·å¼
			show: true,
			textStyle: {
			color: 'black',
			fontSize: 16
			}
			}
			},
			color: '#FF8C00' // è®¾ç½®æ±ç¶å¾æ©è²
			}
			},
			data: HWasterQty_Mater
			},