MES-WEB-LayUI.git

			@@ -46,7 +46,7 @@
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-inline" style="display:none">
			<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>
			@@ -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>
			@@ -67,101 +75,21 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HDate1" style="width:190px;">
			</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>


			<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>
			@@ -273,6 +201,7 @@
			// åå§åçé¢
			function set_ClearBill() {
			$("#HDate").val(Format(new Date, "yyyy-MM-dd"));
			$("#HDate1").val(Format(new Date, "yyyy-MM-dd"));
			set_InitGrid(); //åå§åè¡¨æ ¼
			get_FastQuery();
			////å è½½æçº¿å¾
			@@ -293,14 +222,10 @@
			, 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 }

			]]
			};
			@@ -313,10 +238,10 @@
			var ajaxLoad = layer.load();
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/QC_CustomerAppealReport/SB_EquipICMOTechParamList',
			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 = [];
			@@ -378,101 +303,31 @@
			});
			layer.close(index);
			}

			//å¿«éæ¥è¯¢
			function get_FastQuery() {
			var HEquipNumber = $("#HEquipNumber").val();
			var HEquipName = $("#HEquipName").val();
			var HProcName = $("#HProcName").val();
			var HTechParamName = $("#HTechParamName").val();
			var HDate = $("#HDate").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 (HEquipNumber != "" && HEquipName != "" && HProcName != "" && HTechParamName != "") {
			var HDate = $("#HDate").val(); //å¼å§æ¥æ
			var HDate1 = $("#HDate1").val();//ç»ææ¥æ
			var HEquipType = $("#HEquipType").val();

			if (HEquipNumber != "" \|\| HTechParamName != "") {
			sWhere = {
			HEquipNumber: HEquipNumber
			, HEquipName: HEquipName
			, HProcName: HProcName
			, HTechParamName: HTechParamName
			, HDate: HDate
			, HDate1: HDate1
			, HEquipType: HEquipType
			}
			get_Display(JSON.stringify(sWhere));
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			}

			//éç½®å¿«éæ¥è¯¢
			function set_ClearQuery() {
			$("#HEquipNumber").val("");
			@@ -495,6 +350,7 @@

			sWhere = "";
			}

			//å·æ°
			function get_Refresh() {
			$("#btnSearch").trigger('click');
			@@ -508,18 +364,37 @@

			//æçº¿å¾ç»å®æ°æ®
			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].æ°éå¼);
			HMax.push(option.data[i].ä¸éå¼);
			HMin.push(option.data[i].ä¸éå¼);
			HStd.push(option.data[i].æ åå¼);
			}
			}
			}

			var minValue = Math.min(...HVaule) - 10; //æçº¿çæå¤§å¼
			var maxValue = Math.max(...HVaule) + 10; //æçº¿çæå°å¼
			var interval = Math.floor((maxValue - minValue) / 10); //æ¾ç¤ºæçº¿çé´é
			minValue = Number(minValue.toFixed(2)); // ä¿çä¸¤ä½å°æ°å¹¶è½¬æ¢ä¸ºæ°å
			minValue = Number(minValue.toFixed(2)); // ä¿çä¸¤ä½å°æ°å¹¶è½¬æ¢ä¸ºæ°å

			option_ZZT = {
			title: {
			text: HTitle,
			@@ -529,7 +404,7 @@
			trigger: 'axis'
			},
			legend: {
			data: ['æ°éå¼'],
			data: ['æ°éå¼', 'ä¸éå¼', 'ä¸éå¼', 'æ åå¼'],
			top: 'bottom',
			left: 'center'
			},
			@@ -555,7 +430,10 @@
			],
			yAxis: [
			{
			type: 'value'
			type: 'value',
			min: minValue,
			max: maxValue,
			interval: interval
			}
			],
			series: [
			@@ -572,6 +450,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
			}
			]
			};
			@@ -603,7 +547,7 @@
			}
			//#endregion

			//å·¥åºæµè½¬å¡å¼¹çª
			//è®¾å¤å¼¹çª
			form.on('submit(btnHEquip)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			@@ -627,7 +571,6 @@
			$("#HEquipNumber").val(checkStatus.data[0].è®¾å¤ç¼ç );
			$("#HEquipName").val(checkStatus.data[0].è®¾å¤åç§°);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_EquipList();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -681,6 +624,7 @@

			//å·¥èºåæ°
			form.on('submit(btnHTechParam)', function () {
			var HEquipNumber = $("#HEquipNumber").val();
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -690,7 +634,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterList.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterList.html?type=HTechParam&OperationType=2&HEquipNumber=' + HEquipNumber + '', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {