BUG修复 202108201611

WebRoot/index.jsp

@@ -113,13 +113,17 @@
         }else {
             var p = $("#password").val()
             var basePath = $("#basePath").val();
+            localStorage.setItem('V_LOGINNAME', $("#username").val() );
+            localStorage.setItem('V_PASSWORD', md5(p));
+
+
             var queryJson = new Object();
             queryJson.V_LOGINNAME = $("#username").val();
             queryJson.V_PASSWORD = md5(p);
             queryJson.V_COMMAND = "LOGIN";
             queryJson.code =code;
             var qdata = "queryJson=" + JSON.stringify(queryJson);
-            var qurl = basePath + "login/tolgin";
+            var qurl = basePath + "login/tolgin"
             $.ajax({
                 type: 'POST',
                 url: qurl,
@@ -128,8 +132,6 @@
                     var json = eval('(' + result + ')');
                     // alert('ceshi')
                     if (json.login == 'true') {
-                        sessionStorage.setItem('V_LOGINNAME', $("#username").val());
-                        sessionStorage.setItem('V_PASSWORD', md5(p));
                         if ($("#username").val() == "wjzn") {
                                 location.href = basePath + "view/frontpage/index.html"
                         } else {
@@ -138,9 +140,13 @@
                         }
                     } else {
                         if (json.login == 'false') {
+                            CheckNumber();
                             Ext.Msg.show({
                                 title: '错误信息',
-                                msg: json.Msg
+                                msg: json.Msg === 'CODE WRONG' ? '验证码错误!'
+                                    : json.Msg === 'WRONG PASSWORD!!!' ? '密码输入错误!'
+                                    : json.Msg === 'LOGIN NAME WRONG' ? '用户名输入错误!'
+                                            : json.Msg
                             });
                         }
                     }
@@ -151,6 +157,11 @@
     $("#my_login").submit(function (e) {
         loginSubmit();
     });
+
+    function CheckNumber(){
+        $('#userCaptcha').val('')
+        $('#kaptchaImage').attr('src', './login/getCheckNumber?' + Math.floor(Math.random() * 100));
+    }
 </script>
 <input type="hidden" id="basePath" name="basePath" value="<%=basePath %>"/>
 </body>

WebRoot/index_QrCode.jsp

@@ -165,10 +165,42 @@
                     // document.getElementById("phonenumber").value='';
                     // document.getElementById("action").value=action;
                     // document.getElementById("phonenumber").value=phonenumber;
+
+                    sessionStorage.setItem('V_LOGINNAME', localStorage.getItem('V_LOGINNAME'));
+                    sessionStorage.setItem('V_PASSWORD', localStorage.getItem('V_PASSWORD'));
                     setTimeout(() => {
-                        location.href = URL + "/YtIoT/view/mainframe.jsp"
+                        location.href = URL + "/unnamed/view/mainframe.jsp"
+                        // location.href = URL + "/YtIoT/view/mainframe.jsp"
                     }, 1000)
-
+                    // var basePath = $("#basePath").val();
+                    // var queryJson = new Object();
+                    // queryJson.V_LOGINNAME = localStorage.getItem('V_LOGINNAME');
+                    // queryJson.V_PASSWORD = localStorage.getItem('V_PASSWORD');
+                    // queryJson.V_COMMAND = "LOGIN";
+                    // queryJson.code =code;
+                    // var qdata = "queryJson=" + JSON.stringify(queryJson);
+                    // var qurl = basePath + "login/tolgin";
+                    // $.ajax({
+                    //     type: 'POST',
+                    //     url: qurl,
+                    //     data: qdata,
+                    //     success: function (result) {
+                    //         var json = eval('(' + result + ')');
+                    //         // alert('ceshi')
+                    //         if (json.login == 'true') {
+                    //             sessionStorage.setItem('V_LOGINNAME', queryJson.V_LOGINNAME);
+                    //             sessionStorage.setItem('V_PASSWORD', queryJson.V_PASSWORD);
+                    //
+                    //         } else {
+                    //             if (json.login == 'false') {
+                    //                 Ext.Msg.show({
+                    //                     title: '错误信息',
+                    //                     msg: json.Msg
+                    //                 });
+                    //             }
+                    //         }
+                    //     }
+                    // });
 
                     // alert("ceshi");
                     websocket = null;

WebRoot/js/denglu.js

@@ -35,7 +35,6 @@ function change() {
         $(this).attr('src', './login/getCheckNumber?' + Math.floor(Math.random() * 100));
     })
 }
-
 function checkNumber(userCaptcha){
     var flag;
     $.ajax({

WebRoot/res/img/myImages.css

@@ -8,6 +8,10 @@
 	font-size: 16px;  padding:0 10 0 10;font-family:微软雅黑, Microsoft YaHei;
 }
 
+textarea.x-form-field{
+	background-color: #34383f;
+}
+
 .x-btn-default-small-menu-active .x-btn-inner {
 	color: #ffffff;
 	background-color: #0e70cb;

WebRoot/view/checkrecord/scripts/checkrecord.js

@@ -237,11 +237,15 @@ Ext.onReady(function(){
 	}
 	
 	var reset1 = function(){
-		document.getElementById('inspectorsCheck_title2_input').value = '';
-		document.getElementById('inspectorsCheck_title3_input1').value = '';
+		const time = new Date();
+		const Y = time.getFullYear(); //年
+		const M = time.getMonth(); //月
+		const D = time.getDate(); //日
+		document.getElementById('inspectorsCheck_title2_input').value = ''
+		document.getElementById('inspectorsCheck_title3_input1').value = 0;
 		document.getElementById('inspectorsCheck_title3_input2').value = '';
 		document.getElementById('inspectorsCheck_title3_input3').value = '';
-		document.getElementById('inspectorsCheck_title3_input4').value = '';
+		document.getElementById('inspectorsCheck_title3_input4').value = 4;
 		$("#plan_name").val('');
 		$("#data3b").val('');
 		$("#data3a").val('');
@@ -649,7 +653,7 @@ Ext.onReady(function(){
          });
  		var title7 = document.createElement('div');
  		title7.setAttribute('class','Check_title7_div');
- 		title7.innerHTML='完成时间';
+ 		title7.innerHTML=' 实际完成';
  		maintenanceCheckHtml.appendChild(title7);
  		var select1 = document.createElement('select');
  	   select1.setAttribute('class','Check_input4_class');

WebRoot/view/checkrecord2/scripts/checkrecord2.js

@@ -237,11 +237,15 @@ Ext.onReady(function(){
 	}
 	
 	var reset1 = function(){
+		const time = new Date();
+		const Y = time.getFullYear(); //年
+		const M = time.getMonth(); //月
+		const D = time.getDate(); //日
 		document.getElementById('maintenanceCheck_title2_input').value = '';
-		document.getElementById('maintenanceCheck_title3_input1').value = '';
+		document.getElementById('maintenanceCheck_title3_input1').value = 0;
 		document.getElementById('maintenanceCheck_title3_input2').value = '';
 		document.getElementById('maintenanceCheck_title3_input3').value = '';
-		document.getElementById('maintenanceCheck_title3_input4').value = '';
+		document.getElementById('maintenanceCheck_title3_input4').value = 4;
 		$("#plan_name").val('');
 		$("#data3b").val('');
 		$("#data3a").val('');
@@ -679,7 +683,7 @@ Ext.onReady(function(){
          });
  		var title7 = document.createElement('div');
  		title7.setAttribute('class','Check_title7_div');
- 		title7.innerHTML='完成时间';
+ 		title7.innerHTML=' 实际完成';
  		maintenanceCheckHtml.appendChild(title7);
 // 		var input4 = document.createElement('input');
 // 		input4.setAttribute('class','Check_input4_class');

WebRoot/view/css/frontpage.css

@@ -3,4 +3,4 @@
 * {	padding:0;margin:0;border:0px; }
 html, body { height:100%; width:100%; overflow:hidden; background-color:#000000;}
 #menubar { height:50px; width:100%; overflow:hidden; position:absolute; top:0px; left:0px;color:#ffffff;z-index:10000}
-#mainframe { width:100%; overflow:hidden; position:absolute; top:50px; left:0px;}
+#mainframe { width:100%; overflow:hidden; position:absolute; top:50px; left:0px;}

WebRoot/view/css/mainframe.css

@@ -3,4 +3,5 @@
 * {	padding:0;margin:0;border:0px; }
 html, body { height:100%; width:100%; overflow:hidden; }
 #mousebar { height:5px; width:100%; position:absolute; left:0px; top:0px; z-index:100;}
-#systemwin { height:100%; width:100%; position:absolute; left:0px; top:0px; z-index:0;}
+#systemwin { height:100%; width:100%; position:absolute; left:0px; top:0px; z-index:0;}
+

WebRoot/view/dataSearch/scripts/dataSearch.js

@@ -243,7 +243,8 @@ var draw_confirm = function(){
 			}],
 			yAxis:[{
 				title:{
-					text:'剩余电量',
+					// text:'剩余电量',
+					text:'',
 					style:{fontSize:'10px',color:themecolor,fontWeight:'bold'}
 				},
 				gridLineColor:'rgba(0,0,0,0.2)',
@@ -689,7 +690,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			fieldLabel:'设备名称',
 			id: 'ff_clzt',
@@ -749,6 +768,8 @@ Ext.onReady(function(){
 		        	};
 		        	Ext.getCmp('VFireOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
 		        	Ext.getCmp('VFireOptionFilterWin').hide();
 		        }

WebRoot/view/dataSearch/scripts/firedataSearch.js

@@ -166,7 +166,8 @@ var draw_confirm = function(record){
 			}],
 			yAxis:[{
 				title:{
-					text:point_name,
+					// text:point_name,
+					text:'',
 					style:{fontSize:'10px',color:themecolor,fontWeight:'bold'}
 				},
 				gridLineColor:'rgba(0,0,0,0.2)',
@@ -428,7 +429,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			fieldLabel:'设备名称',
 			id: 'ff_clzt',
@@ -489,6 +508,8 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VFireOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VFireOptionFilterWin').hide();
 //		        	getCurrentData();
 		        }

WebRoot/view/dataSearch/scripts/rtudataSearch.js

@@ -169,7 +169,8 @@ var draw_confirm = function(record){
 			}],
 			yAxis:[{
 				title:{
-					text:point_name,
+					// text:point_name,
+					text:'',
 					style:{fontSize:'10px',color:themecolor,fontWeight:'bold'}
 				},
 				gridLineColor:'rgba(0,0,0,0.2)',
@@ -430,7 +431,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			fieldLabel:'设备名称',
 			id: 'ff_clzt',
@@ -491,6 +510,8 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VFireOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VFireOptionFilterWin').hide();
 //		        	getCurrentData();
 		        }

WebRoot/view/efireAlarm/scripts/efireDevice.js

@@ -687,7 +687,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			xtype:'combo',
 			fieldLabel:'处理状态',
@@ -703,6 +721,8 @@ Ext.onReady(function(){
 	        text: '筛选',
 	        iconCls:'ok_btn',
 		    handler: function() {
+				$("#ff_start_data-inputEl").val('');
+				$("#ff_end_data-inputEl").val('');
 		        var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var query = new Object();
@@ -751,6 +771,8 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VFireOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VFireOptionFilterWin').hide();
 //		        	getCurrentData();
 		        }

WebRoot/view/efireAlarm/scripts/efireOption.js

@@ -688,7 +688,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			xtype:'combo',
 			fieldLabel:'处理状态',
@@ -729,7 +747,6 @@ Ext.onReady(function(){
 		        		query.time_start = Ext.getCmp('ff_start_data').getValue();
 		        		var datetime=query.time_start.getFullYear() + '-' + (query.time_start.getMonth() + 1) + '-' + query.time_start.getDate() + ' ' + query.time_start.getHours() + ':' + query.time_start.getMinutes() + ':' + query.time_start.getSeconds();
 		        		$("#time_start").val(datetime);
-		        		
 		        	}else{
 		        		$("#time_start").val('');
 		        	}
@@ -754,8 +771,11 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VFireOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VFireOptionFilterWin').hide();
 //		        	getCurrentData();
+					console.log(123);
 		        }
 		    }
 		},{

WebRoot/view/fireAlarm/scripts/fireDevice.js

@@ -687,7 +687,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			xtype:'combo',
 			fieldLabel:'处理状态',
@@ -751,6 +769,8 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VFireOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VFireOptionFilterWin').hide();
 //		        	getCurrentData();
 		        }

WebRoot/view/fireAlarm/scripts/fireOption.js

@@ -681,7 +681,7 @@ Ext.onReady(function(){
             id: 'ff_start_data',
             name:"ff_start_data",
             editable:false,//只读约束
-            width:330
+            width:330,
 		},{
         	xtype:'datefield',
             fieldLabel:"结束日期",
@@ -692,7 +692,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			xtype:'combo',
 			fieldLabel:'处理状态',
@@ -758,6 +776,8 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VFireOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VFireOptionFilterWin').hide();
 //		        	getCurrentData();
 		        }

WebRoot/view/inspectors/scripts/inspectors.js

@@ -797,6 +797,7 @@ Ext.onReady(function(){
 				     });
 					
 					}
+
 				},this);
 			}else{
 			Ext.Msg.alert('请先选择','至少选择一条记录，再点击删除');
@@ -859,7 +860,7 @@ Ext.onReady(function(){
 	var reset1 = function(){
 		var zn = document.getElementsByName("zhineng");
         for (var i = 0; i < zn.length; i++) {
-      	  zn[i].checked = false;
+      	  zn[i].checked = true;
         }
 		document.getElementById('inspectors_title3_input1').value = '';
 		$("#zn").val('');
@@ -1085,7 +1086,7 @@ Ext.onReady(function(){
 		   childPanel1_div1.innerHTML='巡检';
 		   maintenancePersonHtml.appendChild(childPanel1_div1);
 		  var childPanel1_input3 = document.createElement('input');
-		   childPanel1_input3.setAttribute('class','input3_class');
+		   childPanel1_input3.setAttribute('class','input3_class')
 //		   childPanel1_input1.setAttribute('id','maintenancePerson_title3_input1');
 		   childPanel1_input3.setAttribute('type','checkbox');
 		   childPanel1_input3.setAttribute('name','zhineng');
@@ -1147,6 +1148,7 @@ Ext.onReady(function(){
 		   childPanel1_title7.setAttribute('onmouseout',"mouseoff(this)");
 		   childPanel1_title7.setAttribute('onclick',"menu_click(this)");
 		   maintenancePersonHtml.appendChild(childPanel1_title7);
+		   reset1();
 		 }
 	
 	changeon1 = function(obj){

WebRoot/view/liftAlarm/scripts/liftDevice.js

@@ -688,7 +688,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			xtype:'combo',
 			fieldLabel:'处理状态',
@@ -752,6 +770,8 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VLiftOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VLiftOptionFilterWin').hide();
 //		        	getCurrentData();
 		        }

WebRoot/view/liftAlarm/scripts/liftOption.js

@@ -702,7 +702,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			xtype:'combo',
 			fieldLabel:'处理状态',
@@ -768,6 +786,8 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VFireOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VFireOptionFilterWin').hide();
 //		        	getCurrentData();
 		        }

WebRoot/view/maintenanceperson/scripts/maintenanceperson.js

@@ -913,7 +913,7 @@ Ext.onReady(function(){
 	var reset1 = function(){
 		var zn = document.getElementsByName("zhineng");
           for (var i = 0; i < zn.length; i++) {
-        	  zn[i].checked = false;
+        	  zn[i].checked = true;
           }
 		document.getElementById('maintenancePerson_title3_input1').value = '';
 		$("#zn").val('');
@@ -1207,6 +1207,7 @@ Ext.onReady(function(){
 		   childPanel1_title7.setAttribute('onmouseout',"mouseoff(this)");
 		   childPanel1_title7.setAttribute('onclick',"menu_click(this)");
 		   maintenancePersonHtml.appendChild(childPanel1_title7);
+		   reset1();
 		 }
 	
 	changeon1 = function(obj){

WebRoot/view/rtuAlarm/scripts/rtuDevice.js

@@ -688,7 +688,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			xtype:'combo',
 			fieldLabel:'处理状态',
@@ -752,6 +770,8 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VRtuOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VRtuOptionFilterWin').hide();
 //		        	getCurrentData();
 		        }

WebRoot/view/rtuAlarm/scripts/rtuOption.js

@@ -690,7 +690,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			xtype:'combo',
 			fieldLabel:'处理状态',
@@ -754,6 +772,8 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VRtuOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VRtuOptionFilterWin').hide();
 //		        	getCurrentData();
 		        }

WebRoot/view/scripts/log.html

@@ -11,6 +11,80 @@
     <script src="https://unpkg.com/element-ui/lib/index.js"></script>
     <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
     <style>
+    .el-table {
+        background: transparent !important;
+    }
+
+    .el-table table {
+        flex-shrink: 0;
+        width: 100% !important;
+    }
+
+    .el-table table {
+        font-size: 14px;
+    }
+
+    .el-table th {
+        color: #FFF;
+        background: rgba(0, 250, 251, 0.20);
+        border-color: transparent;
+    }
+
+    .el-table .cell {
+        padding: 0;
+    }
+
+    .el-table tr {
+        margin-bottom: 1px;
+    }
+
+    .el-table tr,
+    td {
+        padding: 0;
+        background: rgba(0, 251, 251, .051) !important;
+        color: #FFF;
+        border-color: rgba(0, 250, 251, 0.20);
+    }
+
+    .el-table thead th {
+        padding: 0;
+        height: 34px;
+        border-color: rgba(0, 250, 251, 0.20) !important;
+    }
+
+    .el-table .el-table__expanded-cell {
+        padding: 10px;
+    }
+
+    .el-table .el-table__expand-icon {
+        color: #FFF;
+    }
+
+    .el-table .cell {
+        padding:0 10px;
+    }
+
+    .el-table .name-wrapper {
+        white-space: nowrap;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        word-break: break-all;
+    }
+
+    .el-table .el-table__body-wrapper {
+        scrollbar-width: none;
+        /* firefox */
+        -ms-overflow-style: none;
+        /* IE 10+ */
+        overflow-x: hidden;
+        overflow-y: auto;
+    }
+
+    .el-table .el-table__body-wrapper::-webkit-scrollbar {
+        display: none;
+    }
 	html,body,#app{
             width: 100%;
             height: 100%;
@@ -60,7 +134,7 @@
 <body>
     <div id="app">
         <div class="home">
-            <el-row class="title">{{ typeList[typeFree].name }}</el-row>
+<!--            <el-row class="title">{{ typeList[typeFree].name }}</el-row>-->
             <el-row class="search" v-if="typeList[typeFree].inputList.length > 0">
                 <el-input v-model="inputObj[item.prop]" placeholder="请输入内容" v-for="item in typeList[typeFree].inputList" :key="item.symbol"></el-input>
                 <el-button type="primary" @click="getData()">查询</el-button>

WebRoot/view/videoAlarm/scripts/VideoDevice.js

@@ -695,7 +695,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			xtype:'combo',
 			fieldLabel:'处理状态',
@@ -759,6 +777,8 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VRtuOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VRtuOptionFilterWin').hide();
 //		        	getCurrentData();
 		        }

WebRoot/view/videoAlarm/scripts/videoOption.js

@@ -694,7 +694,25 @@ Ext.onReady(function () {
             id: 'ff_end_data',
             name: "ff_end_data",
             editable: false,//只读约束
-            width: 330
+            width: 330,
+            listeners: {
+                //添加日期选择事件
+                "select": function (time) {
+                    var start = Ext.getCmp('ff_start_data').getValue()
+                    var end = Ext.getCmp('ff_end_data').getValue()
+                    if(start === null || start === ""){
+                        Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+                            Ext.getCmp('ff_end_data').setValue('');
+                        });
+                    }else{
+                        if((end.valueOf() - start.valueOf()) < 0){
+                            Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+                                Ext.getCmp('ff_end_data').setValue('');
+                            });
+                        }
+                    }
+                },
+            }
         }, {
             xtype: 'combo',
             fieldLabel: '处理状态',
@@ -758,6 +776,8 @@ Ext.onReady(function () {
                     Ext.getCmp('VRtuOptionListPageToolbar').moveFirst();
                     Ext.getCmp('ff_company_code').setValue('');
                     Ext.getCmp('ff_clzt').setValue('');
+                    Ext.getCmp('ff_start_data').setValue('');
+                    Ext.getCmp('ff_end_data').setValue('');
                     Ext.getCmp('VRtuOptionFilterWin').hide();
 //		        	getCurrentData();
                 }

WebRoot/view/waterAlarm/scripts/waterDevice.js

@@ -684,7 +684,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			xtype:'combo',
 			fieldLabel:'处理状态',
@@ -747,6 +765,8 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VWaterOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VWaterOptionFilterWin').hide();
 //		        	getCurrentData();
 		        }

WebRoot/view/waterAlarm/scripts/waterOption.js

@@ -690,7 +690,25 @@ Ext.onReady(function(){
             id: 'ff_end_data',
             name:"ff_end_data",
             editable:false,//只读约束
-            width:330
+            width:330,
+			listeners: {
+				//添加日期选择事件
+				"select": function (time) {
+					var start = Ext.getCmp('ff_start_data').getValue()
+					var end = Ext.getCmp('ff_end_data').getValue()
+					if(start === null || start === ""){
+						Ext.Msg.alert('操作失败', '请选择开始时间后再次选择!' , function(btn,txt){
+							Ext.getCmp('ff_end_data').setValue('');
+						});
+					}else{
+						if((end.valueOf() - start.valueOf()) < 0){
+							Ext.Msg.alert('操作失败', '开始日期不能选择在结束日期后!' , function(btn,txt){
+								Ext.getCmp('ff_end_data').setValue('');
+							});
+						}
+					}
+				},
+			}
 		},{
 			xtype:'combo',
 			fieldLabel:'处理状态',
@@ -754,6 +772,8 @@ Ext.onReady(function(){
 		        	Ext.getCmp('VWaterOptionListPageToolbar').moveFirst();
 		        	Ext.getCmp('ff_company_code').setValue('');
 		        	Ext.getCmp('ff_clzt').setValue('');
+					Ext.getCmp('ff_start_data').setValue('');
+					Ext.getCmp('ff_end_data').setValue('');
 		        	Ext.getCmp('VWaterOptionFilterWin').hide();
 //		        	getCurrentData();
 		        }

src/cn/com/usky/iot/controller/ExcelController.java

@@ -2,6 +2,8 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 
 import cn.com.usky.iot.auth.TokenAuthBO;
@@ -36,7 +38,9 @@ public class ExcelController {
 
     @Autowired
     private TokenAuthService tokenAuthService;
-
+    public static String getPath(HttpServletRequest request){
+        return request.getServletContext().getRealPath("");
+    }
 
     //导出
     @RequestMapping(value = "/exportexl", method = {RequestMethod.GET, RequestMethod.POST})
@@ -59,7 +63,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.fileDormExport("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.fileDormExport(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -87,7 +91,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.waterDormExport("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.waterDormExport(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -115,7 +119,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.rtuDormExport("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.rtuDormExport(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -143,7 +147,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.fireAlarmExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.fireAlarmExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -171,7 +175,9 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.EfireAlarmExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+
+
+            String ret = excelController.excelService.EfireAlarmExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -199,7 +205,8 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.waterAlarmExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+
+            String ret = excelController.excelService.waterAlarmExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -227,7 +234,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.RTUAlarmExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.RTUAlarmExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -255,7 +262,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.liftAlarmExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.liftAlarmExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -283,7 +290,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.DormExport("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.DormExport(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -311,7 +318,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.patrolplanExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.patrolplanExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -339,7 +346,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.inspectionrecordExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.inspectionrecordExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -367,7 +374,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.checkrecordExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.checkrecordExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -395,7 +402,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.routeExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.routeExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -423,7 +430,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.inspectorsExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.inspectorsExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -451,7 +458,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.patrolpointExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.patrolpointExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -479,7 +486,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.qrcodeanalysisExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.qrcodeanalysisExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -507,7 +514,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.maintenanceplanExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.maintenanceplanExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -535,7 +542,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.checkrecord2Excel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.checkrecord2Excel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -563,7 +570,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.maintenancerecordExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.maintenancerecordExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -591,7 +598,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.route2Excel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.route2Excel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -619,7 +626,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.maintenanceExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.maintenanceExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -647,7 +654,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.maintenancepersonExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.maintenancepersonExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -675,7 +682,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.qrcodeanalysis2Excel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.qrcodeanalysis2Excel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -703,7 +710,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.XjInspectionPointsExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.XjInspectionPointsExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -731,7 +738,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.XjInspectionPointsExcel1("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.XjInspectionPointsExcel1(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -760,7 +767,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.XjInspectorsExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.XjInspectorsExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -788,7 +795,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.XjPlanMasterExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.XjPlanMasterExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -817,7 +824,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.XjPlanMasterExcel1("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.XjPlanMasterExcel1(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -845,7 +852,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.XjSpotOperationRecordExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.XjSpotOperationRecordExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -874,7 +881,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.XjSpotOperationRecordExcel1("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.XjSpotOperationRecordExcel1(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -903,7 +910,7 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = excelController.excelService.EventProcessingExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            String ret = excelController.excelService.EventProcessingExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();
@@ -937,8 +944,8 @@ public class ExcelController {
         jsonObject.put("V_LOGINNAME", o.getVLoginname());
         jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            //String ret = excelController.excelService.VideoAlarmExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-            String ret = excelController.excelService.VideoAlarmExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            //String ret = excelController.excelService.VideoAlarmExcel(getPath(request),queryJson);
+            String ret = excelController.excelService.VideoAlarmExcel(getPath(request), jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             e.printStackTrace();

web/WEB-INF/web.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+         version="4.0">
+</web-app>