bug修改202109261118

WebRoot/view/patrolplan/scripts/patrolplan.js

@@ -526,6 +526,99 @@ Ext.onReady(function () {
 
 	});
 
+	function updatetijiao() {
+		var query = new Object();
+		var spot_id = null;
+
+		var InspectiontimeValue = Ext.getCmp('fa_patrol_cycle').getChecked();
+		var fa_cycle = '';
+		Ext.Array.each(InspectiontimeValue, function (item) {
+			fa_cycle += item.inputValue + ',';
+		});
+		var V_LOGINNAME = $("#V_LOGINNAME").val();
+		var V_PASSWORD = $("#V_PASSWORD").val();
+
+
+		var start_time = Ext.getCmp('fm_patrol_start_time').getValue();
+		if (start_time == '' || start_time == null) {
+			Ext.Msg.alert('提示', '请选择巡检开始时间!', function (btn, txt) {
+			})
+			return;
+		} else {
+			var start_time1 = ((start_time.getHours() < 10) ? ('0' + start_time.getHours()) : start_time.getHours()) + ':' + ((start_time.getMinutes() < 10) ? ('0' + start_time.getMinutes()) : start_time.getMinutes());
+		}
+
+		var end_time = Ext.getCmp('fm_patrol_end_time').getValue();
+		if (end_time == '' || end_time == null) {
+			Ext.Msg.alert('提示', '请选择巡检结束时间!', function (btn, txt) {
+			})
+			return;
+		} else {
+			var end_time1 = ((end_time.getHours() < 10) ? ('0' + end_time.getHours()) : end_time.getHours()) + ':' + ((end_time.getMinutes() < 10) ? ('0' + end_time.getMinutes()) : end_time.getMinutes());
+		}
+
+		query.team_id = Ext.getCmp('fm_patrol_team_id').getValue();
+		if (query.team_id == '' || query.team_id == null) {
+			Ext.Msg.alert('提示', '请选择执行团队!', function (btn, txt) {
+			})
+			return;
+		}
+		//			               Ext.MessageBox.alert('提示', '您的兴趣是' + V_LOGINNAME);
+		//			            var selected = sm1.getSelection( );
+
+		//			            query.spot_id = selected[0].raw.id;
+		//			                     var selected = sm1.getSelection( );
+		//			    	alert(sm1.getCount());
+		if (AllSelectedRecords.length == 1) {
+			query.spot_id = AllSelectedRecords[0];
+		} else {
+			if (AllSelectedRecords.length > 1) {
+				for (var i = 0; i < AllSelectedRecords.length; i++) {
+					if (i == 0)
+						spot_id = AllSelectedRecords[i];
+					else
+						spot_id += "," + AllSelectedRecords[i];
+				}
+				query.spot_id = spot_id;
+			} else {
+				Ext.Msg.alert('请先选择', '至少选择一条巡检点位，再点击提交');
+				return;
+			}
+		}
+
+		query.company_code = Ext.getCmp('fm_patrol_company_code').getValue();//建筑/项目
+
+		query.cycle = fa_cycle;
+		query.start_inspect_time = start_time1;
+		query.end_inspect_time = end_time1;
+		query.start_date = Ext.util.Format.date(Ext.getCmp('fm_patrol_start_date').getValue(), 'Y-m-d');
+		if (query.start_date == '') {
+			Ext.Msg.alert('提示', '请选择执行开始日期!', function (btn, txt) {
+			})
+			return;
+		}
+		query.end_date = Ext.util.Format.date(Ext.getCmp('fm_patrol_end_date').getValue(), 'Y-m-d');
+		if (query.end_date == '') {
+			Ext.Msg.alert('提示', '请选择执行结束日期!', function (btn, txt) {
+			})
+			return;
+		}
+		//							query.ID_LIST = list;
+		// 							query.V_LOGINNAME = V_LOGINNAME;
+		var jsonstr = Ext.JSON.encode(query);
+		Ext.Ajax.request({
+			timeout: 3000000,
+			url: baseUrl + 'iot/planmaster/append1',
+			params: 'queryJson=' + jsonstr,
+			success: function (resp, opts) {
+				Ext.Msg.alert('操作成功', '计划已添加', function (btn, txt) {
+					// myStore.reload();
+					clear_append_form();
+				});
+			}
+		});
+	}
+
 	function addtijiao() {
 		var query = new Object();
 		var spot_id = null;
@@ -538,13 +631,25 @@ Ext.onReady(function () {
 		var V_LOGINNAME = $("#V_LOGINNAME").val();
 		var V_PASSWORD = $("#V_PASSWORD").val();
 
-		query.plan_name = Ext.getCmp('fa_patrolplan_name').getValue();
-		if (query.plan_name == '') {
+		var start_time = Ext.getCmp('fa_patrolplan_name').getValue();
+		if (start_time == '' || start_time == null) {
 			Ext.Msg.alert('提示', '任务名称不能为空!', function (btn, txt) {
 			})
 			return;
+		} else {
+			var start_time1 = ((start_time.getHours() < 10) ? ('0' + start_time.getHours()) : start_time.getHours()) + ':' + ((start_time.getMinutes() < 10) ? ('0' + start_time.getMinutes()) : start_time.getMinutes());
+		}
+
+		var start_time = Ext.getCmp('fa_patrol_start_time').getValue();
+		if (start_time == '' || start_time == null) {
+			Ext.Msg.alert('提示', '请选择巡检开始时间!', function (btn, txt) {
+			})
+			return;
+		} else {
+			var start_time1 = ((start_time.getHours() < 10) ? ('0' + start_time.getHours()) : start_time.getHours()) + ':' + ((start_time.getMinutes() < 10) ? ('0' + start_time.getMinutes()) : start_time.getMinutes());
 		}
 
+
 		var start_time = Ext.getCmp('fa_patrol_start_time').getValue();
 		if (start_time == '' || start_time == null) {
 			Ext.Msg.alert('提示', '请选择巡检开始时间!', function (btn, txt) {
@@ -1092,7 +1197,7 @@ Ext.onReady(function () {
 				text: '修改',
 				iconCls: 'ok_btn',
 				handler: function () {
-					addtijiao();
+					updatetijiao();
 				}
 			}, {
 				text: '关闭',

out/artifacts/YtIoT_Web_exploded/index.jsp

@@ -14,7 +14,6 @@
     <link type="text/css" rel="stylesheet" href="<%=basePath+"res/extjs/resources/css/ext-all-access.css" %>"/>
     <link type="text/css" rel="sytlesheet" href="<%=basePath+"res/particles/css/style.css" %>">
     <link type="text/css" rel="stylesheet" href="index1.css">
-    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <script type="text/javascript" src="<%=basePath+"res/jquery/jquery-3.3.1.min.js" %>"></script>
     <script type="text/javascript" src="<%=basePath+"res/particles/particles.min.js" %>"></script>
     <script type="text/javascript" src="<%=basePath+"res/extjs/ext-all.js" %>"></script>

out/artifacts/YtIoT_Web_exploded/view/patrolplan/scripts/patrolplan.js

@@ -526,6 +526,99 @@ Ext.onReady(function () {
 
 	});
 
+	function updatetijiao() {
+		var query = new Object();
+		var spot_id = null;
+
+		var InspectiontimeValue = Ext.getCmp('fa_patrol_cycle').getChecked();
+		var fa_cycle = '';
+		Ext.Array.each(InspectiontimeValue, function (item) {
+			fa_cycle += item.inputValue + ',';
+		});
+		var V_LOGINNAME = $("#V_LOGINNAME").val();
+		var V_PASSWORD = $("#V_PASSWORD").val();
+
+
+		var start_time = Ext.getCmp('fm_patrol_start_time').getValue();
+		if (start_time == '' || start_time == null) {
+			Ext.Msg.alert('提示', '请选择巡检开始时间!', function (btn, txt) {
+			})
+			return;
+		} else {
+			var start_time1 = ((start_time.getHours() < 10) ? ('0' + start_time.getHours()) : start_time.getHours()) + ':' + ((start_time.getMinutes() < 10) ? ('0' + start_time.getMinutes()) : start_time.getMinutes());
+		}
+
+		var end_time = Ext.getCmp('fm_patrol_end_time').getValue();
+		if (end_time == '' || end_time == null) {
+			Ext.Msg.alert('提示', '请选择巡检结束时间!', function (btn, txt) {
+			})
+			return;
+		} else {
+			var end_time1 = ((end_time.getHours() < 10) ? ('0' + end_time.getHours()) : end_time.getHours()) + ':' + ((end_time.getMinutes() < 10) ? ('0' + end_time.getMinutes()) : end_time.getMinutes());
+		}
+
+		query.team_id = Ext.getCmp('fm_patrol_team_id').getValue();
+		if (query.team_id == '' || query.team_id == null) {
+			Ext.Msg.alert('提示', '请选择执行团队!', function (btn, txt) {
+			})
+			return;
+		}
+		//			               Ext.MessageBox.alert('提示', '您的兴趣是' + V_LOGINNAME);
+		//			            var selected = sm1.getSelection( );
+
+		//			            query.spot_id = selected[0].raw.id;
+		//			                     var selected = sm1.getSelection( );
+		//			    	alert(sm1.getCount());
+		if (AllSelectedRecords.length == 1) {
+			query.spot_id = AllSelectedRecords[0];
+		} else {
+			if (AllSelectedRecords.length > 1) {
+				for (var i = 0; i < AllSelectedRecords.length; i++) {
+					if (i == 0)
+						spot_id = AllSelectedRecords[i];
+					else
+						spot_id += "," + AllSelectedRecords[i];
+				}
+				query.spot_id = spot_id;
+			} else {
+				Ext.Msg.alert('请先选择', '至少选择一条巡检点位，再点击提交');
+				return;
+			}
+		}
+
+		query.company_code = Ext.getCmp('fm_patrol_company_code').getValue();//建筑/项目
+
+		query.cycle = fa_cycle;
+		query.start_inspect_time = start_time1;
+		query.end_inspect_time = end_time1;
+		query.start_date = Ext.util.Format.date(Ext.getCmp('fm_patrol_start_date').getValue(), 'Y-m-d');
+		if (query.start_date == '') {
+			Ext.Msg.alert('提示', '请选择执行开始日期!', function (btn, txt) {
+			})
+			return;
+		}
+		query.end_date = Ext.util.Format.date(Ext.getCmp('fm_patrol_end_date').getValue(), 'Y-m-d');
+		if (query.end_date == '') {
+			Ext.Msg.alert('提示', '请选择执行结束日期!', function (btn, txt) {
+			})
+			return;
+		}
+		//							query.ID_LIST = list;
+		// 							query.V_LOGINNAME = V_LOGINNAME;
+		var jsonstr = Ext.JSON.encode(query);
+		Ext.Ajax.request({
+			timeout: 3000000,
+			url: baseUrl + 'iot/planmaster/append1',
+			params: 'queryJson=' + jsonstr,
+			success: function (resp, opts) {
+				Ext.Msg.alert('操作成功', '计划已添加', function (btn, txt) {
+					// myStore.reload();
+					clear_append_form();
+				});
+			}
+		});
+	}
+
 	function addtijiao() {
 		var query = new Object();
 		var spot_id = null;
@@ -538,13 +631,25 @@ Ext.onReady(function () {
 		var V_LOGINNAME = $("#V_LOGINNAME").val();
 		var V_PASSWORD = $("#V_PASSWORD").val();
 
-		query.plan_name = Ext.getCmp('fa_patrolplan_name').getValue();
-		if (query.plan_name == '') {
+		var start_time = Ext.getCmp('fa_patrolplan_name').getValue();
+		if (start_time == '' || start_time == null) {
 			Ext.Msg.alert('提示', '任务名称不能为空!', function (btn, txt) {
 			})
 			return;
+		} else {
+			var start_time1 = ((start_time.getHours() < 10) ? ('0' + start_time.getHours()) : start_time.getHours()) + ':' + ((start_time.getMinutes() < 10) ? ('0' + start_time.getMinutes()) : start_time.getMinutes());
+		}
+
+		var start_time = Ext.getCmp('fa_patrol_start_time').getValue();
+		if (start_time == '' || start_time == null) {
+			Ext.Msg.alert('提示', '请选择巡检开始时间!', function (btn, txt) {
+			})
+			return;
+		} else {
+			var start_time1 = ((start_time.getHours() < 10) ? ('0' + start_time.getHours()) : start_time.getHours()) + ':' + ((start_time.getMinutes() < 10) ? ('0' + start_time.getMinutes()) : start_time.getMinutes());
 		}
 
+
 		var start_time = Ext.getCmp('fa_patrol_start_time').getValue();
 		if (start_time == '' || start_time == null) {
 			Ext.Msg.alert('提示', '请选择巡检开始时间!', function (btn, txt) {
@@ -1092,7 +1197,7 @@ Ext.onReady(function () {
 				text: '修改',
 				iconCls: 'ok_btn',
 				handler: function () {
-					addtijiao();
+					updatetijiao();
 				}
 			}, {
 				text: '关闭',