youxiw2000 / bsthLineProfiles · Commits

Commit 8c348283676c66260c75776ed4b8b056ddaa67fb

Authored by yiming
1 parent d8bb7d0f
build: skipped

bf

Inline Side-by-side
Showing 10 changed files with 1530 additions and 2214 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
  View file @8c34828
... ... @@ -103,6 +103,7 @@ public class BsthTLineAddController extends BaseController
103 103 ajaxResult.put("msg","线路已存在或提交申请");
104 104 return ajaxResult;
105 105 }
  106 + bsthTLine.setLineUpdateType("3");
106 107 return toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
107 108 }
108 109  
... ... @@ -130,9 +131,8 @@ public class BsthTLineAddController extends BaseController
130 131 {
131 132  
132 133 User loginUser = ShiroUtils.getSysUser();
133   -
134 134 bsthTLine.setUpdateBy(loginUser.getUserName());
135   -
  135 + bsthTLine.setLineUpdateType("3");
136 136 return toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine));
137 137 }
138 138  
... ... @@ -149,4 +149,16 @@ public class BsthTLineAddController extends BaseController
149 149 }
150 150  
151 151  
  152 + @PostMapping( "/isExist")
  153 + @ResponseBody
  154 + public AjaxResult isExist(String lineName)
  155 + {
  156 + BsthTLine bsthTLine=bsthTLineService.selectBsthTLineExamineByLineName(lineName);
  157 + AjaxResult ajaxResult=new AjaxResult();
  158 + Long id=bsthTLine!=null?bsthTLine.getId():null;
  159 + ajaxResult.put("id",id);
  160 + return ajaxResult;
  161 + }
  162 +
  163 +
152 164 }
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
  View file @8c34828
... ... @@ -350,9 +350,7 @@ public class BsthTLine extends BaseEntity
350 350  
351 351 private String revenueType;
352 352  
353   - private String start_reason;
354 353  
355   - private String line_update_type;
356 354  
357 355 public void setId(Long id)
358 356 {
... ... @@ -1149,21 +1147,6 @@ public class BsthTLine extends BaseEntity
1149 1147 this.revenueType = revenueType;
1150 1148 }
1151 1149  
1152   - public String getStart_reason() {
1153   - return start_reason;
1154   - }
1155   -
1156   - public void setStart_reason(String start_reason) {
1157   - this.start_reason = start_reason;
1158   - }
1159   -
1160   - public String getLine_update_type() {
1161   - return line_update_type;
1162   - }
1163   -
1164   - public void setLine_update_type(String line_update_type) {
1165   - this.line_update_type = line_update_type;
1166   - }
1167 1150  
1168 1151 @Override
1169 1152 public String toString() {
... ... @@ -1254,7 +1237,6 @@ public class BsthTLine extends BaseEntity
1254 1237 ", examineStatus='" + examineStatus + '\'' +
1255 1238 ", examineType='" + examineType + '\'' +
1256 1239 ", revenueType='" + revenueType + '\'' +
1257   - ", start_reason='" + start_reason + '\'' +
1258 1240 '}';
1259 1241 }
1260 1242 }
... ...
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @8c34828
... ... @@ -964,14 +964,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
964 964 <if test="persons != null">persons = #{persons},</if>
965 965 <if test="mileages != null">mileages = #{mileages},</if>
966 966 <if test="personAvg != null">person_avg = #{personAvg},</if>
967   - <if test="startDate != null">start_date = #{startDate},</if>
968 967 <if test="nightParking != null">night_parking = #{nightParking},</if>
969 968 <if test="files != null">files = #{files},</if>
970   - <if test="revenueType != null">revenue_type = #{revenueType},</if>
971   - <if test="examineStatus != null">examine_status = #{examineStatus},</if>
  969 + <if test="startDate != null">start_date = #{startDate},</if>
972 970 <if test="startReason != null">start_reason = #{startReason},</if>
973 971 <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
974   - <if test="startReason != null">start_reason = #{startReason},</if>
  972 + <if test="revenueType != null">revenue_type = #{revenueType},</if>
  973 + <if test="examineType != null">examine_type = #{examineType},</if>
  974 + <if test="examineStatus != null">examine_status = #{examineStatus},</if>
975 975 </trim>
976 976 where id = #{id}
977 977 </update>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
  View file @8c34828
... ... @@ -4,128 +4,103 @@
4 4 <th:block th:include="include :: header('添加线路档案信息')" />
5 5 <th:block th:include="include :: datetimepicker-css" />
6 6 <th:block th:include="include :: bootstrap-fileinput-css" />
  7 + <th:block th:include="include :: bootstrap-select-css" />
7 8 </head>
8 9 <body class="white-bg">
9 10 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
10 11 <form class="form-horizontal m" id="form-line-add">
11 12 <div class="form-group">
12   - <label class="col-sm-3 control-label">线路名称：</label>
13   - <div class="col-sm-8">
14   - <input name="lineName" class="form-control" type="text">
  13 + <label class="col-sm-1 control-label">线路名称：</label>
  14 + <div class="col-sm-2">
  15 + <input name="lineName" class="form-control" type="text" onblur="isExist(this.value)">
15 16 </div>
16   - </div>
17   - <div class="form-group">
18   - <label class="col-sm-3 control-label">公司：</label>
19   - <div class="col-sm-8">
  17 + <!---------------------------------->
  18 + <label class="col-sm-1 control-label">主线路id：</label>
  19 + <div class="col-sm-2">
  20 + <input name="pLineId" class="form-control" type="text">
  21 + </div>
  22 + <!---------------------------------->
  23 + <label class="col-sm-1 control-label">公司：</label>
  24 + <div class="col-sm-2">
20 25 <input name="company" class="form-control" type="text">
21 26 </div>
22   - </div>
23   - <div class="form-group">
24   - <label class="col-sm-3 control-label">分公司：</label>
25   - <div class="col-sm-8">
  27 + <!---------------------------------->
  28 + <label class="col-sm-1 control-label">分公司：</label>
  29 + <div class="col-sm-2">
26 30 <input name="fCompany" class="form-control" type="text">
27 31 </div>
  32 +
28 33 </div>
29   - <div class="form-group">
30   - <label class="col-sm-3 control-label">主线路id：</label>
31   - <div class="col-sm-8">
32   - <input name="pLineId" class="form-control" type="text">
33   - </div>
34   - </div>
35   - <div class="form-group">
36   - <label class="col-sm-3 control-label">营运方式：</label>
37   - <div class="col-sm-8">
38   - <select name="serviceType"
39   - th:with="type=${@dict.getType('serviceType')}"
40   - class="form-control m-b">
  34 +
  35 + <div class="form-group">
  36 + <label class="col-sm-1 control-label">营运方式：</label>
  37 + <div class="col-sm-2">
  38 + <select name="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b">
41 39 <option value=""></option>
42   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
43   - th:value="${dict.dictValue}">
44   -
  40 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
45 41 </option>
46 42 </select>
47 43 </div>
48   - </div>
49   -
50   - <div class="form-group">
51   - <label class="col-sm-3 control-label">线路属性：</label>
52   - <div class="col-sm-8">
53   - <select name="lineLevel"
54   - th:with="type=${@dict.getType('lineLevel')}"
55   - class="form-control m-b">
  44 + <!---------------------------------->
  45 + <label class="col-sm-1 control-label">线路属性：</label>
  46 + <div class="col-sm-2">
  47 + <select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b">
56 48 <option value=""></option>
57   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
58   - th:value="${dict.dictValue}">
  49 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
59 50 </option>
60 51 </select>
61 52 </div>
62   - </div>
63   - <div class="form-group">
64   - <label class="col-sm-3 control-label">线路类型：</label>
65   - <div class="col-sm-8">
66   - <select name="lineType" th:with="type=${@dict.getType('lineType')}"
67   - class="form-control m-b">
  53 + <!---------------------------------->
  54 + <label class="col-sm-1 control-label">线路类型：</label>
  55 + <div class="col-sm-2">
  56 + <select name="lineType" th:with="type=${@dict.getType('lineType')}" class="form-control m-b">
68 57 <option value=""></option>
69   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
70   - th:value="${dict.dictValue}">
  58 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
71 59 </option>
72 60 </select>
73 61 </div>
74   - </div>
75   - <div class="form-group">
76   - <label class="col-sm-3 control-label">区属：</label>
77   - <div class="col-sm-8">
78   - <select name="district" th:with="type=${@dict.getType('district')}"
79   - class="form-control m-b">
80   - <option value=""></option>
81   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
82   - th:value="${dict.dictValue}">
  62 + <!---------------------------------->
  63 + <label class="col-sm-1 control-label">道路类型：</label>
  64 + <div class="col-sm-2" th:with="type=${@dict.getType('roadType')}">
  65 + <!--data-max-options="2" 限制多选数量-->
  66 + <select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker form-control" multiple title="" >
  67 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
83 68 </option>
84 69 </select>
85 70 </div>
86 71 </div>
87   - <div class="form-group">
88   - <label class="col-sm-3 control-label">是否区内：</label>
89   - <div class="col-sm-8">
90   - <select name="inoutDistrict"
91   - th:with="type=${@dict.getType('trueFalse')}"
92   - class="form-control m-b">
  72 +
  73 + <div class="form-group">
  74 + <label class="col-sm-1 control-label">区属：</label>
  75 + <div class="col-sm-2">
  76 + <select name="district" th:with="type=${@dict.getType('district')}" class="form-control m-b">
93 77 <option value=""></option>
94   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
95   - th:value="${dict.dictValue}">
96   -
  78 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
97 79 </option>
98 80 </select>
99 81 </div>
100   - </div>
101   - <div class="form-group">
102   - <label class="col-sm-3 control-label">营运状态：</label>
103   - <div class="col-sm-8">
104   - <select name="serviceState"
105   - th:with="type=${@dict.getType('serviceState')}"
106   - class="form-control m-b">
  82 + <!---------------------------------->
  83 + <label class="col-sm-1 control-label">是否区内：</label>
  84 + <div class="col-sm-2">
  85 + <select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
107 86 <option value=""></option>
108   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
109   - th:value="${dict.dictValue}">
  87 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
110 88 </option>
111 89 </select>
112 90 </div>
113   - </div>
114   - <div class="form-group">
115   - <label class="col-sm-3 control-label">车辆类型 多选：</label>
116   - <div class="col-sm-8" th:with="type=${@dict.getType('busType')}">
117   - <label class="checkbox-inline" th:each="dict : ${type}"
118   - style="display: block"> <input type="checkbox"
119   - name="busType"
120   - th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
  91 + <!---------------------------------->
  92 + <label class="col-sm-1 control-label">车辆类型：</label>
  93 + <div class="col-sm-2" th:with="type=${@dict.getType('busType')}">
  94 + <!--data-max-options="2" 限制多选数量-->
  95 + <select name="busType" th:with="type=${@dict.getType('busType')}" class="selectpicker form-control" multiple title="" >
  96 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
  97 + </option>
  98 + </select>
121 99 </div>
122   - </div>
123   - <div class="form-group">
124   - <label class="col-sm-3 control-label">是否空调：</label>
125   - <div class="col-sm-8">
126   - <select name="airConditionerType"
127   - th:with="type=${@dict.getType('airConditionerType')}"
128   - class="form-control m-b">
  100 + <!---------------------------------->
  101 + <label class="col-sm-1 control-label">是否空调：</label>
  102 + <div class="col-sm-2">
  103 + <select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}" class="form-control m-b">
129 104 <option value=""></option>
130 105 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
131 106 th:value="${dict.dictValue}">
... ... @@ -133,460 +108,391 @@
133 108 </select>
134 109 </div>
135 110 </div>
136   - <div class="form-group">
137   - <label class="col-sm-3 control-label">售票类型：</label>
138   - <div class="col-sm-8">
139   - <select name="sellTicketType"
140   - th:with="type=${@dict.getType('sellTicketType')}"
141   - class="form-control m-b">
  111 +
  112 + <div class="form-group">
  113 + <label class="col-sm-1 control-label">售票类型：</label>
  114 + <div class="col-sm-2">
  115 + <select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}" class="form-control m-b">
142 116 <option value=""></option>
143 117 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
144 118 th:value="${dict.dictValue}">
145 119 </option>
146 120 </select>
147 121 </div>
148   - </div>
149   - <div class="form-group">
150   - <label class="col-sm-3 control-label">运营时间：</label>
151   - <div class="col-sm-8">
152   - <select name="serviceTime"
153   - th:with="type=${@dict.getType('serviceTime')}"
154   - class="form-control m-b">
  122 + <!---------------------------------->
  123 + <label class="col-sm-1 control-label">票价：</label>
  124 + <div class="col-sm-2" th:with="type=${@dict.getType('ticketPrice')}">
  125 + <!--data-max-options="2" 限制多选数量-->
  126 + <select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}" class="selectpicker form-control" multiple title="" >
  127 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
  128 + </option>
  129 + </select>
  130 + </div>
  131 + <!---------------------------------->
  132 + <label class="col-sm-1 control-label">运营时间：</label>
  133 + <div class="col-sm-2">
  134 + <select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" class="form-control m-b">
155 135 <option value=""></option>
156 136 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
157 137 th:value="${dict.dictValue}">
158 138 </option>
159 139 </select>
160 140 </div>
  141 + <!---------------------------------->
  142 + <label class="col-sm-1 control-label">线路编码：</label>
  143 + <div class="col-sm-2">
  144 + <input name="lineCode" class="form-control" type="text">
  145 + </div>
161 146 </div>
162   - <div class="form-group">
163   - <label class="col-sm-3 control-label">线路长度：</label>
164   - <div class="col-sm-8">
  147 +
  148 + <div class="form-group">
  149 + <label class="col-sm-1 control-label">线路长度：</label>
  150 + <div class="col-sm-2">
165 151 <input name="lineDistance" class="form-control" type="text">
166 152 </div>
  153 + <!---------------------------------->
  154 + <label class="col-sm-1 control-label">首站：</label>
  155 + <div class="col-sm-2">
  156 + <input name="firstStation" class="form-control" type="text">
  157 + </div>
  158 + <!---------------------------------->
  159 + <label class="col-sm-1 control-label">末站：</label>
  160 + <div class="col-sm-2">
  161 + <input name="lastStation" class="form-control" type="text">
  162 + </div>
  163 + <!---------------------------------->
  164 + <label class="col-sm-1 control-label">起讫站：</label>
  165 + <div class="col-sm-2">
  166 + <input name="startEnd" class="form-control" type="text">
  167 + </div>
167 168 </div>
168   - <div class="form-group">
169   - <label class="col-sm-3 control-label">线路编码：</label>
170   - <div class="col-sm-8">
171   - <input name="lineCode" class="form-control" type="text">
  169 +
  170 + <div class="form-group">
  171 + <label class="col-sm-1 control-label">站点名称：</label>
  172 + <div class="col-sm-2">
  173 + <textarea name="halfwayStation" class="form-control"></textarea>
  174 + </div>
  175 + <!---------------------------------->
  176 + <label class="col-sm-1 control-label">线路走向：</label>
  177 + <div class="col-sm-2">
  178 + <textarea name="directions" class="form-control"></textarea>
  179 + </div>
  180 + <!---------------------------------->
  181 + <label class="col-sm-1 control-label">首战时间：</label>
  182 + <div class="col-sm-2">
  183 + <input name="firstTime" class="form-control" type="text">
  184 + </div>
  185 + <label class="col-sm-1 control-label">末站首战时间：</label>
  186 + <!---------------------------------->
  187 + <div class="col-sm-2">
  188 + <input name="lastTime" class="form-control" type="text">
172 189 </div>
173 190 </div>
174   - <div class="form-group">
175   - <label class="col-sm-3 control-label">授权年限：</label>
176   - <div class="col-sm-8">
  191 +
  192 + <div class="form-group">
  193 + <label class="col-sm-1 control-label">停车场：</label>
  194 + <div class="col-sm-2">
  195 + <input name="park" class="form-control" type="text">
  196 + </div>
  197 + <!---------------------------------->
  198 + <label class="col-sm-1 control-label">授权年限：</label>
  199 + <div class="col-sm-2">
177 200 <input name="warrantYear" class="form-control" type="text">
178 201 </div>
179   - </div>
180   - <div class="form-group">
181   - <label class="col-sm-3 control-label">授权起始日期：</label>
182   - <div class="col-sm-8">
  202 + <!---------------------------------->
  203 + <label class="col-sm-1 control-label">授权起始日期：</label>
  204 + <div class="col-sm-2">
183 205 <div class="input-group date">
184 206 <input name="warrantStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
185 207 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
186 208 </div>
187 209 </div>
188   - </div>
189   - <div class="form-group">
190   - <label class="col-sm-3 control-label">授权结束日期：</label>
191   - <div class="col-sm-8">
  210 + <!---------------------------------->
  211 + <label class="col-sm-1 control-label">授权结束日期：</label>
  212 + <div class="col-sm-2">
192 213 <div class="input-group date">
193 214 <input name="warrantEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
194 215 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
195 216 </div>
196 217 </div>
197 218 </div>
198   - <div class="form-group">
199   - <label class="col-sm-3 control-label">撤销日期：</label>
200   - <div class="col-sm-8">
  219 +
  220 + <div class="form-group">
  221 + <label class="col-sm-1 control-label">撤销日期：</label>
  222 + <div class="col-sm-2">
201 223 <div class="input-group date">
202 224 <input name="planCancelTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
203 225 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
204 226 </div>
205 227 </div>
206   - </div>
207   - <div class="form-group">
208   - <label class="col-sm-3 control-label">实际撤销日期：</label>
209   - <div class="col-sm-8">
  228 + <!---------------------------------->
  229 + <label class="col-sm-1 control-label">实际撤销日期：</label>
  230 + <div class="col-sm-2">
210 231 <div class="input-group date">
211 232 <input name="cancelTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
212 233 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
213 234 </div>
214 235 </div>
215   - </div>
216   - <div class="form-group">
217   - <label class="col-sm-3 control-label">撤销原因：</label>
218   - <div class="col-sm-8">
  236 + <!---------------------------------->
  237 + <label class="col-sm-1 control-label">撤销原因：</label>
  238 + <div class="col-sm-2">
219 239 <textarea name="cancelReason" class="form-control"></textarea>
220 240 </div>
221   - </div>
222   - <div class="form-group">
223   - <label class="col-sm-3 control-label">备注：</label>
224   - <div class="col-sm-8">
225   - <textarea name="remark" class="form-control"></textarea>
226   - </div>
227   - </div>
228   - <!--<div class="form-group">
229   - <label class="col-sm-3 control-label">是否逻辑删除：</label>
230   - <div class="col-sm-8">
231   - <select name="isLogicDelete"
232   - th:with="type=${@dict.getType('trueFalse')}"
233   - class="form-control m-b">
234   - <option value=""></option>
235   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
236   - th:value="${dict.dictValue}">
237   - </option>
238   - </select>
239   - </div>
240   - </div>-->
241   - <div class="form-group">
242   - <label class="col-sm-3 control-label">更新人：</label>
243   - <div class="col-sm-8">
244   - <input name="updateBy" class="form-control" type="text">
245   - </div>
246   - </div>
247   - <div class="form-group">
248   - <label class="col-sm-3 control-label">更新时间：</label>
249   - <div class="col-sm-8">
250   - <div class="input-group date">
251   - <input name="updateTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
252   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
253   - </div>
254   - </div>
255   - </div>
256   - <div class="form-group">
257   - <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
258   - <div class="col-sm-8">
  241 + <!---------------------------------->
  242 + <label class="col-sm-1 control-label">行车作业计划表报备时间：</label>
  243 + <div class="col-sm-2">
259 244 <div class="input-group date">
260 245 <input name="timeSchedule" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
261 246 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
262 247 </div>
263 248 </div>
264 249 </div>
265   - <div class="form-group">
266   - <label class="col-sm-3 control-label">停车场：</label>
267   - <div class="col-sm-8">
268   - <input name="park" class="form-control" type="text">
269   - </div>
270   - </div>
271   - <div class="form-group">
272   - <label class="col-sm-3 control-label">是否权证：</label>
273   - <div class="col-sm-8">
274   - <select name="isWarrant" id="isWarrant"
275   - th:with="type=${@dict.getType('trueFalse')}"
276   - class="form-control m-b">
277   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
278   - th:value="${dict.dictValue}" th:selected="${dict.dictValue=='1'}">
  250 +
  251 + <div class="form-group">
  252 + <label class="col-sm-1 control-label">是否权证：</label>
  253 + <div class="col-sm-2">
  254 + <select name="isWarrant" id="isWarrant" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
  255 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictValue=='1'}">
279 256 </option>
280 257 </select>
281 258 </div>
282   - </div>
283   - <div class="form-group">
284   - <label class="col-sm-3 control-label">权证开通日期：</label>
285   - <div class="col-sm-8">
  259 + <!---------------------------------->
  260 + <label class="col-sm-1 control-label">权证开通日期：</label>
  261 + <div class="col-sm-2">
286 262 <div class="input-group date">
287   - <input name="isWarrantStartTime" id="isWarrantStartTime"
288   - class="form-control" placeholder="yyyy-MM-dd" type="text"
289   - autocomplete="off"> <span class="input-group-addon"><i
290   - class="fa fa-calendar"></i></span>
  263 + <input name="isWarrantStartTime" id="isWarrantStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text"
  264 + autocomplete="off">
  265 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
291 266 </div>
292   -
293 267 </div>
294   - </div>
295   - <div class="form-group">
296   - <label class="col-sm-3 control-label">权证到期日期：</label>
297   - <div class="col-sm-8">
  268 + <!---------------------------------->
  269 + <label class="col-sm-1 control-label">权证到期日期：</label>
  270 + <div class="col-sm-2">
298 271 <div class="input-group date">
299   - <input name="isWarrantEndTime" id="isWarrantEndTime"
300   - class="form-control" placeholder="yyyy-MM-dd" type="text"
301   - autocomplete="off"> <span class="input-group-addon"><i
302   - class="fa fa-calendar"></i></span>
  272 + <input name="isWarrantEndTime" id="isWarrantEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text"
  273 + autocomplete="off">
  274 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
