潘钊 / bsth_control · Commits

Commit 6f391d97d7480a69088f3cac232ea58481f44d40

Authored by ljq
1 parent 9e9e5599
build: skipped

计划排班和考试更改

Inline Side-by-side
Showing 24 changed files with 150 additions and 97 deletions
src/main/java/com/bsth/controller/StationRouteController.java
  View file @6f391d9
... ... @@ -52,7 +52,7 @@ public class StationRouteController extends BaseController<StationRoute, Integer
52 52 }
53 53  
54 54 @RequestMapping(value = "/all_ls", method = RequestMethod.GET)
55   - public Iterable<LsStationRoute> list_ls(@RequestParam Map<String, Object> map) {
  55 + public Iterable<StationRoute> list_ls(@RequestParam Map<String, Object> map) {
56 56 return service.list_ls(map);
57 57 }
58 58  
... ...
src/main/java/com/bsth/service/StationRouteService.java
  View file @6f391d9
... ... @@ -35,7 +35,7 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt;
35 35 * @param map
36 36 * @return
37 37 */
38   - Iterable<LsStationRoute> list_ls(Map<String, Object> map);
  38 + Iterable<StationRoute> list_ls(Map<String, Object> map);
39 39  
40 40 /**
41 41 *
... ...
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
  View file @6f391d9
... ... @@ -254,8 +254,10 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
254 254 repository.save(lineVersions);
255 255 // 更新上一版本时间
256 256 LineVersions upLineVersions = repository.findBylineIdAndVersions(line.getId(),versions);
257   - upLineVersions.setEndDate(new java.sql.Date(startDate.getTime()));
258   - repository.save(upLineVersions);
  257 + if(upLineVersions != null) {
  258 + upLineVersions.setEndDate(new java.sql.Date(startDate.getTime()));
  259 + repository.save(upLineVersions);
  260 + }
259 261  
260 262 //// 先查询待更新版本 如果有需要就删除 预留..
261 263 // List<LsSectionRoute> needDelete = lsSectionRouteRepository.findupdated(Integer.valueOf(map.get("lineId").toString()),map.get("lineCode").toString(),versions);
... ... @@ -267,8 +269,8 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
267 269 // lsStationRouteRepository.deleteAll(needDelete2);
268 270  
269 271  
270   - if(map.get("hisVersions") != null && !map.get("hisVersions").toString().isEmpty()) {
271   - Integer hisVersion = Integer.valueOf(map.get("hisVersions").toString());
  272 + if(map.get("versions") != null && !map.get("versions").toString().isEmpty()) {
  273 + Integer hisVersion = Integer.valueOf(map.get("versions").toString());
272 274  
273 275 List<LsSectionRoute> sectionList = lsSectionRouteRepository.findupdated(Integer.valueOf(map.get("lineId").toString()),map.get("lineCode").toString(),hisVersion);
274 276  
... ...
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
  View file @6f391d9
... ... @@ -94,11 +94,11 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
94 94 @Autowired
95 95 private LsSectionRouteRepository lsSectionRouteRepository;
96 96  
97   - public Iterable<LsStationRoute> list_ls(Map<String, Object> map) {
  97 + public Iterable<StationRoute> list_ls(Map<String, Object> map){
98 98 List<Sort.Order> orderList = new ArrayList<>();
99 99 orderList.add(new Sort.Order(Direction.ASC, "directions"));
100 100 orderList.add(new Sort.Order(Direction.ASC, "stationRouteCode"));
101   - return lsStationRouteRepository.findAll(new CustomerSpecs<LsStationRoute>(map), new Sort(orderList));
  101 + return repository.findAll(new CustomerSpecs(map), new Sort(orderList));
102 102 }
103 103  
104 104  
... ...
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
  View file @6f391d9
... ... @@ -107,7 +107,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
107 107 public List<Map<String, Object>> findZdAndTcc(int lineid, int xldir, int lineversion) {
108 108 String sql = "select * from " +
109 109 "(" +
110   - "select station_code as zcode, station_name as zname, concat(station_name, '(站点)') as aname from bsth_c_ls_stationroute " +
  110 + "select station_code as zcode, station_name as zname, concat(station_name, '(站点)') as aname from bsth_c_stationroute " +
111 111 "where destroy = 0 and line = ? and directions = ? and versions = ? " +
112 112 "union all " +
113 113 "select park_code as zcode, park_name as zname, concat(park_name, '(停车场)') as aname from bsth_c_car_park " +
... ...
src/main/java/com/bsth/service/schedule/timetable/ExcelData.java
  View file @6f391d9
... ... @@ -2,6 +2,7 @@ package com.bsth.service.schedule.timetable;
2 2  
3 3 import com.bsth.entity.Line;
4 4 import com.bsth.entity.LsStationRoute;
  5 +import com.bsth.entity.StationRoute;
5 6 import com.bsth.entity.schedule.GuideboardInfo;
6 7 import com.bsth.service.LineService;
7 8 import com.bsth.service.StationRouteService;
... ... @@ -37,7 +38,7 @@ public class ExcelData {
37 38 /** 线路 */
38 39 private Line line;
39 40 /** 线路路由列表（包含上下行的起终点站） */
40   - private List<LsStationRoute> lsStationRouteList;
  41 + private List<StationRoute> lsStationRouteList;
41 42 /** 路牌列表 */
42 43 private List<GuideboardInfo> guideboardInfoList;
43 44 /** excel数据格式 */
... ... @@ -67,11 +68,11 @@ public class ExcelData {
67 68 this.line = line;
68 69 }
69 70  
70   - public List<LsStationRoute> getLsStationRouteList() {
  71 + public List<StationRoute> getLsStationRouteList() {
71 72 return lsStationRouteList;
72 73 }
73 74  
74   - public void setLsStationRouteList(List<LsStationRoute> lsStationRouteList) {
  75 + public void setLsStationRouteList(List<StationRoute> lsStationRouteList) {
75 76 this.lsStationRouteList = lsStationRouteList;
76 77 }
77 78  
... ... @@ -131,9 +132,8 @@ public class ExcelData {
131 132 Map<String, Object> p1 = new HashMap<>();
132 133 p1.put("line.id_eq", lineId);
133 134 p1.put("stationMark_in", "B,E"); // 起点站
134   - p1.put("destroy_eq", 0); // 未撤销
135   - p1.put("versions_eq", lineRouteVersion); // 带线路版本
136   - lsStationRouteList = (List<LsStationRoute>) stationRouteService.list_ls(p1);
  135 + //p1.put("versions_eq", lineRouteVersion); // 带线路版本
  136 + lsStationRouteList = (List<StationRoute>) stationRouteService.list(p1);
137 137 // 路牌列表
138 138 p1.clear();
139 139 p1.put("xl.id_eq", lineId);
... ... @@ -151,8 +151,8 @@ public class ExcelData {
151 151 * @throws ScheduleException
152 152 */
153 153 private void validateRouteName(int colNum, String routeName) throws ScheduleException {
154   - List<LsStationRoute> lsStationRoutes = new ArrayList<>();
155   - for (LsStationRoute lsStationRoute : this.lsStationRouteList) {
  154 + List<StationRoute> lsStationRoutes = new ArrayList<>();
  155 + for (StationRoute lsStationRoute : this.lsStationRouteList) {
156 156 if ("B".equals(lsStationRoute.getStationMark()) && routeName.equals(lsStationRoute.getStationName())) {
157 157 lsStationRoutes.add(lsStationRoute);
158 158 }
... ...
src/main/resources/application-dev.properties
  View file @6f391d9
... ... @@ -40,9 +40,9 @@ jp.date = cmd /c date
40 40 ## gps client data
41 41 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
42 42 ## gateway real data
43   -http.gps.real.url= http://192.168.168.237:8080/transport_server/rtgps/
  43 +http.gps.real.url= http://101.95.0.106:38080/transport_server/rtgps/
44 44 ## gateway send directive
45   -http.send.directive = http://192.168.168.237:8899/transport_server/message/
  45 +http.send.directive = http://101.95.0.106:38080/transport_server/message/
46 46 ## rfid data
47 47 http.rfid.url= http://114.80.178.12:29000/rfid
48 48  
... ...
src/main/resources/application-prod.properties
  View file @6f391d9
... ... @@ -14,9 +14,10 @@ spring.jpa.show-sql= false
14 14  
15 15 #DATABASE
16 16 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
17   -spring.datasource.url= jdbc:mysql://192.168.2.171:3306/jp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
  17 +spring.datasource.url= jdbc:mysql://172.29.0.14/school_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  18 +#spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
18 19 spring.datasource.username= root
19   -spring.datasource.password= root2jsp
  20 +spring.datasource.password= root
20 21 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
21 22  
22 23 #DATASOURCE SETTING
... ... @@ -30,20 +31,15 @@ spring.datasource.hikari.connection-timeout= 3000
30 31 spring.datasource.hikari.connection-test-query= SELECT 1
31 32 spring.datasource.hikari.validation-timeout= 3000
32 33  
  34 +jp.time = cmd /c time
  35 +jp.date = cmd /c date
  36 +
33 37 ## gps client data
34 38 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
35 39 ## gateway real data
36   -http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
  40 +http.gps.real.url= http://101.95.0.106:38080/transport_server/rtgps/
37 41 ## gateway send directive
38   -http.send.directive= http://10.10.200.79:8080/transport_server/message/
  42 +http.send.directive = http://101.95.0.106:38080/transport_server/message/
39 43 ## rfid data
40   -http.rfid.url= http://10.10.200.82:9000/rfid
41   -## wxsb
42   -#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do
43   -#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do
44   -#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
45   -#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do
46   -http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do
47   -http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do
48   -http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
49   -http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do
50 44 \ No newline at end of file
  45 +http.rfid.url= http://114.80.178.12:29000/rfid
  46 +
... ...
src/main/resources/control-jdbc.properties
  View file @6f391d9
1 1 station.mysql.driver= com.mysql.jdbc.Driver
2   -station.mysql.url= jdbc:mysql://127.0.0.1/jp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  2 +station.mysql.url= jdbc:mysql://172.29.0.14/school_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
3 3 station.mysql.username= root
4 4 station.mysql.password= root
5 5  
... ...
src/main/resources/datatools/config-dev.properties
  View file @6f391d9
... ... @@ -8,9 +8,9 @@ datatools.kvars_dbip=127.0.0.1
8 8 #数据库用户名
9 9 datatools.kvars_dbuname=root
10 10 #数据库密码
11   -datatools.kvars_dbpwd=
  11 +datatools.kvars_dbpwd=root
12 12 #数据库库名
13   -datatools.kvars_dbdname=test_control
  13 +datatools.kvars_dbdname=school_control
14 14  
15 15 # 3、上传数据配置信息
16 16 # 上传文件目录配置（根据不同的环境需要修正）
... ...
src/main/resources/datatools/config-prod.properties
  View file @6f391d9
... ... @@ -5,13 +5,13 @@ datatools.kettle_properties=/datatools/kettle.properties
5 5 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
6 6  
7 7 #数据库ip地址
8   -datatools.kvars_dbip=10.10.200.121
  8 +datatools.kvars_dbip=172.29.0.14
9 9 #数据库用户名
10 10 datatools.kvars_dbuname=root
11 11 #数据库密码
12   -datatools.kvars_dbpwd=root2jsp
  12 +datatools.kvars_dbpwd=root
13 13 #数据库库名
14   -datatools.kvars_dbdname=control
  14 +datatools.kvars_dbdname=school_control
15 15  
16 16 # 3、上传数据配置信息
17 17 # 上传文件目录配置（根据不同的环境需要修正）
... ...
src/main/resources/datatools/ktrs/ttinfodetailDataInput2_version.ktr
  View file @6f391d9
... ... @@ -1644,7 +1644,7 @@
1644 1644 <cache_size>0</cache_size>
1645 1645 <lookup>
1646 1646 <schema/>
1647   - <table>bsth_c_ls_stationroute</table>
  1647 + <table>bsth_c_stationroute</table>
1648 1648 <orderby/>
1649 1649 <fail_on_multiple>N</fail_on_multiple>
1650 1650 <eat_row_on_failure>N</eat_row_on_failure>
... ... @@ -2058,7 +2058,7 @@
2058 2058 <cache_size>0</cache_size>
2059 2059 <lookup>
2060 2060 <schema/>
2061   - <table>bsth_c_ls_stationroute</table>
  2061 + <table>bsth_c_stationroute</table>
2062 2062 <orderby/>
2063 2063 <fail_on_multiple>N</fail_on_multiple>
2064 2064 <eat_row_on_failure>N</eat_row_on_failure>
... ... @@ -2136,7 +2136,7 @@
2136 2136 <cache_size>0</cache_size>
2137 2137 <lookup>
2138 2138 <schema/>
2139   - <table>bsth_c_ls_stationroute</table>
  2139 + <table>bsth_c_stationroute</table>
2140 2140 <orderby/>
2141 2141 <fail_on_multiple>N</fail_on_multiple>
2142 2142 <eat_row_on_failure>N</eat_row_on_failure>
... ... @@ -2274,7 +2274,7 @@
2274 2274 <cache_size>0</cache_size>
2275 2275 <lookup>
2276 2276 <schema/>
2277   - <table>bsth_c_ls_stationroute</table>
  2277 + <table>bsth_c_stationroute</table>
2278 2278 <orderby/>
2279 2279 <fail_on_multiple>N</fail_on_multiple>
2280 2280 <eat_row_on_failure>N</eat_row_on_failure>
... ... @@ -2340,7 +2340,7 @@
2340 2340 <cache_size>0</cache_size>
2341 2341 <lookup>
2342 2342 <schema/>
2343   - <table>bsth_c_ls_stationroute</table>
  2343 + <table>bsth_c_stationroute</table>
2344 2344 <orderby/>
2345 2345 <fail_on_multiple>N</fail_on_multiple>
2346 2346 <eat_row_on_failure>N</eat_row_on_failure>
... ... @@ -2406,7 +2406,7 @@
2406 2406 <cache_size>0</cache_size>
2407 2407 <lookup>
2408 2408 <schema/>
2409   - <table>bsth_c_ls_stationroute</table>
  2409 + <table>bsth_c_stationroute</table>
2410 2410 <orderby/>
2411 2411 <fail_on_multiple>N</fail_on_multiple>
2412 2412 <eat_row_on_failure>N</eat_row_on_failure>
... ...
src/main/resources/datatools/ktrs/ttinfodetailDataInput2_version_2.ktr
  View file @6f391d9
... ... @@ -1692,7 +1692,7 @@
1692 1692 <cache_size>0</cache_size>
1693 1693 <lookup>
1694 1694 <schema/>
1695   - <table>bsth_c_ls_stationroute</table>
  1695 + <table>bsth_c_stationroute</table>
1696 1696 <orderby/>
1697 1697 <fail_on_multiple>N</fail_on_multiple>
1698 1698 <eat_row_on_failure>N</eat_row_on_failure>
... ... @@ -2106,7 +2106,7 @@
2106 2106 <cache_size>0</cache_size>
2107 2107 <lookup>
2108 2108 <schema/>
2109   - <table>bsth_c_ls_stationroute</table>
  2109 + <table>bsth_c_stationroute</table>
2110 2110 <orderby/>
2111 2111 <fail_on_multiple>N</fail_on_multiple>
2112 2112 <eat_row_on_failure>N</eat_row_on_failure>
... ... @@ -2184,7 +2184,7 @@
2184 2184 <cache_size>0</cache_size>
2185 2185 <lookup>
2186 2186 <schema/>
2187   - <table>bsth_c_ls_stationroute</table>
  2187 + <table>bsth_c_stationroute</table>
2188 2188 <orderby/>
2189 2189 <fail_on_multiple>N</fail_on_multiple>
2190 2190 <eat_row_on_failure>N</eat_row_on_failure>
... ... @@ -2322,7 +2322,7 @@
2322 2322 <cache_size>0</cache_size>
2323 2323 <lookup>
2324 2324 <schema/>
2325   - <table>bsth_c_ls_stationroute</table>
  2325 + <table>bsth_c_stationroute</table>
2326 2326 <orderby/>
2327 2327 <fail_on_multiple>N</fail_on_multiple>
2328 2328 <eat_row_on_failure>N</eat_row_on_failure>
... ... @@ -2388,7 +2388,7 @@
2388 2388 <cache_size>0</cache_size>
2389 2389 <lookup>
2390 2390 <schema/>
2391   - <table>bsth_c_ls_stationroute</table>
  2391 + <table>bsth_c_stationroute</table>
2392 2392 <orderby/>
2393 2393 <fail_on_multiple>N</fail_on_multiple>
2394 2394 <eat_row_on_failure>N</eat_row_on_failure>
... ... @@ -2454,7 +2454,7 @@
2454 2454 <cache_size>0</cache_size>
2455 2455 <lookup>
2456 2456 <schema/>
2457   - <table>bsth_c_ls_stationroute</table>
  2457 + <table>bsth_c_stationroute</table>
2458 2458 <orderby/>
2459 2459 <fail_on_multiple>N</fail_on_multiple>
2460 2460 <eat_row_on_failure>N</eat_row_on_failure>
... ...
src/main/resources/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr
  View file @6f391d9
... ... @@ -692,7 +692,7 @@
692 692 <cache_size>0</cache_size>
693 693 <lookup>
694 694 <schema/>
695   - <table>bsth_c_ls_stationroute</table>
  695 + <table>bsth_c_stationroute</table>
696 696 <orderby/>
697 697 <fail_on_multiple>N</fail_on_multiple>
698 698 <eat_row_on_failure>N</eat_row_on_failure>
... ...
src/main/resources/logback.xml
  View file @6f391d9
... ... @@ -3,7 +3,7 @@
3 3 <configuration>
4 4  
5 5 <!-- <property resource="application.properties" /> -->
6   - <property name="LOG_BASE" value="F:/bsth_control_logs" />
  6 + <property name="LOG_BASE" value="E:/bsth_control_logs" />
7 7 <!-- 控制台输出 -->
8 8 <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
9 9  
... ...
src/main/resources/ms-jdbc.properties
  View file @6f391d9
... ... @@ -4,6 +4,6 @@
4 4 #ms.mysql.password= 123456
5 5  
6 6 ms.mysql.driver= com.mysql.jdbc.Driver
7   -ms.mysql.url= jdbc:mysql://127.0.0.17:3306/ms?useUnicode=true&characterEncoding=utf-8
  7 +ms.mysql.url= jdbc:mysql://172.29.0.14:3306/ms?useUnicode=true&characterEncoding=utf-8
8 8 ms.mysql.username= root
9 9 ms.mysql.password= root
10 10 \ No newline at end of file
... ...
src/main/resources/static/pages/base/lineversions/list.html
  View file @6f391d9
... ... @@ -150,7 +150,9 @@
150 150 {{/if}}
151 151 {{if obj.status == '2'}}
152 152 <a class="update_delete_btn btn btn-danger btn-sm" data-id="{{obj.id}}" data-pjax> 删除 </a>
  153 +<!--
153 154 <a class="update_versions_route_btn btn btn-info btn-sm" data-lineid="{{obj.line.id}}" data-pjax> 编辑版本路线 </a>
  155 +-->
154 156 {{/if}}
155 157 {{if obj.status == '2' && obj.isupdate!=1}}
156 158 <a class="issue_btn btn btn-danger btn-sm" data-id="{{obj.id}}" data-pjax>发布</a>
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @6f391d9
... ... @@ -48,7 +48,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
48 48  
49 49 }
50 50 ]
51   -);
  51 +);
52 52 /**
53 53 * remoteValidation指令，远程数据验证验证，作为属性放在某个指令上，依赖与指令的ngModel。
54 54 * 属性如下：
... ... @@ -147,7 +147,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteValidation&#39;, [
147 147 }
148 148 }
149 149 ]);
150   -
  150 +
151 151 /**
152 152 * remoteValidatiot2指令，远程数据验证验证，作为属性放在某个指令上，依赖与指令的ngModel（专门用于时刻表sheet验证）。
153 153 * 属性如下：
... ... @@ -247,7 +247,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteValidationt2&#39;, [
247 247 }
248 248 }
249 249 ]);
250   -
  250 +
251 251 /**
252 252 * remoteValidationt3 远程验证指令（监控依赖的model变化）
253 253 * 属性如下：
... ... @@ -315,7 +315,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
315 315 }
316 316 }
317 317 ]
318   -);
  318 +);
319 319 /**
320 320 * remoteWarn指令：远程验证警告，作为属性放在某个指令上。
321 321 * TODO：暂时没法整合到form上，类似$error这样
... ... @@ -430,7 +430,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteWarn&#39;, [
430 430 }
431 431 };
432 432 }
433   -]);
  433 +]);
434 434  
435 435 angular.module('ScheduleApp').directive("saSelect", ['$timeout', function($timeout) {
436 436 return {
... ... @@ -543,7 +543,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect&quot;, [&#39;$timeout&#39;, function($timeo
543 543 }
544 544 };
545 545 }]);
546   -
  546 +
547 547  
548 548  
549 549 angular.module('ScheduleApp').directive("saSelect2", [
... ... @@ -703,7 +703,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect2&quot;, [
703 703 }
704 704 ]);
705 705  
706   -
  706 +
707 707  
708 708  
709 709  
... ... @@ -1094,7 +1094,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [
1094 1094 }
1095 1095 ]);
1096 1096  
1097   -
  1097 +
1098 1098 /**
1099 1099 * saSelect4指令，封装angular-ui-select控件，并添加相应的业务。
1100 1100 * name（必须）：控件的名字
... ... @@ -1417,7 +1417,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect4&#39;, [
1417 1417  
1418 1418 };
1419 1419 }
1420   -]);
  1420 +]);
1421 1421 /**
1422 1422 * saSelect5指令，基于简拼查询的select，内部封装angular-ui-select控件，并嵌入相应的业务逻辑。
1423 1423 * name（必须）：控件的名字
... ... @@ -1930,7 +1930,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
1930 1930 }
1931 1931 };
1932 1932 }
1933   -]);
  1933 +]);
1934 1934 /**
1935 1935 * mySelect指令，封装uiselect指令，封装内部数据获取，只支持单选
1936 1936 * cm（必须）：绑定外部对象，因为关联的字段不只一个，单独使用ngModel不够
... ... @@ -1974,7 +1974,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;mySelect&#39;, [
1974 1974 }
1975 1975 }
1976 1976 }
1977   -]);
  1977 +]);
1978 1978  
1979 1979 /**
1980 1980 * saRadiogroup指令
... ... @@ -2074,7 +2074,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saRadiogroup&quot;, [function() {
2074 2074 }
2075 2075 };
2076 2076 }]);
2077   -
  2077 +
2078 2078  
2079 2079  
2080 2080 /**
... ... @@ -2235,7 +2235,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saCheckboxgroup&#39;, [
2235 2235 }
2236 2236 ]);
2237 2237  
2238   -
  2238 +
2239 2239  
2240 2240  
2241 2241 /**
... ... @@ -2424,7 +2424,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saDategroup&#39;, [
2424 2424 }
2425 2425 ]);
2426 2426  
2427   -
  2427 +
2428 2428 /**
2429 2429 * saFbgsgroup指令
2430 2430 * 属性如下：
... ... @@ -2577,7 +2577,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
2577 2577 }
2578 2578 }
2579 2579 }
2580   - ]);
  2580 + ]);
2581 2581  
2582 2582  
2583 2583 /**
... ... @@ -3020,7 +3020,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saGuideboardgroup&#39;, [
3020 3020 }
3021 3021 ]);
3022 3022  
3023   -
  3023 +
3024 3024  
3025 3025  
3026 3026 /**
... ... @@ -3768,7 +3768,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
3768 3768 }
3769 3769 ]);
3770 3770  
3771   -
  3771 +
3772 3772 /**
3773 3773 * saBcgroup指令，用于套跑界面中，从指定线路，指定时刻表，指定路牌的班次列表中选择套跑班次。
3774 3774 * 属性如下：
... ... @@ -4061,7 +4061,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saBcgroup&#39;, [
4061 4061 }
4062 4062 }
4063 4063 }
4064   -]);
  4064 +]);
4065 4065 /**
4066 4066 * saTimeTable指令，时刻表显示指令，excel表格形式，支持菜单，事件处理。
4067 4067 * name（必须），控件的名字
... ... @@ -4432,7 +4432,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
4432 4432 }
4433 4433 ]
4434 4434 );
4435   -
  4435 +
4436 4436 /**
4437 4437 * saTimetablePreview指令，时刻表预览模式视图。
4438 4438 */
... ... @@ -4758,7 +4758,7 @@ angular.module(&quot;ScheduleApp&quot;).directive(
4758 4758 };
4759 4759 }
4760 4760 ]
4761   -);
  4761 +);
