Merge remote-tracking branch 'origin/master'

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('fm_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: 1000,
+			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,23 @@ 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;
 		}
 
+		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) {
@@ -613,7 +716,7 @@ Ext.onReady(function () {
 		// 							query.V_LOGINNAME = V_LOGINNAME;
 		var jsonstr = Ext.JSON.encode(query);
 		Ext.Ajax.request({
-			timeout: 3000000,
+			timeout: 1000,
 			url: baseUrl + 'iot/planmaster/append1',
 			params: 'queryJson=' + jsonstr,
 			success: function (resp, opts) {
@@ -1092,7 +1195,7 @@ Ext.onReady(function () {
 				text: '修改',
 				iconCls: 'ok_btn',
 				handler: function () {
-					addtijiao();
+					updatetijiao();
 				}
 			}, {
 				text: '关闭',

WebRoot/view/scripts/log.html

@@ -47,6 +47,8 @@
     }
 
     .el-table thead th {
+        background: rgba(0, 251, 251, .051) !important;
+        color: #FFF;
         padding: 0;
         height: 34px;
         border-color: rgba(0, 250, 251, 0.20) !important;
@@ -89,7 +91,7 @@
         body,
         #app {
             width: 100%;
-            height: 100%;
+            height: calc(100vh - 60px);
             padding: 0;
             margin: 0;
         }
@@ -154,7 +156,7 @@
     </div>
 </body>
 
-<!-- <script src="http://172.16.120.92:8080/YtIoT/iot/log/queryLogList?callback=dosomething"></script> -->
+<script src="http://127.0.0.1:8080/YtIoT/iot/log/queryLogList?callback=dosomething"></script>
 <script>
     var app = new Vue({
         el: '#app',

out/artifacts/YtIoT_Web_exploded/res/img/myImages.css

@@ -1636,7 +1636,7 @@ textarea.x-form-field{
 
 .company_bg_tr {
 	position:absolute;
-	width:406px;
+	width:407px;
 	height:762px;
 	top:0px;
 	right:0px;
@@ -1693,7 +1693,7 @@ textarea.x-form-field{
 .company_bg_br {
 	position:absolute;
 	height:170px;
-	width:406px;
+	width:407px;
 	bottom:0px;
 	right:0px;
 	background:url(icons/company_br.png) no-repeat;

out/artifacts/YtIoT_Web_exploded/view/frontpage/css/myImages.css

@@ -2075,7 +2075,7 @@
 
 .company_bg_tr {
 	position:absolute;
-	width:406px;
+	width:407px;
 	height:762px;
 	top:0px;
 	right:0px;
@@ -2132,7 +2132,7 @@
 .company_bg_br {
 	position:absolute;
 	height:170px;
-	width:406px;
+	width:407px;
 	bottom:0px;
 	right:0px;
 	background:url(icons/company_br.png) no-repeat;

out/artifacts/YtIoT_Web_exploded/view/frontpage/scripts/company.js

@@ -1761,31 +1761,31 @@ var show_realtime_status = function (idx) {
                     $("#HighTemperatureC").html((status_list[i].point_data == '0') ? '正常' : '告警');
                 } else if (status_list[i].point_code == 65) {
                     if (status_list[i].point_data.length > 0)
-                        $("#VoltageA").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#VoltageA").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 66) {
                     if (status_list[i].point_data.length > 0)
-                        $("#VoltageB").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#VoltageB").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 67) {
                     if (status_list[i].point_data.length > 0)
-                        $("#VoltageC").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#VoltageC").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 68) {
                     if (status_list[i].point_data.length > 0)
-                        $("#CurrentA").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#CurrentA").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 69) {
                     if (status_list[i].point_data.length > 0)
-                        $("#CurrentB").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#CurrentB").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 70) {
                     if (status_list[i].point_data.length > 0)
-                        $("#CurrentC").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#CurrentC").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 71) {
                     if (status_list[i].point_data.length > 0)
-                        $("#TemperatureA").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#TemperatureA").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 72) {
                     if (status_list[i].point_data.length > 0)
-                        $("#TemperatureB").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#TemperatureB").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 } else if (status_list[i].point_code == 73) {
                     if (status_list[i].point_data.length > 0)
-                        $("#TemperatureC").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
+                        $("#TemperatureC").html(status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + status_list[i].point_code + ',\'' + status_list[i].point_name + '\')"/>');
                 }
             }
         } else if (devicesStore[idx].dwtype == 'YTSM') {
@@ -1808,7 +1808,7 @@ var show_realtime_status = function (idx) {
                     if (status_list[i].point_code == 1)
                         sta_value.innerHTML = status_list[i].content;
                     else
-                        sta_value.innerHTML = status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + (status_list[i].point_code + ((devicesStore[idx].start_port > 0) ? (devicesStore[idx].start_port + 63) : 0)) + ',\'' + status_list[i].point_name + '\')"/>';
+                        sta_value.innerHTML = status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + (status_list[i].point_code + ((devicesStore[idx].start_port > 0) ? (devicesStore[idx].start_port + 63) : 0)) + ',\'' + status_list[i].point_name + '\')"/>';
                     tr.appendChild(sta_value);
                 }
             }
@@ -1831,7 +1831,7 @@ var show_realtime_status = function (idx) {
                     //					sta_value.style.paddingBottom='12px';
                     if (devicesStore[idx].dwtype == 'YTUI') {
                         if (V_LOGINNAME == 'admin')
-                            sta_value.innerHTML = status_list[i].content + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_userinfo_detail(' + devicesStore[idx].owner_code + ')"/>';
+                            sta_value.innerHTML = status_list[i].content + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_userinfo_detail(\'' + devicesStore[idx].owner_code + '\')"/>';
                         else
                             sta_value.innerHTML = status_list[i].content;
                     } else if ((devicesStore[idx].dwtype == 'YTWP') || (devicesStore[idx].dwtype == 'YTLL')) {
@@ -1841,9 +1841,9 @@ var show_realtime_status = function (idx) {
                             else
                                 sta_value.innerHTML = '--';
                         } else if (status_list[i].point_data.length > 0)
-                            sta_value.innerHTML = status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + (status_list[i].point_code + ((devicesStore[idx].start_port > 0) ? (devicesStore[idx].start_port + 63) : 0)) + ',\'' + status_list[i].point_name + '\')"/>';
+                            sta_value.innerHTML = status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + (status_list[i].point_code + ((devicesStore[idx].start_port > 0) ? (devicesStore[idx].start_port + 63) : 0)) + ',\'' + status_list[i].point_name + '\')"/>';
                     } else if (status_list[i].point_data.length > 0)
-                        sta_value.innerHTML = status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(' + devicesStore[idx].owner_code + ',' + (status_list[i].point_code + ((devicesStore[idx].start_port > 0) ? (devicesStore[idx].start_port + 63) : 0)) + ',\'' + status_list[i].point_name + '\')"/>';
+                        sta_value.innerHTML = status_list[i].point_data + '<img class="detail_data_btn" src="' + basePath + 'res/img/common/famicons/chart_curve.png" onclick="show_detail_data(\'' + devicesStore[idx].owner_code + '\',' + (status_list[i].point_code + ((devicesStore[idx].start_port > 0) ? (devicesStore[idx].start_port + 63) : 0)) + ',\'' + status_list[i].point_name + '\')"/>';
                     tr.appendChild(sta_value);
                 }
             }

out/artifacts/YtIoT_Web_exploded/view/frontpage/scripts/map.js

@@ -1640,7 +1640,7 @@ var draw_all = function() {
             d7a += obj.d7a;
             d7oc += obj.d7oc;
             d7ac += obj.d7ac;
-            if ((obj.lat > 30) && (obj.lat < 33) && (obj.lng > 120) && (obj.lng < 125)) {
+            if ((obj.lat > 30) && (obj.lat < 33) && (obj.lng > 100) && (obj.lng < 125)) {
                 totalLng += obj.lng;
                 totalLat += obj.lat;
                 latngCount++;
@@ -1944,7 +1944,7 @@ var chk_company_cur = function(idx) {
         if (idx >= StatusStore.length)
             idx = 0;
         var obj = StatusStore[idx];
-        if ((obj.lat > 30) && (obj.lat < 33) && (obj.lng > 120) && (obj.lng < 125))
+        if ((obj.lat > 30) && (obj.lat < 33) && (obj.lng > 100) && (obj.lng < 125))
             return idx;
         nrow++;
         if (nrow >= StatusStore.length)

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('fm_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: 1000,
+			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,23 @@ 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;
 		}
 
+		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) {
@@ -613,7 +716,7 @@ Ext.onReady(function () {
 		// 							query.V_LOGINNAME = V_LOGINNAME;
 		var jsonstr = Ext.JSON.encode(query);
 		Ext.Ajax.request({
-			timeout: 3000000,
+			timeout: 1000,
 			url: baseUrl + 'iot/planmaster/append1',
 			params: 'queryJson=' + jsonstr,
 			success: function (resp, opts) {
@@ -1092,7 +1195,7 @@ Ext.onReady(function () {
 				text: '修改',
 				iconCls: 'ok_btn',
 				handler: function () {
-					addtijiao();
+					updatetijiao();
 				}
 			}, {
 				text: '关闭',

out/artifacts/YtIoT_Web_exploded/view/scripts/log.html

@@ -47,6 +47,8 @@
     }
 
     .el-table thead th {
+        background: rgba(0, 251, 251, .051) !important;
+        color: #FFF;
         padding: 0;
         height: 34px;
         border-color: rgba(0, 250, 251, 0.20) !important;
@@ -89,7 +91,7 @@
         body,
         #app {
             width: 100%;
-            height: 100%;
+            height: calc(100vh - 60px);
             padding: 0;
             margin: 0;
         }
@@ -154,7 +156,7 @@
     </div>
 </body>
 
-<!-- <script src="http://172.16.120.92:8080/YtIoT/iot/log/queryLogList?callback=dosomething"></script> -->
+<script src="http://127.0.0.1:8080/YtIoT/iot/log/queryLogList?callback=dosomething"></script>
 <script>
     var app = new Vue({
         el: '#app',