youxiw2000 / bsthLineProfiles · Commits

Commit 7d71c02832b7f0efba2048fddefabe48b3d93816

Authored by yiming
1 parent 918012d2
build: skipped

bf

Inline Side-by-side
Showing 22 changed files with 2826 additions and 2469 deletions
bsthLineProfiles/pom.xml
  View file @7d71c02
@@ -300,7 +300,11 @@ @@ -300,7 +300,11 @@
300 <artifactId>httpclient</artifactId> 300 <artifactId>httpclient</artifactId>
301 <version>4.5.6</version> 301 <version>4.5.6</version>
302 </dependency> 302 </dependency>
303 - 303 + <dependency>
  304 + <groupId>junit</groupId>
  305 + <artifactId>junit</artifactId>
  306 + <version>4.12</version>
  307 + </dependency>
304 </dependencies> 308 </dependencies>
305 309
306 <build> 310 <build>
bsthLineProfiles/src/main/java/com/ruoyi/framework/web/service/CacheService.java
  View file @7d71c02
@@ -10,6 +10,7 @@ import com.ruoyi.common.utils.CacheUtils; @@ -10,6 +10,7 @@ import com.ruoyi.common.utils.CacheUtils;
10 * 缓存操作处理 10 * 缓存操作处理
11 * 11 *
12 * @author ruoyi 12 * @author ruoyi
  13 + *
13 */ 14 */
14 @Service 15 @Service
15 public class CacheService 16 public class CacheService
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
  View file @7d71c02
@@ -39,6 +39,7 @@ public class BsthTLineController extends BaseController @@ -39,6 +39,7 @@ public class BsthTLineController extends BaseController
39 { 39 {
40 private String prefix = "system/line"; 40 private String prefix = "system/line";
41 41
  42 +
42 @Autowired 43 @Autowired
43 private IBsthTLineService bsthTLineService; 44 private IBsthTLineService bsthTLineService;
44 45
@@ -48,22 +49,19 @@ public class BsthTLineController extends BaseController @@ -48,22 +49,19 @@ public class BsthTLineController extends BaseController
48 49
49 @Autowired 50 @Autowired
50 private IUserService userService; 51 private IUserService userService;
51 - 52 +
  53 + /**
  54 + * 线路查询
  55 + */
52 @RequiresPermissions("system:line:view") 56 @RequiresPermissions("system:line:view")
53 @GetMapping() 57 @GetMapping()
54 public String line() 58 public String line()
55 { 59 {
56 return prefix + "/line"; 60 return prefix + "/line";
57 } 61 }
58 -  
59 - @GetMapping("/map")  
60 - public String map()  
61 - {  
62 - return prefix + "/map";  
63 - }  
64 - 62 +
65 /** 63 /**
66 - * 查询【请填写功能名称】列表 64 + * 线路分页
67 */ 65 */
68 @RequiresPermissions("system:line:list") 66 @RequiresPermissions("system:line:list")
69 @PostMapping("/list") 67 @PostMapping("/list")
@@ -74,43 +72,44 @@ public class BsthTLineController extends BaseController @@ -74,43 +72,44 @@ public class BsthTLineController extends BaseController
74 List<BsthTLine> list = bsthTLineService.selectBsthTLineList(bsthTLine); 72 List<BsthTLine> list = bsthTLineService.selectBsthTLineList(bsthTLine);
75 return getDataTable(list); 73 return getDataTable(list);
76 } 74 }
77 -  
78 -  
79 - @GetMapping("/getListForMap")  
80 - @ResponseBody  
81 - public List<BsthTLine> getListForMap() {  
82 - return bsthTLineService.selectBsthTLineList(null);  
83 - }  
84 75
85 /** 76 /**
86 - * 导出【请填写功能名称】列表 77 + * 线路详情
87 */ 78 */
  79 + @GetMapping("/detail/{id}")
  80 + public String detail(@PathVariable("id") Long id, ModelMap mmap)
  81 + {
  82 + BsthTLine bsthTLine = bsthTLineService.selectBsthTLineById(id);
  83 + mmap.put("bsthTLine", bsthTLine);
  84 + return prefix + "/detail";
  85 + }
  86 +
88 @RequiresPermissions("system:line:export") 87 @RequiresPermissions("system:line:export")
89 - @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) 88 + @Log(title = "线路导出", businessType = BusinessType.EXPORT)
90 @PostMapping("/export") 89 @PostMapping("/export")
91 @ResponseBody 90 @ResponseBody
92 public AjaxResult export(BsthTLine bsthTLine) throws NoSuchFieldException { 91 public AjaxResult export(BsthTLine bsthTLine) throws NoSuchFieldException {
93 92
94 List<BsthTLine> list = bsthTLineService.selectBsthTLineList(bsthTLine); 93 List<BsthTLine> list = bsthTLineService.selectBsthTLineList(bsthTLine);
95 - 94 +
96 List<DictData> dicts = dictDataService.selectDictDataList(null); 95 List<DictData> dicts = dictDataService.selectDictDataList(null);
97 - 96 +
98 Map<String,List<DictData>> dictMap = new HashMap(); 97 Map<String,List<DictData>> dictMap = new HashMap();
99 98
100 List<String> titles=new ArrayList<>(); 99 List<String> titles=new ArrayList<>();
101 - 100 +
102 for(DictData d : dicts) { 101 for(DictData d : dicts) {
103 -  
104 - if(dictMap.get(d.getDictType()) == null) {  
105 - dictMap.put(d.getDictType(), new ArrayList<DictData>());  
106 - }  
107 -  
108 - dictMap.get(d.getDictType()).add(d); 102 +
  103 + if(dictMap.get(d.getDictType()) == null) {
  104 + dictMap.put(d.getDictType(), new ArrayList<DictData>());
  105 + }
  106 +
  107 + dictMap.get(d.getDictType()).add(d);
109 } 108 }
110 - 109 +
111 for(BsthTLine line:list) { 110 for(BsthTLine line:list) {
112 -  
113 - Field[] field = line.getClass().getDeclaredFields(); 111 +
  112 + Field[] field = line.getClass().getDeclaredFields();
114 113
115 String isWarrant=bsthTLine.getIsWarrant(); 114 String isWarrant=bsthTLine.getIsWarrant();
116 if("0".equals(isWarrant)){//现实 115 if("0".equals(isWarrant)){//现实
@@ -129,60 +128,60 @@ public class BsthTLineController extends BaseController @@ -129,60 +128,60 @@ public class BsthTLineController extends BaseController
129 } 128 }
130 } 129 }
131 130
132 -  
133 - for(int j=0 ; j<field.length ; j++){ //遍历所有属性 131 +
  132 + for(int j=0 ; j<field.length ; j++){ //遍历所有属性
134 String name = field[j].getName(); //获取属性的名字 133 String name = field[j].getName(); //获取属性的名字
135 - 134 +
136 String type = name; 135 String type = name;
137 - 136 +
138 if(name.equals( "isLogicDelete") || name.equals( "inoutDistrict")|| name.equals( "isMetro") || name.equals( "hasTimelists")|| name.equals( "isWarrant")) { 137 if(name.equals( "isLogicDelete") || name.equals( "inoutDistrict")|| name.equals( "isMetro") || name.equals( "hasTimelists")|| name.equals( "isWarrant")) {
139 - type = "trueFalse"; 138 + type = "trueFalse";
140 } 139 }
141 -  
142 140
143 -  
144 -  
145 - 141 +
  142 +
  143 +
  144 +
146 if(dictMap.get(type) != null) { 145 if(dictMap.get(type) != null) {
147 - name = name.substring(0,1).toUpperCase() + name.substring(1);  
148 -  
149 -  
150 - try {  
151 - Method param = line.getClass().getMethod("get"+name);  
152 -  
153 - String value = (String) param.invoke(line);  
154 -  
155 - if(value != null && value.split(",").length > 0) {  
156 - String result = "";  
157 - for(String str:value.split(",")) {  
158 - for(DictData d:dictMap.get(type)) {  
159 - if(d.getDictValue().equals(str)) {  
160 - result += d.getDictLabel() + ",";  
161 - }  
162 - }  
163 - }  
164 -  
165 - Method m = line.getClass().getMethod("set"+name, new Class[] {String.class});  
166 -  
167 - if(!result.isEmpty()) {  
168 - m.invoke(line,new Object[] {new String(result.substring(0,result.length()-1))});  
169 - }else {  
170 - m.invoke(line,new Object[] {new String(value)});  
171 - }  
172 - }  
173 -  
174 - } catch (Exception e) {  
175 - // TODO Auto-generated catch block  
176 - e.printStackTrace();  
177 - }  
178 - 146 + name = name.substring(0,1).toUpperCase() + name.substring(1);
  147 +
  148 +
  149 + try {
  150 + Method param = line.getClass().getMethod("get"+name);
  151 +
  152 + String value = (String) param.invoke(line);
  153 +
  154 + if(value != null && value.split(",").length > 0) {
  155 + String result = "";
  156 + for(String str:value.split(",")) {
  157 + for(DictData d:dictMap.get(type)) {
  158 + if(d.getDictValue().equals(str)) {
  159 + result += d.getDictLabel() + ",";
  160 + }
  161 + }
  162 + }
  163 +
  164 + Method m = line.getClass().getMethod("set"+name, new Class[] {String.class});
  165 +
  166 + if(!result.isEmpty()) {
  167 + m.invoke(line,new Object[] {new String(result.substring(0,result.length()-1))});
  168 + }else {
  169 + m.invoke(line,new Object[] {new String(value)});
  170 + }
  171 + }
  172 +
  173 + } catch (Exception e) {
  174 + // TODO Auto-generated catch block
  175 + e.printStackTrace();
  176 + }
  177 +
179 } 178 }
180 179
181 -  
182 -  
183 - }  
184 -  
185 - 180 +
  181 +
  182 + }
  183 +
  184 +
186 } 185 }
187 186
188 187
@@ -191,108 +190,161 @@ public class BsthTLineController extends BaseController @@ -191,108 +190,161 @@ public class BsthTLineController extends BaseController
191 return util.exportExcel(list, "line"); 190 return util.exportExcel(list, "line");
192 } 191 }
193 192
  193 +
194 /** 194 /**
195 - * 新增【请填写功能名称】 195 + * 动态列
196 */ 196 */
197 - @GetMapping("/add")  
198 - public String add() 197 + @GetMapping("/getUserLineInfo")
  198 + @ResponseBody
  199 + public AjaxResult getUserLineInfo()
199 { 200 {
200 - return prefix + "/add"; 201 + User loginUser = ShiroUtils.getSysUser();
  202 +
  203 + loginUser = userService.selectUserById(loginUser.getUserId());
  204 +
  205 + return success(loginUser.getLineinfoData());
201 } 206 }
202 207
203 /** 208 /**
204 - * 新增保存【请填写功能名称】 209 + * 修改动态列
205 */ 210 */
206 - @RequiresPermissions("system:line:add")  
207 - @Log(title = "新增线路基本信息", businessType = BusinessType.INSERT)  
208 - @PostMapping("/add") 211 + @PostMapping("/updateUserLineInfo")
209 @ResponseBody 212 @ResponseBody
210 - public AjaxResult addSave(BsthTLine bsthTLine) 213 + public AjaxResult updateUserLineInfo(String lineInfo)
211 { 214 {
212 - User loginUser = ShiroUtils.getSysUser();  
213 - bsthTLine.setCreateBy(loginUser.getUserName());  
214 - return toAjax(bsthTLineService.insertBsthTLine(bsthTLine)); 215 + User loginUser = ShiroUtils.getSysUser();
  216 +
  217 + loginUser.setLineinfoData(lineInfo);
  218 +
  219 + return toAjax(userService.updateUser(loginUser));
215 } 220 }
216 221
217 - @GetMapping("/edit/{id}")  
218 - public String edit(@PathVariable("id") Long id, ModelMap mmap) 222 + /**
  223 + * 文件上传
  224 + */
  225 + @PostMapping("/fileUpload")
  226 + @ResponseBody
  227 + public AjaxResult fileUpload(@RequestParam(value="file_data")File file ,String fileId)
219 { 228 {
220 - BsthTLine bsthTLine = bsthTLineService.selectBsthTLineById(id);  
221 - mmap.put("bsthTLine", bsthTLine);  
222 - return prefix + "/edit"; 229 + System.out.println(fileId);
  230 +
  231 + return null;
223 } 232 }
224 -  
225 - @GetMapping("/getUserLineInfo") 233 +
  234 + @PostMapping("/findByName")
226 @ResponseBody 235 @ResponseBody
227 - public AjaxResult getUserLineInfo() 236 + public List<BsthTLine> findByName(String name)
228 { 237 {
229 - User loginUser = ShiroUtils.getSysUser();  
230 -  
231 - loginUser = userService.selectUserById(loginUser.getUserId());  
232 -  
233 - return success(loginUser.getLineinfoData()); 238 + BsthTLine bsthTLine = new BsthTLine();
  239 +
  240 + bsthTLine.setLineName(name);
  241 + BsthTLine bsthTLineOld=bsthTLineService.selectBsthTLineList(bsthTLine).get(0);
  242 + BsthTLine bsthTLineNew=bsthTLineService.selectBsthTLineExamineByLineName(name);
  243 + List<BsthTLine> bsthTLines=new ArrayList<>();
  244 + bsthTLines.add(bsthTLineOld);
  245 + bsthTLines.add(bsthTLineNew);
  246 + return bsthTLines;
234 } 247 }
235 -  
236 -  
237 - @PostMapping("/fileUpload")  
238 - @ResponseBody  
239 - public AjaxResult fileUpload(@RequestParam(value="file_data")File file ,String fileId) 248 +
  249 + /**
  250 + * 地图
  251 + */
  252 + @GetMapping("/map")
  253 + public String map()
240 { 254 {
241 - System.out.println(fileId);  
242 -  
243 -  
244 - return null; 255 + return prefix + "/map";
245 } 256 }
246 -  
247 -  
248 - @PostMapping("/findByName") 257 +
  258 + @GetMapping("/getListForMap")
249 @ResponseBody 259 @ResponseBody
250 - public BsthTLine findByName(String name)  
251 - {  
252 - BsthTLine bsthTLine = new BsthTLine();  
253 -  
254 - bsthTLine.setLineName(name);  
255 -  
256 - return bsthTLineService.selectBsthTLineList(bsthTLine).get(0); 260 + public List<BsthTLine> getListForMap() {
  261 + return bsthTLineService.selectBsthTLineList(null);
257 } 262 }
  263 +
  264 +
  265 +
  266 + /*
258 267
259 - @PostMapping("/updateUserLineInfo") 268 +
  269 +
  270 + *//**
  271 + * 新增弹窗
  272 + *//*
  273 + @GetMapping("/add")
  274 + public String add()
  275 + {
  276 + return prefix + "/add";
  277 + }
  278 +
  279 +
  280 + *//**
  281 + * 线路新增
  282 + *//*
  283 + @RequiresPermissions("system:line:add")
  284 + @Log(title = "新增线路基本信息", businessType = BusinessType.INSERT)
  285 + @PostMapping("/add")
260 @ResponseBody 286 @ResponseBody
261 - public AjaxResult updateUserLineInfo(String lineInfo) 287 + public AjaxResult addSave(BsthTLine bsthTLine)
262 { 288 {
263 - User loginUser = ShiroUtils.getSysUser();  
264 -  
265 - loginUser.setLineinfoData(lineInfo);  
266 -  
267 - return toAjax(userService.updateUser(loginUser)); 289 + User loginUser = ShiroUtils.getSysUser();
  290 + bsthTLine.setCreateBy(loginUser.getUserName());
  291 + return toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
268 } 292 }
269 293
270 - /** 294 + *//**
  295 + * 线路修改预加载
  296 + *//*
  297 + @GetMapping("/edit/{id}")
  298 + public String edit(@PathVariable("id") Long id, ModelMap mmap)
  299 + {
  300 + BsthTLine bsthTLine = bsthTLineService.selectBsthTLineExamineById(id);
  301 + mmap.put("bsthTLine", bsthTLine);
  302 + return prefix + "/edit";
  303 + }
  304 +
  305 +
  306 +
  307 + *//**
271 * 修改保存【请填写功能名称】 308 * 修改保存【请填写功能名称】
272 - */ 309 + *//*
273 @RequiresPermissions("system:line:edit") 310 @RequiresPermissions("system:line:edit")
274 @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) 311 @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
275 @PostMapping("/edit") 312 @PostMapping("/edit")
276 @ResponseBody 313 @ResponseBody
277 public AjaxResult editSave(BsthTLine bsthTLine) 314 public AjaxResult editSave(BsthTLine bsthTLine)
278 { 315 {
279 -  
280 - User loginUser = ShiroUtils.getSysUser();  
281 -  
282 - bsthTLine.setUpdateBy(loginUser.getUserName());  
283 -  
284 - return toAjax(bsthTLineService.updateBsthTLine(bsthTLine)); 316 +
  317 + User loginUser = ShiroUtils.getSysUser();
  318 +
  319 + bsthTLine.setUpdateBy(loginUser.getUserName());
  320 +
  321 + return toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine));
285 } 322 }
286 323
287 - /** 324 + *//**
288 * 删除【请填写功能名称】 325 * 删除【请填写功能名称】
289 - */ 326 + *//*
290 @RequiresPermissions("system:line:remove") 327 @RequiresPermissions("system:line:remove")
291 @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) 328 @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
292 @PostMapping( "/remove") 329 @PostMapping( "/remove")
293 @ResponseBody 330 @ResponseBody
294 public AjaxResult remove(String ids) 331 public AjaxResult remove(String ids)
295 { 332 {
296 - return toAjax(bsthTLineService.deleteBsthTLineByIds(ids)); 333 + return toAjax(bsthTLineService.deleteBsthTLineExamineById(ids));
297 } 334 }
  335 +
  336 +
  337 + *//**
  338 + * 导出【请填写功能名称】列表
  339 + *//*
  340 +
  341 +
  342 +
  343 + */
  344 +
  345 +
  346 +
  347 +
  348 +
  349 +
298 } 350 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.java
  View file @7d71c02
@@ -59,7 +59,60 @@ public class BsthTLineHistoryController extends BaseController @@ -59,7 +59,60 @@ public class BsthTLineHistoryController extends BaseController
59 { 59 {
60 return prefix + "/line"; 60 return prefix + "/line";
61 } 61 }
62 - 62 +
  63 +
  64 + /**
  65 + * 变更分页
  66 + */
  67 + @RequiresPermissions("system:lineHistory:list")
  68 + @PostMapping("/list")
  69 + @ResponseBody
  70 + public TableDataInfo list(BsthTLine bsthTLine)
  71 + {
  72 + startPage();
  73 + List<BsthTLine> list = bsthTLineService.selectBsthTLineList(bsthTLine);
  74 + return getDataTable(list);
  75 + }
  76 +
  77 + /**
  78 + * 变更预加载
  79 + */
  80 + @GetMapping("/edit/{id}")
  81 + public String edit(@PathVariable("id") Long id, ModelMap mmap)
  82 + {
  83 + BsthTLine bsthTLine = bsthTLineService.selectBsthTLineById(id);
  84 + String lineName=bsthTLine.getLineName();
  85 + BsthTLine bsthTLineExamine=bsthTLineService.selectBsthTLineExamineByLineName(lineName);
  86 + if(bsthTLineExamine!=null){
  87 + bsthTLine=bsthTLineExamine;
  88 + }
  89 + mmap.put("bsthTLine", bsthTLine);
  90 + return prefix + "/edit";
  91 + }
  92 +
  93 + /**
  94 + * 线路变更
  95 + */
  96 + @RequiresPermissions("system:lineHistory:edit")
  97 + @Log(title = "线路变更", businessType = BusinessType.UPDATE)
  98 + @PostMapping("/edit")
  99 + @ResponseBody
  100 + public AjaxResult editSave(BsthTLine bsthTLine)
  101 + {
  102 + User loginUser = ShiroUtils.getSysUser();
  103 + bsthTLine.setUpdateBy(loginUser.getUserName());
  104 + String lineName=bsthTLine.getLineName();
  105 + BsthTLine bsthTLineExamine=bsthTLineService.selectBsthTLineExamineByLineName(lineName);
  106 + if(bsthTLineExamine!=null){//有没审核的直接覆盖
  107 + bsthTLine.setId(bsthTLineExamine.getId());
  108 + return toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine));
  109 + }else {//没有新增
  110 + bsthTLine.setExamineType("1");
  111 + return toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
  112 + }
  113 + }
  114 +
  115 +
63 @RequiresPermissions("system:lineHistory:view") 116 @RequiresPermissions("system:lineHistory:view")
64 @GetMapping("/historyCompare") 117 @GetMapping("/historyCompare")
65 public String historyCompare() 118 public String historyCompare()
@@ -81,19 +134,8 @@ public class BsthTLineHistoryController extends BaseController @@ -81,19 +134,8 @@ public class BsthTLineHistoryController extends BaseController
81 return bsthTLineService.getListByName(name); 134 return bsthTLineService.getListByName(name);
82 } 135 }
83 136
84 - /**  
85 - * 查询【请填写功能名称】列表  
86 - */  
87 - @RequiresPermissions("system:lineHistory:list")  
88 - @PostMapping("/list")  
89 - @ResponseBody  
90 - public TableDataInfo list(BsthTLine bsthTLine)  
91 - {  
92 - startPage();  
93 - List<BsthTLine> list = bsthTLineService.selectBsthTLineHistoryList(bsthTLine);  
94 - return getDataTable(list);  
95 - }  
96 - 137 +
  138 +
97 139
98 140
99 141
@@ -204,13 +246,7 @@ public class BsthTLineHistoryController extends BaseController @@ -204,13 +246,7 @@ public class BsthTLineHistoryController extends BaseController
204 return toAjax(bsthTLineService.insertBsthTLineHistory(bsthTLine)); 246 return toAjax(bsthTLineService.insertBsthTLineHistory(bsthTLine));
205 } 247 }
206 248
207 - @GetMapping("/edit/{id}")  
208 - public String edit(@PathVariable("id") Long id, ModelMap mmap)  
209 - {  
210 - BsthTLine bsthTLine = bsthTLineService.selectBsthTLineHistoryById(id);  
211 - mmap.put("bsthTLine", bsthTLine);  
212 - return prefix + "/edit";  
213 - } 249 +
214 250
215 @GetMapping("/detail/{id}") 251 @GetMapping("/detail/{id}")
216 public String detail(@PathVariable("id") Long id, ModelMap mmap) 252 public String detail(@PathVariable("id") Long id, ModelMap mmap)
@@ -227,23 +263,7 @@ public class BsthTLineHistoryController extends BaseController @@ -227,23 +263,7 @@ public class BsthTLineHistoryController extends BaseController
227 return toAjax(bsthTLineService.updateToLineInfo(rows)); 263 return toAjax(bsthTLineService.updateToLineInfo(rows));
228 } 264 }
229 265
230 - /**  
231 - * 修改保存【请填写功能名称】  
232 - */  
233 - @RequiresPermissions("system:lineHistory:edit")  
234 - @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)  
235 - @PostMapping("/edit")  
236 - @ResponseBody  
237 - public AjaxResult editSave(BsthTLine bsthTLine)  
238 - {  
239 -  
240 266
241 - User loginUser = ShiroUtils.getSysUser();  
242 -  
243 - bsthTLine.setUpdateBy(loginUser.getUserName());  
244 -  
245 - return toAjax(bsthTLineService.updateBsthTLineHistory(bsthTLine));  
246 - }  
247 267
248 /** 268 /**
249 * 删除【请填写功能名称】 269 * 删除【请填写功能名称】
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineReportController.java
  View file @7d71c02
@@ -75,7 +75,7 @@ public class BsthTLineReportController extends BaseController @@ -75,7 +75,7 @@ public class BsthTLineReportController extends BaseController
75 public TableDataInfo list(BsthTLine bsthTLine) 75 public TableDataInfo list(BsthTLine bsthTLine)
76 { 76 {
77 startPage(); 77 startPage();
78 - List<BsthTLine> list = bsthTLineService.selectBsthTlineReportList(bsthTLine); 78 + List<BsthTLine> list = bsthTLineService.selectBsthTLineList(bsthTLine);
79 return getDataTable(list); 79 return getDataTable(list);
80 } 80 }
81 81
@@ -181,7 +181,7 @@ public class BsthTLineReportController extends BaseController @@ -181,7 +181,7 @@ public class BsthTLineReportController extends BaseController
181 @GetMapping("/edit/{id}") 181 @GetMapping("/edit/{id}")
182 public String edit(@PathVariable("id") Long id, ModelMap mmap) 182 public String edit(@PathVariable("id") Long id, ModelMap mmap)
183 { 183 {
184 - BsthTLine bsthTLine = bsthTLineService.selectBsthTlineReportById(id); 184 + BsthTLine bsthTLine = bsthTLineService.selectBsthTLineById(id);
185 mmap.put("bsthTLine", bsthTLine); 185 mmap.put("bsthTLine", bsthTLine);
186 return prefix + "/edit"; 186 return prefix + "/edit";
187 } 187 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
  View file @7d71c02
@@ -344,6 +344,16 @@ public class BsthTLine extends BaseEntity @@ -344,6 +344,16 @@ public class BsthTLine extends BaseEntity
344 344
345 private String files; 345 private String files;
346 346
  347 + private String examineStatus;
  348 +
  349 + private String examineType;
  350 +
  351 + private String revenueType;
  352 +
  353 + private String start_reason;
  354 +
  355 + private String line_update_type;
  356 +
347 public void setId(Long id) 357 public void setId(Long id)
348 { 358 {
349 this.id = id; 359 this.id = id;
@@ -1079,6 +1089,82 @@ public class BsthTLine extends BaseEntity @@ -1079,6 +1089,82 @@ public class BsthTLine extends BaseEntity
1079 this.isWarrantEndTime = isWarrantEndTime; 1089 this.isWarrantEndTime = isWarrantEndTime;
1080 } 1090 }
1081 1091
  1092 + public String getExamineStatus() {
  1093 + return examineStatus;
  1094 + }
  1095 +
  1096 + public void setExamineStatus(String examineStatus) {
  1097 + this.examineStatus = examineStatus;
  1098 + }
  1099 +
  1100 + public String getExamineType() {
  1101 + return examineType;
  1102 + }
  1103 +
  1104 + public void setExamineType(String examineType) {
  1105 + this.examineType = examineType;
  1106 + }
  1107 +
  1108 + public String getfCompany() {
  1109 + return fCompany;
  1110 + }
  1111 +
  1112 + public void setfCompany(String fCompany) {
  1113 + this.fCompany = fCompany;
  1114 + }
  1115 +
  1116 + public Long getpLineId() {
  1117 + return pLineId;
  1118 + }
  1119 +
  1120 + public void setpLineId(Long pLineId) {
  1121 + this.pLineId = pLineId;
  1122 + }
  1123 +
  1124 + @Override
  1125 + public String getUpdateBy() {
  1126 + return updateBy;
  1127 + }
  1128 +
  1129 + @Override
  1130 + public void setUpdateBy(String updateBy) {
  1131 + this.updateBy = updateBy;
  1132 + }
  1133 +
  1134 + @Override
  1135 + public Date getUpdateTime() {
  1136 + return updateTime;
  1137 + }
  1138 +
  1139 + @Override
  1140 + public void setUpdateTime(Date updateTime) {
  1141 + this.updateTime = updateTime;
  1142 + }
  1143 +
  1144 + public String getRevenueType() {
  1145 + return revenueType;
  1146 + }
  1147 +
  1148 + public void setRevenueType(String revenueType) {
  1149 + this.revenueType = revenueType;
  1150 + }
  1151 +
  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 +
1082 @Override 1168 @Override
1083 public String toString() { 1169 public String toString() {
1084 return "BsthTLine{" + 1170 return "BsthTLine{" +
@@ -1165,6 +1251,10 @@ public class BsthTLine extends BaseEntity @@ -1165,6 +1251,10 @@ public class BsthTLine extends BaseEntity
1165 ", updateStatus='" + updateStatus + '\'' + 1251 ", updateStatus='" + updateStatus + '\'' +
1166 ", nightParking='" + nightParking + '\'' + 1252 ", nightParking='" + nightParking + '\'' +
1167 ", files='" + files + '\'' + 1253 ", files='" + files + '\'' +
  1254 + ", examineStatus='" + examineStatus + '\'' +
  1255 + ", examineType='" + examineType + '\'' +
  1256 + ", revenueType='" + revenueType + '\'' +
  1257 + ", start_reason='" + start_reason + '\'' +
1168 '}'; 1258 '}';
1169 } 1259 }
1170 } 1260 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthTLineMapper.java
  View file @7d71c02
@@ -3,6 +3,7 @@ package com.ruoyi.project.system.line.mapper; @@ -3,6 +3,7 @@ package com.ruoyi.project.system.line.mapper;
3 import java.util.List; 3 import java.util.List;
4 import com.ruoyi.project.system.line.domain.BsthTLine; 4 import com.ruoyi.project.system.line.domain.BsthTLine;
5 import com.ruoyi.project.system.line.domain.LineEditReport; 5 import com.ruoyi.project.system.line.domain.LineEditReport;
  6 +import org.apache.ibatis.annotations.Mapper;
6 7
7 /** 8 /**
8 * 【请填写功能名称】Mapper接口 9 * 【请填写功能名称】Mapper接口
@@ -10,6 +11,7 @@ import com.ruoyi.project.system.line.domain.LineEditReport; @@ -10,6 +11,7 @@ import com.ruoyi.project.system.line.domain.LineEditReport;
10 * @author ruoyi 11 * @author ruoyi
11 * @date 2021-08-17 12 * @date 2021-08-17
12 */ 13 */
  14 +@Mapper