303 275 </div>
304   -
305 276 </div>
306   - </div>
307   - <div class="form-group">
308   - <label class="col-sm-3 control-label">道路类型：</label>
309   - <div class="col-sm-8">
310   - <div class="col-sm-8" th:with="type=${@dict.getType('roadType')}">
311   - <label class="checkbox-inline" th:each="dict : ${type}"
312   - style="display: block"> <input type="checkbox"
313   - name="roadType"
314   - th:text="${dict.dictLabel}" th:value="${dict.dictValue}" />
315   - </label>
316   - </div>
317   - </div>
318   - </div>
319   - <div class="form-group">
320   - <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
321   - <div class="col-sm-8">
322   - <input name="ticketPrice" class="form-control" type="text">
323   - </div>
324   - </div>
325   - <div class="form-group">
326   - <label class="col-sm-3 control-label">首站：</label>
327   - <div class="col-sm-8">
328   - <input name="firstStation" class="form-control" type="text">
  277 + <!---------------------------------->
  278 + <label class="col-sm-1 control-label">经营权证（大巴）：</label>
  279 + <div class="col-sm-2">
  280 + <input name="warrantVehiclesLarge" class="form-control" type="text">
329 281 </div>
330 282 </div>
331   - <div class="form-group">
332   - <label class="col-sm-3 control-label">起讫站：</label>
333   - <div class="col-sm-8">
334   - <input name="startEnd" class="form-control" type="text">
  283 +
  284 + <div class="form-group">
  285 + <label class="col-sm-1 control-label">经营权证（中巴）：</label>
  286 + <div class="col-sm-2">
  287 + <input name="warrantVehiclesMiddle" class="form-control" type="text">
335 288 </div>
336   - </div>
337   - <div class="form-group">
338   - <label class="col-sm-3 control-label">首战时间：</label>
339   - <div class="col-sm-8">
340   - <input name="firstTime" class="form-control" type="text">
  289 + <!---------------------------------->
  290 + <label class="col-sm-1 control-label">实际配车数：</label>
  291 + <div class="col-sm-2">
  292 + <input name="vehiclesNumber" class="form-control" type="text">
341 293 </div>
342   - </div>
343   - <div class="form-group">
344   - <label class="col-sm-3 control-label">末站：</label>
345   - <div class="col-sm-8">
346   - <input name="lastStation" class="form-control" type="text">
  294 + <!---------------------------------->
  295 + <label class="col-sm-1 control-label">实际车辆数（大）：</label>
  296 + <div class="col-sm-2">
  297 + <input name="numberVehiclesLarge" class="form-control" type="text">
347 298 </div>
348   - </div>
349   - <div class="form-group">
350   - <label class="col-sm-3 control-label">末站首战时间：</label>
351   - <div class="col-sm-8">
352   - <input name="lastTime" class="form-control" type="text">
  299 + <!---------------------------------->
  300 + <label class="col-sm-1 control-label">实际车辆数（中）：</label>
  301 + <div class="col-sm-2">
  302 + <input name="numberVehiclesMiddle" class="form-control" type="text">
353 303 </div>
354 304 </div>
355   - <div class="form-group">
356   - <label class="col-sm-3 control-label">上行里程数：</label>
357   - <div class="col-sm-8">
  305 +
  306 + <div class="form-group">
  307 + <label class="col-sm-1 control-label">上行里程数：</label>
  308 + <div class="col-sm-2">
358 309 <input name="mileageUp" class="form-control" type="text">
359 310 </div>
360   - </div>
361   - <div class="form-group">
362   - <label class="col-sm-3 control-label">下行里程数：</label>
363   - <div class="col-sm-8">
  311 + <!---------------------------------->
  312 + <label class="col-sm-1 control-label">下行里程数：</label>
  313 + <div class="col-sm-2">
364 314 <input name="mileageDown" class="form-control" type="text">
365 315 </div>
366   - </div>
367   - <div class="form-group">
368   - <label class="col-sm-3 control-label">平均里程数：</label>
369   - <div class="col-sm-8">
  316 + <!---------------------------------->
  317 + <label class="col-sm-1 control-label">平均里程数：</label>
  318 + <div class="col-sm-2">
370 319 <input name="averageMileage" class="form-control" type="text">
371 320 </div>
372   - </div>
373   - <div class="form-group">
374   - <label class="col-sm-3 control-label">站级数(上行)：</label>
375   - <div class="col-sm-8">
  321 + <!---------------------------------->
  322 + <label class="col-sm-1 control-label">站级数(上行)：</label>
  323 + <div class="col-sm-2">
376 324 <input name="stationUp" class="form-control" type="text">
377 325 </div>
378 326 </div>
379   - <div class="form-group">
380   - <label class="col-sm-3 control-label">站级数(下行)：</label>
381   - <div class="col-sm-8">
  327 +
  328 + <div class="form-group">
  329 + <label class="col-sm-1 control-label">站级数(下行)：</label>
  330 + <div class="col-sm-2">
382 331 <input name="stationDown" class="form-control" type="text">
383 332 </div>
384   - </div>
385   - <div class="form-group">
386   - <label class="col-sm-3 control-label">行驶时间(上行)：</label>
387   - <div class="col-sm-8">
  333 + <!---------------------------------->
  334 + <label class="col-sm-1 control-label">行驶时间(上行)：</label>
  335 + <div class="col-sm-2">
388 336 <input name="travelTimeUp" class="form-control" type="text">
389 337 </div>
390   - </div>
391   - <div class="form-group">
392   - <label class="col-sm-3 control-label">行驶时间(下行)：</label>
393   - <div class="col-sm-8">
  338 + <!---------------------------------->
  339 + <label class="col-sm-1 control-label">行驶时间(下行)：</label>
  340 + <div class="col-sm-2">
394 341 <input name="travelTimeDown" class="form-control" type="text">
395 342 </div>
396   - </div>
397   - <div class="form-group">
398   - <label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
399   - <div class="col-sm-8">
  343 + <!---------------------------------->
  344 + <label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
  345 + <div class="col-sm-2">
400 346 <input name="travelIntervalUp" class="form-control" type="text">
401 347 </div>
402 348 </div>
403   - <div class="form-group">
404   - <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
405   - <div class="col-sm-8">
  349 +
  350 + <div class="form-group">
  351 + <label class="col-sm-1 control-label">行驶间隔(低谷)：</label>
  352 + <div class="col-sm-2">
406 353 <input name="travelIntervalDown" class="form-control" type="text">
407 354 </div>
408   - </div>
409   - <div class="form-group">
410   - <label class="col-sm-3 control-label">经营权证（大巴）：</label>
411   - <div class="col-sm-8">
412   - <input name="warrantVehiclesLarge" class="form-control" type="text">
413   - </div>
414   - </div>
415   - <div class="form-group">
416   - <label class="col-sm-3 control-label">经营权证（中巴）：</label>
417   - <div class="col-sm-8">
418   - <input name="warrantVehiclesMiddle" class="form-control" type="text">
419   - </div>
420   - </div>
421   - <div class="form-group">
422   - <label class="col-sm-3 control-label">实际配车数：</label>
423   - <div class="col-sm-8">
424   - <input name="vehiclesNumber" class="form-control" type="text">
  355 + <!---------------------------------->
  356 + <label class="col-sm-1 control-label">高峰系数：</label>
  357 + <div class="col-sm-2">
  358 + <input name="fullCustomerPercent" class="form-control" type="text">
425 359 </div>
426   - </div>
427   - <div class="form-group">
428   - <label class="col-sm-3 control-label">实际车辆数（大）：</label>
429   - <div class="col-sm-8">
430   - <input name="numberVehiclesLarge" class="form-control" type="text">
  360 + <!---------------------------------->
  361 + <label class="col-sm-1 control-label">低谷系数：</label>
  362 + <div class="col-sm-2">
  363 + <input name="lowCustomerPercent" class="form-control" type="text">
431 364 </div>
432   - </div>
433   - <div class="form-group">
434   - <label class="col-sm-3 control-label">实际车辆数（中）：</label>
435   - <div class="col-sm-8">
436   - <input name="numberVehiclesMiddle" class="form-control" type="text">
  365 + <!---------------------------------->
  366 + <label class="col-sm-1 control-label">间隔等级：</label>
  367 + <div class="col-sm-2">
  368 + <input name="divideLevel" class="form-control" type="text">
437 369 </div>
438 370 </div>
439   - <div class="form-group">
440   - <label class="col-sm-3 control-label">车辆自编号：</label>
441   - <div class="col-sm-8">
  371 +
  372 + <div class="form-group">
  373 + <label class="col-sm-1 control-label">车辆自编号：</label>
  374 + <div class="col-sm-2">
442 375 <input name="carPlate" class="form-control" type="text">
443 376 </div>
444   - </div>
445   - <div class="form-group">
446   - <label class="col-sm-3 control-label">线路总配人数：</label>
447   - <div class="col-sm-8">
  377 + <!---------------------------------->
  378 + <label class="col-sm-1 control-label">线路总配人数：</label>
  379 + <div class="col-sm-2">
448 380 <input name="numberPerson" class="form-control" type="text">
449 381 </div>
450   - </div>
451   - <div class="form-group">
452   - <label class="col-sm-3 control-label">人数司机：</label>
453   - <div class="col-sm-8">
  382 + <!---------------------------------->
  383 + <label class="col-sm-1 control-label">人数司机：</label>
  384 + <div class="col-sm-2">
454 385 <input name="numberPersonDriver" class="form-control" type="text">
455 386 </div>
456   - </div>
457   - <div class="form-group">
458   - <label class="col-sm-3 control-label">售票员数：</label>
459   - <div class="col-sm-8">
  387 + <!---------------------------------->
  388 + <label class="col-sm-1 control-label">售票员数：</label>
  389 + <div class="col-sm-2">
460 390 <input name="numberPersonSales" class="form-control" type="text">
461 391 </div>
462 392 </div>
463   - <div class="form-group">
464   - <label class="col-sm-3 control-label">新能源车数：</label>
465   - <div class="col-sm-8">
466   - <input name="busEvNumber" class="form-control" type="text">
467   - </div>
468   - </div>
469   - <div class="form-group">
470   - <label class="col-sm-3 control-label">线路走向：</label>
471   - <div class="col-sm-8">
472   - <textarea name="directions" class="form-control"></textarea>
473   - </div>
474   - </div>
475   - <div class="form-group">
476   - <label class="col-sm-3 control-label">经营权证数：</label>
477   - <div class="col-sm-8">
478   - <input name="numberOfManage" class="form-control" type="text">
479   - </div>
480   - </div>
  393 +
481 394 <div class="form-group">
482   - <label class="col-sm-3 control-label">站点名称：</label>
483   - <div class="col-sm-8">
484   - <textarea name="halfwayStation" class="form-control"></textarea>
485   - </div>
486   - </div>
487   - <div class="form-group">
488   - <label class="col-sm-3 control-label">高峰系数：</label>
489   - <div class="col-sm-8">
490   - <input name="fullCustomerPercent" class="form-control" type="text">
491   - </div>
492   - </div>
493   - <div class="form-group">
494   - <label class="col-sm-3 control-label">低谷系数：</label>
495   - <div class="col-sm-8">
496   - <input name="lowCustomerPercent" class="form-control" type="text">
497   - </div>
498   - </div>
499   - <div class="form-group">
500   - <label class="col-sm-3 control-label">间隔等级：</label>
501   - <div class="col-sm-8">
502   - <input name="divideLevel" class="form-control" type="text">
503   - </div>
504   - </div>
505   - <div class="form-group">
506   - <label class="col-sm-3 control-label">是否挂牌：</label>
507   - <div class="col-sm-8">
508   - <select name="hasTimelists"
509   - th:with="type=${@dict.getType('trueFalse')}"
510   - class="form-control m-b">
511   - <option value=""></option>
512   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
513   - th:value="${dict.dictValue}">
514   - </option>
515   - </select>
  395 + <label class="col-sm-1 control-label">新能源车数：</label>
  396 + <div class="col-sm-2">
  397 + <input name="busEvNumber" class="form-control" type="text">
516 398 </div>
517   - </div>
518   - <div class="form-group">
519   - <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
520   - <div class="col-sm-8">
521   - <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}"
522   - class="form-control m-b">
  399 + <!---------------------------------->
  400 + <label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
  401 + <div class="col-sm-2">
  402 + <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
523 403 <option value=""></option>
524   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
525   - th:value="${dict.dictValue}"></option>
  404 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
526 405 </select>
527 406 </div>
528   - </div>
529   - <div class="form-group">
530   - <label class="col-sm-3 control-label">轨交时间：</label>
531   - <div class="col-sm-8">
  407 + <!---------------------------------->
  408 + <label class="col-sm-1 control-label">轨交时间：</label>
  409 + <div class="col-sm-2">
532 410 <div class="input-group date">
533   - <input name="metroTime" class="form-control"
534   - placeholder="HH:mm:ss" > <span
535   - class="input-group-addon"><i class="fa fa-calendar"></i></span>
  411 + <input name="metroTime" class="form-control" placeholder="HH:mm:ss" >
  412 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
536 413 </div>
537 414 </div>
538   - </div>
539   - <div class="form-group">
540   - <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
541   - <div class="col-sm-8">
542   - <input name="coldBonusType" class="form-control" type="text">
  415 + <!---------------------------------->
  416 + <label class="col-sm-1 control-label">是否挂牌：</label>
  417 + <div class="col-sm-2">
  418 + <select name="hasTimelists" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
  419 + <option value=""></option>
  420 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
  421 + </option>
  422 + </select>
543 423 </div>
544 424 </div>
  425 +
545 426 <div class="form-group">
546   - <label class="col-sm-3 control-label">性质：</label>
547   - <div class="col-sm-8">
548   - <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b">
  427 + <label class="col-sm-1 control-label">经营权证数：</label>
  428 + <div class="col-sm-2">
  429 + <input name="numberOfManage" class="form-control" type="text">
  430 + </div>
  431 + <!---------------------------------->
  432 + <label class="col-sm-1 control-label">营运状态：</label>
  433 + <div class="col-sm-2">
  434 + <select name="serviceState" th:with="type=${@dict.getType('serviceState')}" class="form-control m-b">
549 435 <option value=""></option>
550   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
  436 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
  437 + </option>
551 438 </select>
552 439 </div>
553   - </div>
554   - <div class="form-group">
555   - <label class="col-sm-3 control-label">营收类型：</label>
556   - <div class="col-sm-8">
  440 + <!---------------------------------->
  441 + <label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
  442 + <div class="col-sm-2">
  443 + <input name="coldBonusType" class="form-control" type="text">
  444 + </div>
  445 + <!---------------------------------->
  446 + <label class="col-sm-1 control-label">营收类型：</label>
  447 + <div class="col-sm-2">
557 448 <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
558 449 <option value=""></option>
559 450 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
560 451 </select>
561 452 </div>
562 453 </div>
  454 +
563 455 <div class="form-group">
564   - <label class="col-sm-3 control-label">附件：</label>
565   - <div class="col-sm-8">
566   - <div class="file-loading" id="uploadDiv">
567   - <input id="fileinput" type="file" multiple>
568   - </div>
  456 + <label class="col-sm-1 control-label">性质：</label>
  457 + <div class="col-sm-2">
  458 + <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b" disabled="">
  459 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  460 + th:selected="${dict.dictValue=='3'}" ></option>
  461 + </select>
569 462 </div>
570   - </div>
571   - <div class="form-group">
572   - <label class="col-sm-3 control-label">开通日期：</label>
573   - <div class="col-sm-8">
  463 + <!---------------------------------->
  464 + <label class="col-sm-1 control-label">启用时间：</label>
  465 + <div class="col-sm-2">
574 466 <div class="input-group date">
575 467 <input name="startDate" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
576 468 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
577 469 </div>
578 470 </div>
  471 + <!---------------------------------->
  472 + <label class="col-sm-1 control-label">备注：</label>
  473 + <div class="col-sm-2">
  474 + <textarea name="remark" class="form-control"></textarea>
  475 + </div>
  476 + </div>
  477 +
  478 + <div class="form-group">
  479 + <label class="col-sm-1 control-label">附件：</label>
  480 + <div class="col-sm-5">
  481 + <div class="file-loading" id="uploadDiv">
  482 + <input id="fileinput" type="file" multiple>
  483 + </div>
  484 + </div>
579 485 </div>
580 486 </form>
581 487 </div>
582 488 <th:block th:include="include :: footer" />
583 489 <th:block th:include="include :: datetimepicker-js" />
584 490 <th:block th:include="include :: bootstrap-fileinput-js" />
  491 + <th:block th:include="include :: bootstrap-select-js" />
585 492 <script th:inline="javascript">
586 493 var prefix = ctx + "system/lineAdd"
587 494  
588 495 $(function() {
589   -
590 496 $("#fileinput").fileinput({
591 497 'theme' : 'explorer-fas',
592 498 'uploadUrl' : '/common/upload',
... ... @@ -693,6 +599,73 @@
693 599 autoclose: true
694 600 });
695 601  
  602 + function isExist(lineName){
  603 + var data={'lineName':lineName};
  604 + $.post(prefix + "/isExist",data,function (result){
  605 + if(result.id!=null){
  606 + layer.confirm("是否修改上一次的申请记录",{
  607 + btn: ['是', '否']
  608 + },function (index, layero) {
  609 + var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
  610 + parent.layer.close(index); //再执行关闭
  611 + edit(result.id);
  612 + });
  613 + }
  614 +
  615 + })
  616 + }
  617 +
  618 + function edit(id) {
  619 + open(id,"修改线路档案信息",(prefix + "/edit/{id}").replace("{id}", id));
  620 + }
  621 +
  622 + function open(id,title, url, width, height, callback) {
  623 + console.log(id)
  624 + // 如果是移动端，就使用自适应大小弹窗
  625 + if ($.common.isMobile()) {
  626 + width = 'auto';
  627 + height = 'auto';
  628 + }
  629 + if ($.common.isEmpty(title)) {
  630 + title = false;
  631 + }
  632 + if ($.common.isEmpty(url)) {
  633 + url = "/404.html";
  634 + }
  635 + if ($.common.isEmpty(width)) {
  636 + width = 800;
  637 + }
  638 + if ($.common.isEmpty(height)) {
  639 + height = ($(window).height() - 50);
  640 + }
  641 + if ($.common.isEmpty(callback)) {
  642 + callback = function(index, layero) {
  643 + var iframeWin = layero.find('iframe')[0];
  644 + iframeWin.contentWindow.submitHandler(index, layero);
  645 + }
  646 + }
  647 +
  648 + var index =parent.layer.open({
  649 + type: 2,
  650 + area: [width + 'px', height + 'px'],
  651 + fix: false,
  652 + //不固定
  653 + maxmin: true,
  654 + shade: 0.3,
  655 + title: title,
  656 + content: url,
  657 + btn: ['修改', '删除'],
  658 + // 弹层外区域关闭
  659 + shadeClose: true,
  660 + yes: callback,
  661 + btn2: function(index, layero){
  662 + $.operate.remove(id)
  663 + }
  664 + });
  665 + parent.layer.full(index);
  666 + }
  667 +
  668 +
696 669 </script>
697 670 </body>
698 671 </html>
699 672 \ No newline at end of file
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
  View file @8c34828
... ... @@ -4,297 +4,271 @@
4 4 <th:block th:include="include :: header('修改【请填写功能名称】')" />
5 5 <th:block th:include="include :: datetimepicker-css" />
6 6 <th:block th:include="include :: bootstrap-fileinput-css" />
  7 +<th:block th:include="include :: bootstrap-select-css" />
7 8 </head>
8 9 <body class="white-bg">
9 10 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
10   - <form class="form-horizontal m" id="form-line-edit"
11   - th:object="${bsthTLine}">
  11 + <form class="form-horizontal m" id="form-line-edit" th:object="${bsthTLine}">
12 12 <input name="id" th:field="*{id}" type="hidden">
13 13 <div class="form-group">
14   - <label class="col-sm-3 control-label">线路名称：</label>
15   - <div class="col-sm-8">
16   - <input name="lineName" th:field="*{lineName}" class="form-control"
17   - type="text">
  14 + <label class="col-sm-1 control-label">线路名称：</label>
  15 + <div class="col-sm-2">
  16 + <input name="lineName" th:field="*{lineName}" class="form-control" type="text">
18 17 </div>
19   - </div>
20   - <div class="form-group">
21   - <label class="col-sm-3 control-label">公司：</label>
22   - <div class="col-sm-8">
23   - <input name="company" th:field="*{company}" class="form-control"
24   - type="text">
  18 + <!---------------------------------->
  19 + <label class="col-sm-1 control-label">主线路id：</label>
  20 + <div class="col-sm-2">
  21 + <input name="pLineId" th:field="*{pLineId}" class="form-control" type="text">
25 22 </div>
26   - </div>
27   - <div class="form-group">
28   - <label class="col-sm-3 control-label">分公司：</label>
29   - <div class="col-sm-8">
30   - <input name="fCompany" th:field="*{fCompany}" class="form-control"
31   - type="text">
  23 + <!---------------------------------->
  24 + <label class="col-sm-1 control-label">公司：</label>
  25 + <div class="col-sm-2">
  26 + <input name="company" th:field="*{company}" class="form-control" type="text">
32 27 </div>
33   - </div>
34   - <div class="form-group">
35   - <label class="col-sm-3 control-label">主线路id：</label>
36   - <div class="col-sm-8">
37   - <input name="pLineId" th:field="*{pLineId}" class="form-control"
38   - type="text">
  28 + <!---------------------------------->
  29 + <label class="col-sm-1 control-label">分公司：</label>
  30 + <div class="col-sm-2">
  31 + <input name="fCompany" th:field="*{fCompany}" class="form-control" type="text">
39 32 </div>
40 33 </div>
  34 +
41 35 <div class="form-group">
42   - <label class="col-sm-3 control-label">营运方式：</label>
43   - <div class="col-sm-8">
44   - <select name="serviceType"
45   - th:with="type=${@dict.getType('serviceType')}"
46   - class="form-control m-b">
  36 + <label class="col-sm-1 control-label">营运方式：</label>
  37 + <div class="col-sm-2">
  38 + <select name="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b">
47 39 <option value=""></option>
48   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
49   - th:value="${dict.dictValue}"
50   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}"></option>
  40 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  41 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}">
  42 + </option>
