潘钊 / bsth_control · Commits

Commit 3e3c26a925ea5bce60c81c9864cdbebf18484d23

Authored by ljq
1 parent 07ea9227
build: skipped

1

Inline Side-by-side
Showing 5 changed files with 7 additions and 8 deletions
src/main/java/com/bsth/XDApplication.java
  View file @3e3c26a
... ... @@ -144,7 +144,7 @@ public class XDApplication implements CommandLineRunner {
144 144  
145 145 /** 线调业务 */
146 146 sexec.scheduleWithFixedDelay(scheduleRefreshThread, 30, 120, TimeUnit.SECONDS);//班次更新线程
147   - sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
  147 + //sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
148 148 //sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
149 149 //sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
150 150 sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
... ... @@ -191,7 +191,7 @@ public class XDApplication implements CommandLineRunner {
191 191  
192 192 /** 线调业务 */
193 193 sexec.scheduleWithFixedDelay(scheduleRefreshThread, 30, 120, TimeUnit.SECONDS);//班次更新线程
194   - sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
  194 + //sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
195 195 //sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
196 196 //sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
197 197 sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
... ...
src/main/java/com/bsth/repository/subject/SubjectUserRepository.java
  View file @3e3c26a
... ... @@ -25,7 +25,7 @@ public interface SubjectUserRepository extends BaseRepository<SubjectUser, Integ
25 25 + " order by su.user_id",nativeQuery=true)
26 26 List<Object[]> searchSubjectUserByUserId(String rq, List<String> userIds);
27 27  
28   - @Query(value="select su.subject_id,su.rq,su.result,s.subject_text,s.operate_test,su.remark "
  28 + @Query(value="select su.subject_id,su.rq,su.result,s.subject_text,s.operate_test,su.remark,su.fraction "
29 29 + " from bsth_subject_user su,bsth_subject s where su.subject_id =s.id and su.rq =?1 and su.user_id = ?2 "
30 30 + " order by su.user_id",nativeQuery=true)
31 31 List<Object[]> searchSubjectUserDetail(String rq, String userId);
... ...
src/main/resources/static/pages/subjectUser/subjectUserDetailList.html
  View file @3e3c26a
... ... @@ -29,6 +29,7 @@
29 29 <td style="min-width: 150px">题目</td>
30 30 <td style="min-width: 150px">操作</td>
31 31 <td style="min-width: 150px">结果</td>
  32 + <td style="min-width: 50px">分数</td>
32 33 <td style="min-width: 50px">成绩</td>
33 34 </tr>
34 35 </thead>
... ... @@ -69,6 +70,7 @@
69 70 <td>{{obj.subjectText}}</td>
70 71 <td>{{obj.operateTest}}</td>
71 72 <td>{{obj.remark}}</td>
  73 + <td>{{obj.fraction}}</td>
72 74 <td>{{obj.result}}</td>
73 75 </tr>
74 76 {{/each}}
... ...
src/main/resources/static/real_control_v2/js/subject/subject.js
  View file @3e3c26a
... ... @@ -20,7 +20,6 @@ var su_subject = (function () {
20 20 //otify_succ('全部题目已操作完成 请查看自己的成绩！');
21 21 return; //所有题目已经考完 无考题的情况
22 22 }
23   - debugger
24 23 var htmlStr = template('suject_pop_wrap', list);
25 24 $wrap.append(htmlStr);
26 25  
... ... @@ -33,7 +32,6 @@ var su_subject = (function () {
33 32 }, function(index) {
34 33 // 关闭弹出层.
35 34 layer.closeAll();
36   - debugger
37 35 var thisall= $('.uk-panels .north-button #submit');
38 36 var id= thisall.data('id');
39 37 //判断答题是否正确 返回参数 返回下一题的情况
... ... @@ -58,7 +56,6 @@ var su_subject = (function () {
58 56 function retunhtml(list){
59 57 let i = 1;
60 58 for (let t in list){
61   - debugger
62 59 list[t].index = i;
63 60 if(list[t].result == null || list[t].result == ""){
64 61 list[t].number = list.length;
... ...
src/main/resources/static/real_control_v2/main.html
  View file @3e3c26a
... ... @@ -87,8 +87,8 @@
87 87 <div class="north-tm">
88 88 操作：{{subjectId.reason}}
89 89 </div>
90   - <div class="north-tmx">
91   - 答案：({{subjectId.dir == 0 ? '上行':'下行'}}){{subjectId.operateTest}}
  90 + <div class="north-tmx" style="visibility: {{isOperateTest == 1 ? 'hidden':'visible'}}" >
  91 + 答案：({{subjectId.dir == 0 ? '上行':'下行'}}){{subjectId.operateTest}}
92 92 </div>
93 93 <div class="north-button">
94 94 <button id="submit" class="subject_button" data-id="{{id}}">提交</button>
... ...