计划排班和考试更改

ljq
1 parent 9e9e5599
Showing 24 changed files with 150 additions and 97 deletions
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/service/StationRouteService.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/java/com/bsth/service/schedule/timetable/ExcelData.java
src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
src/main/resources/control-jdbc.properties
src/main/resources/datatools/config-dev.properties
src/main/resources/datatools/config-prod.properties
src/main/resources/datatools/ktrs/ttinfodetailDataInput2_version.ktr
src/main/resources/datatools/ktrs/ttinfodetailDataInput2_version_2.ktr
src/main/resources/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr
src/main/resources/logback.xml
src/main/resources/ms-jdbc.properties
src/main/resources/static/pages/base/lineversions/list.html
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/module.js
@@ -52,7 +52,7 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
     }
     @RequestMapping(value = "/all_ls", method = RequestMethod.GET)
-    public Iterable<LsStationRoute> list_ls(@RequestParam Map<String, Object> map) {
+    public Iterable<StationRoute> list_ls(@RequestParam Map<String, Object> map) {
         return service.list_ls(map);
     }
@@ -35,7 +35,7 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
      * @param map
      * @return
      */
-    Iterable<LsStationRoute> list_ls(Map<String, Object> map);
+    Iterable<StationRoute> list_ls(Map<String, Object> map);
 	/**
 	 * 
@@ -254,8 +254,10 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 			repository.save(lineVersions);
 			// 更新上一版本时间
 			LineVersions upLineVersions = repository.findBylineIdAndVersions(line.getId(),versions);
-			upLineVersions.setEndDate(new java.sql.Date(startDate.getTime()));
-			repository.save(upLineVersions);
+			if(upLineVersions != null) {
+				upLineVersions.setEndDate(new java.sql.Date(startDate.getTime()));
+				repository.save(upLineVersions);
+			}
 			//// 先查询待更新版本 如果有需要就删除 预留..
 //			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
 //			lsStationRouteRepository.deleteAll(needDelete2);
-			if(map.get("hisVersions") != null && !map.get("hisVersions").toString().isEmpty()) {
-				Integer hisVersion = Integer.valueOf(map.get("hisVersions").toString());
+			if(map.get("versions") != null && !map.get("versions").toString().isEmpty()) {
+				Integer hisVersion = Integer.valueOf(map.get("versions").toString());
 				List<LsSectionRoute> sectionList = lsSectionRouteRepository.findupdated(Integer.valueOf(map.get("lineId").toString()),map.get("lineCode").toString(),hisVersion);
@@ -94,11 +94,11 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
     @Autowired
     private LsSectionRouteRepository lsSectionRouteRepository;
-    public Iterable<LsStationRoute> list_ls(Map<String, Object> map) {
+    public Iterable<StationRoute> list_ls(Map<String, Object> map){
         List<Sort.Order> orderList = new ArrayList<>();
         orderList.add(new Sort.Order(Direction.ASC, "directions"));
         orderList.add(new Sort.Order(Direction.ASC, "stationRouteCode"));
-        return lsStationRouteRepository.findAll(new CustomerSpecs<LsStationRoute>(map), new Sort(orderList));
+        return repository.findAll(new CustomerSpecs(map), new Sort(orderList));
     }
@@ -107,7 +107,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     public List<Map<String, Object>> findZdAndTcc(int lineid, int xldir, int lineversion) {
         String sql = "select * from " +
                 "(" +
-                "select station_code as zcode, station_name as zname, concat(station_name, '(站点)') as aname from bsth_c_ls_stationroute " +
+                "select station_code as zcode, station_name as zname, concat(station_name, '(站点)') as aname from bsth_c_stationroute " +
                 "where destroy = 0 and line = ? and directions = ? and versions = ? " +
                 "union all " +
                 "select park_code as zcode, park_name as zname, concat(park_name, '(停车场)') as aname from bsth_c_car_park " +
@@ -2,6 +2,7 @@ package com.bsth.service.schedule.timetable;
 import com.bsth.entity.Line;
 import com.bsth.entity.LsStationRoute;
+import com.bsth.entity.StationRoute;
 import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.service.LineService;
 import com.bsth.service.StationRouteService;
@@ -37,7 +38,7 @@ public class ExcelData {
     /** 线路 */
     private Line line;
     /** 线路路由列表（包含上下行的起终点站） */
-    private List<LsStationRoute> lsStationRouteList;
+    private List<StationRoute> lsStationRouteList;
     /** 路牌列表 */
     private List<GuideboardInfo> guideboardInfoList;
     /** excel数据格式 */
@@ -67,11 +68,11 @@ public class ExcelData {
         this.line = line;
     }
-    public List<LsStationRoute> getLsStationRouteList() {
+    public List<StationRoute> getLsStationRouteList() {
         return lsStationRouteList;
     }
-    public void setLsStationRouteList(List<LsStationRoute> lsStationRouteList) {
+    public void setLsStationRouteList(List<StationRoute> lsStationRouteList) {
         this.lsStationRouteList = lsStationRouteList;
     }
@@ -131,9 +132,8 @@ public class ExcelData {
         Map<String, Object> p1 = new HashMap<>();
         p1.put("line.id_eq", lineId);
         p1.put("stationMark_in", "B,E"); // 起点站
-        p1.put("destroy_eq", 0); // 未撤销
-        p1.put("versions_eq", lineRouteVersion); // 带线路版本
-        lsStationRouteList = (List<LsStationRoute>) stationRouteService.list_ls(p1);
+        //p1.put("versions_eq", lineRouteVersion); // 带线路版本
+        lsStationRouteList = (List<StationRoute>) stationRouteService.list(p1);
         // 路牌列表
         p1.clear();
         p1.put("xl.id_eq", lineId);
@@ -151,8 +151,8 @@ public class ExcelData {
      * @throws ScheduleException
      */
     private void validateRouteName(int colNum, String routeName) throws ScheduleException {
-        List<LsStationRoute> lsStationRoutes = new ArrayList<>();
-        for (LsStationRoute lsStationRoute : this.lsStationRouteList) {
+        List<StationRoute> lsStationRoutes = new ArrayList<>();
+        for (StationRoute lsStationRoute : this.lsStationRouteList) {
             if ("B".equals(lsStationRoute.getStationMark()) && routeName.equals(lsStationRoute.getStationName())) {
                 lsStationRoutes.add(lsStationRoute);
             }
@@ -40,9 +40,9 @@ jp.date = cmd /c date
 ## gps client data
 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
-http.gps.real.url= http://192.168.168.237:8080/transport_server/rtgps/
+http.gps.real.url= http://101.95.0.106:38080/transport_server/rtgps/
 ## gateway send directive
-http.send.directive = http://192.168.168.237:8899/transport_server/message/
+http.send.directive = http://101.95.0.106:38080/transport_server/message/
 ## rfid data
 http.rfid.url= http://114.80.178.12:29000/rfid
@@ -14,9 +14,10 @@ spring.jpa.show-sql= false
 #DATABASE
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.2.171:3306/jp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.url= jdbc:mysql://172.29.0.14/school_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root2jsp
+spring.datasource.password= root
 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
 #DATASOURCE SETTING
@@ -30,20 +31,15 @@ spring.datasource.hikari.connection-timeout= 3000
 spring.datasource.hikari.connection-test-query= SELECT 1
 spring.datasource.hikari.validation-timeout= 3000
+jp.time = cmd /c time
+jp.date = cmd /c date
+
 ## gps client data
 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
-http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
+http.gps.real.url= http://101.95.0.106:38080/transport_server/rtgps/
 ## gateway send directive
-http.send.directive= http://10.10.200.79:8080/transport_server/message/
+http.send.directive = http://101.95.0.106:38080/transport_server/message/
 ## rfid data
-http.rfid.url= http://10.10.200.82:9000/rfid
-## wxsb
-#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do
 \ No newline at end of file
+http.rfid.url= http://114.80.178.12:29000/rfid
+
 station.mysql.driver= com.mysql.jdbc.Driver
-station.mysql.url= jdbc:mysql://127.0.0.1/jp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+station.mysql.url= jdbc:mysql://172.29.0.14/school_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 station.mysql.username= root
 station.mysql.password= root
@@ -8,9 +8,9 @@ datatools.kvars_dbip=127.0.0.1
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
-datatools.kvars_dbpwd=
+datatools.kvars_dbpwd=root
 #数据库库名
-datatools.kvars_dbdname=test_control
+datatools.kvars_dbdname=school_control
 # 3、上传数据配置信息
 # 上传文件目录配置（根据不同的环境需要修正）
@@ -5,13 +5,13 @@ datatools.kettle_properties=/datatools/kettle.properties
 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
 #数据库ip地址
-datatools.kvars_dbip=10.10.200.121
+datatools.kvars_dbip=172.29.0.14
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
-datatools.kvars_dbpwd=root2jsp
+datatools.kvars_dbpwd=root
 #数据库库名
-datatools.kvars_dbdname=control
+datatools.kvars_dbdname=school_control
 # 3、上传数据配置信息
 # 上传文件目录配置（根据不同的环境需要修正）
@@ -1644,7 +1644,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -2058,7 +2058,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -2136,7 +2136,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -2274,7 +2274,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -2340,7 +2340,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -2406,7 +2406,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -1692,7 +1692,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -2106,7 +2106,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -2184,7 +2184,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -2322,7 +2322,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -2388,7 +2388,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -2454,7 +2454,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -692,7 +692,7 @@
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
-      <table>bsth_c_ls_stationroute</table>
+      <table>bsth_c_stationroute</table>
       <orderby/>
       <fail_on_multiple>N</fail_on_multiple>
       <eat_row_on_failure>N</eat_row_on_failure>
@@ -3,7 +3,7 @@
 <configuration>
 	<!-- <property resource="application.properties" /> -->
-	<property name="LOG_BASE" value="F:/bsth_control_logs" />
+	<property name="LOG_BASE" value="E:/bsth_control_logs" />
 	<!-- 控制台输出 -->
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://127.0.0.17:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://172.29.0.14:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
 ms.mysql.password= root
 \ No newline at end of file
@@ -150,7 +150,9 @@
 				{{/if}}
 				{{if obj.status == '2'}}
 					<a class="update_delete_btn btn btn-danger btn-sm"  data-id="{{obj.id}}" data-pjax> 删除 </a>
+<!--
 					<a class="update_versions_route_btn btn btn-info btn-sm" data-lineid="{{obj.line.id}}" data-pjax> 编辑版本路线 </a>
+-->
 				{{/if}}
 				{{if obj.status == '2' && obj.isupdate!=1}}
 					<a class="issue_btn btn btn-danger btn-sm" data-id="{{obj.id}}" data-pjax>发布</a>
@@ -48,7 +48,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
         }
     ]
-);
+);
 /**
  * remoteValidation指令，远程数据验证验证，作为属性放在某个指令上，依赖与指令的ngModel。
  * 属性如下：
@@ -147,7 +147,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteValidation&#39;, [
         }
     }
 ]);
-
+
 /**
  * remoteValidatiot2指令，远程数据验证验证，作为属性放在某个指令上，依赖与指令的ngModel（专门用于时刻表sheet验证）。
  * 属性如下：
@@ -247,7 +247,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteValidationt2&#39;, [
         }
     }
 ]);
-
+
 /**
  * remoteValidationt3 远程验证指令（监控依赖的model变化）
  * 属性如下：
@@ -315,7 +315,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             }
         }
     ]
-);
+);
 /**
  * remoteWarn指令：远程验证警告，作为属性放在某个指令上。
  *                TODO：暂时没法整合到form上，类似$error这样
@@ -430,7 +430,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteWarn&#39;, [
             }
         };
     }
-]);
+]);
 angular.module('ScheduleApp').directive("saSelect", ['$timeout', function($timeout) {
     return {
@@ -543,7 +543,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect&quot;, [&#39;$timeout&#39;, function($timeo
         }
     };
 }]);
-
+
 angular.module('ScheduleApp').directive("saSelect2", [
@@ -703,7 +703,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect2&quot;, [
     }
 ]);
-
+
@@ -1094,7 +1094,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [
     }
 ]);
-
+
 /**
  * saSelect4指令，封装angular-ui-select控件，并添加相应的业务。
  * name（必须）：控件的名字
@@ -1417,7 +1417,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect4&#39;, [
         };
     }
-]);
+]);
 /**
  * saSelect5指令，基于简拼查询的select，内部封装angular-ui-select控件，并嵌入相应的业务逻辑。
  * name（必须）：控件的名字
@@ -1930,7 +1930,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
             }
         };
     }
-]);
+]);
 /**
  * mySelect指令，封装uiselect指令，封装内部数据获取，只支持单选
  * cm（必须）：绑定外部对象，因为关联的字段不只一个，单独使用ngModel不够
@@ -1974,7 +1974,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;mySelect&#39;, [
             }
         }
     }
-]);
+]);
 /**
  * saRadiogroup指令
@@ -2074,7 +2074,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saRadiogroup&quot;, [function() {
         }
     };
 }]);
-
+
 /**
@@ -2235,7 +2235,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saCheckboxgroup&#39;, [
     }
 ]);
-
+
 /**
@@ -2424,7 +2424,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saDategroup&#39;, [
     }
 ]);
-
+
 /**
  * saFbgsgroup指令
  * 属性如下：
@@ -2577,7 +2577,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                 }
             }
         }
-    ]);
+    ]);
 /**
@@ -3020,7 +3020,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saGuideboardgroup&#39;, [
     }
 ]);
-
+
 /**
@@ -3768,7 +3768,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
     }
 ]);
-
+
 /**
  * saBcgroup指令，用于套跑界面中，从指定线路，指定时刻表，指定路牌的班次列表中选择套跑班次。
  * 属性如下：
@@ -4061,7 +4061,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saBcgroup&#39;, [
             }
         }
     }
-]);
+]);
 /**
  * saTimeTable指令，时刻表显示指令，excel表格形式，支持菜单，事件处理。
  * name（必须），控件的名字
@@ -4432,7 +4432,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
         }
     ]
 );
-
+
 /**
  * saTimetablePreview指令，时刻表预览模式视图。
  */
@@ -4758,7 +4758,7 @@ angular.module(&quot;ScheduleApp&quot;).directive(
             };
         }
     ]
-);
+);
 /**
  * 滚动事件控制指令。
  */