51 43 </select>
52 44 </div>
53   - </div>
54   - <div class="form-group">
55   - <label class="col-sm-3 control-label">线路属性：</label>
56   - <div class="col-sm-8">
57   - <select name="lineLevel"
58   - th:with="type=${@dict.getType('lineLevel')}"
59   - class="form-control m-b">
  45 + <!---------------------------------->
  46 + <label class="col-sm-1 control-label">线路属性：</label>
  47 + <div class="col-sm-2">
  48 + <select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b">
60 49 <option value=""></option>
61   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
62   - th:value="${dict.dictValue}"
63   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineLevel== null ? '' : bsthTLine.lineLevel),#strings.toString(dict.dictValue))}"></option>
  50 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  51 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineLevel== null ? '' : bsthTLine.lineLevel),#strings.toString(dict.dictValue))}">
  52 + </option>
64 53 </select>
65 54 </div>
66   - </div>
67   - <div class="form-group">
68   - <label class="col-sm-3 control-label">线路类型：</label>
69   - <div class="col-sm-8">
70   - <select name="lineType" th:with="type=${@dict.getType('lineType')}"
71   - class="form-control m-b">
  55 + <!---------------------------------->
  56 + <label class="col-sm-1 control-label">线路类型：</label>
  57 + <div class="col-sm-2">
  58 + <select name="lineType" th:with="type=${@dict.getType('lineType')}" class="form-control m-b">
72 59 <option value=""></option>
73   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
74   - th:value="${dict.dictValue}"
75   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}"></option>
  60 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  61 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}">
  62 + </option>
76 63 </select>
77 64 </div>
78   - </div>
79   - <div class="form-group">
80   - <label class="col-sm-3 control-label">区属：</label>
81   - <div class="col-sm-8">
82   -
83   - <select name="district" th:with="type=${@dict.getType('district')}"
84   - class="form-control m-b">
85   - <option value=""></option>
86   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
87   - th:value="${dict.dictValue}"
88   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
  65 + <!---------------------------------->
  66 + <label class="col-sm-1 control-label">道路类型：</label>
  67 + <div class="col-sm-2" >
  68 + <!--data-max-options="2" 限制多选数量-->
  69 + <select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker form-control" multiple title="" >
  70 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  71 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.roadType== null ? '' : bsthTLine.roadType),#strings.toString(dict.dictValue))}">
  72 + </option>
89 73 </select>
90 74 </div>
91 75 </div>
  76 +
92 77 <div class="form-group">
93   - <label class="col-sm-3 control-label">是否区内：</label>
94   - <div class="col-sm-8">
95   - <select name="inoutDistrict"
96   - th:with="type=${@dict.getType('trueFalse')}"
97   - class="form-control m-b">
  78 + <label class="col-sm-1 control-label">区属：</label>
  79 + <div class="col-sm-2">
  80 + <select name="district" th:with="type=${@dict.getType('district')}" class="form-control m-b">
98 81 <option value=""></option>
99   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
100   - th:value="${dict.dictValue}"
101   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
  82 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  83 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
102 84 </select>
103 85 </div>
104   - </div>
105   - <div class="form-group">
106   - <label class="col-sm-3 control-label">营运状态：</label>
107   - <div class="col-sm-8">
108   -
109   - <select name="serviceState"
110   - th:with="type=${@dict.getType('serviceState')}"
111   - class="form-control m-b">
  86 + <!---------------------------------->
  87 + <label class="col-sm-1 control-label">是否区内：</label>
  88 + <div class="col-sm-2">
  89 + <select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
112 90 <option value=""></option>
113   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
114   - th:value="${dict.dictValue}"
115   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
  91 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  92 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
116 93 </select>
117 94 </div>
118   - </div>
119   - <div class="form-group">
120   - <label class="col-sm-3 control-label">车辆类型：</label>
121   - <div class="col-sm-8" th:with="type=${@dict.getType('busType')}">
122   - <label class="checkbox-inline" th:each="dict : ${type}"
123   - style="display: block"> <input type="checkbox"
124   - name="busType"
125   - th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.busType == null ? '' : bsthTLine.busType ,','),#strings.toString(dict.dictValue))}"
126   - th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
  95 + <!---------------------------------->
  96 + <label class="col-sm-1 control-label">车辆类型：</label>
  97 + <div class="col-sm-2" th:with="type=${@dict.getType('busType')}">
  98 + <!--data-max-options="2" 限制多选数量-->
  99 + <select name="busType" th:with="type=${@dict.getType('busType')}" class="selectpicker form-control" multiple title="" >
  100 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  101 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.busType== null ? '' : bsthTLine.busType),#strings.toString(dict.dictValue))}">
  102 + </option>
  103 + </select>
127 104 </div>
128   - </div>
129   - <div class="form-group">
130   - <label class="col-sm-3 control-label">是否空调：</label>
131   - <div class="col-sm-8">
132   -
133   - <select name="airConditionerType"
134   - th:with="type=${@dict.getType('airConditionerType')}"
135   - class="form-control m-b">
  105 + <!---------------------------------->
  106 + <label class="col-sm-1 control-label">是否空调：</label>
  107 + <div class="col-sm-2">
  108 + <select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}" class="form-control m-b">
136 109 <option value=""></option>
137   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
138   - th:value="${dict.dictValue}"
139   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType == null ? '' : bsthTLine.airConditionerType ),#strings.toString(dict.dictValue))}"></option>
  110 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  111 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType == null ? '' : bsthTLine.airConditionerType ),#strings.toString(dict.dictValue))}"></option>
140 112 </select>
141 113 </div>
142 114 </div>
  115 +
143 116 <div class="form-group">
144   - <label class="col-sm-3 control-label">售票类型：</label>
145   - <div class="col-sm-8">
146   - <select name="sellTicketType"
147   - th:with="type=${@dict.getType('sellTicketType')}"
148   - class="form-control m-b">
  117 + <label class="col-sm-1 control-label">售票类型：</label>
  118 + <div class="col-sm-2">
  119 + <select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}" class="form-control m-b">
149 120 <option value=""></option>
150   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
151   - th:value="${dict.dictValue}"
152   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType == null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
  121 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  122 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType == null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
153 123 </select>
154 124 </div>
155   - </div>
156   - <div class="form-group">
157   - <label class="col-sm-3 control-label">运营时间：</label>
158   - <div class="col-sm-8">
159   - <select name="serviceTime"
160   - th:with="type=${@dict.getType('serviceTime')}"
161   - class="form-control m-b">
  125 + <!---------------------------------->
  126 + <label class="col-sm-1 control-label">票价：</label>
  127 + <div class="col-sm-2" th:with="type=${@dict.getType('ticketPrice')}">
  128 + <!--data-max-options="2" 限制多选数量-->
  129 + <select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}" class="selectpicker form-control" multiple title="" >
  130 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  131 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.ticketPrice== null ? '' : bsthTLine.ticketPrice),#strings.toString(dict.dictValue))}">
  132 + </option>
  133 + </select>
  134 + </div>
  135 + <!---------------------------------->
  136 + <label class="col-sm-1 control-label">运营时间：</label>
  137 + <div class="col-sm-2">
  138 + <select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" class="form-control m-b">
162 139 <option value=""></option>
163   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
164   - th:value="${dict.dictValue}"
165   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
  140 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  141 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
166 142 </select>
167 143 </div>
168   - </div>
169   - <div class="form-group">
170   - <label class="col-sm-3 control-label">线路长度：</label>
171   - <div class="col-sm-8">
172   - <input name="lineDistance" th:field="*{lineDistance}"
173   - class="form-control" type="text">
  144 + <!---------------------------------->
  145 + <label class="col-sm-1 control-label">线路编码：</label>
  146 + <div class="col-sm-2">
  147 + <input name="lineCode" th:field="*{lineCode}" class="form-control" type="text">
174 148 </div>
175 149 </div>
  150 +
176 151 <div class="form-group">
177   - <label class="col-sm-3 control-label">线路编码：</label>
178   - <div class="col-sm-8">
179   - <input name="lineCode" th:field="*{lineCode}" class="form-control"
180   - type="text">
  152 + <label class="col-sm-1 control-label">线路长度：</label>
  153 + <div class="col-sm-2">
  154 + <input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text">
  155 + </div>
  156 + <!---------------------------------->
  157 + <label class="col-sm-1 control-label">首站：</label>
  158 + <div class="col-sm-2">
  159 + <input name="firstStation" th:field="*{firstStation}" class="form-control" type="text">
  160 + </div>
  161 + <!---------------------------------->
  162 + <label class="col-sm-1 control-label">末站：</label>
  163 + <div class="col-sm-2">
  164 + <input name="lastStation" th:field="*{lastStation}" class="form-control" type="text">
  165 + </div>
  166 + <!---------------------------------->
  167 + <label class="col-sm-1 control-label">起讫站：</label>
  168 + <div class="col-sm-2">
  169 + <input name="startEnd" th:field="*{startEnd}" class="form-control" type="text">
181 170 </div>
182 171 </div>
  172 +
183 173 <div class="form-group">
184   - <label class="col-sm-3 control-label">授权年限：</label>
185   - <div class="col-sm-8">
186   - <input name="warrantYear" th:field="*{warrantYear}"
187   - class="form-control" type="text">
  174 + <label class="col-sm-1 control-label">站点名称：</label>
  175 + <div class="col-sm-2">
  176 + <textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea>
  177 + </div>
  178 + <!---------------------------------->
  179 + <label class="col-sm-1 control-label">线路走向：</label>
  180 + <div class="col-sm-2">
  181 + <textarea name="directions" class="form-control">[[*{directions}]]</textarea>
  182 + </div>
  183 + <!---------------------------------->
  184 + <label class="col-sm-1 control-label">首战时间：</label>
  185 + <div class="col-sm-2">
  186 + <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
  187 + </div>
  188 + <!---------------------------------->
  189 + <label class="col-sm-1 control-label">末站首战时间：</label>
  190 + <div class="col-sm-2">
  191 + <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
188 192 </div>
189 193 </div>
  194 +
190 195 <div class="form-group">
191   - <label class="col-sm-3 control-label">授权起始日期：</label>
192   - <div class="col-sm-8">
  196 + <label class="col-sm-1 control-label">停车场：</label>
  197 + <div class="col-sm-2">
  198 + <input name="park" th:field="*{park}" class="form-control" type="text">
  199 + </div>
  200 + <!---------------------------------->
  201 + <label class="col-sm-1 control-label">授权年限：</label>
  202 + <div class="col-sm-2">
  203 + <input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
  204 + </div>
  205 + <!---------------------------------->
  206 + <label class="col-sm-1 control-label">授权起始日期：</label>
  207 + <div class="col-sm-2">
193 208 <div class="input-group date">
194   - <input name="warrantStartTime"
195   - th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}"
196   - class="form-control" placeholder="yyyy-MM-dd" type="text"
197   - autocomplete="off"> <span class="input-group-addon"><i
198   - class="fa fa-calendar"></i></span>
  209 + <input name="warrantStartTime" th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}"
  210 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  211 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
199 212 </div>
200 213 </div>
201   - </div>
202   - <div class="form-group">
203   - <label class="col-sm-3 control-label">授权结束日期：</label>
204   - <div class="col-sm-8">
  214 + <!---------------------------------->
  215 + <label class="col-sm-1 control-label">授权结束日期：</label>
  216 + <div class="col-sm-2">
205 217 <div class="input-group date">
206   - <input name="warrantEndTime"
207   - th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}"
208   - class="form-control" placeholder="yyyy-MM-dd" type="text"
209   - autocomplete="off"> <span class="input-group-addon"><i
210   - class="fa fa-calendar"></i></span>
  218 + <input name="warrantEndTime" th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}"
  219 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  220 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
211 221 </div>
212 222 </div>
213 223 </div>
  224 +
214 225 <div class="form-group">
215   - <label class="col-sm-3 control-label">撤销日期：</label>
216   - <div class="col-sm-8">
  226 + <label class="col-sm-1 control-label">撤销日期：</label>
  227 + <div class="col-sm-2">
217 228 <div class="input-group date">
218   - <input name="planCancelTime"
219   - th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
220   - class="form-control" placeholder="yyyy-MM-dd" type="text"
221   - autocomplete="off"> <span class="input-group-addon"><i
222   - class="fa fa-calendar"></i></span>
  229 + <input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
  230 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  231 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
223 232 </div>
224 233 </div>
225   - </div>
226   - <div class="form-group">
227   - <label class="col-sm-3 control-label">实际撤销日期：</label>
228   - <div class="col-sm-8">
  234 + <!---------------------------------->
  235 + <label class="col-sm-1 control-label">实际撤销日期：</label>
  236 + <div class="col-sm-2">
229 237 <div class="input-group date">
230   - <input name="cancelTime"
231   - th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
232   - class="form-control" placeholder="yyyy-MM-dd" type="text"
233   - autocomplete="off"> <span class="input-group-addon"><i
234   - class="fa fa-calendar"></i></span>
  238 + <input name="cancelTime" th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
  239 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  240 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
235 241 </div>
236 242 </div>
237   - </div>
238   - <div class="form-group">
239   - <label class="col-sm-3 control-label">撤销原因：</label>
240   - <div class="col-sm-8">
  243 + <!---------------------------------->
  244 + <label class="col-sm-1 control-label">撤销原因：</label>
  245 + <div class="col-sm-2">
241 246 <textarea name="cancelReason" class="form-control">[[*{cancelReason}]]</textarea>
242 247 </div>
243   - </div>
244   - <div class="form-group">
245   - <label class="col-sm-3 control-label">备注：</label>
246   - <div class="col-sm-8">
247   - <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
248   - </div>
249   - </div>
250   - <div class="form-group">
251   - <label class="col-sm-3 control-label">是否逻辑删除：</label>
252   - <div class="col-sm-8">
253   -
254   - <select name="isLogicDelete"
255   - th:with="type=${@dict.getType('trueFalse')}"
256   - class="form-control m-b">
257   - <option value=""></option>
258   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
259   - th:value="${dict.dictValue}"
260   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.isLogicDelete== null ? '' : bsthTLine.isLogicDelete),#strings.toString(dict.dictValue))}"></option>
261   - </select>
262   - </div>
263   - </div>
264   - <div class="form-group">
265   - <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
266   - <div class="col-sm-8">
  248 + <!---------------------------------->
  249 + <label class="col-sm-1 control-label">行车作业计划表报备时间：</label>
  250 + <div class="col-sm-2">
267 251 <div class="input-group date">
268 252 <input name="timeSchedule"
269   - th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
270   - class="form-control" placeholder="yyyy-MM-dd" type="text"
271   - autocomplete="off"> <span class="input-group-addon"><i
  253 + th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
  254 + class="form-control" placeholder="yyyy-MM-dd" type="text"
  255 + autocomplete="off"> <span class="input-group-addon"><i
272 256 class="fa fa-calendar"></i></span>
273 257 </div>
274 258 </div>
275 259 </div>
  260 +
276 261 <div class="form-group">
277   - <label class="col-sm-3 control-label">停车场：</label>
278   - <div class="col-sm-8">
279   - <input name="park" th:field="*{park}" class="form-control"
280   - type="text">
281   - </div>
282   - </div>
283   - <div class="form-group">
284   - <label class="col-sm-3 control-label">是否权证：</label>
285   - <div class="col-sm-8">
286   - <select name="isWarrant" id="isWarrant"
287   - th:with="type=${@dict.getType('trueFalse')}"
288   - class="form-control m-b">
289   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
290   - th:value="${dict.dictValue}"
291   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
  262 + <label class="col-sm-1 control-label">是否权证：</label>
  263 + <div class="col-sm-2">
  264 + <select name="isWarrant" id="isWarrant" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
  265 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  266 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
292 267 </select>
293 268 </div>
294   - </div>
295   - <div class="form-group">
296   - <label class="col-sm-3 control-label">权证开通日期：</label>
297   - <div class="col-sm-8">
  269 + <!---------------------------------->
  270 + <label class="col-sm-1 control-label">权证开通日期：</label>
  271 + <div class="col-sm-2">
298 272 <div class="input-group date">
299 273 <input name="isWarrantStartTime" id="isWarrantStartTime"
300 274 th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
... ... @@ -302,12 +276,10 @@
302 276 autocomplete="off"> <span class="input-group-addon"><i
303 277 class="fa fa-calendar"></i></span>
304 278 </div>
305   -
306 279 </div>
307   - </div>
308   - <div class="form-group">
309   - <label class="col-sm-3 control-label">权证到期日期：</label>
310   - <div class="col-sm-8">
  280 + <!---------------------------------->
  281 + <label class="col-sm-1 control-label">权证到期日期：</label>
  282 + <div class="col-sm-2">
311 283 <div class="input-group date">
312 284 <input name="isWarrantEndTime" id="isWarrantEndTime"
313 285 th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
... ... @@ -315,352 +287,182 @@
315 287 autocomplete="off"> <span class="input-group-addon"><i
316 288 class="fa fa-calendar"></i></span>
317 289 </div>
318   -
319 290 </div>
320   - </div>
321   - <div class="form-group">
322   - <label class="col-sm-3 control-label">道路类型：</label>
323   - <div class="col-sm-8">
324   - <div class="col-sm-8" th:with="type=${@dict.getType('roadType')}">
325   - <label class="checkbox-inline" th:each="dict : ${type}"
326   - style="display: block"> <input type="checkbox"
327   - name="roadType"
328   - th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.roadType == null ? '' : bsthTLine.roadType ,','),#strings.toString(dict.dictValue))}"
329   - th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
330   - </div>
331   - </div>
332   - </div>
333   - <div class="form-group">
334   - <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
335   - <div class="col-sm-8">
336   - <input name="ticketPrice" th:field="*{ticketPrice}"
337   - class="form-control" type="text">
338   - </div>
339   - </div>
340   - <div class="form-group">
341   - <label class="col-sm-3 control-label">首站：</label>
342   - <div class="col-sm-8">
343   - <input name="firstStation" th:field="*{firstStation}"
344   - class="form-control" type="text">
345   - </div>
346   - </div>
347   - <div class="form-group">
348   - <label class="col-sm-3 control-label">起讫站：</label>
349   - <div class="col-sm-8">
350   - <input name="startEnd" th:field="*{startEnd}" class="form-control"
351   - type="text">
352   - </div>
353   - </div>
354   - <div class="form-group">
355   - <label class="col-sm-3 control-label">首战时间：</label>
356   - <div class="col-sm-8">
357   - <input name="firstTime" th:field="*{firstTime}"
358   - class="form-control" type="text">
359   - </div>
360   - </div>
361   - <div class="form-group">
362   - <label class="col-sm-3 control-label">末站：</label>
363   - <div class="col-sm-8">
364   - <input name="lastStation" th:field="*{lastStation}"
365   - class="form-control" type="text">
366   - </div>
367   - </div>
368   - <div class="form-group">
369   - <label class="col-sm-3 control-label">末站首战时间：</label>
370   - <div class="col-sm-8">
371   - <input name="lastTime" th:field="*{lastTime}" class="form-control"
372   - type="text">
373   - </div>
374   - </div>
375   - <div class="form-group">
376   - <label class="col-sm-3 control-label">上行里程数：</label>
377   - <div class="col-sm-8">
378   - <input name="mileageUp" th:field="*{mileageUp}"
379   - class="form-control" type="text">
380   - </div>
381   - </div>
382   - <div class="form-group">
383   - <label class="col-sm-3 control-label">下行里程数：</label>
384   - <div class="col-sm-8">
385   - <input name="mileageDown" th:field="*{mileageDown}"
386   - class="form-control" type="text">
387   - </div>
388   - </div>
389   - <div class="form-group">
390   - <label class="col-sm-3 control-label">平均里程数：</label>
391   - <div class="col-sm-8">
392   - <input name="averageMileage" th:field="*{averageMileage}"
393   - class="form-control" type="text">
394   - </div>
395   - </div>
396   - <div class="form-group">
397   - <label class="col-sm-3 control-label">站级数(上行)：</label>
398   - <div class="col-sm-8">
399   - <input name="stationUp" th:field="*{stationUp}"
400   - class="form-control" type="text">
  291 + <!---------------------------------->
  292 + <label class="col-sm-1 control-label">经营权证（大巴）：</label>
  293 + <div class="col-sm-2">
  294 + <input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text">
401 295 </div>
402 296 </div>
  297 +
403 298 <div class="form-group">
404   - <label class="col-sm-3 control-label">站级数(下行)：</label>
405   - <div class="col-sm-8">
406   - <input name="stationDown" th:field="*{stationDown}"
407   - class="form-control" type="text">
  299 + <label class="col-sm-1 control-label">经营权证（中巴）：</label>
  300 + <div class="col-sm-2">
  301 + <input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control" type="text">
408 302 </div>
409   - </div>
410   - <div class="form-group">
411   - <label class="col-sm-3 control-label">行驶时间(上行)：</label>
412   - <div class="col-sm-8">
413   - <input name="travelTimeUp" th:field="*{travelTimeUp}"
414   - class="form-control" type="text">
  303 + <!---------------------------------->
  304 + <label class="col-sm-1 control-label">实际配车数：</label>
  305 + <div class="col-sm-2">
  306 + <input name="vehiclesNumber" th:field="*{vehiclesNumber}" class="form-control" type="text">
415 307 </div>
416   - </div>
417   - <div class="form-group">
418   - <label class="col-sm-3 control-label">行驶时间(下行)：</label>
419   - <div class="col-sm-8">
420   - <input name="travelTimeDown" th:field="*{travelTimeDown}"
421   - class="form-control" type="text">
  308 + <!---------------------------------->
  309 + <label class="col-sm-1 control-label">实际车辆数（大巴）：</label>
  310 + <div class="col-sm-2">
  311 + <input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" class="form-control" type="text">
