潘钊 / bsth_control · Commits

Commit 92dff73359929919a58a8301ddc06c8a69615446

Authored by ljq
1 parent 37982c84
build: skipped

整体优化

Inline Side-by-side
Showing 12 changed files with 105 additions and 94 deletions
src/main/java/com/bsth/repository/LsSectionRouteRepository.java
  View file @92dff73
... ... @@ -124,7 +124,7 @@ public interface LsSectionRouteRepository extends BaseRepository<LsSectionRoute,
124 124 "s.update_date AS sectionRouteUpdateDate," +
125 125 "s.versions AS sectionRouteVersions," +
126 126 "s.destroy AS sectionRouteDestroy, s.is_roade_speed AS isRoadeSpeed " +
127   - " FROM bsth_c_ls_sectionroute s where s.id =?1) a " +
  127 + " FROM bsth_c_sectionroute s where s.id =?1) a " +
128 128 " LEFT JOIN bsth_c_section b on a.sectionRouteSection = b.id", nativeQuery=true)
129 129 List<Object[]> findSectionRouteInfoFormId(int id);
130 130 /**
... ...
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
  View file @92dff73
... ... @@ -78,6 +78,9 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
78 78 @Override
79 79 public int send60Phrase(String nbbm, String text, String sender) {
80 80 D60 d60 = null;
  81 + if (nbbm.contains("A004")){
  82 + nbbm = "01ABCD23";
  83 + }
81 84 try {
82 85 text = StringEscapeUtils.unescapeHtml4(text);
83 86 text = text.replaceAll("#", "");
... ... @@ -87,7 +90,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
87 90 return -1;
88 91 }
89 92  
90   -/*
  93 +
91 94 if (null == d60)
92 95 return -1;
93 96  
... ... @@ -96,11 +99,11 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
96 99 if (null != sender)
97 100 d60.setSender(sender);
98 101 d60.setHttpCode(code);
99   -*/
100 102  
101   - /* if (code != 0)
  103 +
  104 + if (code != 0)
102 105 d60.setErrorText("网关通讯失败, code: " + code);
103   -*/
  106 +
104 107 dayOfDirectives.put60(d60);
105 108 return 0;
106 109 }
... ... @@ -210,7 +213,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
210 213 @Override
211 214 public int send60Operation(String nbbm, int state, int upDown, String sender) {
212 215 logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
213   -
  216 +
  217 + if (nbbm.contains("A004")){
  218 + nbbm = "01ABCD23";
  219 + }
214 220 String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
215 221 D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state, null);
216 222  
... ... @@ -222,7 +228,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
222 228 d60.setSender("系统");
223 229 // 发送指令
224 230 int code = 0;
225   - //GatewayHttpUtils.postJson(JSON.toJSONString(d60));
  231 + GatewayHttpUtils.postJson(JSON.toJSONString(d60));
226 232 // 添加到缓存，等待入库
227 233 d60.setHttpCode(code);
228 234  
... ... @@ -230,9 +236,9 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
230 236 if(null != gps)
231 237 d60.setLineCode(gps.getLineId());
232 238  
233   - /*if (code != 0)
  239 + if (code != 0)
234 240 d60.setErrorText("网关通讯失败, code: " + code);
235   -*/
  241 +
236 242 dayOfDirectives.put60(d60);
237 243 return code;
238 244 }
... ... @@ -282,9 +288,9 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
282 288 return null;
283 289 }*/
284 290 // 根据当前GPS确定 上下行和营运状态
285   - String deviceId = "111";
286 291 Byte upDown = null;
287 292 Integer state = null;
  293 + String deviceId ="111";