13 public interface BsthTLineMapper 15 public interface BsthTLineMapper
14 { 16 {
15 /** 17 /**
@@ -96,6 +98,19 @@ public interface BsthTLineMapper @@ -96,6 +98,19 @@ public interface BsthTLineMapper
96 public List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object); 98 public List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object);
97 99
98 public List<BsthTLine> getListByName(String name); 100 public List<BsthTLine> getListByName(String name);
99 -  
100 101
  102 +
  103 +
  104 +
  105 + List<BsthTLine> selectBsthTLineExamineList(BsthTLine bsthTLine);
  106 +
  107 + int insertBsthTLineExamine(BsthTLine bsthTLine);
  108 +
  109 + BsthTLine selectBsthTLineExamineById(Long id);
  110 +
  111 + int updateBsthTLineExamine(BsthTLine bsthTLine);
  112 +
  113 + int deleteBsthTLineExamineById(String[] ids);
  114 +
  115 + BsthTLine selectBsthTLineExamineByLineName(String lineName);
101 } 116 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
  View file @7d71c02
@@ -97,4 +97,25 @@ public interface IBsthTLineService @@ -97,4 +97,25 @@ public interface IBsthTLineService
97 public List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object); 97 public List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object);
98 98
99 public List<BsthTLine> getListByName(String object); 99 public List<BsthTLine> getListByName(String object);
  100 +
  101 +
  102 +
  103 +
  104 +
  105 +
  106 +
  107 + List<BsthTLine> selectBsthTLineExamineList(BsthTLine bsthTLine);
  108 +
  109 + int insertBsthTLineExamine(BsthTLine bsthTLine);
  110 +
  111 + BsthTLine selectBsthTLineExamineById(Long id);
  112 +
  113 + int updateBsthTLineExamine(BsthTLine bsthTLine);
  114 +
  115 +
  116 + int deleteBsthTLineExamineById(String ids);
  117 +
  118 + int examine(BsthTLine bsthTLine);
  119 +
  120 + BsthTLine selectBsthTLineExamineByLineName(String lineName);
100 } 121 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
  View file @7d71c02
@@ -330,4 +330,106 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -330,4 +330,106 @@ public class BsthTLineServiceImpl implements IBsthTLineService
330 330
331 331
332 332
  333 +
  334 +
  335 +
  336 +
  337 +
  338 +
  339 +
  340 +
  341 +
  342 +
  343 +
  344 +
  345 + @Override
  346 + public List<BsthTLine> selectBsthTLineExamineList(BsthTLine bsthTLine)
  347 + {
  348 + return bsthTLineMapper.selectBsthTLineExamineList(bsthTLine);
  349 + }
  350 +
  351 + @Override
  352 + public int insertBsthTLineExamine(BsthTLine bsthTLine)
  353 + {
  354 + return bsthTLineMapper.insertBsthTLineExamine(bsthTLine);
  355 + }
  356 +
  357 + @Override
  358 + public BsthTLine selectBsthTLineExamineById(Long id)
  359 + {
  360 + return bsthTLineMapper.selectBsthTLineExamineById(id);
  361 + }
  362 +
  363 +
  364 + @Override
  365 + public int updateBsthTLineExamine(BsthTLine bsthTLine)
  366 + {
  367 + if(bsthTLine.getId()!=null){
  368 + return bsthTLineMapper.updateBsthTLineExamine(bsthTLine);
  369 + }else {
  370 + return 0;
  371 + }
  372 + }
  373 +
  374 + @Override
  375 + public int deleteBsthTLineExamineById(String ids)
  376 + {
  377 + return bsthTLineMapper.deleteBsthTLineExamineById(Convert.toStrArray(ids));
  378 + }
  379 +
  380 + @Override
  381 + public int examine(BsthTLine bsthTLine)
  382 + {
  383 + BsthTLine bl;
  384 + int i;
  385 + if(bsthTLine.getId()!=null){
  386 + if("0".equals(bsthTLine.getExamineType())){//新增
  387 + if("2".equals(bsthTLine.getExamineStatus())){//通过
  388 + //存入主表
  389 + bl=bsthTLineMapper.selectBsthTLineExamineById(bsthTLine.getId());
  390 + i=bsthTLineMapper.insertBsthTLine(bl);
  391 + //删除审核表
  392 + bsthTLineMapper.deleteBsthTLineExamineById(new String[]{bsthTLine.getId().toString()});
  393 + }else{//未通过
  394 + //修改审核表状态
  395 + bl=new BsthTLine();
  396 + bl.setId(bsthTLine.getId());
  397 + bl.setExamineStatus(bsthTLine.getExamineStatus());
  398 + i=bsthTLineMapper.updateBsthTLineExamine(bl);
  399 + }
  400 + return i;
  401 + }else{//变更
  402 + if("2".equals(bsthTLine.getExamineStatus())){//通过
  403 + //在历史表记录原始数据
  404 + bsthTLine=bsthTLineMapper.selectBsthTLineExamineById(bsthTLine.getId());
  405 + String id=bsthTLine.getId().toString();
  406 + bl = bsthTLineMapper.selectBsthTLineByNames(new String[]{bsthTLine.getLineName()}).get(0);
  407 + bl.setCreateBy(bsthTLine.getUpdateBy());
  408 + bsthTLineMapper.saveEditHistory(bl);
  409 + if(bsthTLine.getStartDate() != null) {//设置了启用时间
  410 + bsthTLine.setUpdateStatus("1");
  411 + bsthTLine.setId(bl.getId());
  412 + i=bsthTLineMapper.updateBsthTLineHistory(bsthTLine);
  413 + }else {//立即启用
  414 + i=bsthTLineMapper.updateBsthTLine(bsthTLine);
  415 + }
  416 + //删除审核表
  417 + bsthTLineMapper.deleteBsthTLineExamineById(new String[]{id});
  418 + }else{//未通过
  419 + //修改审核表状态
  420 + bl=new BsthTLine();
  421 + bl.setId(bsthTLine.getId());
  422 + bl.setExamineStatus(bsthTLine.getExamineStatus());
  423 + i=bsthTLineMapper.updateBsthTLineExamine(bl);
  424 + }
  425 + }
  426 + return i;
  427 + }
  428 + return 0;
  429 + }
  430 +
  431 + @Override
  432 + public BsthTLine selectBsthTLineExamineByLineName(String lineName){
  433 + return bsthTLineMapper.selectBsthTLineExamineByLineName(lineName);
  434 + }
333 } 435 }
bsthLineProfiles/src/main/resources/application-druid.yml
  View file @7d71c02
@@ -6,9 +6,9 @@ spring: @@ -6,9 +6,9 @@ spring:
6 druid: 6 druid:
7 # 主库数据源 7 # 主库数据源
8 master: 8 master:
9 - url: jdbc:mysql://localhost:3306/mydata?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 9 + url: jdbc:mysql://localhost:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
10 username: root 10 username: root
11 - password: root 11 + password: 1995627a
12 #password: Aa123456 12 #password: Aa123456
13 # 从库数据源 13 # 从库数据源
14 slave: 14 slave:
bsthLineProfiles/src/main/resources/application.yml
  View file @7d71c02
@@ -74,13 +74,13 @@ spring: @@ -74,13 +74,13 @@ spring:
74 # redis 配置 74 # redis 配置
75 redis: 75 redis:
76 # 地址 76 # 地址
77 - host: 192.168.168.241 77 + host: 127.0.0.1
78 # 端口，默认为6379 78 # 端口，默认为6379
79 port: 6379 79 port: 6379
80 # 数据库索引 80 # 数据库索引
81 database: 0 81 database: 0
82 # 密码 82 # 密码
83 - password: test123 83 + #password: test123
84 # 连接超时时间 84 # 连接超时时间
85 timeout: 10s 85 timeout: 10s
86 lettuce: 86 lettuce:
@@ -128,7 +128,7 @@ shiro: @@ -128,7 +128,7 @@ shiro:
128 # 首页地址 128 # 首页地址
129 indexUrl: /index 129 indexUrl: /index
130 # 验证码开关 130 # 验证码开关
131 - captchaEnabled: true 131 + captchaEnabled: false
132 # 验证码类型 math 数组计算 char 字符 132 # 验证码类型 math 数组计算 char 字符
133 captchaType: math 133 captchaType: math
134 cookie: 134 cookie:
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @7d71c02
@@ -101,6 +101,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -101,6 +101,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
101 <result property="nightParking" column="night_parking" /> 101 <result property="nightParking" column="night_parking" />
102 <result property="updateStatus" column="update_status" /> 102 <result property="updateStatus" column="update_status" />
103 <result property="lineUpdateType" column="line_update_type" /> 103 <result property="lineUpdateType" column="line_update_type" />
  104 + <result property="examineStatus" column="examine_status" />
  105 + <result property="examineType" column="examine_type" />
104 </resultMap> 106 </resultMap>
105 107
106 <resultMap type="LineEditReport" id="LineEditReportResult"> 108 <resultMap type="LineEditReport" id="LineEditReportResult">
@@ -1587,4 +1589,416 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1587,4 +1589,416 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1587 </insert> 1589 </insert>
1588 1590
1589 1591
  1592 +
  1593 +
  1594 +
  1595 +
  1596 +
  1597 +
  1598 + <sql id="selectBsthTLineExamineVo">
  1599 + select id, event_id, line_id, line_name, company,
  1600 + f_company, p_line_id,
  1601 + service_type, line_level, line_type, district,
  1602 + inout_district,
  1603 + service_state, bus_type, air_conditioner_type,
  1604 + sell_ticket_type,
  1605 + service_time, line_distance, line_code, warrant_year,
  1606 + warrant_start_time, warrant_end_time, plan_cancel_time, cancel_time,
  1607 + cancel_reason, remark, is_logic_delete, create_time, update_by,
  1608 + update_time, create_by, time_schedule, park, is_warrant,isWarrant_start_time,isWarrant_end_time, road_type,
  1609 + ticket_price, first_station, start_end, first_time, last_station,
  1610 + last_time, mileage_up, mileage_down, average_mileage, station_up,
  1611 + station_down, travel_time_up, travel_time_down, travel_interval_up,
  1612 + travel_interval_down, warrant_vehicles_large, warrant_vehicles_middle,
  1613 + vehicles_number, number_vehicles_large, number_vehicles_middle,
  1614 + car_plate, number_person, number_person_driver, number_person_sales,
  1615 + bus_ev_number, directions, number_of_manage, halfway_station,
  1616 + full_customer_percent, low_customer_percent, divide_level,
  1617 + has_timelists, is_metro, metro_time, cold_bonus_type, revenues_month,
  1618 + person_month, mileage_month, person_month_avg, revenues, persons,
  1619 + mileages, person_avg, start_date,night_parking,files,examine_status,examine_type,start_reason,line_update_type from bsth_t_line_examine
  1620 + </sql>
  1621 +
  1622 + <select id="selectBsthTLineExamineList" parameterType="BsthTLine"
  1623 + resultMap="BsthTLineResult">
  1624 + <include refid="selectBsthTLineExamineVo" />
  1625 + <where>
  1626 + <if test="eventId != null "> and event_id = #{eventId}</if>
  1627 + <if test="lineId != null "> and line_id = #{lineId}</if>
  1628 + <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
  1629 + <if test="company != null and company != ''"> and company = #{company}</if>
  1630 + <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if>
  1631 + <if test="pLineId != null "> and p_line_id = #{pLineId}</if>
  1632 + <if test="serviceType != null and serviceType != ''"> and service_type = #{serviceType}</if>
  1633 + <if test="lineLevel != null and lineLevel != ''"> and line_level = #{lineLevel}</if>
  1634 + <if test="lineType != null and lineType != ''"> and line_type = #{lineType}</if>
  1635 + <if test="district != null and district != ''"> and district = #{district}</if>
  1636 + <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>
  1637 + <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>
  1638 + <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>
  1639 + <if
  1640 + test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>
  1641 + <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>
  1642 + <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>
  1643 + <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>
  1644 + <if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>
  1645 + <if test="warrantYear != null "> and warrant_year = #{warrantYear}</if>
  1646 + <if test="warrantStartTime != null "> and warrant_start_time = #{warrantStartTime}</if>
  1647 + <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>
  1648 + <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>
  1649 + <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
  1650 + <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
  1651 + <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
  1652 + <if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
  1653 + <if test="updateTime != null "> and update_time = #{updateTime}</if>
  1654 + <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
  1655 + <if test="park != null and park != ''"> and park = #{park}</if>
  1656 + <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>
  1657 + <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>
  1658 + <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>
  1659 + <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>
  1660 + <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>
  1661 + <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>
  1662 + <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>
  1663 + <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
  1664 + <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>
  1665 + <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>
  1666 + <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>
  1667 + <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>
  1668 + <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>
  1669 + <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
  1670 + <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>
  1671 + <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>
  1672 + <if
  1673 + test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>
  1674 + <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}
  1675 + </if>
  1676 + <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}
  1677 + </if>
  1678 + <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>
  1679 + <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>
  1680 + <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}
  1681 + </if>
  1682 + <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>
  1683 + <if test="numberPerson != null "> and number_person = #{numberPerson}</if>
  1684 + <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>
  1685 + <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>
  1686 + <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>
  1687 + <if test="directions != null and directions != ''"> and directions = #{directions}</if>
  1688 + <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>
  1689 + <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>
  1690 + <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>
  1691 + <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>
  1692 + <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>
  1693 + <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>
  1694 + <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>
  1695 + <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>
  1696 + <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>
  1697 + <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>
  1698 + <if test="personMonth != null "> and person_month = #{personMonth}</if>
  1699 + <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>
  1700 + <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>
  1701 + <if test="revenues != null "> and revenues = #{revenues}</if>
  1702 + <if test="persons != null "> and persons = #{persons}</if>
  1703 + <if test="mileages != null "> and mileages = #{mileages}</if>
  1704 + <if test="personAvg != null "> and person_avg = #{personAvg}</if>
  1705 + <if test="startDate != null "> and start_date = #{startDate}</if>
  1706 + <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
  1707 + <if test="examineStatus == 'true' "> and examine_status in(0,1)</if>
  1708 + <if test="examineStatus == 'false' "> and examine_status =2</if>
  1709 + <if test="examineType != null and examineType != ''"> and examine_type = #{examineType}</if>
  1710 + </where>
  1711 + </select>
  1712 +
  1713 +
  1714 + <insert id="insertBsthTLineExamine" parameterType="BsthTLine"
  1715 + useGeneratedKeys="true" keyProperty="id">
  1716 + insert into bsth_t_line_examine
  1717 + <trim prefix="(" suffix=")" suffixOverrides=",">
  1718 + <if test="eventId != null">event_id,</if>
  1719 + <if test="lineId != null">line_id,</if>
  1720 + <if test="lineName != null">line_name,</if>
  1721 + <if test="company != null">company,</if>
  1722 + <if test="fCompany != null">f_company,</if>
  1723 + <if test="pLineId != null">p_line_id,</if>
  1724 + <if test="serviceType != null">service_type,</if>
  1725 + <if test="lineLevel != null">line_level,</if>
  1726 + <if test="lineType != null">line_type,</if>
  1727 + <if test="district != null">district,</if>
  1728 + <if test="inoutDistrict != null">inout_district,</if>
  1729 + <if test="serviceState != null">service_state,</if>
  1730 + <if test="busType != null">bus_type,</if>
  1731 + <if test="airConditionerType != null">air_conditioner_type,</if>
  1732 + <if test="sellTicketType != null">sell_ticket_type,</if>
  1733 + <if test="serviceTime != null">service_time,</if>
  1734 + <if test="lineDistance != null">line_distance,</if>
  1735 + <if test="lineCode != null">line_code,</if>
  1736 + <if test="warrantYear != null">warrant_year,</if>
  1737 + <if test="warrantStartTime != null">warrant_start_time,</if>
  1738 + <if test="warrantEndTime != null">warrant_end_time,</if>
  1739 + <if test="planCancelTime != null">plan_cancel_time,</if>
  1740 + <if test="cancelTime != null">cancel_time,</if>
  1741 + <if test="cancelReason != null">cancel_reason,</if>
  1742 + <if test="remark != null">remark,</if>
  1743 + <if test="isLogicDelete != null">is_logic_delete,</if>
  1744 + <if test="createBy != null">create_by,</if>
  1745 + <if test="timeSchedule != null">time_schedule,</if>
  1746 + <if test="park != null">park,</if>
  1747 + <if test="isWarrant != null">is_warrant,</if>
  1748 + <if test="isWarrantStartTime != null">isWarrant_start_time,</if>
  1749 + <if test="isWarrantEndTime != null">isWarrant_end_time,</if>
  1750 + <if test="roadType != null">road_type,</if>
  1751 + <if test="ticketPrice != null">ticket_price,</if>
  1752 + <if test="firstStation != null">first_station,</if>
  1753 + <if test="startEnd != null">start_end,</if>
  1754 + <if test="firstTime != null">first_time,</if>
  1755 + <if test="lastStation != null">last_station,</if>
  1756 + <if test="lastTime != null">last_time,</if>
  1757 + <if test="mileageUp != null">mileage_up,</if>
  1758 + <if test="mileageDown != null">mileage_down,</if>
  1759 + <if test="averageMileage != null">average_mileage,</if>
  1760 + <if test="stationUp != null">station_up,</if>
  1761 + <if test="stationDown != null">station_down,</if>
  1762 + <if test="travelTimeUp != null">travel_time_up,</if>
  1763 + <if test="travelTimeDown != null">travel_time_down,</if>
  1764 + <if test="travelIntervalUp != null">travel_interval_up,</if>
  1765 + <if test="travelIntervalDown != null">travel_interval_down,</if>
  1766 + <if test="warrantVehiclesLarge != null">warrant_vehicles_large,</if>
  1767 + <if test="warrantVehiclesMiddle != null">warrant_vehicles_middle,</if>
  1768 + <if test="vehiclesNumber != null">vehicles_number,</if>
  1769 + <if test="numberVehiclesLarge != null">number_vehicles_large,</if>
  1770 + <if test="numberVehiclesMiddle != null">number_vehicles_middle,</if>
  1771 + <if test="carPlate != null">car_plate,</if>
  1772 + <if test="numberPerson != null">number_person,</if>
  1773 + <if test="numberPersonDriver != null">number_person_driver,</if>
  1774 + <if test="numberPersonSales != null">number_person_sales,</if>
  1775 + <if test="busEvNumber != null">bus_ev_number,</if>
  1776 + <if test="directions != null">directions,</if>
  1777 + <if test="numberOfManage != null">number_of_manage,</if>
  1778 + <if test="halfwayStation != null">halfway_station,</if>
  1779 + <if test="fullCustomerPercent != null">full_customer_percent,</if>
  1780 + <if test="lowCustomerPercent != null">low_customer_percent,</if>
  1781 + <if test="divideLevel != null">divide_level,</if>
  1782 + <if test="hasTimelists != null">has_timelists,</if>
  1783 + <if test="isMetro != null">is_metro,</if>
  1784 + <if test="metroTime != null">metro_time,</if>
  1785 + <if test="coldBonusType != null">cold_bonus_type,</if>
  1786 + <if test="revenuesMonth != null">revenues_month,</if>
  1787 + <if test="personMonth != null">person_month,</if>
  1788 + <if test="mileageMonth != null">mileage_month,</if>
  1789 + <if test="personMonthAvg != null">person_month_avg,</if>
  1790 + <if test="revenues != null">revenues,</if>
  1791 + <if test="persons != null">persons,</if>
  1792 + <if test="mileages != null">mileages,</if>
  1793 + <if test="personAvg != null">person_avg,</if>
  1794 + <if test="startDate != null">start_date,</if>
  1795 + <if test="nightParking != null">night_parking,</if>
  1796 + <if test="revenueType != null">revenue_type,</if>
  1797 + <if test="examineType != null">examine_type,</if>
  1798 + <if test="startReason != null">start_reason,</if>
  1799 + <if test="lineUpdateType != null">line_update_type,</if>
  1800 + create_time,
  1801 + </trim>
  1802 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  1803 + <if test="eventId != null">#{eventId},</if>
  1804 + <if test="lineId != null">#{lineId},</if>
  1805 + <if test="lineName != null">#{lineName},</if>
  1806 + <if test="company != null">#{company},</if>
  1807 + <if test="fCompany != null">#{fCompany},</if>
  1808 + <if test="pLineId != null">#{pLineId},</if>
  1809 + <if test="serviceType != null">#{serviceType},</if>
  1810 + <if test="lineLevel != null">#{lineLevel},</if>
  1811 + <if test="lineType != null">#{lineType},</if>
  1812 + <if test="district != null">#{district},</if>
  1813 + <if test="inoutDistrict != null">#{inoutDistrict},</if>
  1814 + <if test="serviceState != null">#{serviceState},</if>
  1815 + <if test="busType != null">#{busType},</if>
  1816 + <if test="airConditionerType != null">#{airConditionerType},</if>
  1817 + <if test="sellTicketType != null">#{sellTicketType},</if>
  1818 + <if test="serviceTime != null">#{serviceTime},</if>
  1819 + <if test="lineDistance != null">#{lineDistance},</if>
  1820 + <if test="lineCode != null">#{lineCode},</if>
  1821 + <if test="warrantYear != null">#{warrantYear},</if>
  1822 + <if test="warrantStartTime != null">#{warrantStartTime},</if>
  1823 + <if test="warrantEndTime != null">#{warrantEndTime},</if>
  1824 + <if test="planCancelTime != null">#{planCancelTime},</if>
  1825 + <if test="cancelTime != null">#{cancelTime},</if>
  1826 + <if test="cancelReason != null">#{cancelReason},</if>
  1827 + <if test="remark != null">#{remark},</if>
  1828 + <if test="isLogicDelete != null">#{isLogicDelete},</if>
  1829 + <if test="createBy != null">#{createBy},</if>
  1830 + <if test="timeSchedule != null">#{timeSchedule},</if>
  1831 + <if test="park != null">#{park},</if>
  1832 + <if test="isWarrant != null">#{isWarrant},</if>
  1833 + <if test="isWarrantStartTime != null">#{isWarrantStartTime},</if>
  1834 + <if test="isWarrantEndTime != null">#{isWarrantEndTime},</if>
  1835 + <if test="roadType != null">#{roadType},</if>
  1836 + <if test="ticketPrice != null">#{ticketPrice},</if>
  1837 + <if test="firstStation != null">#{firstStation},</if>
  1838 + <if test="startEnd != null">#{startEnd},</if>
  1839 + <if test="firstTime != null">#{firstTime},</if>
  1840 + <if test="lastStation != null">#{lastStation},</if>
  1841 + <if test="lastTime != null">#{lastTime},</if>
  1842 + <if test="mileageUp != null">#{mileageUp},</if>
  1843 + <if test="mileageDown != null">#{mileageDown},</if>
  1844 + <if test="averageMileage != null">#{averageMileage},</if>
  1845 + <if test="stationUp != null">#{stationUp},</if>
  1846 + <if test="stationDown != null">#{stationDown},</if>
  1847 + <if test="travelTimeUp != null">#{travelTimeUp},</if>
  1848 + <if test="travelTimeDown != null">#{travelTimeDown},</if>
  1849 + <if test="travelIntervalUp != null">#{travelIntervalUp},</if>
  1850 + <if test="travelIntervalDown != null">#{travelIntervalDown},</if>
  1851 + <if test="warrantVehiclesLarge != null">#{warrantVehiclesLarge},</if>
  1852 + <if test="warrantVehiclesMiddle != null">#{warrantVehiclesMiddle},</if>
  1853 + <if test="vehiclesNumber != null">#{vehiclesNumber},</if>
  1854 + <if test="numberVehiclesLarge != null">#{numberVehiclesLarge},</if>
  1855 + <if test="numberVehiclesMiddle != null">#{numberVehiclesMiddle},</if>
  1856 + <if test="carPlate != null">#{carPlate},</if>
  1857 + <if test="numberPerson != null">#{numberPerson},</if>
  1858 + <if test="numberPersonDriver != null">#{numberPersonDriver},</if>
  1859 + <if test="numberPersonSales != null">#{numberPersonSales},</if>
  1860 + <if test="busEvNumber != null">#{busEvNumber},</if>
  1861 + <if test="directions != null">#{directions},</if>
  1862 + <if test="numberOfManage != null">#{numberOfManage},</if>
  1863 + <if test="halfwayStation != null">#{halfwayStation},</if>
  1864 + <if test="fullCustomerPercent != null">#{fullCustomerPercent},</if>
  1865 + <if test="lowCustomerPercent != null">#{lowCustomerPercent},</if>
  1866 + <if test="divideLevel != null">#{divideLevel},</if>
  1867 + <if test="hasTimelists != null">#{hasTimelists},</if>
  1868 + <if test="isMetro != null">#{isMetro},</if>
  1869 + <if test="metroTime != null">#{metroTime},</if>
  1870 + <if test="coldBonusType != null">#{coldBonusType},</if>
  1871 + <if test="revenuesMonth != null">#{revenuesMonth},</if>
  1872 + <if test="personMonth != null">#{personMonth},</if>
  1873 + <if test="mileageMonth != null">#{mileageMonth},</if>
  1874 + <if test="personMonthAvg != null">#{personMonthAvg},</if>
  1875 + <if test="revenues != null">#{revenues},</if>
  1876 + <if test="persons != null">#{persons},</if>
  1877 + <if test="mileages != null">#{mileages},</if>
  1878 + <if test="personAvg != null">#{personAvg},</if>
  1879 + <if test="startDate != null">#{startDate},</if>
  1880 + <if test="nightParking != null">#{nightParking},</if>
  1881 + <if test="revenueType != null">#{revenueType},</if>
  1882 + <if test="examineType != null">#{examineType},</if>
  1883 + <if test="startReason != null">#{startReason},</if>
  1884 + <if test="lineUpdateType != null">#{lineUpdateType},</if>
  1885 + sysdate(),
  1886 + </trim>
  1887 + </insert>
  1888 +
  1889 + <select id="selectBsthTLineExamineById" parameterType="Long"
  1890 + resultMap="BsthTLineResult">
  1891 + <include refid="selectBsthTLineExamineVo" />
  1892 + where id = #{id}
  1893 + </select>
  1894 +
  1895 +
  1896 + <update id="updateBsthTLineExamine" parameterType="BsthTLine">
  1897 + update bsth_t_line_examine
  1898 + <trim prefix="SET" suffixOverrides=",">
  1899 + <if test="eventId != null">event_id = #{eventId},</if>
  1900 + <if test="lineId != null">line_id = #{lineId},</if>
  1901 + <if test="lineName != null">line_name = #{lineName},</if>
  1902 + <if test="company != null">company = #{company},</if>
  1903 + <if test="fCompany != null">f_company = #{fCompany},</if>
  1904 + <if test="pLineId != null">p_line_id = #{pLineId},</if>
  1905 + <if test="serviceType != null">service_type = #{serviceType},</if>
  1906 + <if test="lineLevel != null">line_level = #{lineLevel},</if>
  1907 + <if test="lineType != null">line_type = #{lineType},</if>
  1908 + <if test="district != null">district = #{district},</if>
  1909 + <if test="inoutDistrict != null">inout_district = #{inoutDistrict},</if>
  1910 + <if test="serviceState != null">service_state = #{serviceState},</if>
  1911 + <if test="busType != null">bus_type = #{busType},</if>
  1912 + <if test="airConditionerType != null">air_conditioner_type = #{airConditionerType},</if>
  1913 + <if test="sellTicketType != null">sell_ticket_type = #{sellTicketType},</if>
  1914 + <if test="serviceTime != null">service_time = #{serviceTime},</if>
  1915 + <if test="lineDistance != null">line_distance = #{lineDistance},</if>
  1916 + <if test="lineCode != null">line_code = #{lineCode},</if>
  1917 + <if test="warrantYear != null">warrant_year = #{warrantYear},</if>
  1918 + <if test="warrantStartTime != null">warrant_start_time = #{warrantStartTime},</if>
  1919 + <if test="warrantEndTime != null">warrant_end_time = #{warrantEndTime},</if>
  1920 + <if test="planCancelTime != null">plan_cancel_time = #{planCancelTime},</if>
  1921 + <if test="cancelTime != null">cancel_time = #{cancelTime},</if>
  1922 + <if test="cancelReason != null">cancel_reason = #{cancelReason},</if>
  1923 + <if test="remark != null">remark = #{remark},</if>
  1924 + <if test="isLogicDelete != null">is_logic_delete = #{isLogicDelete},</if>
  1925 + <if test="updateBy != null">update_by = #{updateBy},</if>
  1926 + update_time = sysdate(),
  1927 + <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if>
  1928 + <if test="park != null">park = #{park},</if>
  1929 + <if test="isWarrant != null">is_warrant = #{isWarrant},</if>
  1930 + <if test="isWarrantStartTime != null">isWarrant_start_time = #{isWarrantStartTime},</if>
  1931 + <if test="isWarrantEndTime != null">isWarrant_end_time = #{isWarrantEndTime},</if>
  1932 + <if test="roadType != null">road_type = #{roadType},</if>
  1933 + <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
  1934 + <if test="firstStation != null">first_station = #{firstStation},</if>
  1935 + <if test="startEnd != null">start_end = #{startEnd},</if>
  1936 + <if test="firstTime != null">first_time = #{firstTime},</if>
  1937 + <if test="lastStation != null">last_station = #{lastStation},</if>
  1938 + <if test="lastTime != null">last_time = #{lastTime},</if>
  1939 + <if test="mileageUp != null">mileage_up = #{mileageUp},</if>
  1940 + <if test="mileageDown != null">mileage_down = #{mileageDown},</if>
  1941 + <if test="averageMileage != null">average_mileage = #{averageMileage},</if>
  1942 + <if test="stationUp != null">station_up = #{stationUp},</if>
  1943 + <if test="stationDown != null">station_down = #{stationDown},</if>
  1944 + <if test="travelTimeUp != null">travel_time_up = #{travelTimeUp},</if>
  1945 + <if test="travelTimeDown != null">travel_time_down = #{travelTimeDown},</if>
  1946 + <if test="travelIntervalUp != null">travel_interval_up = #{travelIntervalUp},</if>
  1947 + <if test="travelIntervalDown != null">travel_interval_down = #{travelIntervalDown},</if>
  1948 + <if test="warrantVehiclesLarge != null">warrant_vehicles_large = #{warrantVehiclesLarge},</if>
  1949 + <if test="warrantVehiclesMiddle != null">warrant_vehicles_middle = #{warrantVehiclesMiddle},</if>
  1950 + <if test="vehiclesNumber != null">vehicles_number = #{vehiclesNumber},</if>
  1951 + <if test="numberVehiclesLarge != null">number_vehicles_large = #{numberVehiclesLarge},</if>
  1952 + <if test="numberVehiclesMiddle != null">number_vehicles_middle = #{numberVehiclesMiddle},</if>
  1953 + <if test="carPlate != null">car_plate = #{carPlate},</if>
  1954 + <if test="numberPerson != null">number_person = #{numberPerson},</if>
  1955 + <if test="numberPersonDriver != null">number_person_driver = #{numberPersonDriver},</if>
  1956 + <if test="numberPersonSales != null">number_person_sales = #{numberPersonSales},</if>
  1957 + <if test="busEvNumber != null">bus_ev_number = #{busEvNumber},</if>
  1958 + <if test="directions != null">directions = #{directions},</if>
  1959 + <if test="numberOfManage != null">number_of_manage = #{numberOfManage},</if>
  1960 + <if test="halfwayStation != null">halfway_station = #{halfwayStation},</if>
  1961 + <if test="fullCustomerPercent != null">full_customer_percent = #{fullCustomerPercent},</if>
  1962 + <if test="lowCustomerPercent != null">low_customer_percent = #{lowCustomerPercent},</if>
  1963 + <if test="divideLevel != null">divide_level = #{divideLevel},</if>
  1964 + <if test="hasTimelists != null">has_timelists = #{hasTimelists},</if>
  1965 + <if test="isMetro != null">is_metro = #{isMetro},</if>
  1966 + <if test="metroTime != null">metro_time = #{metroTime},</if>
  1967 + <if test="coldBonusType != null">cold_bonus_type = #{coldBonusType},</if>
  1968 + <if test="revenuesMonth != null">revenues_month = #{revenuesMonth},</if>
  1969 + <if test="personMonth != null">person_month = #{personMonth},</if>
  1970 + <if test="mileageMonth != null">mileage_month = #{mileageMonth},</if>
  1971 + <if test="personMonthAvg != null">person_month_avg = #{personMonthAvg},</if>
  1972 + <if test="revenues != null">revenues = #{revenues},</if>
  1973 + <if test="persons != null">persons = #{persons},</if>
  1974 + <if test="mileages != null">mileages = #{mileages},</if>
  1975 + <if test="personAvg != null">person_avg = #{personAvg},</if>
  1976 + <if test="startDate != null">start_date = #{startDate},</if>
  1977 + <if test="nightParking != null">night_parking = #{nightParking},</if>
  1978 + <if test="files != null">files = #{files},</if>
  1979 + <if test="examineStatus != null">examine_status = #{examineStatus},</if>
  1980 + <if test="startReason != null">start_reason = #{startReason},</if>
  1981 + <if test="startDate != null">start_date = #{startDate},</if>
  1982 + <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
  1983 + <if test="startReason != null">start_reason = #{startReason},</if>
  1984 +
  1985 + </trim>
  1986 + where id = #{id}
  1987 + </update>
  1988 +
  1989 +
  1990 + <delete id="deleteBsthTLineExamineById" parameterType="String">
  1991 + delete from bsth_t_line_examine where id in
  1992 + <foreach item="id" collection="array" open="(" separator=","
  1993 + close=")">
  1994 + #{id}
  1995 + </foreach>
  1996 + </delete>
  1997 +
  1998 + <select id="selectBsthTLineExamineByLineName" parameterType="String"
  1999 + resultMap="BsthTLineResult">
  2000 + <include refid="selectBsthTLineExamineVo" />
  2001 + where line_name= #{lineName}
  2002 + </select>
  2003 +
1590 </mapper> 2004 </mapper>
1591 \ No newline at end of file 2005 \ No newline at end of file
bsthLineProfiles/src/main/resources/static/ruoyi/js/ry-ui.js
  View file @7d71c02
@@ -1109,6 +1109,7 @@ var table = { @@ -1109,6 +1109,7 @@ var table = {
1109 } 1109 }
1110 url = table.options.updateUrl.replace("{id}", id); 1110 url = table.options.updateUrl.replace("{id}", id);
1111 } 1111 }
  1112 + console.log(url)
1112 return url; 1113 return url;
1113 }, 1114 },
1114 // 保存信息 刷新表格 1115 // 保存信息 刷新表格
bsthLineProfiles/src/main/resources/templates/system/line/add.html deleted 100644 → 0
  View file @918012d
1 -<!DOCTYPE html>  
2 -<html lang="zh" xmlns:th="http://www.thymeleaf.org" >  
3 -<head>  
4 - <th:block th:include="include :: header('添加线路档案信息')" />  
5 - <th:block th:include="include :: datetimepicker-css" />  
6 -</head>  
7 -<body class="white-bg">  
8 - <div class="wrapper wrapper-content animated fadeInRight ibox-content">  
9 - <form class="form-horizontal m" id="form-line-add">  
10 - <div class="form-group">  
11 - <label class="col-sm-3 control-label">线路名称：</label>  
12 - <div class="col-sm-8">  
13 - <input name="lineName" class="form-control" type="text">  
14 - </div>  
15 - </div>  
16 - <div class="form-group">  
17 - <label class="col-sm-3 control-label">公司：</label>  
18 - <div class="col-sm-8">  
19 - <input name="company" class="form-control" type="text">  
20 - </div>  
21 - </div>  
22 - <div class="form-group">  
23 - <label class="col-sm-3 control-label">分公司：</label>  
24 - <div class="col-sm-8">  
25 - <input name="fCompany" class="form-control" type="text">  
26 - </div>  
27 - </div>  
28 - <div class="form-group">  
29 - <label class="col-sm-3 control-label">主线路id：</label>  
30 - <div class="col-sm-8">  
31 - <input name="pLineId" class="form-control" type="text">  
32 - </div>  
33 - </div>  
34 - <div class="form-group">  
35 - <label class="col-sm-3 control-label">营运方式：</label>  
36 - <div class="col-sm-8">  
37 - <select name="serviceType"  
38 - th:with="type=${@dict.getType('serviceType')}"  
39 - class="form-control m-b">  
40 - <option value=""></option>  
41 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
42 - th:value="${dict.dictValue}">  
43 -  
44 - </option>  
45 - </select>  
46 - </div>  
47 - </div>  
48 -  
49 - <div class="form-group">  
50 - <label class="col-sm-3 control-label">线路属性：</label>  
51 - <div class="col-sm-8">  
52 - <select name="lineLevel"  
53 - th:with="type=${@dict.getType('lineLevel')}"  
54 - class="form-control m-b">  
55 - <option value=""></option>  
56 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
57 - th:value="${dict.dictValue}">  
58 - </option>  
59 - </select>  
60 - </div>  
61 - </div>  
62 - <div class="form-group">  
63 - <label class="col-sm-3 control-label">线路类型：</label>  
64 - <div class="col-sm-8">  
65 - <select name="lineType" th:with="type=${@dict.getType('lineType')}"  
66 - class="form-control m-b">  
67 - <option value=""></option>  
68 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
69 - th:value="${dict.dictValue}">  
70 - </option>  
71 - </select>  
72 - </div>  
73 - </div>  
74 - <div class="form-group">  
75 - <label class="col-sm-3 control-label">区属：</label>  
76 - <div class="col-sm-8">  
77 - <select name="district" th:with="type=${@dict.getType('district')}"  
78 - class="form-control m-b">  
79 - <option value=""></option>  
80 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
81 - th:value="${dict.dictValue}">  
82 - </option>  
83 - </select>  
84 - </div>  
85 - </div>  
86 - <div class="form-group">  
87 - <label class="col-sm-3 control-label">是否区内：</label>  
88 - <div class="col-sm-8">  
89 - <select name="inoutDistrict"  
90 - th:with="type=${@dict.getType('trueFalse')}"  
91 - class="form-control m-b">  
92 - <option value=""></option>  
93 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
94 - th:value="${dict.dictValue}">  
95 -  
96 - </option>  
97 - </select>  
98 - </div>  
99 - </div>  
100 - <div class="form-group">  
101 - <label class="col-sm-3 control-label">营运状态：</label>  
102 - <div class="col-sm-8">  
103 - <select name="serviceState"  
104 - th:with="type=${@dict.getType('serviceState')}"  
105 - class="form-control m-b">  
106 - <option value=""></option>  
107 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
108 - th:value="${dict.dictValue}">  
109 - </option>  
110 - </select>  
111 - </div>  
112 - </div>  
113 - <div class="form-group">  
114 - <label class="col-sm-3 control-label">车辆类型 多选：</label>  
115 - <div class="col-sm-8" th:with="type=${@dict.getType('busType')}">  
116 - <label class="checkbox-inline" th:each="dict : ${type}"  
117 - style="display: block"> <input type="checkbox"  
118 - name="busType"  
119 - th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>  
120 - </div>  
121 - </div>  
122 - <div class="form-group">  
123 - <label class="col-sm-3 control-label">是否空调：</label>  
124 - <div class="col-sm-8">  
125 - <select name="airConditionerType"  
126 - th:with="type=${@dict.getType('airConditionerType')}"  
127 - class="form-control m-b">  
128 - <option value=""></option>  
129 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
130 - th:value="${dict.dictValue}">  
131 - </option>  
132 - </select>  
133 - </div>  
134 - </div>  
135 - <div class="form-group">  
136 - <label class="col-sm-3 control-label">售票类型：</label>  
137 - <div class="col-sm-8">  
138 - <select name="sellTicketType"  
139 - th:with="type=${@dict.getType('sellTicketType')}"  
140 - class="form-control m-b">  
141 - <option value=""></option>  
142 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
143 - th:value="${dict.dictValue}">  
144 - </option>  
145 - </select>  
146 - </div>  
147 - </div>  
148 - <div class="form-group">  
149 - <label class="col-sm-3 control-label">运营时间：</label>  
150 - <div class="col-sm-8">  
151 - <select name="serviceTime"  
152 - th:with="type=${@dict.getType('serviceTime')}"  
153 - class="form-control m-b">  
154 - <option value=""></option>  
155 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
156 - th:value="${dict.dictValue}">  
157 - </option>  
158 - </select>  
159 - </div>  
160 - </div>  
161 - <div class="form-group">  
162 - <label class="col-sm-3 control-label">线路长度：</label>  
163 - <div class="col-sm-8">  
164 - <input name="lineDistance" class="form-control" type="text">  
165 - </div>  
166 - </div>  
167 - <div class="form-group">  
168 - <label class="col-sm-3 control-label">线路编码：</label>  
169 - <div class="col-sm-8">  
170 - <input name="lineCode" class="form-control" type="text">  
171 - </div>  
172 - </div>  
173 - <div class="form-group">  
174 - <label class="col-sm-3 control-label">授权年限：</label>  
175 - <div class="col-sm-8">  
176 - <input name="warrantYear" class="form-control" type="text">  
177 - </div>  
178 - </div>  
179 - <div class="form-group">  
180 - <label class="col-sm-3 control-label">授权起始日期：</label>  
181 - <div class="col-sm-8">  
182 - <div class="input-group date">  
183 - <input name="warrantStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">  
184 - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>  
185 - </div>  
186 - </div>  
187 - </div>  
188 - <div class="form-group">  
189 - <label class="col-sm-3 control-label">授权结束日期：</label>  
190 - <div class="col-sm-8">  
191 - <div class="input-group date">  
192 - <input name="warrantEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">  
193 - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>  
194 - </div>  
195 - </div>  
196 - </div>  
197 - <div class="form-group">  
198 - <label class="col-sm-3 control-label">撤销日期：</label>  
199 - <div class="col-sm-8">  
200 - <div class="input-group date">  
201 - <input name="planCancelTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">  
202 - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>  
203 - </div>  
204 - </div>  
205 - </div>  
206 - <div class="form-group">  
207 - <label class="col-sm-3 control-label">实际撤销日期：</label>  
208 - <div class="col-sm-8">  
209 - <div class="input-group date">  
210 - <input name="cancelTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">  
211 - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>  
212 - </div>  
213 - </div>  
214 - </div>  
215 - <div class="form-group">  
216 - <label class="col-sm-3 control-label">撤销原因：</label>  
217 - <div class="col-sm-8">  
218 - <textarea name="cancelReason" class="form-control"></textarea>  
219 - </div>  
220 - </div>  
221 - <div class="form-group">  
222 - <label class="col-sm-3 control-label">备注：</label>  
223 - <div class="col-sm-8">  
224 - <textarea name="remark" class="form-control"></textarea>  
225 - </div>  
226 - </div>  
227 - <div class="form-group">  
228 - <label class="col-sm-3 control-label">是否逻辑删除：</label>  
229 - <div class="col-sm-8">  
230 - <select name="isLogicDelete"  
231 - th:with="type=${@dict.getType('trueFalse')}"  
232 - class="form-control m-b">  
233 - <option value=""></option>  
234 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
235 - th:value="${dict.dictValue}">  
236 - </option>  
237 - </select>  
238 - </div>  
239 - </div>  
240 - <div class="form-group">  
241 - <label class="col-sm-3 control-label">更新人：</label>  
242 - <div class="col-sm-8">  
243 - <input name="updateBy" class="form-control" type="text">  
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 - <div class="input-group date">  
250 - <input name="updateTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">  
251 - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>  
252 - </div>  
253 - </div>  
254 - </div>  
255 - <div class="form-group">  
256 - <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>  
257 - <div class="col-sm-8">  
258 - <div class="input-group date">  
259 - <input name="timeSchedule" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">  
260 - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>  
261 - </div>  
262 - </div>  
263 - </div>  
264 - <div class="form-group">  
265 - <label class="col-sm-3 control-label">停车场：</label>  
266 - <div class="col-sm-8">  
267 - <input name="park" class="form-control" type="text">  
268 - </div>  
269 - </div>  
270 - <div class="form-group">  
271 - <label class="col-sm-3 control-label">是否权证：</label>  
272 - <div class="col-sm-8">  
273 - <select name="isWarrant" id="isWarrant"  
274 - th:with="type=${@dict.getType('trueFalse')}"  
275 - class="form-control m-b">  
276 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
277 - th:value="${dict.dictValue}" th:selected="${dict.dictValue=='1'}">  
278 - </option>  
279 - </select>  
280 - </div>  
281 - </div>  
282 - <div class="form-group">  
283 - <label class="col-sm-3 control-label">权证开通日期：</label>  
284 - <div class="col-sm-8">  
285 - <div class="input-group date">  
286 - <input name="isWarrantStartTime" id="isWarrantStartTime"  
287 - class="form-control" placeholder="yyyy-MM-dd" type="text"  
288 - autocomplete="off"> <span class="input-group-addon"><i  
289 - class="fa fa-calendar"></i></span>  
290 - </div>  
291 -  
292 - </div>  
293 - </div>  
294 - <div class="form-group">  
295 - <label class="col-sm-3 control-label">权证到期日期：</label>  
296 - <div class="col-sm-8">  
297 - <div class="input-group date">  
298 - <input name="isWarrantEndTime" id="isWarrantEndTime"  
299 - class="form-control" placeholder="yyyy-MM-dd" type="text"  
300 - autocomplete="off"> <span class="input-group-addon"><i  
301 - class="fa fa-calendar"></i></span>  
302 - </div>  
303 -  
304 - </div>  
305 - </div>  
306 - <div class="form-group">  
307 - <label class="col-sm-3 control-label">道路类型：</label>  
308 - <div class="col-sm-8">  
309 - <div class="col-sm-8" th:with="type=${@dict.getType('roadType')}">  
310 - <label class="checkbox-inline" th:each="dict : ${type}"  
311 - style="display: block"> <input type="checkbox"  
312 - name="roadType"  
313 - th:text="${dict.dictLabel}" th:value="${dict.dictValue}" />  
314 - </label>  
315 - </div>  
316 - </div>  
317 - </div>  
318 - <div class="form-group">  
319 - <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>  
320 - <div class="col-sm-8">  
321 - <input name="ticketPrice" class="form-control" 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="firstStation" class="form-control" type="text">  
328 - </div>  
329 - </div>  
330 - <div class="form-group">  
331 - <label class="col-sm-3 control-label">起讫站：</label>  
332 - <div class="col-sm-8">  
333 - <input name="startEnd" class="form-control" type="text">  
334 - </div>  
335 - </div>  
336 - <div class="form-group">  
337 - <label class="col-sm-3 control-label">首战时间：</label>  
338 - <div class="col-sm-8">  
339 - <input name="firstTime" class="form-control" type="text">  
340 - </div>  
341 - </div>  
342 - <div class="form-group">  
343 - <label class="col-sm-3 control-label">末站：</label>  
344 - <div class="col-sm-8">  
345 - <input name="lastStation" class="form-control" type="text">  
346 - </div>  
347 - </div>  
348 - <div class="form-group">  
349 - <label class="col-sm-3 control-label">末站首战时间：</label>  
350 - <div class="col-sm-8">  
351 - <input name="lastTime" class="form-control" 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="mileageUp" class="form-control" type="text">  
358 - </div>  
359 - </div>  
360 - <div class="form-group">  
361 - <label class="col-sm-3 control-label">下行里程数：</label>  
362 - <div class="col-sm-8">  
363 - <input name="mileageDown" class="form-control" type="text">  
364 - </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="averageMileage" class="form-control" type="text">  
370 - </div>  
371 - </div>  
372 - <div class="form-group">  
373 - <label class="col-sm-3 control-label">站级数(上行)：</label>  
374 - <div class="col-sm-8">  
375 - <input name="stationUp" class="form-control" type="text">  
376 - </div>  
377 - </div>  
378 - <div class="form-group">  
379 - <label class="col-sm-3 control-label">站级数(下行)：</label>  
380 - <div class="col-sm-8">  
381 - <input name="stationDown" class="form-control" type="text">  
382 - </div>  
383 - </div>  
384 - <div class="form-group">  
385 - <label class="col-sm-3 control-label">行驶时间(上行)：</label>  
386 - <div class="col-sm-8">  
387 - <input name="travelTimeUp" class="form-control" type="text">  
388 - </div>  
389 - </div>  
390 - <div class="form-group">  
391 - <label class="col-sm-3 control-label">行驶时间(下行)：</label>  
392 - <div class="col-sm-8">  
393 - <input name="travelTimeDown" 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="travelIntervalUp" class="form-control" type="text">  
400 - </div>  
401 - </div>  
402 - <div class="form-group">  
403 - <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>  
404 - <div class="col-sm-8">  
405 - <input name="travelIntervalDown" class="form-control" type="text">  
406 - </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" class="form-control" type="text">  
412 - </div>  
413 - </div>  
414 - <div class="form-group">  
415 - <label class="col-sm-3 control-label">经营权证（中巴）：</label>  
416 - <div class="col-sm-8">  
417 - <input name="warrantVehiclesMiddle" class="form-control" type="text">  
418 - </div>  
419 - </div>  
420 - <div class="form-group">  
421 - <label class="col-sm-3 control-label">实际配车数：</label>  
422 - <div class="col-sm-8">  
423 - <input name="vehiclesNumber" class="form-control" type="text">  
424 - </div>  
425 - </div>  
426 - <div class="form-group">  
427 - <label class="col-sm-3 control-label">实际车辆数（大）：</label>  
428 - <div class="col-sm-8">  
429 - <input name="numberVehiclesLarge" class="form-control" type="text">  
430 - </div>  
431 - </div>  
432 - <div class="form-group">  
433 - <label class="col-sm-3 control-label">实际车辆数（中）：</label>  
434 - <div class="col-sm-8">  
435 - <input name="numberVehiclesMiddle" class="form-control" type="text">  
436 - </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="carPlate" class="form-control" type="text">  
442 - </div>  
443 - </div>  
444 - <div class="form-group">  
445 - <label class="col-sm-3 control-label">线路总配人数：</label>  
446 - <div class="col-sm-8">  
447 - <input name="numberPerson" class="form-control" type="text">  
448 - </div>  
449 - </div>  
450 - <div class="form-group">  
451 - <label class="col-sm-3 control-label">人数司机：</label>  
452 - <div class="col-sm-8">  
453 - <input name="numberPersonDriver" class="form-control" type="text">  
454 - </div>  
455 - </div>  
456 - <div class="form-group">  
457 - <label class="col-sm-3 control-label">售票员数：</label>  
458 - <div class="col-sm-8">  
459 - <input name="numberPersonSales" class="form-control" type="text">  
460 - </div>  
461 - </div>  
462 - <div class="form-group">  
463 - <label class="col-sm-3 control-label">新能源车数：</label>  
464 - <div class="col-sm-8">  
465 - <input name="busEvNumber" class="form-control" type="text">  
466 - </div>  
467 - </div>  
468 - <div class="form-group">  
469 - <label class="col-sm-3 control-label">线路走向：</label>  
470 - <div class="col-sm-8">  
471 - <textarea name="directions" class="form-control"></textarea>  
472 - </div>  
473 - </div>  
474 - <div class="form-group">  
475 - <label class="col-sm-3 control-label">经营权证数：</label>  
476 - <div class="col-sm-8">  
477 - <input name="numberOfManage" class="form-control" type="text">  
478 - </div>  
479 - </div>  
480 - <div class="form-group">  
481 - <label class="col-sm-3 control-label">站点名称：</label>  
482 - <div class="col-sm-8">  
483 - <textarea name="halfwayStation" class="form-control"></textarea>  
484 - </div>  
485 - </div>  
486 - <div class="form-group">  
487 - <label class="col-sm-3 control-label">高峰系数：</label>  
488 - <div class="col-sm-8">  
489 - <input name="fullCustomerPercent" class="form-control" type="text">  
490 - </div>  
491 - </div>  
492 - <div class="form-group">  
493 - <label class="col-sm-3 control-label">低谷系数：</label>  
494 - <div class="col-sm-8">  
495 - <input name="lowCustomerPercent" class="form-control" type="text">  
496 - </div>  
497 - </div>  
498 - <div class="form-group">  
499 - <label class="col-sm-3 control-label">间隔等级：</label>  
500 - <div class="col-sm-8">  
501 - <input name="divideLevel" class="form-control" type="text">  
502 - </div>  
503 - </div>  
504 - <div class="form-group">  
505 - <label class="col-sm-3 control-label">是否挂牌：</label>  
506 - <div class="col-sm-8">  
507 - <select name="hasTimelists"  
508 - th:with="type=${@dict.getType('trueFalse')}"  
509 - class="form-control m-b">  
510 - <option value=""></option>  
511 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
512 - th:value="${dict.dictValue}">  
513 - </option>  
514 - </select>  
515 - </div>  
516 - </div>  
517 - <div class="form-group">  
518 - <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>  
519 - <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}"  
520 - class="form-control m-b">  
521 - <option value=""></option>  
522 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
523 - th:value="${dict.dictValue}"></option>  
524 - </select>  
525 - </div>  
526 - <div class="form-group">  
527 - <label class="col-sm-3 control-label">轨交时间：</label>  
528 - <div class="col-sm-8">  
529 - <div class="input-group date">  
530 - <input name="metroTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">  
531 - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>  
532 - </div>  
533 - </div>  
534 - </div>  
535 - <div class="form-group">  
536 - <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>  
537 - <div class="col-sm-8">  
538 - <input name="coldBonusType" lass="form-control" type="text">  
539 - </div>  
540 - </div>  
541 - <div class="form-group">  
542 - <label class="col-sm-3 control-label">月度营收：</label>  
543 - <div class="col-sm-8">  
544 - <input name="revenuesMonth" class="form-control" type="text">  
545 - </div>  
546 - </div>  
547 - <div class="form-group">  
548 - <label class="col-sm-3 control-label">月度人次：</label>  
549 - <div class="col-sm-8">  
550 - <input name="personMonth" class="form-control" type="text">  
551 - </div>  
552 - </div>  
553 - <div class="form-group">  
554 - <label class="col-sm-3 control-label">月度里程：</label>  
555 - <div class="col-sm-8">  
556 - <input name="mileageMonth" class="form-control" type="text">  
557 - </div>  
558 - </div>  
559 - <div class="form-group">  
560 - <label class="col-sm-3 control-label">百公里人次：</label>  
561 - <div class="col-sm-8">  
562 - <input name="personMonthAvg" class="form-control" type="text">  
563 - </div>  
564 - </div>  
565 - <div class="form-group">  
566 - <label class="col-sm-3 control-label">营收：</label>  
567 - <div class="col-sm-8">  
568 - <input name="revenues" 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="persons" class="form-control" type="text">  
575 - </div>  
576 - </div>  
577 - <div class="form-group">  
578 - <label class="col-sm-3 control-label">里程：</label>  
579 - <div class="col-sm-8">  
580 - <input name="mileages" class="form-control" type="text">  
581 - </div>  
582 - </div>  
583 - <div class="form-group">  
584 - <label class="col-sm-3 control-label">百公里人次：</label>  
585 - <div class="col-sm-8">  
586 - <input name="personAvg" class="form-control" type="text">  
587 - </div>  
588 - </div>  
589 - <div class="form-group">  
590 - <label class="col-sm-3 control-label">开通日期：</label>  
591 - <div class="col-sm-8">  
592 - <div class="input-group date">  
593 - <input name="startDate" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">  
594 - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>  
595 - </div>  
596 - </div>  
597 - </div>  
598 - </form>  
599 - </div>  
600 - <th:block th:include="include :: footer" />  
601 - <th:block th:include="include :: datetimepicker-js" />  
602 - <script th:inline="javascript">  
603 - var prefix = ctx + "system/line"  
604 - $("#form-line-add").validate({  
605 - rules:{  
606 - isWarrantStartTime:{  
607 - required:function (){  
608 - return $('#isWarrant').val()==='1';  
609 - },  
610 - },  
611 - isWarrantEndTime:{  
612 - required:function (){  
613 - return $('#isWarrant').val()==='1';  
614 - },  
615 - },  
616 - },  
617 - messages: {  
618 - isWarrantStartTime: {  
619 - required: "请选择日期",  
620 - },  
621 - isWarrantEndTime: {  
622 - required: "请选择日期",  
623 - }  
624 - },focusCleanup: true  
625 - });  
626 -  
627 - function submitHandler() {  
628 - if ($.validate.form()) {  
629 - $.operate.save(prefix + "/add", $('#form-line-add').serialize());  
630 - }  
631 - }  
632 -  
633 - $("input[name='warrantStartTime']").datetimepicker({  
634 - format: "yyyy-mm-dd",  
635 - minView: "month",  
636 - autoclose: true  
637 - });  
638 -  
639 - $("input[name='warrantEndTime']").datetimepicker({  
640 - format: "yyyy-mm-dd",  
641 - minView: "month",  
642 - autoclose: true  
643 - });  
644 -  
645 - $("input[name='planCancelTime']").datetimepicker({  
646 - format: "yyyy-mm-dd",  
647 - minView: "month",  
648 - autoclose: true  
649 - });  
650 -  
651 - $("input[name='cancelTime']").datetimepicker({  
652 - format: "yyyy-mm-dd",  
653 - minView: "month",  
654 - autoclose: true  
655 - });  
656 -  
657 - $("input[name='updateTime']").datetimepicker({  
658 - format: "yyyy-mm-dd",  
659 - minView: "month",  
660 - autoclose: true  
661 - });  
662 -  
663 - $("input[name='timeSchedule']").datetimepicker({  
664 - format: "yyyy-mm-dd",  
665 - minView: "month",  
666 - autoclose: true  
667 - });  
668 -  
669 - $("input[name='metroTime']").datetimepicker({  
670 - format: "yyyy-mm-dd",  
671 - minView: "month",  
672 - autoclose: true  
673 - });  
674 -  
675 - $("input[name='startDate']").datetimepicker({  
676 - format: "yyyy-mm-dd",  
677 - minView: "month",  
678 - autoclose: true  
679 - });  
680 -  
681 - $("input[name='isWarrantStartTime']").datetimepicker({  
682 - format: "yyyy-mm-dd",  
683 - minView: "month",  
684 - autoclose: true  
685 - });  
686 - $("input[name='isWarrantEndTime']").datetimepicker({  
687 - format: "yyyy-mm-dd",  
688 - minView: "month",  
689 - autoclose: true  
690 - });  
691 -  
692 - </script>  
693 -</body>  
694 -</html>  
695 \ No newline at end of file 0 \ No newline at end of file
bsthLineProfiles/src/main/resources/templates/system/line/map.html deleted 100644 → 0
  View file @918012d
1 -<!DOCTYPE html>  
2 -<html lang="zh" xmlns:th="http://www.thymeleaf.org"  
3 - xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">  
4 -<head>  
5 -  
6 -<th:block th:include="include :: header('地图查询')" />  
7 -  
8 -<style>  
9 -body, html, #container {  
10 - overflow: hidden;  
11 - width: 100%;  
12 - height: 100%;  
13 - margin: 0;  
14 - font-family: "微软雅黑";  
15 -}  
16 -  
17 -.info {  
18 - z-index: 999;  
19 - width: auto;  
20 - min-width: 22rem;  
21 - padding: .75rem 1.25rem;  
22 - margin-left: 1.25rem;  
23 - position: fixed;  
24 - top: 1rem;  
25 - background-color: #fff;  
26 - border-radius: .25rem;  
27 - font-size: 14px;  
28 - color: #666;  
29 - box-shadow: 0 2px 6px 0 rgba(27, 142, 236, 0.5);  
30 -}  
31 -  
32 -.stationInfo {  
33 - right: 0px;  
34 - top: 100px;  
35 - display: none;  
36 -}  
37 -</style>  
38 -<script  
39 - src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>  
40 -</head>  
41 -<body>  
42 - <div class="info">  
43 - <input type="text" class="form-control" id="distance"  
44 - placeholder="查询范围(单位米)" value="500" />  
45 - </div>  
46 -  
47 - <!-- <div class="info col-lg-6">  
48 - <div class="input-group">  
49 - <input type="text" class="form-control" id="text">  
50 - <div class="input-group-btn">  
51 - <button type="button" class="btn btn-white dropdown-toggle"  
52 - data-toggle="dropdown">  
53 - <span class="caret"></span>  
54 - </button>  
55 - <ul class="dropdown-menu dropdown-menu-right" role="menu">  
56 - </ul>  
57 - </div>  
58 - </div>  
59 - </div> -->  
60 -  
61 - <div class="info stationInfo">  
62 - <div id="stationInfo"></div>  
63 -  
64 - </div>  
65 -  
66 - <div id="container"></div>  
67 - <th:block th:include="include :: footer" />  
68 - <th:block th:include="include :: bootstrap-suggest-js" />  
69 - <script>  
70 - var map = new BMapGL.Map('container'); // 创建Map实例  
71 - map.centerAndZoom(new BMapGL.Point(121.528733, 31.237425), 12); // 初始化地图,设置中心点坐标和地图级别  
72 - map.enableScrollWheelZoom(true); // 开启鼠标滚轮缩放  
73 -  
74 - map.addEventListener('click', function(e) {  
75 - if (e.overlay) {  
76 - return; // 存在覆盖物退出  
77 - }  
78 - map.clearOverlays();  
79 -  
80 - $.get("http://180.167.126.126:18991/prod-api/service/interfact/getStation?lng="  
81 - + e.latlng.lng + "&lat=" + e.latlng.lat + "&dis="  
82 - + $("#distance").val() / 1000, function(data) {  
83 - if (data.code == "200") {  
84 - for ( var i in data.data) {  
85 - (function(){  
86 - var station = data.data[i];  
87 - var marker = new BMapGL.Marker(new BMapGL.Point(station.lonBd, station.latBd),{title:station.standardStationCode});  
88 - var label = new BMapGL.Label(station.stationName);  
89 -  
90 - marker.setLabel(label);  
91 -  
92 -  
93 - marker.station = data.data[i];  
94 -  
95 - var opts = {  
96 - width: 200,  
97 - height: 200,  
98 - title: station.stationName  
99 - };  
100 -  
101 - var info = "";  
102 - info += "<span>站点名称：" + data.data[i].stationName  
103 - + "</span><br/>";  
104 - info += "<span>行业编码：" + data.data[i].standardStationCode  
105 - + "</span><br/>";  
106 - info += "<span>站点编码：" + data.data[i].stationCode  
107 - + "</span><br/>";  
108 - info += "<span>经过线路：" + data.data[i].lineList  
109 - + "</span><br/>";  
110 - info += "<span>道路名称：" + data.data[i].roadName  
111 - + "</span><br/>";  
112 -  
113 - var infoWindow = new BMapGL.InfoWindow(info, opts);  
114 -  
115 -  
116 - marker.addEventListener('click', function() {  
117 - map.openInfoWindow(infoWindow, new BMapGL.Point(station.lonBd, station.latBd)); // 开启信息窗口  
118 - });  
119 -  
120 -  
121 - map.addOverlay(marker);  
122 - })();  
123 - }  
124 - }  
125 - });  
126 -  
127 - });  
128 -  
129 - /* $("#text").bsSuggest({  
130 - url : "/system/line/getListForMap",  
131 - effectiveFields : [ "lineName" ],  
132 - searchFields : [ "lineName", "halfwayStation" ],  
133 - effectiveFieldsAlias : {  
134 - lineName : "线路名"  
135 - },  
136 - clearable : true,  
137 - idField : "id",  
138 - keyField : "lineName",  
139 - processData : function(json) { // url 获取数据时，对数据的处理，作为 getData 的回调函数  
140 - var data = {  
141 - 'value' : []  
142 - };  
143 -  
144 - for ( var i in json) {  
145 - data.value.push(json[i]);  
146 - }  
147 -  
148 - //字符串转化为 js 对象  
149 - return data;  
150 - }  
151 - }).on('onDataRequestSuccess', function(e, result) {  
152 - console.log('onDataRequestSuccess: ', result);  
153 - }).on('onSetSelectValue', function(e, selectedData, selectedRawData) {  
154 -  
155 - busline.getBusList(e.target.value);  
156 -  
157 - }).on('onUnsetSelectValue', function() {  
158 - console.log('onUnsetSelectValue');  
159 - }).on('onShowDropdown', function(e, data) {  
160 - console.log('onShowDropdown', e.target.value, data);  
161 - }).on('onHideDropdown', function(e, data) {  
162 - console.log('onHideDropdown', e.target.value, data);  
163 - });  
164 -  
165 -  
166 - var busline = new BMapGL.BusLineSearch(map, {  
167 - renderOptions : {  
168 - map : map,  
169 - panel : "r-result"  
170 - },  
171 - onGetBusListComplete : function(result) {  
172 - if (result) {  
173 -  
174 - for(var i in result._listItems){  
175 - if(result._listItems[i].name.indexOf($("#text").val()) > -1){  
176 - var fstLine = result.getBusListItem(i);//获取第一个公交列表显示到map上  
177 - busline.getBusLine(fstLine);  
178 - return;  
179 - }  
180 - }  
181 -  
182 - }else{  
183 - return;  
184 - }  
185 - },  
186 - onMarkersSet:function(array){  
187 -  
188 - for(var i in array){  
189 -  
190 - const overlay = array[i];  
191 -  
192 -  
193 - }  
194 -  
195 - }  
196 - }); */  
197 - </script>  
198 -  
199 -  
200 -  
201 -</body>  
202 -</html>  
203 \ No newline at end of file 0 \ No newline at end of file
bsthLineProfiles/src/main/resources/templates/system/line/edit.html renamed to bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
  View file @7d71c02
@@ -13,35 +13,35 @@ @@ -13,35 +13,35 @@
13 <div class="form-group"> 13 <div class="form-group">
14 <label class="col-sm-3 control-label">线路名称：</label> 14 <label class="col-sm-3 control-label">线路名称：</label>
15 <div class="col-sm-8"> 15 <div class="col-sm-8">
16 - <input name="lineName" th:field="*{lineName}" class="form-control" 16 + <input name="lineName" th:field="*{lineName}" class="form-control" disabled
17 type="text"> 17 type="text">
18 </div> 18 </div>
19 </div> 19 </div>
20 <div class="form-group"> 20 <div class="form-group">
21 <label class="col-sm-3 control-label">公司：</label> 21 <label class="col-sm-3 control-label">公司：</label>
22 <div class="col-sm-8"> 22 <div class="col-sm-8">
23 - <input name="company" th:field="*{company}" class="form-control" 23 + <input name="company" th:field="*{company}" class="form-control" disabled
24 type="text"> 24 type="text">
25 </div> 25 </div>
26 </div> 26 </div>
27 <div class="form-group"> 27 <div class="form-group">
28 <label class="col-sm-3 control-label">分公司：</label> 28 <label class="col-sm-3 control-label">分公司：</label>
29 <div class="col-sm-8"> 29 <div class="col-sm-8">
30 - <input name="fCompany" th:field="*{fCompany}" class="form-control" 30 + <input name="fCompany" th:field="*{fCompany}" class="form-control" disabled
31 type="text"> 31 type="text">
32 </div> 32 </div>
33 </div> 33 </div>
34 <div class="form-group"> 34 <div class="form-group">
35 <label class="col-sm-3 control-label">主线路id：</label> 35 <label class="col-sm-3 control-label">主线路id：</label>
36 <div class="col-sm-8"> 36 <div class="col-sm-8">
37 - <input name="pLineId" th:field="*{pLineId}" class="form-control" 37 + <input name="pLineId" th:field="*{pLineId}" class="form-control" disabled
38 type="text"> 38 type="text">
39 </div> 39 </div>
40 </div> 40 </div>
41 <div class="form-group"> 41 <div class="form-group">
42 <label class="col-sm-3 control-label">营运方式：</label> 42 <label class="col-sm-3 control-label">营运方式：</label>
43 <div class="col-sm-8"> 43 <div class="col-sm-8">
44 - <select name="serviceType" 44 + <select name="serviceType" disabled
45 th:with="type=${@dict.getType('serviceType')}" 45 th:with="type=${@dict.getType('serviceType')}"
46 class="form-control m-b"> 46 class="form-control m-b">
47 <option value=""></option> 47 <option value=""></option>
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 <div class="form-group"> 54 <div class="form-group">
55 <label class="col-sm-3 control-label">线路属性：</label> 55 <label class="col-sm-3 control-label">线路属性：</label>
56 <div class="col-sm-8"> 56 <div class="col-sm-8">
57 - <select name="lineLevel" 57 + <select name="lineLevel" disabled
58 th:with="type=${@dict.getType('lineLevel')}" 58 th:with="type=${@dict.getType('lineLevel')}"
59 class="form-control m-b"> 59 class="form-control m-b">
60 <option value=""></option> 60 <option value=""></option>
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 <div class="form-group"> 67 <div class="form-group">
68 <label class="col-sm-3 control-label">线路类型：</label> 68 <label class="col-sm-3 control-label">线路类型：</label>
69 <div class="col-sm-8"> 69 <div class="col-sm-8">
70 - <select name="lineType" th:with="type=${@dict.getType('lineType')}" 70 + <select name="lineType" disabled th:with="type=${@dict.getType('lineType')}"
71 class="form-control m-b"> 71 class="form-control m-b">
72 <option value=""></option> 72 <option value=""></option>
73 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" 73 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 <label class="col-sm-3 control-label">区属：</label> 80 <label class="col-sm-3 control-label">区属：</label>
81 <div class="col-sm-8"> 81 <div class="col-sm-8">
82 82
83 - <select name="district" th:with="type=${@dict.getType('district')}" 83 + <select name="district" th:with="type=${@dict.getType('district')}" disabled
84 class="form-control m-b"> 84 class="form-control m-b">
85 <option value=""></option> 85 <option value=""></option>
86 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" 86 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 <div class="form-group"> 92 <div class="form-group">
93 <label class="col-sm-3 control-label">是否区内：</label> 93 <label class="col-sm-3 control-label">是否区内：</label>
94 <div class="col-sm-8"> 94 <div class="col-sm-8">
95 - <select name="inoutDistrict" 95 + <select name="inoutDistrict" disabled
96 th:with="type=${@dict.getType('trueFalse')}" 96 th:with="type=${@dict.getType('trueFalse')}"
97 class="form-control m-b"> 97 class="form-control m-b">
98 <option value=""></option> 98 <option value=""></option>
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
106 <label class="col-sm-3 control-label">营运状态：</label> 106 <label class="col-sm-3 control-label">营运状态：</label>
107 <div class="col-sm-8"> 107 <div class="col-sm-8">
108 108
109 - <select name="serviceState" 109 + <select name="serviceState" disabled
110 th:with="type=${@dict.getType('serviceState')}" 110 th:with="type=${@dict.getType('serviceState')}"
111 class="form-control m-b"> 111 class="form-control m-b">
112 <option value=""></option> 112 <option value=""></option>
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 <label class="col-sm-3 control-label">车辆类型：</label> 120 <label class="col-sm-3 control-label">车辆类型：</label>
121 <div class="col-sm-8" th:with="type=${@dict.getType('busType')}"> 121 <div class="col-sm-8" th:with="type=${@dict.getType('busType')}">
122 <label class="checkbox-inline" th:each="dict : ${type}" 122 <label class="checkbox-inline" th:each="dict : ${type}"
123 - style="display: block"> <input type="checkbox" 123 + style="display: block"> <input type="checkbox" disabled
124 name="busType" 124 name="busType"
125 th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.busType == null ? '' : bsthTLine.busType ,','),#strings.toString(dict.dictValue))}" 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> 126 th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
130 <label class="col-sm-3 control-label">是否空调：</label> 130 <label class="col-sm-3 control-label">是否空调：</label>
131 <div class="col-sm-8"> 131 <div class="col-sm-8">
132 132
133 - <select name="airConditionerType" 133 + <select name="airConditionerType" disabled
134 th:with="type=${@dict.getType('airConditionerType')}" 134 th:with="type=${@dict.getType('airConditionerType')}"
135 class="form-control m-b"> 135 class="form-control m-b">
136 <option value=""></option> 136 <option value=""></option>
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
143 <div class="form-group"> 143 <div class="form-group">
144 <label class="col-sm-3 control-label">售票类型：</label> 144 <label class="col-sm-3 control-label">售票类型：</label>
145 <div class="col-sm-8"> 145 <div class="col-sm-8">
146 - <select name="sellTicketType" 146 + <select name="sellTicketType" disabled
147 th:with="type=${@dict.getType('sellTicketType')}" 147 th:with="type=${@dict.getType('sellTicketType')}"
148 class="form-control m-b"> 148 class="form-control m-b">
149 <option value=""></option> 149 <option value=""></option>
@@ -156,7 +156,7 @@ @@ -156,7 +156,7 @@
156 <div class="form-group"> 156 <div class="form-group">
157 <label class="col-sm-3 control-label">运营时间：</label> 157 <label class="col-sm-3 control-label">运营时间：</label>
158 <div class="col-sm-8"> 158 <div class="col-sm-8">
159 - <select name="serviceTime" 159 + <select name="serviceTime" disabled
160 th:with="type=${@dict.getType('serviceTime')}" 160 th:with="type=${@dict.getType('serviceTime')}"
161 class="form-control m-b"> 161 class="form-control m-b">
162 <option value=""></option> 162 <option value=""></option>
@@ -169,21 +169,21 @@ @@ -169,21 +169,21 @@
169 <div class="form-group"> 169 <div class="form-group">
170 <label class="col-sm-3 control-label">线路长度：</label> 170 <label class="col-sm-3 control-label">线路长度：</label>
171 <div class="col-sm-8"> 171 <div class="col-sm-8">
172 - <input name="lineDistance" th:field="*{lineDistance}" 172 + <input name="lineDistance" th:field="*{lineDistance}" disabled
173 class="form-control" type="text"> 173 class="form-control" type="text">
174 </div> 174 </div>
175 </div> 175 </div>
176 <div class="form-group"> 176 <div class="form-group">
177 <label class="col-sm-3 control-label">线路编码：</label> 177 <label class="col-sm-3 control-label">线路编码：</label>
178 <div class="col-sm-8"> 178 <div class="col-sm-8">
179 - <input name="lineCode" th:field="*{lineCode}" class="form-control" 179 + <input name="lineCode" th:field="*{lineCode}" class="form-control" disabled
180 type="text"> 180 type="text">
181 </div> 181 </div>
182 </div> 182 </div>
183 <div class="form-group"> 183 <div class="form-group">
184 <label class="col-sm-3 control-label">授权年限：</label> 184 <label class="col-sm-3 control-label">授权年限：</label>
185 <div class="col-sm-8"> 185 <div class="col-sm-8">
186 - <input name="warrantYear" th:field="*{warrantYear}" 186 + <input name="warrantYear" th:field="*{warrantYear}" disabled
187 class="form-control" type="text"> 187 class="form-control" type="text">
188 </div> 188 </div>
189 </div> 189 </div>
@@ -192,7 +192,7 @@ @@ -192,7 +192,7 @@
192 <div class="col-sm-8"> 192 <div class="col-sm-8">
193 <div class="input-group date"> 193 <div class="input-group date">
194 <input name="warrantStartTime" 194 <input name="warrantStartTime"
195 - th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}" 195 + th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}" disabled
196 class="form-control" placeholder="yyyy-MM-dd" type="text" 196 class="form-control" placeholder="yyyy-MM-dd" type="text"
197 autocomplete="off"> <span class="input-group-addon"><i 197 autocomplete="off"> <span class="input-group-addon"><i
198 class="fa fa-calendar"></i></span> 198 class="fa fa-calendar"></i></span>
@@ -204,7 +204,7 @@ @@ -204,7 +204,7 @@
204 <div class="col-sm-8"> 204 <div class="col-sm-8">
205 <div class="input-group date"> 205 <div class="input-group date">
206 <input name="warrantEndTime" 206 <input name="warrantEndTime"
207 - th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}" 207 + th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}" disabled
208 class="form-control" placeholder="yyyy-MM-dd" type="text" 208 class="form-control" placeholder="yyyy-MM-dd" type="text"
209 autocomplete="off"> <span class="input-group-addon"><i 209 autocomplete="off"> <span class="input-group-addon"><i
210 class="fa fa-calendar"></i></span> 210 class="fa fa-calendar"></i></span>
@@ -216,7 +216,7 @@ @@ -216,7 +216,7 @@
216 <div class="col-sm-8"> 216 <div class="col-sm-8">
217 <div class="input-group date"> 217 <div class="input-group date">
218 <input name="planCancelTime" 218 <input name="planCancelTime"
219 - th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}" 219 + th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}" disabled
220 class="form-control" placeholder="yyyy-MM-dd" type="text" 220 class="form-control" placeholder="yyyy-MM-dd" type="text"
221 autocomplete="off"> <span class="input-group-addon"><i 221 autocomplete="off"> <span class="input-group-addon"><i
222 class="fa fa-calendar"></i></span> 222 class="fa fa-calendar"></i></span>
@@ -228,7 +228,7 @@ @@ -228,7 +228,7 @@
228 <div class="col-sm-8"> 228 <div class="col-sm-8">
229 <div class="input-group date"> 229 <div class="input-group date">
230 <input name="cancelTime" 230 <input name="cancelTime"
231 - th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}" 231 + th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}" disabled
232 class="form-control" placeholder="yyyy-MM-dd" type="text" 232 class="form-control" placeholder="yyyy-MM-dd" type="text"
233 autocomplete="off"> <span class="input-group-addon"><i 233 autocomplete="off"> <span class="input-group-addon"><i
234 class="fa fa-calendar"></i></span> 234 class="fa fa-calendar"></i></span>
@@ -238,20 +238,20 @@ @@ -238,20 +238,20 @@
238 <div class="form-group"> 238 <div class="form-group">
239 <label class="col-sm-3 control-label">撤销原因：</label> 239 <label class="col-sm-3 control-label">撤销原因：</label>
240 <div class="col-sm-8"> 240 <div class="col-sm-8">
241 - <textarea name="cancelReason" class="form-control">[[*{cancelReason}]]</textarea> 241 + <textarea name="cancelReason" class="form-control" disabled>[[*{cancelReason}]]</textarea>
242 </div> 242 </div>
243 </div> 243 </div>
244 <div class="form-group"> 244 <div class="form-group">
245 <label class="col-sm-3 control-label">备注：</label> 245 <label class="col-sm-3 control-label">备注：</label>
246 <div class="col-sm-8"> 246 <div class="col-sm-8">
247 - <textarea name="remark" class="form-control">[[*{remark}]]</textarea> 247 + <textarea name="remark" class="form-control" disabled>[[*{remark}]]</textarea>
248 </div> 248 </div>
249 </div> 249 </div>
250 <div class="form-group"> 250 <div class="form-group">
251 <label class="col-sm-3 control-label">是否逻辑删除：</label> 251 <label class="col-sm-3 control-label">是否逻辑删除：</label>
252 <div class="col-sm-8"> 252 <div class="col-sm-8">
253 253
254 - <select name="isLogicDelete" 254 + <select name="isLogicDelete" disabled
255 th:with="type=${@dict.getType('trueFalse')}" 255 th:with="type=${@dict.getType('trueFalse')}"
256 class="form-control m-b"> 256 class="form-control m-b">
257 <option value=""></option> 257 <option value=""></option>
@@ -265,7 +265,7 @@ @@ -265,7 +265,7 @@
265 <label class="col-sm-3 control-label">行车作业计划表报备时间：</label> 265 <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
266 <div class="col-sm-8"> 266 <div class="col-sm-8">
267 <div class="input-group date"> 267 <div class="input-group date">
268 - <input name="timeSchedule" 268 + <input name="timeSchedule" disabled
269 th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}" 269 th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
270 class="form-control" placeholder="yyyy-MM-dd" type="text" 270 class="form-control" placeholder="yyyy-MM-dd" type="text"
271 autocomplete="off"> <span class="input-group-addon"><i 271 autocomplete="off"> <span class="input-group-addon"><i
@@ -276,14 +276,14 @@ @@ -276,14 +276,14 @@
276 <div class="form-group"> 276 <div class="form-group">
277 <label class="col-sm-3 control-label">停车场：</label> 277 <label class="col-sm-3 control-label">停车场：</label>
278 <div class="col-sm-8"> 278 <div class="col-sm-8">
279 - <input name="park" th:field="*{park}" class="form-control" 279 + <input name="park" th:field="*{park}" class="form-control" disabled
280 type="text"> 280 type="text">
281 </div> 281 </div>
282 </div> 282 </div>
283 <div class="form-group"> 283 <div class="form-group">
284 <label class="col-sm-3 control-label">是否权证：</label> 284 <label class="col-sm-3 control-label">是否权证：</label>
285 <div class="col-sm-8"> 285 <div class="col-sm-8">
286 - <select name="isWarrant" id="isWarrant" 286 + <select name="isWarrant" id="isWarrant" disabled
287 th:with="type=${@dict.getType('trueFalse')}" 287 th:with="type=${@dict.getType('trueFalse')}"
288 class="form-control m-b"> 288 class="form-control m-b">
289 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" 289 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
@@ -296,7 +296,7 @@ @@ -296,7 +296,7 @@
296 <label class="col-sm-3 control-label">权证开通日期：</label> 296 <label class="col-sm-3 control-label">权证开通日期：</label>
297 <div class="col-sm-8"> 297 <div class="col-sm-8">
298 <div class="input-group date"> 298 <div class="input-group date">
299 - <input name="isWarrantStartTime" id="isWarrantStartTime" 299 + <input name="isWarrantStartTime" id="isWarrantStartTime" disabled
300 th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}" 300 th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
301 class="form-control" placeholder="yyyy-MM-dd" type="text" 301 class="form-control" placeholder="yyyy-MM-dd" type="text"
302 autocomplete="off"> <span class="input-group-addon"><i 302 autocomplete="off"> <span class="input-group-addon"><i
@@ -309,7 +309,7 @@ @@ -309,7 +309,7 @@
309 <label class="col-sm-3 control-label">权证到期日期：</label> 309 <label class="col-sm-3 control-label">权证到期日期：</label>
310 <div class="col-sm-8"> 310 <div class="col-sm-8">
311 <div class="input-group date"> 311 <div class="input-group date">
312 - <input name="isWarrantEndTime" id="isWarrantEndTime" 312 + <input name="isWarrantEndTime" id="isWarrantEndTime" disabled
313 th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}" 313 th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
314 class="form-control" placeholder="yyyy-MM-dd" type="text" 314 class="form-control" placeholder="yyyy-MM-dd" type="text"
315 autocomplete="off"> <span class="input-group-addon"><i 315 autocomplete="off"> <span class="input-group-addon"><i
@@ -324,7 +324,7 @@ @@ -324,7 +324,7 @@
324 <div class="col-sm-8" th:with="type=${@dict.getType('roadType')}"> 324 <div class="col-sm-8" th:with="type=${@dict.getType('roadType')}">
325 <label class="checkbox-inline" th:each="dict : ${type}" 325 <label class="checkbox-inline" th:each="dict : ${type}"
326 style="display: block"> <input type="checkbox" 326 style="display: block"> <input type="checkbox"
327 - name="roadType" 327 + name="roadType" disabled
328 th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.roadType == null ? '' : bsthTLine.roadType ,','),#strings.toString(dict.dictValue))}" 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> 329 th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
330 </div> 330 </div>
@@ -333,105 +333,105 @@ @@ -333,105 +333,105 @@
333 <div class="form-group"> 333 <div class="form-group">
334 <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label> 334 <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
335 <div class="col-sm-8"> 335 <div class="col-sm-8">
336 - <input name="ticketPrice" th:field="*{ticketPrice}" 336 + <input name="ticketPrice" th:field="*{ticketPrice}" disabled
337 class="form-control" type="text"> 337 class="form-control" type="text">
338 </div> 338 </div>
339 </div> 339 </div>
340 <div class="form-group"> 340 <div class="form-group">
341 <label class="col-sm-3 control-label">首站：</label> 341 <label class="col-sm-3 control-label">首站：</label>
342 <div class="col-sm-8"> 342 <div class="col-sm-8">
343 - <input name="firstStation" th:field="*{firstStation}" 343 + <input name="firstStation" th:field="*{firstStation}" disabled
344 class="form-control" type="text"> 344 class="form-control" type="text">
345 </div> 345 </div>
346 </div> 346 </div>
347 <div class="form-group"> 347 <div class="form-group">
348 <label class="col-sm-3 control-label">起讫站：</label> 348 <label class="col-sm-3 control-label">起讫站：</label>
349 <div class="col-sm-8"> 349 <div class="col-sm-8">
350 - <input name="startEnd" th:field="*{startEnd}" class="form-control" 350 + <input name="startEnd" th:field="*{startEnd}" class="form-control" disabled
351 type="text"> 351 type="text">
352 </div> 352 </div>
353 </div> 353 </div>
354 <div class="form-group"> 354 <div class="form-group">
355 <label class="col-sm-3 control-label">首战时间：</label> 355 <label class="col-sm-3 control-label">首战时间：</label>
356 <div class="col-sm-8"> 356 <div class="col-sm-8">
357 - <input name="firstTime" th:field="*{firstTime}" 357 + <input name="firstTime" th:field="*{firstTime}" disabled
358 class="form-control" type="text"> 358 class="form-control" type="text">
359 </div> 359 </div>
360 </div> 360 </div>
361 <div class="form-group"> 361 <div class="form-group">
362 <label class="col-sm-3 control-label">末站：</label> 362 <label class="col-sm-3 control-label">末站：</label>
363 <div class="col-sm-8"> 363 <div class="col-sm-8">
364 - <input name="lastStation" th:field="*{lastStation}" 364 + <input name="lastStation" th:field="*{lastStation}" disabled
365 class="form-control" type="text"> 365 class="form-control" type="text">
366 </div> 366 </div>
367 </div> 367 </div>
368 <div class="form-group"> 368 <div class="form-group">
369 <label class="col-sm-3 control-label">末站首战时间：</label> 369 <label class="col-sm-3 control-label">末站首战时间：</label>
370 <div class="col-sm-8"> 370 <div class="col-sm-8">
371 - <input name="lastTime" th:field="*{lastTime}" class="form-control" 371 + <input name="lastTime" th:field="*{lastTime}" class="form-control" disabled
372 type="text"> 372 type="text">
373 </div> 373 </div>
374 </div> 374 </div>
375 <div class="form-group"> 375 <div class="form-group">
376 <label class="col-sm-3 control-label">上行里程数：</label> 376 <label class="col-sm-3 control-label">上行里程数：</label>
377 <div class="col-sm-8"> 377 <div class="col-sm-8">
378 - <input name="mileageUp" th:field="*{mileageUp}" 378 + <input name="mileageUp" th:field="*{mileageUp}" disabled
379 class="form-control" type="text"> 379 class="form-control" type="text">
380 </div> 380 </div>
381 </div> 381 </div>
382 <div class="form-group"> 382 <div class="form-group">
383 <label class="col-sm-3 control-label">下行里程数：</label> 383 <label class="col-sm-3 control-label">下行里程数：</label>
384 <div class="col-sm-8"> 384 <div class="col-sm-8">
385 - <input name="mileageDown" th:field="*{mileageDown}" 385 + <input name="mileageDown" th:field="*{mileageDown}" disabled
386 class="form-control" type="text"> 386 class="form-control" type="text">
387 </div> 387 </div>
388 </div> 388 </div>
389 <div class="form-group"> 389 <div class="form-group">
390 <label class="col-sm-3 control-label">平均里程数：</label> 390 <label class="col-sm-3 control-label">平均里程数：</label>
391 <div class="col-sm-8"> 391 <div class="col-sm-8">
392 - <input name="averageMileage" th:field="*{averageMileage}" 392 + <input name="averageMileage" th:field="*{averageMileage}" disabled
393 class="form-control" type="text"> 393 class="form-control" type="text">
394 </div> 394 </div>
395 </div> 395 </div>
396 <div class="form-group"> 396 <div class="form-group">
397 <label class="col-sm-3 control-label">站级数(上行)：</label> 397 <label class="col-sm-3 control-label">站级数(上行)：</label>
398 <div class="col-sm-8"> 398 <div class="col-sm-8">
399 - <input name="stationUp" th:field="*{stationUp}" 399 + <input name="stationUp" th:field="*{stationUp}" disabled
400 class="form-control" type="text"> 400 class="form-control" type="text">
401 </div> 401 </div>
402 </div> 402 </div>
403 <div class="form-group"> 403 <div class="form-group">
404 <label class="col-sm-3 control-label">站级数(下行)：</label> 404 <label class="col-sm-3 control-label">站级数(下行)：</label>
405 <div class="col-sm-8"> 405 <div class="col-sm-8">
406 - <input name="stationDown" th:field="*{stationDown}" 406 + <input name="stationDown" th:field="*{stationDown}" disabled
407 class="form-control" type="text"> 407 class="form-control" type="text">
408 </div> 408 </div>
409 </div> 409 </div>
410 <div class="form-group"> 410 <div class="form-group">
411 <label class="col-sm-3 control-label">行驶时间(上行)：</label> 411 <label class="col-sm-3 control-label">行驶时间(上行)：</label>
412 <div class="col-sm-8"> 412 <div class="col-sm-8">
413 - <input name="travelTimeUp" th:field="*{travelTimeUp}" 413 + <input name="travelTimeUp" th:field="*{travelTimeUp}" disabled
414 class="form-control" type="text"> 414 class="form-control" type="text">
415 </div> 415 </div>
416 </div> 416 </div>
417 <div class="form-group"> 417 <div class="form-group">
418 <label class="col-sm-3 control-label">行驶时间(下行)：</label> 418 <label class="col-sm-3 control-label">行驶时间(下行)：</label>
419 <div class="col-sm-8"> 419 <div class="col-sm-8">
420 - <input name="travelTimeDown" th:field="*{travelTimeDown}" 420 + <input name="travelTimeDown" th:field="*{travelTimeDown}" disabled
421 class="form-control" type="text"> 421 class="form-control" type="text">
422 </div> 422 </div>
423 </div> 423 </div>
424 <div class="form-group"> 424 <div class="form-group">
425 <label class="col-sm-3 control-label">行驶间隔(高峰)：</label> 425 <label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
426 <div class="col-sm-8"> 426 <div class="col-sm-8">
427 - <input name="travelIntervalUp" th:field="*{travelIntervalUp}" 427 + <input name="travelIntervalUp" th:field="*{travelIntervalUp}" disabled
428 class="form-control" type="text"> 428 class="form-control" type="text">
429 </div> 429 </div>
430 </div> 430 </div>
431 <div class="form-group"> 431 <div class="form-group">
432 <label class="col-sm-3 control-label">行驶间隔(低谷)：</label> 432 <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
433 <div class="col-sm-8"> 433 <div class="col-sm-8">
434 - <input name="travelIntervalDown" th:field="*{travelIntervalDown}" 434 + <input name="travelIntervalDown" th:field="*{travelIntervalDown}" disabled
435 class="form-control" type="text"> 435 class="form-control" type="text">
436 </div> 436 </div>
437 </div> 437 </div>
@@ -439,7 +439,7 @@ @@ -439,7 +439,7 @@
439 <label class="col-sm-3 control-label">经营权证（大巴）：</label> 439 <label class="col-sm-3 control-label">经营权证（大巴）：</label>
440 <div class="col-sm-8"> 440 <div class="col-sm-8">
441 <input name="warrantVehiclesLarge" 441 <input name="warrantVehiclesLarge"
442 - th:field="*{warrantVehiclesLarge}" class="form-control" 442 + th:field="*{warrantVehiclesLarge}" class="form-control" disabled
443 type="text"> 443 type="text">
444 </div> 444 </div>
445 </div> 445 </div>
@@ -447,21 +447,21 @@ @@ -447,21 +447,21 @@
447 <label class="col-sm-3 control-label">经营权证（中巴）：</label> 447 <label class="col-sm-3 control-label">经营权证（中巴）：</label>
448 <div class="col-sm-8"> 448 <div class="col-sm-8">
449 <input name="warrantVehiclesMiddle" 449 <input name="warrantVehiclesMiddle"
450 - th:field="*{warrantVehiclesMiddle}" class="form-control" 450 + th:field="*{warrantVehiclesMiddle}" class="form-control" disabled
451 type="text"> 451 type="text">
452 </div> 452 </div>
453 </div> 453 </div>
454 <div class="form-group"> 454 <div class="form-group">
455 <label class="col-sm-3 control-label">实际配车数：</label> 455 <label class="col-sm-3 control-label">实际配车数：</label>
456 <div class="col-sm-8"> 456 <div class="col-sm-8">
457 - <input name="vehiclesNumber" th:field="*{vehiclesNumber}" 457 + <input name="vehiclesNumber" th:field="*{vehiclesNumber}" disabled
458 class="form-control" type="text"> 458 class="form-control" type="text">
459 </div> 459 </div>
460 </div> 460 </div>
461 <div class="form-group"> 461 <div class="form-group">
462 <label class="col-sm-3 control-label">实际车辆数（大巴）：</label> 462 <label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
463 <div class="col-sm-8"> 463 <div class="col-sm-8">
464 - <input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" 464 + <input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" disabled
465 class="form-control" type="text"> 465 class="form-control" type="text">
466 </div> 466 </div>
467 </div> 467 </div>
@@ -469,82 +469,82 @@ @@ -469,82 +469,82 @@
469 <label class="col-sm-3 control-label">实际车辆数（中巴）：</label> 469 <label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
470 <div class="col-sm-8"> 470 <div class="col-sm-8">
471 <input name="numberVehiclesMiddle" 471 <input name="numberVehiclesMiddle"
472 - th:field="*{numberVehiclesMiddle}" class="form-control" 472 + th:field="*{numberVehiclesMiddle}" class="form-control" disabled
473 type="text"> 473 type="text">
474 </div> 474 </div>
475 </div> 475 </div>
476 <div class="form-group"> 476 <div class="form-group">
477 <label class="col-sm-3 control-label">车辆自编号：</label> 477 <label class="col-sm-3 control-label">车辆自编号：</label>
478 <div class="col-sm-8"> 478 <div class="col-sm-8">
479 - <input name="carPlate" th:field="*{carPlate}" class="form-control" 479 + <input name="carPlate" th:field="*{carPlate}" class="form-control" disabled
480 type="text"> 480 type="text">
481 </div> 481 </div>
482 </div> 482 </div>
483 <div class="form-group"> 483 <div class="form-group">
484 <label class="col-sm-3 control-label">线路总配人数：</label> 484 <label class="col-sm-3 control-label">线路总配人数：</label>
485 <div class="col-sm-8"> 485 <div class="col-sm-8">
486 - <input name="numberPerson" th:field="*{numberPerson}" 486 + <input name="numberPerson" th:field="*{numberPerson}" disabled
487 class="form-control" type="text"> 487 class="form-control" type="text">
488 </div> 488 </div>
489 </div> 489 </div>
490 <div class="form-group"> 490 <div class="form-group">
491 <label class="col-sm-3 control-label">人数司机：</label> 491 <label class="col-sm-3 control-label">人数司机：</label>
492 <div class="col-sm-8"> 492 <div class="col-sm-8">
493 - <input name="numberPersonDriver" th:field="*{numberPersonDriver}" 493 + <input name="numberPersonDriver" th:field="*{numberPersonDriver}" disabled
494 class="form-control" type="text"> 494 class="form-control" type="text">
495 </div> 495 </div>
496 </div> 496 </div>
497 <div class="form-group"> 497 <div class="form-group">
498 <label class="col-sm-3 control-label">售票员数：</label> 498 <label class="col-sm-3 control-label">售票员数：</label>
499 <div class="col-sm-8"> 499 <div class="col-sm-8">
500 - <input name="numberPersonSales" th:field="*{numberPersonSales}" 500 + <input name="numberPersonSales" th:field="*{numberPersonSales}" disabled
501 class="form-control" type="text"> 501 class="form-control" type="text">
502 </div> 502 </div>
503 </div> 503 </div>
504 <div class="form-group"> 504 <div class="form-group">
505 <label class="col-sm-3 control-label">新能源车数：</label> 505 <label class="col-sm-3 control-label">新能源车数：</label>
506 <div class="col-sm-8"> 506 <div class="col-sm-8">
507 - <input name="busEvNumber" th:field="*{busEvNumber}" 507 + <input name="busEvNumber" th:field="*{busEvNumber}" disabled
508 class="form-control" type="text"> 508 class="form-control" type="text">
509 </div> 509 </div>
510 </div> 510 </div>
511 <div class="form-group"> 511 <div class="form-group">
512 <label class="col-sm-3 control-label">线路走向：</label> 512 <label class="col-sm-3 control-label">线路走向：</label>
513 <div class="col-sm-8"> 513 <div class="col-sm-8">
514 - <textarea name="directions" class="form-control">[[*{directions}]]</textarea> 514 + <textarea name="directions" class="form-control" disabled>[[*{directions}]]</textarea>
515 </div> 515 </div>
516 </div> 516 </div>
517 <div class="form-group"> 517 <div class="form-group">
518 <label class="col-sm-3 control-label">经营权证数：</label> 518 <label class="col-sm-3 control-label">经营权证数：</label>
519 <div class="col-sm-8"> 519 <div class="col-sm-8">
520 - <input name="numberOfManage" th:field="*{numberOfManage}" 520 + <input name="numberOfManage" th:field="*{numberOfManage}" disabled
521 class="form-control" type="text"> 521 class="form-control" type="text">
522 </div> 522 </div>
523 </div> 523 </div>
524 <div class="form-group"> 524 <div class="form-group">
525 <label class="col-sm-3 control-label">站点名称：</label> 525 <label class="col-sm-3 control-label">站点名称：</label>
526 <div class="col-sm-8"> 526 <div class="col-sm-8">
527 - <textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea> 527 + <textarea name="halfwayStation" class="form-control" disabled>[[*{halfwayStation}]]</textarea>
528 </div> 528 </div>
529 </div> 529 </div>
530 <div class="form-group"> 530 <div class="form-group">
531 <label class="col-sm-3 control-label">高峰系数：</label> 531 <label class="col-sm-3 control-label">高峰系数：</label>
532 <div class="col-sm-8"> 532 <div class="col-sm-8">
533 - <input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" 533 + <input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" disabled
534 class="form-control" type="text"> 534 class="form-control" type="text">
535 </div> 535 </div>
536 </div> 536 </div>
537 <div class="form-group"> 537 <div class="form-group">
538 <label class="col-sm-3 control-label">低谷系数：</label> 538 <label class="col-sm-3 control-label">低谷系数：</label>
539 <div class="col-sm-8"> 539 <div class="col-sm-8">
540 - <input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" 540 + <input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" disabled
541 class="form-control" type="text"> 541 class="form-control" type="text">
542 </div> 542 </div>
543 </div> 543 </div>
544 <div class="form-group"> 544 <div class="form-group">
545 <label class="col-sm-3 control-label">间隔等级：</label> 545 <label class="col-sm-3 control-label">间隔等级：</label>
546 <div class="col-sm-8"> 546 <div class="col-sm-8">
547 - <input name="divideLevel" th:field="*{divideLevel}" 547 + <input name="divideLevel" th:field="*{divideLevel}" disabled
548 class="form-control" type="text"> 548 class="form-control" type="text">
549 </div> 549 </div>
550 </div> 550 </div>
@@ -552,7 +552,7 @@ @@ -552,7 +552,7 @@
552 <label class="col-sm-3 control-label">是否挂牌：</label> 552 <label class="col-sm-3 control-label">是否挂牌：</label>
553 <div class="col-sm-8"> 553 <div class="col-sm-8">
554 <select name="hasTimelists" 554 <select name="hasTimelists"
555 - th:with="type=${@dict.getType('trueFalse')}" 555 + th:with="type=${@dict.getType('trueFalse')}" disabled
556 class="form-control m-b"> 556 class="form-control m-b">
557 <option value=""></option> 557 <option value=""></option>
558 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" 558 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
@@ -564,7 +564,7 @@ @@ -564,7 +564,7 @@
564 <div class="form-group"> 564 <div class="form-group">
565 <label class="col-sm-3 control-label">是否轨交末班车衔接：</label> 565 <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
566 <div class="col-sm-8"> 566 <div class="col-sm-8">
567 - <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" 567 + <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" disabled
568 class="form-control m-b"> 568 class="form-control m-b">
569 <option value=""></option> 569 <option value=""></option>
570 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" 570 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
@@ -577,7 +577,7 @@ @@ -577,7 +577,7 @@
577 <label class="col-sm-3 control-label">轨交时间：</label> 577 <label class="col-sm-3 control-label">轨交时间：</label>
578 <div class="col-sm-8"> 578 <div class="col-sm-8">
579 <div class="input-group date"> 579 <div class="input-group date">
580 - <input name="metroTime" class="form-control" 580 + <input name="metroTime" class="form-control" disabled
581 placeholder="HH:mm:ss" th:value="*{metroTime}"> <span 581 placeholder="HH:mm:ss" th:value="*{metroTime}"> <span
582 class="input-group-addon"><i class="fa fa-calendar"></i></span> 582 class="input-group-addon"><i class="fa fa-calendar"></i></span>
583 </div> 583 </div>
@@ -586,63 +586,7 @@ @@ -586,63 +586,7 @@
586 <div class="form-group"> 586 <div class="form-group">
587 <label class="col-sm-3 control-label">冷僻线路补贴类型：</label> 587 <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
588 <div class="col-sm-8"> 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}" 589 + <input name="coldBonusType" th:field="*{coldBonusType}" disabled
646 class="form-control" type="text"> 590 class="form-control" type="text">
647 </div> 591 </div>
648 </div> 592 </div>
@@ -652,7 +596,7 @@ @@ -652,7 +596,7 @@
652 <div class="col-sm-8"> 596 <div class="col-sm-8">
653 <div class="input-group date"> 597 <div class="input-group date">
654 <input name="startDate" 598 <input name="startDate"
655 - th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}" 599 + th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}" disabled
656 class="form-control" placeholder="yyyy-MM-dd" type="text" 600 class="form-control" placeholder="yyyy-MM-dd" type="text"
657 autocomplete="off"> <span class="input-group-addon"><i 601 autocomplete="off"> <span class="input-group-addon"><i
658 class="fa fa-calendar"></i></span> 602 class="fa fa-calendar"></i></span>
@@ -664,7 +608,7 @@ @@ -664,7 +608,7 @@
664 <label class="col-sm-3 control-label">性质：</label> 608 <label class="col-sm-3 control-label">性质：</label>
665 <div class="col-sm-8"> 609 <div class="col-sm-8">
666 <select name="lineUpdateType" 610 <select name="lineUpdateType"
667 - th:with="type=${@dict.getType('lineUpdateType')}" 611 + th:with="type=${@dict.getType('lineUpdateType')}" disabled
668 class="form-control m-b"> 612 class="form-control m-b">
669 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" 613 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
670 th:value="${dict.dictValue}"></option> 614 th:value="${dict.dictValue}"></option>
@@ -674,14 +618,14 @@ @@ -674,14 +618,14 @@
674 <div class="form-group"> 618 <div class="form-group">
675 <label class="col-sm-3 control-label">启用原因：</label> 619 <label class="col-sm-3 control-label">启用原因：</label>
676 <div class="col-sm-8"> 620 <div class="col-sm-8">
677 - <textarea name="startReason" class="form-control"></textarea> 621 + <textarea name="startReason" class="form-control" disabled>[[*{startReason}]]</textarea>
678 </div> 622 </div>
679 </div> 623 </div>
680 <div class="form-group"> 624 <div class="form-group">
681 <label class="col-sm-3 control-label">附件：</label> 625 <label class="col-sm-3 control-label">附件：</label>
682 <div class="col-sm-8"> 626 <div class="col-sm-8">
683 - <div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}">  
684 - <input name="files" type="hidden" th:value="${path}"> 627 + <div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" disabled>
  628 + <input name="files" type="hidden" th:value="${path}" >