422 312 </div>
423   - </div>
424   - <div class="form-group">
425   - <label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
426   - <div class="col-sm-8">
427   - <input name="travelIntervalUp" th:field="*{travelIntervalUp}"
428   - class="form-control" type="text">
  313 + <!---------------------------------->
  314 + <label class="col-sm-1 control-label">实际车辆数（中巴）：</label>
  315 + <div class="col-sm-2">
  316 + <input name="numberVehiclesMiddle" th:field="*{numberVehiclesMiddle}" class="form-control" type="text">
429 317 </div>
430 318 </div>
  319 +
431 320 <div class="form-group">
432   - <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
433   - <div class="col-sm-8">
434   - <input name="travelIntervalDown" th:field="*{travelIntervalDown}"
435   - class="form-control" type="text">
  321 + <label class="col-sm-1 control-label">上行里程数：</label>
  322 + <div class="col-sm-2">
  323 + <input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text">
436 324 </div>
437   - </div>
438   - <div class="form-group">
439   - <label class="col-sm-3 control-label">经营权证（大巴）：</label>
440   - <div class="col-sm-8">
441   - <input name="warrantVehiclesLarge"
442   - th:field="*{warrantVehiclesLarge}" class="form-control"
443   - type="text">
  325 + <!---------------------------------->
  326 + <label class="col-sm-1 control-label">下行里程数：</label>
  327 + <div class="col-sm-2">
  328 + <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
444 329 </div>
445   - </div>
446   - <div class="form-group">
447   - <label class="col-sm-3 control-label">经营权证（中巴）：</label>
448   - <div class="col-sm-8">
449   - <input name="warrantVehiclesMiddle"
450   - th:field="*{warrantVehiclesMiddle}" class="form-control"
451   - type="text">
  330 + <!---------------------------------->
  331 + <label class="col-sm-1 control-label">平均里程数：</label>
  332 + <div class="col-sm-2">
  333 + <input name="averageMileage" th:field="*{averageMileage}" class="form-control" type="text">
452 334 </div>
453   - </div>
454   - <div class="form-group">
455   - <label class="col-sm-3 control-label">实际配车数：</label>
456   - <div class="col-sm-8">
457   - <input name="vehiclesNumber" th:field="*{vehiclesNumber}"
458   - class="form-control" type="text">
  335 + <!---------------------------------->
  336 + <label class="col-sm-1 control-label">站级数(上行)：</label>
  337 + <div class="col-sm-2">
  338 + <input name="stationUp" th:field="*{stationUp}" class="form-control" type="text">
459 339 </div>
460 340 </div>
  341 +
461 342 <div class="form-group">
462   - <label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
463   - <div class="col-sm-8">
464   - <input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}"
465   - class="form-control" type="text">
  343 + <label class="col-sm-1 control-label">站级数(下行)：</label>
  344 + <div class="col-sm-2">
  345 + <input name="stationDown" th:field="*{stationDown}" class="form-control" type="text">
466 346 </div>
467   - </div>
468   - <div class="form-group">
469   - <label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
470   - <div class="col-sm-8">
471   - <input name="numberVehiclesMiddle"
472   - th:field="*{numberVehiclesMiddle}" class="form-control"
473   - type="text">
  347 + <!---------------------------------->
  348 + <label class="col-sm-1 control-label">行驶时间(上行)：</label>
  349 + <div class="col-sm-2">
  350 + <input name="travelTimeUp" th:field="*{travelTimeUp}" class="form-control" type="text">
474 351 </div>
475   - </div>
476   - <div class="form-group">
477   - <label class="col-sm-3 control-label">车辆自编号：</label>
478   - <div class="col-sm-8">
479   - <input name="carPlate" th:field="*{carPlate}" class="form-control"
480   - type="text">
  352 + <!---------------------------------->
  353 + <label class="col-sm-1 control-label">行驶时间(下行)：</label>
  354 + <div class="col-sm-2">
  355 + <input name="travelTimeDown" th:field="*{travelTimeDown}" class="form-control" type="text">
481 356 </div>
482   - </div>
483   - <div class="form-group">
484   - <label class="col-sm-3 control-label">线路总配人数：</label>
485   - <div class="col-sm-8">
486   - <input name="numberPerson" th:field="*{numberPerson}"
487   - class="form-control" type="text">
  357 + <!---------------------------------->
  358 + <label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
  359 + <div class="col-sm-2">
  360 + <input name="travelIntervalUp" th:field="*{travelIntervalUp}" class="form-control" type="text">
488 361 </div>
489 362 </div>
  363 +
490 364 <div class="form-group">
491   - <label class="col-sm-3 control-label">人数司机：</label>
492   - <div class="col-sm-8">
493   - <input name="numberPersonDriver" th:field="*{numberPersonDriver}"
494   - class="form-control" type="text">
  365 + <label class="col-sm-1 control-label">行驶间隔(低谷)：</label>
  366 + <div class="col-sm-2">
  367 + <input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text">
495 368 </div>
496   - </div>
497   - <div class="form-group">
498   - <label class="col-sm-3 control-label">售票员数：</label>
499   - <div class="col-sm-8">
500   - <input name="numberPersonSales" th:field="*{numberPersonSales}"
501   - class="form-control" type="text">
  369 + <!---------------------------------->
  370 + <label class="col-sm-1 control-label">高峰系数：</label>
  371 + <div class="col-sm-2">
  372 + <input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" class="form-control" type="text">
502 373 </div>
503   - </div>
504   - <div class="form-group">
505   - <label class="col-sm-3 control-label">新能源车数：</label>
506   - <div class="col-sm-8">
507   - <input name="busEvNumber" th:field="*{busEvNumber}"
508   - class="form-control" type="text">
  374 + <!---------------------------------->
  375 + <label class="col-sm-1 control-label">低谷系数：</label>
  376 + <div class="col-sm-2">
  377 + <input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" class="form-control" type="text">
509 378 </div>
510   - </div>
511   - <div class="form-group">
512   - <label class="col-sm-3 control-label">线路走向：</label>
513   - <div class="col-sm-8">
514   - <textarea name="directions" class="form-control">[[*{directions}]]</textarea>
  379 + <!---------------------------------->
  380 + <label class="col-sm-1 control-label">间隔等级：</label>
  381 + <div class="col-sm-2">
  382 + <input name="divideLevel" th:field="*{divideLevel}" class="form-control" type="text">
515 383 </div>
516 384 </div>
  385 +
517 386 <div class="form-group">
518   - <label class="col-sm-3 control-label">经营权证数：</label>
519   - <div class="col-sm-8">
520   - <input name="numberOfManage" th:field="*{numberOfManage}"
521   - class="form-control" type="text">
  387 + <label class="col-sm-1 control-label">车辆自编号：</label>
  388 + <div class="col-sm-2">
  389 + <input name="carPlate" th:field="*{carPlate}" class="form-control" type="text">
522 390 </div>
523   - </div>
524   - <div class="form-group">
525   - <label class="col-sm-3 control-label">站点名称：</label>
526   - <div class="col-sm-8">
527   - <textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea>
  391 + <!---------------------------------->
  392 + <label class="col-sm-1 control-label">线路总配人数：</label>
  393 + <div class="col-sm-2">
  394 + <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
528 395 </div>
529   - </div>
530   - <div class="form-group">
531   - <label class="col-sm-3 control-label">高峰系数：</label>
532   - <div class="col-sm-8">
533   - <input name="fullCustomerPercent" th:field="*{fullCustomerPercent}"
534   - class="form-control" type="text">
  396 + <!---------------------------------->
  397 + <label class="col-sm-1 control-label">人数司机：</label>
  398 + <div class="col-sm-2">
  399 + <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text">
535 400 </div>
536   - </div>
537   - <div class="form-group">
538   - <label class="col-sm-3 control-label">低谷系数：</label>
539   - <div class="col-sm-8">
540   - <input name="lowCustomerPercent" th:field="*{lowCustomerPercent}"
541   - class="form-control" type="text">
  401 + <!---------------------------------->
  402 + <label class="col-sm-1 control-label">售票员数：</label>
  403 + <div class="col-sm-2">
  404 + <input name="numberPersonSales" th:field="*{numberPersonSales}" class="form-control" type="text">
542 405 </div>
543 406 </div>
  407 +
544 408 <div class="form-group">
545   - <label class="col-sm-3 control-label">间隔等级：</label>
546   - <div class="col-sm-8">
547   - <input name="divideLevel" th:field="*{divideLevel}"
548   - class="form-control" type="text">
  409 + <label class="col-sm-1 control-label">新能源车数：</label>
  410 + <div class="col-sm-2">
  411 + <input name="busEvNumber" th:field="*{busEvNumber}" class="form-control" type="text">
549 412 </div>
550   - </div>
551   - <div class="form-group">
552   - <label class="col-sm-3 control-label">是否挂牌：</label>
553   - <div class="col-sm-8">
554   - <select name="hasTimelists"
555   - th:with="type=${@dict.getType('trueFalse')}"
556   - class="form-control m-b">
  413 + <!---------------------------------->
  414 + <label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
  415 + <div class="col-sm-2">
  416 + <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
557 417 <option value=""></option>
558   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
559   - th:value="${dict.dictValue}"
560   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
561   - </select>
562   - </div>
563   - </div>
564   - <div class="form-group">
565   - <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
566   - <div class="col-sm-8">
567   - <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}"
568   - class="form-control m-b">
569   - <option value=""></option>
570   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
571   - th:value="${dict.dictValue}"
572   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro== null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
  418 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  419 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro== null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
573 420 </select>
574 421 </div>
575   - </div>
576   - <div class="form-group">
577   - <label class="col-sm-3 control-label">轨交时间：</label>
578   - <div class="col-sm-8">
  422 + <!---------------------------------->
  423 + <label class="col-sm-1 control-label">轨交时间：</label>
  424 + <div class="col-sm-2">
579 425 <div class="input-group date">
580   - <input name="metroTime" class="form-control"
581   - placeholder="HH:mm:ss" th:value="*{metroTime}"> <span
582   - class="input-group-addon"><i class="fa fa-calendar"></i></span>
  426 + <input name="metroTime" class="form-control" placeholder="HH:mm:ss" th:value="*{metroTime}">
  427 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
583 428 </div>
584 429 </div>
585   - </div>
586   - <div class="form-group">
587   - <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
588   - <div class="col-sm-8">
589   - <input name="coldBonusType" th:field="*{coldBonusType}"
590   - class="form-control" type="text">
591   - </div>
592   - </div>
593   - <!--<div class="form-group">
594   - <label class="col-sm-3 control-label">月度营收：</label>
595   - <div class="col-sm-8">
596   - <input name="revenuesMonth" th:field="*{revenuesMonth}"
597   - class="form-control" type="text">
598   - </div>
599   - </div>
600   - <div class="form-group">
601   - <label class="col-sm-3 control-label">月度人次：</label>
602   - <div class="col-sm-8">
603   - <input name="personMonth" th:field="*{personMonth}"
604   - class="form-control" type="text">
605   - </div>
606   - </div>
607   - <div class="form-group">
608   - <label class="col-sm-3 control-label">月度里程：</label>
609   - <div class="col-sm-8">
610   - <input name="mileageMonth" th:field="*{mileageMonth}"
611   - class="form-control" type="text">
612   - </div>
613   - </div>
614   - <div class="form-group">
615   - <label class="col-sm-3 control-label">百公里人次：</label>
616   - <div class="col-sm-8">
617   - <input name="personMonthAvg" th:field="*{personMonthAvg}"
618   - class="form-control" type="text">
619   - </div>
620   - </div>
621   - <div class="form-group">
622   - <label class="col-sm-3 control-label">营收：</label>
623   - <div class="col-sm-8">
624   - <input name="revenues" th:field="*{revenues}" class="form-control"
625   - type="text">
626   - </div>
627   - </div>
628   - <div class="form-group">
629   - <label class="col-sm-3 control-label">人次：</label>
630   - <div class="col-sm-8">
631   - <input name="persons" th:field="*{persons}" class="form-control"
632   - type="text">
633   - </div>
634   - </div>
635   - <div class="form-group">
636   - <label class="col-sm-3 control-label">里程：</label>
637   - <div class="col-sm-8">
638   - <input name="mileages" th:field="*{mileages}" class="form-control"
639   - type="text">
640   - </div>
641   - </div>
642   - <div class="form-group">
643   - <label class="col-sm-3 control-label">百公里人次：</label>
644   - <div class="col-sm-8">
645   - <input name="personAvg" th:field="*{personAvg}"
646   - class="form-control" type="text">
647   - </div>
648   - </div>-->
649   - <div class="form-group">
650   - <label class="col-sm-3 control-label">性质：</label>
651   - <div class="col-sm-8">
652   - <select name="lineUpdateType"
653   - th:with="type=${@dict.getType('lineUpdateType')}"
  430 + <!---------------------------------->
  431 + <label class="col-sm-1 control-label">是否挂牌：</label>
  432 + <div class="col-sm-2">
  433 + <select name="hasTimelists"
  434 + th:with="type=${@dict.getType('trueFalse')}"
654 435 class="form-control m-b">
  436 + <option value=""></option>
655 437 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
656 438 th:value="${dict.dictValue}"
657   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
  439 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
658 440 </select>
659 441 </div>
660 442 </div>
  443 +
661 444 <div class="form-group">
662   - <label class="col-sm-3 control-label">营收类型：</label>
663   - <div class="col-sm-8">
  445 + <label class="col-sm-1 control-label">经营权证数：</label>
  446 + <div class="col-sm-2">
  447 + <input name="numberOfManage" th:field="*{numberOfManage}" class="form-control" type="text">
  448 + </div>
  449 + <!---------------------------------->
  450 + <label class="col-sm-1 control-label">营运状态：</label>
  451 + <div class="col-sm-2">
  452 + <select name="serviceState" th:with="type=${@dict.getType('serviceState')}" class="form-control m-b">
  453 + <option value=""></option>
  454 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  455 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
  456 + </select>
  457 + </div>
  458 + <!---------------------------------->
  459 + <label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
  460 + <div class="col-sm-2">
  461 + <input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text">
  462 + </div>
  463 + <!---------------------------------->
  464 + <label class="col-sm-1 control-label">营收类型：</label>
  465 + <div class="col-sm-2">
664 466 <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
665 467 <option value=""></option>
666 468 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
... ... @@ -668,37 +470,45 @@
668 470 </select>
669 471 </div>
670 472 </div>
  473 +
671 474 <div class="form-group">
672   - <label class="col-sm-3 control-label">启用时间：</label>
673   - <div class="col-sm-8">
  475 + <label class="col-sm-1 control-label">性质：</label>
  476 + <div class="col-sm-2">
  477 + <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b" disabled="">
  478 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  479 + th:selected="${dict.dictValue=='3'}" ></option>
  480 + </select>
  481 + </div>
  482 + <!---------------------------------->
  483 + <label class="col-sm-1 control-label">启用时间：</label>
  484 + <div class="col-sm-2">
674 485 <div class="input-group date">
675   - <input name="startDate"
676   - th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
677   - class="form-control" placeholder="yyyy-MM-dd" type="text"
678   - autocomplete="off"> <span class="input-group-addon"><i
679   - class="fa fa-calendar"></i></span>
  486 + <input name="startDate" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
  487 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  488 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
680 489 </div>
681 490  
682 491 </div>
683   - </div>
684   -
685   - <div class="form-group">
686   - <label class="col-sm-3 control-label">启用原因：</label>
687   - <div class="col-sm-8">
688   - <textarea name="startReason" class="form-control">[[*{startReason}]]</textarea>
  492 + <!---------------------------------->
  493 + <label class="col-sm-1 control-label">备注：</label>
  494 + <div class="col-sm-2">
  495 + <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
689 496 </div>
690 497 </div>
  498 +
691 499 <div class="form-group">
692   - <label class="col-sm-3 control-label">附件：</label>
693   - <div class="col-sm-8">
694   - <div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}">
695   - <input name="files" type="hidden" th:value="${path}">
696   - <a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
697   - </a>
698   - <button onclick="deleteFile(this);">删除</button>
699   - </div>
700   - <div class="file-loading" id="uploadDiv">
701   - <input id="fileinput" type="file" multiple>
  500 + <div class="form-group">
  501 + <label class="col-sm-1 control-label">附件：</label>
  502 + <div class="col-sm-5">
  503 + <div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" >
  504 + <input name="files" type="hidden" th:value="${path}" >
  505 + <a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
  506 + </a>
  507 + <button onclick="deleteFile(this);">删除</button>
  508 + </div>
  509 + <div class="file-loading" id="uploadDiv">
  510 + <input id="fileinput" type="file" multiple>
  511 + </div>
702 512 </div>
703 513 </div>
704 514 </div>
... ... @@ -707,6 +517,7 @@
707 517 <th:block th:include="include :: footer" />
708 518 <th:block th:include="include :: datetimepicker-js" />
709 519 <th:block th:include="include :: bootstrap-fileinput-js" />
  520 + <th:block th:include="include :: bootstrap-select-js" />
710 521 <script th:inline="javascript">
711 522 var prefix = ctx + "system/lineAdd";
712 523 function deleteFile(obj){
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/line.html
  View file @8c34828
... ... @@ -69,7 +69,7 @@
69 69  
70 70 function add(obj){
71 71 if($(obj)[0].className.indexOf("disabled") == -1)
72   - $.operate.add();
  72 + $.operate.addFull();
73 73 }
74 74  
75 75 new Vue({
... ... @@ -219,10 +219,6 @@
219 219 title: '分公司'
220 220 },
221 221 {
222   - field: 'pLineId',
223   - title: '主线路id'
224   - },
225   - {
226 222 field: 'serviceType',
227 223 title: '营运方式'
228 224 },
... ... @@ -239,106 +235,10 @@
239 235 title: '区属'
240 236 },
241 237 {
242   - field: 'inoutDistrict',
243   - title: '是否区内'
244   - },
245   - {
246   - field: 'serviceState',
247   - title: '营运状态'
248   - },
249   - {
250   - field: 'busType',
251   - title: '车辆类型'
252   - },
253   - {
254   - field: 'airConditionerType',
255   - title: '是否空调'
256   - },
257   - {
258   - field: 'sellTicketType',
259   - title: '售票类型'
260   - },
261   - {
262   - field: 'serviceTime',
263   - title: '运营时间'
264   - },
265   - {
266 238 field: 'lineDistance',
267 239 title: '线路长度'
268 240 },
269 241 {
270   - field: 'lineCode',
271   - title: '线路编码'
272   - },
273   - {
274   - field: 'warrantYear',
275   - title: '授权年限'
276   - },
277   - {
278   - field: 'warrantStartTime',
279   - title: '授权起始日期'
280   - },
281   - {
282   - field: 'warrantEndTime',
283   - title: '授权结束日期'
284   - },
285   - {
286   - field: 'planCancelTime',
287   - title: '撤销日期'
288   - },
289   - {
290   - field: 'cancelTime',
291   - title: '实际撤销日期'
292   - },
293   - {
294   - field: 'cancelReason',
295   - title: '撤销原因'
296   - },
297   - {
298   - field: 'remark',
299   - title: '备注'
300   - },
301   - {
302   - field: 'isLogicDelete',
303   - title: '是否逻辑删除'
304   - },
305   - {
306   - field: 'updateBy',
307   - title: '更新人'
308   - },
309   - {
310   - field: 'updateTime',
311   - title: '更新时间'
312   - },
313   - {
314   - field: 'timeSchedule',
315   - title: '行车作业计划表报备时间'
316   - },
317   - {
318   - field: 'park',
319   - title: '停车场'
320   - },
321   - {
322   - field: 'isWarrant',
323   - title: '是否权证'
324   - },
325   - {
326   - field: 'isWarrantStartTime',
327   - title: '权证开通日期'
328   - },
329   - {
330   - field: 'isWarrantEndTime',
331   - title: '权证到期日期'
332   - },
333   - {
334   - field: 'roadType',
335   - title: '道路类型'
336   - },
337   - {
338   - field: 'ticketPrice',
339   - title: '票价'
340   - },
341   - {
342 242 field: 'firstStation',
343 243 title: '首站'
344 244 },
... ... @@ -347,108 +247,8 @@
347 247 title: '起讫站'
348 248 },
349 249 {
350   - field: 'firstTime',
351   - title: '首战时间'
352   - },
353   - {
354 250 field: 'lastStation',
355 251 title: '末站'
356   - },
357   - {
358   - field: 'lastTime',
359   - title: '末站首战时间'
360   - },
361   - {
362   - field: 'mileageUp',
363   - title: '上行里程数'
364   - },
365   - {
366   - field: 'mileageDown',
367   - title: '下行里程数'
368   - },
369   - {
370   - field: 'averageMileage',
371   - title: '平均里程数'
372   - },
373   - {
374   - field: 'stationUp',
375   - title: '站级数(上行)'
376   - },
377   - {
378   - field: 'stationDown',
379   - title: '站级数(下行)'
380   - },{
381   - field: 'travelTimeUp',
382   - title: '行驶时间(上行)'
383   - },{
384   - field: 'travelTimeDown',
385   - title: '行驶时间(下行)'
386   - },{
387   - field: 'travelIntervalUp',
388   - title: '行驶间隔(高峰)'
389   - },{
390   - field: 'travelIntervalDown',
391   - title: '行驶间隔(低谷)'
392   - },{
393   - field: 'warrantVehiclesLarge',
394   - title: '经营权证(大巴)'
395   - }, {
396   - field: 'warrantVehiclesMiddle',
397   - title: '经营权证(中巴)'
398   - },{
399   - field: 'vehiclesNumber',
400   - title: '实际配车数'
401   - }, {
402   - field: 'numberVehiclesLarge',
403   - title: '实际车辆数(大巴)'
404   - }, {
405   - field: 'numberVehiclesMiddle',
406   - title: '实际车辆数(中巴)'
407   - },{
408   - field: 'carPlate',
409   - title: '车辆自编号'
410   - },{
411   - field: 'numberPerson',
412   - title: '线路总配人数'
413   - },{
414   - field: 'numberPersonDriver',
415   - title: '人数司机'
416   - }, {
417   - field: 'numberPersonSales',
418   - title: '售票员数'
419   - },{
420   - field: 'busEvNumber',
421   - title: '新能源车数'
422   - },{
423   - field: 'directions',
424   - title: '线路走向'
425   - },{
426   - field: 'numberOfManage',
427   - title: '经营权证数'
428   - },{
429   - field: 'halfwayStation',
430   - title: '站点名称'
431   - },{
432   - field: 'fullCustomerPercent',
433   - title: '高峰系数'
434   - },{
435   - field: 'lowCustomerPercent',
436   - title: '低谷系数'
437   - }, {
438   - field: 'divideLevel',
439   - title: '间隔等级'
440   - },{
441   - field: 'hasTimelists',
442   - title: '是否挂牌'
443   - },{
444   - field: 'isMetro',
445   - title: '是否轨交末班车衔接'
446   - },{
447   - field: 'metroTime',
448   - title: '轨交时间'
449   - },{
450   - field: 'coldBonusType',
451   - title: '冷僻线路补贴类型'
452 252 }];
453 253  
454 254  
... ... @@ -493,7 +293,7 @@
493 293 }
494 294 }
495 295  
496   - layer.open({
  296 + var index=layer.open({
497 297 type: 2,
498 298 area: [width + 'px', height + 'px'],
499 299 fix: false,
... ... @@ -510,6 +310,7 @@
510 310 $.operate.remove(id)
511 311 }
512 312 });
  313 + layer.full(index);
513 314 }
514 315 </script>
515 316 <style>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
  View file @8c34828
