youxiw2000 / bsthLineProfiles · Commits

Commit 961438692ba28e42dc20140ebcfa55c7fa119098

Authored by yiming
1 parent dd6d81c3

bf

Inline Side-by-side
Showing 13 changed files with 760 additions and 1012 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
  View file @9614386
... ... @@ -166,16 +166,16 @@ public class BsthTLine extends BaseEntity
166 166 @Excel(name = "起讫站")
167 167 private String startEnd;
168 168  
169   - /** 首战时间 */
170   - @Excel(name = "首战时间")
  169 + /** 首站时间 */
  170 + @Excel(name = "首站时间")
171 171 private String firstTime;
172 172  
173 173 /** 末站 */
174 174 @Excel(name = "末站")
175 175 private String lastStation;
176 176  
177   - /** 末站首战时间 */
178   - @Excel(name = "末站首战时间")
  177 + /** 末站首站时间 */
  178 + @Excel(name = "末站首站时间")
179 179 private String lastTime;
180 180  
181 181 /** 上行里程数 */
... ...
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @9614386
... ... @@ -1597,7 +1597,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
1597 1597 <where>
1598 1598 and line_name = #{name}
1599 1599 </where>
1600   - ORDER BY start_date DESC
  1600 + ORDER BY start_date
1601 1601 </select>
1602 1602  
1603 1603  
... ...
bsthLineProfiles/src/main/resources/templates/system/line/detail.html
  View file @9614386
... ... @@ -43,7 +43,7 @@
43 43  
44 44 <div class="form-group">
45 45 <span id="serviceType">
46   - <label class="col-sm-1 control-label">营运方式：</label>
  46 + <label class="col-sm-1 control-label">：</label>
47 47 <div class="col-sm-2">
48 48 <select name="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b" disabled>
49 49 <option value=""></option>
... ... @@ -222,13 +222,13 @@
222 222 </div></span>
223 223 <!---------------------------------->
224 224 <span id="firstTime">
225   - <label class="col-sm-1 control-label">首战时间：</label>
  225 + <label class="col-sm-1 control-label">首站时间：</label>
226 226 <div class="col-sm-2">
227 227 <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text" disabled>
228 228 </div></span>
229 229 <!---------------------------------->
230 230 <span id="lastTime">
231   - <label class="col-sm-1 control-label">末站首战时间：</label>
  231 + <label class="col-sm-1 control-label">末站首站时间：</label>
232 232 <div class="col-sm-2">
233 233 <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text" disabled>
234 234 </div></span>
... ...
bsthLineProfiles/src/main/resources/templates/system/line/line.html
  View file @9614386
... ... @@ -129,11 +129,11 @@
129 129 name="firstStation" /></li>
130 130 <li><label>起讫站：</label> <input type="text" name="startEnd" />
131 131 </li>
132   - <li><label>首战时间：</label> <input type="text" name="firstTime" />
  132 + <li><label>首站时间：</label> <input type="text" name="firstTime" />
133 133 </li>
134 134 <li><label>末站：</label> <input type="text" name="lastStation" />
135 135 </li>
136   - <li><label>末站首战：</label> <input type="text"
  136 + <li><label>末站首站：</label> <input type="text"
137 137 name="lastTime" /></li>
138 138 <li><label>上行里程：</label> <input type="text"
139 139 name="mileageUp" /></li>
... ... @@ -654,7 +654,7 @@
654 654 },
655 655 {
656 656 field: 'firstTime',
657   - title: '首战时间'
  657 + title: '首站时间'
658 658 },
659 659 {
660 660 field: 'lastStation',
... ... @@ -662,7 +662,7 @@
662 662 },
663 663 {
664 664 field: 'lastTime',
665   - title: '末站首战时间'
  665 + title: '末站首站时间'
666 666 },
667 667 {
668 668 field: 'mileageUp',
... ...
bsthLineProfiles/src/main/resources/templates/system/line/map.html
  View file @9614386
... ... @@ -434,7 +434,7 @@ body, html, #container {
434 434 onGetBusListComplete: function onGetBusListComplete (result) {
435 435 let fstLine = result.getBusListItem(0);//通过线路名查询线路列表默认第一条
436 436 bus.getBusLine(fstLine);
437   - },onPolylinesSet: function onPolylinesSet(polyline){//添加公交线时候回调函数.参数：ply:Polyline 公交线路几何对象
  437 + }/*,onPolylinesSet: function onPolylinesSet(polyline){//添加公交线时候回调函数.参数：ply:Polyline 公交线路几何对象
438 438 //通过删除api自带的折线 然后改变颜色重新渲染
439 439 map.clearOverlays();
440 440 //https://mapopen-pub-jsapi.bj.bcebos.com/jsapi/reference/jsapi_webgl_1_0.html#a3b0
... ... @@ -451,7 +451,7 @@ body, html, #container {
451 451 for(var i in sl){
452 452 map.addOverlay(sl[i]);
453 453 }
454   - }
  454 + }*/
455 455 });
456 456  
457 457  
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
  View file @9614386
... ... @@ -178,11 +178,11 @@
178 178 <textarea name="directions" class="form-control"></textarea>
179 179 </div>
180 180 <!---------------------------------->
181   - <label class="col-sm-1 control-label">首战时间：</label>
  181 + <label class="col-sm-1 control-label">首站时间：</label>
182 182 <div class="col-sm-2">
183 183 <input name="firstTime" class="form-control" type="text">
184 184 </div>
185   - <label class="col-sm-1 control-label">末站首战时间：</label>
  185 + <label class="col-sm-1 control-label">末站首站时间：</label>
186 186 <!---------------------------------->
187 187 <div class="col-sm-2">
188 188 <input name="lastTime" class="form-control" type="text">
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
  View file @9614386
... ... @@ -181,12 +181,12 @@
181 181 <textarea name="directions" class="form-control">[[*{directions}]]</textarea>
182 182 </div>
183 183 <!---------------------------------->
184   - <label class="col-sm-1 control-label">首战时间：</label>
  184 + <label class="col-sm-1 control-label">首站时间：</label>
185 185 <div class="col-sm-2">
186 186 <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
187 187 </div>
188 188 <!---------------------------------->
189   - <label class="col-sm-1 control-label">末站首战时间：</label>
  189 + <label class="col-sm-1 control-label">末站首站时间：</label>
190 190 <div class="col-sm-2">
191 191 <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
192 192 </div>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
  View file @9614386
... ... @@ -181,12 +181,12 @@
181 181 <textarea name="directions" class="form-control" disabled>[[*{directions}]]</textarea>
182 182 </div>
183 183 <!---------------------------------->
184   - <label class="col-sm-1 control-label">首战时间：</label>
  184 + <label class="col-sm-1 control-label">首站时间：</label>
185 185 <div class="col-sm-2">
186 186 <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text" disabled>
187 187 </div>
188 188 <!---------------------------------->
189   - <label class="col-sm-1 control-label">末站首战时间：</label>
  189 + <label class="col-sm-1 control-label">末站首站时间：</label>
190 190 <div class="col-sm-2">
191 191 <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text" disabled>
192 192 </div>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @9614386
... ... @@ -181,12 +181,12 @@
181 181 <textarea name="directions" class="form-control">[[*{directions}]]</textarea>
182 182 </div>
183 183 <!---------------------------------->
184   - <label class="col-sm-1 control-label">首战时间：</label>
  184 + <label class="col-sm-1 control-label">首站时间：</label>
185 185 <div class="col-sm-2">
186 186 <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
187 187 </div>
188 188 <!---------------------------------->
189   - <label class="col-sm-1 control-label">末站首战时间：</label>
  189 + <label class="col-sm-1 control-label">末站首站时间：</label>
190 190 <div class="col-sm-2">
191 191 <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
192 192 </div>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/historyCompare.html
  View file @9614386
1 1 <!DOCTYPE html>
2 2 <html lang="zh" xmlns:th="http://www.thymeleaf.org"
3   - xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 + xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
4 4 <head>
5   -<th:block th:include="include :: header('线路档案信息')" />
  5 + <th:block th:include="include :: header('线路档案信息')"/>