4762 4762 /**
4763 4763 * 滚动事件控制指令。
4764 4764 */
... ... @@ -4802,7 +4802,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
4802 4802 }
4803 4803 }
4804 4804 ]
4805   -);
  4805 +);
4806 4806 /**
4807 4807 * 滚动事件控制指令。
4808 4808 */
... ... @@ -4846,7 +4846,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
4846 4846 }
4847 4847 }
4848 4848 ]
4849   -);
  4849 +);
4850 4850 /**
4851 4851 * saOrderoption指令，搜索时的排序选项（在搜索时可以使用，通用的）
4852 4852 * 属性如下：
... ... @@ -5018,7 +5018,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
5018 5018 };
5019 5019 }
5020 5020 ]
5021   -);
  5021 +);
5022 5022 /**
5023 5023 * saScpdate指令（非通用指令，只在排班计划form中使用）。
5024 5024 * 属性如下：
... ... @@ -5249,7 +5249,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
5249 5249 };
5250 5250 }
5251 5251 ]
5252   -);
  5252 +);
5253 5253 /**
5254 5254 * saSrule指令（非通用指令，只在排班计划form中使用）。
5255 5255 * 属性如下：
... ... @@ -5437,7 +5437,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
5437 5437 };
5438 5438 }
5439 5439 ]
5440   -);
  5440 +);
5441 5441 /**
5442 5442 * saPlaninfoedit指令，排班明细编辑控件，用在调度执勤日报的修改功能
5443 5443 * name（必须），控件的名字
... ... @@ -5879,7 +5879,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
5879 5879 };
5880 5880 }
5881 5881 ]
5882   -);
  5882 +);
5883 5883 /**
5884 5884 * saPlaninfoedit2指令，排班明细编辑控件，用在调度执勤日报的修改功能
5885 5885 * name（必须），控件的名字
... ...
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/module.js
  View file @6f391d9
... ... @@ -385,7 +385,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
385 385  
386 386 // 当转向到此页面时，就获取明细信息并绑定
387 387 Gb.get({id: id}, function(result) {
388   - self.guideboardForDetail = result.data;
  388 + self.guideboardForDetail = result;
389 389 self.title = "路牌 " + self.guideboardForDetail.lpName + " 详细信息";
390 390 });
391 391 }
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/module.js
  View file @6f391d9
... ... @@ -65,7 +65,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
65 65 service.getCurrentLineVersion(xlid).then(
66 66 function(result) {
67 67 if (result.length == 0) {
68   - alert("没有线路当前版本");
  68 + //alert("没有线路当前版本");
69 69 } else if (result.length > 1) {
70 70 alert("有多个线路当前版本");
71 71 } else {
... ...
src/main/resources/static/real_control_v2/css/main.css
  View file @6f391d9
... ... @@ -2143,4 +2143,5 @@ g.gps-wrap rect.twinkle[updown=&quot;1&quot;] {
2143 2143 color: red;
2144 2144 position:absolute;
2145 2145 right:0;
  2146 + margin-top: -40px;
2146 2147 }
... ...
src/main/resources/static/real_control_v2/css/north.css
  View file @6f391d9
... ... @@ -70,7 +70,6 @@
70 70 width: 100%;
71 71 bottom: 1px;
72 72 margin-left: -14px;
73   - margin-top: 35px;
74 73 }
75 74  
76 75 .north .north-tabs .uk-tab {
... ...
src/main/resources/static/real_control_v2/js/subject/subject.js
  View file @6f391d9
... ... @@ -6,15 +6,20 @@ var su_subject = (function () {
6 6 ks();
7 7 };
8 8  
9   - function ks(){
  9 + function ks(index){
10 10 //站点路由
11 11 gb_common.$get('/subjectUser/userAll', '',function (rs) {
12 12 if (rs == null || rs.length == 0) {
13   - return //当前没有考题或
  13 + return //当前没有考题
  14 + }
  15 +
  16 + var list ;
  17 + if (index != null || index != undefined){
  18 + list = retunhtmls(rs,index);
  19 + }else {
  20 + list = retunhtml(rs);
14 21 }
15 22  
16   - var list = retunhtml(rs);
17   -
18 23 $('.north_suject').remove();
19 24 if (list == null){
20 25 //otify_succ('全部题目已操作完成 请查看自己的成绩！');
... ... @@ -22,12 +27,32 @@ var su_subject = (function () {
22 27 }
23 28 var htmlStr = template('suject_pop_wrap', list);
24 29 $wrap.append(htmlStr);
25   -
  30 +
  31 + //上一题
  32 + $('.uk-panels .north-buttonUp').on('click', function () {
  33 + var thisall= $('.uk-panels .north-buttonUp');
  34 + var index= thisall.data('index');
  35 + if (index == 1) {
  36 + layer.msg('已经是第一题...');
  37 + return
  38 + }
  39 + ks(index - 2);
  40 + });
  41 + //下一题
  42 + $('.uk-panels .north-buttonDown').on('click', function () {
  43 + var thisall= $('.uk-panels .north-buttonDown');
  44 + var index= thisall.data('index');
  45 + var number= thisall.data('number');
  46 + if (index == number){
  47 + layer.msg('已经是最后一题...');
  48 + return
  49 + }
  50 + ks(index);
  51 + });
  52 +
26 53 //提交按钮 //加载完成才可以
27 54 $('.uk-panels .north-button').on('click', function () {
28   -
29   -
30   - layer.confirm('提交后不可更改，您确定要提交吗？', {
  55 + layer.confirm('您确定要提交吗？', {
31 56 btn: ['提交','取消'] //按钮
32 57 }, function(index) {
33 58 // 关闭弹出层.
... ... @@ -49,10 +74,13 @@ var su_subject = (function () {
49 74 });
50 75 });
51 76 })
  77 +
  78 +
  79 +
  80 +
52 81 }
53 82  
54   -
55   -
  83 +
56 84 function retunhtml(list){
57 85 let i = 1;
58 86 for (let t in list){
... ... @@ -66,8 +94,15 @@ var su_subject = (function () {
66 94 }
67 95 return null;
68 96 }
69   -
70   -
  97 +
  98 + function retunhtmls(list,index){
  99 + list[index].number = list.length;
  100 + list[index].index = index + 1;
  101 + return list[index];
  102 + }
  103 +
  104 +
  105 +
71 106 return {
72 107 init: init
73 108 };
... ...
src/main/resources/static/real_control_v2/main.html
  View file @6f391d9
... ... @@ -74,13 +74,27 @@
74 74  
75 75 <!-- #### 考试 start ### -->
76 76 <script id="suject_pop_wrap" type="text/html">
77   - <div class="north_suject">
  77 + <div class="north_suject" style="margin-top: -20px">
78 78  
  79 +
  80 + <div class="north-tmx">
  81 + &nbsp;&nbsp;&nbsp;
  82 + 当前状态：
  83 + {{if result== 0 }}
  84 + 答题正确
  85 + {{else if result== 1}}
  86 + 答题错误
  87 + {{else}}
  88 + 未答题
  89 + {{/if}}
  90 + </div>
  91 + <div class="north-tm">
  92 +
  93 + </div>
79 94 <div class="north-tm">
80 95 当前第 {{index}} 题 &nbsp;&nbsp;共有 {{number}} 题
81 96 </div>
82 97  
83   -
84 98 <div class="north-tm">
85 99 场景：{{subjectId.subjectText}}
86 100 </div>
... ... @@ -90,6 +104,10 @@
90 104 <div class="north-tmx" style="visibility: {{isOperateTest == 1 ? 'hidden':'visible'}}" >
91 105 答案：({{subjectId.dir == 0 ? '上行':'下行'}}){{subjectId.operateTest}}
92 106 </div>
  107 + <button id="submitUp" class="north-buttonUp" style="margin-left: 32%;" data-index="{{index}}">上一题</button>
  108 +
  109 + <button id="submitDown" class="north-buttonDown" data-index="{{index}}" data-number="{{number}}">下一题</button>
  110 +
93 111 <div class="north-button">
94 112 <button id="submit" class="subject_button" data-id="{{id}}">提交</button>
95 113 </div>
... ...