... ... @@ -4,645 +4,501 @@
4 4 <th:block th:include="include :: header('修改【请填写功能名称】')" />
5 5 <th:block th:include="include :: datetimepicker-css" />
6 6 <th:block th:include="include :: bootstrap-fileinput-css" />
  7 +<th:block th:include="include :: bootstrap-select-css" />
7 8 </head>
8 9 <body class="white-bg">
9 10 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
10   - <form class="form-horizontal m" id="form-line-edit"
11   - th:object="${bsthTLine}">
  11 + <form class="form-horizontal m" id="form-line-edit" th:object="${bsthTLine}">
12 12 <input name="id" th:field="*{id}" type="hidden">
13 13 <div class="form-group">
14   - <label class="col-sm-3 control-label">线路名称：</label>
15   - <div class="col-sm-8">
16   - <input name="lineName" th:field="*{lineName}" class="form-control" disabled
17   - type="text">
  14 + <label class="col-sm-1 control-label">线路名称：</label>
  15 + <div class="col-sm-2">
  16 + <input name="lineName" th:field="*{lineName}" class="form-control" type="text" disabled>
18 17 </div>
19   - </div>
20   - <div class="form-group">
21   - <label class="col-sm-3 control-label">公司：</label>
22   - <div class="col-sm-8">
23   - <input name="company" th:field="*{company}" class="form-control" disabled
24   - type="text">
  18 + <!---------------------------------->
  19 + <label class="col-sm-1 control-label">主线路id：</label>
  20 + <div class="col-sm-2">
  21 + <input name="pLineId" th:field="*{pLineId}" class="form-control" type="text" disabled>
25 22 </div>
26   - </div>
27   - <div class="form-group">
28   - <label class="col-sm-3 control-label">分公司：</label>
29   - <div class="col-sm-8">
30   - <input name="fCompany" th:field="*{fCompany}" class="form-control" disabled
31   - type="text">
  23 + <!---------------------------------->
  24 + <label class="col-sm-1 control-label">公司：</label>
  25 + <div class="col-sm-2">
  26 + <input name="company" th:field="*{company}" class="form-control" type="text" disabled>
32 27 </div>
33   - </div>
34   - <div class="form-group">
35   - <label class="col-sm-3 control-label">主线路id：</label>
36   - <div class="col-sm-8">
37   - <input name="pLineId" th:field="*{pLineId}" class="form-control" disabled
38   - type="text">
  28 + <!---------------------------------->
  29 + <label class="col-sm-1 control-label">分公司：</label>
  30 + <div class="col-sm-2">
  31 + <input name="fCompany" th:field="*{fCompany}" class="form-control" type="text" disabled>
39 32 </div>
40 33 </div>
  34 +
41 35 <div class="form-group">
42   - <label class="col-sm-3 control-label">营运方式：</label>
43   - <div class="col-sm-8">
44   - <select name="serviceType" disabled
45   - th:with="type=${@dict.getType('serviceType')}"
46   - class="form-control m-b">
  36 + <label class="col-sm-1 control-label">营运方式：</label>
  37 + <div class="col-sm-2">
  38 + <select name="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b" disabled>
47 39 <option value=""></option>
48   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
49   - th:value="${dict.dictValue}"
50   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}"></option>
  40 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  41 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}">
  42 + </option>
51 43 </select>
52 44 </div>
53   - </div>
54   - <div class="form-group">
55   - <label class="col-sm-3 control-label">线路属性：</label>
56   - <div class="col-sm-8">
57   - <select name="lineLevel" disabled
58   - th:with="type=${@dict.getType('lineLevel')}"
59   - class="form-control m-b">
  45 + <!---------------------------------->
  46 + <label class="col-sm-1 control-label">线路属性：</label>
  47 + <div class="col-sm-2">
  48 + <select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b" disabled>
60 49 <option value=""></option>
61   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
62   - th:value="${dict.dictValue}"
63   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineLevel== null ? '' : bsthTLine.lineLevel),#strings.toString(dict.dictValue))}"></option>
  50 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  51 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineLevel== null ? '' : bsthTLine.lineLevel),#strings.toString(dict.dictValue))}">
  52 + </option>
64 53 </select>
65 54 </div>
66   - </div>
67   - <div class="form-group">
68   - <label class="col-sm-3 control-label">线路类型：</label>
69   - <div class="col-sm-8">
70   - <select name="lineType" disabled th:with="type=${@dict.getType('lineType')}"
71   - class="form-control m-b">
  55 + <!---------------------------------->
  56 + <label class="col-sm-1 control-label">线路类型：</label>
  57 + <div class="col-sm-2">
  58 + <select name="lineType" th:with="type=${@dict.getType('lineType')}" class="form-control m-b" disabled>
72 59 <option value=""></option>
73   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
74   - th:value="${dict.dictValue}"
75   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}"></option>
  60 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  61 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}">
  62 + </option>
76 63 </select>
77 64 </div>
78   - </div>
79   - <div class="form-group">
80   - <label class="col-sm-3 control-label">区属：</label>
81   - <div class="col-sm-8">
82   -
83   - <select name="district" th:with="type=${@dict.getType('district')}" disabled
84   - class="form-control m-b">
85   - <option value=""></option>
86   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
87   - th:value="${dict.dictValue}"
88   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
  65 + <!---------------------------------->
  66 + <label class="col-sm-1 control-label">道路类型：</label>
  67 + <div class="col-sm-2" >
  68 + <!--data-max-options="2" 限制多选数量-->
  69 + <select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker form-control" multiple title="" disabled>
  70 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  71 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.roadType== null ? '' : bsthTLine.roadType),#strings.toString(dict.dictValue))}">
  72 + </option>
89 73 </select>
90 74 </div>
91 75 </div>
  76 +
92 77 <div class="form-group">
93   - <label class="col-sm-3 control-label">是否区内：</label>
94   - <div class="col-sm-8">
95   - <select name="inoutDistrict" disabled
96   - th:with="type=${@dict.getType('trueFalse')}"
97   - class="form-control m-b">
  78 + <label class="col-sm-1 control-label">区属：</label>
  79 + <div class="col-sm-2">
  80 + <select name="district" th:with="type=${@dict.getType('district')}" class="form-control m-b" disabled>
98 81 <option value=""></option>
99   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
100   - th:value="${dict.dictValue}"
101   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
  82 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  83 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
102 84 </select>
103 85 </div>
104   - </div>
105   - <div class="form-group">
106   - <label class="col-sm-3 control-label">营运状态：</label>
107   - <div class="col-sm-8">
108   -
109   - <select name="serviceState" disabled
110   - th:with="type=${@dict.getType('serviceState')}"
111   - class="form-control m-b">
  86 + <!---------------------------------->
  87 + <label class="col-sm-1 control-label">是否区内：</label>
  88 + <div class="col-sm-2">
  89 + <select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b" disabled>
112 90 <option value=""></option>
113   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
114   - th:value="${dict.dictValue}"
115   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
  91 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  92 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
116 93 </select>
117 94 </div>
118   - </div>
119   - <div class="form-group">
120   - <label class="col-sm-3 control-label">车辆类型：</label>
121   - <div class="col-sm-8" th:with="type=${@dict.getType('busType')}">
122   - <label class="checkbox-inline" th:each="dict : ${type}"
123   - style="display: block"> <input type="checkbox" disabled
124   - name="busType"
125   - th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.busType == null ? '' : bsthTLine.busType ,','),#strings.toString(dict.dictValue))}"
126   - th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
  95 + <!---------------------------------->
  96 + <label class="col-sm-1 control-label">车辆类型：</label>
  97 + <div class="col-sm-2" th:with="type=${@dict.getType('busType')}">
  98 + <!--data-max-options="2" 限制多选数量-->
  99 + <select name="busType" th:with="type=${@dict.getType('busType')}" class="selectpicker form-control" multiple title="" disabled >
  100 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  101 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.busType== null ? '' : bsthTLine.busType),#strings.toString(dict.dictValue))}">
  102 + </option>
  103 + </select>
127 104 </div>
128   - </div>
129   - <div class="form-group">
130   - <label class="col-sm-3 control-label">是否空调：</label>
131   - <div class="col-sm-8">
132   -
133   - <select name="airConditionerType" disabled
134   - th:with="type=${@dict.getType('airConditionerType')}"
135   - class="form-control m-b">
  105 + <!---------------------------------->
  106 + <label class="col-sm-1 control-label">是否空调：</label>
  107 + <div class="col-sm-2">
  108 + <select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}" class="form-control m-b" disabled>
136 109 <option value=""></option>
137   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
138   - th:value="${dict.dictValue}"
139   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType == null ? '' : bsthTLine.airConditionerType ),#strings.toString(dict.dictValue))}"></option>
  110 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  111 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType == null ? '' : bsthTLine.airConditionerType ),#strings.toString(dict.dictValue))}"></option>
140 112 </select>
141 113 </div>
142 114 </div>
  115 +
143 116 <div class="form-group">
144   - <label class="col-sm-3 control-label">售票类型：</label>
145   - <div class="col-sm-8">
146   - <select name="sellTicketType" disabled
147   - th:with="type=${@dict.getType('sellTicketType')}"
148   - class="form-control m-b">
  117 + <label class="col-sm-1 control-label">售票类型：</label>
  118 + <div class="col-sm-2">
  119 + <select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}" class="form-control m-b" disabled>
149 120 <option value=""></option>
150   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
151   - th:value="${dict.dictValue}"
152   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType == null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
  121 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  122 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType == null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
153 123 </select>
154 124 </div>
155   - </div>
156   - <div class="form-group">
157   - <label class="col-sm-3 control-label">运营时间：</label>
158   - <div class="col-sm-8">
159   - <select name="serviceTime" disabled
160   - th:with="type=${@dict.getType('serviceTime')}"
161   - class="form-control m-b">
  125 + <!---------------------------------->
  126 + <label class="col-sm-1 control-label">票价：</label>
  127 + <div class="col-sm-2" th:with="type=${@dict.getType('ticketPrice')}">
  128 + <!--data-max-options="2" 限制多选数量-->
  129 + <select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}" class="selectpicker form-control" multiple title="" disabled >
  130 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  131 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.ticketPrice== null ? '' : bsthTLine.ticketPrice),#strings.toString(dict.dictValue))}">
  132 + </option>
  133 + </select>
  134 + </div>
  135 + <!---------------------------------->
  136 + <label class="col-sm-1 control-label">运营时间：</label>
  137 + <div class="col-sm-2">
  138 + <select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" class="form-control m-b" disabled>
162 139 <option value=""></option>
163   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
164   - th:value="${dict.dictValue}"
165   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
  140 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  141 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
166 142 </select>
167 143 </div>
168   - </div>
169   - <div class="form-group">
170   - <label class="col-sm-3 control-label">线路长度：</label>
171   - <div class="col-sm-8">
172   - <input name="lineDistance" th:field="*{lineDistance}" disabled
173   - class="form-control" type="text">
  144 + <!---------------------------------->
  145 + <label class="col-sm-1 control-label">线路编码：</label>
  146 + <div class="col-sm-2">
  147 + <input name="lineCode" th:field="*{lineCode}" class="form-control" type="text" disabled>
174 148 </div>
175 149 </div>
  150 +
176 151 <div class="form-group">
177   - <label class="col-sm-3 control-label">线路编码：</label>
178   - <div class="col-sm-8">
179   - <input name="lineCode" th:field="*{lineCode}" class="form-control" disabled
180   - type="text">
  152 + <label class="col-sm-1 control-label">线路长度：</label>
  153 + <div class="col-sm-2">
  154 + <input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text" disabled>
  155 + </div>
  156 + <!---------------------------------->
  157 + <label class="col-sm-1 control-label">首站：</label>
  158 + <div class="col-sm-2">
  159 + <input name="firstStation" th:field="*{firstStation}" class="form-control" type="text" disabled>
  160 + </div>
  161 + <!---------------------------------->
  162 + <label class="col-sm-1 control-label">末站：</label>
  163 + <div class="col-sm-2">
  164 + <input name="lastStation" th:field="*{lastStation}" class="form-control" type="text" disabled>
  165 + </div>
  166 + <!---------------------------------->
  167 + <label class="col-sm-1 control-label">起讫站：</label>
  168 + <div class="col-sm-2">
  169 + <input name="startEnd" th:field="*{startEnd}" class="form-control" type="text" disabled>
181 170 </div>
182 171 </div>
  172 +
183 173 <div class="form-group">
184   - <label class="col-sm-3 control-label">授权年限：</label>
185   - <div class="col-sm-8">
186   - <input name="warrantYear" th:field="*{warrantYear}" disabled
187   - class="form-control" type="text">
  174 + <label class="col-sm-1 control-label">站点名称：</label>
  175 + <div class="col-sm-2">
  176 + <textarea name="halfwayStation" class="form-control" disabled>[[*{halfwayStation}]]</textarea>
  177 + </div>
  178 + <!---------------------------------->
  179 + <label class="col-sm-1 control-label">线路走向：</label>
  180 + <div class="col-sm-2">
  181 + <textarea name="directions" class="form-control" disabled>[[*{directions}]]</textarea>
  182 + </div>
  183 + <!---------------------------------->
  184 + <label class="col-sm-1 control-label">首战时间：</label>
  185 + <div class="col-sm-2">
  186 + <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text" disabled>
  187 + </div>
  188 + <!---------------------------------->
  189 + <label class="col-sm-1 control-label">末站首战时间：</label>
  190 + <div class="col-sm-2">
  191 + <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text" disabled>
188 192 </div>
189 193 </div>
  194 +
190 195 <div class="form-group">
191   - <label class="col-sm-3 control-label">授权起始日期：</label>
192   - <div class="col-sm-8">
  196 + <label class="col-sm-1 control-label">停车场：</label>
  197 + <div class="col-sm-2">
  198 + <input name="park" th:field="*{park}" class="form-control" type="text" disabled>
  199 + </div>
  200 + <!---------------------------------->
  201 + <label class="col-sm-1 control-label">授权年限：</label>
  202 + <div class="col-sm-2">
  203 + <input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text" disabled>
  204 + </div>
  205 + <!---------------------------------->
  206 + <label class="col-sm-1 control-label">授权起始日期：</label>
  207 + <div class="col-sm-2">
193 208 <div class="input-group date">
194   - <input name="warrantStartTime"
195   - th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}" disabled
196   - class="form-control" placeholder="yyyy-MM-dd" type="text"
197   - autocomplete="off"> <span class="input-group-addon"><i
198   - class="fa fa-calendar"></i></span>
  209 + <input name="warrantStartTime" th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}"
  210 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
  211 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
199 212 </div>
200 213 </div>
201   - </div>
202   - <div class="form-group">
203   - <label class="col-sm-3 control-label">授权结束日期：</label>
204   - <div class="col-sm-8">
  214 + <!---------------------------------->
  215 + <label class="col-sm-1 control-label">授权结束日期：</label>
  216 + <div class="col-sm-2">
205 217 <div class="input-group date">
206   - <input name="warrantEndTime"
207   - th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}" disabled
208   - class="form-control" placeholder="yyyy-MM-dd" type="text"
209   - autocomplete="off"> <span class="input-group-addon"><i
210   - class="fa fa-calendar"></i></span>
  218 + <input name="warrantEndTime" th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}"
  219 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
  220 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
211 221 </div>
212 222 </div>
213 223 </div>
  224 +
214 225 <div class="form-group">
215   - <label class="col-sm-3 control-label">撤销日期：</label>
216   - <div class="col-sm-8">
  226 + <label class="col-sm-1 control-label">撤销日期：</label>
  227 + <div class="col-sm-2">
217 228 <div class="input-group date">
218   - <input name="planCancelTime"
219   - th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}" disabled
220   - class="form-control" placeholder="yyyy-MM-dd" type="text"
221   - autocomplete="off"> <span class="input-group-addon"><i
222   - class="fa fa-calendar"></i></span>
  229 + <input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
  230 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
  231 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
223 232 </div>
224 233 </div>
225   - </div>
226   - <div class="form-group">
227   - <label class="col-sm-3 control-label">实际撤销日期：</label>
228   - <div class="col-sm-8">
  234 + <!---------------------------------->
  235 + <label class="col-sm-1 control-label">实际撤销日期：</label>
  236 + <div class="col-sm-2">
229 237 <div class="input-group date">
230   - <input name="cancelTime"
231   - th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}" disabled
232   - class="form-control" placeholder="yyyy-MM-dd" type="text"
233   - autocomplete="off"> <span class="input-group-addon"><i
234   - class="fa fa-calendar"></i></span>
  238 + <input name="cancelTime" th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
  239 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
  240 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
235 241 </div>
236 242 </div>
237   - </div>
238   - <div class="form-group">
239   - <label class="col-sm-3 control-label">撤销原因：</label>
240   - <div class="col-sm-8">
  243 + <!---------------------------------->
  244 + <label class="col-sm-1 control-label">撤销原因：</label>
  245 + <div class="col-sm-2">
241 246 <textarea name="cancelReason" class="form-control" disabled>[[*{cancelReason}]]</textarea>
242 247 </div>
243   - </div>
244   - <div class="form-group">
245   - <label class="col-sm-3 control-label">备注：</label>
246   - <div class="col-sm-8">
247   - <textarea name="remark" class="form-control" disabled>[[*{remark}]]</textarea>
248   - </div>
249   - </div>
250   - <div class="form-group">
251   - <label class="col-sm-3 control-label">是否逻辑删除：</label>
252   - <div class="col-sm-8">
253   -
254   - <select name="isLogicDelete" disabled
255   - th:with="type=${@dict.getType('trueFalse')}"
256   - class="form-control m-b">
257   - <option value=""></option>
258   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
259   - th:value="${dict.dictValue}"
260   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.isLogicDelete== null ? '' : bsthTLine.isLogicDelete),#strings.toString(dict.dictValue))}"></option>
261   - </select>
262   - </div>
263   - </div>
264   - <div class="form-group">
265   - <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
266   - <div class="col-sm-8">
  248 + <!---------------------------------->
  249 + <label class="col-sm-1 control-label">行车作业计划表报备时间：</label>
  250 + <div class="col-sm-2">
267 251 <div class="input-group date">
268   - <input name="timeSchedule" disabled
269   - th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
270   - class="form-control" placeholder="yyyy-MM-dd" type="text"
271   - autocomplete="off"> <span class="input-group-addon"><i
272   - class="fa fa-calendar"></i></span>
  252 + <input name="timeSchedule" th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
  253 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
  254 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
273 255 </div>
274 256 </div>
275 257 </div>
  258 +
276 259 <div class="form-group">
277   - <label class="col-sm-3 control-label">停车场：</label>
278   - <div class="col-sm-8">
279   - <input name="park" th:field="*{park}" class="form-control" disabled
280   - type="text">
281   - </div>
282   - </div>
283   - <div class="form-group">
284   - <label class="col-sm-3 control-label">是否权证：</label>
285   - <div class="col-sm-8">
286   - <select name="isWarrant" id="isWarrant" disabled
287   - th:with="type=${@dict.getType('trueFalse')}"
288   - class="form-control m-b">
289   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
290   - th:value="${dict.dictValue}"
291   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
  260 + <label class="col-sm-1 control-label">是否权证：</label>
  261 + <div class="col-sm-2">
  262 + <select name="isWarrant" id="isWarrant" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b" disabled>
  263 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  264 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
292 265 </select>
293 266 </div>
294   - </div>
295   - <div class="form-group">
296   - <label class="col-sm-3 control-label">权证开通日期：</label>
297   - <div class="col-sm-8">
  267 + <!---------------------------------->
  268 + <label class="col-sm-1 control-label">权证开通日期：</label>
  269 + <div class="col-sm-2">
298 270 <div class="input-group date">
299   - <input name="isWarrantStartTime" id="isWarrantStartTime" disabled
300   - th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
301   - class="form-control" placeholder="yyyy-MM-dd" type="text"
302   - autocomplete="off"> <span class="input-group-addon"><i
303   - class="fa fa-calendar"></i></span>
  271 + <input name="isWarrantStartTime" id="isWarrantStartTime" th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
  272 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
  273 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
304 274 </div>
305   -
306 275 </div>
307   - </div>
308   - <div class="form-group">
309   - <label class="col-sm-3 control-label">权证到期日期：</label>
310   - <div class="col-sm-8">
  276 + <!---------------------------------->
  277 + <label class="col-sm-1 control-label">权证到期日期：</label>
  278 + <div class="col-sm-2">