6 6 </head>
7 7 <body class="gray-bg">
8   - <div class="info col-lg-12">
9   - <div class="input-group">
10   - <input type="text" class="form-control" id="text">
11   - <div class="input-group-btn">
12   - <button type="button" class="btn btn-white dropdown-toggle"
13   - data-toggle="dropdown">
14   - <span class="caret"></span>
15   - </button>
16   - <ul class="dropdown-menu dropdown-menu-right" role="menu">
17   - </ul>
18   - </div>
19   - </div>
20   - </div>
21   - <div class="container-div" id="context" style="padding-top:100px;">
22   - <el-row>
23   - <el-col :span="6">
24   - <el-timeline reverse="reverse">
25   - <el-timeline-item
26   - v-for="(line,index) in lines"
27   - type="primary"
28   - size="large"
29   - :timestamp="line.startDate" @click.native="change(index);">
30   - {{line.lineUpdateType}}(
31   - {{line.startReason}})
32   - </el-timeline-item>
33   - </el-timeline>
34   - </el-col>
35   - <el-col :span="18">
36   - <el-tabs type="border-card" v-model="tab" v-if="line">
37   - <el-tab-pane label="线路信息" name="first">
38   - <div class="col-sm-6">
39   - <label class="col-sm-3 control-label">线路名称：</label>
40   - <span class="col-sm-9">
41   - {{line.lineName}}
42   - </span>
43   - </div>
44   - <div class="col-sm-6">
45   - <label class="col-sm-3 control-label">公司：</label>
46   - <span class="col-sm-9">
47   - {{line.company}}
48   - </span>
49   - </div>
50   - <div class="col-sm-6">
51   - <label class="col-sm-3 control-label">分公司：</label>
52   - <span class="col-sm-9">
53   - {{line.fCompany}}
54   - </span>
55   - </div>
56   - <div class="col-sm-6">
57   - <label class="col-sm-3 control-label">主线路id：</label>
58   - <span class="col-sm-9">
59   - {{line.pLineId}}
60   - </span>
61   - </div>
62   - <div class="col-sm-6">
63   - <label class="col-sm-3 control-label">营运方式：</label>
64   - <span class="col-sm-9"> {{line.serviceType}}</span>
65   - </div>
66   - <div class="col-sm-6">
67   - <label class="col-sm-3 control-label">营运方式：</label>
68   - <span class="col-sm-9"> {{line.busType}}</span>
69   - </div>
70   - <div class="col-sm-6">
71   - <label class="col-sm-3 control-label">线路属性：</label>
72   - <span class="col-sm-9">
73   - {{line.lineLevel}}
74   - </span>
75   - </div>
76   - <div class="col-sm-6">
77   - <label class="col-sm-3 control-label">线路类型：</label>
78   - <span class="col-sm-9">
79   - {{line.lineType}}
80   - </span>
81   - </div>
82   - <div class="col-sm-6">
83   - <label class="col-sm-3 control-label">区属：</label>
84   - <span class="col-sm-9">
85   - {{line.district}}
86   - </span>
87   - </div>
88   - <div class="col-sm-6">
89   - <label class="col-sm-3 control-label">是否区内：</label>
90   - <span class="col-sm-9">
91   - {{line.inoutDistrict}}
92   - </span>
93   - </div>
94   - <div class="col-sm-6">
95   - <label class="col-sm-3 control-label">营运状态：</label>
96   - <span class="col-sm-9">
97   -
98   - {{line.serviceState}}
99   - </span>
100   - </div>
101   - <div class="col-sm-6">
102   - <label class="col-sm-3 control-label">车辆类型：</label>
103   - <span class="col-sm-9">
104   - {{line.busType}}
105   - </span>
106   - </div>
107   - <div class="col-sm-6">
108   - <label class="col-sm-3 control-label">是否空调：</label>
109   - <span class="col-sm-9">
110   -
111   - {{line.airConditionerType}}
112   - </span>
113   - </div>
114   - <div class="col-sm-6">
115   - <label class="col-sm-3 control-label">售票类型：</label>
116   - <span class="col-sm-9">
117   - {{line.sellTicketType}}
118   - </span>
119   - </div>
120   - <div class="col-sm-6">
121   - <label class="col-sm-3 control-label">运营时间：</label>
122   - <span class="col-sm-9">
123   - {{line.serviceTime}}
124   - </span>
125   - </div>
126   - <div class="col-sm-6">
127   - <label class="col-sm-3 control-label">线路长度：</label>
128   - <span class="col-sm-9">
129   - {{line.lineDistance}}
130   - </span>
131   - </div>
132   - <div class="col-sm-6">
133   - <label class="col-sm-3 control-label">线路编码：</label>
134   - <span class="col-sm-9">
135   - {{line.lineCode}}
136   - </span>
137   - </div>
138   - <div class="col-sm-6">
139   - <label class="col-sm-3 control-label">授权年限：</label>
140   - <span class="col-sm-9">
141   - {{line.warrantYear}}
142   - </span>
143   - </div>
144   - <div class="col-sm-6">
145   - <label class="col-sm-3 control-label">授权起始日期：</label>
146   - <span class="col-sm-9">
147   - {{line.warrantStartTime}}
148   - </span>
149   - </div>
150   - <div class="col-sm-6">
151   - <label class="col-sm-3 control-label">授权结束日期：</label>
152   - <span class="col-sm-9">
153   - {{line.warrantEndTime}}
154   - </span>
155   - </div>
156   - <div class="col-sm-6">
157   - <label class="col-sm-3 control-label">撤销日期：</label>
158   - <span class="col-sm-9">
159   - {{line.planCancelTime}}
160   - </span>
161   - </div>
162   - <div class="col-sm-6">
163   - <label class="col-sm-3 control-label">实际撤销日期：</label>
164   - <span class="col-sm-9">
165   - {{line.cancelTime}}
166   - </span>
167   - </div>
168   - <div class="col-sm-6">
169   - <label class="col-sm-3 control-label">撤销原因：</label>
170   - <span class="col-sm-9">
171   - <textarea name="cancelReason" class="form-control" readonly>{{line.cancelReason}}</textarea>
172   - </span>
173   - </div>
174   - <div class="col-sm-6">
175   - <label class="col-sm-3 control-label">备注：</label>
176   - <span class="col-sm-9">
177   - <textarea name="remark" class="form-control" readonly>{{line.remark}}</textarea>
178   - </span>
179   - </div>
180   - <div class="col-sm-6">
181   - <label class="col-sm-3 control-label">是否逻辑删除：</label>
182   - <span class="col-sm-9">
183   -
184   - {{line.isLogicDelete}}
185   - </span>
186   - </div>
187   - <div class="col-sm-6">
188   - <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
189   - <span class="col-sm-9">
190   - {{line.timeSchedule}}
191   - </span>
192   - </div>
193   - <div class="col-sm-6">
194   - <label class="col-sm-3 control-label">停车场：</label>
195   - <span class="col-sm-9">
196   - {{line.park}}
197   - </span>
198   - </div>
199   - <div class="col-sm-6">
200   - <label class="col-sm-3 control-label">是否权证：</label>
201   - <span class="col-sm-9">
202   - {{line.isWarran}}
203   - </span>
204   - </div>
205   - <div class="col-sm-6">
206   - <label class="col-sm-3 control-label">道路类型：</label>
207   - <span class="col-sm-9">
208   - {{line.roadType}}
209   - </span>
210   - </div>
211   - <div class="col-sm-6">
212   - <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
213   - <span class="col-sm-9" >
214   - <input type="text" th:value="${line!=null?line:line}">
215   - {{line.ticketPrice}}
216   - </span>
217   - </div>
218   - <div class="col-sm-6">
219   - <label class="col-sm-3 control-label">首站：</label>
220   - <span class="col-sm-9">
221   - {{line.firstStation}}
222   - </span>
223   - </div>
224   - <div class="col-sm-6">
225   - <label class="col-sm-3 control-label">起讫站：</label>
226   - <span class="col-sm-9">
227   - {{line.startEnd}}
228   - </span>
229   - </div>
230   - <div class="col-sm-6">
231   - <label class="col-sm-3 control-label">首战时间：</label>
232   - <span class="col-sm-9">
233   - {{line.firstTime}}
234   - </span>
235   - </div>
236   - <div class="col-sm-6">
237   - <label class="col-sm-3 control-label">末站：</label>
238   - <span class="col-sm-9">
239   - {{line.lastStation}}
240   - </span>
241   - </div>
242   - <div class="col-sm-6">
243   - <label class="col-sm-3 control-label">末站首战时间：</label>
244   - <span class="col-sm-9">
245   - {{line.lastTime}}
246   - </span>
247   - </div>
248   - <div class="col-sm-6">
249   - <label class="col-sm-3 control-label">上行里程数：</label>
250   - <span class="col-sm-9">
251   - {{line.mileageUp}}
252   - </span>
253   - </div>
254   - <div class="col-sm-6">
255   - <label class="col-sm-3 control-label">下行里程数：</label>
256   - <span class="col-sm-9">
257   - {{line.mileageDown}}
258   - </span>
259   - </div>
260   - <div class="col-sm-6">
261   - <label class="col-sm-3 control-label">平均里程数：</label>
262   - <span class="col-sm-9">
263   - {{line.averageMileage}}
264   - </span>
265   - </div>
266   - <div class="col-sm-6">
267   - <label class="col-sm-3 control-label">站级数(上行)：</label>
268   - <span class="col-sm-9">
269   - {{line.stationUp}}
270   - </span>
271   - </div>
272   - <div class="col-sm-6">
273   - <label class="col-sm-3 control-label">站级数(下行)：</label>
274   - <span class="col-sm-9">
275   - {{line.stationDown}}
276   - </span>
277   - </div>
278   - <div class="col-sm-6">
279   - <label class="col-sm-3 control-label">行驶时间(上行)：</label>
280   - <span class="col-sm-9">
281   - {{line.travelTimeUp}}
282   - </span>
283   - </div>
284   - <div class="col-sm-6">
285   - <label class="col-sm-3 control-label">行驶时间(下行)：</label>
286   - <span class="col-sm-9">
287   - {{line.travelTimeDown}}
288   - </span>
289   - </div>
290   - <div class="col-sm-6">
291   - <label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
292   - <span class="col-sm-9">
293   - {{line.travelIntervalUp}}
294   - </span>
295   - </div>
296   - <div class="col-sm-6">
297   - <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
298   - <span class="col-sm-9">
299   - {{line.travelIntervalDown}}
300   - </span>
301   - </div>
302   - <div class="col-sm-6">
303   - <label class="col-sm-3 control-label">经营权证（大巴）：</label>
304   - <span class="col-sm-9">
305   - {{line.warrantVehiclesLarge}}
306   - </span>
307   - </div>
308   - <div class="col-sm-6">
309   - <label class="col-sm-3 control-label">经营权证（中巴）：</label>
310   - <span class="col-sm-9">
311   - {{line.warrantVehiclesMiddle}}
312   - </span>
313   - </div>
314   - <div class="col-sm-6">
315   - <label class="col-sm-3 control-label">实际配车数：</label>
316   - <span class="col-sm-9">
317   - {{line.vehiclesNumber}}
318   - </span>
319   - </div>
320   - <div class="col-sm-6">
321   - <label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
322   - <span class="col-sm-9">
323   - {{line.numberVehiclesLarge}}
324   - </span>
325   - </div>
326   - <div class="col-sm-6">
327   - <label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
328   - <span class="col-sm-9">
329   - {{line.numberVehiclesMiddle}}
330   - </span>
331   - </div>
332   - <div class="col-sm-6">
333   - <label class="col-sm-3 control-label">车辆自编号：</label>
334   - <span class="col-sm-9">
335   - {{line.carPlate}}
336   - </span>
337   - </div>
338   - <div class="col-sm-6">
339   - <label class="col-sm-3 control-label">线路总配人数：</label>
340   - <span class="col-sm-9">
341   - {{line.numberPerson}}
342   - </span>
343   - </div>
344   - <div class="col-sm-6">
345   - <label class="col-sm-3 control-label">人数司机：</label>
346   - <span class="col-sm-9">
347   - {{line.numberPersonDriver}}
348   - </span>
349   - </div>
350   - <div class="col-sm-6">
351   - <label class="col-sm-3 control-label">售票员数：</label>
352   - <span class="col-sm-9">
353   - {{line.numberPersonSales}}
354   - </span>
355   - </div>
356   - <div class="col-sm-6">
357   - <label class="col-sm-3 control-label">新能源车数：</label>
358   - <span class="col-sm-9">
359   - {{line.busEvNumber}}
360   - </span>
361   - </div>
362   - <div class="col-sm-6">
363   - <label class="col-sm-3 control-label">线路走向：</label>
364   - <span class="col-sm-9">
365   - <textarea name="directions" class="form-control" readonly>{{line.directions}}</textarea>
366   - </span>
367   - </div>
368   - <div class="col-sm-6">
369   - <label class="col-sm-3 control-label">经营权证数：</label>
370   - <span class="col-sm-9">
371   - {{line.numberOfManage}}
372   - </span>
373   - </div>
374   - <div class="col-sm-6">
375   - <label class="col-sm-3 control-label">站点名称：</label>
376   - <span class="col-sm-9">
377   - <textarea name="halfwayStation" class="form-control" readonly>{{line.halfwayStation}}</textarea>
378   - </span>
379   - </div>
380   - <div class="col-sm-6">
381   - <label class="col-sm-3 control-label">高峰系数：</label>
382   - <span class="col-sm-9">
383   - {{line.fullCustomerPercent}}
384   - </span>
385   - </div>
386   - <div class="col-sm-6">
387   - <label class="col-sm-3 control-label">低谷系数：</label>
388   - <span class="col-sm-9">
389   - {{line.lowCustomerPercent}}
390   - </span>
391   - </div>
392   - <div class="col-sm-6">
393   - <label class="col-sm-3 control-label">间隔等级：</label>
394   - <span class="col-sm-9">
395   - {{line.divideLevel}}
396   - </span>
397   - </div>
398   - <div class="col-sm-6">
399   - <label class="col-sm-3 control-label">是否挂牌：</label>
400   - <span class="col-sm-9">
401   - {{line.hasTimelists}}
402   - </span>
403   - </div>
404   - <div class="col-sm-6">
405   - <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
406   - <span class="col-sm-9">
407   - {{line.isMetro}}
408   - </span>
409   - </div>
410   - <div class="col-sm-6">
411   - <label class="col-sm-3 control-label">轨交时间：</label>
412   - <span class="col-sm-9">
413   - {{line.metroTime}}
414   - </span>
415   - </div>
416   - <div class="col-sm-6">
417   - <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
418   - <span class="col-sm-9">
419   - {{line.coldBonusType}}
420   - </span>
421   - </div>
422   - <div class="col-sm-6">
423   - <label class="col-sm-3 control-label">月度营收：</label>
424   - <span class="col-sm-9">
425   - {{line.revenuesMonth}}
426   - </span>
427   - </div>
428   - <div class="col-sm-6">
429   - <label class="col-sm-3 control-label">月度人次：</label>
430   - <span class="col-sm-9">
431   - {{line.personMonth}}
432   - </span>
433   - </div>
434   - <div class="col-sm-6">
435   - <label class="col-sm-3 control-label">月度里程：</label>
436   - <span class="col-sm-9">
437   - {{line.mileageMonth}}
438   - </span>
439   - </div>
440   - <div class="col-sm-6">
441   - <label class="col-sm-3 control-label">百公里人次：</label>
442   - <span class="col-sm-9">
443   - {{line.personMonthAvg}}
444   - </span>
445   - </div>
446   - <div class="col-sm-6">
447   - <label class="col-sm-3 control-label">营收：</label>
448   - <span class="col-sm-9">
449   - {{line.revenues}}
450   - </span>
451   - </div>
452   - <div class="col-sm-6">
453   - <label class="col-sm-3 control-label">人次：</label>
454   - <span class="col-sm-9">
455   - {{line.persons}}
456   - </span>
457   - </div>
458   - <div class="col-sm-6">
459   - <label class="col-sm-3 control-label">里程：</label>
460   - <span class="col-sm-9">
461   - {{line.mileages}}
462   - </span>
463   - </div>
464   - <div class="col-sm-6">
465   - <label class="col-sm-3 control-label">百公里人次：</label>
466   - <span class="col-sm-9">
467   - {{line.personAvg}}
468   - </span>
469   - </div>
470   -
471   - <div class="col-sm-6">
472   - <label class="col-sm-3 control-label">启用时间：</label>
473   - <span class="col-sm-9">
474   - {{line.startDate}}
475   -
476   - </span>
477   - </div>
478   - <div class="col-sm-6">
479   - <label class="col-sm-3 control-label">启用原因：</label>
480   - <span class="col-sm-9">
481   - <textarea name="startReason" class="form-control" readonly>{{line.startReason}}</textarea>
482   - </span>
483   - </div>
484   -
485   - <div class="col-sm-12" v-if="line.files">
486   - <label class="col-sm-3 control-label">附件：</label>
487   - <span class="col-sm-9" v-for="path in line.files.split(',')" >
488   - <a :href="path.replace(path.split(':')[0] + ':' , '')">
  8 +<div class="info col-lg-12">
  9 + <div class="input-group">
  10 + <input type="text" class="form-control" id="text" placeholder="请选择">
  11 + <div class="input-group-btn">
  12 + <button type="button" class="btn btn-white dropdown-toggle"
  13 + data-toggle="dropdown">
  14 + <span class="caret"></span>
  15 + </button>
  16 + <ul class="dropdown-menu dropdown-menu-right" role="menu">
  17 + </ul>
  18 + </div>
  19 + </div>
  20 +</div>
  21 +<div class="container-div" id="context" style="padding-top:100px;">
  22 + <el-row>
  23 + <el-col :span="6">
  24 + <el-timeline>
  25 + <el-timeline-item
  26 + v-for="(line,index) in lines"
  27 + :type="line.timeLineType"
  28 + size="large"
  29 + :timestamp="line.startDate" @click.native="change(index);">
  30 + {{line.lineUpdateType}}(
  31 + {{line.startReason}})
  32 + </el-timeline-item>
  33 + </el-timeline>
  34 + </el-col>
  35 + <el-col :span="18">
  36 + <el-tabs type="border-card" v-model="tab" v-if="line">
  37 + <el-tab-pane label="线路信息" name="first">
  38 + <div class="col-sm-6">
  39 + <label class="col-sm-3 control-label">线路名称：</label>
  40 + <span class="col-sm-9" id="lineName">{{line.lineName}}</span>
  41 + </div>
  42 + <div class="col-sm-6">
  43 + <label class="col-sm-3 control-label">公司：</label>
  44 + <span class="col-sm-9" id="company">{{line.company}}</span>
  45 + </div>
  46 + <div class="col-sm-6">
  47 + <label class="col-sm-3 control-label">分公司：</label>
  48 + <span class="col-sm-9" id="fCompany">{{line.fCompany}}</span>
  49 + </div>
  50 + <div class="col-sm-6">
  51 + <label class="col-sm-3 control-label">主线路id：</label>
  52 + <span class="col-sm-9" id="pLineId">{{line.pLineId}}</span>
  53 + </div>
  54 + <div class="col-sm-6">
  55 + <label class="col-sm-3 control-label">营运方式：</label>
  56 + <span class="col-sm-9" id="serviceType"> {{line.serviceType}}</span>
  57 + </div>
  58 + <div class="col-sm-6">
  59 + <label class="col-sm-3 control-label">线路属性：</label>
  60 + <span class="col-sm-9" id="lineLevel">{{line.lineLevel}}</span>
  61 + </div>
  62 + <div class="col-sm-6">
  63 + <label class="col-sm-3 control-label">线路类型：</label>
  64 + <span class="col-sm-9" id="lineType">{{line.lineType}}
  65 + </span>
  66 + </div>
  67 + <div class="col-sm-6">
  68 + <label class="col-sm-3 control-label">区属：</label>
  69 + <span class="col-sm-9" id="district">{{line.district}}</span>
  70 + </div>
  71 + <div class="col-sm-6">
  72 + <label class="col-sm-3 control-label">是否区内：</label>
  73 + <span class="col-sm-9" id="inoutDistrict">{{line.inoutDistrict}}</span>
  74 + </div>
  75 + <div class="col-sm-6">
  76 + <label class="col-sm-3 control-label">营运状态：</label>
  77 + <span class="col-sm-9" id="serviceState">{{line.serviceState}}</span>
  78 + </div>
  79 + <div class="col-sm-6">
  80 + <label class="col-sm-3 control-label">车辆类型：</label>
  81 + <span class="col-sm-9" id="busType">{{line.busType}}</span>
  82 + </div>
  83 + <div class="col-sm-6">
  84 + <label class="col-sm-3 control-label">是否空调：</label>
  85 + <span class="col-sm-9" id="airConditionerType">{{line.airConditionerType}}</span>
  86 + </div>
  87 + <div class="col-sm-6">
  88 + <label class="col-sm-3 control-label">售票类型：</label>
  89 + <span class="col-sm-9" id="sellTicketType">{{line.sellTicketType}}</span>
  90 + </div>
  91 + <div class="col-sm-6">
  92 + <label class="col-sm-3 control-label">运营时间：</label>
  93 + <span class="col-sm-9" id="serviceTime">{{line.serviceTime}}</span>
  94 + </div>
  95 + <div class="col-sm-6">
  96 + <label class="col-sm-3 control-label">线路长度：</label>
  97 + <span class="col-sm-9" id="lineDistance">{{line.lineDistance}}</span>
  98 + </div>
  99 + <div class="col-sm-6">
  100 + <label class="col-sm-3 control-label">线路编码：</label>
  101 + <span class="col-sm-9" id="lineCode">{{line.lineCode}}</span>
  102 + </div>
  103 + <div class="col-sm-6">
  104 + <label class="col-sm-3 control-label">授权年限：</label>
  105 + <span class="col-sm-9" id="warrantYear">{{line.warrantYear}}</span>
  106 + </div>
  107 + <div class="col-sm-6">
  108 + <label class="col-sm-3 control-label">授权起始日期：</label>
  109 + <span class="col-sm-9" id="warrantStartTime">{{line.warrantStartTime}}</span>
  110 + </div>
  111 + <div class="col-sm-6">
  112 + <label class="col-sm-3 control-label">授权结束日期：</label>
  113 + <span class="col-sm-9" id="warrantEndTime">{{line.warrantEndTime}}</span>
  114 + </div>
  115 + <div class="col-sm-6">
  116 + <label class="col-sm-3 control-label">撤销日期：</label>
  117 + <span class="col-sm-9" id="planCancelTime">{{line.planCancelTime}}</span>
  118 + </div>
  119 + <div class="col-sm-6">
  120 + <label class="col-sm-3 control-label">实际撤销日期：</label>
  121 + <span class="col-sm-9"id="cancelTime">{{line.cancelTime}}</span>
  122 + </div>
  123 + <div class="col-sm-6">
  124 + <label class="col-sm-3 control-label">撤销原因：</label>
  125 + <span class="col-sm-9"id="cancelReason">
  126 + <textarea name="cancelReason" class="form-control" readonly >{{line.cancelReason}}</textarea>
  127 + </span>
  128 + </div>
  129 + <div class="col-sm-6">
  130 + <label class="col-sm-3 control-label">备注：</label>
  131 + <span class="col-sm-9"id="remark">
  132 + <textarea name="remark" class="form-control" readonly >{{line.remark}}</textarea>
  133 + </span>
  134 + </div>
  135 + <div class="col-sm-6">
  136 + <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
  137 + <span class="col-sm-9" id="timeSchedule">{{line.timeSchedule}}</span>
  138 + </div>
  139 + <div class="col-sm-6">
  140 + <label class="col-sm-3 control-label">停车场：</label>
  141 + <span class="col-sm-9" id="park">{{line.park}}</span>
  142 + </div>
  143 + <div class="col-sm-6">
  144 + <label class="col-sm-3 control-label">是否权证：</label>
  145 + <span class="col-sm-9" id="isWarran">{{line.isWarran}}</span>
  146 + </div>
  147 + <div class="col-sm-6">
  148 + <label class="col-sm-3 control-label">道路类型：</label>
  149 + <span class="col-sm-9" id="roadType">{{line.roadType}}</span>
  150 + </div>
  151 + <div class="col-sm-6">
  152 + <label class="col-sm-3 control-label">票价：</label>
  153 + <span class="col-sm-9" id="ticketPrice">{{line.ticketPrice}}</span>
  154 + </div>
  155 + <div class="col-sm-6">
  156 + <label class="col-sm-3 control-label">首站：</label>
  157 + <span class="col-sm-9" id="firstStation">{{line.firstStation}}</span>
  158 + </div>
  159 + <div class="col-sm-6">
  160 + <label class="col-sm-3 control-label">起讫站：</label>
  161 + <span class="col-sm-9" id="startEnd">{{line.startEnd}}</span>
  162 + </div>
  163 + <div class="col-sm-6">
  164 + <label class="col-sm-3 control-label">首站时间：</label>
  165 + <span class="col-sm-9"id="firstTime">{{line.firstTime}}</span>
  166 + </div>
  167 + <div class="col-sm-6">
  168 + <label class="col-sm-3 control-label">末站：</label>
  169 + <span class="col-sm-9"id="lastStation">{{line.lastStation}}</span>
  170 + </div>
  171 + <div class="col-sm-6">
  172 + <label class="col-sm-3 control-label">末站首站时间：</label>
  173 + <span class="col-sm-9"id="lastTime">{{line.lastTime}}</span>
  174 + </div>
  175 + <div class="col-sm-6">
  176 + <label class="col-sm-3 control-label">上行里程数：</label>
  177 + <span class="col-sm-9"id="mileageUp">{{line.mileageUp}}</span>
  178 + </div>
  179 + <div class="col-sm-6">
  180 + <label class="col-sm-3 control-label">下行里程数：</label>
  181 + <span class="col-sm-9"id="mileageDown">{{line.mileageDown}}</span>
  182 + </div>
  183 + <div class="col-sm-6">
  184 + <label class="col-sm-3 control-label">平均里程数：</label>
  185 + <span class="col-sm-9"id="averageMileage">{{line.averageMileage}}</span>
  186 + </div>
  187 + <div class="col-sm-6">
  188 + <label class="col-sm-3 control-label">站级数(上行)：</label>
  189 + <span class="col-sm-9"id="stationUp">{{line.stationUp}}</span>
  190 + </div>
  191 + <div class="col-sm-6">
  192 + <label class="col-sm-3 control-label">站级数(下行)：</label>
  193 + <span class="col-sm-9"id="stationDown">{{line.stationDown}}</span>
  194 + </div>
  195 + <div class="col-sm-6">
  196 + <label class="col-sm-3 control-label">行驶时间(上行)：</label>
  197 + <span class="col-sm-9"id="travelTimeUp">{{line.travelTimeUp}}</span>
  198 + </div>
  199 + <div class="col-sm-6">
  200 + <label class="col-sm-3 control-label">行驶时间(下行)：</label>
  201 + <span class="col-sm-9"id="travelTimeDown">{{line.travelTimeDown}}</span>
  202 + </div>
  203 + <div class="col-sm-6">
  204 + <label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
  205 + <span class="col-sm-9"id="travelIntervalUp">{{line.travelIntervalUp}}</span>
  206 + </div>
  207 + <div class="col-sm-6">
  208 + <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
  209 + <span class="col-sm-9"id="travelIntervalDown">{{line.travelIntervalDown}}</span>
  210 + </div>
  211 + <div class="col-sm-6">
  212 + <label class="col-sm-3 control-label">经营权证（大巴）：</label>
  213 + <span class="col-sm-9"id="warrantVehiclesLarge">{{line.warrantVehiclesLarge}}</span>
  214 + </div>
  215 + <div class="col-sm-6">
  216 + <label class="col-sm-3 control-label">经营权证（中巴）：</label>
  217 + <span class="col-sm-9"id="warrantVehiclesMiddle">{{line.warrantVehiclesMiddle}}</span>
  218 + </div>
  219 + <div class="col-sm-6">
  220 + <label class="col-sm-3 control-label">实际配车数：</label>
  221 + <span class="col-sm-9"id="vehiclesNumber">{{line.vehiclesNumber}}</span>
  222 + </div>
  223 + <div class="col-sm-6">
  224 + <label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
  225 + <span class="col-sm-9"id="numberVehiclesLarge">{{line.numberVehiclesLarge}}</span>
  226 + </div>
  227 + <div class="col-sm-6">
  228 + <label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
  229 + <span class="col-sm-9"id="numberVehiclesMiddle">{{line.numberVehiclesMiddle}}</span>
  230 + </div>
  231 + <div class="col-sm-6">
  232 + <label class="col-sm-3 control-label">车辆自编号：</label>
  233 + <span class="col-sm-9"id="carPlate">{{line.carPlate}}</span>
  234 + </div>
  235 + <div class="col-sm-6">
  236 + <label class="col-sm-3 control-label">线路总配人数：</label>
  237 + <span class="col-sm-9"id="numberPerson">{{line.numberPerson}}</span>
  238 + </div>
  239 + <div class="col-sm-6">
  240 + <label class="col-sm-3 control-label">人数司机：</label>
  241 + <span class="col-sm-9"id="numberPersonDriver">{{line.numberPersonDriver}}</span>
  242 + </div>
  243 + <div class="col-sm-6">
  244 + <label class="col-sm-3 control-label">售票员数：</label>
  245 + <span class="col-sm-9"id="numberPersonSales">{{line.numberPersonSales}}</span>
  246 + </div>
  247 + <div class="col-sm-6">
  248 + <label class="col-sm-3 control-label">新能源车数：</label>
  249 + <span class="col-sm-9"id="busEvNumber">{{line.busEvNumber}}</span>
  250 + </div>
  251 + <div class="col-sm-6">
  252 + <label class="col-sm-3 control-label">线路走向：</label>
  253 + <span class="col-sm-9"id="directions">
  254 + <textarea name="directions" class="form-control" readonly>{{line.directions}}</textarea>
  255 + </span>
  256 + </div>
  257 + <div class="col-sm-6">
  258 + <label class="col-sm-3 control-label">经营权证数：</label>
  259 + <span class="col-sm-9"id="numberOfManage">{{line.numberOfManage}}</span>
  260 + </div>
  261 + <div class="col-sm-6">
  262 + <label class="col-sm-3 control-label">站点名称：</label>
  263 + <span class="col-sm-9" id="halfwayStation">
  264 + <textarea name="halfwayStation" class="form-control" readonly>{{line.halfwayStation}}</textarea>
  265 + </span>
  266 + </div>
  267 + <div class="col-sm-6">
  268 + <label class="col-sm-3 control-label">高峰系数：</label>
  269 + <span class="col-sm-9" id="fullCustomerPercent">{{line.fullCustomerPercent}}</span>
  270 + </div>
  271 + <div class="col-sm-6">
  272 + <label class="col-sm-3 control-label">低谷系数：</label>
  273 + <span class="col-sm-9" id="lowCustomerPercent">{{line.lowCustomerPercent}}</span>
  274 + </div>
  275 + <div class="col-sm-6">
  276 + <label class="col-sm-3 control-label">间隔等级：</label>
  277 + <span class="col-sm-9"id="divideLevel">{{line.divideLevel}}</span>
  278 + </div>
  279 + <div class="col-sm-6">
  280 + <label class="col-sm-3 control-label">是否挂牌：</label>
  281 + <span class="col-sm-9" id="hasTimelists">{{line.hasTimelists}}</span>
  282 + </div>
  283 + <div class="col-sm-6">
  284 + <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
  285 + <span class="col-sm-9" id="isMetro">{{line.isMetro}}</span>
  286 + </div>
  287 + <div class="col-sm-6">
  288 + <label class="col-sm-3 control-label">轨交时间：</label>
  289 + <span class="col-sm-9" id="metroTime">{{line.metroTime}}</span>
  290 + </div>
  291 + <div class="col-sm-6">
  292 + <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
  293 + <span class="col-sm-9" id="coldBonusType">{{line.coldBonusType}}</span>
  294 + </div>
  295 + <div class="col-sm-12" v-if="line.files">
  296 + <label class="col-sm-3 control-label">附件：</label>
  297 + <span class="col-sm-9" v-for="path in line.files.split(',')">
  298 + <a :href="path.replace(path.split(':')[0] + ':' , '')">
