潘钊 / bsth_control · Commits

Commit 1fab73e31ecb1affee109e896bf6c32930e2a860

Authored by 王通
1 parent 7fc92c20
build: skipped

1.加入版本之后部分内容修正

Inline Side-by-side
Showing 14 changed files with 451 additions and 1296 deletions
@@ -381,13 +381,6 @@ @@ -381,13 +381,6 @@
381 <artifactId>log4j-over-slf4j</artifactId> 381 <artifactId>log4j-over-slf4j</artifactId>
382 <version>1.7.7</version> 382 <version>1.7.7</version>
383 </dependency> 383 </dependency>
384 -  
385 - <!-- geotool -->  
386 - <dependency>  
387 - <groupId>org.locationtech.jts</groupId>  
388 - <artifactId>jts-core</artifactId>  
389 - <version>1.16.1</version>  
390 - </dependency>  
391 </dependencies> 384 </dependencies>
392 385
393 <dependencyManagement> 386 <dependencyManagement>
src/main/java/com/bsth/entity/Station.java
  View file @1fab73e
1 package com.bsth.entity; 1 package com.bsth.entity;
2 2
3 -import com.bsth.util.Geo.Point;  
4 import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 3 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
5 -import org.hibernate.annotations.Formula;  
6 -import org.locationtech.jts.geom.Geometry;  
7 -import org.locationtech.jts.io.WKBReader;  
8 4
9 import javax.persistence.*; 5 import javax.persistence.*;
10 -  
11 import java.util.Arrays; 6 import java.util.Arrays;
12 import java.util.Date; 7 import java.util.Date;
13 -import java.util.List;  
14 8
15 9
16 /** 10 /**
@@ -275,17 +269,6 @@ public class Station { @@ -275,17 +269,6 @@ public class Station {
275 this.bPolygonGrid = bPolygonGrid; 269 this.bPolygonGrid = bPolygonGrid;
276 } 270 }
277 271
278 - public String getBdPolygon() {  
279 - if (bPolygonGrid == null) {  
280 - return null;  
281 - }  
282 - Geometry geometry = getGeometryFromBytes(getbPolygonGrid());  
283 - if (geometry == null) {  
284 - return null;  
285 - }  
286 - return geometry.toString();  
287 - }  
288 -  
289 public Integer getDestroy() { 272 public Integer getDestroy() {
290 return destroy; 273 return destroy;
291 } 274 }
@@ -342,48 +325,6 @@ public class Station { @@ -342,48 +325,6 @@ public class Station {
342 this.updateDate = updateDate; 325 this.updateDate = updateDate;
343 } 326 }
344 327
345 - private static Geometry getGeometryFromBytes(byte[] geometryAsBytes) {  
346 - Geometry geometry = null;  
347 - try {  
348 - // 字节数组小于5，说明geometry有问题  
349 - if (geometryAsBytes.length < 5) {  
350 - throw new Exception("Invalid geometry inputStream - less than five bytes");  
351 - }  
352 -  
353 - //first four bytes of the geometry are the SRID,  
354 - //followed by the actual WKB. Determine the SRID  
355 - //这里是取字节数组的前4个来解析srid  
356 - byte[] sridBytes = new byte[4];  
357 - System.arraycopy(geometryAsBytes, 0, sridBytes, 0, 4);  
358 - boolean bigEndian = (geometryAsBytes[4] == 0x00);  
359 - // 解析srid  
360 - int srid = 0;  
361 - if (bigEndian) {  
362 - for (int i = 0; i < sridBytes.length; i++) {  
363 - srid = (srid << 8) + (sridBytes[i] & 0xff);  
364 - }  
365 - } else {  
366 - for (int i = 0; i < sridBytes.length; i++) {  
367 - srid += (sridBytes[i] & 0xff) << (8 * i);  
368 - }  
369 - }  
370 -  
371 - //use the JTS WKBReader for WKB parsing  
372 - WKBReader wkbReader = new WKBReader();  
373 - // 使用geotool的WKBReader 把字节数组转成geometry对象。  
374 - //copy the byte array, removing the first four  
375 - //SRID bytes  
376 - byte[] wkb = new byte[geometryAsBytes.length - 4];  
377 - System.arraycopy(geometryAsBytes, 4, wkb, 0, wkb.length);  
378 - geometry = wkbReader.read(wkb);  
379 - geometry.setSRID(srid);  
380 - } catch (Exception e) {  
381 - e.printStackTrace();  
382 - }  
383 -  
384 - return geometry;  
385 - }  
386 -  
387 @Override 328 @Override
388 public String toString() { 329 public String toString() {
389 return "Station [id=" + id + ", stationCod=" + stationCod + ", stationName=" + stationName + ", roadCoding=" 330 return "Station [id=" + id + ", stationCod=" + stationCod + ", stationName=" + stationName + ", roadCoding="
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @1fab73e
@@ -1180,14 +1180,19 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1180,14 +1180,19 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1180 result = "上传失败"; 1180 result = "上传失败";
1181 state = "0"; 1181 state = "0";
1182 } 1182 }
  1183 + logger.info("xml:" + sBuffer.toString());
  1184 + logger.info("上传结果:" + result);
1183 // 保存运管处上传记录 1185 // 保存运管处上传记录
1184 saveYgcUploadLog(ttinfoList,sBuffer.toString(),TrafficManageServiceImpl.UPLOAD_TYPE_SKB,state); 1186 saveYgcUploadLog(ttinfoList,sBuffer.toString(),TrafficManageServiceImpl.UPLOAD_TYPE_SKB,state);
  1187 + if(qp_ssop.setSKB(userNameOther_qp, passwordOther_qp, sBuffer.toString()).isSuccess()){
  1188 + result = "上传成功";
  1189 + }else{
  1190 + result = "上传失败";
  1191 + }
  1192 + logger.info("青浦上传结果:" + result);
1185 } catch (Exception e) { 1193 } catch (Exception e) {
1186 logger.error("setSKB:", e); 1194 logger.error("setSKB:", e);
1187 e.printStackTrace(); 1195 e.printStackTrace();
1188 - }finally{  
1189 - logger.info("setSKB:"+sBuffer.toString());  
1190 - logger.info("setSKB:"+result);  
1191 } 1196 }
1192 return result; 1197 return result;
1193 } 1198 }
src/main/resources/static/pages/base/stationroute/editsection_inout.html deleted 100644 → 0
  View file @7fc92c2
1 -<!-- 编辑路段 -->  
2 -<div class="modal fade" id="edit_section_mobal" role="basic" aria-hidden="true">  
3 - <div class="modal-dialog">  
4 - <div class="modal-content">  
5 - <div class="modal-header">  
6 - <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>  
7 - <h4 class="modal-title">路段修改</h4>  
8 - </div>  
9 - <div class="modal-body">  
10 - <form class="form-horizontal" role="form" id="edit_section_form" action="/module" method="post">  
11 - <div class="alert alert-danger display-hide"> <button class="close" data-close="alert"></button>  
12 - 您的输入有误，请检查下面的输入项  
13 - </div>  
14 - <!-- 线路ID -->  
15 - <input type="hidden" name="sectionId" id="section.id">  
16 - <input type="hidden" name="sectionRouteId" id="id">  
17 - <input type="hidden" name="sectionCode" id="section.sectionCode">  
18 - <input type="hidden" name="sectionRouteLine" id="lineId">  
19 - <input type="hidden" name="lineCode" id="lineCode">  
20 - <input type="hidden" name="bsectionVector" id="bsectionVector" />  
21 - <input type="hidden" name="csectionVector" id="csectionVector" value=""/>  
22 - <input type="hidden" name="dbType" id="dbType" value="b"/>  
23 - <input type="hidden" name="directions" id="dir">  
24 - <input type="hidden" name="speedLimit" id="speedLimit" >  
25 - <input type="hidden" name="roadCoding" id="roadCoding"/>  
26 - <input type="hidden" name="versions" id="versions"/>  
27 - <input type="hidden" name="start" id="start"/>  
28 - <input type="hidden" name="end" id="end"/>  
29 - <!-- 路段名称 -->  
30 - <div class="form-body">  
31 - <div class="form-group">  
32 - <label class="control-label col-md-3">  
33 - <span class="required"> * </span> 路段名称:  
34 - </label>  
35 - <div class="col-md-6">  
36 - <input type="text" class="form-control" name="sectionName" id="sectionName" placeholder="路段名称">  
37 - </div>  
38 - </div>  
39 - </div>  
40 - <!-- 路段序号 -->  
41 - <div class="form-body">  
42 - <div class="form-group">  
43 - <label class="control-label col-md-3">  
44 - 上一路段:  
45 - </label>  
46 - <div class="col-md-6">  
47 - <select name="sectionrouteCode" class="form-control" id="sectionrouteCode" style="width:100%"></select>  
48 - <span class="help-block">说明:选择的路段将作为本站序号的参考，成为选择路段的下一个路段。 </span>  
49 - </div>  
50 - </div>  
51 - </div>  
52 - </form>  
53 - </div>  
54 - <div class="modal-footer">  
55 - <button type="button" class="btn btn-primary" id="editSectionButton">提交数据</button>  
56 - <button type="button" class="btn default" data-dismiss="modal">取消</button>  
57 - </div>  
58 - </div>  
59 - </div>  
60 -</div>  
61 -<script type="text/javascript">  
62 -debugger;  
63 -$('#edit_section_mobal').on('editSectionMobal_show', function(e, map_,ajaxd,p,fun){  
64 - function setSectionFormValue(section) {  
65 - $('#edit_section_form input').each(function() {  
66 - $(this).val(eval('section.' + this.id));  
67 - });  
68 - }  
69 - var section = p.data;  
70 - var lineId = section.lineCode, version = section.versions, start = section.start, end = section.end;  
71 - setSectionFormValue(section);  
72 - // 获取路段号元素，并添加下拉属性值  
73 - ajaxd.getRouteByStartEnd(lineId,version,start, end,function(result) {  
74 - var routes = result.data.routes,paramsD =new Array();  
75 - var eq_scetionRouteCode = section.sectionrouteCode;  
76 - paramsD.push({'id':'请选择...','text':'将此路段设置位第一个路段'});  
77 - // 遍历  
78 - $.each(routes, function(i, g){  
79 - // 判断.  
80 - if(g.section.sectionName) {  
81 - var ptions_v = g.sectionrouteCode;  
82 - if(eq_scetionRouteCode != ptions_v) {  
83 - // 添加拼音检索下拉框格式数据数组.  
84 - paramsD.push({'id':ptions_v,  
85 - 'text':g.section.sectionName + '(' + ptions_v + ')'});  
86 - }  
87 - }  
88 - });  
89 - // 初始化上一个路段拼音检索下拉框.  
90 - initPinYinSelect2($('#sectionrouteCode'),paramsD,function(selector) {  
91 - if(paramsD.length > 0) {  
92 - var upStationRouteCode = paramsD[paramsD.length - 1].sectionrouteCode;  
93 - $('#sectionrouteCode').select2('val',upStationRouteCode);  
94 - }else {  
95 - $('#sectionrouteCode').select2('val','请选择...');  
96 - }  
97 - });  
98 - });  
99 - // 显示mobal  
100 - $('#edit_section_mobal').modal({show : true,backdrop: 'static',keyboard: false});//  
101 - // 当调用 hide 实例方法时触发  
102 - $('#edit_section_mobal').on('hide.bs.modal', function () {  
103 - closeMobleSetClean();  
104 - });  
105 - function closeMobleSetClean() {  
106 - // 清除地图覆盖物  
107 - map_.clearMarkAndOverlays();  
108 - $('#inoutSearch').click();  
109 - fun.editAChangeCssRemoveDisabled();  
110 - //ajaxd.getSectionRouteInfo(lineId,dir,$("#versions").val(),function(data) {  
111 - // fun.linePanlThree(lineId,data,dir);  
112 - //});  
113 - setTimeout(function () {  
114 - map_.openSectionInfoWin_inout(p);  
115 - },1000);  
116 - }  
117 - // 编辑表单元素  
118 - var form = $('#edit_section_form');  
119 - // 获取错误提示元素  
120 - var error = $('.alert-danger', form);  
121 - // 提交数据按钮事件  
122 - $('#editSectionButton').on('click', function() {  
123 - // 表单提交  
124 - form.submit();  
125 - });  
126 - // 表单验证  
127 - form.validate({  
128 - errorElement : 'span',  
129 - errorClass : 'help-block help-block-error',  
130 - focusInvalid : false,  
131 - rules : {  
132 - 'sectionName' : {required : true,maxlength:50}  
133 - },  
134 - invalidHandler : function(event, validator) {  
135 - error.show();  
136 - App.scrollTo(error, -200);  
137 - },  
138 - highlight : function(element) {  
139 - $(element).closest('.form-group').addClass('has-error');  
140 - },  
141 - unhighlight : function(element) {  
142 - $(element).closest('.form-group').removeClass('has-error');  
143 - },  
144 - success : function(label) {  
145 - label.closest('.form-group').removeClass('has-error');  
146 - },  
147 - submitHandler : function(f) {  
148 - // 获取折线坐标集合  
149 - var editPloyLineArray = p.getPath();  
150 - // 折线坐标集合  
151 - $('#bsectionVector').val(JSON.stringify(editPloyLineArray));  
152 - var params = form.serializeJSON();  
153 - params.destroy=0;  
154 - params.sectionDistance=0;  
155 - params.sectionTime=0;  
156 - params.status=$($("#versions").find("option:selected")[0]).attr("status");  
157 - error.hide();  
158 - debugger  
159 - if(params.sectionrouteCode=='请选择...')  
160 - params.sectionrouteCode='';  
161 - ajaxd.inoutSectionUpdate(params,function(resuntDate) {  
162 - if(resuntDate.status=='SUCCESS') {  
163 - // 弹出添加成功提示消息  
164 - layer.msg('修改成功...');  
165 - }else {  
166 - // 弹出添加失败提示消息  
167 - layer.msg('修改失败...');  
168 - }  
169 - $('#edit_section_mobal').modal('hide');  
170 - var dir = params.directions  
171 - closeMobleSetClean();  
172 - });  
173 - }  
174 - });  
175 -});  
176 -</script>  
177 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
  View file @1fab73e
@@ -189,41 +189,6 @@ var GetAjaxData = function(){ @@ -189,41 +189,6 @@ var GetAjaxData = function(){
189 189
190 }); 190 });
191 191
192 - },  
193 -  
194 - // 编辑线路走向保存  
195 - inoutSectionUpdate:function(section,callback) {  
196 - $post('/inout/sectionUpdate',section,function(data) {  
197 - callback && callback(data);  
198 - })  
199 - },  
200 -  
201 - // 生成线路走向  
202 - inoutSectionSave:function(section,callback){  
203 - $post('/inout/sectionSave',section,function(data) {  
204 - callback && callback(data);  
205 - })  
206 - },  
207 -  
208 - // 根据线路查找进出场的起终点信息  
209 - getStartEndByLine: function (lineId, version, cb) {  
210 - $get('/inout/getStartEndByLine', {lineId : lineId, version : version}, function (r) {  
211 - return cb && cb(r);  
212 - });  
213 - },  
214 -  
215 - // 根据起终点查找对应的路段信息  
216 - getRouteByStartEnd: function (lineId, version, start, end, cb) {  
217 - $get('/inout/getRouteByStartEnd', {lineId : lineId, version : version, start : start, end : end}, function (r) {  
218 - return cb && cb(r);  
219 - });  
220 - },  
221 -  
222 - // 根据ID查询路段信息.  
223 - getRouteInfoById : function(sectionRouteId,callback){  
224 - $get('/inout/' + sectionRouteId,{},function(r) {  
225 - return callback && callback(r);  
226 - });  
227 } 192 }
228 }; 193 };
229 return ajaxData; 194 return ajaxData;
src/main/resources/static/pages/base/stationroute/js/stationroute-list-events.js
  View file @1fab73e
@@ -376,15 +376,4 @@ $(function(){ @@ -376,15 +376,4 @@ $(function(){
376 } 376 }
377 }); 377 });
378 }) 378 })
379 -  
380 - // 进出场规划  
381 - $('#leftUpOrDown #inoutLine').on('click', function(){  
382 - var lineIdEvents = LineObj.getLineObj();  
383 -  
384 - var val = $("#versions").val();  
385 -  
386 - /** 初始化上行树 @param：<Line.id：线路Id；0:上行> */  
387 - PublicFunctions.resjtreeDate(lineIdEvents.id,'3',val);  
388 -  
389 - });  
390 }); 379 });
391 \ No newline at end of file 380 \ No newline at end of file
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
  View file @1fab73e