311 279 <div class="input-group date">
312   - <input name="isWarrantEndTime" id="isWarrantEndTime" disabled
313   - th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
314   - class="form-control" placeholder="yyyy-MM-dd" type="text"
315   - autocomplete="off"> <span class="input-group-addon"><i
316   - class="fa fa-calendar"></i></span>
  280 + <input name="isWarrantEndTime" id="isWarrantEndTime" th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
  281 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
  282 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
317 283 </div>
318   -
319   - </div>
320   - </div>
321   - <div class="form-group">
322   - <label class="col-sm-3 control-label">道路类型：</label>
323   - <div class="col-sm-8">
324   - <div class="col-sm-8" th:with="type=${@dict.getType('roadType')}">
325   - <label class="checkbox-inline" th:each="dict : ${type}"
326   - style="display: block"> <input type="checkbox"
327   - name="roadType" disabled
328   - th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.roadType == null ? '' : bsthTLine.roadType ,','),#strings.toString(dict.dictValue))}"
329   - th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
330   - </div>
331   - </div>
332   - </div>
333   - <div class="form-group">
334   - <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
335   - <div class="col-sm-8">
336   - <input name="ticketPrice" th:field="*{ticketPrice}" disabled
337   - class="form-control" type="text">
338   - </div>
339   - </div>
340   - <div class="form-group">
341   - <label class="col-sm-3 control-label">首站：</label>
342   - <div class="col-sm-8">
343   - <input name="firstStation" th:field="*{firstStation}" disabled
344   - class="form-control" type="text">
345 284 </div>
346   - </div>
347   - <div class="form-group">
348   - <label class="col-sm-3 control-label">起讫站：</label>
349   - <div class="col-sm-8">
350   - <input name="startEnd" th:field="*{startEnd}" class="form-control" disabled
351   - type="text">
352   - </div>
353   - </div>
354   - <div class="form-group">
355   - <label class="col-sm-3 control-label">首战时间：</label>
356   - <div class="col-sm-8">
357   - <input name="firstTime" th:field="*{firstTime}" disabled
358   - class="form-control" type="text">
359   - </div>
360   - </div>
361   - <div class="form-group">
362   - <label class="col-sm-3 control-label">末站：</label>
363   - <div class="col-sm-8">
364   - <input name="lastStation" th:field="*{lastStation}" disabled
365   - class="form-control" type="text">
366   - </div>
367   - </div>
368   - <div class="form-group">
369   - <label class="col-sm-3 control-label">末站首战时间：</label>
370   - <div class="col-sm-8">
371   - <input name="lastTime" th:field="*{lastTime}" class="form-control" disabled
372   - type="text">
373   - </div>
374   - </div>
375   - <div class="form-group">
376   - <label class="col-sm-3 control-label">上行里程数：</label>
377   - <div class="col-sm-8">
378   - <input name="mileageUp" th:field="*{mileageUp}" disabled
379   - class="form-control" type="text">
380   - </div>
381   - </div>
382   - <div class="form-group">
383   - <label class="col-sm-3 control-label">下行里程数：</label>
384   - <div class="col-sm-8">
385   - <input name="mileageDown" th:field="*{mileageDown}" disabled
386   - class="form-control" type="text">
387   - </div>
388   - </div>
389   - <div class="form-group">
390   - <label class="col-sm-3 control-label">平均里程数：</label>
391   - <div class="col-sm-8">
392   - <input name="averageMileage" th:field="*{averageMileage}" disabled
393   - class="form-control" type="text">
394   - </div>
395   - </div>
396   - <div class="form-group">
397   - <label class="col-sm-3 control-label">站级数(上行)：</label>
398   - <div class="col-sm-8">
399   - <input name="stationUp" th:field="*{stationUp}" disabled
400   - class="form-control" type="text">
401   - </div>
402   - </div>
403   - <div class="form-group">
404   - <label class="col-sm-3 control-label">站级数(下行)：</label>
405   - <div class="col-sm-8">
406   - <input name="stationDown" th:field="*{stationDown}" disabled
407   - class="form-control" type="text">
  285 + <!---------------------------------->
  286 + <label class="col-sm-1 control-label">经营权证（大巴）：</label>
  287 + <div class="col-sm-2">
  288 + <input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text" disabled>
408 289 </div>
409 290 </div>
  291 +
410 292 <div class="form-group">
411   - <label class="col-sm-3 control-label">行驶时间(上行)：</label>
412   - <div class="col-sm-8">
413   - <input name="travelTimeUp" th:field="*{travelTimeUp}" disabled
414   - class="form-control" type="text">
  293 + <label class="col-sm-1 control-label">经营权证（中巴）：</label>
  294 + <div class="col-sm-2">
  295 + <input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control" type="text" disabled>
415 296 </div>
416   - </div>
417   - <div class="form-group">
418   - <label class="col-sm-3 control-label">行驶时间(下行)：</label>
419   - <div class="col-sm-8">
420   - <input name="travelTimeDown" th:field="*{travelTimeDown}" disabled
421   - class="form-control" type="text">
  297 + <!---------------------------------->
  298 + <label class="col-sm-1 control-label">实际配车数：</label>
  299 + <div class="col-sm-2">
  300 + <input name="vehiclesNumber" th:field="*{vehiclesNumber}" class="form-control" type="text" disabled>
422 301 </div>
423   - </div>
424   - <div class="form-group">
425   - <label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
426   - <div class="col-sm-8">
427   - <input name="travelIntervalUp" th:field="*{travelIntervalUp}" disabled
428   - class="form-control" type="text">
  302 + <!---------------------------------->
  303 + <label class="col-sm-1 control-label">实际车辆数（大巴）：</label>
  304 + <div class="col-sm-2">
  305 + <input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" class="form-control" type="text" disabled>
429 306 </div>
430   - </div>
431   - <div class="form-group">
432   - <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
433   - <div class="col-sm-8">
434   - <input name="travelIntervalDown" th:field="*{travelIntervalDown}" disabled
435   - class="form-control" type="text">
  307 + <!---------------------------------->
  308 + <label class="col-sm-1 control-label">实际车辆数（中巴）：</label>
  309 + <div class="col-sm-2">
  310 + <input name="numberVehiclesMiddle" th:field="*{numberVehiclesMiddle}" class="form-control" type="text" disabled>
436 311 </div>
437 312 </div>
  313 +
438 314 <div class="form-group">
439   - <label class="col-sm-3 control-label">经营权证（大巴）：</label>
440   - <div class="col-sm-8">
441   - <input name="warrantVehiclesLarge"
442   - th:field="*{warrantVehiclesLarge}" class="form-control" disabled
443   - type="text">
  315 + <label class="col-sm-1 control-label">上行里程数：</label>
  316 + <div class="col-sm-2">
  317 + <input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text" disabled>
444 318 </div>
445   - </div>
446   - <div class="form-group">
447   - <label class="col-sm-3 control-label">经营权证（中巴）：</label>
448   - <div class="col-sm-8">
449   - <input name="warrantVehiclesMiddle"
450   - th:field="*{warrantVehiclesMiddle}" class="form-control" disabled
451   - type="text">
  319 + <!---------------------------------->
  320 + <label class="col-sm-1 control-label">下行里程数：</label>
  321 + <div class="col-sm-2">
  322 + <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text"disabled>
452 323 </div>
453   - </div>
454   - <div class="form-group">
455   - <label class="col-sm-3 control-label">实际配车数：</label>
456   - <div class="col-sm-8">
457   - <input name="vehiclesNumber" th:field="*{vehiclesNumber}" disabled
458   - class="form-control" type="text">
  324 + <!---------------------------------->
  325 + <label class="col-sm-1 control-label">平均里程数：</label>
  326 + <div class="col-sm-2">
  327 + <input name="averageMileage" th:field="*{averageMileage}" class="form-control" type="text" disabled>
459 328 </div>
460   - </div>
461   - <div class="form-group">
462   - <label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
463   - <div class="col-sm-8">
464   - <input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" disabled
465   - class="form-control" type="text">
  329 + <!---------------------------------->
  330 + <label class="col-sm-1 control-label">站级数(上行)：</label>
  331 + <div class="col-sm-2">
  332 + <input name="stationUp" th:field="*{stationUp}" class="form-control" type="text" disabled>
466 333 </div>
467 334 </div>
  335 +
468 336 <div class="form-group">
469   - <label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
470   - <div class="col-sm-8">
471   - <input name="numberVehiclesMiddle"
472   - th:field="*{numberVehiclesMiddle}" class="form-control" disabled
473   - type="text">
  337 + <label class="col-sm-1 control-label">站级数(下行)：</label>
  338 + <div class="col-sm-2">
  339 + <input name="stationDown" th:field="*{stationDown}" class="form-control" type="text" disabled>
474 340 </div>
475   - </div>
476   - <div class="form-group">
477   - <label class="col-sm-3 control-label">车辆自编号：</label>
478   - <div class="col-sm-8">
479   - <input name="carPlate" th:field="*{carPlate}" class="form-control" disabled
480   - type="text">
  341 + <!---------------------------------->
  342 + <label class="col-sm-1 control-label">行驶时间(上行)：</label>
  343 + <div class="col-sm-2">
  344 + <input name="travelTimeUp" th:field="*{travelTimeUp}" class="form-control" type="text" disabled>
481 345 </div>
482   - </div>
483   - <div class="form-group">
484   - <label class="col-sm-3 control-label">线路总配人数：</label>
485   - <div class="col-sm-8">
486   - <input name="numberPerson" th:field="*{numberPerson}" disabled
487   - class="form-control" type="text">
  346 + <!---------------------------------->
  347 + <label class="col-sm-1 control-label">行驶时间(下行)：</label>
  348 + <div class="col-sm-2">
  349 + <input name="travelTimeDown" th:field="*{travelTimeDown}" class="form-control" type="text" disabled>
488 350 </div>
489   - </div>
490   - <div class="form-group">
491   - <label class="col-sm-3 control-label">人数司机：</label>
492   - <div class="col-sm-8">
493   - <input name="numberPersonDriver" th:field="*{numberPersonDriver}" disabled
494   - class="form-control" type="text">
  351 + <!---------------------------------->
  352 + <label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
  353 + <div class="col-sm-2">
  354 + <input name="travelIntervalUp" th:field="*{travelIntervalUp}" class="form-control" type="text" disabled>
495 355 </div>
496 356 </div>
  357 +
497 358 <div class="form-group">
498   - <label class="col-sm-3 control-label">售票员数：</label>
499   - <div class="col-sm-8">
500   - <input name="numberPersonSales" th:field="*{numberPersonSales}" disabled
501   - class="form-control" type="text">
  359 + <label class="col-sm-1 control-label">行驶间隔(低谷)：</label>
  360 + <div class="col-sm-2">
  361 + <input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text" disabled>
502 362 </div>
503   - </div>
504   - <div class="form-group">
505   - <label class="col-sm-3 control-label">新能源车数：</label>
506   - <div class="col-sm-8">
507   - <input name="busEvNumber" th:field="*{busEvNumber}" disabled
508   - class="form-control" type="text">
  363 + <!---------------------------------->
  364 + <label class="col-sm-1 control-label">高峰系数：</label>
  365 + <div class="col-sm-2">
  366 + <input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" class="form-control" type="text" disabled>
509 367 </div>
510   - </div>
511   - <div class="form-group">
512   - <label class="col-sm-3 control-label">线路走向：</label>
513   - <div class="col-sm-8">
514   - <textarea name="directions" class="form-control" disabled>[[*{directions}]]</textarea>
  368 + <!---------------------------------->
  369 + <label class="col-sm-1 control-label">低谷系数：</label>
  370 + <div class="col-sm-2">
  371 + <input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" class="form-control" type="text" disabled>
515 372 </div>
516   - </div>
517   - <div class="form-group">
518   - <label class="col-sm-3 control-label">经营权证数：</label>
519   - <div class="col-sm-8">
520   - <input name="numberOfManage" th:field="*{numberOfManage}" disabled
521   - class="form-control" type="text">
  373 + <!---------------------------------->
  374 + <label class="col-sm-1 control-label">间隔等级：</label>
  375 + <div class="col-sm-2">
  376 + <input name="divideLevel" th:field="*{divideLevel}" class="form-control" type="text" disabled>
522 377 </div>
523 378 </div>
  379 +
524 380 <div class="form-group">
525   - <label class="col-sm-3 control-label">站点名称：</label>
526   - <div class="col-sm-8">
527   - <textarea name="halfwayStation" class="form-control" disabled>[[*{halfwayStation}]]</textarea>
  381 + <label class="col-sm-1 control-label">车辆自编号：</label>
  382 + <div class="col-sm-2">
  383 + <input name="carPlate" th:field="*{carPlate}" class="form-control" type="text" disabled>
528 384 </div>
529   - </div>
530   - <div class="form-group">
531   - <label class="col-sm-3 control-label">高峰系数：</label>
532   - <div class="col-sm-8">
533   - <input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" disabled
534   - class="form-control" type="text">
  385 + <!---------------------------------->
  386 + <label class="col-sm-1 control-label">线路总配人数：</label>
  387 + <div class="col-sm-2">
  388 + <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text" disabled>
535 389 </div>
536   - </div>
537   - <div class="form-group">
538   - <label class="col-sm-3 control-label">低谷系数：</label>
539   - <div class="col-sm-8">
540   - <input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" disabled
541   - class="form-control" type="text">
  390 + <!---------------------------------->
  391 + <label class="col-sm-1 control-label">人数司机：</label>
  392 + <div class="col-sm-2">
  393 + <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text" disabled>
542 394 </div>
543   - </div>
544   - <div class="form-group">
545   - <label class="col-sm-3 control-label">间隔等级：</label>
546   - <div class="col-sm-8">
547   - <input name="divideLevel" th:field="*{divideLevel}" disabled
548   - class="form-control" type="text">
  395 + <!---------------------------------->
  396 + <label class="col-sm-1 control-label">售票员数：</label>
  397 + <div class="col-sm-2">
  398 + <input name="numberPersonSales" th:field="*{numberPersonSales}" class="form-control" type="text" disabled>
549 399 </div>
550 400 </div>
  401 +
551 402 <div class="form-group">
552   - <label class="col-sm-3 control-label">是否挂牌：</label>
553   - <div class="col-sm-8">
554   - <select name="hasTimelists"
555   - th:with="type=${@dict.getType('trueFalse')}" disabled
556   - class="form-control m-b">
557   - <option value=""></option>
558   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
559   - th:value="${dict.dictValue}"
560   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
561   - </select>
  403 + <label class="col-sm-1 control-label">新能源车数：</label>
  404 + <div class="col-sm-2">
  405 + <input name="busEvNumber" th:field="*{busEvNumber}" class="form-control" type="text" disabled>
562 406 </div>
563   - </div>
564   - <div class="form-group">
565   - <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
566   - <div class="col-sm-8">
567   - <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" disabled
568   - class="form-control m-b">
  407 + <!---------------------------------->
  408 + <label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
  409 + <div class="col-sm-2">
  410 + <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b" disabled>
569 411 <option value=""></option>
570   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
571   - th:value="${dict.dictValue}"
572   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro== null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
  412 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  413 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro== null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
573 414 </select>
574 415 </div>
575   - </div>
576   - <div class="form-group">
577   - <label class="col-sm-3 control-label">轨交时间：</label>
578   - <div class="col-sm-8">
  416 + <!---------------------------------->
  417 + <label class="col-sm-1 control-label">轨交时间：</label>
  418 + <div class="col-sm-2">
579 419 <div class="input-group date">
580   - <input name="metroTime" class="form-control" disabled
581   - placeholder="HH:mm:ss" th:value="*{metroTime}"> <span
582   - class="input-group-addon"><i class="fa fa-calendar"></i></span>
  420 + <input name="metroTime" class="form-control" placeholder="HH:mm:ss" th:value="*{metroTime}" disabled>
  421 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
583 422 </div>
584 423 </div>
585   - </div>
586   - <div class="form-group">
587   - <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
588   - <div class="col-sm-8">
589   - <input name="coldBonusType" th:field="*{coldBonusType}" disabled
590   - class="form-control" type="text">
  424 + <!---------------------------------->
  425 + <label class="col-sm-1 control-label">是否挂牌：</label>
  426 + <div class="col-sm-2">
  427 + <select name="hasTimelists" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b" disabled>
  428 + <option value=""></option>
  429 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  430 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
  431 + </select>
591 432 </div>
592 433 </div>
593 434  
594 435 <div class="form-group">
595   - <label class="col-sm-3 control-label">性质：</label>
596   - <div class="col-sm-8">
597   - <select name="lineUpdateType"
598   - th:with="type=${@dict.getType('lineUpdateType')}" disabled
599   - class="form-control m-b">
600   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
601   - th:value="${dict.dictValue}"
602   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
  436 + <label class="col-sm-1 control-label">经营权证数：</label>
  437 + <div class="col-sm-2">
  438 + <input name="numberOfManage" th:field="*{numberOfManage}" class="form-control" type="text" disabled>
  439 + </div>
  440 + <!---------------------------------->
  441 + <label class="col-sm-1 control-label">营运状态：</label>
  442 + <div class="col-sm-2">
  443 + <select name="serviceState" th:with="type=${@dict.getType('serviceState')}" class="form-control m-b" disabled>
  444 + <option value=""></option>
  445 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  446 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
603 447 </select>
604 448 </div>
605   - </div>
606   - <div class="form-group">
607   - <label class="col-sm-3 control-label">营收类型：</label>
608   - <div class="col-sm-8">
609   - <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" disabled class="form-control m-b">
  449 + <!---------------------------------->
  450 + <label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
  451 + <div class="col-sm-2">
  452 + <input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text" disabled>
  453 + </div>
  454 + <!---------------------------------->
  455 + <label class="col-sm-1 control-label">营收类型：</label>
  456 + <div class="col-sm-2">
  457 + <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b" disabled>
610 458 <option value=""></option>
611 459 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
612 460 th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>></option>></option>
613 461 </select>
614 462 </div>
615 463 </div>
  464 +
616 465 <div class="form-group">
617   - <label class="col-sm-3 control-label">启用时间：</label>
618   - <div class="col-sm-8">
  466 + <label class="col-sm-1 control-label">性质：</label>
  467 + <div class="col-sm-2">
  468 + <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b" disabled>
  469 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  470 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
  471 + </select>
  472 + </div>
  473 + <!---------------------------------->
  474 + <label class="col-sm-1 control-label">启用时间：</label>
  475 + <div class="col-sm-2">
619 476 <div class="input-group date">
620   - <input name="startDate"
621   - th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}" disabled
622   - class="form-control" placeholder="yyyy-MM-dd" type="text"
623   - autocomplete="off"> <span class="input-group-addon"><i
624   - class="fa fa-calendar"></i></span>
  477 + <input name="startDate" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
  478 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
  479 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
625 480 </div>
626 481  
627 482 </div>
628   - </div>
629   - <div class="form-group">
630   - <label class="col-sm-3 control-label">启用原因：</label>
631   - <div class="col-sm-8">
632   - <textarea name="startReason" class="form-control" disabled>[[*{startReason}]]</textarea>
  483 + <!---------------------------------->
  484 + <label class="col-sm-1 control-label">备注：</label>
  485 + <div class="col-sm-2">
  486 + <textarea name="remark" class="form-control" disabled>[[*{remark}]]</textarea>
633 487 </div>
634 488 </div>
  489 +
635 490 <div class="form-group">
636   - <label class="col-sm-3 control-label">附件：</label>
637   - <div class="col-sm-8">
638   - <div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" disabled>
639   - <input name="files" type="hidden" th:value="${path}" >
640   - <a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
641   - </a>
642   - <button onclick="deleteFile(this);">删除</button>
643   - </div>
644   - <div class="file-loading" id="uploadDiv">
645   - <input id="fileinput" type="file" multiple>
  491 + <div class="form-group">
  492 + <label class="col-sm-1 control-label">附件：</label>
  493 + <div class="col-sm-5" >
  494 + <div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" >
  495 + <input name="files" type="hidden" th:value="${path}" >
  496 + <a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}"></a>
  497 + <button onclick="deleteFile(this);" disabled>删除</button>
  498 + </div>
  499 + <div class="file-loading" id="uploadDiv">
  500 + <input id="fileinput" type="file" multiple disabled>
  501 + </div>
646 502 </div>
647 503 </div>
648 504 </div>
... ... @@ -651,6 +507,7 @@
651 507 <th:block th:include="include :: footer" />
652 508 <th:block th:include="include :: datetimepicker-js" />
653 509 <th:block th:include="include :: bootstrap-fileinput-js" />
  510 + <th:block th:include="include :: bootstrap-select-js" />