489 299 {{path.split(":")[0]}}
490 300 </a>
491   - </span>
492   - </div>
493   -
494   -
495   - </el-tab-pane>
496   - <el-tab-pane label="对比数据" name="second" v-if="oldLine">
497   - <div class="col-sm-6">
498   - <label class="col-sm-3 control-label">线路名称：</label>
499   - <span class="col-sm-9">
  301 + </span>
  302 + </div>
  303 + </el-tab-pane>
  304 + <el-tab-pane label="对比数据" name="second" v-if="oldLine">
  305 + <div class="col-sm-6">
  306 + <label class="col-sm-3 control-label">线路名称：</label>
  307 + <span class="col-sm-9" id="text2">
500 308 {{oldLine.lineName}}
501 309 </span>
502   - </div>
503   - <div class="col-sm-6">
504   - <label class="col-sm-3 control-label">公司：</label>
505   - <span class="col-sm-9">
  310 + </div>
  311 + <div class="col-sm-6">
  312 + <label class="col-sm-3 control-label">公司：</label>
  313 + <span class="col-sm-9">
506 314 {{oldLine.company}}
507 315 </span>
508   - </div>
509   - <div class="col-sm-6">
510   - <label class="col-sm-3 control-label">分公司：</label>
511   - <span class="col-sm-9">
  316 + </div>
  317 + <div class="col-sm-6">
  318 + <label class="col-sm-3 control-label">分公司：</label>
  319 + <span class="col-sm-9">