685 <a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}"> 629 <a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
686 </a> 630 </a>
687 <button onclick="deleteFile(this);">删除</button> 631 <button onclick="deleteFile(this);">删除</button>
@@ -724,7 +668,7 @@ @@ -724,7 +668,7 @@
724 668
725 }); 669 });
726 670
727 - $.get("/system/line/getUserLineInfo", 671 + /*$.get("/system/line/getUserLineInfo",
728 function(data) { 672 function(data) {
729 if (data.msg != null) { 673 if (data.msg != null) {
730 var objs = JSON.parse(data.msg); 674 var objs = JSON.parse(data.msg);
@@ -784,7 +728,7 @@ @@ -784,7 +728,7 @@
784 728
785 } 729 }
786 } 730 }
787 - }); 731 + });*/
788 }) 732 })
789 733
790 function getParent(obj, className) { 734 function getParent(obj, className) {
bsthLineProfiles/src/main/resources/templates/system/line/line.html renamed to bsthLineProfiles/src/main/resources/templates/system/lineExamine/line.html
  View file @7d71c02
@@ -11,226 +11,28 @@ @@ -11,226 +11,28 @@
11 <form id="formId"> 11 <form id="formId">
12 <div class="select-list"> 12 <div class="select-list">
13 <ul> 13 <ul>
14 - <li><label>线路名称：</label> <input type="text" name="lineName" />  
15 - </li>  
16 <li><label>公司：</label> <input type="text" name="company" /> 14 <li><label>公司：</label> <input type="text" name="company" />
17 </li> 15 </li>
18 <li><label>分公司：</label> <input type="text" name="fCompany" /> 16 <li><label>分公司：</label> <input type="text" name="fCompany" />
19 </li> 17 </li>
20 - <li><label>主线路id：</label> <input type="text" name="pLineId" />  
21 - </li>  
22 - <li><label>营运方式：</label> <select name="serviceType"  
23 - th:with="type=${@dict.getType('serviceType')}">  
24 - <option value=""></option>  
25 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
26 - th:value="${dict.dictValue}"></option>  
27 - </select></li>  
28 - <li><label>线路属性：</label>  
29 - <select name="lineLevel"  
30 - th:with="type=${@dict.getType('lineLevel')}">  
31 - <option value=""></option>  
32 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
33 - th:value="${dict.dictValue}"></option>  
34 - </select>  
35 - </li>  
36 - <li><label>线路类型：</label> <select name="lineType"  
37 - th:with="type=${@dict.getType('lineType')}">  
38 - <option value=""></option>  
39 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
40 - th:value="${dict.dictValue}"></option>  
41 - </select></li>  
42 - <li><label>区属：</label> <select name="district"  
43 - th:with="type=${@dict.getType('district')}">  
44 - <option value=""></option>  
45 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
46 - th:value="${dict.dictValue}"></option>  
47 - </select></li>  
48 - <li><label>是否区内：</label> <select name="inoutDistrict"  
49 - th:with="type=${@dict.getType('trueFalse')}">  
50 - <option value=""></option>  
51 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
52 - th:value="${dict.dictValue}"></option>  
53 - </select></li>  
54 - <li><label>营运状态：</label> <select name="serviceState"  
55 - th:with="type=${@dict.getType('serviceState')}">  
56 - <option value=""></option>  
57 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
58 - th:value="${dict.dictValue}"></option>  
59 - </select></li>  
60 - <li><label>车辆类型：</label> <select name="busType"  
61 - th:with="type=${@dict.getType('busType')}">  
62 - <option value=""></option>  
63 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
64 - th:value="${dict.dictValue}"></option>  
65 - </select></li>  
66 - <li><label>是否空调：</label> <select name="airConditionerType"  
67 - th:with="type=${@dict.getType('airConditionerType')}">  
68 - <option value=""></option>  
69 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
70 - th:value="${dict.dictValue}"></option>  
71 - </select></li>  
72 - <li><label>售票类型：</label> <select name="sellTicketType"  
73 - th:with="type=${@dict.getType('sellTicketType')}">  
74 - <option value=""></option>  
75 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
76 - th:value="${dict.dictValue}"></option>  
77 - </select></li>  
78 - <li><label>运营时间：</label> <select name="serviceTime"  
79 - th:with="type=${@dict.getType('serviceTime')}">  
80 - <option value=""></option>  
81 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
82 - th:value="${dict.dictValue}"></option>  
83 - </select></li>  
84 - <li><label>线路长度：</label> <input type="text"  
85 - name="lineDistance" /></li>  
86 - <li><label>线路编码：</label> <input type="text" name="lineCode" />  
87 - </li>  
88 - <li><label>授权年限：</label> <input type="text"  
89 - name="warrantYear" /></li>  
90 - <li><label>授权起始：</label> <input type="text"  
91 - class="time-input" placeholder="请选择授权起始日期"  
92 - name="warrantStartTime" /></li>  
93 - <li><label>授权结束：</label> <input type="text"  
94 - class="time-input" placeholder="请选择授权结束日期" name="warrantEndTime" />  
95 - </li>  
96 - <li><label>撤销日期：</label> <input type="text"  
97 - class="time-input" placeholder="请选择撤销日期" name="planCancelTime" />  
98 - </li>  
99 - <li><label>实际撤销：</label> <input type="text"  
100 - class="time-input" placeholder="请选择实际撤销日期" name="cancelTime" />  
101 - </li>  
102 - <li><label>更新人：</label> <input type="text" name="updateBy" />  
103 - </li>  
104 - <li><label>更新时间：</label> <input type="text"  
105 - class="time-input" placeholder="请选择更新时间" name="updateTime" /></li>  
106 - <li><label>行车作业计划表报备时间：</label> <input type="text"  
107 - class="time-input" placeholder="请选择行车作业计划表报备时间"  
108 - name="timeSchedule" /></li>  
109 - <li><label>停车场：</label> <input type="text" name="park" /></li>  
110 - <li><label>是否权证：</label> <select name="isWarrant"  
111 - th:with="type=${@dict.getType('trueFalse')}">  
112 - <option value=""></option>  
113 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
114 - th:value="${dict.dictValue}"></option>  
115 - </select></li>  
116 - <li><label>道路类型：</label> <select name="roadType"  
117 - th:with="type=${@dict.getType('roadType')}">  
118 - <option value=""></option>  
119 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
120 - th:value="${dict.dictValue}"></option>  
121 - </select></li>  
122 - <li><label>票价：</label> <input type="text" name="ticketPrice" /></li>  
123 - <li><label>首站：</label> <input type="text"  
124 - name="firstStation" /></li>  
125 - <li><label>起讫站：</label> <input type="text" name="startEnd" />  
126 - </li>  
127 - <li><label>首战时间：</label> <input type="text" name="firstTime" />  
128 - </li>  
129 - <li><label>末站：</label> <input type="text" name="lastStation" />  
130 - </li>  
131 - <li><label>末站首战：</label> <input type="text"  
132 - name="lastTime" /></li>  
133 - <li><label>上行里程：</label> <input type="text"  
134 - name="mileageUp" /></li>  
135 - <li><label>下行里程：</label> <input type="text"  
136 - name="mileageDown" /></li>  
137 - <li><label>平均里程：</label> <input type="text"  
138 - name="averageMileage" /></li>  
139 - <li><label>上行站级：</label> <input type="text"  
140 - name="stationUp" /></li>  
141 - <li><label>下行站级数()：</label> <input type="text"  
142 - name="stationDown" /></li>  
143 - <li><label>行驶时间(上行)：</label> <input type="text"  
144 - name="travelTimeUp" /></li>  
145 - <li><label>行驶时间(下行)：</label> <input type="text"  
146 - name="travelTimeDown" /></li>  
147 - <li><label>行驶间隔(高峰)：</label> <input type="text"  
148 - name="travelIntervalUp" /></li>  
149 - <li><label>行驶间隔(低谷)：</label> <input type="text"  
150 - name="travelIntervalDown" /></li>  
151 - <li><label>经营权证：</label> <input type="text"  
152 - name="warrantVehiclesLarge" /></li>  
153 - <li><label>经营权证：</label> <input type="text"  
154 - name="warrantVehiclesMiddle" /></li>  
155 - <li><label>实际配车数：</label> <input type="text"  
156 - name="vehiclesNumber" /></li>  
157 - <li><label>实际车辆数(大巴)：</label> <input type="text"  
158 - name="numberVehiclesLarge" /></li>  
159 - <li><label>实际车辆数(中巴)：</label> <input type="text"  
160 - name="numberVehiclesMiddle" /></li>  
161 - <li><label>车辆自编号：</label> <input type="text" name="carPlate" />  
162 - </li>  
163 - <li><label>线路总配人数：</label> <input type="text"  
164 - name="numberPerson" /></li>  
165 - <li><label>人数司机：</label> <input type="text"  
166 - name="numberPersonDriver" /></li>  
167 - <li><label>售票员数：</label> <input type="text"  
168 - name="numberPersonSales" /></li>  
169 - <li><label>新能源车数：</label> <input type="text"  
170 - name="busEvNumber" /></li>  
171 - <li><label>经营权证数：</label> <input type="text"  
172 - name="numberOfManage" /></li>  
173 - <li><label>高峰系数：</label> <input type="text"  
174 - name="fullCustomerPercent" /></li>  
175 - <li><label>低谷系数：</label> <input type="text"  
176 - name="lowCustomerPercent" /></li>  
177 - <li><label>间隔等级：</label> <input type="text"  
178 - name="divideLevel" /></li>  
179 - <li><label>是否挂牌：</label> <input type="text"  
180 - name="hasTimelists" /></li>  
181 - <li><label>是否轨交末班车衔接：</label> <select name="isMetro"  
182 - th:with="type=${@dict.getType('trueFalse')}">  
183 - <option value=""></option>  
184 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
185 - th:value="${dict.dictValue}"></option>  
186 - </select></li>  
187 - <li><label>轨交时间：</label> <input type="text"  
188 - class="time-input" placeholder="请选择轨交时间" name="metroTime" /></li>  
189 - <li><label>冷僻补贴：</label> <input type="text"  
190 - name="coldBonusType" /></li>  
191 - <li><label>月度营收：</label> <input type="text"  
192 - name="revenuesMonth" /></li>  
193 - <li><label>月度人次：</label> <input type="text"  
194 - name="personMonth" /></li>  
195 - <li><label>月度里程：</label> <input type="text"  
196 - name="mileageMonth" /></li>  
197 - <li><label>百公里人次：</label> <input type="text"  
198 - name="personMonthAvg" /></li>  
199 - <li><label>营收：</label> <input type="text" name="revenues" />  
200 - </li>  
201 - <li><label>人次：</label> <input type="text" name="persons" />  
202 - </li>  
203 - <li><label>里程：</label> <input type="text" name="mileages" /> 18 + <li><label>线路名称：</label> <input type="text" name="lineName" />
204 </li> 19 </li>
205 - <li><label>百公里人次：</label> <input type="text"  
206 - name="personAvg" /></li>  
207 -  
208 <li> 20 <li>
209 <el-button size="mini" type="primary" icon="el-icon-search" onClick="$.table.search();">搜索</el-button> 21 <el-button size="mini" type="primary" icon="el-icon-search" onClick="$.table.search();">搜索</el-button>
210 <el-button size="mini" icon="el-icon-refresh" onClick="$.form.reset();">重置</el-button> 22 <el-button size="mini" icon="el-icon-refresh" onClick="$.form.reset();">重置</el-button>
211 </li> 23 </li>
212 -  
213 </ul> 24 </ul>
214 25
215 </div> 26 </div>
216 </form> 27 </form>
217 </div> 28 </div>
218 -  
219 -  
220 - <div class="btn-group-sm" id="toolbar" role="group">  
221 -  
222 - <el-button plain size="mini" type="success" icon="el-icon-search" onClick="$.table.search();" data-toggle="modal" data-target="#myModal">选择显示的列</el-button>  
223 -  
224 - <el-button plain size="mini" type="primary" icon="el-icon-plus" onClick="add(this);" shiro:hasPermission="system:line:add">新增</el-button>  
225 -  
226 - <el-button plain size="mini" type="primary" icon="el-icon-edit" onClick="edit(this);" class="btn single disabled" shiro:hasPermission="system:line:edit">修改</el-button>  
227 -  
228 - <el-button plain size="mini" type="danger" icon="el-icon-delete" onClick="remove(this);" class="btn multiple disabled" shiro:hasPermission="system:line:remove"> 删除</el-button>  
229 -  
230 - <el-button plain size="mini" type="warning" icon="el-icon-download" onClick="$.table.exportExcel();" shiro:hasPermission="system:line:export"> 导出</el-button>  
231 -  
232 -  
233 - </div> 29 +
  30 + <!--<div class="btn-group-sm" id="toolbar" role="group">
  31 +
  32 + <el-button plain size="mini" type="primary" icon="el-icon-plus" onClick="add(this);" shiro:hasPermission="system:line:add">新增</el-button>
  33 +
  34 + </div>-->
  35 +
234 <div class="col-sm-12 select-table table-striped"> 36 <div class="col-sm-12 select-table table-striped">
235 <table id="bootstrap-table"></table> 37 <table id="bootstrap-table"></table>
236 </div> 38 </div>
@@ -262,173 +64,114 @@ @@ -262,173 +64,114 @@
262 </div> 64 </div>
263 65
264 66
  67 +
265 <script th:inline="javascript"> 68 <script th:inline="javascript">
266 69
267 - function add(obj){  
268 - if($(obj)[0].className.indexOf("disabled") == -1)  
269 - $.operate.add(); 70 + /* function add(obj){
  71 + if($(obj)[0].className.indexOf("disabled") == -1)
  72 + $.operate.add();
  73 + }*/
270 74
271 - }  
272 -  
273 - function edit(obj){  
274 - if($(obj)[0].className.indexOf("disabled") == -1)  
275 - $.operate.edit();  
276 -  
277 - }  
278 -  
279 -  
280 - function remove(obj){  
281 - if($(obj)[0].className.indexOf("disabled") == -1)  
282 - $.operate.removeAll();  
283 -  
284 - }  
285 -  
286 - new Vue({  
287 - el: '#context',  
288 - data: function() {  
289 - return { visible: false }  
290 - }  
291 - })  
292 -  
293 - var dicts = [[${@dict.getType('')}]];  
294 - var mytable = null;  
295 -  
296 -  
297 - function initTable(){  
298 - var objs = $("#cols div");  
299 -  
300 -  
301 - var data = [];  
302 -  
303 - for(var i = 0;i< objs.length;i++){  
304 - var name = $(objs[i]).find("input")[0].name;  
305 - var text = $(objs[i]).find("label")[0].innerText;  
306 - var checked = $(objs[i]).find("input")[0].checked;  
307 -  
308 - data.push({  
309 - name:name,  
310 - text:text,  
311 - checked:checked});  
312 -  
313 - }  
314 -  
315 - createTable(data);  
316 -  
317 - $.post("/system/line/updateUserLineInfo",{lineInfo:JSON.stringify(data)},function(data){  
318 - $.modal.msg(data.msg);  
319 - }); 75 + new Vue({
  76 + el: '#context',
  77 + data: function() {
  78 + return { visible: false }
  79 + }
  80 + })
  81 + var dicts = [[${@dict.getType('')}]];
  82 +
  83 + function queryParams(params) {
  84 + var search = $.table.queryParams(params);
  85 + search.examineStatus ='true';
  86 + return search;
320 } 87 }
321 88
322 function createTable(objs){ 89 function createTable(objs){
323 - var options = {  
324 - url: prefix + "/list",  
325 - createUrl: prefix + "/add",  
326 - updateUrl: prefix + "/edit/{id}",  
327 - removeUrl: prefix + "/remove",  
328 - exportUrl: prefix + "/export",  
329 - modalName: "线路档案信息",  
330 - columns: [],  
331 - rowStyle:function(row,index) {  
332 - var flag=DateMinus(row.isWarrantEndTime);  
333 - if(row.isWarrant==='1'&&!flag){  
334 - var strClass='danger';  
335 - return {classes:strClass}; 90 + var options = {
  91 + url: prefix + "/list",
  92 + detailUrl: prefix + "/detail/{id}",
  93 + queryParams: queryParams,
  94 + modalName: "线路档案信息审核",
  95 + columns: [],
  96 + onDblClickRow:function (row,index){
  97 + detail(row.id,row.examineType);
  98 + }
  99 + };
  100 +
  101 +
  102 + if(objs.length > 0){
  103 + options.columns[0] = {checkbox:true};
  104 + options.columns[1] = {visible:false,field:"id"};
  105 + }
  106 +
  107 + for(var i = 0;i< objs.length;i++){
  108 +
  109 + if(!objs)continue;
  110 +
  111 + console.log(objs[i]);
  112 +
  113 + var col = {
  114 + field: objs[i].field,
  115 + title: objs[i].title,
  116 + align: 'center',
  117 + formatter: function(value, row, index) {
  118 +
  119 +
  120 + if(this.field == "roadType" || this.field == "busType"){
  121 + if(value != null){
  122 +
  123 + var arr = value.split(",");
  124 + value = "";
  125 + for(var i in arr){
  126 +
  127 + for(var j in dicts[this.field]){
  128 + if(dicts[this.field][j].dictValue == arr[i]){
  129 + value += dicts[this.field][j].dictLabel + ","
  130 + break;
  131 + }
  132 + }
  133 +
  134 + }
  135 + return $.table.tooltip(value.substring(0,value.length -1), 5);
  136 + }
  137 + }
  138 +
  139 + if(this.field == "isLogicDelete" || this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists"){
  140 + for(var j in dicts["trueFalse"]){
  141 + if(dicts["trueFalse"][j].dictValue == value){
  142 + value = dicts["trueFalse"][j].dictLabel;
  143 + break;
  144 + }
336 } 145 }
337 - return ""; 146 + }
  147 +
338 148
  149 +
  150 + if(dicts[this.field]){
  151 + for(var j in dicts[this.field]){
  152 + if(dicts[this.field][j].dictValue == value){
  153 + value = dicts[this.field][j].dictLabel;
  154 + break;
  155 + }
  156 + }
339 } 157 }
340 - };  
341 -  
342 -  
343 - if(objs.length > 0){  
344 - options.columns[0] = {checkbox:true};  
345 - options.columns[1] = {visible:false,field:"id"};  
346 - }  
347 -  
348 - for(var i = 0;i< objs.length;i++){  
349 -  
350 - var col = {  
351 - field: objs[i].name,  
352 - title: objs[i].text,  
353 - visible:objs[i].checked,  
354 - align: 'center',  
355 - formatter: function(value, row, index) {  
356 -  
357 -  
358 - if(this.field == "roadType" || this.field == "busType"){  
359 - if(value != null){  
360 -  
361 - var arr = value.split(",");  
362 - value = "";  
363 - for(var i in arr){  
364 -  
365 - for(var j in dicts[this.field]){  
366 - if(dicts[this.field][j].dictValue == arr[i]){  
367 - value += dicts[this.field][j].dictLabel + ","  
368 - break;  
369 - }  
370 - }  
371 -  
372 - }  
373 - return $.table.tooltip(value.substring(0,value.length -1), 5);  
374 - }  
375 - }  
376 -  
377 - if(this.field == "isLogicDelete" || this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists" || this.field == "isWarrant"){  
378 - for(var j in dicts["trueFalse"]){  
379 - if(dicts["trueFalse"][j].dictValue == value){  
380 - value = dicts["trueFalse"][j].dictLabel;  
381 - break;  
382 - }  
383 - }  
384 - }  
385 -  
386 -  
387 -  
388 - if(dicts[this.field]){  
389 - for(var j in dicts[this.field]){  
390 - if(dicts[this.field][j].dictValue == value){  
391 - value = dicts[this.field][j].dictLabel;  
392 - break;  
393 - }  
394 - }  
395 - }  
396 -  
397 - return $.table.tooltip(value, 5);  
398 - }  
399 - }  
400 -  
401 - if($($("#formId input[name="+objs[i].name+"]"))){  
402 - if(objs[i].checked){  
403 - $($("#formId input[name="+objs[i].name+"]")).parent().show();  
404 - }else{  
405 -  
406 - $($("#formId input[name="+objs[i].name+"]")).parent().hide();  
407 - }  
408 - }  
409 - if($($("#formId select[name="+objs[i].name+"]"))){  
410 - if(objs[i].checked){  
411 - $($("#formId select[name="+objs[i].name+"]")).parent().show();  
412 - }else{  
413 -  
414 - $($("#formId select[name="+objs[i].name+"]")).parent().hide();  
415 - }  
416 - }  
417 -  
418 - options.columns.push(col);  
419 -  
420 - }  
421 -  
422 - $.table.destroy();  
423 -  
424 - $.table.init(options);  
425 -  
426 - mytable = $.table; 158 +
  159 + return $.table.tooltip(value, 5);
  160 + }
  161 + }
  162 +
  163 + options.columns.push(col);
  164 +
  165 + }
  166 +
  167 + $.table.init(options);
  168 +
  169 +
427 } 170 }
428 - 171 +
429 function checkAll(obj){ 172 function checkAll(obj){
430 var objs = $("#cols input"); 173 var objs = $("#cols input");
431 - 174 +
432 if(obj.checked == false){ 175 if(obj.checked == false){
433 for(var i in objs){ 176 for(var i in objs){
434 objs[i].checked = false; 177 objs[i].checked = false;
@@ -439,145 +182,151 @@ @@ -439,145 +182,151 @@
439 } 182 }
440 } 183 }
441 } 184 }
442 -  
443 -  
444 - var editFlag = [[${@permission.hasPermi('system:line:edit')}]];  
445 - var removeFlag = [[${@permission.hasPermi('system:line:remove')}]];  
446 - var prefix = ctx + "system/line";  
447 -  
448 - $(function() {  
449 - var allDicts = {};  
450 -  
451 - for(var i in dicts){  
452 - if(!allDicts[dicts[i].dictType]){  
453 - allDicts[dicts[i].dictType] = [];  
454 - }  
455 - allDicts[dicts[i].dictType].push(dicts[i]);  
456 - }  
457 -  
458 - dicts = allDicts;  
459 -  
460 -  
461 -  
462 -  
463 -  
464 -  
465 - var cols = [{  
466 - field: 'lineName',  
467 - title: '线路名称'  
468 - },  
469 - {  
470 - field: 'company',  
471 - title: '公司'  
472 - },  
473 - {  
474 - field: 'fCompany',  
475 - title: '分公司'  
476 - },  
477 - {  
478 - field: 'pLineId',  
479 - title: '主线路id'  
480 - },  
481 - {  
482 - field: 'serviceType',  
483 - title: '营运方式'  
484 - },  
485 - {  
486 - field: 'lineLevel',  
487 - title: '线路属性'  
488 - },  
489 - {  
490 - field: 'lineType',  
491 - title: '线路属性'  
492 - },  
493 - {  
494 - field: 'district',  
495 - title: '区属'  
496 - },  
497 - {  
498 - field: 'inoutDistrict',  
499 - title: '是否区内'  
500 - },  
501 - {  
502 - field: 'serviceState',  
503 - title: '营运状态'  
504 - },  
505 - {  
506 - field: 'busType',  
507 - title: '车辆类型'  
508 - },  
509 - {  
510 - field: 'airConditionerType',  
511 - title: '是否空调'  
512 - },  
513 - {  
514 - field: 'sellTicketType',  
515 - title: '售票类型'  
516 - },  
517 - {  
518 - field: 'serviceTime',  
519 - title: '运营时间'  
520 - },  
521 - {  
522 - field: 'lineDistance',  
523 - title: '线路长度'  
524 - },  
525 - {  
526 - field: 'lineCode',  
527 - title: '线路编码'  
528 - },  
529 - {  
530 - field: 'warrantYear',  
531 - title: '授权年限'  
532 - },  
533 - {  
534 - field: 'warrantStartTime',  
535 - title: '授权起始日期'  
536 - },  
537 - {  
538 - field: 'warrantEndTime',  
539 - title: '授权结束日期'  
540 - },  
541 - {  
542 - field: 'planCancelTime',  
543 - title: '撤销日期'  
544 - },  
545 - {  
546 - field: 'cancelTime',  
547 - title: '实际撤销日期'  
548 - },  
549 - {  
550 - field: 'cancelReason',  
551 - title: '撤销原因'  
552 - },  
553 - {  
554 - field: 'remark',  
555 - title: '备注'  
556 - },  
557 - {  
558 - field: 'isLogicDelete',  
559 - title: '是否逻辑删除'  
560 - },  
561 - {  
562 - field: 'updateBy',  
563 - title: '更新人'  
564 - },  
565 - {  
566 - field: 'updateTime',  
567 - title: '更新时间'  
568 - },  
569 - {  
570 - field: 'timeSchedule',  
571 - title: '行车作业计划表报备时间'  
572 - },  
573 - {  
574 - field: 'park',  
575 - title: '停车场'  
576 - },  
577 - {  
578 - field: 'isWarrant',  
579 - title: '是否权证'  
580 - }, 185 +
  186 +
  187 + var editFlag = [[${@permission.hasPermi('system:lineReport:edit')}]];
  188 + var removeFlag = [[${@permission.hasPermi('system:lineReport:remove')}]];
  189 + var prefix = ctx + "system/lineExamine";
  190 +
  191 + $(function() {
  192 +
  193 +
  194 +
  195 +
  196 + var allDicts = {};
  197 +
  198 + for(var i in dicts){
  199 + if(!allDicts[dicts[i].dictType]){
  200 + allDicts[dicts[i].dictType] = [];
  201 + }
  202 + allDicts[dicts[i].dictType].push(dicts[i]);
  203 + }
  204 +
  205 + dicts = allDicts;
  206 +
  207 +
  208 + var cols = [{
  209 + field: 'lineName',
  210 + title: '线路名称',
  211 + },
  212 + {
  213 + field: 'company',
  214 + title: '公司'
  215 + },
  216 + {
  217 + field: 'fCompany',
  218 + title: '分公司'
  219 + },
  220 + {
  221 + field: 'pLineId',
  222 + title: '主线路id'
  223 + },
  224 + {
  225 + field: 'serviceType',
  226 + title: '营运方式'
  227 + },
  228 + {
  229 + field: 'lineLevel',
  230 + title: '线路属性'
  231 + },{
  232 + field: 'examineType',
  233 + title: '审核类型'
  234 + },{
  235 + field: 'examineStatus',
  236 + title: '审核状态'
  237 + }/*,
  238 + {
  239 + field: 'lineType',
  240 + title: '线路属性'
  241 + },
  242 + {
  243 + field: 'district',
  244 + title: '区属'
  245 + },
  246 + {
  247 + field: 'inoutDistrict',
  248 + title: '是否区内'
  249 + },
  250 + {
  251 + field: 'serviceState',
  252 + title: '营运状态'
  253 + },
  254 + {
  255 + field: 'busType',
  256 + title: '车辆类型'
  257 + },
  258 + {
  259 + field: 'airConditionerType',
  260 + title: '是否空调'
  261 + },
  262 + {
  263 + field: 'sellTicketType',
  264 + title: '售票类型'
  265 + },
  266 + {
  267 + field: 'serviceTime',
  268 + title: '运营时间'
  269 + },
  270 + {
  271 + field: 'lineDistance',
  272 + title: '线路长度'
  273 + },
  274 + {
  275 + field: 'lineCode',
  276 + title: '线路编码'
  277 + },
  278 + {
  279 + field: 'warrantYear',
  280 + title: '授权年限'
  281 + },
  282 + {
  283 + field: 'warrantStartTime',
  284 + title: '授权起始日期'
  285 + },
  286 + {
  287 + field: 'warrantEndTime',
  288 + title: '授权结束日期'
  289 + },
  290 + {
  291 + field: 'planCancelTime',
  292 + title: '撤销日期'
  293 + },
  294 + {
  295 + field: 'cancelTime',
  296 + title: '实际撤销日期'
  297 + },
  298 + {
  299 + field: 'cancelReason',
  300 + title: '撤销原因'
  301 + },
  302 + {
  303 + field: 'remark',
  304 + title: '备注'
  305 + },
  306 + {
  307 + field: 'isLogicDelete',
  308 + title: '是否逻辑删除'
  309 + },
  310 + {
  311 + field: 'updateBy',
  312 + title: '更新人'
  313 + },
  314 + {
  315 + field: 'updateTime',
  316 + title: '更新时间'
  317 + },
  318 + {
  319 + field: 'timeSchedule',
  320 + title: '行车作业计划表报备时间'
  321 + },
  322 + {
  323 + field: 'park',
  324 + title: '停车场'
  325 + },
  326 + {
  327 + field: 'isWarrant',
  328 + title: '是否权证'
  329 + },
581 { 330 {
582 field: 'isWarrantStartTime', 331 field: 'isWarrantStartTime',
583 title: '权证开通日期' 332 title: '权证开通日期'
@@ -586,206 +335,172 @@ @@ -586,206 +335,172 @@
586 field: 'isWarrantEndTime', 335 field: 'isWarrantEndTime',
587 title: '权证到期日期' 336 title: '权证到期日期'
588 }, 337 },
589 - {  
590 - field: 'roadType',  
591 - title: '道路类型'  
592 - },  
593 - {  
594 - field: 'ticketPrice',  
595 - title: '票价'  
596 - },  
597 - {  
598 - field: 'firstStation',  
599 - title: '首站'  
600 - },  
601 - {  
602 - field: 'startEnd',  
603 - title: '起讫站'  
604 - },  
605 - {  
606 - field: 'firstTime',  
607 - title: '首战时间'  
608 - },  
609 - {  
610 - field: 'lastStation',  
611 - title: '末站'  
612 - },  
613 - {  
614 - field: 'lastTime',  
615 - title: '末站首战时间'  
616 - },  
617 - {  
618 - field: 'mileageUp',  
619 - title: '上行里程数'  
620 - },  
621 - {  
622 - field: 'mileageDown',  
623 - title: '下行里程数'  
624 - },  
625 - {  
626 - field: 'averageMileage',  
627 - title: '平均里程数'  
628 - },  
629 - {  
630 - field: 'stationUp',  
631 - title: '站级数(上行)'  
632 - },  
633 - {  
634 - field: 'stationDown',  
635 - title: '站级数(下行)'  
636 - },{  
637 - field: 'travelTimeUp',  
638 - title: '行驶时间(上行)'  
639 - },{  
640 - field: 'travelTimeDown',  
641 - title: '行驶时间(下行)'  
642 - },{  
643 - field: 'travelIntervalUp',  
644 - title: '行驶间隔(高峰)'  
645 - },{  
646 - field: 'travelIntervalDown',  
647 - title: '行驶间隔(低谷)'  
648 - },{  
649 - field: 'warrantVehiclesLarge',  
650 - title: '经营权证(大巴)'  
651 - }, {  
652 - field: 'warrantVehiclesMiddle',  
653 - title: '经营权证(中巴)'  
654 - },{  
655 - field: 'vehiclesNumber',  
656 - title: '实际配车数'  
657 - }, {  
658 - field: 'numberVehiclesLarge',  
659 - title: '实际车辆数(大巴)'  
660 - }, {  
661 - field: 'numberVehiclesMiddle',  
662 - title: '实际车辆数(中巴)'  
663 - },{  
664 - field: 'carPlate',  
665 - title: '车辆自编号'  
666 - },{  
667 - field: 'numberPerson',  
668 - title: '线路总配人数'  
669 - },{  
670 - field: 'numberPersonDriver',  
671 - title: '人数司机'  
672 - }, {  
673 - field: 'numberPersonSales',  
674 - title: '售票员数'  
675 - },{  
676 - field: 'busEvNumber',  
677 - title: '新能源车数'  
678 - },{  
679 - field: 'directions',  
680 - title: '线路走向'  
681 - },{  
682 - field: 'numberOfManage',  
683 - title: '经营权证数'  
684 - },{  
685 - field: 'halfwayStation',  
686 - title: '站点名称'  
687 - },{  
688 - field: 'fullCustomerPercent',  
689 - title: '高峰系数'  
690 - },{  
691 - field: 'lowCustomerPercent',  
692 - title: '低谷系数'  
693 - }, {  
694 - field: 'divideLevel',  
695 - title: '间隔等级'  
696 - },{  
697 - field: 'hasTimelists',  
698 - title: '是否挂牌'  
699 - },{  
700 - field: 'isMetro',  
701 - title: '是否轨交末班车衔接'  
702 - },{  
703 - field: 'metroTime',  
704 - title: '轨交时间'  
705 - },{  
706 - field: 'coldBonusType',  
707 - title: '冷僻线路补贴类型'  
708 - },{  
709 - field: 'revenuesMonth',  
710 - title: '月度营收'  
711 - },{  
712 - field: 'personMonth',  
713 - title: '月度人次'  
714 - },{  
715 - field: 'mileageMonth',  
716 - title: '月度里程'  
717 - },{  
718 - field: 'personMonthAvg',  
719 - title: '百公里人次'  
720 - },{  
721 - field: 'revenues',  
722 - title: '营收'  
723 - },{  
724 - field: 'persons',  
725 - title: '人次'  
726 - }, {  
727 - field: 'mileages',  
728 - title: '里程'  
729 - },{  
730 - field: 'personAvg',  
731 - title: '百公里人次'  
732 - }];  
733 -  
734 - for(var i =0 ; i < cols.length ;i++){  
735 - if(i > 0 && i %3 > 0)continue;  
736 - var tag = "<div class='col_checkbox'><input type='checkbox' name="+cols[i].field+"><label>"+cols[i].title + "</label></div>";  
737 - if(cols[i+1]){  
738 - tag+= "<div class='col_checkbox'><input type='checkbox' name="+cols[i+1].field+"><label>"+cols[i+1].title + "</label></div>";  
739 - }  
740 - if(cols[i+2]){  
741 - tag+= "<div class='col_checkbox'><input type='checkbox' name="+cols[i+2].field+"><label>"+cols[i+2].title + "</label></div>";  
742 - }  
743 - $("#cols").append(tag);  
744 - }  
745 -  
746 - $.get("/system/line/getUserLineInfo",function(data){  
747 - if(data.msg != null){  
748 - var data = JSON.parse(data.msg);  
749 - createTable(data);  
750 -  
751 -  
752 - var allCheck = true;  
753 -  
754 - for(var i = 0;i<data.length;i++){  
755 -  
756 - if(!data[i].checked){  
757 - allCheck = false;  
758 - }  
759 -  
760 - $("#cols input[name="+data[i].name+"]")[0].checked = data[i].checked;  
761 - }  
762 -  
763 - $("#checkboxForAll")[0].checked = allCheck;  
764 -  
765 - }  
766 - });  
767 -  
768 -  
769 - });  
770 -  
771 -  
772 - function DateMinus(date1){  
773 - if(date1==null){  
774 - return true;  
775 - }  
776 -  
777 - var sdate = new Date(date1);  
778 - var now = new Date();  
779 - var days = sdate.getTime()-now.getTime();  
780 - var day = parseInt(days / (1000 * 60 * 60 * 24));  
781 - console.log(day);  
782 - if(day<120){  
783 - return false;  
784 - }  
785 - return true; 338 + {
  339 + field: 'roadType',
  340 + title: '道路类型'
  341 + },
  342 + {
  343 + field: 'ticketPrice',
  344 + title: '票价'
  345 + },
  346 + {
  347 + field: 'firstStation',
  348 + title: '首站'
  349 + },
  350 + {
  351 + field: 'startEnd',
  352 + title: '起讫站'
  353 + },
  354 + {
  355 + field: 'firstTime',
  356 + title: '首战时间'
  357 + },
  358 + {
  359 + field: 'lastStation',
  360 + title: '末站'
  361 + },
  362 + {
  363 + field: 'lastTime',
  364 + title: '末站首战时间'
  365 + },
  366 + {
  367 + field: 'mileageUp',
  368 + title: '上行里程数'
  369 + },
  370 + {
  371 + field: 'mileageDown',
  372 + title: '下行里程数'
  373 + },
  374 + {
  375 + field: 'averageMileage',
  376 + title: '平均里程数'
  377 + },
  378 + {
  379 + field: 'stationUp',
  380 + title: '站级数(上行)'
  381 + },
  382 + {
  383 + field: 'stationDown',
  384 + title: '站级数(下行)'
  385 + },{
  386 + field: 'travelTimeUp',
  387 + title: '行驶时间(上行)'
  388 + },{
  389 + field: 'travelTimeDown',
  390 + title: '行驶时间(下行)'
  391 + },{
  392 + field: 'travelIntervalUp',
  393 + title: '行驶间隔(高峰)'
  394 + },{
  395 + field: 'travelIntervalDown',
  396 + title: '行驶间隔(低谷)'
  397 + },{
  398 + field: 'warrantVehiclesLarge',
  399 + title: '经营权证(大巴)'
  400 + }, {
  401 + field: 'warrantVehiclesMiddle',
  402 + title: '经营权证(中巴)'
  403 + },{
  404 + field: 'vehiclesNumber',
  405 + title: '实际配车数'
  406 + }, {
  407 + field: 'numberVehiclesLarge',
  408 + title: '实际车辆数(大巴)'
  409 + }, {
  410 + field: 'numberVehiclesMiddle',
  411 + title: '实际车辆数(中巴)'
  412 + },{
  413 + field: 'carPlate',
  414 + title: '车辆自编号'
  415 + },{
  416 + field: 'numberPerson',
  417 + title: '线路总配人数'
  418 + },{
  419 + field: 'numberPersonDriver',
  420 + title: '人数司机'
  421 + }, {
  422 + field: 'numberPersonSales',
  423 + title: '售票员数'
  424 + },{
  425 + field: 'busEvNumber',
  426 + title: '新能源车数'
  427 + },{
  428 + field: 'directions',
  429 + title: '线路走向'
  430 + },{
  431 + field: 'numberOfManage',
  432 + title: '经营权证数'
  433 + },{
  434 + field: 'halfwayStation',
  435 + title: '站点名称'
  436 + },{
  437 + field: 'fullCustomerPercent',
  438 + title: '高峰系数'
  439 + },{
  440 + field: 'lowCustomerPercent',
  441 + title: '低谷系数'
  442 + }, {
  443 + field: 'divideLevel',
  444 + title: '间隔等级'
  445 + },{
  446 + field: 'hasTimelists',
  447 + title: '是否挂牌'
  448 + },{
  449 + field: 'isMetro',
  450 + title: '是否轨交末班车衔接'
  451 + },{
  452 + field: 'metroTime',
  453 + title: '轨交时间'
  454 + },{
  455 + field: 'coldBonusType',
  456 + title: '冷僻线路补贴类型'
  457 + }*/];
  458 +
  459 +
  460 + createTable(cols);
  461 + });
  462 +
  463 +
  464 +
  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: ['通过','未通过'],
  476 + yes: function () {
  477 + var data={'id':id,'examineType':examineType,'examineStatus':'2'}
  478 + $.post(url, data, function(result) {
  479 + if (result.code == web_status.SUCCESS) {
  480 + $.modal.closeAll();
  481 + $.table.refresh();
  482 + $.modal.alertSuccess(result.msg);
  483 + }else {
  484 + $.modal.alertError(result.msg);
  485 + }
  486 + });
  487 + },
  488 + btn2:function () {
  489 + var data={'id':id,'examineType':examineType,'examineStatus':'1'}
  490 + $.post(url, data, function(result) {
  491 + if (result.code == web_status.SUCCESS) {
  492 + $.table.refresh();
  493 + $.modal.alertSuccess(result.msg)
  494 + }else {
  495 + $.modal.alertError(result.msg);
  496 + }
  497 + });
  498 + }
  499 + };
  500 + $.modal.openOptions(options);
786 } 501 }
787 - </script>  
788 502
  503 + </script>
789 <style> 504 <style>
790 .col_checkbox { 505 .col_checkbox {
791 width: 33%; 506 width: 33%;
bsthLineProfiles/src/main/resources/templates/system/lineHistory/add.html
  View file @7d71c02
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html lang="zh" xmlns:th="http://www.thymeleaf.org" > 2 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
3 <head> 3 <head>
4 - <th:block th:include="include :: header('新增【请填写功能名称】')" /> 4 + <th:block th:include="include :: header('添加线路档案信息')" />
5 <th:block th:include="include :: datetimepicker-css" /> 5 <th:block th:include="include :: datetimepicker-css" />
6 </head> 6 </head>
7 <body class="white-bg"> 7 <body class="white-bg">
8 <div class="wrapper wrapper-content animated fadeInRight ibox-content"> 8 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
9 <form class="form-horizontal m" id="form-line-add"> 9 <form class="form-horizontal m" id="form-line-add">
10 <div class="form-group"> 10 <div class="form-group">
11 - <label class="col-sm-3 control-label">夜间停车场(无)：</label>  
12 - <div class="col-sm-8">  
13 - <input name="eventId" class="form-control" type="text">  
14 - </div>  
15 - </div>  
16 - <div class="form-group">  
17 - <label class="col-sm-3 control-label">夜间停车场(无)：</label>  
18 - <div class="col-sm-8">  
19 - <input name="lineId" class="form-control" type="text">  
20 - </div>  
21 - </div>  
22 - <div class="form-group">  
23 <label class="col-sm-3 control-label">线路名称：</label> 11 <label class="col-sm-3 control-label">线路名称：</label>
24 <div class="col-sm-8"> 12 <div class="col-sm-8">
25 <input name="lineName" class="form-control" type="text"> 13 <input name="lineName" class="form-control" type="text">
@@ -44,78 +32,130 @@ @@ -44,78 +32,130 @@
44 </div> 32 </div>
45 </div> 33 </div>
46 <div class="form-group"> 34 <div class="form-group">
47 - <label class="col-sm-3 control-label">营运方式 全程/区间/大站/定班/跨线/B线：</label> 35 + <label class="col-sm-3 control-label">营运方式：</label>
48 <div class="col-sm-8"> 36 <div class="col-sm-8">
49 - <select name="serviceType" class="form-control m-b">  
50 - <option value="">所有</option> 37 + <select name="serviceType"
  38 + th:with="type=${@dict.getType('serviceType')}"
  39 + class="form-control m-b">
  40 + <option value=""></option>
  41 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  42 + th:value="${dict.dictValue}">
  43 +
  44 + </option>
51 </select> 45 </select>
52 - <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>  
53 </div> 46 </div>
54 </div> 47 </div>
55 - <div class="form-group"> 48 +
  49 + <div class="form-group">
56 <label class="col-sm-3 control-label">线路属性：</label> 50 <label class="col-sm-3 control-label">线路属性：</label>
57 <div class="col-sm-8"> 51 <div class="col-sm-8">
58 - <input name="lineLevel" class="form-control" type="text"> 52 + <select name="lineLevel"
  53 + th:with="type=${@dict.getType('lineLevel')}"
  54 + class="form-control m-b">
  55 + <option value=""></option>
  56 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  57 + th:value="${dict.dictValue}">
  58 + </option>
  59 + </select>
59 </div> 60 </div>
60 </div> 61 </div>
61 <div class="form-group"> 62 <div class="form-group">
62 - <label class="col-sm-3 control-label">线路属性：</label> 63 + <label class="col-sm-3 control-label">线路类型：</label>
63 <div class="col-sm-8"> 64 <div class="col-sm-8">
64 - <select name="lineType" class="form-control m-b">  
65 - <option value="">所有</option> 65 + <select name="lineType" th:with="type=${@dict.getType('lineType')}"
  66 + class="form-control m-b">
  67 + <option value=""></option>
  68 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  69 + th:value="${dict.dictValue}">
  70 + </option>
66 </select> 71 </select>
67 - <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>  
68 </div> 72 </div>
69 </div> 73 </div>
70 <div class="form-group"> 74 <div class="form-group">
71 <label class="col-sm-3 control-label">区属：</label> 75 <label class="col-sm-3 control-label">区属：</label>
72 <div class="col-sm-8"> 76 <div class="col-sm-8">
73 - <input name="district" class="form-control" type="text"> 77 + <select name="district" th:with="type=${@dict.getType('district')}"
  78 + class="form-control m-b">
  79 + <option value=""></option>
  80 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  81 + th:value="${dict.dictValue}">
  82 + </option>
  83 + </select>
74 </div> 84 </div>
75 </div> 85 </div>
76 <div class="form-group"> 86 <div class="form-group">
77 <label class="col-sm-3 control-label">是否区内：</label> 87 <label class="col-sm-3 control-label">是否区内：</label>
78 <div class="col-sm-8"> 88 <div class="col-sm-8">
79 - <input name="inoutDistrict" class="form-control" type="text"> 89 + <select name="inoutDistrict"
  90 + th:with="type=${@dict.getType('trueFalse')}"
  91 + class="form-control m-b">
  92 + <option value=""></option>
  93 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  94 + th:value="${dict.dictValue}">
  95 +
  96 + </option>
  97 + </select>
80 </div> 98 </div>
81 </div> 99 </div>
82 <div class="form-group"> 100 <div class="form-group">
83 - <label class="col-sm-3 control-label">营运状态 运营中/撤销/暂停：</label> 101 + <label class="col-sm-3 control-label">营运状态：</label>
84 <div class="col-sm-8"> 102 <div class="col-sm-8">
85 - <input name="serviceState" class="form-control" type="text"> 103 + <select name="serviceState"
  104 + th:with="type=${@dict.getType('serviceState')}"
  105 + class="form-control m-b">
  106 + <option value=""></option>
  107 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  108 + th:value="${dict.dictValue}">
  109 + </option>
  110 + </select>
86 </div> 111 </div>
87 </div> 112 </div>
88 <div class="form-group"> 113 <div class="form-group">
89 <label class="col-sm-3 control-label">车辆类型 多选：</label> 114 <label class="col-sm-3 control-label">车辆类型 多选：</label>
90 - <div class="col-sm-8">  
91 - <select name="busType" class="form-control m-b">  
92 - <option value="">所有</option>  
93 - </select>  
94 - <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span> 115 + <div class="col-sm-8" th:with="type=${@dict.getType('busType')}">
  116 + <label class="checkbox-inline" th:each="dict : ${type}"
  117 + style="display: block"> <input type="checkbox"
  118 + name="busType"
  119 + th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
95 </div> 120 </div>
96 </div> 121 </div>
97 <div class="form-group"> 122 <div class="form-group">
98 <label class="col-sm-3 control-label">是否空调：</label> 123 <label class="col-sm-3 control-label">是否空调：</label>
99 <div class="col-sm-8"> 124 <div class="col-sm-8">
100 - <select name="airConditionerType" class="form-control m-b">  
101 - <option value="">所有</option> 125 + <select name="airConditionerType"
  126 + th:with="type=${@dict.getType('airConditionerType')}"
  127 + class="form-control m-b">
  128 + <option value=""></option>
  129 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  130 + th:value="${dict.dictValue}">
  131 + </option>
102 </select> 132 </select>
103 - <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>  
104 </div> 133 </div>
105 </div> 134 </div>
106 <div class="form-group"> 135 <div class="form-group">
107 <label class="col-sm-3 control-label">售票类型：</label> 136 <label class="col-sm-3 control-label">售票类型：</label>
108 <div class="col-sm-8"> 137 <div class="col-sm-8">
109 - <select name="sellTicketType" class="form-control m-b">  
110 - <option value="">所有</option> 138 + <select name="sellTicketType"
  139 + th:with="type=${@dict.getType('sellTicketType')}"
  140 + class="form-control m-b">
  141 + <option value=""></option>
  142 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  143 + th:value="${dict.dictValue}">
  144 + </option>
111 </select> 145 </select>
112 - <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>  
113 </div> 146 </div>
114 </div> 147 </div>
115 <div class="form-group"> 148 <div class="form-group">
116 <label class="col-sm-3 control-label">运营时间：</label> 149 <label class="col-sm-3 control-label">运营时间：</label>
117 <div class="col-sm-8"> 150 <div class="col-sm-8">
118 - <input name="serviceTime" class="form-control" type="text"> 151 + <select name="serviceTime"
  152 + th:with="type=${@dict.getType('serviceTime')}"
  153 + class="form-control m-b">
  154 + <option value=""></option>
  155 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  156 + th:value="${dict.dictValue}">
  157 + </option>
  158 + </select>
119 </div> 159 </div>
120 </div> 160 </div>
121 <div class="form-group"> 161 <div class="form-group">
@@ -187,7 +227,14 @@ @@ -187,7 +227,14 @@
187 <div class="form-group"> 227 <div class="form-group">
188 <label class="col-sm-3 control-label">是否逻辑删除：</label> 228 <label class="col-sm-3 control-label">是否逻辑删除：</label>
189 <div class="col-sm-8"> 229 <div class="col-sm-8">
190 - <input name="isLogicDelete" class="form-control" type="text"> 230 + <select name="isLogicDelete"
  231 + th:with="type=${@dict.getType('trueFalse')}"
  232 + class="form-control m-b">
  233 + <option value=""></option>
  234 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  235 + th:value="${dict.dictValue}">
  236 + </option>
  237 + </select>
191 </div> 238 </div>
192 </div> 239 </div>
193 <div class="form-group"> 240 <div class="form-group">
@@ -223,16 +270,49 @@ @@ -223,16 +270,49 @@
223 <div class="form-group"> 270 <div class="form-group">
224 <label class="col-sm-3 control-label">是否权证：</label> 271 <label class="col-sm-3 control-label">是否权证：</label>
225 <div class="col-sm-8"> 272 <div class="col-sm-8">
226 - <input name="isWarrant" class="form-control" type="text"> 273 + <select name="isWarrant" id="isWarrant"
  274 + th:with="type=${@dict.getType('trueFalse')}"
  275 + class="form-control m-b">
  276 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  277 + th:value="${dict.dictValue}" th:selected="${dict.dictValue=='1'}">
  278 + </option>
  279 + </select>
  280 + </div>
  281 + </div>
  282 + <div class="form-group">
  283 + <label class="col-sm-3 control-label">权证开通日期：</label>
  284 + <div class="col-sm-8">
  285 + <div class="input-group date">
  286 + <input name="isWarrantStartTime" id="isWarrantStartTime"
  287 + class="form-control" placeholder="yyyy-MM-dd" type="text"
  288 + autocomplete="off"> <span class="input-group-addon"><i
  289 + class="fa fa-calendar"></i></span>
  290 + </div>
  291 +
  292 + </div>
  293 + </div>
  294 + <div class="form-group">
  295 + <label class="col-sm-3 control-label">权证到期日期：</label>
  296 + <div class="col-sm-8">
  297 + <div class="input-group date">
  298 + <input name="isWarrantEndTime" id="isWarrantEndTime"
  299 + class="form-control" placeholder="yyyy-MM-dd" type="text"
  300 + autocomplete="off"> <span class="input-group-addon"><i
  301 + class="fa fa-calendar"></i></span>
  302 + </div>
  303 +
227 </div> 304 </div>
228 </div> 305 </div>
229 <div class="form-group"> 306 <div class="form-group">
230 <label class="col-sm-3 control-label">道路类型：</label> 307 <label class="col-sm-3 control-label">道路类型：</label>
231 <div class="col-sm-8"> 308 <div class="col-sm-8">
232 - <select name="roadType" class="form-control m-b">  
233 - <option value="">所有</option>  
234 - </select>  
235 - <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span> 309 + <div class="col-sm-8" th:with="type=${@dict.getType('roadType')}">
  310 + <label class="checkbox-inline" th:each="dict : ${type}"
  311 + style="display: block"> <input type="checkbox"
  312 + name="roadType"
  313 + th:text="${dict.dictLabel}" th:value="${dict.dictValue}" />
  314 + </label>
  315 + </div>
236 </div> 316 </div>
237 </div> 317 </div>
238 <div class="form-group"> 318 <div class="form-group">
@@ -326,13 +406,13 @@ @@ -326,13 +406,13 @@
326 </div> 406 </div>
327 </div> 407 </div>
328 <div class="form-group"> 408 <div class="form-group">
329 - <label class="col-sm-3 control-label">经营权证：</label> 409 + <label class="col-sm-3 control-label">经营权证（大巴）：</label>
330 <div class="col-sm-8"> 410 <div class="col-sm-8">
331 <input name="warrantVehiclesLarge" class="form-control" type="text"> 411 <input name="warrantVehiclesLarge" class="form-control" type="text">
332 </div> 412 </div>
333 </div> 413 </div>
334 <div class="form-group"> 414 <div class="form-group">
335 - <label class="col-sm-3 control-label">经营权证：</label> 415 + <label class="col-sm-3 control-label">经营权证（中巴）：</label>
336 <div class="col-sm-8"> 416 <div class="col-sm-8">
337 <input name="warrantVehiclesMiddle" class="form-control" type="text"> 417 <input name="warrantVehiclesMiddle" class="form-control" type="text">
338 </div> 418 </div>
@@ -344,13 +424,13 @@ @@ -344,13 +424,13 @@
344 </div> 424 </div>
345 </div> 425 </div>
346 <div class="form-group"> 426 <div class="form-group">
347 - <label class="col-sm-3 control-label">实际车辆数：</label> 427 + <label class="col-sm-3 control-label">实际车辆数（大）：</label>
348 <div class="col-sm-8"> 428 <div class="col-sm-8">
349 <input name="numberVehiclesLarge" class="form-control" type="text"> 429 <input name="numberVehiclesLarge" class="form-control" type="text">
350 </div> 430 </div>
351 </div> 431 </div>
352 <div class="form-group"> 432 <div class="form-group">
353 - <label class="col-sm-3 control-label">实际车辆数：</label> 433 + <label class="col-sm-3 control-label">实际车辆数（中）：</label>
354 <div class="col-sm-8"> 434 <div class="col-sm-8">
355 <input name="numberVehiclesMiddle" class="form-control" type="text"> 435 <input name="numberVehiclesMiddle" class="form-control" type="text">
356 </div> 436 </div>
@@ -424,14 +504,24 @@ @@ -424,14 +504,24 @@
424 <div class="form-group"> 504 <div class="form-group">
425 <label class="col-sm-3 control-label">是否挂牌：</label> 505 <label class="col-sm-3 control-label">是否挂牌：</label>
426 <div class="col-sm-8"> 506 <div class="col-sm-8">
427 - <input name="hasTimelists" class="form-control" type="text"> 507 + <select name="hasTimelists"
  508 + th:with="type=${@dict.getType('trueFalse')}"
  509 + class="form-control m-b">
  510 + <option value=""></option>
  511 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  512 + th:value="${dict.dictValue}">
  513 + </option>
  514 + </select>
428 </div> 515 </div>
429 </div> 516 </div>
430 <div class="form-group"> 517 <div class="form-group">
431 <label class="col-sm-3 control-label">是否轨交末班车衔接：</label> 518 <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
432 - <div class="col-sm-8">  
433 - <input name="isMetro" class="form-control" type="text">  
434 - </div> 519 + <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}"
  520 + class="form-control m-b">
  521 + <option value=""></option>
  522 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  523 + th:value="${dict.dictValue}"></option>
  524 + </select>
435 </div> 525 </div>
436 <div class="form-group"> 526 <div class="form-group">
437 <label class="col-sm-3 control-label">轨交时间：</label> 527 <label class="col-sm-3 control-label">轨交时间：</label>
@@ -445,10 +535,7 @@ @@ -445,10 +535,7 @@
445 <div class="form-group"> 535 <div class="form-group">
446 <label class="col-sm-3 control-label">冷僻线路补贴类型：</label> 536 <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
447 <div class="col-sm-8"> 537 <div class="col-sm-8">
448 - <select name="coldBonusType" class="form-control m-b">  
449 - <option value="">所有</option>  
450 - </select>  
451 - <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span> 538 + <input name="coldBonusType" lass="form-control" type="text">
452 </div> 539 </div>
453 </div> 540 </div>
454 <div class="form-group"> 541 <div class="form-group">
@@ -508,12 +595,6 @@ @@ -508,12 +595,6 @@
508 </div> 595 </div>
509 </div> 596 </div>
510 </div> 597 </div>
511 - <div class="form-group">  
512 - <label class="col-sm-3 control-label">夜间停车场(无)：</label>  
513 - <div class="col-sm-8">  
514 - <input name="nightParking" class="form-control" type="text">  
515 - </div>  
516 - </div>  
517 </form> 598 </form>
518 </div> 599 </div>
519 <th:block th:include="include :: footer" /> 600 <th:block th:include="include :: footer" />
@@ -521,7 +602,26 @@ @@ -521,7 +602,26 @@
521 <script th:inline="javascript"> 602 <script th:inline="javascript">
522 var prefix = ctx + "system/line" 603 var prefix = ctx + "system/line"
523 $("#form-line-add").validate({ 604 $("#form-line-add").validate({
524 - focusCleanup: true 605 + rules:{
  606 + isWarrantStartTime:{
  607 + required:function (){
  608 + return $('#isWarrant').val()==='1';
  609 + },
  610 + },
  611 + isWarrantEndTime:{
  612 + required:function (){
  613 + return $('#isWarrant').val()==='1';
  614 + },
  615 + },
  616 + },
  617 + messages: {
  618 + isWarrantStartTime: {
  619 + required: "请选择日期",
  620 + },
  621 + isWarrantEndTime: {
  622 + required: "请选择日期",
  623 + }
  624 + },focusCleanup: true
525 }); 625 });
526 626
527 function submitHandler() { 627 function submitHandler() {
@@ -577,6 +677,18 @@ @@ -577,6 +677,18 @@
577 minView: "month", 677 minView: "month",
578 autoclose: true 678 autoclose: true
579 }); 679 });
  680 +
  681 + $("input[name='isWarrantStartTime']").datetimepicker({
  682 + format: "yyyy-mm-dd",
  683 + minView: "month",
  684 + autoclose: true
  685 + });
  686 + $("input[name='isWarrantEndTime']").datetimepicker({
  687 + format: "yyyy-mm-dd",
  688 + minView: "month",
  689 + autoclose: true
  690 + });
  691 +
580 </script> 692 </script>
581 </body> 693 </body>
582 </html> 694 </html>
583 \ No newline at end of file 695 \ No newline at end of file
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @7d71c02
@@ -117,7 +117,7 @@ @@ -117,7 +117,7 @@
117 </div> 117 </div>
118 <div class="form-group"> 118 <div class="form-group">
119 <label class="col-sm-3 control-label">车辆类型：</label> 119 <label class="col-sm-3 control-label">车辆类型：</label>
120 - <div class="col-sm-8" th:with="type=${@dict.getType('busType')}"> 120 + <div class="col-sm-8" th:with="type=${@dict.getType('busType')}" name="busType">
121 <label class="checkbox-inline" th:each="dict : ${type}" 121 <label class="checkbox-inline" th:each="dict : ${type}"
122 style="display: block"> <input type="checkbox" 122 style="display: block"> <input type="checkbox"
123 name="busType" 123 name="busType"
@@ -290,7 +290,7 @@ @@ -290,7 +290,7 @@
290 <div class="form-group"> 290 <div class="form-group">
291 <label class="col-sm-3 control-label">道路类型：</label> 291 <label class="col-sm-3 control-label">道路类型：</label>
292 <div class="col-sm-8"> 292 <div class="col-sm-8">
293 - <div class="col-sm-8" th:with="type=${@dict.getType('roadType')}"> 293 + <div class="col-sm-8" th:with="type=${@dict.getType('roadType')}" name="roadType">
294 <label class="checkbox-inline" th:each="dict : ${type}" 294 <label class="checkbox-inline" th:each="dict : ${type}"
295 style="display: block"> <input type="checkbox" 295 style="display: block"> <input type="checkbox"
296 name="roadType" 296 name="roadType"
@@ -560,7 +560,7 @@ @@ -560,7 +560,7 @@
560 class="form-control" type="text"> 560 class="form-control" type="text">
561 </div> 561 </div>
562 </div> 562 </div>
563 - <div class="form-group"> 563 + <!--<div class="form-group">
564 <label class="col-sm-3 control-label">月度营收：</label> 564 <label class="col-sm-3 control-label">月度营收：</label>
565 <div class="col-sm-8"> 565 <div class="col-sm-8">
566 <input name="revenuesMonth" th:field="*{revenuesMonth}" 566 <input name="revenuesMonth" th:field="*{revenuesMonth}"
@@ -615,7 +615,7 @@ @@ -615,7 +615,7 @@
615 <input name="personAvg" th:field="*{personAvg}" 615 <input name="personAvg" th:field="*{personAvg}"
616 class="form-control" type="text"> 616 class="form-control" type="text">
617 </div> 617 </div>
618 - </div> 618 + </div>-->
619 619
620 <div class="form-group"> 620 <div class="form-group">
621 <label class="col-sm-3 control-label">启用时间：</label> 621 <label class="col-sm-3 control-label">启用时间：</label>
@@ -692,13 +692,30 @@ @@ -692,13 +692,30 @@
692 } 692 }
693 } 693 }
694 }); */ 694 }); */
695 -  
696 $.post("/system/line/findByName", 695 $.post("/system/line/findByName",
697 { 696 {
698 name : $("#lineName").val() 697 name : $("#lineName").val()
699 }, 698 },
700 function(data) { 699 function(data) {
701 - for ( var i in data) { 700 + var bsthTLineOld=data[0];
  701 + var bsthTLineNew=data[1];
  702 + if(bsthTLineNew!=null){
  703 + console.log(bsthTLineNew)
  704 + for(let i in bsthTLineOld){
  705 + var o=bsthTLineOld[i]==null?'':bsthTLineOld[i];
  706 + var n=bsthTLineNew[i]==null?'':bsthTLineNew[i];
  707 + if(o!=n){
  708 + console.log(i)
  709 + i=i=='fcompany'?'fCompany':i;
  710 + i=i=='plineId'?'pLineId':i;
  711 + var input=document.getElementsByName(i)[0];
  712 + if(input!=undefined){
  713 + input.style.color='red'
  714 + }
  715 + }
  716 + }
  717 + }
  718 + /*for ( var i in data) {
702 719
703 if(i == "fcompany"){ 720 if(i == "fcompany"){
704 console.log(i); 721 console.log(i);
@@ -747,7 +764,7 @@ @@ -747,7 +764,7 @@
747 764
748 } 765 }
749 766
750 - } 767 + }*/
751 768
752 }); 769 });
753 770
bsthLineProfiles/src/main/resources/templates/system/lineHistory/line.html
  View file @7d71c02
@@ -11,26 +11,23 @@ @@ -11,26 +11,23 @@
11 <form id="formId"> 11 <form id="formId">
12 <div class="select-list"> 12 <div class="select-list">
13 <ul> 13 <ul>
14 - <li><label>线路名称：</label> <input type="text" name="lineName" /></li>  
15 -  
16 - <li><label>启用日期：</label> <input type="text" class="time-input" placeholder="" name="startDate" /></li>  
17 - 14 + <li><label>公司：</label> <input type="text" name="company" />
  15 + </li>
  16 + <li><label>分公司：</label> <input type="text" name="fCompany" />
  17 + </li>
  18 + <li><label>线路名称：</label> <input type="text" name="lineName" />
  19 + </li>
18 <li> 20 <li>
19 <el-button size="mini" type="primary" icon="el-icon-search" onClick="$.table.search();">搜索</el-button> 21 <el-button size="mini" type="primary" icon="el-icon-search" onClick="$.table.search();">搜索</el-button>
20 <el-button size="mini" icon="el-icon-refresh" onClick="$.form.reset();">重置</el-button> 22 <el-button size="mini" icon="el-icon-refresh" onClick="$.form.reset();">重置</el-button>
21 </li> 23 </li>
22 -  
23 </ul> 24 </ul>
24 25
25 </div> 26 </div>
26 </form> 27 </form>
27 </div> 28 </div>
28 29
29 - <div class="btn-group-sm" id="toolbar" role="group">  
30 -  
31 - <el-button plain size="mini" type="warning" icon="el-icon-download" onClick="$.table.exportExcel();" shiro:hasPermission="system:line:export"> 导出</el-button>  
32 -  
33 - </div> 30 +
34 <div class="col-sm-12 select-table table-striped"> 31 <div class="col-sm-12 select-table table-striped">
35 <table id="bootstrap-table"></table> 32 <table id="bootstrap-table"></table>
36 </div> 33 </div>
@@ -47,13 +44,13 @@ @@ -47,13 +44,13 @@
47 <h4 class="modal-title" id="myModalLabel">选择显示的列</h4> 44 <h4 class="modal-title" id="myModalLabel">选择显示的列</h4>
48 </div> 45 </div>
49 <div class="modal-body" id="cols" style="float: left;"> 46 <div class="modal-body" id="cols" style="float: left;">
50 - <input type="checkbox" onClick="checkAll(this);"  
51 - id="checkboxForAll" /><label>全选</label><br /> <br /> 47 + <input type="checkbox" onClick="checkAll(this);" id="checkboxForAll"/><label>全选</label><br />
  48 + <br />
  49 +
52 </div> 50 </div>
53 <div class="modal-footer"> 51 <div class="modal-footer">
54 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button> 52 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
55 - <button type="button" class="btn btn-primary" data-dismiss="modal"  
56 - onClick="initTable();">提交更改</button> 53 + <button type="button" class="btn btn-primary" data-dismiss="modal" onClick="initTable();">提交更改</button>
57 </div> 54 </div>
58 </div> 55 </div>
59 <!-- /.modal-content --> 56 <!-- /.modal-content -->
@@ -62,120 +59,449 @@ @@ -62,120 +59,449 @@
62 </div> 59 </div>
63 60
64 61
  62 +
65 <script th:inline="javascript"> 63 <script th:inline="javascript">
66 64
67 - new Vue({  
68 - el: '#context',  
69 - data: function() {  
70 - return { visible: false }  
71 - }  
72 - })  
73 - var dicts = [[${@dict.getType('')}]];  
74 -  
75 - var table;  
76 -  
77 -  
78 - function updateToLineInfo(){  
79 - var rows = $.table.selectFirstColumns();  
80 - var ids = "";  
81 - for(var i in rows){  
82 - ids += rows[i] + ",";  
83 - 65 + function add(obj){
  66 + if($(obj)[0].className.indexOf("disabled") == -1)
  67 + $.operate.add();
  68 + }
  69 +
  70 + new Vue({
  71 + el: '#context',
  72 + data: function() {
  73 + return { visible: false }
  74 + }
  75 + })
  76 + var dicts = [[${@dict.getType('')}]];
  77 +
  78 + function queryParams(params) {
  79 + var search = $.table.queryParams(params);
  80 + search.examineStatus ='true';
  81 + search.examineType='0';
  82 + return search;
84 } 83 }
85 - updateToLineInfoById(ids);  
86 - }  
87 -  
88 - function updateToLineInfoById(id){  
89 - $.post("/system/lineHistory/updateToLineInfo",{rows:id},function(data){  
90 - $.modal.msg(data.msg);  
91 - $.table.refresh(); 84 +
  85 + function createTable(objs){
  86 + var options = {
  87 + url: prefix + "/list",
  88 + updateUrl: prefix + "/edit/{id}",
  89 + queryParams: queryParams,
  90 + modalName: "线路档案信息变更",
  91 + columns: [],
  92 + onDblClickRow:function (row,index){
  93 + edit(row.id);
  94 + }
  95 + };
  96 +
  97 +
  98 + if(objs.length > 0){
  99 + options.columns[0] = {checkbox:true};
  100 + options.columns[1] = {visible:false,field:"id"};
  101 + }
  102 +
  103 + for(var i = 0;i< objs.length;i++){
  104 +
  105 + if(!objs)continue;
  106 +
  107 + var col = {
  108 + field: objs[i].field,
  109 + title: objs[i].title,
  110 + align: 'center',
  111 + formatter: function(value, row, index) {
  112 +
  113 +
  114 + if(this.field == "roadType" || this.field == "busType"){
  115 + if(value != null){
  116 +
  117 + var arr = value.split(",");
  118 + value = "";
  119 + for(var i in arr){
  120 +
  121 + for(var j in dicts[this.field]){
  122 + if(dicts[this.field][j].dictValue == arr[i]){
  123 + value += dicts[this.field][j].dictLabel + ","
  124 + break;
  125 + }
  126 + }
  127 +
  128 + }
  129 + return $.table.tooltip(value.substring(0,value.length -1), 5);
  130 + }
  131 + }
  132 +
  133 + if(this.field == "isLogicDelete" || this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists"){
  134 + for(var j in dicts["trueFalse"]){
  135 + if(dicts["trueFalse"][j].dictValue == value){
  136 + value = dicts["trueFalse"][j].dictLabel;
  137 + break;
  138 + }
  139 + }
  140 + }
  141 +
  142 +
  143 +
  144 + if(dicts[this.field]){
  145 + for(var j in dicts[this.field]){
  146 + if(dicts[this.field][j].dictValue == value){
  147 + value = dicts[this.field][j].dictLabel;
  148 + break;
  149 + }
  150 + }
  151 + }
  152 +
  153 + return $.table.tooltip(value, 5);
  154 + }
  155 + }
  156 +
  157 + options.columns.push(col);
  158 +
  159 + }
  160 +
  161 + $.table.init(options);
  162 +
  163 +
  164 + }
  165 +
  166 + function checkAll(obj){
  167 + var objs = $("#cols input");
  168 +
  169 + if(obj.checked == false){
  170 + for(var i in objs){
  171 + objs[i].checked = false;
  172 + }
  173 + }else{
  174 + for(var i in objs){
  175 + objs[i].checked = true;
  176 + }
  177 + }
  178 + }
  179 +
  180 +
  181 + var editFlag = [[${@permission.hasPermi('system:lineReport:edit')}]];
  182 + var removeFlag = [[${@permission.hasPermi('system:lineReport:remove')}]];
  183 + var prefix = ctx + "system/lineHistory";
  184 +
  185 + $(function() {
  186 +
  187 +
  188 +
  189 +
  190 + var allDicts = {};
  191 +
  192 + for(var i in dicts){
  193 + if(!allDicts[dicts[i].dictType]){
  194 + allDicts[dicts[i].dictType] = [];
  195 + }
  196 + allDicts[dicts[i].dictType].push(dicts[i]);
  197 + }
  198 +
  199 + dicts = allDicts;
  200 +
  201 +
  202 + var cols = [{
  203 + field: 'lineName',
  204 + title: '线路名称',
  205 + },
  206 + {
  207 + field: 'company',
  208 + title: '公司'
  209 + },
  210 + {
  211 + field: 'fCompany',
  212 + title: '分公司'
  213 + },
  214 + {
  215 + field: 'pLineId',
  216 + title: '主线路id'
  217 + },
  218 + {
  219 + field: 'serviceType',
  220 + title: '营运方式'
  221 + },
  222 + {
  223 + field: 'lineLevel',
  224 + title: '线路属性'
  225 + },
  226 + {
  227 + field: 'lineType',
  228 + title: '线路属性'
  229 + },
  230 + {
  231 + field: 'district',
  232 + title: '区属'
  233 + },
  234 + {
  235 + field: 'inoutDistrict',
  236 + title: '是否区内'
  237 + },
  238 + {
  239 + field: 'serviceState',
  240 + title: '营运状态'
  241 + },
  242 + {
  243 + field: 'busType',
  244 + title: '车辆类型'
  245 + },
  246 + {
  247 + field: 'airConditionerType',
  248 + title: '是否空调'
  249 + },
  250 + {
  251 + field: 'sellTicketType',
  252 + title: '售票类型'
  253 + },
  254 + {
  255 + field: 'serviceTime',
  256 + title: '运营时间'
  257 + },
  258 + {
  259 + field: 'lineDistance',
  260 + title: '线路长度'
  261 + },
  262 + {
  263 + field: 'lineCode',
  264 + title: '线路编码'
  265 + },
  266 + {
  267 + field: 'warrantYear',
  268 + title: '授权年限'
  269 + },
  270 + {
  271 + field: 'warrantStartTime',
  272 + title: '授权起始日期'
  273 + },
  274 + {
  275 + field: 'warrantEndTime',
  276 + title: '授权结束日期'
  277 + },
  278 + {
  279 + field: 'planCancelTime',
  280 + title: '撤销日期'
  281 + },
  282 + {
  283 + field: 'cancelTime',
  284 + title: '实际撤销日期'
  285 + },
  286 + {
  287 + field: 'cancelReason',
  288 + title: '撤销原因'
  289 + },
  290 + {
  291 + field: 'remark',
  292 + title: '备注'
  293 + },
  294 + {
  295 + field: 'isLogicDelete',
  296 + title: '是否逻辑删除'
  297 + },
  298 + {
  299 + field: 'updateBy',
  300 + title: '更新人'
  301 + },
  302 + {
  303 + field: 'updateTime',
  304 + title: '更新时间'
  305 + },
  306 + {
  307 + field: 'timeSchedule',
  308 + title: '行车作业计划表报备时间'
  309 + },
  310 + {
  311 + field: 'park',
  312 + title: '停车场'
  313 + },
  314 + {
  315 + field: 'isWarrant',
  316 + title: '是否权证'
  317 + },
  318 + {
  319 + field: 'isWarrantStartTime',
  320 + title: '权证开通日期'
  321 + },
  322 + {
  323 + field: 'isWarrantEndTime',
  324 + title: '权证到期日期'
  325 + },
  326 + {
  327 + field: 'roadType',
  328 + title: '道路类型'
  329 + },
  330 + {
  331 + field: 'ticketPrice',
  332 + title: '票价'
  333 + },
  334 + {
  335 + field: 'firstStation',
  336 + title: '首站'
  337 + },
  338 + {
  339 + field: 'startEnd',
  340 + title: '起讫站'
  341 + },
  342 + {
  343 + field: 'firstTime',
  344 + title: '首战时间'
  345 + },
  346 + {
  347 + field: 'lastStation',
  348 + title: '末站'
  349 + },
  350 + {
  351 + field: 'lastTime',
  352 + title: '末站首战时间'
  353 + },
  354 + {
  355 + field: 'mileageUp',
  356 + title: '上行里程数'
  357 + },
  358 + {
  359 + field: 'mileageDown',
  360 + title: '下行里程数'
  361 + },
  362 + {
  363 + field: 'averageMileage',
  364 + title: '平均里程数'
  365 + },
  366 + {
  367 + field: 'stationUp',
  368 + title: '站级数(上行)'
  369 + },
  370 + {
  371 + field: 'stationDown',
  372 + title: '站级数(下行)'
  373 + },{
  374 + field: 'travelTimeUp',
  375 + title: '行驶时间(上行)'
  376 + },{
  377 + field: 'travelTimeDown',
  378 + title: '行驶时间(下行)'
  379 + },{
  380 + field: 'travelIntervalUp',
  381 + title: '行驶间隔(高峰)'
  382 + },{
  383 + field: 'travelIntervalDown',
  384 + title: '行驶间隔(低谷)'
  385 + },{
  386 + field: 'warrantVehiclesLarge',
  387 + title: '经营权证(大巴)'
  388 + }, {
  389 + field: 'warrantVehiclesMiddle',
  390 + title: '经营权证(中巴)'
  391 + },{
  392 + field: 'vehiclesNumber',
  393 + title: '实际配车数'
  394 + }, {
  395 + field: 'numberVehiclesLarge',
  396 + title: '实际车辆数(大巴)'
  397 + }, {
  398 + field: 'numberVehiclesMiddle',
  399 + title: '实际车辆数(中巴)'
  400 + },{
  401 + field: 'carPlate',
  402 + title: '车辆自编号'
  403 + },{
  404 + field: 'numberPerson',
  405 + title: '线路总配人数'
  406 + },{
  407 + field: 'numberPersonDriver',
  408 + title: '人数司机'
  409 + }, {
  410 + field: 'numberPersonSales',
  411 + title: '售票员数'
  412 + },{
  413 + field: 'busEvNumber',
  414 + title: '新能源车数'
  415 + },{
  416 + field: 'directions',
  417 + title: '线路走向'
  418 + },{
  419 + field: 'numberOfManage',
  420 + title: '经营权证数'
  421 + },{
  422 + field: 'halfwayStation',
  423 + title: '站点名称'
  424 + },{
  425 + field: 'fullCustomerPercent',
  426 + title: '高峰系数'
  427 + },{
  428 + field: 'lowCustomerPercent',
  429 + title: '低谷系数'
  430 + }, {
  431 + field: 'divideLevel',
  432 + title: '间隔等级'
  433 + },{
  434 + field: 'hasTimelists',
  435 + title: '是否挂牌'
  436 + },{
  437 + field: 'isMetro',
  438 + title: '是否轨交末班车衔接'
  439 + },{
  440 + field: 'metroTime',
  441 + title: '轨交时间'
  442 + },{
  443 + field: 'coldBonusType',
  444 + title: '冷僻线路补贴类型'
  445 + }];
  446 +
  447 +
  448 + createTable(cols);
92 }); 449 });
93 - }  
94 -  
95 - function createTable(){  
96 -  
97 - var cols = [{  
98 - field: 'lineName',  
99 - title: '线路名称',  
100 - align: 'center'  
101 - },{  
102 - field: 'startReason',  
103 - title: '启用原因',  
104 - align: 'center'  
105 - },{  
106 - field: 'startDate',  
107 - title: '启用日期',  
108 - align: 'center',  
109 - formatter: function(value, row, index) {  
110 - if(!value)  
111 - value = "";  
112 - return value.substring(0,10);  
113 - }  
114 - },{  
115 - title: '操作',  
116 - align: 'center',  
117 - formatter: function(value, row, index) {  
118 -  
119 -  
120 - var actions = [];  
121 - actions.push('<a class="btn btn-primary btn-xs" onclick="$.operate.detail('+row.id+')" shiro:hasPermission="system:lineHistory:edit"> 查看</a>')  
122 -  
123 - if(row.updateStatus == "1"){  
124 - actions.push('<a class="btn btn-primary btn-xs" onclick="$.operate.edit('+row.id+')" shiro:hasPermission="system:lineHistory:edit"> 修改</a>')  
125 - actions.push('<a class="btn btn-success btn-xs" onclick="updateToLineInfoById('+row.id+')" shiro:hasPermission="system:lineHistory:edit"> 立即启用</a>')  
126 - actions.push('<a class="btn btn-danger btn-xs" onclick="$.operate.remove('+row.id+')"><i class="fa fa-remove"></i>删除</a>');  
127 - }  
128 - return actions.join('');  
129 - }  
130 - }];  
131 -  
132 - var options = {  
133 - url: prefix + "/list",  
134 - createUrl: prefix + "/add",  
135 - updateUrl: prefix + "/edit/{id}",  
136 - removeUrl: prefix + "/remove",  
137 - exportUrl: prefix + "/export",  
138 - detailUrl: prefix + "/detail/{id}",  
139 - modalName: "线路档案修改信息",  
140 - columns: []  
141 - };  
142 -  
143 - options.columns[0] = {checkbox:true};  
144 - options.columns[1] = {visible:false,field:"id"};  
145 -  
146 -  
147 - for(var i in cols){  
148 - options.columns.push(cols[i]);  
149 - }  
150 - $.table.destroy();  
151 -  
152 - $.table.init(options);  
153 - 450 + function edit(id) {
  451 + table.set();
  452 + if($.common.isEmpty(id) && table.options.type == table_type.bootstrapTreeTable) {
  453 + var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0];
  454 + if ($.common.isEmpty(row)) {
  455 + $.modal.alertWarning("请至少选择一条记录");
  456 + return;
  457 + }
  458 + var url = table.options.updateUrl.replace("{id}", row[table.options.uniqueId]);
  459 + open("修改" + table.options.modalName, url);
  460 + } else {
  461 + open(id,"修改" + table.options.modalName, $.operate.editUrl(id));
  462 + }
154 } 463 }
155 -  
156 -  
157 -  
158 - var editFlag = [[${@permission.hasPermi('system:lineHistory:edit')}]];  
159 - var removeFlag = [[${@permission.hasPermi('system:lineHistory:remove')}]];  
160 - var prefix = ctx + "system/lineHistory";  
161 -  
162 - $(function() {  
163 - var allDicts = {};  
164 -  
165 - for(var i in dicts){  
166 - if(!allDicts[dicts[i].dictType]){  
167 - allDicts[dicts[i].dictType] = [];  
168 - }  
169 - allDicts[dicts[i].dictType].push(dicts[i]);  
170 - }  
171 -  
172 - dicts = allDicts;  
173 -  
174 -  
175 - createTable();  
176 - });  
177 - </script> 464 + function open(id,title, url, width, height, callback) {
  465 + // 如果是移动端，就使用自适应大小弹窗
  466 + if ($.common.isMobile()) {
  467 + width = 'auto';
  468 + height = 'auto';
  469 + }
  470 + if ($.common.isEmpty(title)) {
  471 + title = false;
  472 + }
  473 + if ($.common.isEmpty(url)) {
  474 + url = "/404.html";
  475 + }
  476 + if ($.common.isEmpty(width)) {
  477 + width = 800;
  478 + }
  479 + if ($.common.isEmpty(height)) {
  480 + height = ($(window).height() - 50);
  481 + }
  482 + if ($.common.isEmpty(callback)) {
  483 + callback = function(index, layero) {
  484 + var iframeWin = layero.find('iframe')[0];
  485 + iframeWin.contentWindow.submitHandler(index, layero);
  486 + }
  487 + }
178 488
  489 + layer.open({
  490 + type: 2,
  491 + area: [width + 'px', height + 'px'],
  492 + fix: false,
  493 + //不固定
  494 + maxmin: true,
  495 + shade: 0.3,
  496 + title: title,
  497 + content: url,
  498 + btn: ['变更', '返回'],
  499 + // 弹层外区域关闭
  500 + shadeClose: true,
  501 + yes: callback
  502 + });
  503 + }
  504 + </script>