654 511 <script th:inline="javascript">
655 512 var prefix = ctx + "system/line";
656 513 function deleteFile(obj){
... ...
bsthLineProfiles/src/main/resources/templates/system/lineExamine/line.html
  View file @8c34828
... ... @@ -108,8 +108,6 @@
108 108  
109 109 if(!objs)continue;
110 110  
111   - console.log(objs[i]);
112   -
113 111 var col = {
114 112 field: objs[i].field,
115 113 title: objs[i].title,
... ... @@ -462,18 +460,50 @@
462 460  
463 461  
464 462  
465   - function detail(id,examineType,width, height) {
466   - table.set();
467   - var url=prefix+'/examine'
468   - var _url = $.operate.detailUrl(id);
469   - var options = {
470   - title: table.options.modalName + "详细",
471   - width: width,
472   - height: height,
473   - url: _url,
474   - skin: 'layui-layer-gray',
475   - btn: ['通过','未通过'],
  463 +
  464 + function detail(id,examineType) {
  465 + open(examineType,id,table.options.modalName,(table.options.detailUrl).replace("{id}", id));
  466 + }
  467 +
  468 + function open(examineType,id,title, url, width, height, callback) {
  469 + // 如果是移动端，就使用自适应大小弹窗
  470 + if ($.common.isMobile()) {
  471 + width = 'auto';
  472 + height = 'auto';
  473 + }
  474 + if ($.common.isEmpty(title)) {
  475 + title = false;
  476 + }
  477 + if ($.common.isEmpty(url)) {
  478 + url = "/404.html";
  479 + }
  480 + if ($.common.isEmpty(width)) {
  481 + width = 800;
  482 + }
  483 + if ($.common.isEmpty(height)) {
  484 + height = ($(window).height() - 50);
  485 + }
  486 + if ($.common.isEmpty(callback)) {
  487 + callback = function(index, layero) {
  488 + var iframeWin = layero.find('iframe')[0];
  489 + iframeWin.contentWindow.submitHandler(index, layero);
  490 + }
  491 + }
  492 +
  493 + var index =layer.open({
  494 + type: 2,
  495 + area: [width + 'px', height + 'px'],
  496 + fix: false,
  497 + //不固定
  498 + maxmin: true,
  499 + shade: 0.3,
  500 + title: title,
  501 + content: url,
  502 + btn: ['通过','未通过'],
  503 + // 弹层外区域关闭
  504 + shadeClose: true,
476 505 yes: function () {
  506 + var url=prefix+'/examine'
477 507 var data={'id':id,'examineType':examineType,'examineStatus':'2'}
478 508 $.post(url, data, function(result) {
479 509 if (result.code == web_status.SUCCESS) {
... ... @@ -486,6 +516,7 @@
486 516 });
487 517 },
488 518 btn2:function () {
  519 + var url=prefix+'/examine'
489 520 var data={'id':id,'examineType':examineType,'examineStatus':'1'}
490 521 $.post(url, data, function(result) {
491 522 if (result.code == web_status.SUCCESS) {
... ... @@ -496,10 +527,9 @@
496 527 }
497 528 });
498 529 }
499   - };
500   - $.modal.openOptions(options);
  530 + });
  531 + layer.full(index);
501 532 }
502   -
503 533 </script>
504 534 <style>
505 535 .col_checkbox {
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @8c34828
... ... @@ -4,675 +4,515 @@
4 4 <th:block th:include="include :: header('修改【请填写功能名称】')" />
5 5 <th:block th:include="include :: datetimepicker-css" />
6 6 <th:block th:include="include :: bootstrap-fileinput-css" />
  7 +<th:block th:include="include :: bootstrap-select-css" />
7 8 </head>
8 9 <body class="white-bg">
9 10 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
10   - <form class="form-horizontal m" id="form-line-edit"
11   - th:object="${bsthTLine}">
  11 + <form class="form-horizontal m" id="form-line-edit" th:object="${bsthTLine}">
12 12 <input name="id" th:field="*{id}" type="hidden">
13 13 <div class="form-group">
14   - <label class="col-sm-3 control-label">线路名称：</label>
15   - <div class="col-sm-8">
16   - <input id="lineName" name="lineName" th:field="*{lineName}"
17   - class="form-control" type="text" readonly>
  14 + <label class="col-sm-1 control-label">线路名称：</label>
  15 + <div class="col-sm-2">
  16 + <input name="lineName" th:field="*{lineName}" class="form-control" type="text" readonly>
18 17 </div>
19   - </div>
20   - <div class="form-group">
21   - <label class="col-sm-3 control-label">公司：</label>
22   - <div class="col-sm-8">
23   - <input name="company" th:field="*{company}" class="form-control"
24   - type="text">
  18 + <!---------------------------------->
  19 + <label class="col-sm-1 control-label">主线路id：</label>
  20 + <div class="col-sm-2">
  21 + <input name="pLineId" th:field="*{pLineId}" class="form-control" type="text">
25 22 </div>
26   - </div>
27   - <div class="form-group">
28   - <label class="col-sm-3 control-label">分公司：</label>
29   - <div class="col-sm-8">
30   - <input name="fCompany" th:field="*{fCompany}" class="form-control"
31   - type="text">
  23 + <!---------------------------------->
  24 + <label class="col-sm-1 control-label">公司：</label>
  25 + <div class="col-sm-2">
  26 + <input name="company" th:field="*{company}" class="form-control" type="text">
32 27 </div>
33   - </div>
34   - <div class="form-group">
35   - <label class="col-sm-3 control-label">主线路id：</label>
36   - <div class="col-sm-8">
37   - <input name="pLineId" th:field="*{pLineId}" class="form-control"
38   - type="text">
  28 + <!---------------------------------->
  29 + <label class="col-sm-1 control-label">分公司：</label>
  30 + <div class="col-sm-2">
  31 + <input name="fCompany" th:field="*{fCompany}" class="form-control" type="text">
39 32 </div>
40 33 </div>
  34 +
41 35 <div class="form-group">
42   - <label class="col-sm-3 control-label">营运方式：</label>
43   - <div class="col-sm-8">
44   - <select name="serviceType"
45   - th:with="type=${@dict.getType('serviceType')}"
46   - class="form-control m-b">
  36 + <label class="col-sm-1 control-label">营运方式：</label>
  37 + <div class="col-sm-2">
  38 + <select name="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b">
47 39 <option value=""></option>
48   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
49   - th:value="${dict.dictValue}"
50   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}"></option>
  40 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  41 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}">
  42 + </option>
51 43 </select>
52 44 </div>
53   - </div>
54   - <div class="form-group">
55   - <label class="col-sm-3 control-label">线路属性：</label>
56   - <div class="col-sm-8">
57   - <select name="lineLevel"
58   - th:with="type=${@dict.getType('lineLevel')}"
59   - class="form-control m-b">
  45 + <!---------------------------------->
  46 + <label class="col-sm-1 control-label">线路属性：</label>
  47 + <div class="col-sm-2">
  48 + <select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b">
60 49 <option value=""></option>
61   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
62   - th:value="${dict.dictValue}"
63   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineLevel== null ? '' : bsthTLine.lineLevel),#strings.toString(dict.dictValue))}"></option>
  50 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  51 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineLevel== null ? '' : bsthTLine.lineLevel),#strings.toString(dict.dictValue))}">
  52 + </option>
64 53 </select>
65 54 </div>
66   - </div>
67   - <div class="form-group">
68   - <label class="col-sm-3 control-label">线路类型：</label>
69   - <div class="col-sm-8">
70   - <select name="lineType" th:with="type=${@dict.getType('lineType')}"
71   - class="form-control m-b">
  55 + <!---------------------------------->
  56 + <label class="col-sm-1 control-label">线路类型：</label>
  57 + <div class="col-sm-2">
  58 + <select name="lineType" th:with="type=${@dict.getType('lineType')}" class="form-control m-b">
72 59 <option value=""></option>
73   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
74   - th:value="${dict.dictValue}"
75   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}"></option>
  60 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  61 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}">
  62 + </option>
76 63 </select>
77 64 </div>
78   - </div>
79   - <div class="form-group">
80   - <label class="col-sm-3 control-label">区属：</label>
81   - <div class="col-sm-8">
82   -
83   - <select name="district" th:with="type=${@dict.getType('district')}"
84   - class="form-control m-b">
85   - <option value=""></option>
86   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
87   - th:value="${dict.dictValue}"
88   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
  65 + <!---------------------------------->
  66 + <label class="col-sm-1 control-label">道路类型：</label>
  67 + <div class="col-sm-2" name="roadType">
  68 + <!--data-max-options="2" 限制多选数量-->
  69 + <select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker form-control" multiple title="" >
  70 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  71 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.roadType== null ? '' : bsthTLine.roadType),#strings.toString(dict.dictValue))}">
  72 + </option>
89 73 </select>
90 74 </div>
91 75 </div>
  76 +
92 77 <div class="form-group">
93   - <label class="col-sm-3 control-label">是否区内：</label>
94   - <div class="col-sm-8">
95   - <select name="inoutDistrict"
96   - th:with="type=${@dict.getType('trueFalse')}"
97   - class="form-control m-b">
  78 + <label class="col-sm-1 control-label">区属：</label>
  79 + <div class="col-sm-2">
  80 + <select name="district" th:with="type=${@dict.getType('district')}" class="form-control m-b">
98 81 <option value=""></option>
99   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
100   - th:value="${dict.dictValue}"
101   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
  82 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  83 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
102 84 </select>
103 85 </div>
104   - </div>
105   - <div class="form-group">
106   - <label class="col-sm-3 control-label">营运状态：</label>
107   - <div class="col-sm-8">
108   -
109   - <select name="serviceState"
110   - th:with="type=${@dict.getType('serviceState')}"
111   - class="form-control m-b">
  86 + <!---------------------------------->
  87 + <label class="col-sm-1 control-label">是否区内：</label>
  88 + <div class="col-sm-2">
  89 + <select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
112 90 <option value=""></option>
113   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
114   - th:value="${dict.dictValue}"
115   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
  91 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  92 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
116 93 </select>
117 94 </div>
118   - </div>
119   - <div class="form-group">
120   - <label class="col-sm-3 control-label">车辆类型：</label>
121   - <div class="col-sm-8" th:with="type=${@dict.getType('busType')}" name="busType">
122   - <label class="checkbox-inline" th:each="dict : ${type}"
123   - style="display: block"> <input type="checkbox"
124   - name="busType"
125   - th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.busType == null ? '' : bsthTLine.busType ,','),#strings.toString(dict.dictValue))}"
126   - th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
  95 + <!---------------------------------->
  96 + <label class="col-sm-1 control-label">车辆类型：</label>
  97 + <div class="col-sm-2" name="busType">
  98 + <!--data-max-options="2" 限制多选数量-->
  99 + <select name="busType" th:with="type=${@dict.getType('busType')}" class="selectpicker form-control" multiple title="" >
  100 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  101 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.busType== null ? '' : bsthTLine.busType),#strings.toString(dict.dictValue))}">
  102 + </option>
  103 + </select>
127 104 </div>
128   - </div>
129   - <div class="form-group">
130   - <label class="col-sm-3 control-label">是否空调：</label>
131   - <div class="col-sm-8">
132   -
133   - <select name="airConditionerType"
134   - th:with="type=${@dict.getType('airConditionerType')}"
135   - class="form-control m-b">
  105 + <!---------------------------------->
  106 + <label class="col-sm-1 control-label">是否空调：</label>
  107 + <div class="col-sm-2">
  108 + <select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}" class="form-control m-b">
136 109 <option value=""></option>
137   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
138   - th:value="${dict.dictValue}"
139   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType== null ? '' : bsthTLine.airConditionerType),#strings.toString(dict.dictValue))}"></option>
  110 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  111 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType == null ? '' : bsthTLine.airConditionerType ),#strings.toString(dict.dictValue))}"></option>
140 112 </select>
141 113 </div>
142 114 </div>
  115 +
143 116 <div class="form-group">
144   - <label class="col-sm-3 control-label">售票类型：</label>
145   - <div class="col-sm-8">
146   - <select name="sellTicketType"
147   - th:with="type=${@dict.getType('sellTicketType')}"
148   - class="form-control m-b">
  117 + <label class="col-sm-1 control-label">售票类型：</label>
  118 + <div class="col-sm-2" >
  119 + <select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}" class="form-control m-b">
149 120 <option value=""></option>
150   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
151   - th:value="${dict.dictValue}"
152   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType== null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
  121 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  122 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType == null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
153 123 </select>
154 124 </div>
155   - </div>
156   - <div class="form-group">
157   - <label class="col-sm-3 control-label">运营时间：</label>
158   - <div class="col-sm-8">
159   - <select name="serviceTime"
160   - th:with="type=${@dict.getType('serviceTime')}"
161   - class="form-control m-b">
  125 + <!---------------------------------->
  126 + <label class="col-sm-1 control-label">票价：</label>
  127 + <div class="col-sm-2" name="ticketPrice">
  128 + <!--data-max-options="2" 限制多选数量-->
  129 + <select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}" class="selectpicker form-control" multiple title="" >
  130 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  131 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.ticketPrice== null ? '' : bsthTLine.ticketPrice),#strings.toString(dict.dictValue))}">
  132 + </option>
  133 + </select>
  134 + </div>
  135 + <!---------------------------------->
  136 + <label class="col-sm-1 control-label">运营时间：</label>
  137 + <div class="col-sm-2">
  138 + <select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" class="form-control m-b">
162 139 <option value=""></option>
163   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
164   - th:value="${dict.dictValue}"
165   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
  140 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  141 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
166 142 </select>
167 143 </div>
168   - </div>
169   - <div class="form-group">
170   - <label class="col-sm-3 control-label">线路长度：</label>
171   - <div class="col-sm-8">
172   - <input name="lineDistance" th:field="*{lineDistance}"
173   - class="form-control" type="text">
  144 + <!---------------------------------->
  145 + <label class="col-sm-1 control-label">线路编码：</label>
  146 + <div class="col-sm-2">
  147 + <input name="lineCode" th:field="*{lineCode}" class="form-control" type="text">
174 148 </div>
175 149 </div>
  150 +
176 151 <div class="form-group">
177   - <label class="col-sm-3 control-label">线路编码：</label>
178   - <div class="col-sm-8">
179   - <input name="lineCode" th:field="*{lineCode}" class="form-control"
180   - type="text">
  152 + <label class="col-sm-1 control-label">线路长度：</label>
  153 + <div class="col-sm-2">
  154 + <input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text">
  155 + </div>
  156 + <!---------------------------------->
  157 + <label class="col-sm-1 control-label">首站：</label>
  158 + <div class="col-sm-2">
  159 + <input name="firstStation" th:field="*{firstStation}" class="form-control" type="text">
  160 + </div>
  161 + <!---------------------------------->
  162 + <label class="col-sm-1 control-label">末站：</label>
  163 + <div class="col-sm-2">
  164 + <input name="lastStation" th:field="*{lastStation}" class="form-control" type="text">
  165 + </div>
  166 + <!---------------------------------->
  167 + <label class="col-sm-1 control-label">起讫站：</label>
  168 + <div class="col-sm-2">
  169 + <input name="startEnd" th:field="*{startEnd}" class="form-control" type="text">
181 170 </div>
182 171 </div>
  172 +
183 173 <div class="form-group">
184   - <label class="col-sm-3 control-label">授权年限：</label>
185   - <div class="col-sm-8">
186   - <input name="warrantYear" th:field="*{warrantYear}"
187   - class="form-control" type="text">
  174 + <label class="col-sm-1 control-label">站点名称：</label>
  175 + <div class="col-sm-2">
  176 + <textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea>
  177 + </div>
  178 + <!---------------------------------->
  179 + <label class="col-sm-1 control-label">线路走向：</label>
  180 + <div class="col-sm-2">
  181 + <textarea name="directions" class="form-control">[[*{directions}]]</textarea>
  182 + </div>
  183 + <!---------------------------------->
  184 + <label class="col-sm-1 control-label">首战时间：</label>
  185 + <div class="col-sm-2">
  186 + <input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
  187 + </div>
  188 + <!---------------------------------->
  189 + <label class="col-sm-1 control-label">末站首战时间：</label>
  190 + <div class="col-sm-2">
  191 + <input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
188 192 </div>
189 193 </div>
  194 +
190 195 <div class="form-group">
191   - <label class="col-sm-3 control-label">授权起始日期：</label>
192   - <div class="col-sm-8">
  196 + <label class="col-sm-1 control-label">停车场：</label>
  197 + <div class="col-sm-2">
  198 + <input name="park" th:field="*{park}" class="form-control" type="text">
  199 + </div>
  200 + <!---------------------------------->
  201 + <label class="col-sm-1 control-label">授权年限：</label>
  202 + <div class="col-sm-2">
  203 + <input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
  204 + </div>
  205 + <!---------------------------------->
  206 + <label class="col-sm-1 control-label">授权起始日期：</label>
  207 + <div class="col-sm-2">
193 208 <div class="input-group date">
194   - <input name="warrantStartTime"
195   - th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}"
196   - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  209 + <input name="warrantStartTime" th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}"
  210 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
197 211 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
198 212 </div>
199 213 </div>
200   - </div>
201   - <div class="form-group">
202   - <label class="col-sm-3 control-label">授权结束日期：</label>
203   - <div class="col-sm-8">
  214 + <!---------------------------------->
  215 + <label class="col-sm-1 control-label">授权结束日期：</label>
  216 + <div class="col-sm-2">
204 217 <div class="input-group date">
205   - <input name="warrantEndTime"
206   - th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}"
207   - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  218 + <input name="warrantEndTime" th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}"
  219 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
208 220 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
209 221 </div>
210 222 </div>
211 223 </div>
  224 +
212 225 <div class="form-group">
213   - <label class="col-sm-3 control-label">撤销日期：</label>
214   - <div class="col-sm-8">
  226 + <label class="col-sm-1 control-label">撤销日期：</label>
  227 + <div class="col-sm-2">
215 228 <div class="input-group date">
216   - <input name="planCancelTime"
217   - th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
218   - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  229 + <input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
  230 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
219 231 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
220 232 </div>
221 233 </div>
222   - </div>
223   - <div class="form-group">
224   - <label class="col-sm-3 control-label">实际撤销日期：</label>
225   - <div class="col-sm-8">
  234 + <!---------------------------------->
  235 + <label class="col-sm-1 control-label">实际撤销日期：</label>
  236 + <div class="col-sm-2">
226 237 <div class="input-group date">
227   - <input name="cancelTime"
228   - th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
229   - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  238 + <input name="cancelTime" th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
  239 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
230 240 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
231 241 </div>
232 242 </div>
233   - </div>
234   - <div class="form-group">
235   - <label class="col-sm-3 control-label">撤销原因：</label>
236   - <div class="col-sm-8">
  243 + <!---------------------------------->
  244 + <label class="col-sm-1 control-label">撤销原因：</label>
  245 + <div class="col-sm-2">
237 246 <textarea name="cancelReason" class="form-control">[[*{cancelReason}]]</textarea>
238 247 </div>
239   - </div>
240   - <div class="form-group">
241   - <label class="col-sm-3 control-label">备注：</label>
242   - <div class="col-sm-8">
243   - <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
244   - </div>
245   - </div>
246   - <div class="form-group">
247   - <label class="col-sm-3 control-label">是否逻辑删除：</label>
248   - <div class="col-sm-8">
249   -
250   - <select name="isLogicDelete"
251   - th:with="type=${@dict.getType('trueFalse')}"
252   - class="form-control m-b">
253   - <option value=""></option>
254   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
255   - th:value="${dict.dictValue}"
256   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.isLogicDelete == null ? '' : bsthTLine.isLogicDelete),#strings.toString(dict.dictValue))}"></option>
257   - </select>
258   - </div>
259   - </div>
260   - <div class="form-group">
261   - <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
262   - <div class="col-sm-8">
  248 + <!---------------------------------->
  249 + <label class="col-sm-1 control-label">行车作业计划表报备时间：</label>
  250 + <div class="col-sm-2">
263 251 <div class="input-group date">
264 252 <input name="timeSchedule"
265   - th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
266   - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
267   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
  253 + th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
  254 + class="form-control" placeholder="yyyy-MM-dd" type="text"
  255 + autocomplete="off"> <span class="input-group-addon"><i
  256 + class="fa fa-calendar"></i></span>
268 257 </div>
269 258 </div>
270 259 </div>
  260 +
271 261 <div class="form-group">
272   - <label class="col-sm-3 control-label">停车场：</label>
273   - <div class="col-sm-8">
274   - <input name="park" th:field="*{park}" class="form-control"
275   - type="text">
276   - </div>
277   - </div>
278   - <div class="form-group">
279   - <label class="col-sm-3 control-label">是否权证：</label>
280   - <div class="col-sm-8">
281   - <select name="isWarrant"
282   - th:with="type=${@dict.getType('trueFalse')}"
283   - class="form-control m-b">
284   - <option value=""></option>
285   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
286   - th:value="${dict.dictValue}"
287   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
  262 + <label class="col-sm-1 control-label">是否权证：</label>
  263 + <div class="col-sm-2">
  264 + <select name="isWarrant" id="isWarrant" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
  265 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  266 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
288 267 </select>
289 268 </div>
290   - </div>
291   - <div class="form-group">
292   - <label class="col-sm-3 control-label">道路类型：</label>
293   - <div class="col-sm-8">
294   - <div class="col-sm-8" th:with="type=${@dict.getType('roadType')}" name="roadType">
295   - <label class="checkbox-inline" th:each="dict : ${type}"
296   - style="display: block"> <input type="checkbox"
297   - name="roadType"
298   - th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.roadType == null ? '' : bsthTLine.roadType ,','),#strings.toString(dict.dictValue))}"
299   - th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
  269 + <!---------------------------------->
  270 + <label class="col-sm-1 control-label">权证开通日期：</label>
  271 + <div class="col-sm-2">
  272 + <div class="input-group date">
  273 + <input name="isWarrantStartTime" id="isWarrantStartTime"
  274 + th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
  275 + class="form-control" placeholder="yyyy-MM-dd" type="text"
  276 + autocomplete="off"> <span class="input-group-addon"><i
  277 + class="fa fa-calendar"></i></span>
300 278 </div>
301 279 </div>
302   - </div>
303   - <div class="form-group">
304   - <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
305   - <div class="col-sm-8">
306   - <input name="ticketPrice" th:field="*{ticketPrice}"
307   - class="form-control" type="text">
308   - </div>
309   - </div>
310   - <div class="form-group">
311   - <label class="col-sm-3 control-label">首站：</label>
312   - <div class="col-sm-8">
313   - <input name="firstStation" th:field="*{firstStation}"
314   - class="form-control" type="text">
315   - </div>
316   - </div>
317   - <div class="form-group">
318   - <label class="col-sm-3 control-label">起讫站：</label>
319   - <div class="col-sm-8">
320   - <input name="startEnd" th:field="*{startEnd}" class="form-control"
321   - type="text">
322   - </div>
323   - </div>
324   - <div class="form-group">
325   - <label class="col-sm-3 control-label">首战时间：</label>
326   - <div class="col-sm-8">
327   - <input name="firstTime" th:field="*{firstTime}"
328   - class="form-control" type="text">
329   - </div>
330   - </div>
331   - <div class="form-group">
332   - <label class="col-sm-3 control-label">末站：</label>
333   - <div class="col-sm-8">
334   - <input name="lastStation" th:field="*{lastStation}"
335   - class="form-control" type="text">
336   - </div>
337   - </div>
338   - <div class="form-group">
339   - <label class="col-sm-3 control-label">末站首战时间：</label>
340   - <div class="col-sm-8">
341   - <input name="lastTime" th:field="*{lastTime}" class="form-control"
342   - type="text">
343   - </div>
344   - </div>
345   - <div class="form-group">
346   - <label class="col-sm-3 control-label">上行里程数：</label>
347   - <div class="col-sm-8">
348   - <input name="mileageUp" th:field="*{mileageUp}"
349   - class="form-control" type="text">
  280 + <!---------------------------------->
  281 + <label class="col-sm-1 control-label">权证到期日期：</label>
  282 + <div class="col-sm-2">
  283 + <div class="input-group date">
  284 + <input name="isWarrantEndTime" id="isWarrantEndTime"
  285 + th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
  286 + class="form-control" placeholder="yyyy-MM-dd" type="text"
  287 + autocomplete="off"> <span class="input-group-addon"><i
  288 + class="fa fa-calendar"></i></span>
  289 + </div>