512 320 {{oldLine.fCompany}}
513 321 </span>
514   - </div>
515   - <div class="col-sm-6">
516   - <label class="col-sm-3 control-label">主线路id：</label>
517   - <span class="col-sm-9">
  322 + </div>
  323 + <div class="col-sm-6">
  324 + <label class="col-sm-3 control-label">主线路id：</label>
  325 + <span class="col-sm-9">
518 326 {{oldLine.pLineId}}
519 327 </span>
520   - </div>
521   - <div class="col-sm-6">
522   - <label class="col-sm-3 control-label">营运方式：</label>
523   - <span class="col-sm-9"> {{oldLine.serviceType}}</span>
524   - </div>
525   - <div class="col-sm-6">
526   - <label class="col-sm-3 control-label">营运方式：</label>
527   - <span class="col-sm-9"> {{oldLine.busType}}</span>
528   - </div>
529   - <div class="col-sm-6">
530   - <label class="col-sm-3 control-label">线路属性：</label>
531   - <span class="col-sm-9">
  328 + </div>
  329 + <div class="col-sm-6">
  330 + <label class="col-sm-3 control-label">营运方式：</label>
  331 + <span class="col-sm-9"> {{oldLine.serviceType}}</span>
  332 + </div>
  333 + <div class="col-sm-6">
  334 + <label class="col-sm-3 control-label">线路属性：</label>
  335 + <span class="col-sm-9">