179 <style> 505 <style>
180 .col_checkbox { 506 .col_checkbox {
181 width: 33%; 507 width: 33%;
bsthLineProfiles/src/main/resources/templates/system/lineReport/edit.html
  View file @7d71c02
@@ -12,35 +12,35 @@ @@ -12,35 +12,35 @@
12 <div class="form-group"> 12 <div class="form-group">
13 <label class="col-sm-3 control-label">线路名称：</label> 13 <label class="col-sm-3 control-label">线路名称：</label>
14 <div class="col-sm-8"> 14 <div class="col-sm-8">
15 - <input name="lineName" th:field="*{lineName}" class="form-control" 15 + <input name="lineName" th:field="*{lineName}" class="form-control" readonly
16 type="text"> 16 type="text">
17 </div> 17 </div>
18 </div> 18 </div>
19 <div class="form-group"> 19 <div class="form-group">
20 <label class="col-sm-3 control-label">公司：</label> 20 <label class="col-sm-3 control-label">公司：</label>
21 <div class="col-sm-8"> 21 <div class="col-sm-8">
22 - <input name="company" th:field="*{company}" class="form-control" 22 + <input name="company" th:field="*{company}" class="form-control" readonly
23 type="text"> 23 type="text">
24 </div> 24 </div>
25 </div> 25 </div>
26 <div class="form-group"> 26 <div class="form-group">
27 <label class="col-sm-3 control-label">分公司：</label> 27 <label class="col-sm-3 control-label">分公司：</label>
28 <div class="col-sm-8"> 28 <div class="col-sm-8">
29 - <input name="fCompany" th:field="*{fCompany}" class="form-control" 29 + <input name="fCompany" th:field="*{fCompany}" class="form-control" readonly
30 type="text"> 30 type="text">
31 </div> 31 </div>
32 </div> 32 </div>
33 <div class="form-group"> 33 <div class="form-group">
34 <label class="col-sm-3 control-label">主线路id：</label> 34 <label class="col-sm-3 control-label">主线路id：</label>
35 <div class="col-sm-8"> 35 <div class="col-sm-8">
36 - <input name="pLineId" th:field="*{pLineId}" class="form-control" 36 + <input name="pLineId" th:field="*{pLineId}" class="form-control" readonly
37 type="text"> 37 type="text">
38 </div> 38 </div>
39 </div> 39 </div>
40 <div class="form-group"> 40 <div class="form-group">
41 <label class="col-sm-3 control-label">营运方式：</label> 41 <label class="col-sm-3 control-label">营运方式：</label>
42 <div class="col-sm-8"> 42 <div class="col-sm-8">
43 - <select name="serviceType" 43 + <select name="serviceType" readonly
44 th:with="type=${@dict.getType('serviceType')}" class="form-control m-b"> 44 th:with="type=${@dict.getType('serviceType')}" class="form-control m-b">
45 <option value=""></option> 45 <option value=""></option>
46 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}"></option> 46 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}"></option>
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 </div> 49 </div>
50 <div class="form-group"> 50 <div class="form-group">
51 <label class="col-sm-3 control-label">线路属性：</label> 51 <label class="col-sm-3 control-label">线路属性：</label>
52 - <div class="col-sm-8"> 52 + <div class="col-sm-8">
53 <select name="lineLevel" 53 <select name="lineLevel"
54 th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b"> 54 th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b">
55 <option value=""></option> 55 <option value=""></option>
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 </div> 59 </div>
60 <div class="form-group"> 60 <div class="form-group">
61 <label class="col-sm-3 control-label">线路类型：</label> 61 <label class="col-sm-3 control-label">线路类型：</label>
62 - <div class="col-sm-8"> 62 + <div class="col-sm-8">
63 <select name="lineType" 63 <select name="lineType"
64 th:with="type=${@dict.getType('lineType')}" class="form-control m-b"> 64 th:with="type=${@dict.getType('lineType')}" class="form-control m-b">
65 <option value=""></option> 65 <option value=""></option>
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 <div class="form-group"> 70 <div class="form-group">
71 <label class="col-sm-3 control-label">区属：</label> 71 <label class="col-sm-3 control-label">区属：</label>
72 <div class="col-sm-8"> 72 <div class="col-sm-8">
73 - 73 +
74 <select name="district" 74 <select name="district"
75 th:with="type=${@dict.getType('district')}" class="form-control m-b"> 75 th:with="type=${@dict.getType('district')}" class="form-control m-b">
76 <option value=""></option> 76 <option value=""></option>
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 <div class="form-group"> 91 <div class="form-group">
92 <label class="col-sm-3 control-label">营运状态：</label> 92 <label class="col-sm-3 control-label">营运状态：</label>
93 <div class="col-sm-8"> 93 <div class="col-sm-8">
94 - 94 +
95 <select name="serviceState" 95 <select name="serviceState"
96 th:with="type=${@dict.getType('serviceState')}" class="form-control m-b"> 96 th:with="type=${@dict.getType('serviceState')}" class="form-control m-b">
97 <option value=""></option> 97 <option value=""></option>
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
112 <div class="form-group"> 112 <div class="form-group">
113 <label class="col-sm-3 control-label">是否空调：</label> 113 <label class="col-sm-3 control-label">是否空调：</label>
114 <div class="col-sm-8"> 114 <div class="col-sm-8">
115 - 115 +
116 <select name="airConditionerType" 116 <select name="airConditionerType"
117 th:with="type=${@dict.getType('airConditionerType')}" class="form-control m-b"> 117 th:with="type=${@dict.getType('airConditionerType')}" class="form-control m-b">
118 <option value=""></option> 118 <option value=""></option>
@@ -220,7 +220,7 @@ @@ -220,7 +220,7 @@
220 <div class="form-group"> 220 <div class="form-group">
221 <label class="col-sm-3 control-label">是否逻辑删除：</label> 221 <label class="col-sm-3 control-label">是否逻辑删除：</label>
222 <div class="col-sm-8"> 222 <div class="col-sm-8">
223 - 223 +
224 <select name="isLogicDelete" 224 <select name="isLogicDelete"
225 th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b"> 225 th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
226 <option value=""></option> 226 <option value=""></option>
@@ -578,7 +578,7 @@ @@ -578,7 +578,7 @@
578 class="form-control" type="text"> 578 class="form-control" type="text">
579 </div> 579 </div>
580 </div> 580 </div>
581 - 581 +
582 <div class="form-group"> 582 <div class="form-group">
583 <label class="col-sm-3 control-label">启用时间：</label> 583 <label class="col-sm-3 control-label">启用时间：</label>
584 <div class="col-sm-8"> 584 <div class="col-sm-8">
@@ -587,8 +587,8 @@ @@ -587,8 +587,8 @@
587 th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}" 587 th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
588 class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off"> 588 class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
589 <span class="input-group-addon"><i class="fa fa-calendar"></i></span> 589 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
590 - </div>  
591 - 590 + </div>
  591 +