350 290 </div>
351   - </div>
352   - <div class="form-group">
353   - <label class="col-sm-3 control-label">下行里程数：</label>
354   - <div class="col-sm-8">
355   - <input name="mileageDown" th:field="*{mileageDown}"
356   - class="form-control" type="text">
  291 + <!---------------------------------->
  292 + <label class="col-sm-1 control-label">经营权证（大巴）：</label>
  293 + <div class="col-sm-2">
  294 + <input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text">
357 295 </div>
358 296 </div>
  297 +
359 298 <div class="form-group">
360   - <label class="col-sm-3 control-label">平均里程数：</label>
361   - <div class="col-sm-8">
362   - <input name="averageMileage" th:field="*{averageMileage}"
363   - class="form-control" type="text">
  299 + <label class="col-sm-1 control-label">经营权证（中巴）：</label>
  300 + <div class="col-sm-2">
  301 + <input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control" type="text">
364 302 </div>
365   - </div>
366   - <div class="form-group">
367   - <label class="col-sm-3 control-label">站级数(上行)：</label>
368   - <div class="col-sm-8">
369   - <input name="stationUp" th:field="*{stationUp}"
370   - class="form-control" type="text">
  303 + <!---------------------------------->
  304 + <label class="col-sm-1 control-label">实际配车数：</label>
  305 + <div class="col-sm-2">
  306 + <input name="vehiclesNumber" th:field="*{vehiclesNumber}" class="form-control" type="text">
371 307 </div>
372   - </div>
373   - <div class="form-group">
374   - <label class="col-sm-3 control-label">站级数(下行)：</label>
375   - <div class="col-sm-8">
376   - <input name="stationDown" th:field="*{stationDown}"
377   - class="form-control" type="text">
  308 + <!---------------------------------->
  309 + <label class="col-sm-1 control-label">实际车辆数（大巴）：</label>
  310 + <div class="col-sm-2">
  311 + <input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" class="form-control" type="text">
378 312 </div>
379   - </div>
380   - <div class="form-group">
381   - <label class="col-sm-3 control-label">行驶时间(上行)：</label>
382   - <div class="col-sm-8">
383   - <input name="travelTimeUp" th:field="*{travelTimeUp}"
384   - class="form-control" type="text">
  313 + <!---------------------------------->
  314 + <label class="col-sm-1 control-label">实际车辆数（中巴）：</label>
  315 + <div class="col-sm-2">
  316 + <input name="numberVehiclesMiddle" th:field="*{numberVehiclesMiddle}" class="form-control" type="text">
385 317 </div>
386 318 </div>
  319 +
387 320 <div class="form-group">
388   - <label class="col-sm-3 control-label">行驶时间(下行)：</label>
389   - <div class="col-sm-8">
390   - <input name="travelTimeDown" th:field="*{travelTimeDown}"
391   - class="form-control" type="text">
  321 + <label class="col-sm-1 control-label">上行里程数：</label>
  322 + <div class="col-sm-2">
  323 + <input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text">
392 324 </div>
393   - </div>
394   - <div class="form-group">
395   - <label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
396   - <div class="col-sm-8">
397   - <input name="travelIntervalUp" th:field="*{travelIntervalUp}"
398   - class="form-control" type="text">
  325 + <!---------------------------------->
  326 + <label class="col-sm-1 control-label">下行里程数：</label>
  327 + <div class="col-sm-2">
  328 + <input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
399 329 </div>
400   - </div>
401   - <div class="form-group">
402   - <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
403   - <div class="col-sm-8">
404   - <input name="travelIntervalDown" th:field="*{travelIntervalDown}"
405   - class="form-control" type="text">
  330 + <!---------------------------------->
  331 + <label class="col-sm-1 control-label">平均里程数：</label>
  332 + <div class="col-sm-2">
  333 + <input name="averageMileage" th:field="*{averageMileage}" class="form-control" type="text">
406 334 </div>
407   - </div>
408   - <div class="form-group">
409   - <label class="col-sm-3 control-label">经营权证（大巴）：</label>
410   - <div class="col-sm-8">
411   - <input name="warrantVehiclesLarge"
412   - th:field="*{warrantVehiclesLarge}" class="form-control"
413   - type="text">
  335 + <!---------------------------------->
  336 + <label class="col-sm-1 control-label">站级数(上行)：</label>
  337 + <div class="col-sm-2">
  338 + <input name="stationUp" th:field="*{stationUp}" class="form-control" type="text">
414 339 </div>
415 340 </div>
  341 +
416 342 <div class="form-group">
417   - <label class="col-sm-3 control-label">经营权证（中巴）：</label>
418   - <div class="col-sm-8">
419   - <input name="warrantVehiclesMiddle"
420   - th:field="*{warrantVehiclesMiddle}" class="form-control"
421   - type="text">
  343 + <label class="col-sm-1 control-label">站级数(下行)：</label>
  344 + <div class="col-sm-2">
  345 + <input name="stationDown" th:field="*{stationDown}" class="form-control" type="text">
422 346 </div>
423   - </div>
424   - <div class="form-group">
425   - <label class="col-sm-3 control-label">实际配车数：</label>
426   - <div class="col-sm-8">
427   - <input name="vehiclesNumber" th:field="*{vehiclesNumber}"
428   - class="form-control" type="text">
  347 + <!---------------------------------->
  348 + <label class="col-sm-1 control-label">行驶时间(上行)：</label>
  349 + <div class="col-sm-2">
  350 + <input name="travelTimeUp" th:field="*{travelTimeUp}" class="form-control" type="text">
429 351 </div>
430   - </div>
431   - <div class="form-group">
432   - <label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
433   - <div class="col-sm-8">
434   - <input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}"
435   - class="form-control" type="text">
  352 + <!---------------------------------->
  353 + <label class="col-sm-1 control-label">行驶时间(下行)：</label>
  354 + <div class="col-sm-2">
  355 + <input name="travelTimeDown" th:field="*{travelTimeDown}" class="form-control" type="text">
436 356 </div>
437   - </div>
438   - <div class="form-group">
439   - <label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
440   - <div class="col-sm-8">
441   - <input name="numberVehiclesMiddle"
442   - th:field="*{numberVehiclesMiddle}" class="form-control"
443   - type="text">
  357 + <!---------------------------------->
  358 + <label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
  359 + <div class="col-sm-2">
  360 + <input name="travelIntervalUp" th:field="*{travelIntervalUp}" class="form-control" type="text">
444 361 </div>
445 362 </div>
  363 +
446 364 <div class="form-group">
447   - <label class="col-sm-3 control-label">车辆自编号：</label>
448   - <div class="col-sm-8">
449   - <input name="carPlate" th:field="*{carPlate}" class="form-control"
450   - type="text">
  365 + <label class="col-sm-1 control-label">行驶间隔(低谷)：</label>
  366 + <div class="col-sm-2">
  367 + <input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text">
451 368 </div>
452   - </div>
453   - <div class="form-group">
454   - <label class="col-sm-3 control-label">线路总配人数：</label>
455   - <div class="col-sm-8">
456   - <input name="numberPerson" th:field="*{numberPerson}"
457   - class="form-control" type="text">
  369 + <!---------------------------------->
  370 + <label class="col-sm-1 control-label">高峰系数：</label>
  371 + <div class="col-sm-2">
  372 + <input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" class="form-control" type="text">
458 373 </div>
459   - </div>
460   - <div class="form-group">
461   - <label class="col-sm-3 control-label">人数司机：</label>
462   - <div class="col-sm-8">
463   - <input name="numberPersonDriver" th:field="*{numberPersonDriver}"
464   - class="form-control" type="text">
  374 + <!---------------------------------->
  375 + <label class="col-sm-1 control-label">低谷系数：</label>
  376 + <div class="col-sm-2">
  377 + <input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" class="form-control" type="text">
465 378 </div>
466   - </div>
467   - <div class="form-group">
468   - <label class="col-sm-3 control-label">售票员数：</label>
469   - <div class="col-sm-8">
470   - <input name="numberPersonSales" th:field="*{numberPersonSales}"
471   - class="form-control" type="text">
  379 + <!---------------------------------->
  380 + <label class="col-sm-1 control-label">间隔等级：</label>
  381 + <div class="col-sm-2">
  382 + <input name="divideLevel" th:field="*{divideLevel}" class="form-control" type="text">
472 383 </div>
473 384 </div>
  385 +
474 386 <div class="form-group">
475   - <label class="col-sm-3 control-label">新能源车数：</label>
476   - <div class="col-sm-8">
477   - <input name="busEvNumber" th:field="*{busEvNumber}"
478   - class="form-control" type="text">
  387 + <label class="col-sm-1 control-label">车辆自编号：</label>
  388 + <div class="col-sm-2">
  389 + <input name="carPlate" th:field="*{carPlate}" class="form-control" type="text">
479 390 </div>
480   - </div>
481   - <div class="form-group">
482   - <label class="col-sm-3 control-label">线路走向：</label>
483   - <div class="col-sm-8">
484   - <textarea name="directions" class="form-control">[[*{directions}]]</textarea>
  391 + <!---------------------------------->
  392 + <label class="col-sm-1 control-label">线路总配人数：</label>
  393 + <div class="col-sm-2">
  394 + <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
485 395 </div>
486   - </div>
487   - <div class="form-group">
488   - <label class="col-sm-3 control-label">经营权证数：</label>
489   - <div class="col-sm-8">
490   - <input name="numberOfManage" th:field="*{numberOfManage}"
491   - class="form-control" type="text">
  396 + <!---------------------------------->
  397 + <label class="col-sm-1 control-label">人数司机：</label>
  398 + <div class="col-sm-2">
  399 + <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text">
492 400 </div>
493   - </div>
494   - <div class="form-group">
495   - <label class="col-sm-3 control-label">站点名称：</label>
496   - <div class="col-sm-8">
497   - <textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea>
  401 + <!---------------------------------->
  402 + <label class="col-sm-1 control-label">售票员数：</label>
  403 + <div class="col-sm-2">
  404 + <input name="numberPersonSales" th:field="*{numberPersonSales}" class="form-control" type="text">
498 405 </div>
499 406 </div>
  407 +
500 408 <div class="form-group">
501   - <label class="col-sm-3 control-label">高峰系数：</label>
502   - <div class="col-sm-8">
503   - <input name="fullCustomerPercent" th:field="*{fullCustomerPercent}"
504   - class="form-control" type="text">
  409 + <label class="col-sm-1 control-label">新能源车数：</label>
  410 + <div class="col-sm-2">
  411 + <input name="busEvNumber" th:field="*{busEvNumber}" class="form-control" type="text">
505 412 </div>
506   - </div>
507   - <div class="form-group">
508   - <label class="col-sm-3 control-label">低谷系数：</label>
509   - <div class="col-sm-8">
510   - <input name="lowCustomerPercent" id="lowCustomerPercent" th:field="*{lowCustomerPercent}"
511   - class="form-control" type="text">
  413 + <!---------------------------------->
  414 + <label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
  415 + <div class="col-sm-2">
  416 + <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
  417 + <option value=""></option>
  418 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  419 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro== null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
  420 + </select>
512 421 </div>
513   - </div>
514   - <div class="form-group">
515   - <label class="col-sm-3 control-label">间隔等级：</label>
516   - <div class="col-sm-8">
517   - <input name="divideLevel" th:field="*{divideLevel}"
518   - class="form-control" type="text">
  422 + <!---------------------------------->
  423 + <label class="col-sm-1 control-label">轨交时间：</label>
  424 + <div class="col-sm-2">
  425 + <div class="input-group date">
  426 + <input name="metroTime" class="form-control" placeholder="HH:mm:ss" th:value="*{metroTime}">
  427 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
  428 + </div>
519 429 </div>
520   - </div>
521   - <div class="form-group">
522   - <label class="col-sm-3 control-label">是否挂牌：</label>
523   - <div class="col-sm-8">
  430 + <!---------------------------------->
  431 + <label class="col-sm-1 control-label">是否挂牌：</label>
  432 + <div class="col-sm-2">
524 433 <select name="hasTimelists"
525   - th:with="type=${@dict.getType('trueFalse')}"
526   - class="form-control m-b">
  434 + th:with="type=${@dict.getType('trueFalse')}"
  435 + class="form-control m-b">
527 436 <option value=""></option>
528 437 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
529   - th:value="${dict.dictValue}"
530   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists == null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
  438 + th:value="${dict.dictValue}"
  439 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
531 440 </select>
532 441 </div>
533 442 </div>
534   - <div class="form-group">
535   - <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
536   - <div class="col-sm-8">
537 443  
538   - <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}"
539   - class="form-control m-b">
540   - <option value=""></option>
541   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
542   - th:value="${dict.dictValue}"
543   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro == null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
544   - </select>
545   - </div>
546   - </div>
547 444 <div class="form-group">
548   - <label class="col-sm-3 control-label">轨交时间：</label>
549   - <div class="col-sm-8">
550   - <div class="input-group date">
551   - <input name="metroTime" class="form-control"
552   - placeholder="HH:mm:ss" th:value="*{metroTime}"> <span
553   - class="input-group-addon"><i class="fa fa-calendar"></i></span>
554   - </div>
  445 + <label class="col-sm-1 control-label">经营权证数：</label>
  446 + <div class="col-sm-2">
  447 + <input name="numberOfManage" th:field="*{numberOfManage}" class="form-control" type="text">
555 448 </div>
556   - </div>
557   - <div class="form-group">
558   - <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
559   - <div class="col-sm-8">
560   - <input name="coldBonusType" th:field="*{coldBonusType}"
561   - class="form-control" type="text">
562   - </div>
563   - </div>
564   - <!--<div class="form-group">
565   - <label class="col-sm-3 control-label">月度营收：</label>
566   - <div class="col-sm-8">
567   - <input name="revenuesMonth" th:field="*{revenuesMonth}"
568   - class="form-control" type="text">
569   - </div>
570   - </div>
571   - <div class="form-group">
572   - <label class="col-sm-3 control-label">月度人次：</label>
573   - <div class="col-sm-8">
574   - <input name="personMonth" th:field="*{personMonth}"
575   - class="form-control" type="text">
576   - </div>
577   - </div>
578   - <div class="form-group">
579   - <label class="col-sm-3 control-label">月度里程：</label>
580   - <div class="col-sm-8">
581   - <input name="mileageMonth" th:field="*{mileageMonth}"
582   - class="form-control" type="text">
583   - </div>
584   - </div>
585   - <div class="form-group">
586   - <label class="col-sm-3 control-label">百公里人次：</label>
587   - <div class="col-sm-8">
588   - <input name="personMonthAvg" th:field="*{personMonthAvg}"
589   - class="form-control" type="text">
  449 + <!---------------------------------->
  450 + <label class="col-sm-1 control-label">营运状态：</label>
  451 + <div class="col-sm-2">
  452 + <select name="serviceState" th:with="type=${@dict.getType('serviceState')}" class="form-control m-b">
  453 + <option value=""></option>
  454 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  455 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
  456 + </select>
590 457 </div>
591   - </div>
592   - <div class="form-group">
593   - <label class="col-sm-3 control-label">营收：</label>
594   - <div class="col-sm-8">
595   - <input name="revenues" th:field="*{revenues}" class="form-control"
596   - type="text">
  458 + <!---------------------------------->
  459 + <label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
  460 + <div class="col-sm-2">
  461 + <input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text">
597 462 </div>
598   - </div>
599   - <div class="form-group">
600   - <label class="col-sm-3 control-label">人次：</label>
601   - <div class="col-sm-8">
602   - <input name="persons" th:field="*{persons}" class="form-control"
603   - type="text">
604   - </div>
605   - </div>
606   - <div class="form-group">
607   - <label class="col-sm-3 control-label">里程：</label>
608   - <div class="col-sm-8">
609   - <input name="mileages" th:field="*{mileages}" class="form-control"
610   - type="text">
  463 + <!---------------------------------->
  464 + <label class="col-sm-1 control-label">营收类型：</label>
  465 + <div class="col-sm-2">
  466 + <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
  467 + <option value=""></option>
  468 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  469 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>></option>></option>
  470 + </select>
611 471 </div>
612 472 </div>
613   - <div class="form-group">
614   - <label class="col-sm-3 control-label">百公里人次：</label>
615   - <div class="col-sm-8">
616   - <input name="personAvg" th:field="*{personAvg}"
617   - class="form-control" type="text">
618   - </div>
619   - </div>-->
620   -
621   -
622 473  
623 474 <div class="form-group">
624   - <label class="col-sm-3 control-label">性质：</label>
625   - <div class="col-sm-8">
  475 + <label class="col-sm-1 control-label">性质：</label>
  476 + <div class="col-sm-2">
626 477 <select name="lineUpdateType"
627 478 th:with="type=${@dict.getType('lineUpdateType')}"
628 479 class="form-control m-b">
629   - <option value=""></option>
630 480 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
631 481 th:value="${dict.dictValue}"
632 482 th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
633 483 </select>
634 484 </div>
635   - </div>
636   - <div class="form-group">
637   - <label class="col-sm-3 control-label">营收类型：</label>
638   - <div class="col-sm-8">
639   - <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
640   - <option value=""></option>
641   - <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
642   - th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>></option>></option>
643   - </select>
644   - </div>
645   - </div>
646   - <div class="form-group">
647   - <label class="col-sm-3 control-label" name="files">附件：</label>
648   - <div class="col-sm-8">
649   - <div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" disabled>
650   - <input name="files" type="hidden" th:value="${path}" >
651   - <a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
652   - </a>
653   - <button onclick="deleteFile(this);">删除</button>
654   - </div>
655   - <div class="file-loading" id="uploadDiv">
656   - <input id="fileinput" type="file" multiple>
657   - </div>
658   - </div>
659   - </div>
660   - <div class="form-group">
661   - <label class="col-sm-3 control-label">启用时间：</label>
662   - <div class="col-sm-8">
  485 + <!---------------------------------->
  486 + <label class="col-sm-1 control-label">启用时间：</label>
  487 + <div class="col-sm-2">
663 488 <div class="input-group date">
664   - <input name="startDate"
665   - th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
  489 + <input name="startDate" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
666 490 class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
667 491 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
668 492 </div>
669 493  
670 494 </div>
  495 + <!---------------------------------->
  496 + <label class="col-sm-1 control-label">备注：</label>
  497 + <div class="col-sm-2">
  498 + <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
  499 + </div>
671 500 </div>
  501 +
672 502 <div class="form-group">
673   - <label class="col-sm-3 control-label">启用原因：</label>
674   - <div class="col-sm-8">
675   - <textarea name="startReason" class="form-control">[[*{startReason}]]</textarea>
  503 + <div class="form-group">
  504 + <label class="col-sm-1 control-label" name="files">附件：</label>
  505 + <div class="col-sm-5">
  506 + <div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" >
  507 + <input name="files" type="hidden" th:value="${path}" >
  508 + <a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
  509 + </a>
  510 + <button onclick="deleteFile(this);">删除</button>
  511 + </div>
  512 + <div class="file-loading" id="uploadDiv">
  513 + <input id="fileinput" type="file" multiple >
  514 + </div>
  515 + </div>
676 516 </div>
677 517 </div>
678 518 </form>
... ... @@ -680,8 +520,12 @@
680 520 <th:block th:include="include :: footer" />
681 521 <th:block th:include="include :: datetimepicker-js" />
682 522 <th:block th:include="include :: bootstrap-fileinput-js" />
  523 + <th:block th:include="include :: bootstrap-select-js" />
683 524 <script th:inline="javascript">
684 525 var prefix = ctx + "system/lineHistory";
  526 + function deleteFile(obj){
  527 + $(obj).parent().remove();
  528 + }
685 529 var f=[[${flag}]];
686 530 $(function() {
687 531 /* $.get("/system/line/getUserLineInfo",function(data){
... ... @@ -740,9 +584,7 @@
740 584 });
741 585 })
742 586  
743   - function deleteFile(obj){
744   - $(obj).parent().remove();
745   - }
  587 +
746 588 $.post("/system/line/findByName",
747 589 {
748 590 name : $("#lineName").val()
... ... @@ -880,8 +722,16 @@
880 722 minView : "month",
881 723 autoclose : true
882 724 });
883   -
884   -
  725 + $("input[name='isWarrantStartTime']").datetimepicker({
  726 + format : "yyyy-mm-dd",
  727 + minView : "month",
  728 + autoclose : true
  729 + });
  730 + $("input[name='isWarrantEndTime']").datetimepicker({
  731 + format : "yyyy-mm-dd",
  732 + minView : "month",
  733 + autoclose : true
  734 + });
885 735 </script>
886 736 </body>
887 737 </html>
888 738 \ No newline at end of file
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/line.html
  View file @8c34828
... ... @@ -482,7 +482,7 @@
482 482 }
483 483 }
484 484  
485   - layer.open({
  485 + var index=layer.open({
486 486 type: 2,
487 487 area: [width + 'px', height + 'px'],
488 488 fix: false,
... ... @@ -508,7 +508,7 @@
508 508 }
509 509 },
510 510 });
511   -
  511 + layer.full(index);
512 512 }
513 513  
514 514 </script>
... ...