MES-WEB-LayUI.git

			@@ -117,6 +117,8 @@
			var DateClo = [];
			var ZHUData = [];
			var HModName = "Sb_EquipmentLoadReport";

			var HWorkTimeArr = [];
			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½
			@@ -160,6 +162,48 @@
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			});

			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èæ¯é¢è²ååä½é¢è²

			var HIsExist = true;
			//å¤ææéçäº§èµæºæ¯å¦å¨æ°ç»ä¸åå¨
			for (var i = 0; i < ZHUData.length; i++) {
			if (ZHUData[i].çäº§èµæº == obj.data.HSourceName) {
			for (let j = 0; j < HWorkTimeArr.length; j++) {
			if (HWorkTimeArr[j].çäº§èµæº.indexOf(obj.data.HSourceName) != -1 && i == 0) {
			HIsExist = false;
			break;
			}
			}
			if (HIsExist) {
			HWorkTimeArr.push(ZHUData[i])
			}
			}
			}
			//éæ°å è½½æ±ç¶å¾
			set_Graphics();
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			//ç§»é¤æ°æ®æ°æ®
			HWorkTimeArr = HWorkTimeArr.filter(item => item.çäº§èµæº != obj.data.HSourceName)
			//éæ°å è½½æ±ç¶å¾
			set_Graphics();
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			})

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³
			@@ -268,15 +312,73 @@
			var HXTitle = [];//Xè½´æ é¢åç§°
			var TimeCount = []; //å·¥æ¶æ°æ®
			var NumCount = 0;

			var HWorkTimeSum = [];
			var num = [];

			if (HWorkTimeArr.length > 0) {
			for (let i = 0; i < HWorkTimeArr.length; i++) {
			if (HWorkTimeSum.length == 0) {
			//HWorkTimeSum.push(HWorkTimeArr[i])
			HWorkTimeSum.push({ "HMasterDate": HWorkTimeArr[i].HMasterDate, "HTimeSum": Number(HWorkTimeArr[i].HTimeSum) })
			} else {
			for (let j = 1; j <= HWorkTimeSum.length; j++) {
			if (HWorkTimeSum[j - 1].HMasterDate.indexOf(HWorkTimeArr[i].HMasterDate) == -1) {
			if (j == HWorkTimeSum.length) {
			//HWorkTimeSum.push(HWorkTimeArr[i])
			HWorkTimeSum.push({ "HMasterDate": HWorkTimeArr[i].HMasterDate, "HTimeSum": Number(HWorkTimeArr[i].HTimeSum) })
			break;
			}
			} else {
			HWorkTimeSum[j - 1].HTimeSum = Number(HWorkTimeSum[j - 1].HTimeSum) + Number(HWorkTimeArr[i].HTimeSum);
			break;
			}
			}
			}
			}
			} else {
			for (let i = 0; i < ZHUData.length; i++) {
			if (HWorkTimeSum.length == 0) {
			//HWorkTimeSum.push(ZHUData[i])
			HWorkTimeSum.push({ "HMasterDate": ZHUData[i].HMasterDate, "HTimeSum": Number(ZHUData[i].HTimeSum) })
			} else {
			for (let j = 1; j <= HWorkTimeSum.length; j++) {
			if (HWorkTimeSum[j - 1].HMasterDate.indexOf(ZHUData[i].HMasterDate) == -1) {
			if (j == HWorkTimeSum.length) {
			//HWorkTimeSum.push(ZHUData[i])
			HWorkTimeSum.push({ "HMasterDate": ZHUData[i].HMasterDate, "HTimeSum": Number(ZHUData[i].HTimeSum) })
			break;
			}
			} else {
			HWorkTimeSum[j - 1].HTimeSum = Number(HWorkTimeSum[j - 1].HTimeSum) + Number(ZHUData[i].HTimeSum);
			//num.push({ "HMasterDate": ZHUData[i].HMasterDate, "HTimeSum": Number(HWorkTimeSum[j - 1].HTimeSum) + Number(ZHUData[i].HTimeSum) });
			break;
			}
			}
			}
			}
			}

			for (let i = 0; i < 14; i++) {

			HXTitle.push(DateClo[i]["title"]);
			if (ZHUData.length > NumCount) {
			TimeCount.push(ZHUData[NumCount]['HTimeSum']);

			if (HWorkTimeSum.length > NumCount) {
			TimeCount.push(HWorkTimeSum[NumCount]['HTimeSum']);
			NumCount += 1;
			} else {
			TimeCount.push(0);
			}

			//if (ZHUData.length > NumCount && HWorkTimeArr.length == 0) {
			// TimeCount.push(ZHUData[NumCount]['HTimeSum']);
			// NumCount += 1;
			//} else if (HWorkTimeArr.length > NumCount && HWorkTimeArr.length > 0) {
			// TimeCount.push(HWorkTimeArr[NumCount]['HTimeSum']);
			// NumCount += 1;
			//} else {
			// TimeCount.push(0);
			//}

			}
			option_ZZT = {
			@@ -340,6 +442,8 @@
			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			var columns = [];
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			columns.push({ type: 'checkbox', fixed: 'left' });
			columns.push({ type: 'numbers', title: 'åºå·'});
			columns.push({ field: 'HSourceName', title: 'çäº§èµæº', width: 120 });
			var myDate = new Date();