592 </div> 592 </div>
593 </div> 593 </div>
594 <div class="form-group"> 594 <div class="form-group">
@@ -603,16 +603,16 @@ @@ -603,16 +603,16 @@
603 <th:block th:include="include :: datetimepicker-js" /> 603 <th:block th:include="include :: datetimepicker-js" />
604 <script th:inline="javascript"> 604 <script th:inline="javascript">
605 var prefix = ctx + "system/line"; 605 var prefix = ctx + "system/line";
606 - 606 +
607 $(function(){ 607 $(function(){
608 $.get("/system/line/getUserLineInfo",function(data){ 608 $.get("/system/line/getUserLineInfo",function(data){
609 if(data.msg != null){ 609 if(data.msg != null){
610 var objs = JSON.parse(data.msg); 610 var objs = JSON.parse(data.msg);
611 611
612 - 612 +
613 for(var i = 0;i<objs.length;i++){ 613 for(var i = 0;i<objs.length;i++){
614 -  
615 - 614 +
  615 +
616 if($($("input[name="+objs[i].name+"]"))){ 616 if($($("input[name="+objs[i].name+"]"))){
617 if(objs[i].checked){ 617 if(objs[i].checked){
618 getParent($($("input[name="+objs[i].name+"]")),"form-group").show(); 618 getParent($($("input[name="+objs[i].name+"]")),"form-group").show();
@@ -620,7 +620,7 @@ @@ -620,7 +620,7 @@
620 getParent($($("input[name="+objs[i].name+"]")),"form-group").hide(); 620 getParent($($("input[name="+objs[i].name+"]")),"form-group").hide();
621 } 621 }
622 } 622 }
623 - 623 +
624 if($($("select[name="+objs[i].name+"]"))){ 624 if($($("select[name="+objs[i].name+"]"))){
625 if(objs[i].checked){ 625 if(objs[i].checked){
626 getParent($($("select[name="+objs[i].name+"]")),"form-group").show(); 626 getParent($($("select[name="+objs[i].name+"]")),"form-group").show();
@@ -628,7 +628,7 @@ @@ -628,7 +628,7 @@
628 getParent($($("select[name="+objs[i].name+"]")),"form-group").hide(); 628 getParent($($("select[name="+objs[i].name+"]")),"form-group").hide();
629 } 629 }
630 } 630 }
631 - 631 +
632 if($($("textarea[name="+objs[i].name+"]"))){ 632 if($($("textarea[name="+objs[i].name+"]"))){
633 if(objs[i].checked){ 633 if(objs[i].checked){
634 getParent($($("textarea[name="+objs[i].name+"]")),"form-group").show(); 634 getParent($($("textarea[name="+objs[i].name+"]")),"form-group").show();
@@ -636,23 +636,23 @@ @@ -636,23 +636,23 @@
636 getParent($($("textarea[name="+objs[i].name+"]")),"form-group").hide(); 636 getParent($($("textarea[name="+objs[i].name+"]")),"form-group").hide();
637 } 637 }
638 } 638 }
639 - 639 +
640 } 640 }
641 } 641 }
642 }); 642 });
643 }) 643 })
644 - 644 +
645 function getParent(obj,className){ 645 function getParent(obj,className){
646 var parent = obj; 646 var parent = obj;
647 - 647 +
648 while(parent[0] && parent[0].className != className){ 648 while(parent[0] && parent[0].className != className){
649 parent = parent.parent(); 649 parent = parent.parent();
650 } 650 }
651 - 651 +
652 return parent; 652 return parent;
653 } 653 }
654 -  
655 - 654 +
  655 +