532 336 {{oldLine.lineLevel}}
533 337 </span>
534   - </div>
535   - <div class="col-sm-6">
536   - <label class="col-sm-3 control-label">线路类型：</label>
537   - <span class="col-sm-9">
  338 + </div>
  339 + <div class="col-sm-6">
  340 + <label class="col-sm-3 control-label">线路类型：</label>
  341 + <span class="col-sm-9">
538 342 {{oldLine.lineType}}
539 343 </span>
540   - </div>
541   - <div class="col-sm-6">
542   - <label class="col-sm-3 control-label">区属：</label>
543   - <span class="col-sm-9">
  344 + </div>
  345 + <div class="col-sm-6">
  346 + <label class="col-sm-3 control-label">区属：</label>
  347 + <span class="col-sm-9">
544 348 {{oldLine.district}}
545 349 </span>
546   - </div>
547   - <div class="col-sm-6">
548   - <label class="col-sm-3 control-label">是否区内：</label>
549   - <span class="col-sm-9">
  350 + </div>
  351 + <div class="col-sm-6">
  352 + <label class="col-sm-3 control-label">是否区内：</label>
  353 + <span class="col-sm-9">
550 354 {{oldLine.inoutDistrict}}
551 355 </span>
552   - </div>
553   - <div class="col-sm-6">
554   - <label class="col-sm-3 control-label">营运状态：</label>
555   - <span class="col-sm-9">
  356 + </div>
  357 + <div class="col-sm-6">
  358 + <label class="col-sm-3 control-label">营运状态：</label>
  359 + <span class="col-sm-9">
556 360  
557 361 {{oldLine.serviceState}}
558 362 </span>
559   - </div>
560   - <div class="col-sm-6">
561   - <label class="col-sm-3 control-label">车辆类型：</label>
562   - <span class="col-sm-9">
  363 + </div>
  364 + <div class="col-sm-6">
  365 + <label class="col-sm-3 control-label">车辆类型：</label>
  366 + <span class="col-sm-9">
563 367 {{oldLine.busType}}
564 368 </span>
565   - </div>
566   - <div class="col-sm-6">
567   - <label class="col-sm-3 control-label">是否空调：</label>
568   - <span class="col-sm-9">
  369 + </div>
  370 + <div class="col-sm-6">
  371 + <label class="col-sm-3 control-label">是否空调：</label>
  372 + <span class="col-sm-9">
569 373  
570 374 {{oldLine.airConditionerType}}
571 375 </span>
572   - </div>
573   - <div class="col-sm-6">
574   - <label class="col-sm-3 control-label">售票类型：</label>
575   - <span class="col-sm-9">
  376 + </div>
  377 + <div class="col-sm-6">
  378 + <label class="col-sm-3 control-label">售票类型：</label>
  379 + <span class="col-sm-9">
576 380 {{oldLine.sellTicketType}}
577 381 </span>
578   - </div>
579   - <div class="col-sm-6">
580   - <label class="col-sm-3 control-label">运营时间：</label>
581   - <span class="col-sm-9">
  382 + </div>
  383 + <div class="col-sm-6">
  384 + <label class="col-sm-3 control-label">运营时间：</label>
  385 + <span class="col-sm-9">
582 386 {{oldLine.serviceTime}}
583 387 </span>
584   - </div>
585   - <div class="col-sm-6">
586   - <label class="col-sm-3 control-label">线路长度：</label>
587   - <span class="col-sm-9">
  388 + </div>
  389 + <div class="col-sm-6">
  390 + <label class="col-sm-3 control-label">线路长度：</label>
  391 + <span class="col-sm-9">
588 392 {{oldLine.lineDistance}}
589 393 </span>
590   - </div>
591   - <div class="col-sm-6">
592   - <label class="col-sm-3 control-label">线路编码：</label>
593   - <span class="col-sm-9">
  394 + </div>
  395 + <div class="col-sm-6">
  396 + <label class="col-sm-3 control-label">线路编码：</label>
  397 + <span class="col-sm-9">
594 398 {{oldLine.lineCode}}
595 399 </span>
596   - </div>
597   - <div class="col-sm-6">
598   - <label class="col-sm-3 control-label">授权年限：</label>
599   - <span class="col-sm-9">
  400 + </div>
  401 + <div class="col-sm-6">
  402 + <label class="col-sm-3 control-label">授权年限：</label>
  403 + <span class="col-sm-9">
600 404 {{oldLine.warrantYear}}
601 405 </span>
602   - </div>
603   - <div class="col-sm-6">
604   - <label class="col-sm-3 control-label">授权起始日期：</label>
605   - <span class="col-sm-9">
  406 + </div>
  407 + <div class="col-sm-6">
  408 + <label class="col-sm-3 control-label">授权起始日期：</label>
  409 + <span class="col-sm-9">
606 410 {{oldLine.warrantStartTime}}
607 411 </span>
608   - </div>
609   - <div class="col-sm-6">
610   - <label class="col-sm-3 control-label">授权结束日期：</label>
611   - <span class="col-sm-9">
  412 + </div>
  413 + <div class="col-sm-6">
  414 + <label class="col-sm-3 control-label">授权结束日期：</label>
  415 + <span class="col-sm-9">
612 416 {{oldLine.warrantEndTime}}
613 417 </span>
614   - </div>
615   - <div class="col-sm-6">
616   - <label class="col-sm-3 control-label">撤销日期：</label>
617   - <span class="col-sm-9">
  418 + </div>
  419 + <div class="col-sm-6">
  420 + <label class="col-sm-3 control-label">撤销日期：</label>
  421 + <span class="col-sm-9">
618 422 {{oldLine.planCancelTime}}
619 423 </span>
620   - </div>
621   - <div class="col-sm-6">
622   - <label class="col-sm-3 control-label">实际撤销日期：</label>
623   - <span class="col-sm-9">
  424 + </div>
  425 + <div class="col-sm-6">
  426 + <label class="col-sm-3 control-label">实际撤销日期：</label>
  427 + <span class="col-sm-9">
624 428 {{oldLine.cancelTime}}
625 429 </span>
626   - </div>
627   - <div class="col-sm-6">
628   - <label class="col-sm-3 control-label">撤销原因：</label>
629   - <span class="col-sm-9">
  430 + </div>
  431 + <div class="col-sm-6">
  432 + <label class="col-sm-3 control-label">撤销原因：</label>
  433 + <span class="col-sm-9">
630 434 <textarea name="cancelReason" class="form-control" readonly>{{oldLine.cancelReason}}</textarea>
631 435 </span>
632   - </div>
633   - <div class="col-sm-6">
634   - <label class="col-sm-3 control-label">备注：</label>
635   - <span class="col-sm-9">
  436 + </div>
  437 + <div class="col-sm-6">
  438 + <label class="col-sm-3 control-label">备注：</label>
  439 + <span class="col-sm-9">
636 440 <textarea name="remark" class="form-control" readonly>{{oldLine.remark}}</textarea>
637 441 </span>
638   - </div>
639   - <div class="col-sm-6">
640   - <label class="col-sm-3 control-label">是否逻辑删除：</label>
641   - <span class="col-sm-9">
642   -
643   - {{oldLine.isLogicDelete}}
644   - </span>
645   - </div>
646   - <div class="col-sm-6">
647   - <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
648   - <span class="col-sm-9">
  442 + </div>
  443 + <div class="col-sm-6">
  444 + <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
  445 + <span class="col-sm-9">
649 446 {{oldLine.timeSchedule}}
650 447 </span>
651   - </div>
652   - <div class="col-sm-6">
653   - <label class="col-sm-3 control-label">停车场：</label>
654   - <span class="col-sm-9">
  448 + </div>
  449 + <div class="col-sm-6">
  450 + <label class="col-sm-3 control-label">停车场：</label>
  451 + <span class="col-sm-9">
655 452 {{oldLine.park}}
656 453 </span>
657   - </div>
658   - <div class="col-sm-6">
659   - <label class="col-sm-3 control-label">是否权证：</label>
660   - <span class="col-sm-9">
  454 + </div>
  455 + <div class="col-sm-6">
  456 + <label class="col-sm-3 control-label">是否权证：</label>
  457 + <span class="col-sm-9">
