Commit 718313cc5fe98beebda52194033b505fbe0ac3f9

Authored by 潘钊
1 parent 1dce9479

update

src/main/java/com/bsth/controller/sys/KaptchaController.java 0 → 100644
  1 +package com.bsth.controller.sys;
  2 +
  3 +import java.io.IOException;
  4 +
  5 +import javax.servlet.ServletException;
  6 +import javax.servlet.http.HttpServletRequest;
  7 +import javax.servlet.http.HttpServletResponse;
  8 +
  9 +import org.springframework.web.bind.annotation.RequestMapping;
  10 +import org.springframework.web.bind.annotation.RequestMethod;
  11 +import org.springframework.web.bind.annotation.RestController;
  12 +
  13 +import com.google.code.kaptcha.servlet.KaptchaExtend;
  14 +
  15 +@RestController
  16 +public class KaptchaController extends KaptchaExtend{
  17 +
  18 + @RequestMapping(value = "/captcha.jpg", method = RequestMethod.GET)
  19 + public void captcha(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
  20 + super.captcha(req, resp);
  21 + }
  22 +}
... ...
src/main/resources/static/assets/img/bg_9b9dcb65ff.png 0 → 100644

5.9 KB

src/main/resources/static/assets/img/dialog-gray-bg_42c40b3eb6.png 0 → 100644

1.54 KB

src/main/resources/static/assets/plugins/jquery.base64.min.js 0 → 100644
  1 +"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));