656 $("#form-line-edit").validate({ 656 $("#form-line-edit").validate({
657 focusCleanup : true 657 focusCleanup : true
658 }); 658 });
bsthLineProfiles/src/main/resources/templates/system/lineReport/line.html
  View file @7d71c02
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html lang="zh" xmlns:th="http://www.thymeleaf.org" 2 <html lang="zh" xmlns:th="http://www.thymeleaf.org"
3 - xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> 3 + xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
4 <head> 4 <head>
5 -<th:block th:include="include :: header('线路档案信息月报表')" />  
6 -<th:block th:include="include :: datetimepicker-css" /> 5 + <th:block th:include="include :: header('线路档案信息')" />
7 </head> 6 </head>
8 <body class="gray-bg"> 7 <body class="gray-bg">
9 - <div class="container-div" id="context">  
10 - <div class="row">  
11 - <div class="col-sm-12 search-collapse">  
12 - <form id="formId">  
13 - <div class="select-list">  
14 - <ul> 8 +<div class="container-div" id="context">
  9 + <div class="row">
  10 + <div class="col-sm-12 search-collapse">
  11 + <form id="formId">
  12 + <div class="select-list">
  13 + <ul>
  14 + <li><label>公司：</label> <input type="text" name="company" />
  15 + </li>
  16 + <li><label>分公司：</label> <input type="text" name="fCompany" />
  17 + </li>
  18 + <li><label>线路名称：</label> <input type="text" name="lineName" />
  19 + </li>
  20 + <li><label>主线路id：</label> <input type="text" name="pLineId" />
  21 + </li>
  22 + <li><label>营运方式：</label> <select name="serviceType"
  23 + th:with="type=${@dict.getType('serviceType')}">
  24 + <option value=""></option>
  25 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  26 + th:value="${dict.dictValue}"></option>
  27 + </select></li>
  28 + <li><label>线路属性：</label>
  29 + <select name="lineLevel"
  30 + th:with="type=${@dict.getType('lineLevel')}">
  31 + <option value=""></option>
  32 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  33 + th:value="${dict.dictValue}"></option>
  34 + </select>
  35 + </li>
  36 + <li><label>线路类型：</label> <select name="lineType"
  37 + th:with="type=${@dict.getType('lineType')}">
  38 + <option value=""></option>
  39 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  40 + th:value="${dict.dictValue}"></option>
  41 + </select></li>
  42 + <li><label>区属：</label> <select name="district"
  43 + th:with="type=${@dict.getType('district')}">
  44 + <option value=""></option>
  45 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  46 + th:value="${dict.dictValue}"></option>
  47 + </select></li>
  48 + <li><label>是否区内：</label> <select name="inoutDistrict"
  49 + th:with="type=${@dict.getType('trueFalse')}">
  50 + <option value=""></option>
  51 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  52 + th:value="${dict.dictValue}"></option>
  53 + </select></li>
  54 + <li><label>营运状态：</label> <select name="serviceState"
  55 + th:with="type=${@dict.getType('serviceState')}">
  56 + <option value=""></option>
  57 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  58 + th:value="${dict.dictValue}"></option>
  59 + </select></li>
  60 + <li><label>车辆类型：</label> <select name="busType"
  61 + th:with="type=${@dict.getType('busType')}">
  62 + <option value=""></option>
  63 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  64 + th:value="${dict.dictValue}"></option>
  65 + </select></li>
  66 + <li><label>是否空调：</label> <select name="airConditionerType"
  67 + th:with="type=${@dict.getType('airConditionerType')}">
  68 + <option value=""></option>
  69 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  70 + th:value="${dict.dictValue}"></option>
  71 + </select></li>
  72 + <li><label>售票类型：</label> <select name="sellTicketType"
  73 + th:with="type=${@dict.getType('sellTicketType')}">
  74 + <option value=""></option>
  75 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  76 + th:value="${dict.dictValue}"></option>
  77 + </select></li>
  78 + <li><label>运营时间：</label> <select name="serviceTime"
  79 + th:with="type=${@dict.getType('serviceTime')}">
  80 + <option value=""></option>
  81 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  82 + th:value="${dict.dictValue}"></option>
  83 + </select></li>
  84 + <li><label>线路长度：</label> <input type="text"
  85 + name="lineDistance" /></li>
  86 + <li><label>线路编码：</label> <input type="text" name="lineCode" />
  87 + </li>
  88 + <li><label>授权年限：</label> <input type="text"
  89 + name="warrantYear" /></li>
  90 + <li><label>授权起始：</label> <input type="text"
  91 + class="time-input" placeholder="请选择授权起始日期"
  92 + name="warrantStartTime" /></li>
  93 + <li><label>授权结束：</label> <input type="text"
  94 + class="time-input" placeholder="请选择授权结束日期" name="warrantEndTime" />
  95 + </li>
  96 + <li><label>撤销日期：</label> <input type="text"
  97 + class="time-input" placeholder="请选择撤销日期" name="planCancelTime" />
  98 + </li>
  99 + <li><label>实际撤销：</label> <input type="text"
  100 + class="time-input" placeholder="请选择实际撤销日期" name="cancelTime" />
  101 + </li>
  102 + <li><label>更新人：</label> <input type="text" name="updateBy" />
  103 + </li>
  104 + <li><label>更新时间：</label> <input type="text"
  105 + class="time-input" placeholder="请选择更新时间" name="updateTime" /></li>
  106 + <li><label>行车作业计划表报备时间：</label> <input type="text"
  107 + class="time-input" placeholder="请选择行车作业计划表报备时间"
  108 + name="timeSchedule" /></li>
  109 + <li><label>停车场：</label> <input type="text" name="park" /></li>
  110 + <li><label>是否权证：</label> <select name="isWarrant"
  111 + th:with="type=${@dict.getType('trueFalse')}">
  112 + <option value=""></option>
  113 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  114 + th:value="${dict.dictValue}"></option>
  115 + </select></li>
  116 + <li><label>道路类型：</label> <select name="roadType"
  117 + th:with="type=${@dict.getType('roadType')}">
  118 + <option value=""></option>
  119 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  120 + th:value="${dict.dictValue}"></option>
  121 + </select></li>
  122 + <li><label>票价：</label> <input type="text" name="ticketPrice" /></li>
  123 + <li><label>首站：</label> <input type="text"
  124 + name="firstStation" /></li>
  125 + <li><label>起讫站：</label> <input type="text" name="startEnd" />
  126 + </li>
  127 + <li><label>首战时间：</label> <input type="text" name="firstTime" />
  128 + </li>
  129 + <li><label>末站：</label> <input type="text" name="lastStation" />
  130 + </li>
  131 + <li><label>末站首战：</label> <input type="text"
  132 + name="lastTime" /></li>
  133 + <li><label>上行里程：</label> <input type="text"
  134 + name="mileageUp" /></li>
  135 + <li><label>下行里程：</label> <input type="text"
  136 + name="mileageDown" /></li>
  137 + <li><label>平均里程：</label> <input type="text"
  138 + name="averageMileage" /></li>
  139 + <li><label>上行站级：</label> <input type="text"
  140 + name="stationUp" /></li>
  141 + <li><label>下行站级数()：</label> <input type="text"
  142 + name="stationDown" /></li>
  143 + <li><label>行驶时间(上行)：</label> <input type="text"
  144 + name="travelTimeUp" /></li>
  145 + <li><label>行驶时间(下行)：</label> <input type="text"
  146 + name="travelTimeDown" /></li>
  147 + <li><label>行驶间隔(高峰)：</label> <input type="text"
  148 + name="travelIntervalUp" /></li>
  149 + <li><label>行驶间隔(低谷)：</label> <input type="text"
  150 + name="travelIntervalDown" /></li>
  151 + <li><label>经营权证：</label> <input type="text"
  152 + name="warrantVehiclesLarge" /></li>
  153 + <li><label>经营权证：</label> <input type="text"
  154 + name="warrantVehiclesMiddle" /></li>
  155 + <li><label>实际配车数：</label> <input type="text"
  156 + name="vehiclesNumber" /></li>
  157 + <li><label>实际车辆数(大巴)：</label> <input type="text"
  158 + name="numberVehiclesLarge" /></li>
  159 + <li><label>实际车辆数(中巴)：</label> <input type="text"
  160 + name="numberVehiclesMiddle" /></li>
  161 + <li><label>车辆自编号：</label> <input type="text" name="carPlate" />
  162 + </li>
  163 + <li><label>线路总配人数：</label> <input type="text"
  164 + name="numberPerson" /></li>
  165 + <li><label>人数司机：</label> <input type="text"
  166 + name="numberPersonDriver" /></li>
  167 + <li><label>售票员数：</label> <input type="text"
  168 + name="numberPersonSales" /></li>
  169 + <li><label>新能源车数：</label> <input type="text"
  170 + name="busEvNumber" /></li>
  171 + <li><label>经营权证数：</label> <input type="text"
  172 + name="numberOfManage" /></li>
  173 + <li><label>高峰系数：</label> <input type="text"
  174 + name="fullCustomerPercent" /></li>
  175 + <li><label>低谷系数：</label> <input type="text"
  176 + name="lowCustomerPercent" /></li>
  177 + <li><label>间隔等级：</label> <input type="text"
  178 + name="divideLevel" /></li>
  179 + <li><label>是否挂牌：</label> <input type="text"
  180 + name="hasTimelists" /></li>
  181 + <li><label>是否轨交末班车衔接：</label> <select name="isMetro"
  182 + th:with="type=${@dict.getType('trueFalse')}">
  183 + <option value=""></option>
  184 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  185 + th:value="${dict.dictValue}"></option>
  186 + </select></li>
  187 + <li><label>轨交时间：</label> <input type="text"
  188 + class="time-input" placeholder="请选择轨交时间" name="metroTime" /></li>
  189 + <li><label>冷僻补贴：</label> <input type="text"
  190 + name="coldBonusType" /></li>
  191 + <li><label>月度营收：</label> <input type="text"
  192 + name="revenuesMonth" /></li>
  193 + <li><label>月度人次：</label> <input type="text"
  194 + name="personMonth" /></li>
  195 + <li><label>月度里程：</label> <input type="text"
  196 + name="mileageMonth" /></li>
  197 + <li><label>百公里人次：</label> <input type="text"
  198 + name="personMonthAvg" /></li>
  199 + <li><label>营收：</label> <input type="text" name="revenues" />
  200 + </li>
  201 + <li><label>人次：</label> <input type="text" name="persons" />
  202 + </li>
  203 + <li><label>里程：</label> <input type="text" name="mileages" />
  204 + </li>
  205 + <li><label>百公里人次：</label> <input type="text"
  206 + name="personAvg" /></li>
