update

潘钊
1 parent 1dce9479
Showing 8 changed files with 98 additions and 11 deletions
src/main/java/com/bsth/controller/sys/KaptchaController.java
src/main/resources/static/assets/img/bg_9b9dcb65ff.png
src/main/resources/static/assets/img/dialog-gray-bg_42c40b3eb6.png
src/main/resources/static/assets/plugins/jquery.base64.min.js
src/main/resources/static/pages/control/lineConfig/config.html
src/main/resources/static/pages/forecast/sample/css/main.css
src/main/resources/static/pages/forecast/sample/main.html
src/main/resources/static/pages/forecast/sample/modal.html
+package com.bsth.controller.sys;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.google.code.kaptcha.servlet.KaptchaExtend;
+
+@RestController
+public class KaptchaController extends KaptchaExtend{
+
+	@RequestMapping(value = "/captcha.jpg", method = RequestMethod.GET)
+    public void captcha(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        super.captcha(req, resp);
+    }
+}
+"use strict";jQuery.base64=(function($){var _PADCHAR="=",_ALPHA="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",_VERSION="1.0";function _getbyte64(s,i){var idx=_ALPHA.indexOf(s.charAt(i));if(idx===-1){throw"Cannot decode base64"}return idx}function _decode(s){var pads=0,i,b10,imax=s.length,x=[];s=String(s);if(imax===0){return s}if(imax%4!==0){throw"Cannot decode base64"}if(s.charAt(imax-1)===_PADCHAR){pads=1;if(s.charAt(imax-2)===_PADCHAR){pads=2}imax-=4}for(i=0;i<imax;i+=4){b10=(_getbyte64(s,i)<<18)|(_getbyte64(s,i+1)<<12)|(_getbyte64(s,i+2)<<6)|_getbyte64(s,i+3);x.push(String.fromCharCode(b10>>16,(b10>>8)&255,b10&255))}switch(pads){case 1:b10=(_getbyte64(s,i)<<18)|(_getbyte64(s,i+1)<<12)|(_getbyte64(s,i+2)<<6);x.push(String.fromCharCode(b10>>16,(b10>>8)&255));break;case 2:b10=(_getbyte64(s,i)<<18)|(_getbyte64(s,i+1)<<12);x.push(String.fromCharCode(b10>>16));break}return x.join("")}function _getbyte(s,i){var x=s.charCodeAt(i);if(x>255){throw"INVALID_CHARACTER_ERR: DOM Exception 5"}return x}function _encode(s){if(arguments.length!==1){throw"SyntaxError: exactly one argument required"}s=String(s);var i,b10,x=[],imax=s.length-s.length%3;if(s.length===0){return s}for(i=0;i<imax;i+=3){b10=(_getbyte(s,i)<<16)|(_getbyte(s,i+1)<<8)|_getbyte(s,i+2);x.push(_ALPHA.charAt(b10>>18));x.push(_ALPHA.charAt((b10>>12)&63));x.push(_ALPHA.charAt((b10>>6)&63));x.push(_ALPHA.charAt(b10&63))}switch(s.length-imax){case 1:b10=_getbyte(s,i)<<16;x.push(_ALPHA.charAt(b10>>18)+_ALPHA.charAt((b10>>12)&63)+_PADCHAR+_PADCHAR);break;case 2:b10=(_getbyte(s,i)<<16)|(_getbyte(s,i+1)<<8);x.push(_ALPHA.charAt(b10>>18)+_ALPHA.charAt((b10>>12)&63)+_ALPHA.charAt((b10>>6)&63)+_PADCHAR);break}return x.join("")}return{decode:_decode,encode:_encode,VERSION:_VERSION}}(jQuery));
 \ No newline at end of file