0 2 \ No newline at end of file
... ...
src/main/resources/static/pages/control/lineConfig/config.html
... ... @@ -273,7 +273,7 @@ butto.line-config-btn:active{
273 273 }
274 274  
275 275 function defaultConfig(lineCode, name){
276   - layer.confirm('没有找到['+name+']的配置信息,系统将生成默认配置?', {
  276 + layer.confirm('没有找到['+html_encode(name)+']的配置信息,系统将生成默认配置?', {
277 277 btn : [ '我同意' ],
278 278 icon : 3,
279 279 shift: 5,
... ...
src/main/resources/static/pages/forecast/sample/css/main.css
... ... @@ -245,4 +245,12 @@ rect.f_rect{
245 245 #forecastSamplePanel .tab-content::-webkit-scrollbar-corner,
246 246 #forecastSamplePanel #trafficChart::-webkit-scrollbar-corner {
247 247 background: transparent;
  248 +}
  249 +
  250 +#forecastPopForm.form-horizontal .form-group{
  251 + margin: 15px 7px;
  252 +}
  253 +
  254 +#forecastPopForm.form-horizontal{
  255 + margin: 15px;
248 256 }
249 257 \ No newline at end of file
... ...
src/main/resources/static/pages/forecast/sample/main.html
... ... @@ -56,6 +56,51 @@
56 56 {{/each}}
57 57 </script>
58 58  
  59 +<script id="forecast_gps_create_temp" type="text/html">
  60 +<form class="form-horizontal" role="form" id="forecastPopForm">
  61 + <div class="form-body">
  62 + <div class="form-group">
  63 + <label class="col-md-3 control-label">线路</label>
  64 + <div class="col-md-9">
  65 + <input type="text" class="form-control" value="闵行11路" readonly>
  66 + </div>
  67 + </div>
  68 + <div class="form-group">
  69 + <label class="col-md-3 control-label">走向</label>
  70 + <div class="col-md-9">
  71 + <select class="form-control input-inline input-medium" readonly>
  72 + <option value="0">上行</option>
  73 + </select>
  74 + </div>
  75 + </div>
  76 +
  77 + <h6 style="margin: 20px 0;border-bottom: 1px solid #eeeeee;padding: 15px 0 10px;color: gray;">1、 告诉我应该使用哪些GPS数据</h6>
  78 + <div class="form-group">
  79 + <label class="col-md-3 control-label">gps起始时间</label>
  80 + <div class="col-md-9">
  81 + <input type="date" class="form-control" >
  82 + </div>
  83 + </div>
  84 + <div class="form-group">
  85 + <label class="col-md-3 control-label">gps截止时间</label>
  86 + <div class="col-md-9">
  87 + <input type="date" class="form-control" >
  88 + </div>
  89 + </div>
  90 +
  91 +
  92 + <h6 style="margin: 20px 0;border-bottom: 1px solid #eeeeee;padding: 15px 0 10px;color: gray;">2、 你想怎么划分时区</h6>
  93 + <div class="form-group">
  94 + <label class="col-md-3 control-label">...</label>
  95 + <div class="col-md-9">
  96 + <input type="date" class="form-control" >
  97 + </div>
  98 + </div>
  99 + </div>
  100 +</form>
  101 +</script>
  102 +
  103 +
59 104 <script src="/pages/forecast/sample/js/svg.js"></script>
60 105 <script>
61 106 !function(){
... ... @@ -74,12 +119,6 @@
74 119 opacity : .8
75 120 });
76 121  
77   -/* //路由
78   - $('.left_station_route .tab-content').slimscroll({
79   - height : 'calc(100% - 46px)',
80   - opacity : .8
81   - }); */
82   -
83 122 //上下行切换事件
84 123 $('.left_station_route .tabbable-line ul li').on('click', function(){setTimeout(drawSvg, 300);});
85 124  
... ... @@ -160,7 +199,7 @@
160 199  
161 200  
162 201 $('#gpsCreateDataLink').on('click', function(){
163   - var lineName = $('.line_config_tree ul li.selected button').text();
  202 + /* var lineName = $('.line_config_tree ul li.selected button').text();
164 203 var updownText = $('.left_station_route ul li.active a').text();
165 204  
166 205 layer.confirm('使用GPS轨迹生成【'+lineName+' -'+updownText+'】站点间耗时数据? 该操作将会清除原有数据。', {
... ... @@ -168,6 +207,23 @@
168 207 icon: 3
169 208 }, function(){
170 209  
  210 + }); */
  211 +
  212 + layer.open({
  213 + type: 1,
  214 + area: '530px',
  215 + maxmin: true,
  216 + content: template('forecast_gps_create_temp', {}),
  217 + shift: 5,
  218 + title: 'GPS生成数据',
  219 + success: function(){
  220 + /* dictionaryUtils.transformDom($('#childTaskDiv .nt-dictionary'));
  221 + $('#childTaskDiv').trigger('init', {
  222 + selected: schedul,
  223 + _data: _data,
  224 + _alone: _alone
  225 + }); */
  226 + }
171 227 });
172 228 });
173 229 }();
... ...
src/main/resources/static/pages/forecast/sample/modal.html
... ... @@ -39,7 +39,7 @@
39 39 </div>
40 40 </div>
41 41 <div class="form-group">
42   - <label class="col-md-3 control-label">时段:</label>
  42 + <label class="col-md-3 control-label">时段:</label>
43 43 <div class="col-md-4" style="padding-right: 0;">
44 44 <input type="time" class="form-control" name="sDate" value="{{obj.d.sDate}}" required>
45 45 </div>
... ... @@ -86,7 +86,7 @@
86 86 </div>
87 87 </div>
88 88 <div class="form-group">
89   - <label class="col-md-3 control-label">标签:</label>
  89 + <label class="col-md-3 control-label">时区:</label>
90 90 <div class="col-md-9">
91 91 <select class="form-control" name="tag" style="width:100%;" multiple required>
92 92 <option value="早高峰">早高峰</option>
... ... @@ -96,7 +96,7 @@
96 96 </div>
97 97 </div>
98 98 <div class="form-group">
99   - <label class="col-md-3 control-label">时段:</label>
  99 + <label class="col-md-3 control-label">时段:</label>
100 100 <div class="col-md-4" style="padding-right: 0;">
101 101 <input type="time" class="form-control" name="sDate" required>
102 102 </div>
... ...