@@ -4802,7 +4802,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             }
         }
     ]
-);
+);
 /**
  * 滚动事件控制指令。
  */
@@ -4846,7 +4846,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             }
         }
     ]
-);
+);
 /**
  * saOrderoption指令，搜索时的排序选项（在搜索时可以使用，通用的）
  * 属性如下：
@@ -5018,7 +5018,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             };
         }
     ]
-);
+);
 /**
  * saScpdate指令（非通用指令，只在排班计划form中使用）。
  * 属性如下：
@@ -5249,7 +5249,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             };
         }
     ]
-);
+);
 /**
  * saSrule指令（非通用指令，只在排班计划form中使用）。
  * 属性如下：
@@ -5437,7 +5437,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             };
         }
     ]
-);
+);
 /**
  * saPlaninfoedit指令，排班明细编辑控件，用在调度执勤日报的修改功能
  * name（必须），控件的名字
@@ -5879,7 +5879,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             };
         }
     ]
-);
+);
 /**
  * saPlaninfoedit2指令，排班明细编辑控件，用在调度执勤日报的修改功能
  * name（必须），控件的名字
@@ -385,7 +385,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 当转向到此页面时，就获取明细信息并绑定
             Gb.get({id: id}, function(result) {
-                self.guideboardForDetail = result.data;
+                self.guideboardForDetail = result;
                 self.title = "路牌 " + self.guideboardForDetail.lpName + " 详细信息";
             });
         }
@@ -65,7 +65,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                         service.getCurrentLineVersion(xlid).then(
                             function(result) {
                                 if (result.length == 0) {
-                                    alert("没有线路当前版本");
+                                    //alert("没有线路当前版本");
                                 } else if (result.length > 1) {
                                     alert("有多个线路当前版本");
                                 } else {
@@ -2143,4 +2143,5 @@ g.gps-wrap rect.twinkle[updown=&quot;1&quot;] {
     color: red;
     position:absolute;
     right:0;
+    margin-top: -40px;
 }
@@ -70,7 +70,6 @@
     width: 100%;
     bottom: 1px;
     margin-left: -14px;
-    margin-top: 35px;
 }
 .north .north-tabs .uk-tab {
@@ -6,15 +6,20 @@ var su_subject = (function () {
         ks();
     };
-    function ks(){
+    function ks(index){
         //站点路由
         gb_common.$get('/subjectUser/userAll', '',function (rs) {
             if (rs == null || rs.length == 0) {
-                return //当前没有考题或
+                return //当前没有考题
+            }
+            
+            var list ;
+            if (index != null || index != undefined){
+                 list = retunhtmls(rs,index);
+            }else {
+                 list = retunhtml(rs); 
             }
-            var list = retunhtml(rs);
-
             $('.north_suject').remove();
             if (list == null){
                 //otify_succ('全部题目已操作完成 请查看自己的成绩！');
@@ -22,12 +27,32 @@ var su_subject = (function () {
             }
             var htmlStr = template('suject_pop_wrap', list);
             $wrap.append(htmlStr);
-
+            
+            //上一题
+            $('.uk-panels .north-buttonUp').on('click', function () {
+                var thisall= $('.uk-panels .north-buttonUp');
+                var index= thisall.data('index');
+                if (index == 1) {
+                    layer.msg('已经是第一题...');
+                    return
+                }
+                ks(index - 2);
+            });
+            //下一题
+            $('.uk-panels .north-buttonDown').on('click', function () {
+                var thisall= $('.uk-panels .north-buttonDown');
+                var index= thisall.data('index');
+                var number= thisall.data('number');
+                if (index == number){
+                    layer.msg('已经是最后一题...');
+                    return
+                }
+                ks(index);
+            });
+            
             //提交按钮 //加载完成才可以
             $('.uk-panels .north-button').on('click', function () {
-
-
-                layer.confirm('提交后不可更改，您确定要提交吗？', {
+                layer.confirm('您确定要提交吗？', {
                     btn: ['提交','取消'] //按钮
                 }, function(index) {
                     // 关闭弹出层.
@@ -49,10 +74,13 @@ var su_subject = (function () {
                 });
             });
         })
+
+
+       
+
     }
-   
-    
+
     function retunhtml(list){
         let i = 1;
         for (let t in list){
@@ -66,8 +94,15 @@ var su_subject = (function () {
         }
         return null;
     }
-   
-    
+
+    function retunhtmls(list,index){
+        list[index].number = list.length;
+        list[index].index = index + 1;
+        return list[index];
+    }
+
+
+
     return {
         init: init
     };
@@ -74,13 +74,27 @@
 <!-- #### 考试 start ###  --> 
 <script id="suject_pop_wrap" type="text/html">
-    <div class="north_suject">
+    <div class="north_suject" style="margin-top: -20px">
+
+        <div class="north-tmx">
+             &nbsp;&nbsp;&nbsp;
+            当前状态：
+            {{if result== 0 }}
+            答题正确
+            {{else if result== 1}}
+            答题错误
+            {{else}}
+            未答题
+            {{/if}}
+        </div>
+        <div class="north-tm">
+           
+        </div>
         <div class="north-tm">
             当前第 {{index}} 题  &nbsp;&nbsp;共有 {{number}} 题
         </div>
-        
         <div class="north-tm">
             场景：{{subjectId.subjectText}}
         </div>
@@ -90,6 +104,10 @@
         <div class="north-tmx" style="visibility: {{isOperateTest == 1 ? 'hidden':'visible'}}" >
              答案：({{subjectId.dir == 0 ? '上行':'下行'}}){{subjectId.operateTest}}
         </div>
+            <button id="submitUp" class="north-buttonUp" style="margin-left: 32%;" data-index="{{index}}">上一题</button>
+       
+            <button id="submitDown" class="north-buttonDown" data-index="{{index}}" data-number="{{number}}">下一题</button>
+ 
         <div class="north-button">
             <button id="submit" class="subject_button" data-id="{{id}}">提交</button>
         </div>