@@ -82,105 +82,6 @@ var PublicFunctions = function () { @@ -82,105 +82,6 @@ var PublicFunctions = function () {
82 } 82 }
83 83
84 var status = $($("#versions").find("option:selected")[0]).attr("status"); 84 var status = $($("#versions").find("option:selected")[0]).attr("status");
85 - if (directionData == 3) {  
86 - // 隐藏上行规划  
87 - $('#upToolsMobal').hide();  
88 - // 隐藏上行树  
89 - $('#uptreeMobal').hide();  
90 - // 隐藏下行规划  
91 - $('#downToolsMobal').hide();  
92 - // 隐藏下行树  
93 - $('#DowntreeMobal').hide();  
94 - //  
95 - $('#InoutCarparktreeMobal .table-toolbar').hide();  
96 -  
97 - GetAjaxData.getStartEndByLine(id, version, function (result) {  
98 - if (result.data) {  
99 - $('#InoutCarparktreeMobal').show();  
100 - var formHtml = template('inout-carpark-search-form');  
101 - $('.inout-search').html(formHtml);  
102 -  
103 - $('#startPoint').html(PubFun.startOrEndPoint(result.data.start, result.data.carpark));  
104 - $('#endPoint').html(PubFun.startOrEndPoint(result.data.end, result.data.carpark));  
105 - $('#startPoint').on('change', function () {  
106 - $('#InoutCarparktreeMobal .table-toolbar').hide();  
107 - });  
108 - $('#endPoint').on('change', function () {  
109 - $('#InoutCarparktreeMobal .table-toolbar').hide();  
110 - });  
111 - $('#inoutSearch').on('click', function () {  
112 - var start = $('#startPoint').val().split('_'), end = $('#endPoint').val().split('_');  
113 - if (start[1] == end[1]) {  
114 - layer.msg('进出场的站点不可能同时为站点或停车场');  
115 - return;  
116 - }  
117 -  
118 - $('#inout_carpark_tree').show();  
119 - $('#InoutCarparktreeMobal .table-toolbar').show();  
120 -  
121 - GetAjaxData.getRouteByStartEnd(id, version, start[0], end[0], function(result1) {  
122 - var routes = result1.data.routes, rootNode;  
123 - WorldsBMap.clearMarkAndOverlays();  
124 - var startPoint = mapData[start.join('_')], endPoint = mapData[end.join('_')], point, points;  
125 - if (startPoint.shapesType === 'r') {  
126 - point = startPoint.bdPoint.split(' ');  
127 - WorldsBMap.drawCircle({lng : point[0], lat : point[1]}, startPoint.radius, startPoint.stationName, true);  
128 - } else if (startPoint.shapesType === 'd') {  
129 - points = startPoint.bdPoints;  
130 - points = points.replace('POLYGON ((', '').replace('POLYGON((', '').replaceAll(', ', ',').replace('))', '');  
131 - points = points.split(',')  
132 - WorldsBMap.drawPolygon(points, startPoint.stationName, true);  
133 - }  
134 -  
135 - if (endPoint.shapesType === 'r') {  
136 - point = endPoint.bdPoint.split(' ');  
137 - WorldsBMap.drawCircle({lng : point[0], lat : point[1]}, endPoint.radius, endPoint.stationName, true);  
138 - } else if (endPoint.shapesType === 'd') {  
139 - points = endPoint.bdPoints;  
140 - points = points.replace('POLYGON ((', '').replace('POLYGON((', '').replaceAll(', ', ',').replace('))', '');  
141 - points = points.split(',')  
142 - WorldsBMap.drawPolygon(points, endPoint.stationName, true);  
143 - }  
144 -  
145 - rootNode = {id: -1, pId: null, name: '路段', text: '路段', icon: null, groupType: 2, container : 'pjax-container', enable : true, children: routes};  
146 - if (routes.length > 0) {  
147 - for (var i = 0,route;i < routes.length;i++) {  
148 - route = routes[i];  
149 - route.pId = 1;  
150 - route.name = route.section.sectionName;  
151 - route.text = route.section.sectionName;  
152 - route.icon = null;  
153 - route.groupType = 3;  
154 - route.chaildredType = 'section';  
155 - route.enable = true;  
156 - route.lineId = id;  
157 - route.lineCode = id;  
158 - route.versions = version;  
159 - route.dir = 3;  
160 - route.start = start[0];  
161 - route.end = end[0];  
162 - route.sectionrouteId = route.id;  
163 - route.sectionName = route.section.sectionName;  
164 - route.sectionBsectionVector = route.section.bsectionVector;  
165 - points = route.section.bsectionVector.replace('LINESTRING(', '').replace(')', '');  
166 - points = points.split(',');  
167 - WorldsBMap.drawPolyLine(points, route, start[0], end[0]);  
168 - }  
169 - } else {  
170 - rootNode.children = [{id: 0, pId: -1, name: '添加路段', text: '添加路段', lineId: id, lineCode: id, versions: version, dir: 3, start: start[0], end: end[0], icon: null, groupType: 3, container : 'pjax-container', enable : true, chaildredType: status > 0 ? 'addSection' : '', sectionBsectionVector: 'LINESTRING(' + startPoint.bdPoint + ')'}];  
171 - }  
172 - StationTreeData.inoutInit([rootNode]);  
173 - StationTreeData.inoutreloadeTree([rootNode]);  
174 - });  
175 - });  
176 - } else {  
177 - layer.msg(result.msg);  
178 - }  
179 - });  
180 - } else {  
181 - $('#InoutCarparktreeMobal').hide();  
182 - $('#inout_carpark_tree').hide();  
183 - }  
184 85
185 // 获取树数据 86 // 获取树数据
186 GetAjaxData.getStation(id,directionData,version,function(treeDateJson) { 87 GetAjaxData.getStation(id,directionData,version,function(treeDateJson) {
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
  View file @1fab73e
@@ -926,7 +926,6 @@ window.WorldsBMap = function () { @@ -926,7 +926,6 @@ window.WorldsBMap = function () {
926 if (p.data.sectionrouteId == sectionRoudId) { 926 if (p.data.sectionrouteId == sectionRoudId) {
927 switch (p.data.dir) { 927 switch (p.data.dir) {
928 case 3: 928 case 3:
929 - WorldsBMap.openSectionInfoWin_inout(p);  
930 break; 929 break;
931 default: 930 default:
932 WorldsBMap.openSectionInfoWin(p); 931 WorldsBMap.openSectionInfoWin(p);
@@ -1039,40 +1038,21 @@ window.WorldsBMap = function () { @@ -1039,40 +1038,21 @@ window.WorldsBMap = function () {
1039 params.end = stecion.end; 1038 params.end = stecion.end;
1040 1039
1041 params.status=$($("#versions").find("option:selected")[0]).attr("status"); 1040 params.status=$($("#versions").find("option:selected")[0]).attr("status");
1042 - if (dir == 3) {  
1043 - GetAjaxData.inoutSectionSave(params, function (result) {  
1044 - if(result.status =="SUCCESS"){  
1045 - $('.main_left_panel_m_layer').hide();  
1046 - $(btn).parents('.buffer_edit_body').parent().remove();  
1047 - PublicFunctions.editMapStatusRemove();  
1048 - //PublicFunctions.resjtreeDate(lineId,dir,$("#versions").val());  
1049 - $('#inoutSearch').click();  
1050 - PublicFunctions.editAChangeCssRemoveDisabled();  
1051 -// GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {  
1052 -// PublicFunctions.linePanlThree(lineId,data,dir);  
1053 -// });  
1054 - layer.msg("添加成功！");  
1055 - } else if(result.status =="ERROR") {  
1056 - layer.msg("添加失败！");  
1057 - }  
1058 - });  
1059 - } else {  
1060 - GetAjaxData.sectionSave(params, function (result) {  
1061 - if(result.status =="SUCCESS"){  
1062 - $('.main_left_panel_m_layer').hide();  
1063 - $(btn).parents('.buffer_edit_body').parent().remove();  
1064 - PublicFunctions.editMapStatusRemove();  
1065 - PublicFunctions.resjtreeDate(lineId,dir,$("#versions").val());  
1066 - PublicFunctions.editAChangeCssRemoveDisabled(); 1041 + GetAjaxData.sectionSave(params, function (result) {
  1042 + if(result.status =="SUCCESS"){
  1043 + $('.main_left_panel_m_layer').hide();
  1044 + $(btn).parents('.buffer_edit_body').parent().remove();
  1045 + PublicFunctions.editMapStatusRemove();
  1046 + PublicFunctions.resjtreeDate(lineId,dir,$("#versions").val());
  1047 + PublicFunctions.editAChangeCssRemoveDisabled();
1067 // GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) { 1048 // GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {
1068 // PublicFunctions.linePanlThree(lineId,data,dir); 1049 // PublicFunctions.linePanlThree(lineId,data,dir);
1069 // }); 1050 // });
1070 - layer.msg("添加成功！");  
1071 - } else if(result.status =="ERROR") {  
1072 - layer.msg("添加失败！");  
1073 - }  
1074 - });  
1075 - } 1051 + layer.msg("添加成功！");
  1052 + } else if(result.status =="ERROR") {
  1053 + layer.msg("添加失败！");
  1054 + }
  1055 + });
1076 }); 1056 });
1077 } else if(!sectionName){ 1057 } else if(!sectionName){
1078 layer.msg('请填写路段名字！'); 1058 layer.msg('请填写路段名字！');
@@ -1544,282 +1524,7 @@ window.WorldsBMap = function () { @@ -1544,282 +1524,7 @@ window.WorldsBMap = function () {
1544 myRichMarker.ct_source = '1'; 1524 myRichMarker.ct_source = '1';
1545 mapBValue.addOverlay(myRichMarker); 1525 mapBValue.addOverlay(myRichMarker);
1546 } 1526 }
1547 - },  
1548 -  
1549 - drawPolyLine: function (points, data, start, end) {  
1550 - var bdPoints = new Array(), i = 0, point, polyline;  
1551 - for (i = 0;i < points.length;i++) {  
1552 - point = points[i].split(' ');  
1553 - bdPoints.push(new BMap.Point(point[0], point[1]));  
1554 - }  
1555 - // 创建线路走向  
1556 - polyline = new BMap.Polyline(bdPoints, {  
1557 - strokeColor: 'red',  
1558 - strokeWeight: 6,  
1559 - strokeOpacity: 0.7  
1560 - });  
1561 -  
1562 - polyline.data = data;  
1563 - polyline.start = start;  
1564 - polyline.end = end;  
1565 - polyline.ct_source = '1';  
1566 - // 把折线添加到地图上  
1567 - mapBValue.addOverlay(polyline);  
1568 - // 聚焦事件  
1569 - polyline.addEventListener('mousemove', function (e) {  
1570 - if (this != editPolyline)  
1571 - this.setStrokeColor("#20bd26");  
1572 - });  
1573 - // 失去焦点  
1574 - polyline.addEventListener('mouseout', function (e) {  
1575 - if (this != editPolyline && this != road_win_show_p)  
1576 - this.setStrokeColor("red");  
1577 - });  
1578 - // 添加单击事件  
1579 - polyline.addEventListener('onclick', function (e) {  
1580 - // 打开信息窗口  
1581 - if (map_status != 1)  
1582 - WorldsBMap.openSectionInfoWin_inout(this);  
1583 - });  
1584 - // 添加右击事件  
1585 - polyline.addEventListener('rightclick', function (e) {  
1586 - if (currentSection.enableEditing) {  
1587 - this.disableEditing();  
1588 - WorldsBMap.saveSection_inout(this);  
1589 - }  
1590 - });  
1591 - sectionArray.push(polyline);  
1592 - },  
1593 -  
1594 - // 打开路段信息窗口  
1595 - openSectionInfoWin_inout: function(p) {  
1596 - var section = p.data;  
1597 - var dir = section.sectionrouteDirections;  
1598 - var width = WorldsBMap.strGetLength(section.sectionName) * 10;  
1599 - // 信息窗口参数属性  
1600 - var opts = {  
1601 - // 信息窗口宽度  
1602 - width: (width < 200 ? 200 : width),  
1603 - // 信息窗口高度  
1604 - height: 150,  
1605 - //设置不允许信窗发送短息  
1606 - enableMessage: false,  
1607 - //是否开启点击地图关闭信息窗口  
1608 - enableCloseOnClick: false,  
1609 - // 是否开启信息窗口打开时地图自动移动（默认开启）。(自 1.1 新增)  
1610 - enableAutoPan: false  
1611 - };  
1612 - var htm = '<span style="color: #ff8355;font-size: 18px;">' + section.sectionName + '</span>' +  
1613 - '<span class="help-block" >路段编码：' + section.sectionCode + '</span>' +  
1614 - '<span class="help-block" >路段序号：' + section.sectionrouteCode + '</span>' +  
1615 - '<span class="help-block" >版本号&nbsp&nbsp：' + section.versions + '</span>' +  
1616 - '<div >';  
1617 -  
1618 - if($($("#versions").find("option:selected")[0]).attr("status") > 0){  
1619 - htm += '<button class="info_win_btn" id="editStation" onclick="WorldsBMap.editSection_inout(' + section.sectionrouteId +','+dir+ ')">修改</button>' +  
1620 - '<button class="info_win_btn" id="addBetweenStationRoad" onclick="WorldsBMap.destroySection_inout('+ section.sectionrouteId + ','+section.sectionrouteLine+','+section.sectionrouteDirections+')">撤销</button>' +  
1621 - '<button class="info_win_btn" id="addSectionAfter" onclick="WorldsBMap.addSectionAfter_inout('+section.sectionrouteId+')">添加路段(之后)</button>' +  
1622 - '</div>';  
1623 - }  
1624 -  
1625 - // 创建信息窗口  
1626 - var infoWindow_target = new BMap.InfoWindow(htm, opts);  
1627 - // 切割段折线坐标字符串  
1628 - var sectionStr = section.sectionBsectionVector.substring(11, section.sectionBsectionVector.length - 1);  
1629 - // 分割折线坐标字符串  
1630 - var lineArray = sectionStr.split(',');  
1631 - var sectionArray = [];  
1632 - for (var i = 0; i < lineArray.length; i++) {  
1633 - sectionArray.push(new BMap.Point(lineArray[i].split(' ')[0], lineArray[i].split(' ')[1]));  
1634 - }  
1635 - // 计算中间点  
1636 - var index = parseInt(sectionArray.length / 2);  
1637 - var centerPoint = sectionArray[index];  
1638 - //close event  
1639 - infoWindow_target.addEventListener('close', function (e) {  
1640 - p.setStrokeColor("red");  
1641 - road_win_show_p = null;  
1642 - });  
1643 - //open event  
1644 - infoWindow_target.addEventListener('open', function (e) {  
1645 - p.setStrokeColor("#20bd26");  
1646 - road_win_show_p = p;  
1647 - });  
1648 - //开启信息窗口  
1649 - mapBValue.openInfoWindow(infoWindow_target, centerPoint);  
1650 - mapBValue.panTo(centerPoint);  
1651 - },  
1652 -  
1653 - /**  
1654 - * 进出场路段设置为编辑状态  
1655 - */  
1656 - editSection_inout: function(sectionRoudId) {  
1657 - layer.confirm('进入编辑状态', {  
1658 - btn : [ '确定','返回' ], icon: 3, title:'提示'  
1659 - }, function() {  
1660 - PublicFunctions.editMapStatus(dir);  
1661 - layer.msg('双击保存路段');  
1662 - var p;  
1663 - for (var i = 0; p = sectionArray[i++];) {  
1664 - if (p.data.sectionrouteId == sectionRoudId) {  
1665 - mapBValue.closeInfoWindow();//关闭infoWindow  
1666 - p.enableEditing();  
1667 - p.setStrokeColor('blue');  
1668 - editPolyline = p;  
1669 - break;  
1670 - }  
1671 - }  
1672 - // 路段中间点为中心  
1673 - var section = p.data;  
1674 - var sectionStr = section.sectionBsectionVector.substring(11, section.sectionBsectionVector.length - 1);  
1675 - // 分割折线坐标字符串  
1676 - var lineArray = sectionStr.split(',');  
1677 - var sectionPointArray = [];  
1678 - for (var i = 0; i < lineArray.length; i++) {  
1679 - sectionPointArray.push(new BMap.Point(lineArray[i].split(' ')[0], lineArray[i].split(' ')[1]));  
1680 - }  
1681 - // 计算中间点  
1682 - var index = parseInt(sectionPointArray.length / 2);  
1683 - var centerPoint = sectionPointArray[index];  
1684 - mapBValue.centerAndZoom(centerPoint, 17);  
1685 - // var c = p.ia[Math.floor(p.ia.length/2)];  
1686 - // mapBValue.centerAndZoom(new BMap.Point(c.lng, c.lat), 18);  
1687 - p.addEventListener('dblclick', function () {  
1688 - /** 设置修改路段集合对象为空 */  
1689 - editPolyline = '';  
1690 - PublicFunctions.editMapStatusRemove();  
1691 - $.get('editsection_inout.html', function(m){  
1692 - $('body').append(m);  
1693 - $('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap,GetAjaxData,p,PublicFunctions]);  
1694 - });  
1695 - });  
1696 - });  
1697 - },  
1698 -  
1699 - // 撤销路段  
1700 - destroySection_inout : function(sectionRoudId) {  
1701 - layer.confirm('你确定要撤销此路段吗？', {  
1702 - btn : [ '撤销','返回' ], icon: 3, title:'提示'  
1703 - }, function(){  
1704 - var status = $($("#versions").find("option:selected")[0]).attr("status");  
1705 - $.post('/inout/destroy',{'id': sectionRoudId,status:status},function(resuntDate) {  
1706 - if (resuntDate.status == 'SUCCESS') {  
1707 - // 弹出添加成功提示消息  
1708 - layer.msg('撤销成功!');  
1709 - } else {  
1710 - // 弹出添加失败提示消息  
1711 - layer.msg('撤销失败!');  
1712 - }  
1713 - // 刷新左边树  
1714 - $('#inoutSearch').click();  
1715 - /** 查询路段信息 @param:<Line.id：线路Id；delBatch.dir：方向> @return：data：路段数据 */  
1716 -// GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {  
1717 -// /** 在地图上画出线路走向 @param:<Line.id：线路Id；delBatch.dir：方向；data：路段数据> */  
1718 -// PublicFunctions.linePanlThree(lineId,data,dir);  
1719 -// });  
1720 - });  
1721 - });  
1722 - },  
1723 -  
1724 - // 添加在路段之后  
1725 - addSectionAfter_inout : function(sectionRoudId) {  
1726 - //order = after before;  
1727 - var beforeSection;  
1728 - // 关闭信息窗口  
1729 - mapBValue.closeInfoWindow();  
1730 - PublicFunctions.editMapStatus();  
1731 - // 把数据填充到模版中  
1732 - var addSectionHTML = template('add_draw_polyline-temp',{ 'id': sectionRoudId});  
1733 - $('body .mian-portlet-body').append(addSectionHTML);  
1734 - //暂停和开始绘制  
1735 - $('.draw_polyline_switch>a').on('click', function () {  
1736 - var t = $(this).text();  
1737 - if(t=='暂停绘制'){  
1738 - WorldsBMap.exitDrawStatus();  
1739 - $(this).text('开始绘制');  
1740 - }  
1741 - else{  
1742 - WorldsBMap.openDrawStatus();  
1743 - $(this).text('暂停绘制');  
1744 - }  
1745 - });  
1746 -  
1747 - //取消  
1748 - $('#addSectionCancelBtn').on('click', function () {  
1749 - $('.main_left_panel_m_layer').hide();  
1750 - $(this).parents('.buffer_edit_body').parent().remove();  
1751 - WorldsBMap.exitDrawStatus();  
1752 - PublicFunctions.editMapStatusRemove();  
1753 - });  
1754 - GetAjaxData.getRouteInfoById(sectionRoudId, function(data){  
1755 - beforeSection = data;  
1756 - beforeSection.sectionBsectionVector = beforeSection.section.bsectionVector;  
1757 - WorldsBMap.showAddSectionPanel(beforeSection);  
1758 - });  
1759 -  
1760 - //确定  
1761 - $('#addSectionSbmintBtn').on('click', function () {  
1762 - var btn = this;  
1763 - $('#addSectionSbmintBtn').addClass("disabled");  
1764 - var sectionName = $('#sectionNameInput').val();  
1765 - var bsectionVector = $('#bsectionVectorInput').val();  
1766 - var params = {};  
1767 - if(sectionName && bsectionVector) {  
1768 - WorldsBMap.exitDrawStatus();  
1769 - GetAjaxData.getSectionCode(function(sectionCode) {  
1770 - params.lineId = beforeSection.line.id;  
1771 - params.lineCode = beforeSection.lineCode;  
1772 - params.sectionCode = sectionCode;// 设值路段编码.  
1773 - params.sectionName = sectionName;  
1774 - params.roadCoding = '';  
1775 - params.dbType = 'b';  
1776 - params.bsectionVector = bsectionVector;  
1777 - params.sectionrouteCode = beforeSection.sectionrouteCode+"_0";  
1778 - params.sectionTime = 0;  
1779 - params.sectionDistance = 60;  
1780 - params.speedLimit = 0;  
1781 - params.versions = beforeSection.versions;  
1782 - params.destroy = 0;  
1783 - params.directions = beforeSection.directions;  
1784 - params.descriptions = '';  
1785 - params.start = beforeSection.start;  
1786 - params.end = beforeSection.end;  
1787 - params.status=$($("#versions").find("option:selected")[0]).attr("status");  
1788 -  
1789 - GetAjaxData.inoutSectionSave(params, function (result) {  
1790 - if(result.status =="SUCCESS"){  
1791 - $('.main_left_panel_m_layer').hide();  
1792 - $(btn).parents('.buffer_edit_body').parent().remove();  
1793 - PublicFunctions.editMapStatusRemove();  
1794 - $('#inoutSearch').click();  
1795 - PublicFunctions.editAChangeCssRemoveDisabled();  
1796 -// GetAjaxData.getSectionRouteInfo(lineId,dir,function(data) {  
1797 -// PublicFunctions.linePanlThree(lineId,data,dir);  
1798 -// });  
1799 - layer.msg("添加成功！");  
1800 - } else if(result.status =="ERROR") {  
1801 - layer.msg("添加失败！");  
1802 - }  
1803 - });  
1804 - });  
1805 - } else if(!sectionName){  
1806 - layer.msg('请填写路段名字！');  
1807 - } else if(!bsectionVector)  
1808 - layer.msg('请先绘制路段！');  
1809 - setTimeout(function () {  
1810 - $("#addSectionSbmintBtn").removeClass("disabled");  
1811 - },1000);  
1812 - });  
1813 - },  
1814 - /**  
1815 - * 保存进出场路段  
1816 - */  
1817 - saveSection_inout: function () {  
1818 - $.get('editsection_inout.html', function(m){  
1819 - $('body').append(m);  
1820 - $('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap,GetAjaxData,currentSection,PublicFunctions]);  
1821 - });  
1822 - }, 1527 + }
1823 }; 1528 };
1824 1529
1825 return Bmap; 1530 return Bmap;
src/main/resources/static/pages/base/stationroute/js/stationroute-list-reload.js
  View file @1fab73e
@@ -72,12 +72,8 @@ $(function() { @@ -72,12 +72,8 @@ $(function() {
72 $('#stationDown').removeClass('active'); 72 $('#stationDown').removeClass('active');
73 $('#stationDown').removeClass('in'); 73 $('#stationDown').removeClass('in');
74 $('#stationDown').addClass('fade'); 74 $('#stationDown').addClass('fade');
75 - $('#inoutCarpark').removeClass('active');  
76 - $('#inoutCarpark').removeClass('in');  
77 - $('#inoutCarpark').addClass('fade');  
78 $('#stationUp').addClass('active in'); 75 $('#stationUp').addClass('active in');
79 $('#downLine').parent().removeClass('active'); 76 $('#downLine').parent().removeClass('active');
80 - $('#inoutLine').parent().removeClass('active');  
81 $('#upLine').parent().addClass('active'); 77 $('#upLine').parent().addClass('active');
82 78
83 if ($($("#versions").find("option:selected")[0]).attr("status") > 0) { 79 if ($($("#versions").find("option:selected")[0]).attr("status") > 0) {
src/main/resources/static/pages/base/stationroute/js/stationroute-list-treedata.js
  View file @1fab73e
@@ -159,44 +159,6 @@ var StationTreeData = function(){ @@ -159,44 +159,6 @@ var StationTreeData = function(){
159 }); 159 });
160 } 160 }
161 }, 161 },
162 - inoutInit : function(treeDateJson) {  
163 - // 如果不为空  
164 - if(treeDateJson) {  
165 - // 树初始化load事件  
166 - $('#inout_carpark_tree').on('loaded.jstree', function(e, data){  
167 - // 展开树  
168 - $.jstree.reference("#inout_carpark_tree").open_all();  
169 - }).jstree({  
170 - 'core' : {  
171 - 'themes' : {  
172 - 'responsive': false  
173 - },  
174 - 'data': treeDateJson,  
175 - 'multiple':false  
176 - },  
177 - 'types' : {  
178 - "default" : {  
179 - "icon" : false  
180 - },  
181 - 'enable_true' : {  
182 - "icon" : 'fa fa-check icon-lg'  
183 - },  
184 - 'enable_false' : {  
185 - 'icon' : 'fa fa-close icon-lg'  
186 - },  
187 - 'group':{  
188 - 'icon' : 'fa fa-object-group icon-lg'  
189 - }  
190 - },  
191 - 'plugins': ['types']  
192 - // 树节点单击事件  
193 - }).bind('click.jstree', function(event) {  
194 - // 获取下行选中树节点  
195 - var treeOjb = $.jstree.reference("#inout_carpark_tree").get_selected(true);  
196 - TreeOnclickEvent(treeOjb);  
197 - });  
198 - }  
199 - },  
200 upreloadeTree : function (treeDateJson) { 162 upreloadeTree : function (treeDateJson) {
201 // 获取上行树 163 // 获取上行树
202 var tree = $.jstree.reference('#station_Up_tree'); 164 var tree = $.jstree.reference('#station_Up_tree');
@@ -220,18 +182,6 @@ var StationTreeData = function(){ @@ -220,18 +182,6 @@ var StationTreeData = function(){
220 setTimeout(function () { 182 setTimeout(function () {
221 tree.open_all(); 183 tree.open_all();
222 },500); 184 },500);
223 - },  
224 - inoutreloadeTree : function (treeDateJson) {  
225 - // 获取下行树  
226 - var tree = $.jstree.reference('#inout_carpark_tree');  
227 - // 赋值数据  
228 - tree.settings.core.data = treeDateJson;  
229 - // 刷行下行树  
230 - tree.refresh();  
231 - // 展开树  
232 - setTimeout(function () {  
233 - tree.open_all();  
234 - },500);  
235 } 185 }
236 } 186 }
237 187
src/main/resources/static/pages/base/stationroute/list.html
  View file @1fab73e
@@ -340,33 +340,6 @@ @@ -340,33 +340,6 @@
340 </div> 340 </div>
341 </script> 341 </script>
342 342
343 -<script id="inout-carpark-search-form" type="text/html">  
344 - <div class="form-horizontal">  
345 - <div class="form-group">  
346 - <div class="col-md-3 col-sm-3 col-xs-3">  
347 - <label class="uk-form-label">起点</label>  
348 - </div>  
349 - <div class="col-md-9 col-sm-9 col-xs-9">  
350 - <select class="form-control" name="startPoint" id="startPoint"></select>  
351 - </div>  
352 - </div>  
353 - <div class="form-group">  
354 - <div class="col-md-3 col-sm-3 col-xs-3">  
355 - <label class="uk-form-label">终点</label>  
356 - </div>  
357 - <div class="col-md-9 col-sm-9 col-xs-9">  
358 - <select class="form-control" name="endPoint" id="endPoint"></select>  
359 - </div>  
360 - </div>  
361 - <div class="form-group">  
362 - <div class="col-md-6"></div>  
363 - <div class="col-md-6 btns">  
364 - <button class="btn-sm" style="float: right;" id="inoutSearch">搜索</button>  
365 - </div>  
366 - </div>  
367 - </div>  
368 -</script>  
369 -  
370 <script type="text/javascript"> 343 <script type="text/javascript">
371 setTimeout(function () { 344 setTimeout(function () {
372 // 百度地图API功能 345 // 百度地图API功能
@@ -442,21 +415,5 @@ @@ -442,21 +415,5 @@
442 myValue = $("#searchInput").val(); 415 myValue = $("#searchInput").val();
443 setPlace(); 416 setPlace();
444 }); 417 });
445 -  
446 - $('#historyGps').on('click', function() {  
447 - $.get('/pages/base/stationroute/list_template.html', function (content) {  
448 - window.layerIdx = layer.open({  
449 - type: 1,  
450 - move: false,  
451 - area: ['800px', '600px'],  
452 - content: content,  
453 - title: '选择班次(为前一天班次，请选择GPS自动完成的班次)',  
454 - shift: 5,  
455 - scrollbar: false,  
456 - success: function () {  
457 - }  
458 - });  
459 - });  
460 - });  
461 },1000); 418 },1000);
462 </script> 419 </script>
463 \ No newline at end of file 420 \ No newline at end of file
src/main/resources/static/pages/base/stationroute/list_template.html deleted 100644 → 0
  View file @7fc92c2
1 -<div className="row">  
2 - <div className="col-md-12">  
3 - <!-- BEGIN VALIDATION STATES-->  
4 - <div className="portlet light portlet-fit portlet-form bordered">  
5 - <div className="portlet-body">  
6 - <div class="table-container" style="margin-top: 10px">  
7 - <table class="table table-striped table-bordered table-hover table-checkable" id="datatable_waybill_choose">  
8 - <thead>  
9 - <tr role="row" class="heading">  
10 - <th width="10%">序号</th>  
11 - <th width="18%">线路名称</th>  
12 - <th width="18%">起点</th>  
13 - <th width="18%">终点</th>  
14 - <th width="18%">实际发车时间</th>  
15 - <th width="18%">实际到达时间</th>  
16 - </tr>  
17 - </thead>  
18 - <tbody></tbody>  
19 - </table>  
20 - </div>  
21 - </div>  
22 - </div>  
23 - </div>  
24 -</div>  
25 -<script type="text/html" id="waybill_choose_template">  
26 - {{each list as obj i }}  
27 - <tr>  
28 - <td style="vertical-align: middle;">  
29 - <input type="radio" class="group-checkable icheck" name="waybillRadio" data-id="{{obj.id}}">  
30 - </td>  
31 - <td style="vertical-align: middle;">  
32 - {{obj.xlName}}  
33 - </td>  
34 - <td>  
35 - {{obj.qdzName}}  
36 - </td>  
37 - <td>  
38 - {{obj.zdzName}}  
39 - </td>  
40 - <td>  
41 - {{obj.fcsjActual}}  
42 - </td>  
43 - <td>  
44 - {{obj.zdsjActual}}  
45 - </td>  
46 - </tr>  
47 - {{/each}}  
48 - {{if list.length == 0}}  
49 - <tr>  
50 - <td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>  
51 - </tr>  
52 - {{/if}}  
53 -</script>  
54 -<script>  
55 - $(function () {  
56 - // 异步请求获取表格数据  
57 - var params = {};  
58 - params.qdzCode_eq = $('#startPoint').val().split('_')[0];  
59 - params.zdzCode_eq = $('#endPoint').val().split('_')[0];  
60 - params.xlBm_eq = LineObj.getLineObj().id;  
61 - $.ajax({  
62 - url: "/real_control_v2/assets/imgs/time.gif",  
63 - type: "HEAD",  
64 - async: false,  
65 - success: function(result,status,xhr) {  
66 - params.scheduleDateStr_eq = moment(xhr.getResponseHeader("Date")).add(-1, 'days').format('YYYY-MM-DD');  
67 - }  
68 - })  
69 - $.get('/realSchedule/all',params,function(result){  
70 - // 把数据填充到模版中  
71 - var tbodyHtml = template('waybill_choose_template',{list:result});  
72 - // 把渲染好的模版html文本追加到表格中  
73 - $('#datatable_waybill_choose tbody').html(tbodyHtml);  
74 - $("input[name='waybillRadio']").change(function () {  
75 - $.post('/inout/pathPlaningByHistory', {schId: $(this).data('id'), version: $("#versions").val()}, function (result1) {  
76 - layer.msg('路径规划已完成');  
77 - // 刷新左边树  
78 - $('#inoutSearch').click();  
79 - layer.close(window.layerIdx);  
80 - });  
81 - });  
82 - });  
83 - });  
84 -</script>  
85 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/trafficManage/js/timeTempletUploadRecord.js
  View file @1fab73e
1 -/**  
2 - *  
3 - * @JSName : common.js(运管功能公共js)  
4 - *  
5 - * @Author : bsth@lq  
6 - *  
7 - * @Description : TODO(运管功能公共js)  
8 - *  
9 - * @Data : 2016年6月29日 上午9:21:17  
10 - *  
11 - * @Version 公交调度系统BS版 0.1  
12 - *  
13 - */  
14 -  
15 -(function(){  
16 - var page = 0, initPagination;  
17 - // 关闭左侧栏  
18 - if (!$('body').hasClass('page-sidebar-closed'))  
19 - $('.menu-toggler.sidebar-toggler').click();  
20 - // 填充公司下拉框选择值  
21 - $get('/business/all', {upCode_eq: '88'}, function(array){  
22 -  
23 - // 公司下拉options属性值  
24 - var options = '<option value="">请选择...</option>';  
25 -  
26 - // 遍历array  
27 - $.each(array, function(i,d){  
28 -  
29 - options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';  
30 -  
31 - });  
32 -  
33 - // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions  
34 - $('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);  
35 -  
36 - });  
37 -  
38 - // 填充分公司下拉框选择值  
39 - function setbrancheCompanySelectOptions(){  
40 -  
41 - // 获取公司下拉框选择值  
42 - var businessCode = $('#companySelect').val();  
43 -  
44 - // 分公司下拉框options属性值  
45 - var options = '<option value="">请选择...</option>';  
46 -  
47 - // 如果公司选择为空则分公司为空 ; 否则查询出所属公司下的分公司名称和相应分公司代码  
48 - if(businessCode == null || businessCode ==''){  
49 -  
50 - // 填充分公司下拉框options  
51 - $('#brancheCompanySelect').html(options);  
52 -  
53 - } else {  
54 -  
55 - // 查询出所属公司下的分公司名称和相应分公司代码  
56 - $get('/business/all', {upCode_eq: businessCode}, function(array){  
57 -  
58 - // 遍历array  
59 - $.each(array, function(i,d){  
60 -  
61 - options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';  
62 -  
63 - // 填充分公司下拉框options  
64 - $('#brancheCompanySelect').html(options);  
65 -  
66 - });  
67 - });  
68 -  
69 - // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions  
70 - $('#brancheCompanySelect').html(options).on('change', setLineAutocompleteOptions);  
71 - }  
72 - }  
73 -  
74 - function setLineAutocompleteOptions(){  
75 - // 搜索参数集合  
76 - var params = {};  
77 - // 搜索字段名称  
78 - var name;  
79 - var items = $("ul.breadcrumb select");  
80 - // 遍历items集合  
81 - for(var j = 0, item; item = items[j++];){  
82 - // 获取字段名称  
83 - name = $(item).attr('name');  
84 - if(name){  
85 - // 赋取相对应的值  
86 - params[name] = $(item).val();  
87 - }  
88 - }  
89 - var lines = new Array();  
90 - var gsmap = getBusMap();  
91 - params["remove_ne"] = 1;  
92 - // 取得所有线路  
93 - $get('/line/all', params, function(allLine) {  
94 - // 遍历数组  
95 - $.each(allLine, function(i, e) {  
96 - var companyCode = e.company;  
97 - e.company = gsmap[e.company];  
98 - e.brancheCompany = gsmap[companyCode+"_"+e.brancheCompany];  
99 - var line = '{"hex":"'+e.company+'","label":"'+e.name+'"}';  
100 - var obj = jQuery.parseJSON(line);  
101 - lines[i]= obj;  
102 - });  
103 -  
104 -  
105 - });  
106 - // 给输入框绑定autocomplete事件  
107 - $("#line_name").autocompleter({  
108 - highlightMatches: true,  
109 - source: lines,  
110 - template: '{{ label }} <span>({{ hex }})</span>',  
111 - hint: true,  
112 - empty: false,  
113 - limit: 5,  
114 - });  
115 - }  
116 -  
117 - // 日期控件  
118 - $('#dateInput').datetimepicker({  
119 - // 日期控件时间格式  
120 - format : 'YYYY-MM-DD',  
121 - // 语言  
122 - locale: 'zh-cn'  
123 - });  
124 - // 日期范围输入框限制，绑定按键和粘贴事件  
125 - $(".dateRange").keyup(function(){  
126 - var tmptxt=$(this).val();  
127 - $(this).val(tmptxt.replace(/\D|^0/g,''));  
128 - if(tmptxt.length > 2){  
129 - $(this).val(tmptxt.substring(0,2));  
130 - }  
131 - if(tmptxt > 24){  
132 - $(this).val(24);  
133 - }  
134 - if(tmptxt < 0){  
135 - $(this).val(00);  
136 - }  
137 - }).bind("paste",function(){  
138 - var tmptxt=$(this).val();  
139 - $(this).val(tmptxt.replace(/\D|^0/g,''));  
140 - if(tmptxt.length > 2){  
141 - $(this).val(tmptxt.substring(0,2));  
142 - }  
143 - if(tmptxt > 24){  
144 - $(this).val(24);  
145 - }  
146 - if(tmptxt < 0){  
147 - $(this).val(00);  
148 - }  
149 - }).css("ime-mode", "disabled");  
150 - /**  
151 - * 取得编码-公司map  
152 - * gsmap["5"] = 南汇公司  
153 - * gsmap["5_3"] = 芦潮港分公司  
154 - */  
155 - function getBusMap(){  
156 - // 取得公司信息，替换公司编码  
157 - var gsmap = {};  
158 - $get('/business/all', null, function(array){  
159 - $.each(array, function(i, gs){  
160 - var k = gs.upCode + '_' + gs.businessCode;  
161 - if(gs.upCode === '88'){  
162 - k = gs.businessCode;  
163 - }  
164 - gsmap[k] = gs.businessName;  
165 - });  
166 - });  
167 - return gsmap;  
168 - }  
169 - /**  
170 - * 设置公司自动完成  
171 - */  
172 - var lines = new Array();  
173 - var gsmap = getBusMap();  
174 - // 取得所有线路  
175 - $get('/line/all', null, function(allLine) {  
176 - // 遍历数组  
177 - $.each(allLine, function(i, e) {  
178 - var companyCode = e.company;  
179 - e.company = gsmap[e.company];  
180 - e.brancheCompany = gsmap[companyCode+"_"+e.brancheCompany];  
181 - var line = '{"hex":"' + e.company + '","label":"' + e.name  
182 - + '"}';  
183 - var obj = jQuery.parseJSON(line);  
184 - lines[i] = obj;  
185 - });  
186 - });  
187 - // 给输入框绑定autocomplete事件  
188 - $("#line_name").autocompleter({  
189 - highlightMatches : true,  
190 - source : lines,  
191 - template : '{{ label }} <span>({{ hex }})</span>',  
192 - hint : true,  
193 - empty : false,  
194 - limit : 5,  
195 - });  
196 - // 设置autocompleter的宽度和输入框一样  
197 - $(".autocompleter").css("width",  
198 - $("#line_name").css("width"));  
199 -  
200 - searchM(null, true);  
201 - // 绑定查询事件  
202 - $("#search").click(searchM);  
203 - // 查询方法  
204 - function searchM() {  
205 - var params = {};  
206 - // 取得输入框的值  
207 - var inputs = $(".breadcrumb input,select");  
208 - // 遍历数组  
209 - $.each(inputs, function(i, element) {  
210 - params[$(element).attr("name")] = $(element).val();  
211 - });  
212 - page = 0;  
213 - loadTableDate(params,true);  
214 - }  
215 -  
216 - function loadTableDate(param,isPon) {  
217 - // 搜索参数  
218 - var params = {};  
219 - if(param)  
220 - params = param;  
221 - // 排序（按更新时间）  
222 - params['order'] = 'id';  
223 - // 记录当前页数  
224 - params['page'] = page;  
225 - var i = layer.load(2);  
226 - $get('/skb_log', params, function(data) {  
227 - var content = data.content;  
228 - _dateFormat(content);  
229 - var bodyHtm = template('timeTempletUploadRecord_list_temp', {  
230 - list : content  
231 - });  
232 - $('#datatable_logger tbody').html(bodyHtm);  
233 - if(isPon && data.content.length > 0){  
234 - //重新分页  
235 - initPagination = true;  
236 - showPagination(data);  
237 - }  
238 - layer.close(i);  
239 - });  
240 - }  
241 -  
242 - //转换时间格式  
243 - function _dateFormat(list) {  
244 - var fs = 'YYYY-MM-DD HH:mm';  
245 - $.each(list, function(i, obj) {  
246 - obj.createDate = moment(obj.createDate).format(fs);  
247 - });  
248 - }  
249 -  
250 - function showPagination(data){  
251 - //分页  
252 - $('#pagination').jqPaginator({  
253 - totalPages: data.totalPages,  
254 - visiblePages: 6,  
255 - currentPage: page + 1,  
256 - first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',  
257 - prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',  
258 - next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',  
259 - last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',  
260 - page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',  
261 - onPageChange: function (num, type) {  
262 - if(initPagination){  
263 - initPagination = false;  
264 - return;  
265 - }  
266 - page = num - 1;  
267 - loadTableDate(null, false);  
268 - }  
269 - });  
270 - }  
271 -})();  
272 \ No newline at end of file 1 \ No newline at end of file
  2 +/**
  3 + *
  4 + * @JSName : common.js(运管功能公共js)
  5 + *
  6 + * @Author : bsth@lq
  7 + *
  8 + * @Description : TODO(运管功能公共js)
  9 + *
  10 + * @Data : 2016年6月29日 上午9:21:17
  11 + *
  12 + * @Version 公交调度系统BS版 0.1
  13 + *
  14 + */
  15 +
  16 +(function(){
  17 + var page = 0, initPagination;
  18 + // 关闭左侧栏
  19 + if (!$('body').hasClass('page-sidebar-closed'))
  20 + $('.menu-toggler.sidebar-toggler').click();
  21 + // 填充公司下拉框选择值
  22 + $get('/business/all', {upCode_eq: '88'}, function(array){
  23 +
  24 + // 公司下拉options属性值
  25 + var options = '<option value="">请选择...</option>';
  26 +
  27 + // 遍历array
  28 + $.each(array, function(i,d){
  29 +
  30 + options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
  31 +
  32 + });
  33 +
  34 + // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
  35 + $('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
  36 +
  37 + });
  38 +
  39 + // 填充分公司下拉框选择值
  40 + function setbrancheCompanySelectOptions(){
  41 +
  42 + // 获取公司下拉框选择值
  43 + var businessCode = $('#companySelect').val();
  44 +
  45 + // 分公司下拉框options属性值
  46 + var options = '<option value="">请选择...</option>';
  47 +
  48 + // 如果公司选择为空则分公司为空 ; 否则查询出所属公司下的分公司名称和相应分公司代码
  49 + if(businessCode == null || businessCode ==''){
  50 +
  51 + // 填充分公司下拉框options
  52 + $('#brancheCompanySelect').html(options);
  53 +
  54 + } else {
  55 +
  56 + // 查询出所属公司下的分公司名称和相应分公司代码
  57 + $get('/business/all', {upCode_eq: businessCode}, function(array){
  58 +
  59 + // 遍历array
  60 + $.each(array, function(i,d){
  61 +
  62 + options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
  63 +
  64 + // 填充分公司下拉框options
  65 + $('#brancheCompanySelect').html(options);
  66 +
  67 + });
  68 + });
  69 +
  70 + // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
  71 + $('#brancheCompanySelect').html(options).on('change', setLineAutocompleteOptions);
  72 + }
  73 + }
  74 +
  75 + function setLineAutocompleteOptions(){
  76 + // 搜索参数集合
  77 + var params = {};
  78 + // 搜索字段名称
  79 + var name;
  80 + var items = $("ul.breadcrumb select");
  81 + // 遍历items集合
  82 + for(var j = 0, item; item = items[j++];){
  83 + // 获取字段名称
  84 + name = $(item).attr('name');
  85 + if(name){
  86 + // 赋取相对应的值
  87 + params[name] = $(item).val();
  88 + }
  89 + }
  90 + var lines = new Array();
  91 + var gsmap = getBusMap();
  92 + params["remove_ne"] = 1;
  93 + // 取得所有线路
  94 + $get('/line/all', params, function(allLine) {
  95 + // 遍历数组
  96 + $.each(allLine, function(i, e) {
  97 + var companyCode = e.company;
  98 + e.company = gsmap[e.company];
  99 + e.brancheCompany = gsmap[companyCode+"_"+e.brancheCompany];
  100 + var line = '{"hex":"'+e.company+'","label":"'+e.name+'"}';
  101 + var obj = jQuery.parseJSON(line);
  102 + lines[i]= obj;
  103 + });
  104 +
  105 +
  106 + });
  107 + // 给输入框绑定autocomplete事件
  108 + $("#line_name").autocompleter({
  109 + highlightMatches: true,
  110 + source: lines,
  111 + template: '{{ label }} <span>({{ hex }})</span>',
  112 + hint: true,
  113 + empty: false,
  114 + limit: 5,
  115 + });
  116 + }
  117 +
  118 + // 日期控件
  119 + $('#dateInput').datetimepicker({
  120 + // 日期控件时间格式
  121 + format : 'YYYY-MM-DD',
  122 + // 语言
  123 + locale: 'zh-cn'
  124 + });
  125 + // 日期范围输入框限制，绑定按键和粘贴事件
  126 + $(".dateRange").keyup(function(){
  127 + var tmptxt=$(this).val();
  128 + $(this).val(tmptxt.replace(/\D|^0/g,''));
  129 + if(tmptxt.length > 2){
  130 + $(this).val(tmptxt.substring(0,2));
  131 + }
  132 + if(tmptxt > 24){
  133 + $(this).val(24);
  134 + }
  135 + if(tmptxt < 0){
  136 + $(this).val(00);
  137 + }
  138 + }).bind("paste",function(){
  139 + var tmptxt=$(this).val();
  140 + $(this).val(tmptxt.replace(/\D|^0/g,''));
  141 + if(tmptxt.length > 2){
  142 + $(this).val(tmptxt.substring(0,2));
  143 + }
  144 + if(tmptxt > 24){
  145 + $(this).val(24);
  146 + }
  147 + if(tmptxt < 0){
  148 + $(this).val(00);
  149 + }
  150 + }).css("ime-mode", "disabled");
  151 + /**
  152 + * 取得编码-公司map
  153 + * gsmap["5"] = 南汇公司
  154 + * gsmap["5_3"] = 芦潮港分公司
  155 + */
  156 + function getBusMap(){
  157 + // 取得公司信息，替换公司编码
  158 + var gsmap = {};
  159 + $get('/business/all', null, function(array){
  160 + $.each(array, function(i, gs){
  161 + var k = gs.upCode + '_' + gs.businessCode;
  162 + if(gs.upCode === '88'){
  163 + k = gs.businessCode;
  164 + }
  165 + gsmap[k] = gs.businessName;
  166 + });
  167 + });
  168 + return gsmap;
  169 + }
  170 + /**
  171 + * 设置公司自动完成
  172 + */
  173 + var lines = new Array();
  174 + var gsmap = getBusMap();
  175 + // 取得所有线路
  176 + $get('/line/all', null, function(allLine) {
  177 + // 遍历数组
  178 + $.each(allLine, function(i, e) {
  179 + var companyCode = e.company;
  180 + e.company = gsmap[e.company];
  181 + e.brancheCompany = gsmap[companyCode+"_"+e.brancheCompany];
  182 + var line = '{"hex":"' + e.company + '","label":"' + e.name
  183 + + '"}';
  184 + var obj = jQuery.parseJSON(line);
  185 + lines[i] = obj;
  186 + });
  187 + });
  188 + // 给输入框绑定autocomplete事件
  189 + $("#line_name").autocompleter({
  190 + highlightMatches : true,
  191 + source : lines,
  192 + template : '{{ label }} <span>({{ hex }})</span>',
  193 + hint : true,
  194 + empty : false,
  195 + limit : 5,
  196 + });
  197 + // 设置autocompleter的宽度和输入框一样
  198 + $(".autocompleter").css("width",
  199 + $("#line_name").css("width"));
  200 +
  201 + // 设置上传类型
  202 + var uploadStateOptions = '<option value="1">时刻表上传</option>'
  203 + +'<option value="2">线路停靠站上传</option>'
  204 + +'<option value="3">路单上传</option>';
  205 + $('#uploadType').html(uploadStateOptions).on('change', searchM);
  206 +
  207 + searchM(null, true);
  208 + // 绑定查询事件
  209 + $("#search").click(searchM);
  210 + // 查询方法
  211 + function searchM() {
  212 + var params = {};
  213 + // 取得输入框的值
  214 + var inputs = $(".breadcrumb input,select");
  215 + // 遍历数组
  216 + $.each(inputs, function(i, element) {
  217 + params[$(element).attr("name")] = $(element).val();
  218 + });
  219 + page = 0;
  220 + loadTableDate(params,true);
  221 + }
  222 +
  223 + function loadTableDate(param,isPon) {
  224 + // 搜索参数
  225 + var params = {};
  226 + if(param)
  227 + params = param;
  228 + // 排序（按更新时间）
  229 + params['order'] = 'id';
  230 + // 记录当前页数
  231 + params['page'] = page;
  232 + var i = layer.load(2);
  233 + $get('/skb_log', params, function(data) {
  234 + var content = data.content;
  235 + _dateFormat(content);
  236 + var bodyHtm = template('timeTempletUploadRecord_list_temp', {
  237 + list : content
  238 + });
  239 + $('#datatable_logger tbody').html(bodyHtm);
  240 + if(isPon && data.content.length > 0){
  241 + //重新分页
  242 + initPagination = true;
  243 + showPagination(data);
  244 + }
  245 + layer.close(i);
  246 + });
  247 + }
  248 +
  249 + //转换时间格式
  250 + function _dateFormat(list) {
  251 + var fs = 'YYYY-MM-DD HH:mm';
  252 + $.each(list, function(i, obj) {
  253 + obj.createDate = moment(obj.createDate).format(fs);
  254 + });
  255 + }
  256 +
  257 + function showPagination(data){
  258 + //分页
  259 + $('#pagination').jqPaginator({
  260 + totalPages: data.totalPages,
  261 + visiblePages: 6,
  262 + currentPage: page + 1,
  263 + first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
  264 + prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
  265 + next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
  266 + last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
  267 + page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
  268 + onPageChange: function (num, type) {
  269 + if(initPagination){
  270 + initPagination = false;
  271 + return;
  272 + }
  273 + page = num - 1;
  274 + loadTableDate(null, false);
  275 + }
  276 + });
  277 + }
  278 +
  279 + template.helper("cutXml", function(xml) {
  280 + return xml ? xml.substring(0,20) + "..." : "";
  281 + });
  282 +})();
  283 +function showXml(el){
  284 + window.sessionStorage.setItem('upload_ygc_xml',JSON.stringify($(el).val()));
  285 + $.get('show_xml.html', function(m){$(pjaxContainer).append(m);});
  286 +}
273 \ No newline at end of file 287 \ No newline at end of file
src/main/resources/static/pages/trafficManage/timeTempletUploadRecord.html
  View file @1fab73e
1 -<link href="css/trafficManage.css" rel="stylesheet" type="text/css" />  
2 -<link href="css/autocompleter.css" rel="stylesheet" type="text/css" />  
3 -<ul class="page-breadcrumb breadcrumb">  
4 - <li><a href="/pages/home.html" data-pjax>首页</a> <i  
5 - class="fa fa-circle"></i></li>  
6 - <li><span class="active">运维管理</span> <i class="fa fa-circle"></i></li>  
7 - <li><span class="active">时刻模板上传日志</span></li>  
8 -</ul>  
9 -<div class="tab_line">  
10 - <div class="col-md-12">  
11 - <ul class="breadcrumb">  
12 - <li>筛选数据:</li>  
13 - <li><select name="ttInfo.xl.company_eq" class="form-control" id="companySelect"></select></li>  
14 - <li><select name="ttInfo.xl.brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select></li>  
15 - <li>日期:</li>  
16 - <li><input type="text" class="inputCommon dateTime" name="createDate_date_eq" id="dateInput" placeholder="日期"></li>  
17 - <li>线路名称:</li>  
18 - <li><input type="text" class="form-control form-filter input-sm"  
19 - name="ttInfo.xl.name_eq" id="line_name" maxlength="40" /></li>  
20 - <li>上传用户:</li>  
21 - <li><input type="text" class="inputCommon inputCarPlate"  
22 - name="user.name_like" maxlength="40" /></li>  
23 - <li><a class="btn btn-circle blue" id="search">筛选</a></li>  
24 - </ul>  
25 - </div>  
26 - <div class="col-md-12 panel-wrap">  
27 - <div class="_panel">  
28 - <div class="table-container">  
29 - <table  
30 - class="table table-striped table-bordered table-advance pb-table head"  
31 - id="datatable_logger">  
32 - <thead>  
33 - <tr>  
34 - <th>序号</th>  
35 - <th>公司</th>  
36 - <th>分公司</th>  
37 - <th>线路</th>  
38 - <th>模板名称</th>  
39 - <th>上传人员</th>  
40 - <th>上传时间</th>  
41 - </tr>  
42 - </thead>  
43 - <tbody>  
44 - </tbody>  
45 - </table>  
46 - <div style="text-align: right;">  
47 - <ul id="pagination" class="pagination"></ul>  
48 - </div>  
49 - </div>  
50 - </div>  
51 - </div>  
52 -</div>  
53 -<script id="timeTempletUploadRecord_list_temp" type="text/html">  
54 -{{each list as obj i}}  
55 -<tr>  
56 - <td class="seq" style="vertical-align: middle;">  
57 - {{i+1}}  
58 - </td>  
59 - <td>  
60 - {{if obj.ttInfo.xl.company == '55'}}  
61 - 上南公司  
62 - {{else if obj.ttInfo.xl.company == '22'}}  
63 - 金高公司  
64 - {{else if obj.ttInfo.xl.company == '05'}}  
65 - 杨高公司  
66 - {{else if obj.ttInfo.xl.company == '26'}}  
67 - 南汇公司  
68 - {{else if obj.ttInfo.xl.company == '77'}}  
69 - 闵行公司  
70 - {{/if}}  
71 - </td>  
72 - <td>  
73 - {{if obj.ttInfo.xl.company == '55'}}  
74 -  
75 - {{if obj.ttInfo.xl.brancheCompany == '1'}}  
76 - 上南二分公司  
77 - {{else if obj.ttInfo.xl.brancheCompany == '2'}}  
78 - 上南三分公司  
79 - {{else if obj.ttInfo.xl.brancheCompany == '3'}}  
80 - 上南六分公司  
81 - {{else if obj.ttInfo.xl.brancheCompany == '4'}}  
82 - 上南一分公司  
83 - {{/if}}  
84 -  
85 - {{else if obj.ttInfo.xl.company == '22'}}  
86 -  
87 - {{if obj.ttInfo.xl.brancheCompany == '1'}}  
88 - 四分公司  
89 - {{else if obj.ttInfo.xl.brancheCompany == '2'}}  
90 - 二分公司  
91 - {{else if obj.ttInfo.xl.brancheCompany == '3'}}  
92 - 三分公司  
93 - {{else if obj.ttInfo.xl.brancheCompany == '5'}}  
94 - 一分公司  
95 - {{/if}}  
96 -  
97 - {{else if obj.ttInfo.xl.company == '05'}}  
98 -  
99 - {{if obj.ttInfo.xl.brancheCompany == '1'}}  
100 - 川沙分公司  
101 - {{else if obj.ttInfo.xl.brancheCompany == '2'}}  
102 - 金桥分公司  
103 - {{else if obj.ttInfo.xl.brancheCompany == '3'}}  
104 - 芦潮港分公司  
105 - {{else if obj.ttInfo.xl.brancheCompany == '5'}}  
106 - 杨高分公司  
107 - {{else if obj.ttInfo.xl.brancheCompany == '6'}}  
108 - 周浦分公司  
109 - {{/if}}  
110 -  
111 - {{else if obj.ttInfo.xl.company == '26'}}  
112 -  
113 - {{if obj.ttInfo.xl.brancheCompany == '1'}}  
114 - 南汇一分  
115 - {{else if obj.ttInfo.xl.brancheCompany == '2'}}  
116 - 南汇二分  
117 - {{else if obj.ttInfo.xl.brancheCompany == '3'}}  
118 - 南汇三分  
119 - {{else if obj.ttInfo.xl.brancheCompany == '4'}}  
120 - 南汇维修公司  
121 - {{else if obj.ttInfo.xl.brancheCompany == '5'}}  
122 - 南汇公司  
123 - {{/if}}  
124 -  
125 - {{/if}}  
126 - </td>  
127 - <td>  
128 - {{obj.ttInfo.xl.name}}  
129 - </td>  
130 - <td>  
131 - {{obj.ttInfo.name}}  
132 - </td>  
133 - <td>  
134 - {{obj.user.name}}  
135 - </td>  
136 - <td>  
137 - {{obj.createDate}}  
138 - </td>  
139 -</tr>  
140 -{{/each}}  
141 -{{if list.length == 0}}  
142 -<tr class="muted">  
143 - <td colspan=7 style="text-align: center;"><h6>没有找到相关数据</h6></td>  
144 -</tr>  
145 -{{/if}}  
146 - </script> 1 +<link href="css/trafficManage.css" rel="stylesheet" type="text/css" />
  2 +<link href="css/autocompleter.css" rel="stylesheet" type="text/css" />
  3 +<ul class="page-breadcrumb breadcrumb">
  4 + <li><a href="/pages/home.html" data-pjax>首页</a> <i
  5 + class="fa fa-circle"></i></li>
  6 + <li><span class="active">运维管理</span> <i class="fa fa-circle"></i></li>
  7 + <li><span class="active">运管处上传日志</span></li>
  8 +</ul>
  9 +<div class="tab_line">
  10 + <div class="col-md-12">
  11 + <ul class="breadcrumb">
  12 + <li>筛选数据:</li>
  13 + <li><select name="line.company_eq" class="form-control" id="companySelect"></select></li>
  14 + <li><select name="line.brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select></li>
  15 + <li>日期:</li>
  16 + <li><input type="text" class="inputCommon dateTime" name="createDate_dateEq" id="dateInput" placeholder="日期">
  17 + </li>
  18 + <li>线路名称:</li>
  19 + <li><input type="text" class="form-control form-filter input-sm"
  20 + name="line.name_eq" id="line_name" maxlength="40" /></li>
  21 + <li>上传用户:</li>
  22 + <li><input type="text" class="inputCommon inputCarPlate"
  23 + name="user.name_like" maxlength="40" /></li>
  24 + <li>上传类型:</li>
  25 + <li><select name="type_eq" class="form-control" id="uploadType"></select></li>
  26 + <li><a class="btn btn-circle blue" id="search">筛选</a></li>
  27 + </ul>
  28 + </div>
  29 + <div class="col-md-12 panel-wrap">
  30 + <div class="_panel">
  31 + <div class="table-container">
  32 + <table
  33 + class="table table-striped table-bordered table-advance pb-table head"
  34 + id="datatable_logger">
  35 + <thead>
  36 + <tr>
  37 + <th>序号</th>
  38 + <th>公司</th>
  39 + <th>分公司</th>
  40 + <th>线路</th>
  41 + <th>模板名称</th>
  42 + <th>上传人员</th>
  43 + <th>上传参数</th>
  44 + <th>上传类型</th>
  45 + <th>是否成功</th>
  46 + <th>上传时间</th>
  47 + </tr>
  48 + </thead>
  49 + <tbody>
  50 + </tbody>
  51 + </table>
  52 + <div style="text-align: right;">
  53 + <ul id="pagination" class="pagination"></ul>
  54 + </div>
  55 + </div>
  56 + </div>
  57 + </div>
  58 +</div>
  59 +<script id="timeTempletUploadRecord_list_temp" type="text/html">
  60 + {{each list as obj i}}
  61 + <tr>
  62 + <td class="seq" style="vertical-align: middle;">
  63 + {{i+1}}
  64 + </td>
  65 + <td>
  66 + {{if obj.line.company == '99'}}
  67 + 青浦公交
  68 + {{else if obj.line.company == '200'}}
  69 + 嘉兴公交
  70 + {{else if obj.line.company == '300'}}
  71 + 吴江公交
  72 + {{/if}}
  73 + </td>
  74 + <td>
  75 + {{if obj.line.company == '99'}}
  76 +
  77 + {{if obj.line.brancheCompany == '100'}}
  78 + 青浦公交
  79 + {{/if}}
  80 +
  81 + {{else if obj.line.company == '200'}}
  82 +
  83 + {{if obj.line.brancheCompany == '201'}}
  84 + 嘉兴公交
  85 + {{/if}}
  86 +
  87 + {{else if obj.line.company == '300'}}
  88 +
  89 + {{if obj.line.brancheCompany == '301'}}
  90 + 吴江公交
  91 + {{/if}}
  92 +
  93 + {{/if}}
  94 + </td>
  95 + <td>
  96 + {{obj.line.name}}
  97 + </td>
  98 + <td>
  99 + {{obj.name}}
  100 + </td>
  101 + <td>
  102 + {{obj.user.name}}
  103 + </td>
  104 + <td>
  105 + {{cutXml(obj.uploadXml)}}
  106 + {{if obj.uploadXml != null && obj.uploadXml != ''}}
  107 + {{if obj.state == '1'}}
  108 + <button type="button" class="btn btn-primary" value="{{obj.uploadXml}}{{obj.uploadXmlSub}}" onclick="showXml(this)">
  109 + 查看
  110 + </button>
  111 + {{else if obj.state == '0'}}
  112 + <button type="button" class="btn btn-danger" value="{{obj.uploadXml}}{{obj.uploadXmlSub}}" onclick="showXml(this)">
  113 + 查看
  114 + </button>
  115 + {{/if}}
  116 + {{/if}}
  117 +
  118 + </td>
  119 + <td>
  120 + {{if obj.type == '1'}}
  121 + 时刻表上传
  122 + {{else if obj.type == '2'}}
  123 + 线路停靠站上传
  124 + {{else if obj.type == '3'}}
  125 + 路单上传
  126 + {{/if}}
  127 + </td>
  128 + <td>
  129 + {{if obj.state == '1'}}
  130 + 成功
  131 + {{else if obj.state == '0'}}
  132 + 失败
  133 + {{/if}}
  134 + </td>
  135 + <td>
  136 + {{obj.createDate}}
  137 + </td>
  138 +</tr>
  139 +{{/each}}
  140 +{{if list.length == 0}}
  141 +<tr class="muted">
  142 + <td colspan=10 style="text-align: center;"><h6>没有找到相关数据</h6></td>
  143 +</tr>
  144 +{{/if}}
  145 + </script>
147 <script src="./js/timeTempletUploadRecord.js"></script> 146 <script src="./js/timeTempletUploadRecord.js"></script>
148 \ No newline at end of file 147 \ No newline at end of file