15 207
16 - <li><input type="text"  
17 - class="form-control" name="createTime" placeholder="报表时间" /></li> 208 + <li>
  209 + <el-button size="mini" type="primary" icon="el-icon-search" onClick="$.table.search();">搜索</el-button>
  210 + <el-button size="mini" icon="el-icon-refresh" onClick="$.form.reset();">重置</el-button>
  211 + </li>
18 212
19 - <li>  
20 - <el-button size="mini" type="primary" icon="el-icon-search" onClick="$.table.search();">搜索</el-button>  
21 - <el-button size="mini" icon="el-icon-refresh" onClick="$.form.reset();">重置</el-button>  
22 - </li> 213 + </ul>
23 214
24 - </ul> 215 + </div>
  216 + </form>
  217 + </div>
25 218
26 - </div>  
27 - </form>  
28 - </div>  
29 219
30 - <!-- <button class="btn btn-primary btn-lg" data-toggle="modal"  
31 - data-target="#myModal">选择显示的列</button> -->  
32 - <div class="btn-group-sm" id="toolbar" role="group">  
33 -  
34 - <el-button plain size="mini" type="warning" icon="el-icon-download" onClick="$.table.exportExcel();" shiro:hasPermission="system:line:export"> 导出</el-button>  
35 - </div>  
36 - <div class="col-sm-12 select-table table-striped">  
37 - <table id="bootstrap-table"></table>  
38 - </div> 220 + <div class="btn-group-sm" id="toolbar" role="group">
  221 +
  222 + <el-button plain size="mini" type="success" icon="el-icon-search" onClick="$.table.search();" data-toggle="modal" data-target="#myModal">选择显示的列</el-button>
  223 +
  224 + <el-button plain size="mini" type="warning" icon="el-icon-download" onClick="$.table.exportExcel();" shiro:hasPermission="system:line:export"> 导出</el-button>
  225 +
  226 + </div>
  227 + <div class="col-sm-12 select-table table-striped">
  228 + <table id="bootstrap-table"></table>