@@ -273,7 +273,7 @@ butto.line-config-btn:active{
 	}
 	function defaultConfig(lineCode, name){
-		layer.confirm('没有找到['+name+']的配置信息，系统将生成默认配置？', {
+		layer.confirm('没有找到['+html_encode(name)+']的配置信息，系统将生成默认配置？', {
 			btn : [ '我同意' ],
 			icon : 3,
 			shift: 5,
@@ -245,4 +245,12 @@ rect.f_rect{
 #forecastSamplePanel .tab-content::-webkit-scrollbar-corner,
 #forecastSamplePanel #trafficChart::-webkit-scrollbar-corner {  
   background: transparent;  
+}
+
+#forecastPopForm.form-horizontal .form-group{
+    margin: 15px 7px;
+}
+
+#forecastPopForm.form-horizontal{
+    margin: 15px;
 }
 \ No newline at end of file
@@ -56,6 +56,51 @@
 {{/each}}
 </script>
+<script id="forecast_gps_create_temp" type="text/html">
+<form class="form-horizontal" role="form" id="forecastPopForm">
+    <div class="form-body">
+        <div class="form-group">
+            <label class="col-md-3 control-label">线路</label>
+            <div class="col-md-9">
+                <input type="text" class="form-control" value="闵行11路" readonly>
+            </div>
+        </div>
+		<div class="form-group">
+		     <label class="col-md-3 control-label">走向</label>
+		     <div class="col-md-9">
+		         <select class="form-control input-inline input-medium" readonly>
+		         	<option value="0">上行</option>
+		         </select>
+		     </div>
+		 </div>
+
+		 <h6 style="margin: 20px 0;border-bottom: 1px solid #eeeeee;padding: 15px 0 10px;color: gray;">1、 告诉我应该使用哪些GPS数据</h6>
+		 <div class="form-group">
+            <label class="col-md-3 control-label">gps起始时间</label>
+            <div class="col-md-9">
+                <input type="date" class="form-control" >
+            </div>
+        </div>
+		<div class="form-group">
+            <label class="col-md-3 control-label">gps截止时间</label>
+            <div class="col-md-9">
+                <input type="date" class="form-control" >
+            </div>
+        </div>
+
+
+		 <h6 style="margin: 20px 0;border-bottom: 1px solid #eeeeee;padding: 15px 0 10px;color: gray;">2、 你想怎么划分时区</h6>
+		 <div class="form-group">
+            <label class="col-md-3 control-label">...</label>
+            <div class="col-md-9">
+                <input type="date" class="form-control" >
+            </div>
+        </div>
+     </div>
+</form>
+</script>
+
+
 <script src="/pages/forecast/sample/js/svg.js"></script>
 <script>
 !function(){
@@ -74,12 +119,6 @@
 		opacity : .8
 	});
-/*  	//路由
-	$('.left_station_route .tab-content').slimscroll({
-		height : 'calc(100% - 46px)',
-		opacity : .8
-	}); */
-	
 	//上下行切换事件 
 	$('.left_station_route .tabbable-line ul li').on('click', function(){setTimeout(drawSvg, 300);});
@@ -160,7 +199,7 @@
 	$('#gpsCreateDataLink').on('click', function(){
-		var lineName = $('.line_config_tree ul li.selected button').text();
+		/* var lineName = $('.line_config_tree ul li.selected button').text();
 		var updownText = $('.left_station_route ul li.active a').text();
 		layer.confirm('使用GPS轨迹生成【'+lineName+' -'+updownText+'】站点间耗时数据？ 该操作将会清除原有数据。', {
@@ -168,6 +207,23 @@
 		  icon: 3
 		}, function(){
+		}); */
+		
+		layer.open({
+		  type: 1,
+		  area: '530px',
+		  maxmin: true,
+		  content: template('forecast_gps_create_temp', {}),
+		  shift: 5,
+		  title: 'GPS生成数据',
+		  success: function(){
+			 /*  dictionaryUtils.transformDom($('#childTaskDiv .nt-dictionary'));
+			  $('#childTaskDiv').trigger('init', {
+				  selected: schedul, 
+				  _data: _data,
+				  _alone: _alone
+			   }); */
+		  }
 		});
 	});
 }();
@@ -39,7 +39,7 @@
 		            </div>
 		        </div>
 		        <div class="form-group">
-		            <label class="col-md-3 control-label">时段：</label>
+		            <label class="col-md-3 control-label">时间段：</label>
 		            <div class="col-md-4" style="padding-right: 0;">
 		                 <input type="time" class="form-control" name="sDate" value="{{obj.d.sDate}}" required> 
 		            </div>
@@ -86,7 +86,7 @@
 		            </div>
 		        </div>
 				<div class="form-group">
-            		<label class="col-md-3 control-label">标签：</label>
+            		<label class="col-md-3 control-label">时区：</label>
             		<div class="col-md-9">
 						<select class="form-control" name="tag" style="width:100%;" multiple required>
 							<option value="早高峰">早高峰</option>
@@ -96,7 +96,7 @@
             		</div>
         		</div>
 		        <div class="form-group">
-		            <label class="col-md-3 control-label">时段：</label>
+		            <label class="col-md-3 control-label">时间段：</label>
 		            <div class="col-md-4" style="padding-right: 0;">
 		                 <input type="time" class="form-control" name="sDate"  required> 
 		            </div>