661 458 {{oldLine.isWarran}}
662 459 </span>
663   - </div>
664   - <div class="col-sm-6">
665   - <label class="col-sm-3 control-label">道路类型：</label>
666   - <span class="col-sm-9">
  460 + </div>
  461 + <div class="col-sm-6">
  462 + <label class="col-sm-3 control-label">道路类型：</label>
  463 + <span class="col-sm-9">
667 464 {{oldLine.roadType}}
668 465 </span>
669   - </div>
670   - <div class="col-sm-6">
671   - <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
672   - <span class="col-sm-9">
  466 + </div>
  467 + <div class="col-sm-6">
  468 + <label class="col-sm-3 control-label">票价：</label>
  469 + <span class="col-sm-9">
673 470 {{oldLine.ticketPrice}}
674 471 </span>
675   - </div>
676   - <div class="col-sm-6">
677   - <label class="col-sm-3 control-label">首站：</label>
678   - {{oldLine.firstStation}}
679   - </span>
680   - </div>
681   - <div class="col-sm-6">
682   - <label class="col-sm-3 control-label">起讫站：</label>
683   - <span class="col-sm-9">
  472 + </div>
  473 + <div class="col-sm-6">
  474 + <label class="col-sm-3 control-label">首站：</label>
  475 + <span class="col-sm-9">
  476 + {{oldLine.firstStation}}
  477 + </span>
  478 + </div>
  479 + <div class="col-sm-6">
  480 + <label class="col-sm-3 control-label">起讫站：</label>
  481 + <span class="col-sm-9">
684 482 {{oldLine.startEnd}}
685 483 </span>
686   - </div>
687   - <div class="col-sm-6">
688   - <label class="col-sm-3 control-label">首战时间：</label>
689   - <span class="col-sm-9">
  484 + </div>
  485 + <div class="col-sm-6">
  486 + <label class="col-sm-3 control-label">首站时间：</label>
  487 + <span class="col-sm-9">
690 488 {{oldLine.firstTime}}
691 489 </span>
692   - </div>
693   - <div class="col-sm-6">
694   - <label class="col-sm-3 control-label">末站：</label>
695   - <span class="col-sm-9">
  490 + </div>
  491 + <div class="col-sm-6">
  492 + <label class="col-sm-3 control-label">末站：</label>
  493 + <span class="col-sm-9">
696 494 {{oldLine.lastStation}}
697 495 </span>
698   - </div>
699   - <div class="col-sm-6">
700   - <label class="col-sm-3 control-label">末站首战时间：</label>
701   - <span class="col-sm-9">
  496 + </div>
  497 + <div class="col-sm-6">
  498 + <label class="col-sm-3 control-label">末站首站时间：</label>
  499 + <span class="col-sm-9">
702 500 {{oldLine.lastTime}}
703 501 </span>
704   - </div>
705   - <div class="col-sm-6">
706   - <label class="col-sm-3 control-label">上行里程数：</label>
707   - <span class="col-sm-9">
  502 + </div>
  503 + <div class="col-sm-6">
  504 + <label class="col-sm-3 control-label">上行里程数：</label>
  505 + <span class="col-sm-9">
708 506 {{oldLine.mileageUp}}
709 507 </span>
710   - </div>
711   - <div class="col-sm-6">
712   - <label class="col-sm-3 control-label">下行里程数：</label>
713   - <span class="col-sm-9">
  508 + </div>
  509 + <div class="col-sm-6">
  510 + <label class="col-sm-3 control-label">下行里程数：</label>
  511 + <span class="col-sm-9">
714 512 {{oldLine.mileageDown}}
715 513 </span>
716   - </div>
717   - <div class="col-sm-6">
718   - <label class="col-sm-3 control-label">平均里程数：</label>
719   - <span class="col-sm-9">
  514 + </div>
  515 + <div class="col-sm-6">
  516 + <label class="col-sm-3 control-label">平均里程数：</label>
  517 + <span class="col-sm-9">
720 518 {{oldLine.averageMileage}}
721 519 </span>
722   - </div>
723   - <div class="col-sm-6">
724   - <label class="col-sm-3 control-label">站级数(上行)：</label>
725   - <span class="col-sm-9">
  520 + </div>
  521 + <div class="col-sm-6">
  522 + <label class="col-sm-3 control-label">站级数(上行)：</label>
  523 + <span class="col-sm-9">
726 524 {{oldLine.stationUp}}
727 525 </span>
728   - </div>
729   - <div class="col-sm-6">
730   - <label class="col-sm-3 control-label">站级数(下行)：</label>
731   - <span class="col-sm-9">
  526 + </div>
  527 + <div class="col-sm-6">
  528 + <label class="col-sm-3 control-label">站级数(下行)：</label>
  529 + <span class="col-sm-9">
732 530 {{oldLine.stationDown}}
733 531 </span>
734   - </div>
735   - <div class="col-sm-6">
736   - <label class="col-sm-3 control-label">行驶时间(上行)：</label>
737   - <span class="col-sm-9">
  532 + </div>
  533 + <div class="col-sm-6">
  534 + <label class="col-sm-3 control-label">行驶时间(上行)：</label>
  535 + <span class="col-sm-9">
738 536 {{oldLine.travelTimeUp}}
739 537 </span>
740   - </div>
741   - <div class="col-sm-6">
742   - <label class="col-sm-3 control-label">行驶时间(下行)：</label>
743   - <span class="col-sm-9">
  538 + </div>
  539 + <div class="col-sm-6">
  540 + <label class="col-sm-3 control-label">行驶时间(下行)：</label>
  541 + <span class="col-sm-9">
744 542 {{oldLine.travelTimeDown}}
745 543 </span>
746   - </div>
747   - <div class="col-sm-6">
748   - <label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
749   - <span class="col-sm-9">
  544 + </div>
  545 + <div class="col-sm-6">
  546 + <label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
  547 + <span class="col-sm-9">
750 548 {{oldLine.travelIntervalUp}}
751 549 </span>
752   - </div>
753   - <div class="col-sm-6">
754   - <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
755   - <span class="col-sm-9">
  550 + </div>
  551 + <div class="col-sm-6">
  552 + <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
  553 + <span class="col-sm-9">
756 554 {{oldLine.travelIntervalDown}}
757 555 </span>
758   - </div>
759   - <div class="col-sm-6">
760   - <label class="col-sm-3 control-label">经营权证（大巴）：</label>
761   - <span class="col-sm-9">
  556 + </div>
  557 + <div class="col-sm-6">
  558 + <label class="col-sm-3 control-label">经营权证（大巴）：</label>
  559 + <span class="col-sm-9">
762 560 {{oldLine.warrantVehiclesLarge}}
763 561 </span>
764   - </div>
765   - <div class="col-sm-6">
766   - <label class="col-sm-3 control-label">经营权证（中巴）：</label>
767   - <span class="col-sm-9">
  562 + </div>
  563 + <div class="col-sm-6">
  564 + <label class="col-sm-3 control-label">经营权证（中巴）：</label>
  565 + <span class="col-sm-9">
768 566 {{oldLine.warrantVehiclesMiddle}}
769 567 </span>
770   - </div>
771   - <div class="col-sm-6">
772   - <label class="col-sm-3 control-label">实际配车数：</label>
773   - <span class="col-sm-9">
  568 + </div>
  569 + <div class="col-sm-6">
  570 + <label class="col-sm-3 control-label">实际配车数：</label>
  571 + <span class="col-sm-9">
774 572 {{oldLine.vehiclesNumber}}
775 573 </span>
776   - </div>
777   - <div class="col-sm-6">
778   - <label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
779   - <span class="col-sm-9">
  574 + </div>
  575 + <div class="col-sm-6">
  576 + <label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
  577 + <span class="col-sm-9">
780 578 {{oldLine.numberVehiclesLarge}}
781 579 </span>
782   - </div>
783   - <div class="col-sm-6">
784   - <label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
785   - <span class="col-sm-9">
  580 + </div>
  581 + <div class="col-sm-6">
  582 + <label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
  583 + <span class="col-sm-9">
786 584 {{oldLine.numberVehiclesMiddle}}
787 585 </span>
788   - </div>
789   - <div class="col-sm-6">
790   - <label class="col-sm-3 control-label">车辆自编号：</label>
791   - <span class="col-sm-9">
  586 + </div>
  587 + <div class="col-sm-6">
  588 + <label class="col-sm-3 control-label">车辆自编号：</label>
  589 + <span class="col-sm-9">
792 590 {{oldLine.carPlate}}
793 591 </span>
794   - </div>
795   - <div class="col-sm-6">
796   - <label class="col-sm-3 control-label">线路总配人数：</label>
797   - <span class="col-sm-9">
  592 + </div>
  593 + <div class="col-sm-6">
  594 + <label class="col-sm-3 control-label">线路总配人数：</label>
  595 + <span class="col-sm-9">
798 596 {{oldLine.numberPerson}}
799 597 </span>
800   - </div>
801   - <div class="col-sm-6">
802   - <label class="col-sm-3 control-label">人数司机：</label>
803   - <span class="col-sm-9">
  598 + </div>
  599 + <div class="col-sm-6">
  600 + <label class="col-sm-3 control-label">人数司机：</label>
  601 + <span class="col-sm-9">
804 602 {{oldLine.numberPersonDriver}}
805 603 </span>
806   - </div>
807   - <div class="col-sm-6">
808   - <label class="col-sm-3 control-label">售票员数：</label>
809   - <span class="col-sm-9">
  604 + </div>
  605 + <div class="col-sm-6">
  606 + <label class="col-sm-3 control-label">售票员数：</label>
  607 + <span class="col-sm-9">
810 608 {{oldLine.numberPersonSales}}
811 609 </span>
812   - </div>
813   - <div class="col-sm-6">
814   - <label class="col-sm-3 control-label">新能源车数：</label>
815   - <span class="col-sm-9">
  610 + </div>
  611 + <div class="col-sm-6">
  612 + <label class="col-sm-3 control-label">新能源车数：</label>
  613 + <span class="col-sm-9">
816 614 {{oldLine.busEvNumber}}
817 615 </span>
818   - </div>
819   - <div class="col-sm-6">
820   - <label class="col-sm-3 control-label">线路走向：</label>
821   - <span class="col-sm-9">
  616 + </div>
  617 + <div class="col-sm-6">
  618 + <label class="col-sm-3 control-label">线路走向：</label>
  619 + <span class="col-sm-9">
