整体优化

ljq
1 parent 37982c84
Showing 12 changed files with 105 additions and 94 deletions
src/main/java/com/bsth/repository/LsSectionRouteRepository.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/impl/SectionServiceImpl.java
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
src/main/java/com/bsth/util/subject/subEnum.java
src/main/java/com/bsth/util/subject/subEnumDevice.java
src/main/resources/static/pages/base/line/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sftz.html
src/main/resources/static/real_control_v2/js/subject/subject.js
src/main/resources/static/real_control_v2/main.html
@@ -124,7 +124,7 @@ public interface LsSectionRouteRepository extends BaseRepository&lt;LsSectionRoute,
 			"s.update_date AS sectionRouteUpdateDate," +
 			"s.versions AS sectionRouteVersions," +
 			"s.destroy AS sectionRouteDestroy,  s.is_roade_speed AS isRoadeSpeed " +
-			" FROM  bsth_c_ls_sectionroute s where s.id =?1) a " +
+			" FROM  bsth_c_sectionroute s where s.id =?1) a " +
 			" LEFT JOIN bsth_c_section b on a.sectionRouteSection = b.id", nativeQuery=true)
 	List<Object[]> findSectionRouteInfoFormId(int id);
 	/**
@@ -78,6 +78,9 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     @Override
     public int send60Phrase(String nbbm, String text, String sender) {
         D60 d60 = null;
+        if (nbbm.contains("A004")){
+            nbbm = "01ABCD23";
+        }
         try {
             text = StringEscapeUtils.unescapeHtml4(text);
             text = text.replaceAll("#", "");
@@ -87,7 +90,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             return -1;
         }
-/*
+
         if (null == d60)
             return -1;
@@ -96,11 +99,11 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         if (null != sender)
             d60.setSender(sender);
         d60.setHttpCode(code);
-*/
-     /*   if (code != 0)
+
+        if (code != 0)
             d60.setErrorText("网关通讯失败, code: " + code);
-*/
+
         dayOfDirectives.put60(d60);
         return 0;
     }
@@ -210,7 +213,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     @Override
     public int send60Operation(String nbbm, int state, int upDown, String sender) {
         logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
-
+        
+        if (nbbm.contains("A004")){
+            nbbm = "01ABCD23";
+        }
         String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
         D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state, null);
@@ -222,7 +228,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             d60.setSender("系统");
         // 发送指令
         int code = 0;
-        //GatewayHttpUtils.postJson(JSON.toJSONString(d60));
+        GatewayHttpUtils.postJson(JSON.toJSONString(d60));
         // 添加到缓存，等待入库
         d60.setHttpCode(code);
@@ -230,9 +236,9 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         if(null != gps)
             d60.setLineCode(gps.getLineId());
-        /*if (code != 0)
+        if (code != 0)
             d60.setErrorText("网关通讯失败, code: " + code);
-*/
+
         dayOfDirectives.put60(d60);
         return code;
     }
@@ -282,9 +288,9 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             return null;
         }*/
         // 根据当前GPS确定 上下行和营运状态
-        String deviceId = "111";
         Byte upDown = null;
         Integer state = null;