39 </div> 229 </div>
40 </div> 230 </div>
41 - <th:block th:include="include :: footer" />  
42 - <th:block th:include="include :: datetimepicker-js" />  
43 - <!--<div class="modal fade" id="myModal" tabindex="-1" role="dialog"  
44 - aria-labelledby="myModalLabel" aria-hidden="true">  
45 - <div class="modal-dialog">  
46 - <div class="modal-content">  
47 - <div class="modal-header">  
48 - <button type="button" class="close" data-dismiss="modal" 231 +</div>
  232 +<th:block th:include="include :: footer" />
  233 +<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
  234 + aria-labelledby="myModalLabel" aria-hidden="true">
  235 + <div class="modal-dialog">
  236 + <div class="modal-content">
  237 + <div class="modal-header">
  238 + <button type="button" class="close" data-dismiss="modal"
49 aria-hidden="true">&times;</button> 239 aria-hidden="true">&times;</button>
50 - <h4 class="modal-title" id="myModalLabel">选择显示的列</h4>  
51 - </div>  
52 - <div class="modal-body" id="cols" style="float: left;">  
53 - <input type="checkbox" onClick="checkAll(this);" id="checkboxForAll"/><label>全选</label><br />  
54 - <br /> 240 + <h4 class="modal-title" id="myModalLabel">选择显示的列</h4>
  241 + </div>
  242 + <div class="modal-body" id="cols" style="float: left;">
  243 + <input type="checkbox" onClick="checkAll(this);" id="checkboxForAll"/><label>全选</label><br />
  244 + <br />
55 245
56 - </div>  
57 - <div class="modal-footer">  
58 - <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>  
59 - <button type="button" class="btn btn-primary" data-dismiss="modal" onClick="initTable();">提交更改</button>  
60 - </div> 246 + </div>
  247 + <div class="modal-footer">
  248 + <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
  249 + <button type="button" class="btn btn-primary" data-dismiss="modal" onClick="initTable();">提交更改</button>
61 </div> 250 </div>
62 </div> 251 </div>
63 - --> 252 + <!-- /.modal-content -->
64 </div> 253 </div>
  254 + <!-- /.modal -->
  255 +</div>
  256 +
  257 +
  258 +<script th:inline="javascript">
  259 +
  260 + function add(obj){
  261 + if($(obj)[0].className.indexOf("disabled") == -1)
  262 + $.operate.add();
  263 +
  264 + }
  265 +
  266 + function edit(obj){
  267 + if($(obj)[0].className.indexOf("disabled") == -1)
  268 + $.operate.edit();
  269 +
  270 + }
65 271
66 272
67 - <script th:inline="javascript"> 273 + function remove(obj){
  274 + if($(obj)[0].className.indexOf("disabled") == -1)
  275 + $.operate.removeAll();
  276 +
  277 + }
68 278
69 new Vue({ 279 new Vue({
70 - el: '#context',  
71 - data: function() {  
72 - return { visible: false }  
73 - }  
74 - }) 280 + el: '#context',
  281 + data: function() {
  282 + return { visible: false }
  283 + }
  284 + })
  285 +
75 var dicts = [[${@dict.getType('')}]]; 286 var dicts = [[${@dict.getType('')}]];
76 -  
77 -  
78 - function createTable(objs){  
79 - var options = {  
80 - url: prefix + "/list",  
81 - createUrl: prefix + "/add",  
82 - updateUrl: prefix + "/edit/{id}",  
83 - removeUrl: prefix + "/remove",  
84 - exportUrl: prefix + "/export",  
85 - modalName: "线路档案信息月报表",  
86 - columns: []  
87 - };  
88 -  
89 -  
90 - if(objs.length > 0){  
91 - options.columns[0] = {checkbox:true};  
92 - options.columns[1] = {visible:false,field:"id"};  
93 - }  
94 -  
95 - for(var i = 0;i< objs.length;i++){  
96 -  
97 - if(!objs)continue;  
98 -  
99 - console.log(objs[i]);  
100 -  
101 - var col = {  
102 - field: objs[i].field,  
103 - title: objs[i].title,  
104 - align: 'center',  
105 - formatter: function(value, row, index) {  
106 -  
107 -  
108 - if(this.field == "roadType" || this.field == "busType"){  
109 - if(value != null){  
110 -  
111 - var arr = value.split(",");  
112 - value = "";  
113 - for(var i in arr){  
114 -  
115 - for(var j in dicts[this.field]){  
116 - if(dicts[this.field][j].dictValue == arr[i]){  
117 - value += dicts[this.field][j].dictLabel + ","  
118 - break;  
119 - }  
120 - }  
121 -  
122 - }  
123 - return $.table.tooltip(value.substring(0,value.length -1), 5);  
124 - }  
125 - }  
126 -  
127 - if(this.field == "isLogicDelete" || this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists"){  
128 - for(var j in dicts["trueFalse"]){  
129 - if(dicts["trueFalse"][j].dictValue == value){  
130 - value = dicts["trueFalse"][j].dictLabel;  
131 - break;  
132 - }  
133 - }  
134 - }  
135 -  
136 -  
137 -  
138 - if(dicts[this.field]){  
139 - for(var j in dicts[this.field]){  
140 - if(dicts[this.field][j].dictValue == value){  
141 - value = dicts[this.field][j].dictLabel;  
142 - break;  
143 - }  
144 - }  
145 - }  
146 -  
147 - return $.table.tooltip(value, 5);  
148 - }  
149 - }  
150 -  
151 - options.columns.push(col);  
152 -  
153 - }  
154 -  
155 - $.table.init(options);  
156 -  
157 - 287 + var mytable = null;
  288 +
  289 +
  290 + function initTable(){
  291 + var objs = $("#cols div");
  292 +
  293 +
  294 + var data = [];
  295 +
  296 + for(var i = 0;i< objs.length;i++){
  297 + var name = $(objs[i]).find("input")[0].name;
  298 + var text = $(objs[i]).find("label")[0].innerText;
  299 + var checked = $(objs[i]).find("input")[0].checked;
  300 +
  301 + data.push({
  302 + name:name,
  303 + text:text,
  304 + checked:checked});
  305 +
158 } 306 }
159 -  
160 - function checkAll(obj){  
161 - var objs = $("#cols input");  
162 -  
163 - if(obj.checked == false){  
164 - for(var i in objs){  
165 - objs[i].checked = false; 307 +
  308 + createTable(data);
  309 +
  310 + $.post("/system/line/updateUserLineInfo",{lineInfo:JSON.stringify(data)},function(data){
  311 + $.modal.msg(data.msg);
  312 + });
  313 + }
  314 +
  315 + function createTable(objs){
  316 + var options = {
  317 + url: prefix + "/list",
  318 + exportUrl: prefix + "/export",
  319 + updateUrl: prefix + "/edit/{id}",
  320 + modalName: "线路档案信息",
  321 + columns: [],
  322 + queryParams: queryParams,
  323 + rowStyle:function(row,index) {
  324 + var flag=DateMinus(row.isWarrantEndTime);
  325 + if(row.isWarrant==='1'&&!flag){
  326 + var strClass='danger';
  327 + return {classes:strClass};
166 } 328 }
167 - }else{  
168 - for(var i in objs){  
169 - objs[i].checked = true; 329 + return "";
  330 + },
  331 + onDblClickRow:function (row,index){
  332 + $.operate.edit(row.id);
  333 + }
  334 + };
  335 +
  336 +
  337 + if(objs.length > 0){
  338 + options.columns[0] = {checkbox:true};
  339 + options.columns[1] = {visible:false,field:"id"};
  340 + }
  341 +
  342 + for(var i = 0;i< objs.length;i++){
  343 +
  344 + var col = {
  345 + field: objs[i].name,
  346 + title: objs[i].text,
  347 + visible:objs[i].checked,
  348 + align: 'center',
  349 + formatter: function(value, row, index) {
  350 +
  351 +
  352 + if(this.field == "roadType" || this.field == "busType"){
  353 + if(value != null){
  354 +
  355 + var arr = value.split(",");
  356 + value = "";
  357 + for(var i in arr){
  358 +
  359 + for(var j in dicts[this.field]){
  360 + if(dicts[this.field][j].dictValue == arr[i]){
  361 + value += dicts[this.field][j].dictLabel + ","
  362 + break;
  363 + }
  364 + }
  365 +
  366 + }
  367 + return $.table.tooltip(value.substring(0,value.length -1), 5);
  368 + }
  369 + }
  370 +
  371 + if(this.field == "isLogicDelete" || this.field == "inoutDistrict"|| this.field == "isMetro" || this.field == "hasTimelists" || this.field == "isWarrant"){
  372 + for(var j in dicts["trueFalse"]){
  373 + if(dicts["trueFalse"][j].dictValue == value){
  374 + value = dicts["trueFalse"][j].dictLabel;
  375 + break;
  376 + }
  377 + }
  378 + }
  379 +
  380 +
  381 +
  382 + if(dicts[this.field]){
  383 + for(var j in dicts[this.field]){
  384 + if(dicts[this.field][j].dictValue == value){
  385 + value = dicts[this.field][j].dictLabel;
  386 + break;
  387 + }
  388 + }
  389 + }
  390 +
  391 + return $.table.tooltip(value, 5);
170 } 392 }
171 } 393 }
  394 +
  395 + if($($("#formId input[name="+objs[i].name+"]"))){
  396 + if(objs[i].checked){
  397 + $($("#formId input[name="+objs[i].name+"]")).parent().show();
  398 + }else{
  399 +
  400 + $($("#formId input[name="+objs[i].name+"]")).parent().hide();
  401 + }
  402 + }
  403 + if($($("#formId select[name="+objs[i].name+"]"))){
  404 + if(objs[i].checked){
  405 + $($("#formId select[name="+objs[i].name+"]")).parent().show();
  406 + }else{
  407 +
  408 + $($("#formId select[name="+objs[i].name+"]")).parent().hide();
  409 + }
  410 + }
  411 +
  412 + options.columns.push(col);
  413 +
  414 + }
  415 +
  416 + $.table.destroy();
  417 +
  418 + $.table.init(options);
  419 +
  420 + mytable = $.table;
  421 + }
  422 +
  423 + function checkAll(obj){
  424 + var objs = $("#cols input");
  425 +
  426 + if(obj.checked == false){
  427 + for(var i in objs){
  428 + objs[i].checked = false;
  429 + }
  430 + }else{
  431 + for(var i in objs){
  432 + objs[i].checked = true;
  433 + }
  434 + }
  435 + }
  436 +
  437 + function queryParams(params) {
  438 + var search = $.table.queryParams(params);
  439 + return search;
  440 + }
  441 + var editFlag = [[${@permission.hasPermi('system:line:edit')}]];
  442 + var removeFlag = [[${@permission.hasPermi('system:line:remove')}]];
  443 + var prefix = ctx + "system/lineReport";
  444 +
  445 + $(function() {
  446 + var allDicts = {};
  447 +
  448 + for(var i in dicts){
  449 + if(!allDicts[dicts[i].dictType]){
  450 + allDicts[dicts[i].dictType] = [];
  451 + }
  452 + allDicts[dicts[i].dictType].push(dicts[i]);
  453 + }
  454 +
  455 + dicts = allDicts;
  456 +
  457 +
  458 +
  459 +
  460 +
  461 +
  462 + var cols = [{
  463 + field: 'lineName',
  464 + title: '线路名称'
  465 + },
  466 + {
  467 + field: 'company',
  468 + title: '公司'
  469 + },
  470 + {
  471 + field: 'fCompany',
  472 + title: '分公司'
  473 + },
  474 + {
  475 + field: 'pLineId',
  476 + title: '主线路id'
  477 + },
  478 + {
  479 + field: 'serviceType',
  480 + title: '营运方式'
  481 + },
  482 + {
  483 + field: 'lineLevel',
  484 + title: '线路属性'
  485 + },
  486 + {
  487 + field: 'lineType',
  488 + title: '线路属性'
  489 + },
  490 + {
  491 + field: 'district',
  492 + title: '区属'
  493 + },
  494 + {
  495 + field: 'inoutDistrict',
  496 + title: '是否区内'
  497 + },
  498 + {
  499 + field: 'serviceState',
  500 + title: '营运状态'
  501 + },
  502 + {
  503 + field: 'busType',
  504 + title: '车辆类型'
  505 + },
  506 + {
  507 + field: 'airConditionerType',
  508 + title: '是否空调'
  509 + },
  510 + {
  511 + field: 'sellTicketType',
  512 + title: '售票类型'
  513 + },
  514 + {
  515 + field: 'serviceTime',
  516 + title: '运营时间'
  517 + },
  518 + {
  519 + field: 'lineDistance',
  520 + title: '线路长度'
  521 + },
  522 + {
  523 + field: 'lineCode',
  524 + title: '线路编码'
  525 + },
  526 + {
  527 + field: 'warrantYear',
  528 + title: '授权年限'
  529 + },
  530 + {
  531 + field: 'warrantStartTime',
  532 + title: '授权起始日期'
  533 + },
  534 + {
  535 + field: 'warrantEndTime',
  536 + title: '授权结束日期'
  537 + },
  538 + {
  539 + field: 'planCancelTime',
  540 + title: '撤销日期'
  541 + },
  542 + {
  543 + field: 'cancelTime',
  544 + title: '实际撤销日期'
  545 + },
  546 + {
  547 + field: 'cancelReason',
  548 + title: '撤销原因'
  549 + },
  550 + {
  551 + field: 'remark',
  552 + title: '备注'
  553 + },
  554 + {
  555 + field: 'isLogicDelete',
  556 + title: '是否逻辑删除'
  557 + },
  558 + {
  559 + field: 'updateBy',
  560 + title: '更新人'
  561 + },
  562 + {
  563 + field: 'updateTime',
  564 + title: '更新时间'
  565 + },
  566 + {
  567 + field: 'timeSchedule',
  568 + title: '行车作业计划表报备时间'
  569 + },
  570 + {
  571 + field: 'park',
  572 + title: '停车场'
  573 + },
  574 + {
  575 + field: 'isWarrant',
  576 + title: '是否权证'
  577 + },
  578 + {
  579 + field: 'isWarrantStartTime',
  580 + title: '权证开通日期'
  581 + },
  582 + {
  583 + field: 'isWarrantEndTime',
  584 + title: '权证到期日期'
  585 + },
  586 + {
  587 + field: 'roadType',
  588 + title: '道路类型'
  589 + },
  590 + {
  591 + field: 'ticketPrice',
  592 + title: '票价'
  593 + },
  594 + {
  595 + field: 'firstStation',
  596 + title: '首站'
  597 + },
  598 + {
  599 + field: 'startEnd',
  600 + title: '起讫站'
  601 + },
  602 + {
  603 + field: 'firstTime',
  604 + title: '首战时间'
  605 + },
  606 + {
  607 + field: 'lastStation',
  608 + title: '末站'
  609 + },
  610 + {
  611 + field: 'lastTime',
  612 + title: '末站首战时间'
  613 + },
  614 + {
  615 + field: 'mileageUp',
  616 + title: '上行里程数'
  617 + },
  618 + {
  619 + field: 'mileageDown',
  620 + title: '下行里程数'
  621 + },
  622 + {
  623 + field: 'averageMileage',
  624 + title: '平均里程数'
  625 + },
  626 + {
  627 + field: 'stationUp',
  628 + title: '站级数(上行)'
  629 + },
  630 + {
  631 + field: 'stationDown',
  632 + title: '站级数(下行)'
  633 + },{
  634 + field: 'travelTimeUp',
  635 + title: '行驶时间(上行)'
  636 + },{
  637 + field: 'travelTimeDown',
  638 + title: '行驶时间(下行)'
  639 + },{
  640 + field: 'travelIntervalUp',
  641 + title: '行驶间隔(高峰)'
  642 + },{
  643 + field: 'travelIntervalDown',
  644 + title: '行驶间隔(低谷)'
  645 + },{
  646 + field: 'warrantVehiclesLarge',
  647 + title: '经营权证(大巴)'
  648 + }, {
  649 + field: 'warrantVehiclesMiddle',
  650 + title: '经营权证(中巴)'
  651 + },{
  652 + field: 'vehiclesNumber',
  653 + title: '实际配车数'
  654 + }, {
  655 + field: 'numberVehiclesLarge',
  656 + title: '实际车辆数(大巴)'
  657 + }, {
  658 + field: 'numberVehiclesMiddle',
  659 + title: '实际车辆数(中巴)'
  660 + },{
  661 + field: 'carPlate',
  662 + title: '车辆自编号'
  663 + },{
  664 + field: 'numberPerson',
  665 + title: '线路总配人数'
  666 + },{
  667 + field: 'numberPersonDriver',
  668 + title: '人数司机'
  669 + }, {
  670 + field: 'numberPersonSales',
  671 + title: '售票员数'
  672 + },{
  673 + field: 'busEvNumber',
  674 + title: '新能源车数'
  675 + },{
  676 + field: 'directions',
  677 + title: '线路走向'
  678 + },{
  679 + field: 'numberOfManage',
  680 + title: '经营权证数'
  681 + },{
  682 + field: 'halfwayStation',
  683 + title: '站点名称'
  684 + },{
  685 + field: 'fullCustomerPercent',
  686 + title: '高峰系数'
  687 + },{
  688 + field: 'lowCustomerPercent',
  689 + title: '低谷系数'
  690 + }, {
  691 + field: 'divideLevel',
  692 + title: '间隔等级'
  693 + },{
  694 + field: 'hasTimelists',
  695 + title: '是否挂牌'
  696 + },{
  697 + field: 'isMetro',
  698 + title: '是否轨交末班车衔接'
  699 + },{
  700 + field: 'metroTime',
  701 + title: '轨交时间'
  702 + },{
  703 + field: 'coldBonusType',
  704 + title: '冷僻线路补贴类型'
  705 + },{
  706 + field: 'revenuesMonth',
  707 + title: '月度营收'
  708 + },{
  709 + field: 'personMonth',
  710 + title: '月度人次'
  711 + },{
  712 + field: 'mileageMonth',
  713 + title: '月度里程'
  714 + },{
  715 + field: 'personMonthAvg',
  716 + title: '百公里人次'
  717 + },{
  718 + field: 'revenues',
  719 + title: '营收'
  720 + },{
  721 + field: 'persons',
  722 + title: '人次'
  723 + }, {
  724 + field: 'mileages',
  725 + title: '里程'
  726 + },{
  727 + field: 'personAvg',
  728 + title: '百公里人次'
  729 + }];
  730 +
  731 + for(var i =0 ; i < cols.length ;i++){
  732 + if(i > 0 && i %3 > 0)continue;
  733 + var tag = "<div class='col_checkbox'><input type='checkbox' name="+cols[i].field+"><label>"+cols[i].title + "</label></div>";
  734 + if(cols[i+1]){
  735 + tag+= "<div class='col_checkbox'><input type='checkbox' name="+cols[i+1].field+"><label>"+cols[i+1].title + "</label></div>";
  736 + }
  737 + if(cols[i+2]){
  738 + tag+= "<div class='col_checkbox'><input type='checkbox' name="+cols[i+2].field+"><label>"+cols[i+2].title + "</label></div>";
  739 + }
  740 + $("#cols").append(tag);
172 } 741 }
173 -  
174 -  
175 - var editFlag = [[${@permission.hasPermi('system:lineReport:edit')}]];  
176 - var removeFlag = [[${@permission.hasPermi('system:lineReport:remove')}]];  
177 - var prefix = ctx + "system/lineReport";  
178 -  
179 - $(function() {  
180 -  
181 -  
182 -  
183 -  
184 - var allDicts = {};  
185 -  
186 - for(var i in dicts){  
187 - if(!allDicts[dicts[i].dictType]){  
188 - allDicts[dicts[i].dictType] = [];  
189 - }  
190 - allDicts[dicts[i].dictType].push(dicts[i]);  
191 - }  
192 -  
193 - dicts = allDicts;  
194 -  
195 -  
196 - var cols = [{  
197 - field: 'lineName',  
198 - title: '线路名称'  
199 - },  
200 - {  
201 - field: 'ticketPrice',  
202 - title: '票价'  
203 - },  
204 - {  
205 - field: 'company',  
206 - title: '公司'  
207 - },  
208 - {  
209 - field: 'fCompany',  
210 - title: '分公司'  
211 - },  
212 - {  
213 - field: 'firstStation',  
214 - title: '首站'  
215 - },  
216 - {  
217 - field: 'firstTime',  
218 - title: '首战时间'  
219 - },  
220 - {  
221 - field: 'lastStation',  
222 - title: '末站'  
223 - },  
224 - {  
225 - field: 'lastTime',  
226 - title: '末站首战时间'  
227 - },  
228 - {  
229 - field: 'mileageUp',  
230 - title: '上行里程数'  
231 - },  
232 - {  
233 - field: 'mileageDown',  
234 - title: '下行里程数'  
235 - },  
236 - {  
237 - field: 'averageMileage',  
238 - title: '平均里程数'  
239 - },  
240 - {  
241 - field: 'stationUp',  
242 - title: '站级数(上行)'  
243 - }, {  
244 - field: 'stationDown',  
245 - title: '站级数(下行)'  
246 - },{  
247 - field: 'travelTimeUp',  
248 - title: '行驶时间(上行)'  
249 - }, {  
250 - field: 'travelTimedown',  
251 - title: '行驶时间(下行)'  
252 - },  
253 - {  
254 - field: 'travelIntervalUp',  
255 - title: '行驶间隔(高峰)'  
256 - },{  
257 - field: 'travelIntervalDown',  
258 - title: '行驶间隔(低谷)'  
259 - },{  
260 - field: 'warrantVehiclesLarge',  
261 - title: '经营权证(大巴)'  
262 - },{  
263 - field: 'warrantVehiclesMiddle',  
264 - title: '经营权证(中巴)'  
265 - },{  
266 - field: 'numberVehiclesLarge',  
267 - title: '实际车辆数(大巴)'  
268 - },{  
269 - field: 'numberVehiclesMiddle',  
270 - title: '实际车辆数(中巴)'  
271 - },  
272 - {  
273 - field: 'busEvNumber',  
274 - title: '新能源车数'  
275 - },{  
276 - field: 'carPlate',  
277 - title: '车辆自编号'  
278 - },  
279 - {  
280 - field: 'sellTicketType',  
281 - title: '售票类型'  
282 - },  
283 - {  
284 - field: 'startDate',  
285 - title: '开通日期'  
286 - },  
287 - {  
288 - field: 'serviceType',  
289 - title: '营运方式'  
290 - },  
291 - {  
292 - field: 'directions',  
293 - title: '线路走向'  
294 - },{  
295 - field: 'halfwayStation',  
296 - title: '站点名称'  
297 - },{  
298 - field: 'nightParking',  
299 - title: '夜间停车点'  
300 - },  
301 - {  
302 - field: 'fullCustomerPercent',  
303 - title: '高峰系数'  
304 - },{  
305 - field: 'lowCustomerPercent',  
306 - title: '低谷系数'  
307 - }, {  
308 - field: 'divideLevel',  
309 - title: '间隔等级'  
310 - },{  
311 - field: 'hasTimelists',  
312 - title: '是否挂牌'  
313 - },  
314 - {  
315 - field: 'serviceState',  
316 - title: '营运状态'  
317 - },{  
318 - field: 'isMetro',  
319 - title: '是否轨交末班车衔接'  
320 - },{  
321 - field: 'metroTime',  
322 - title: '轨交时间'  
323 - },  
324 - {  
325 - field: 'lineType',  
326 - title: '线路类型'  
327 - },  
328 - {  
329 - field: 'roadType',  
330 - title: '道路类型'  
331 - },{  
332 - field: 'coldBonusType',  
333 - title: '冷僻线路补贴类型'  
334 - },{  
335 - field: 'revenuesMonth',  
336 - title: '月度营收'  
337 - },{  
338 - field: 'personMonth',  
339 - title: '月度人次'  
340 - },{  
341 - field: 'mileageMonth',  
342 - title: '月度里程'  
343 - },{  
344 - field: 'personMonthAvg',  
345 - title: '百公里人次'  
346 - },{  
347 - field: 'revenues',  
348 - title: '累计营收'  
349 - },{  
350 - field: 'persons',  
351 - title: '累计人次'  
352 - }, {  
353 - field: 'mileages',  
354 - title: '累计里程'  
355 - },{  
356 - field: 'personAvg',  
357 - title: '累计百公里人次'  
358 - }];  
359 -  
360 -  
361 - createTable(cols);  
362 - });  
363 -  
364 - $("input[name='createTime']").datetimepicker({  
365 - format : "yyyy-mm",  
366 - startView: 3,  
367 - minView : 3,  
368 - maxView : 3,  
369 - autoclose : true 742 +
  743 + $.get("/system/line/getUserLineInfo",function(data){
  744 + if(data.msg != null){
  745 + var data = JSON.parse(data.msg);
  746 + createTable(data);
  747 +
  748 +
  749 + var allCheck = true;
  750 +
  751 + for(var i = 0;i<data.length;i++){
  752 +
  753 + if(!data[i].checked){
  754 + allCheck = false;
  755 + }
  756 +
  757 + $("#cols input[name="+data[i].name+"]")[0].checked = data[i].checked;
  758 + }
  759 +
  760 + $("#checkboxForAll")[0].checked = allCheck;
  761 +
  762 + }
370 }); 763 });
371 - </script>  
372 - 764 +
  765 +
  766 + });
  767 +
  768 +
  769 + function DateMinus(date1){
  770 + if(date1==null){
  771 + return true;
  772 + }
  773 +
  774 + var sdate = new Date(date1);
  775 + var now = new Date();
  776 + var days = sdate.getTime()-now.getTime();
  777 + var day = parseInt(days / (1000 * 60 * 60 * 24));
  778 + console.log(day);
  779 + if(day<120){
  780 + return false;
  781 + }
  782 + return true;
  783 + }
  784 +</script>
  785 +
  786 +<style>
  787 + .col_checkbox {
  788 + width: 33%;
  789 + float: left;
  790 + }
  791 +</style>
373 </body> 792 </body>
374 </html> 793 </html>
375 \ No newline at end of file 794 \ No newline at end of file