822 620 <textarea name="directions" class="form-control" readonly>{{oldLine.directions}}</textarea>
823 621 </span>
824   - </div>
825   - <div class="col-sm-6">
826   - <label class="col-sm-3 control-label">经营权证数：</label>
827   - <span class="col-sm-9">
  622 + </div>
  623 + <div class="col-sm-6">
  624 + <label class="col-sm-3 control-label">经营权证数：</label>
  625 + <span class="col-sm-9">
828 626 {{oldLine.numberOfManage}}
829 627 </span>
830   - </div>
831   - <div class="col-sm-6">
832   - <label class="col-sm-3 control-label">站点名称：</label>
833   - <span class="col-sm-9">
834   - <textarea name="halfwayStation" class="form-control" readonly>{{oldLine.halfwayStation}}</textarea>
  628 + </div>
  629 + <div class="col-sm-6">
  630 + <label class="col-sm-3 control-label">站点名称：</label>
  631 + <span class="col-sm-9">
  632 + <textarea name="halfwayStation" class="form-control" readonly>{{oldLine.halfwayStation}}</textarea>
835 633 </span>
836   - </div>
837   - <div class="col-sm-6">
838   - <label class="col-sm-3 control-label">高峰系数：</label>
839   - <span class="col-sm-9">
  634 + </div>
  635 + <div class="col-sm-6">
  636 + <label class="col-sm-3 control-label">高峰系数：</label>
  637 + <span class="col-sm-9">
840 638 {{oldLine.fullCustomerPercent}}
841 639 </span>
842   - </div>
843   - <div class="col-sm-6">
844   - <label class="col-sm-3 control-label">低谷系数：</label>
845   - <span class="col-sm-9">
  640 + </div>
  641 + <div class="col-sm-6">
  642 + <label class="col-sm-3 control-label">低谷系数：</label>
  643 + <span class="col-sm-9">
846 644 {{oldLine.lowCustomerPercent}}
847 645 </span>
848   - </div>
849   - <div class="col-sm-6">
850   - <label class="col-sm-3 control-label">间隔等级：</label>
851   - <span class="col-sm-9">
  646 + </div>
  647 + <div class="col-sm-6">
  648 + <label class="col-sm-3 control-label">间隔等级：</label>
  649 + <span class="col-sm-9">
852 650 {{oldLine.divideLevel}}
853 651 </span>
854   - </div>
855   - <div class="col-sm-6">
856   - <label class="col-sm-3 control-label">是否挂牌：</label>
857   - <span class="col-sm-9">
  652 + </div>
  653 + <div class="col-sm-6">
  654 + <label class="col-sm-3 control-label">是否挂牌：</label>
  655 + <span class="col-sm-9">
858 656 {{oldLine.hasTimelists}}
859 657 </span>
860   - </div>
861   - <div class="col-sm-6">
862   - <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
863   - <span class="col-sm-9">
  658 + </div>
  659 + <div class="col-sm-6">
  660 + <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
  661 + <span class="col-sm-9">
864 662 {{oldLine.isMetro}}
865 663 </span>
866   - </div>
867   - <div class="col-sm-6">
868   - <label class="col-sm-3 control-label">轨交时间：</label>
869   - <span class="col-sm-9">
  664 + </div>
  665 + <div class="col-sm-6">
  666 + <label class="col-sm-3 control-label">轨交时间：</label>
  667 + <span class="col-sm-9">
870 668 {{oldLine.metroTime}}
871 669 </span>
872   - </div>
873   - <div class="col-sm-6">
874   - <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
875   - <span class="col-sm-9">
  670 + </div>
  671 + <div class="col-sm-6">
  672 + <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
  673 + <span class="col-sm-9">
876 674 {{oldLine.coldBonusType}}
877 675 </span>
878   - </div>
879   - <div class="col-sm-6">
880   - <label class="col-sm-3 control-label">月度营收：</label>
881   - <span class="col-sm-9">
882   - {{oldLine.revenuesMonth}}
883   - </span>
884   - </div>
885   - <div class="col-sm-6">
886   - <label class="col-sm-3 control-label">月度人次：</label>
887   - <span class="col-sm-9">
888   - {{oldLine.personMonth}}
889   - </span>
890   - </div>
891   - <div class="col-sm-6">
892   - <label class="col-sm-3 control-label">月度里程：</label>
893   - <span class="col-sm-9">
894   - {{oldLine.mileageMonth}}
895   - </span>
896   - </div>
897   - <div class="col-sm-6">
898   - <label class="col-sm-3 control-label">百公里人次：</label>
899   - <span class="col-sm-9">
900   - {{oldLine.personMonthAvg}}
901   - </span>
902   - </div>
903   - <div class="col-sm-6">
904   - <label class="col-sm-3 control-label">营收：</label>
905   - <span class="col-sm-9">
906   - {{oldLine.revenues}}
907   - </span>
908   - </div>
909   - <div class="col-sm-6">
910   - <label class="col-sm-3 control-label">人次：</label>
911   - <span class="col-sm-9">
912   - {{oldLine.persons}}
913   - </span>
914   - </div>
915   - <div class="col-sm-6">
916   - <label class="col-sm-3 control-label">里程：</label>
917   - <span class="col-sm-9">
918   - {{oldLine.mileages}}
919   - </span>
920   - </div>
921   - <div class="col-sm-6">
922   - <label class="col-sm-3 control-label">百公里人次：</label>
923   - <span class="col-sm-9">
924   - {{oldLine.personAvg}}
925   - </span>
926   - </div>
927   -
928   - <div class="col-sm-6">
929   - <label class="col-sm-3 control-label">启用时间：</label>
930   - <span class="col-sm-9">
931   - {{oldLine.startDate}}
932   -
933   - </span>
934   - </div>
935   - <div class="col-sm-6">
936   - <label class="col-sm-3 control-label">启用原因：</label>
937   - <span class="col-sm-9">
938   - <textarea name="startReason" class="form-control" readonly>{{oldLine.startReason}}</textarea>
939   - </span>
940   - </div>
941   -
942   - <div class="col-sm-12" v-if="oldLine.files">
943   - <label class="col-sm-3 control-label">附件：</label>
944   - <span class="col-sm-9" v-for="path in oldLine.files.split(',')" >
945   - <a :href="path.replace(path.split(':')[0] + ':' , '')">
  676 + </div>
  677 + <div class="col-sm-12" v-if="oldLine.files">
  678 + <label class="col-sm-3 control-label">附件：</label>
  679 + <span class="col-sm-9" v-for="path in oldLine.files.split(',')">
  680 + <a :href="path.replace(path.split(':')[0] + ':' , '')">
946 681 {{path.split(":")[0]}}
947 682 </a>
948 683 </span>
949   - </div>
950   -
951   - </el-tab-pane>
952   - </el-tabs>
953   - </el-col>
954   - </el-row>
  684 + </div>
  685 +
  686 + </el-tab-pane>
  687 + </el-tabs>
  688 + </el-col>
  689 + </el-row>
  690 +
  691 +</div>
  692 +<th:block th:include="include :: footer"/>
  693 +<th:block th:include="include :: bootstrap-suggest-js"/>
955 694  
956   - </div>
957   - <th:block th:include="include :: footer" />
958   - <th:block th:include="include :: bootstrap-suggest-js" />
959 695  
  696 +<script th:inline="javascript">
960 697  
961 698  
962   - <script th:inline="javascript">
963   -
  699 + var dicts = [[${@dict.getType("")}]];