288 294 if (null == sch) {
289 295 GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);
290 296 if (null == gpsData) {
... ...
src/main/java/com/bsth/service/impl/SectionServiceImpl.java
  View file @92dff73
... ... @@ -7,6 +7,8 @@ import java.util.HashMap;
7 7 import java.util.List;
8 8 import java.util.Map;
9 9  
  10 +import com.bsth.entity.sys.SysUser;
  11 +import com.bsth.security.util.SecurityUtils;
10 12 import com.bsth.util.RoadCutDoubleName;
11 13 import org.springframework.beans.factory.annotation.Autowired;
12 14 import org.springframework.stereotype.Service;
... ... @@ -981,7 +983,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
981 983 sectionRoute.setDestroy(destroy);
982 984 sectionRoute.setVersions(versions);
983 985 sectionRoute.setLine(line);
984   - sectionRoute.setIsRoadeSpeed(0);
  986 +
985 987 routeRepository.save(sectionRoute);
986 988 resultMap.put("status", ResponseCode.SUCCESS);
987 989 } catch (Exception e) {
... ...
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
  View file @92dff73
... ... @@ -109,13 +109,8 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
109 109 if (m.get("message") != null)
110 110 remark = m.get("message").toString();
111 111  
112   -
113   - SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
114   - Date date = new Date();
115   - // 修改日期
116   -
117 112 //修改答案
118   - int status = subjectUserRepository.updates(result,user.getId(),date,remark,id);
  113 + int status = subjectUserRepository.updates(result,user.getId(),new Date(),remark,id);
119 114  
120 115 if (status == 1){
121 116 return result;
... ...
src/main/java/com/bsth/util/subject/subEnum.java
  View file @92dff73
... ... @@ -42,7 +42,7 @@ public enum subEnum {
42 42 String[] t = answer.split(","); //0 计划里程 1 是否烂班状态 2烂班原因
43 43 //判断结果是否合格
44 44 for (ScheduleRealInfo s : sch) {
45   - if (s.getDfsj().equals(sj) &&
  45 + if (s.getFcsj().equals(sj) &&
46 46 s.getJhlc() == Double.parseDouble(t[0]) &&
47 47 s.getStatus() == Integer.parseInt(t[1]) &&
48 48 s.getRemarks().contains(t[2])) {
... ... @@ -68,7 +68,7 @@ public enum subEnum {
68 68 List<ScheduleRealInfo> sh = sch.stream().filter(s -> s.getXlDir().equals(dir)).collect(Collectors.toList());
69 69 //判断结果是否合格
70 70 for (ScheduleRealInfo s : sch) {
71   - if (s.getDfsj().equals(sj) &&
  71 + if (s.getFcsj().equals(sj) &&
72 72 s.getStatus() == Integer.parseInt(t[0]) &&
73 73 t[1].equals(s.getAdjustExps())) {
74 74 m.put("state",true);
... ... @@ -98,7 +98,7 @@ public enum subEnum {
98 98 for (int i = 0; i < sch.size(); i++) {
99 99 ScheduleRealInfo s = sch.get(i);
100 100 //判断当前班次是否符合条件
101   - if (s.getDfsj().equals(sj) &&
  101 + if (s.getFcsj().equals(sj) &&
102 102 s.getJhlc() == Double.parseDouble(t[0]) &&
103 103 s.getStatus() == Integer.parseInt(t[1]) &&
104 104 s.getRemarks().contains(t[2])) {
... ... @@ -142,7 +142,7 @@ public enum subEnum {
142 142 String[] t = answer.split(","); //0 实发时间 1调整说明
143 143 //判断结果是否合格
144 144 for (ScheduleRealInfo s : sch) {
145   - if (s.getDfsj().equals(sj) &&
  145 + if (s.getFcsj().equals(sj) &&
146 146 t[0].equals(s.getFcsjActual()) &&
147 147 s.getRemarks().contains(t[1])) {
148 148 m.put("state",true);
... ... @@ -164,7 +164,7 @@ public enum subEnum {
164 164 String[] t = answer.split(","); //0 调整说明
165 165 //判断结果是否合格
166 166 for (ScheduleRealInfo s : sch) {
167   - if (s.getDfsj().equals(sj) &&
  167 + if (s.getFcsj().equals(sj) &&
168 168 s.getFcsjActual() == null &&
169 169 s.getRemarks() != null &&
170 170 s.getRemarks().contains(t[0])) {
... ... @@ -187,7 +187,7 @@ public enum subEnum {
187 187 String[] t = answer.split(","); //0 放站
188 188 //判断结果是否合格
189 189 for (ScheduleRealInfo s : sch) {
190   - if (s.getDfsj().equals(sj) &&
  190 + if (s.getFcsj().equals(sj) &&
191 191 s.getBcType().equals(t[0])) {
192 192 m.put("state",true);
193 193 return m;
... ... @@ -208,7 +208,7 @@ public enum subEnum {
208 208 String[] t = answer.split(","); //0 放站 1备注-是不是龙阳路地铁站
209 209 //判断结果是否合格
210 210 for (ScheduleRealInfo s : sch) {
211   - if (s.getDfsj().equals(sj) &&
  211 + if (s.getFcsj().equals(sj) &&
212 212 s.getBcType().equals(t[0]) &&
213 213 s.getRemarks() != null &&
214 214 s.getRemarks().contains(t[1])) {
... ... @@ -231,7 +231,7 @@ public enum subEnum {
231 231 String[] t = answer.split(","); //0 放站 1备注-是不是龙阳路地铁站
232 232 //判断结果是否合格
233 233 for (ScheduleRealInfo s : sch) {
234   - if (s.getDfsj().equals(sj)) {
  234 + if (s.getFcsj().equals(sj)) {
235 235 //涉及到子任务
236 236 Set<ChildTaskPlan> ctaks = s.getcTasks();
237 237 //ctaks.size() == 2
... ... @@ -248,7 +248,7 @@ public enum subEnum {
248 248 //判断子任务里程数和班次里程数是否一样 && 满足两个班次
249 249 if (lc == s.getJhlc().floatValue() && sn == 2) {
250 250 m.put("state",true);
251   - return m;
  251 + return m;
252 252 }
253 253  
254 254 }
... ... @@ -277,12 +277,12 @@ public enum subEnum {
277 277 ScheduleRealInfo s = sch.get(i);
278 278  
279 279 //判断当前班次是否符合条件 1.是否临加
280   - if (s.getDfsj().equals(sj)) {
281   - Long stn = sdf.parse(s.getDfsj()).getTime() + Long.parseLong(t[0]) * 60 * 1000;
  280 + if (s.getFcsj().equals(sj)) {
  281 + Long stn = sdf.parse(s.getFcsj()).getTime() + Long.parseLong(t[0]) * 60 * 1000;
282 282 df =sdf.format(stn);
283 283 }
284 284 //判断是否有这个临加班次
285   - if (s.getDfsj().equals(df) && s.getClZbh().contains(t[1]) && s.isSflj() == true) {
  285 + if (s.getFcsj().equals(df) && s.getClZbh().contains(t[1]) && s.isSflj() == true) {
286 286 m.put("state",true);
287 287 return m;
288 288 }
... ... @@ -317,15 +317,15 @@ public enum subEnum {
317 317 ScheduleRealInfo s = sch.get(i);
318 318  
319 319 //判断当前班次是否符合条件 全部班次
320   - if (s.getDfsj().equals(sj) && s.getXlDir().equals(sur.getSubjectId().getDir())) {
321   - Long stn = sdf.parse(s.getDfsj()).getTime() + Long.parseLong(t[0]) * 60 * 1000;
  320 + if (s.getFcsj().equals(sj) && s.getXlDir().equals(sur.getSubjectId().getDir())) {
  321 + Long stn = sdf.parse(s.getFcsj()).getTime() + Long.parseLong(t[0]) * 60 * 1000;
322 322 df =sdf.format(stn);
323 323 }
324 324 //判断是否有这个临加班次
325   - if (s.getDfsj().equals(df) && s.getClZbh().contains(t[1]) && s.isSflj() == true) {
  325 + if (s.getFcsj().equals(df) && s.getClZbh().contains(t[1]) && s.isSflj() == true) {
326 326 dfsj =s.getZdsj();
327 327 }
328   - if(s.getDfsj().equals(dfsj) && s.isSflj() == true){
  328 + if(s.getFcsj().equals(dfsj) && s.isSflj() == true){
329 329 m.put("state",true);
330 330 return m;
331 331 }
... ... @@ -361,7 +361,7 @@ public enum subEnum {
361 361 ScheduleRealInfo s = sch.get(i);
362 362 //判断当前班次是否符合条件 全部班次
363 363 if ( s.getBcType().equals(t[0]) && s.isSflj() == true && s.getClZbh().equals(t[2]) &&
364   - (s.getDfsj().equals(sj) || s.getDfsj().equals(t[1]) )) {
  364 + (s.getFcsj().equals(sj) || s.getFcsj().equals(t[1]) )) {
365 365  
366 366 if((s.getQdzName().equals(t[3]) && s.getZdzName().equals(t[4]) ) ||
367 367 s.getQdzName().equals(t[4]) && s.getZdzName().equals(t[3])){
... ... @@ -400,7 +400,7 @@ public enum subEnum {
400 400 for (int i = 0; i < sch.size(); i++) {
401 401 ScheduleRealInfo s = sch.get(i);
402 402 //判断当前班次是否符合条件 全部班次
403   - if ( s.getDfsj().equals(sj) && s.getLpName().equals(t[0]) && s.isSflj() == true) {
  403 + if ( s.getFcsj().equals(sj) && s.getLpName().equals(t[0]) && s.isSflj() == true) {
404 404 m.put("state",true);
405 405 return m;
406 406 }
... ... @@ -432,7 +432,7 @@ public enum subEnum {
432 432 for (int i = 0; i < sch.size(); i++) {
433 433 ScheduleRealInfo s = sch.get(i);
434 434 //判断当前班次是否符合条件 全部班次
435   - if ( s.getDfsj().equals(sj) && s.getjGh().equals(t[0])) {
  435 + if ( s.getFcsj().equals(sj) && s.getjGh().equals(t[0])) {
436 436 m.put("state",true);
437 437 return m;
438 438 }
... ... @@ -464,17 +464,18 @@ public enum subEnum {
464 464 for (int i = 0; i < sch.size(); i++) {
465 465 ScheduleRealInfo s = sch.get(i);
466 466 //判断当前班次是否符合条件 全部班次
467   - if ( s.getDfsj().equals(sj) && s.getjGh().equals(t[1])) {
  467 + if ( s.getFcsj().equals(sj) && s.getjGh().equals(t[1])) {
468 468 su ++;
469 469 }
470 470  
471   - if ( s.getDfsj().equals(t[2]) && s.getjGh().equals(t[0])) {
  471 + if ( s.getFcsj().equals(t[2]) && s.getjGh().equals(t[0])) {
472 472 su ++;
473 473 }
474 474 }
475   - if(su == 2)
476   - m.put("state",true);
  475 + if(su == 2) {
  476 + m.put("state", true);
477 477 return m;
  478 + }
478 479  
479 480  
480 481 }catch (Exception e){
... ... @@ -503,7 +504,7 @@ public enum subEnum {
503 504 int sunm = 0;
504 505 for (int i = 0; i < sch.size(); i++) {
505 506 ScheduleRealInfo s = sch.get(i);
506   - if ( s.getDfsj().equals(sj)) { //当前排班
  507 + if ( s.getFcsj().equals(sj)) { //当前排班
507 508 su = i;
508 509 }
509 510 //后续两个班次
... ... @@ -513,9 +514,10 @@ public enum subEnum {
513 514 sunm = stg == Integer.parseInt(t[0]) ? sunm + 1 : sunm; //
514 515 }
515 516 }
516   - if(sunm == 3)
517   - m.put("state",true);
  517 + if(sunm == 3) {
  518 + m.put("state", true);
518 519 return m;
  520 + }
519 521  
520 522  
521 523 }catch (Exception e){
... ... @@ -545,15 +547,15 @@ public enum subEnum {
545 547 int sunm = 0;
546 548 for (int i = 0; i < sch.size(); i++) {
547 549 ScheduleRealInfo s = sch.get(i);
548   - if ( s.getDfsj().equals(sj)) { //当前排班
  550 + if ( s.getFcsj().equals(sj)) { //当前排班
549 551 Float stn = s.getLateMinute();
550   - sunm = stn == Integer.parseInt(t[0]) ? sunm + 1 : sunm; //班次调整待发延后10分
  552 + sunm = stn == Integer.parseInt(t[0]) ? sunm + 1 : sunm; //误点延后5分钟
551 553 su = i;
552 554 }
553 555 //后续两个班次
554 556 if (su != 0 && i > su && i <= su + 2){
555 557 Float stn = s.getLateMinute();
556   - sunm = stn == Integer.parseInt(t[0]) ? sunm + 1 : sunm; //班次调整待发延后10分
  558 + sunm = stn == Integer.parseInt(t[0]) ? sunm + 1 : sunm; //误点延后5分钟
557 559 }
558 560 }
559 561 if(sunm == 3) {
... ...
src/main/java/com/bsth/util/subject/subEnumDevice.java
  View file @92dff73
... ... @@ -40,7 +40,7 @@ public enum subEnumDevice {
40 40 String answer = sur.getSubjectId().getAnswer();//答案
41 41 String[] t = answer.split(","); //0
42 42 for (D60 d60 : yyArray){
43   - if (d60.getDeviceId().contains(user.getUserName()) && d60.getDeviceId().contains(t[0]) ){ //用户名
  43 + if (d60.getSender().contains(user.getUserName()) && d60.getDeviceId().contains(t[0]) ){ //用户名
44 44 m.put("state",true);
45 45 return m;
46 46 }
... ... @@ -55,13 +55,15 @@ public enum subEnumDevice {
55 55 @Override
56 56 public Map run(SubjectUser sur, Collection<D60> yyArray,SysUser user){
57 57 Map m = new HashMap();
  58 + String answer = sur.getSubjectId().getAnswer();//答案
  59 + String[] t = answer.split(","); //0
58 60 int num = 0;
59 61 for (D60 d60 : yyArray){
60 62 if (d60.getDeviceId().contains(user.getUserName())){ //用户名
61 63 num = num + 1;
62 64 }
63 65 }
64   - if (num >= 5) {
  66 + if (num >= Integer.parseInt(t[0])) {
65 67 m.put("state", true);
66 68 return m;
67 69 }
... ...
src/main/resources/static/pages/base/line/list.html
  View file @92dff73
... ... @@ -41,12 +41,12 @@
41 41 <span class="caption-subject font-dark sbold uppercase">线路信息</span>
42 42 </div>
43 43 <div class="actions">
44   - <div class="btn-group btn-group-devided" data-toggle="buttons">
  44 + <!-- <div class="btn-group btn-group-devided" data-toggle="buttons">
45 45 <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加线路</a>
46   - </div>
  46 + </div>-->
47 47 <div class="btn-group">
48   - <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>
49   - </a>
  48 + <!--<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>
  49 + </a>-->
50 50 <ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
51 51 <li>
52 52 <a href="javascript:;" data-action="0" id="createUsingSingle" class="tool-action"> <i class="fa fa-file-zip-o"></i> 生成线路文件</a>
... ... @@ -88,7 +88,7 @@
88 88 <th width="9%">上海市线路编码</th>
89 89 <th width="7%">是否撤销</th>
90 90 <th width="6%">线路标准</th>
91   - <th width="6%">站点详情</th>
  91 + <!--<th width="6%">站点详情</th>-->
92 92 <th width="12%">操作</th>
93 93 </tr>
94 94 <tr role="row" class="filter">
... ... @@ -147,7 +147,7 @@
147 147 </select>
148 148 </td>
149 149 <td>#</td>
150   - <td>#</td>
  150 + <!-- <td>#</td>-->
151 151 <td>
152 152 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
153 153 <i class="fa fa-search"></i> 搜索
... ... @@ -299,13 +299,13 @@
299 299 <td>
300 300 <a href="/pages/base/lineinformation/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
301 301 </td>
302   - <td>
  302 + <!-- <td>
303 303 <a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看</a>
304   - <!--<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>-->
305   - </td>
  304 + &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;
  305 + </td>-->
306 306 <td>
307 307 <a href="details.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>
308   - <a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
  308 + <!--<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>-->
309 309  
310 310 {{if obj.destroy==1}}
311 311 <!--<a class="ct_base_line_delete_link" data-id="{{obj.id}}" data-name="{{obj.name}}"> 删除 </a>-->
... ... @@ -315,7 +315,7 @@
315 315 {{/each}}
316 316 {{if list.length == 0}}
317 317 <tr>
318   - <td colspan=13><h6 class="muted">没有找到相关数据</h6></td>
  318 + <td colspan=12><h6 class="muted">没有找到相关数据</h6></td>
319 319 </tr>
320 320 {{/if}}
321 321 </script>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
  View file @92dff73
... ... @@ -137,11 +137,11 @@
137 137 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
138 138 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
139 139 <a ui-sref="busInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
140   - <a ui-sref="busInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> 修改 </a>
  140 + <!-- <a ui-sref="busInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> 修改 </a>
141 141 <a sweetalert
142 142 sweet-options="{title: '是否删除车辆信息？',text: '内部编码：' + info.insideCode + '</br>如果有车辆配置信息关联，会报错，建议不要随便删除！', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"
143 143 sweet-on-confirm="ctrl.deleteCar(info.id)"
144   - class="btn btn-danger btn-sm">删除</a>
  144 + class="btn btn-danger btn-sm">删除</a>-->
145 145 </td>
146 146 </tr>
147 147 </tbody>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
  View file @92dff73
... ... @@ -170,11 +170,11 @@
170 170 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
171 171 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
172 172 <a ui-sref="employeeInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
173   - <a ui-sref="employeeInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> 修改 </a>
174   - <a sweetalert
  173 + <!--<a ui-sref="employeeInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> 修改 </a>-->
  174 + <!-- <a sweetalert
175 175 sweet-options="{title: '是否删除人员信息？',text: '姓名：' + info.personnelName + '</br>工号：' + info.jobCode + '</br>如果有人员配置信息关联，会报错，建议不要随便删除！', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"
176 176 sweet-on-confirm="ctrl.deleteEmp(info.id)"
177   - class="btn btn-danger btn-sm">删除</a>
  177 + class="btn btn-danger btn-sm">删除</a>-->
178 178 </td>
179 179 </tr>
180 180 </tbody>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sftz.html
  View file @92dff73
... ... @@ -64,21 +64,6 @@
64 64 </div>
65 65 </div>
66 66 </div>
67   - <div class="uk-grid">
68   - <div class="uk-width-1-1">
69   - <div class="uk-form-row">
70   - <label class="uk-form-label" >上报类型</label>
71   - <div class="uk-form-controls report-type-checkbox-list">
72   - {{each reportTypes as report i}}
73   - <label>
74   - <input class="i-cbox" name="reportTypes[]" value="{{report.code}}" type="checkbox" title="{{report.name}}">
75   - {{report.name}}
76   - </label>
77   - {{/each}}
78   - </div>
79   - </div>
80   - </div>
81   - </div>
82 67 <div class="uk-grid">
83 68 <div class="uk-width-1-1">
84 69 <div class="uk-form-row ct-stacked">
... ...
src/main/resources/static/real_control_v2/js/subject/subject.js
  View file @92dff73
... ... @@ -12,7 +12,7 @@ var su_subject = (function () {
12 12 if (rs == null || rs.length == 0) {
13 13 return //当前没有考题或
14 14 }
15   - debugger
  15 +
16 16 var list = retunhtml(rs);
17 17  
18 18 $('.north_suject').remove();
... ... @@ -20,25 +20,34 @@ var su_subject = (function () {
20 20 //otify_succ('全部题目已操作完成 请查看自己的成绩！');
21 21 return; //所有题目已经考完 无考题的情况
22 22 }
23   -
  23 + debugger
24 24 var htmlStr = template('suject_pop_wrap', list);
25 25 $wrap.append(htmlStr);
26 26  
27 27 //提交按钮 //加载完成才可以
28 28 $('.uk-panels .north-button').on('click', function () {
29   - debugger
30   - var thisall= $('.uk-panels .north-button #submit');
31   - var id= thisall.data('id');
32   - //判断答题是否正确 返回参数 返回下一题的情况
33   - gb_common.$get('/subjectUser/determine', {id: id},function (rs) {
34   - if (rs == 0){ //提示答题正确
35   - notify_succ('答题正确！');
36   - }else if(rs == 1){ //提示答题失败
37   - notify_err('答题错误！');
38   - }else { //系统出错
39   -
40   - }
41   - ks();
  29 +
  30 +
  31 + layer.confirm('提交后不可更改，您确定要提交吗？', {
  32 + btn: ['提交','取消'] //按钮
  33 + }, function(index) {
  34 + // 关闭弹出层.
  35 + layer.closeAll();
  36 + debugger
  37 + var thisall= $('.uk-panels .north-button #submit');
  38 + var id= thisall.data('id');
  39 + //判断答题是否正确 返回参数 返回下一题的情况
  40 + gb_common.$get('/subjectUser/determine', {id: id},function (rs) {
  41 + if (rs == 0){ //提示答题正确
  42 + notify_succ('答题正确！');
  43 + }else if(rs == 1){ //提示答题失败
  44 + notify_err('答题错误！');
  45 + }else { //系统出错
  46 +
  47 + }
  48 + ks();
  49 + });
  50 +
42 51 });
43 52 });
44 53 })
... ... @@ -47,10 +56,16 @@ var su_subject = (function () {
47 56  
48 57  
49 58 function retunhtml(list){
  59 + let i = 1;
50 60 for (let t in list){
  61 + debugger
  62 + list[t].index = i;
51 63 if(list[t].result == null || list[t].result == ""){
  64 + list[t].number = list.length;
52 65 return list[t];
53 66 }
  67 +
  68 + i = i +1;
54 69 }
55 70 return null;
56 71 }
... ...
src/main/resources/static/real_control_v2/main.html
  View file @92dff73
... ... @@ -75,6 +75,10 @@
75 75 <!-- #### 考试 start ### -->
76 76 <script id="suject_pop_wrap" type="text/html">
77 77 <div class="north_suject">
  78 +
  79 + <div class="north-tm">
  80 + 当前第 {{index}} 题 &nbsp;&nbsp;共有 {{number}} 题
  81 + </div>
78 82 <div class="north-tm">
79 83 场景：{{subjectId.subjectText}}
80 84 </div>
... ...