1

ljq
1 parent 07ea9227
Showing 5 changed files with 7 additions and 8 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/repository/subject/SubjectUserRepository.java
src/main/resources/static/pages/subjectUser/subjectUserDetailList.html
src/main/resources/static/real_control_v2/js/subject/subject.js
src/main/resources/static/real_control_v2/main.html
@@ -144,7 +144,7 @@ public class XDApplication implements CommandLineRunner {
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 30, 120, TimeUnit.SECONDS);//班次更新线程
-        sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
+        //sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
         //sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
         //sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
         sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
@@ -191,7 +191,7 @@ public class XDApplication implements CommandLineRunner {
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 30, 120, TimeUnit.SECONDS);//班次更新线程
-        sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
+        //sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
         //sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
         //sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
         sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
@@ -25,7 +25,7 @@ public interface SubjectUserRepository extends BaseRepository&lt;SubjectUser, Integ
             + " order by  su.user_id",nativeQuery=true)
     List<Object[]> searchSubjectUserByUserId(String rq, List<String> userIds);
-    @Query(value="select su.subject_id,su.rq,su.result,s.subject_text,s.operate_test,su.remark "
+    @Query(value="select su.subject_id,su.rq,su.result,s.subject_text,s.operate_test,su.remark,su.fraction "
             + " from bsth_subject_user su,bsth_subject s where su.subject_id =s.id and su.rq =?1 and su.user_id = ?2 "
             + " order by  su.user_id",nativeQuery=true)
     List<Object[]> searchSubjectUserDetail(String rq, String userId);
@@ -29,6 +29,7 @@
 								<td style="min-width: 150px">题目</td>
 								<td style="min-width: 150px">操作</td>
 								<td style="min-width: 150px">结果</td>
+								<td style="min-width: 50px">分数</td>
 								<td style="min-width: 50px">成绩</td>
 							</tr>
 						</thead>
@@ -69,6 +70,7 @@
 		<td>{{obj.subjectText}}</td>
 		<td>{{obj.operateTest}}</td>
 		<td>{{obj.remark}}</td>
+		<td>{{obj.fraction}}</td>
 		<td>{{obj.result}}</td>
 		</tr>
 	{{/each}}
@@ -20,7 +20,6 @@ var su_subject = (function () {
                 //otify_succ('全部题目已操作完成 请查看自己的成绩！');
                 return; //所有题目已经考完 无考题的情况
             }
-            debugger
             var htmlStr = template('suject_pop_wrap', list);
             $wrap.append(htmlStr);
@@ -33,7 +32,6 @@ var su_subject = (function () {
                 }, function(index) {
                     // 关闭弹出层.
                     layer.closeAll();
-                    debugger
                     var thisall= $('.uk-panels .north-button #submit');
                     var id= thisall.data('id');
                     //判断答题是否正确  返回参数   返回下一题的情况
@@ -58,7 +56,6 @@ 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;
@@ -87,8 +87,8 @@
         <div class="north-tm">
             操作：{{subjectId.reason}}
         </div>
-        <div class="north-tmx">
-            答案：({{subjectId.dir == 0 ? '上行':'下行'}}){{subjectId.operateTest}}
+        <div class="north-tmx" style="visibility: {{isOperateTest == 1 ? 'hidden':'visible'}}" >
+             答案：({{subjectId.dir == 0 ? '上行':'下行'}}){{subjectId.operateTest}}
         </div>
         <div class="north-button">
             <button id="submit" class="subject_button" data-id="{{id}}">提交</button>