964 700  
965   - var dicts = [[${@dict.getType("")}]];
966   -
967   - $("#text").bsSuggest({
968   - url : "/system/lineHistory/getListForMap",
969   - effectiveFields : [ "lineName" ],
970   - searchFields : [ "lineName"],
971   - effectiveFieldsAlias : {
972   - lineName : "线路名"
973   - },
974   - clearable : true,
975   - idField : "id",
976   - keyField : "lineName",
977   - processData : function(json) { // url 获取数据时，对数据的处理，作为 getData 的回调函数
978   - var data = {
979   - 'value' : []
980   - };
981   -
982   - for ( var i in json) {
983   - data.value.push(json[i]);
  701 + $("#text").bsSuggest({
  702 + url: "/system/lineHistory/getListForMap",
  703 + effectiveFields: ["lineName"],
  704 + searchFields: ["lineName"],
  705 + effectiveFieldsAlias: {
  706 + lineName: "线路名"
  707 + },
  708 + clearable: true,
  709 + idField: "id",
  710 + keyField: "lineName",
  711 + processData: function (json) { // url 获取数据时，对数据的处理，作为 getData 的回调函数
  712 + var data = {
  713 + 'value': []
  714 + };
  715 +
  716 + for (var i in json) {
  717 + data.value.push(json[i]);
  718 + }
  719 +
  720 + //字符串转化为 js 对象
  721 + return data;
  722 + }
  723 + }).on('onDataRequestSuccess', function (e, result) {
  724 + console.log('onDataRequestSuccess: ', result);
  725 + }).on('onSetSelectValue', function (e, selectedData, selectedRawData) {
  726 +
  727 + $.get("/system/lineHistory/getListByName", {name: selectedData.key}, function (data) {
  728 +
  729 + getData(data);
  730 + vueObj.change(0);
  731 + });
  732 +
  733 + });
  734 +
  735 +
  736 + function getData(data) {
  737 + for (var index in data) {
  738 + var obj = data[index];
  739 + for (var field in obj) {
  740 + var value = data[index][field];
  741 +
  742 + if (field == "roadType" || field == "busType") {
  743 + if (data[index][field] != null) {
  744 +
  745 + var arr = value.split(",");
  746 + value = "";
  747 + for (var i in arr) {
  748 + for (var j in dicts[field]) {
  749 + if (dicts[field][j].dictValue == arr[i]) {
  750 + value += dicts[field][j].dictLabel + ","
  751 + break;
  752 + }
  753 + }
  754 +
  755 + }
  756 +
  757 +
  758 + data[index][field] = value.substring(0, value.length - 1);
  759 +
  760 + }
  761 + continue;
  762 + }
  763 +
  764 + if (field == "isLogicDelete" || field == "inoutDistrict" || field == "isMetro" || field == "hasTimelists" || field == "isWarran") {
  765 + for (var j in dicts["trueFalse"]) {
  766 + if (dicts["trueFalse"][j].dictValue == value) {
  767 + value = dicts["trueFalse"][j].dictLabel;
  768 + data[index][field] = value;
  769 + break;
  770 + }
  771 + }
  772 +
  773 + continue;
  774 + }
  775 + if (dicts[field]) {
  776 + for (var j in dicts[field]) {
  777 + if (dicts[field][j].dictValue == value) {
  778 + value = dicts[field][j].dictLabel;
  779 + data[index][field] = value;
  780 + break;
  781 + }
984 782 }
985   -
986   - //字符串转化为 js 对象
987   - return data;
  783 + continue;
988 784 }
989   - }).on('onDataRequestSuccess', function(e, result) {
990   - console.log('onDataRequestSuccess: ', result);
991   - }).on('onSetSelectValue', function(e, selectedData, selectedRawData) {
992   -
993   - $.get("/system/lineHistory/getListByName",{name:selectedData.key},function(data){
994   -
995   - getData(data);
996   -
997   - });
998   -
999   - });
1000   -
1001   -
1002   - function getData(data){
1003   - for(var index in data){
1004   - var obj = data[index];
1005   -
1006   - for(var field in obj){
1007 785  
1008   - var value = data[index][field];
1009   -
1010   - if(field == "roadType" || field == "busType"){
1011   - if(data[index][field] != null){
1012   -
1013   - var arr = value.split(",");
1014   - value = "";
1015   - for(var i in arr){
1016   - for(var j in dicts[field]){
1017   - if(dicts[field][j].dictValue == arr[i]){
1018   - value += dicts[field][j].dictLabel + ","
1019   - break;
1020   - }
1021   - }
1022   -
1023   - }
1024   -
1025   -
1026   - data[index][field] = value.substring(0,value.length -1);
1027 786  
1028   - }
1029   - continue;
1030   - }
1031   -
1032   - if(field == "isLogicDelete" || field == "inoutDistrict"|| field == "isMetro" || field == "hasTimelists" || field == "isWarran"){
1033   - for(var j in dicts["trueFalse"]){
1034   - if(dicts["trueFalse"][j].dictValue == value){
1035   - value = dicts["trueFalse"][j].dictLabel;
1036   - data[index][field] = value;
1037   - break;
1038   - }
1039   - }
1040 787  
1041   - continue;
1042   - }
1043   -
1044   - if(field == "lineUpdateType")
1045   - console.log("123");
1046   -
1047   - if(dicts[field]){
1048   - for(var j in dicts[field]){
1049   - if(dicts[field][j].dictValue == value){
1050   - value = dicts[field][j].dictLabel;
1051   - data[index][field] = value;
1052   - break;
1053   - }
1054   - }
1055   - continue;
1056   - }
1057   -
1058   - }
1059   -
1060   -
1061   - if(!data[index].lineUpdateType){
1062   - data[index].lineUpdateType = '初始化';
  788 +
  789 + }
  790 +
  791 +
  792 + if (!data[index].lineUpdateType) {
  793 + data[index].lineUpdateType = '初始化';
  794 + }
  795 +
  796 + }
  797 + vueObj._data.lines = data;
  798 +
  799 + console.log(data);
  800 + }
  801 +
  802 + var vueObj = new Vue({
  803 + el: '#context',
  804 + data: function () {
  805 + return {
  806 + tab: 'first',
  807 + lines: null,
  808 + line: null,
  809 + oldLine: null,
  810 + visible: false
  811 + }
  812 + },
  813 + methods: {
  814 + change(index) {
  815 + var l;
  816 + var ol;
  817 + if (index == 0) {
  818 + this.oldLine = null;
  819 + this.line = this.lines[index];
  820 + l = this.line;
  821 + for (let f in l) {
  822 + $('#'+f).attr('style',"color:#303133");
1063 823 }
1064   -
1065   - }
1066   -
1067   - vueObj._data.lines = data;
1068   -
1069   - console.log(data);
1070   - }
1071   -
1072   - var vueObj = new Vue({
1073   - el: '#context',
1074   - data: function() {
1075   - return {
1076   - tab: 'first',
1077   - lines : null,
1078   - line:null,
1079   - oldLine: null,
1080   - visible: false }
1081   - },
1082   - methods:{
1083   - change(index){
1084   - console.log(index);
1085   - this.line = this.lines[index];
1086   - var l=this.line;
1087   - this.oldLine = this.lines[index+1];
1088   - var ol=this.oldLine;
1089   - /* for(let f in l){
1090   - if(l[f]!=ol[f]){
1091   - $('#ticketPrice').attr('style','color: red');
  824 + } else {
  825 + this.oldLine = this.lines[index - 1];
  826 + ol = this.oldLine;
  827 + this.line = this.lines[index];
  828 + l = this.line;
  829 + if (ol != null) {
  830 + for (let f in l) {
  831 + if (l[f] != ol[f]) {
  832 + $('#'+f).css({'color': 'red'});
  833 + }
  834 + }
1092 835 }
1093   - }*/
1094   - },
1095   -
1096   - }
1097   - })
1098   - var dicts = [[${@dict.getType('')}]];
1099   -
1100   - var editFlag = [[${@permission.hasPermi('system:lineHistory:edit')}]];
1101   - var removeFlag = [[${@permission.hasPermi('system:lineHistory:remove')}]];
1102   - var prefix = ctx + "system/lineHistory";
  836 + }
1103 837  
1104   - $(function() {
1105   - var allDicts = {};
1106   -
1107   - for(var i in dicts){
1108   - if(!allDicts[dicts[i].dictType]){
1109   - allDicts[dicts[i].dictType] = [];
1110   - }
1111   - allDicts[dicts[i].dictType].push(dicts[i]);
1112   - }
1113   -
1114   - dicts = allDicts;
1115   -
1116   - });
1117   - </script>
  838 + for (var i in this.lines) {
  839 + this.lines[i].timeLineType = "primary";
  840 + }
  841 + this.lines[index].timeLineType = "success";
  842 + },
  843 +
  844 + }
  845 + })
  846 + var dicts = [[${@dict.getType('')}]];
  847 +
  848 + var editFlag = [[${@permission.hasPermi('system:lineHistory:edit')}]];
  849 + var removeFlag = [[${@permission.hasPermi('system:lineHistory:remove')}]];
  850 + var prefix = ctx + "system/lineHistory";
  851 +
  852 + $(function () {
  853 + var allDicts = {};
  854 +
  855 + for (var i in dicts) {
  856 + if (!allDicts[dicts[i].dictType]) {
  857 + allDicts[dicts[i].dictType] = [];
  858 + }
  859 + allDicts[dicts[i].dictType].push(dicts[i]);
  860 + }
  861 +
  862 + dicts = allDicts;
  863 +
  864 + });
  865 +</script>
  866 +
  867 +<style>
  868 + .info {
  869 + margin-top: 5px;
  870 + }
1118 871  
1119   - <style>
1120   - .info{
1121   - margin-top:5px;
1122   - }
1123   -
1124   -.col_checkbox {
1125   - width: 33%;
1126   - float: left;
1127   -}
  872 + .col_checkbox {
  873 + width: 33%;
  874 + float: left;
  875 + }
1128 876 </style>
1129 877 </body>
1130 878 </html>
1131 879 \ No newline at end of file
... ...
bsthLineProfiles/src/main/resources/templates/system/lineReport/add.html
  View file @9614386
... ... @@ -254,7 +254,7 @@
254 254 </div>
255 255 </div>
256 256 <div class="form-group">
257   - <label class="col-sm-3 control-label">首战时间：</label>
  257 + <label class="col-sm-3 control-label">首站时间：</label>
258 258 <div class="col-sm-8">
259 259 <input name="firstTime" class="form-control" type="text">
260 260 </div>
... ... @@ -266,7 +266,7 @@
266 266 </div>
267 267 </div>
268 268 <div class="form-group">
269   - <label class="col-sm-3 control-label">末站首战时间：</label>
  269 + <label class="col-sm-3 control-label">末站首站时间：</label>
270 270 <div class="col-sm-8">
271 271 <input name="lastTime" class="form-control" type="text">
272 272 </div>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineReport/edit.html
  View file @9614386
... ... @@ -290,7 +290,7 @@
290 290 </div>
291 291 </div>
292 292 <div class="form-group">
293   - <label class="col-sm-3 control-label">首战时间：</label>
  293 + <label class="col-sm-3 control-label">首站时间：</label>
294 294 <div class="col-sm-8">
295 295 <input name="firstTime" th:field="*{firstTime}"
296 296 class="form-control" type="text">
... ... @@ -304,7 +304,7 @@
304 304 </div>
305 305 </div>
306 306 <div class="form-group">
307   - <label class="col-sm-3 control-label">末站首战时间：</label>
  307 + <label class="col-sm-3 control-label">末站首站时间：</label>
308 308 <div class="col-sm-8">
309 309 <input name="lastTime" th:field="*{lastTime}" class="form-control"
310 310 type="text">
... ...
bsthLineProfiles/src/main/resources/templates/system/lineReport/line.html
  View file @9614386
... ... @@ -124,11 +124,11 @@
124 124 name="firstStation" /></li>
125 125 <li><label>起讫站：</label> <input type="text" name="startEnd" />
126 126 </li>
127   - <li><label>首战时间：</label> <input type="text" name="firstTime" />
  127 + <li><label>首站时间：</label> <input type="text" name="firstTime" />
128 128 </li>
129 129 <li><label>末站：</label> <input type="text" name="lastStation" />
130 130 </li>
131   - <li><label>末站首战：</label> <input type="text"
  131 + <li><label>末站首站：</label> <input type="text"
132 132 name="lastTime" /></li>
133 133 <li><label>上行里程：</label> <input type="text"
134 134 name="mileageUp" /></li>
... ... @@ -601,7 +601,7 @@
601 601 },
602 602 {
603 603 field: 'firstTime',
604   - title: '首战时间'
  604 + title: '首站时间'
605 605 },
606 606 {
607 607 field: 'lastStation',
... ... @@ -609,7 +609,7 @@
609 609 },
610 610 {
611 611 field: 'lastTime',
612   - title: '末站首战时间'
  612 + title: '末站首站时间'
613 613 },
614 614 {
615 615 field: 'mileageUp',
... ...