+        String deviceId ="111";
         if (null == sch) {
             GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);
             if (null == gpsData) {
@@ -7,6 +7,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.util.RoadCutDoubleName;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -981,7 +983,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			sectionRoute.setDestroy(destroy);
 			sectionRoute.setVersions(versions);
 			sectionRoute.setLine(line);
-			sectionRoute.setIsRoadeSpeed(0);
+ 
 			routeRepository.save(sectionRoute);
 			resultMap.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
@@ -109,13 +109,8 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
         if (m.get("message") != null)
             remark = m.get("message").toString();
-   
-        SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
-        Date date = new Date();
-        // 修改日期
-        
         //修改答案
-        int status  = subjectUserRepository.updates(result,user.getId(),date,remark,id);
+        int status  = subjectUserRepository.updates(result,user.getId(),new Date(),remark,id);
         if (status == 1){
             return result;
@@ -42,7 +42,7 @@ public enum subEnum {
             String[] t = answer.split(","); //0 计划里程  1 是否烂班状态 2烂班原因
             //判断结果是否合格
             for (ScheduleRealInfo s : sch) {
-                if (s.getDfsj().equals(sj) &&
+                if (s.getFcsj().equals(sj) &&
                         s.getJhlc() == Double.parseDouble(t[0]) &&
                         s.getStatus() == Integer.parseInt(t[1]) &&
                         s.getRemarks().contains(t[2])) {
@@ -68,7 +68,7 @@ public enum subEnum {
             List<ScheduleRealInfo> sh = sch.stream().filter(s -> s.getXlDir().equals(dir)).collect(Collectors.toList());
             //判断结果是否合格
             for (ScheduleRealInfo s : sch) {
-                if (s.getDfsj().equals(sj) &&
+                if (s.getFcsj().equals(sj) &&
                         s.getStatus() == Integer.parseInt(t[0]) &&
                          t[1].equals(s.getAdjustExps())) {
                     m.put("state",true);
@@ -98,7 +98,7 @@ public enum subEnum {
                 for (int i = 0; i < sch.size(); i++) {
                     ScheduleRealInfo s = sch.get(i);
                     //判断当前班次是否符合条件
-                    if (s.getDfsj().equals(sj) &&
+                    if (s.getFcsj().equals(sj) &&
                             s.getJhlc() == Double.parseDouble(t[0]) &&
                             s.getStatus() == Integer.parseInt(t[1]) &&
                             s.getRemarks().contains(t[2])) {
@@ -142,7 +142,7 @@ public enum subEnum {
             String[] t = answer.split(","); //0 实发时间 1调整说明
             //判断结果是否合格
             for (ScheduleRealInfo s : sch) {
-                if (s.getDfsj().equals(sj) &&
+                if (s.getFcsj().equals(sj) &&
                         t[0].equals(s.getFcsjActual()) &&
                         s.getRemarks().contains(t[1])) {
                     m.put("state",true);
@@ -164,7 +164,7 @@ public enum subEnum {
             String[] t = answer.split(","); //0 调整说明
             //判断结果是否合格
             for (ScheduleRealInfo s : sch) {
-                if (s.getDfsj().equals(sj) &&
+                if (s.getFcsj().equals(sj) &&
                         s.getFcsjActual() == null &&
                         s.getRemarks() != null &&
                         s.getRemarks().contains(t[0])) {
@@ -187,7 +187,7 @@ public enum subEnum {
             String[] t = answer.split(","); //0 放站
             //判断结果是否合格
             for (ScheduleRealInfo s : sch) {
-                if (s.getDfsj().equals(sj) &&
+                if (s.getFcsj().equals(sj) &&
                         s.getBcType().equals(t[0])) {
                     m.put("state",true);
                     return m;
@@ -208,7 +208,7 @@ public enum subEnum {
             String[] t = answer.split(","); //0 放站 1备注-是不是龙阳路地铁站
             //判断结果是否合格
             for (ScheduleRealInfo s : sch) {
-                if (s.getDfsj().equals(sj) &&
+                if (s.getFcsj().equals(sj) &&
                         s.getBcType().equals(t[0]) &&
                         s.getRemarks() != null &&
                         s.getRemarks().contains(t[1])) {
@@ -231,7 +231,7 @@ public enum subEnum {
             String[] t = answer.split(","); //0 放站 1备注-是不是龙阳路地铁站
             //判断结果是否合格  
             for (ScheduleRealInfo s : sch) {
-                if (s.getDfsj().equals(sj)) {
+                if (s.getFcsj().equals(sj)) {
                     //涉及到子任务
                     Set<ChildTaskPlan> ctaks = s.getcTasks();
                     //ctaks.size() == 2
@@ -248,7 +248,7 @@ public enum subEnum {
                     //判断子任务里程数和班次里程数是否一样  && 满足两个班次
                     if (lc == s.getJhlc().floatValue() && sn == 2) {
                        m.put("state",true);
-                    return m;
+                       return m;
                     }
                 }
@@ -277,12 +277,12 @@ public enum subEnum {
                     ScheduleRealInfo s = sch.get(i);
                     //判断当前班次是否符合条件  1.是否临加
-                    if (s.getDfsj().equals(sj)) {
-                        Long stn = sdf.parse(s.getDfsj()).getTime() + Long.parseLong(t[0]) * 60 * 1000;
+                    if (s.getFcsj().equals(sj)) {
+                        Long stn = sdf.parse(s.getFcsj()).getTime() + Long.parseLong(t[0]) * 60 * 1000;
                         df =sdf.format(stn);
                     }
                     //判断是否有这个临加班次
-                    if (s.getDfsj().equals(df) && s.getClZbh().contains(t[1]) && s.isSflj() == true) {
+                    if (s.getFcsj().equals(df) && s.getClZbh().contains(t[1]) && s.isSflj() == true) {
                         m.put("state",true);
                     return m;
                     }
@@ -317,15 +317,15 @@ public enum subEnum {
                     ScheduleRealInfo s = sch.get(i);
                     //判断当前班次是否符合条件  全部班次
-                    if (s.getDfsj().equals(sj) && s.getXlDir().equals(sur.getSubjectId().getDir())) {
-                        Long stn = sdf.parse(s.getDfsj()).getTime() + Long.parseLong(t[0]) * 60 * 1000;
+                    if (s.getFcsj().equals(sj) && s.getXlDir().equals(sur.getSubjectId().getDir())) {
+                        Long stn = sdf.parse(s.getFcsj()).getTime() + Long.parseLong(t[0]) * 60 * 1000;
                         df =sdf.format(stn);
                     }
                     //判断是否有这个临加班次
-                    if (s.getDfsj().equals(df) && s.getClZbh().contains(t[1]) && s.isSflj() == true) {
+                    if (s.getFcsj().equals(df) && s.getClZbh().contains(t[1]) && s.isSflj() == true) {
                         dfsj =s.getZdsj();
                     }
-                    if(s.getDfsj().equals(dfsj) && s.isSflj() == true){
+                    if(s.getFcsj().equals(dfsj) && s.isSflj() == true){
                         m.put("state",true);
                     return m;
                     }
@@ -361,7 +361,7 @@ public enum subEnum {
                     ScheduleRealInfo s = sch.get(i);
                     //判断当前班次是否符合条件  全部班次
                     if ( s.getBcType().equals(t[0]) && s.isSflj() == true && s.getClZbh().equals(t[2]) && 
-                            (s.getDfsj().equals(sj) || s.getDfsj().equals(t[1]) )) {
+                            (s.getFcsj().equals(sj) || s.getFcsj().equals(t[1]) )) {
                         if((s.getQdzName().equals(t[3]) && s.getZdzName().equals(t[4]) ) ||
                                 s.getQdzName().equals(t[4]) && s.getZdzName().equals(t[3])){
@@ -400,7 +400,7 @@ public enum subEnum {
                 for (int i = 0; i < sch.size(); i++) {
                     ScheduleRealInfo s = sch.get(i);
                     //判断当前班次是否符合条件  全部班次
-                    if ( s.getDfsj().equals(sj) && s.getLpName().equals(t[0]) && s.isSflj() == true) {
+                    if ( s.getFcsj().equals(sj) && s.getLpName().equals(t[0]) && s.isSflj() == true) {
                         m.put("state",true);
                     return m;
                     }
@@ -432,7 +432,7 @@ public enum subEnum {
                 for (int i = 0; i < sch.size(); i++) {
                     ScheduleRealInfo s = sch.get(i);
                     //判断当前班次是否符合条件  全部班次
-                    if ( s.getDfsj().equals(sj) && s.getjGh().equals(t[0])) {
+                    if ( s.getFcsj().equals(sj) && s.getjGh().equals(t[0])) {
                         m.put("state",true);
                     return m;
                     }
@@ -464,17 +464,18 @@ public enum subEnum {
                 for (int i = 0; i < sch.size(); i++) {
                     ScheduleRealInfo s = sch.get(i);
                     //判断当前班次是否符合条件  全部班次
-                    if ( s.getDfsj().equals(sj) && s.getjGh().equals(t[1])) {
+                    if ( s.getFcsj().equals(sj) && s.getjGh().equals(t[1])) {
                         su ++;
                     }
-                    if ( s.getDfsj().equals(t[2]) && s.getjGh().equals(t[0])) {
+                    if ( s.getFcsj().equals(t[2]) && s.getjGh().equals(t[0])) {
                         su ++;
                     }
                 }
-                if(su == 2)
-                    m.put("state",true);
+                if(su == 2) {
+                    m.put("state", true);
                     return m;
+                }
             }catch (Exception e){
@@ -503,7 +504,7 @@ public enum subEnum {
                 int sunm = 0;
                 for (int i = 0; i < sch.size(); i++) {
                     ScheduleRealInfo s = sch.get(i);
-                    if ( s.getDfsj().equals(sj)) { //当前排班
+                    if ( s.getFcsj().equals(sj)) { //当前排班
                         su = i;
                     }
                     //后续两个班次
@@ -513,9 +514,10 @@ public enum subEnum {
                         sunm = stg == Integer.parseInt(t[0]) ? sunm + 1 : sunm;  //
                     }
                 }
-                if(sunm == 3)
-                    m.put("state",true);
+                if(sunm == 3) {
+                    m.put("state", true);
                     return m;
+                }
             }catch (Exception e){
@@ -545,15 +547,15 @@ public enum subEnum {
                 int sunm = 0;
                 for (int i = 0; i < sch.size(); i++) {
                     ScheduleRealInfo s = sch.get(i);
-                    if ( s.getDfsj().equals(sj)) { //当前排班
+                    if ( s.getFcsj().equals(sj)) { //当前排班
                         Float stn =  s.getLateMinute();
-                        sunm = stn == Integer.parseInt(t[0]) ? sunm + 1 : sunm;  //班次调整待发延后10分
+                        sunm = stn == Integer.parseInt(t[0]) ? sunm + 1 : sunm;  //误点延后5分钟
                         su = i;
                     }
                     //后续两个班次
                     if (su != 0 && i > su && i <= su + 2){
                         Float stn =  s.getLateMinute();
-                        sunm = stn == Integer.parseInt(t[0]) ? sunm + 1 : sunm;  //班次调整待发延后10分
+                        sunm = stn == Integer.parseInt(t[0]) ? sunm + 1 : sunm;  //误点延后5分钟
                     }
                 }
                 if(sunm == 3) {
@@ -40,7 +40,7 @@ public enum subEnumDevice {
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0
             for (D60 d60 : yyArray){
-                if (d60.getDeviceId().contains(user.getUserName()) && d60.getDeviceId().contains(t[0]) ){ //用户名
+                if (d60.getSender().contains(user.getUserName()) && d60.getDeviceId().contains(t[0]) ){ //用户名
                     m.put("state",true);
                     return m;
                 }
@@ -55,13 +55,15 @@ public enum subEnumDevice {
         @Override
         public Map run(SubjectUser sur, Collection<D60> yyArray,SysUser user){
             Map m = new HashMap();
+            String answer = sur.getSubjectId().getAnswer();//答案
+            String[] t = answer.split(","); //0
             int num = 0;
             for (D60 d60 : yyArray){
                 if (d60.getDeviceId().contains(user.getUserName())){ //用户名
                     num = num + 1;
                 }
             }
-            if (num >= 5) {
+            if (num >= Integer.parseInt(t[0])) {
                 m.put("state", true);
                 return m;
             }
@@ -41,12 +41,12 @@
 					 <span class="caption-subject font-dark sbold uppercase">线路信息</span>
 				</div>
 				<div class="actions">
-					<div class="btn-group btn-group-devided" data-toggle="buttons">
+			<!--		<div class="btn-group btn-group-devided" data-toggle="buttons">
 						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加线路</a>
-					</div>
+					</div>-->
 					<div class="btn-group">
-					<a class="btn red btn-outline btn-circle" href="javascript:;" data-toggle="dropdown" aria-expanded="false"> <i class="fa fa-share"></i> <span class="hidden-xs"> 系统工具 </span> <i class="fa fa-angle-down"></i>
-					</a>
+					<!--<a class="btn red btn-outline btn-circle" href="javascript:;" data-toggle="dropdown" aria-expanded="false"> <i class="fa fa-share"></i> <span class="hidden-xs"> 系统工具 </span> <i class="fa fa-angle-down"></i>
+					</a>-->
 					<ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
 						<li>
 							<a href="javascript:;" data-action="0" id="createUsingSingle" class="tool-action"> <i class="fa fa-file-zip-o"></i> 生成线路文件</a>
@@ -88,7 +88,7 @@
 								<th width="9%">上海市线路编码</th>
 								<th width="7%">是否撤销</th>
 								<th width="6%">线路标准</th>
-								<th width="6%">站点详情</th>
+								<!--<th width="6%">站点详情</th>-->
 								<th width="12%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
@@ -147,7 +147,7 @@
                                      </select>
 								</td>
 								<td>#</td>
-								<td>#</td>
+							<!--	<td>#</td>-->
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
 										<i class="fa fa-search"></i> 搜索
@@ -299,13 +299,13 @@
 			<td>
 				<a href="/pages/base/lineinformation/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
 			</td>
-			<td>
+		<!--	<td>
 				<a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看</a>
-				<!--<a href="javascript:window.localStorage.setItem('geo_data_edit_line_code' , '{{obj.lineCode}}');window.localStorage.removeItem('geo_data_edit_line_version');window.location.href='/pages/base/geo_data_edit/uk3_wrap.html';" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>-->
-			</td>
+				&lt;!&ndash;<a href="javascript:window.localStorage.setItem('geo_data_edit_line_code' , '{{obj.lineCode}}');window.localStorage.removeItem('geo_data_edit_line_version');window.location.href='/pages/base/geo_data_edit/uk3_wrap.html';" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>&ndash;&gt;
+			</td>-->
 			<td>
 				<a href="details.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>
-				<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
+				<!--<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>-->
 				{{if obj.destroy==1}}
 				<!--<a class="ct_base_line_delete_link" data-id="{{obj.id}}" data-name="{{obj.name}}"> 删除 </a>-->
@@ -315,7 +315,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan=13><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan=12><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
@@ -137,11 +137,11 @@
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="busInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
-                    <a ui-sref="busInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> 修改 </a>
+                   <!-- <a ui-sref="busInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> 修改 </a>
                     <a sweetalert
                        sweet-options="{title: '是否删除车辆信息？',text: '内部编码：' + info.insideCode + '</br>如果有车辆配置信息关联，会报错，建议不要随便删除！', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"
                        sweet-on-confirm="ctrl.deleteCar(info.id)"
-                       class="btn btn-danger btn-sm">删除</a>
+                       class="btn btn-danger btn-sm">删除</a>-->
                 </td>
             </tr>
             </tbody>
@@ -170,11 +170,11 @@
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="employeeInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
-                    <a ui-sref="employeeInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> 修改 </a>
-                    <a sweetalert
+                    <!--<a ui-sref="employeeInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> 修改 </a>-->
+                   <!-- <a sweetalert
                        sweet-options="{title: '是否删除人员信息？',text: '姓名：' + info.personnelName + '</br>工号：' + info.jobCode + '</br>如果有人员配置信息关联，会报错，建议不要随便删除！', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"
                        sweet-on-confirm="ctrl.deleteEmp(info.id)"
-                       class="btn btn-danger btn-sm">删除</a>
+                       class="btn btn-danger btn-sm">删除</a>-->
                 </td>
             </tr>
             </tbody>
@@ -64,21 +64,6 @@
                 </div>
             </div>
         </div>
-		<div class="uk-grid">
-            <div class="uk-width-1-1">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >上报类型</label>
-					<div class="uk-form-controls report-type-checkbox-list">
-                        {{each reportTypes as report i}}
-                        <label>
-                            <input class="i-cbox" name="reportTypes[]" value="{{report.code}}" type="checkbox" title="{{report.name}}">
-                            {{report.name}}
-                          </label>
-                        {{/each}}
-                    </div>
-                </div>
-            </div>
-        </div>
         <div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
@@ -12,7 +12,7 @@ var su_subject = (function () {
             if (rs == null || rs.length == 0) {
                 return //当前没有考题或
             }
-            debugger
+            
             var list = retunhtml(rs);
             $('.north_suject').remove();
@@ -20,25 +20,34 @@ var su_subject = (function () {
                 //otify_succ('全部题目已操作完成 请查看自己的成绩！');
                 return; //所有题目已经考完 无考题的情况
             }
-
+            debugger
             var htmlStr = template('suject_pop_wrap', list);
             $wrap.append(htmlStr);
             //提交按钮 //加载完成才可以
             $('.uk-panels .north-button').on('click', function () {
-                debugger
-                var thisall= $('.uk-panels .north-button #submit');
-                var id= thisall.data('id');
-                //判断答题是否正确  返回参数   返回下一题的情况
-                gb_common.$get('/subjectUser/determine', {id: id},function (rs) {
-                    if (rs == 0){ //提示答题正确
-                        notify_succ('答题正确！');
-                    }else if(rs == 1){ //提示答题失败
-                        notify_err('答题错误！');
-                    }else { //系统出错
-
-                    }
-                    ks();
+
+
+                layer.confirm('提交后不可更改，您确定要提交吗？', {
+                    btn: ['提交','取消'] //按钮
+                }, function(index) {
+                    // 关闭弹出层.
+                    layer.closeAll();
+                    debugger
+                    var thisall= $('.uk-panels .north-button #submit');
+                    var id= thisall.data('id');
+                    //判断答题是否正确  返回参数   返回下一题的情况
+                    gb_common.$get('/subjectUser/determine', {id: id},function (rs) {
+                        if (rs == 0){ //提示答题正确
+                            notify_succ('答题正确！');
+                        }else if(rs == 1){ //提示答题失败
+                            notify_err('答题错误！');
+                        }else { //系统出错
+
+                        }
+                        ks();
+                    });
+
                 });
             });
         })
@@ -47,10 +56,16 @@ var su_subject = (function () {
     function retunhtml(list){
+        let i = 1;
         for (let t in list){
+            debugger
+            list[t].index = i;
             if(list[t].result == null || list[t].result == ""){
+                list[t].number = list.length;
                 return list[t];
             }
+            
+            i = i +1;
         }
         return null;
     }
@@ -75,6 +75,10 @@
 <!-- #### 考试 start ###  --> 
 <script id="suject_pop_wrap" type="text/html">
     <div class="north_suject">
+
+        <div class="north-tm">
+            当前第 {{index}} 题  &nbsp;&nbsp;共有 {{number}} 题
+        </div>
         <div class="north-tm">
             场景：{{subjectId.subjectText}}
         </div>