Skip to content

G
gk
Commit b5a4fdfe authored by yangshuxing's avatar yangshuxing
Browse files
Options

成绩审核js交互

parents 6f4a5545 a0e93691
Show whitespace changes
Inline Side-by-side
Showing with 262 additions and 126 deletions
src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/CmptScoreRuleScoreInfo.java
View file @ b5a4fdfe
...@@ -21,6 +21,7 @@ public class CmptScoreRuleScoreInfo { ...@@ -21,6 +21,7 @@ public class CmptScoreRuleScoreInfo {
private String subsectionTime; private String subsectionTime;
private Integer subsectionscore; private Integer subsectionscore;
private Integer subsectionMileage; private Integer subsectionMileage;
private Integer checkStatus;
private Integer isDelete; private Integer isDelete;
private String insertTime; private String insertTime;
private String updateTime; private String updateTime;
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleScoreInfoMapper.java
View file @ b5a4fdfe
...@@ -4,6 +4,7 @@ package com.dlbridge.jadp.plugins.cmpt.dao.mapper; ...@@ -4,6 +4,7 @@ package com.dlbridge.jadp.plugins.cmpt.dao.mapper;
import com.dlbridge.feign.bean.ScoreItem; import com.dlbridge.feign.bean.ScoreItem;
import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo; import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo;
import com.dlbridge.jadp.plugins.cmpt.bean.UserScoreExcelBean; import com.dlbridge.jadp.plugins.cmpt.bean.UserScoreExcelBean;
import org.springframework.data.domain.Pageable;
import java.util.List; import java.util.List;
...@@ -32,4 +33,46 @@ public interface CmptScoreRuleScoreInfoMapper { ...@@ -32,4 +33,46 @@ public interface CmptScoreRuleScoreInfoMapper {
* @return * @return
*/ */
Integer getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo(Integer cmptId,String markNo,int ruleId); Integer getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo(Integer cmptId,String markNo,int ruleId);
/**
* 获取此规则有多少人提交成绩
* @param cmptId
* @param ruleId
* @param checkStatus
* @return
*/
Integer getCmptScoreRuleScoreInfoToalNumer(int cmptId,int roadId,int ruleId,int checkStatus);
/**
* 分页获取用户提交的成绩
* @param page
* @param cmptId
* @param roadId
* @param ruleId
* @param checkStatus
* @return
*/
List<CmptScoreRuleScoreInfo> getCmptScoreRuleScoreInfoList(Pageable page, int cmptId, int roadId, int ruleId, int checkStatus);
/**
* 批量审核，审核成绩结果为未通过
* @param cmptId
* @param roadId
* @param ruleId
* @param noPassedIds
* @return
*/
Integer uploadCmptScoreRuleScoreInfoByNoPassedIds(int cmptId, int roadId, int ruleId,int[] noPassedIds);
/**
* 批量审核，审核成绩结果为通过
* @param cmptId
* @param roadId
* @param ruleId
* @param passedIds
* @return
*/
Integer uploadCmptScoreRuleScoreInfoByPassedIds(int cmptId, int roadId, int ruleId,int[] passedIds);
} }
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleScoreInfoMapper.xml
View file @ b5a4fdfe
...@@ -12,5 +12,19 @@ ...@@ -12,5 +12,19 @@
<select id="getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo" resultType="int"> <select id="getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo" resultType="int">
select id from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and rule_id=#{ruleId} and mark_no=#{markNo} select id from gk_cmpt_score_rule_scoreinfo where cmptId=#{cmptId} and rule_id=#{ruleId} and mark_no=#{markNo}
</select> </select>
<select id="getCmptScoreRuleScoreInfoToalNumer" resultType="int">
select count(1) from geerunner.cmpt_enroll as a left join gk_cmpt_score_rule_scoreinfo as b on a.cmpt_id=b.cmptId where cmptId=#{cmptId} and a.cmpt_item=#{roadId} and rule_id=#{ruleId} and checkStatus=#{checkStatus} and a.del_flag=0 and b.isDelete=0
</select>
<select id="getCmptScoreRuleScoreInfoList" resultType="com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo">
select a.cmpt_id as cmptId,rule_id as ruleId,b.mark_no as markNo,subsectionscore as subsectionscore,subsectionMileage as subsectionMileage,checkStatus from geerunner.cmpt_enroll as a left join
gk_cmpt_score_rule_scoreinfo as b on a.cmpt_id=b.cmptId where cmptId=#{cmptId} and a.cmpt_item=#{roadId} and rule_id=#{ruleId} and checkStatus=#{checkStatus} and a.del_flag=0 and b.isDelete=0 order by subsectionTime desc limit #{page.offset},#{page.size}
</select>
<update id="uploadCmptScoreRuleScoreInfoByNoPassedIds">
</update>
<update id="uploadCmptScoreRuleScoreInfoByPassedIds">
</update>
</mapper> </mapper>
\ No newline at end of file
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/ScoreReviewMapper.java deleted 100644 → 0
View file @ 6f4a5545
package com.dlbridge.jadp.plugins.cmpt.dao.mapper;
public interface ScoreReviewMapper {
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/ScoreReviewMapper.xml deleted 100644 → 0
View file @ 6f4a5545
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.ScoreReviewMapper">
<select id="queryRoads" resultType="com.dlbridge.jadp.plugins.cmpt.bean.Road">
select road_id roadId,cmpt_id cmptId,road_name name,file_name fileName,file_url fileUrl,times,file_size fileSize
from gk_road
where cmpt_id = #{cmptId} and is_delete = 0
</select>
<update id="delete">
update gk_road set is_delete = 1 where road_id = #{roadId}
</update>
<update id="update">
update gk_road
<set>
<if test="road.name != null">
road_name = #{road.name},
</if>
<if test="road.fileSize > 0">
file_size = #{road.fileSize},
</if>
<if test="road.fileName != null">
file_name = #{road.fileName},
</if>
<if test="road.fileUrl != null">
file_url = #{road.fileUrl}
</if>
</set>
where road_id = #{road.roadId}
</update>
</mapper>
\ No newline at end of file
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptScoreRuleScoreInfoService.java
View file @ b5a4fdfe
...@@ -4,7 +4,11 @@ import com.dlbridge.feign.bean.ScoreItem; ...@@ -4,7 +4,11 @@ import com.dlbridge.feign.bean.ScoreItem;
import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo; import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo;
import com.dlbridge.jadp.plugins.cmpt.bean.UserScoreExcelBean; import com.dlbridge.jadp.plugins.cmpt.bean.UserScoreExcelBean;
import com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreRuleScoreInfoMapper; import com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptScoreRuleScoreInfoMapper;
import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
import com.dlbridge.jadp.plugins.cmpt.utils.Page;
import com.dlbridge.jadp.plugins.cmpt.utils.PageFactory;
import com.dlbridge.jadp.plugins.cmpt.utils.date.DateUtil; import com.dlbridge.jadp.plugins.cmpt.utils.date.DateUtil;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -25,6 +29,9 @@ public class CmptScoreRuleScoreInfoService { ...@@ -25,6 +29,9 @@ public class CmptScoreRuleScoreInfoService {
@Resource @Resource
RemoteService remoteService; RemoteService remoteService;
@Resource
CmptScoreRuleScoreInfoService cmptScoreRuleScoreInfoService;
/** /**
* 保存用户提交的成绩,每一天规则对应一条成绩 * 保存用户提交的成绩,每一天规则对应一条成绩
* @param cmptScoreRuleScoreInfo * @param cmptScoreRuleScoreInfo
...@@ -65,5 +72,66 @@ public class CmptScoreRuleScoreInfoService { ...@@ -65,5 +72,66 @@ public class CmptScoreRuleScoreInfoService {
return cmptScoreRuleScoreInfoMapper.getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo(cmptId,markNo,ruleId); return cmptScoreRuleScoreInfoMapper.getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo(cmptId,markNo,ruleId);
} }
/**
* 根据号码牌自动审核成绩
* 查出总成绩，并把成绩发送给计时系统
* @param cmptId
* @param markNo
*/
public boolean scoreReviewByMarkNo(int cmptId, String markNo, int SwitchScoreReview){
//成绩自动审核开启SwitchScoreReview==1
if(SwitchScoreReview==1){
//根据赛事id和号码牌查出总成绩
HashMap<String,Object> scoreResult=cmptScoreRuleScoreInfoService.getUserScoreByMarkNo(cmptId,markNo);
//将数据都插入计时系统的名单中
HashMap<String,Object> cmptEnrollInfo=new HashMap<>();
cmptEnrollInfo.put("cmptId",cmptId);
cmptEnrollInfo.put("markNo",markNo);
cmptEnrollInfo.put("deviceId",markNo);
cmptEnrollInfo.put("remark", DateUtil.formatDate((Long)scoreResult.get("userTotalScore")));
cmptEnrollInfo.put("remark2",String.valueOf(((int)scoreResult.get("userTotalMileage")/100d)/10d));
boolean enrollFlag=remoteService.mergePersonEnrollByMarkNo(cmptEnrollInfo);
//将成绩插入到计时系统，以便出完赛证书
String records=markNo+","+DateUtil.formatDate((Long)scoreResult.get("userTotalScore"))+",3";
boolean timeFlag=remoteService.uploadTimeScore(cmptId,records);
return enrollFlag&timeFlag;
}
return false;
}
/**
* 根据cmptid，roadId,ruleId获取用户提交成绩记录
* @param page
* @param cmptId
* @param roadId
* @param ruleId
* @parm checkstatus 1为已审核 0为未审核 2为未通过
* @return
*/
public Page<List<CmptScoreRuleScoreInfo>> getCmptScoreRuleScoreInfo(Pageable page, int cmptId, int roadId, int ruleId,int checkstatus){
long count = cmptScoreRuleScoreInfoMapper.getCmptScoreRuleScoreInfoToalNumer(cmptId,roadId,ruleId,checkstatus);
List<CmptScoreRuleScoreInfo> list = cmptScoreRuleScoreInfoMapper.getCmptScoreRuleScoreInfoList(page, cmptId,roadId,ruleId,checkstatus);
return PageFactory.setContent(list, page, count);
}
/**
* 批量审核用户提交的成绩信息
* @param cmptId
* @param roadId
* @param ruleId
* @param noPassedIds
* @param passedIds
* @return
*/
public boolean uploadCmptScoreRuleScoreInfo(int cmptId, int roadId, int ruleId,int[] noPassedIds,int[] passedIds){
Integer uploadNumberNoPassedIds= cmptScoreRuleScoreInfoMapper.uploadCmptScoreRuleScoreInfoByNoPassedIds(cmptId,roadId,ruleId,noPassedIds);
Integer uploadNumberPassedIds= cmptScoreRuleScoreInfoMapper.uploadCmptScoreRuleScoreInfoByNoPassedIds(cmptId,roadId,ruleId,passedIds);
if(uploadNumberNoPassedIds>0 ||uploadNumberPassedIds>0){
return true;
}
return false;
}
} }
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/ScoreReviewService.java deleted 100644 → 0
View file @ 6f4a5545
package com.dlbridge.jadp.plugins.cmpt.service;
import com.dlbridge.jadp.plugins.cmpt.bean.ScoreExcelBean;
import com.dlbridge.jadp.plugins.cmpt.utils.date.DateUtil;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
/**
* 成绩审核的service
*/
@Service
@Log4j2
public class ScoreReviewService {
@Resource
RemoteService remoteService;
@Resource
CmptScoreRuleScoreInfoService cmptScoreRuleScoreInfoService;
/**
* 根据号码牌自动审核成绩
* 查出总成绩，并把成绩发送给计时系统
* @param cmptId
* @param markNo
*/
public boolean scoreReviewByMarkNo(int cmptId, String markNo, int SwitchScoreReview){
//成绩自动审核开启SwitchScoreReview==1
if(SwitchScoreReview==1){
//根据赛事id和号码牌查出总成绩
HashMap<String,Object> scoreResult=cmptScoreRuleScoreInfoService.getUserScoreByMarkNo(cmptId,markNo);
//将数据都插入计时系统的名单中
HashMap<String,Object> cmptEnrollInfo=new HashMap<>();
cmptEnrollInfo.put("cmptId",cmptId);
cmptEnrollInfo.put("markNo",markNo);
cmptEnrollInfo.put("deviceId",markNo);
cmptEnrollInfo.put("remark", DateUtil.formatDate((Long)scoreResult.get("userTotalScore")));
cmptEnrollInfo.put("remark2",String.valueOf(((int)scoreResult.get("userTotalMileage")/100d)/10d));
boolean enrollFlag=remoteService.mergePersonEnrollByMarkNo(cmptEnrollInfo);
//将成绩插入到计时系统，以便出完赛证书
String records=markNo+","+DateUtil.formatDate((Long)scoreResult.get("userTotalScore"))+",3";
boolean timeFlag=remoteService.uploadTimeScore(cmptId,records);
return enrollFlag&timeFlag;
}
return false;
}
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/CmptScoreRuleScoreInfoController.java 0 → 100644
View file @ b5a4fdfe
package com.dlbridge.jadp.plugins.cmpt.web;
import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRuleScoreInfo;
import com.dlbridge.jadp.plugins.cmpt.service.CmptScoreRuleScoreInfoService;
import com.dlbridge.jadp.plugins.cmpt.utils.Page;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource;
import java.util.List;
/**
* 成绩审核对应的接口
*/
@Controller
@Log4j2
@RequestMapping("gk/scoreReview/")
@ApiIgnore
public class CmptScoreRuleScoreInfoController {
@Resource
CmptScoreRuleScoreInfoService cmptScoreRuleScoreInfoService;
/**
* 根据cmptId，roadId,ruleId获取用户提交的成绩记录
* @param page
* @param cmptId
* @param roadId
* @param ruleId
* @param checkstatus 1为已审核 0为未审核，2为未通过
* @return
*/
@RequestMapping("getCmptScoreRuleScoreInfo")
public Page<List<CmptScoreRuleScoreInfo>> getCmptScoreRuleScoreInfo(Pageable page, int cmptId, int roadId, int ruleId,int checkstatus) {
Page<List<CmptScoreRuleScoreInfo>> result = cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfo(page,cmptId,roadId,ruleId,checkstatus);
result.setCode(200);
return result;
}
/**
* 批量审核成绩为通过或者未通过
* @param page
* @param cmptId
* @param roadId
* @param ruleId
* @param checkstatus 1为已通过 ，2为未通过
* @return
*/
@RequestMapping("uploadCmptScoreRuleScoreInfo")
public Page<List<CmptScoreRuleScoreInfo>> uploadCmptScoreRuleScoreInfo(Pageable page, int cmptId, int roadId, int ruleId,
int checkstatus,int[] noPassedIds,int[] passedIds){
boolean isOk= cmptScoreRuleScoreInfoService.uploadCmptScoreRuleScoreInfo(cmptId,roadId,ruleId,noPassedIds,passedIds);
log.info("审核成绩"+isOk);
Page<List<CmptScoreRuleScoreInfo>> result = cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfo(page,cmptId,roadId,ruleId,checkstatus);
result.setCode(200);
return result;
}
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
View file @ b5a4fdfe
...@@ -5,7 +5,6 @@ import com.dlbridge.feign.NewsService; ...@@ -5,7 +5,6 @@ import com.dlbridge.feign.NewsService;
import com.dlbridge.feign.ScoreService; import com.dlbridge.feign.ScoreService;
import com.dlbridge.feign.bean.ScoreItem; import com.dlbridge.feign.bean.ScoreItem;
import com.dlbridge.jadp.common.service.JService; import com.dlbridge.jadp.common.service.JService;
import com.dlbridge.jadp.common.utils.DateUtils;
import com.dlbridge.jadp.job.CountJob; import com.dlbridge.jadp.job.CountJob;
import com.dlbridge.jadp.plugins.cmpt.bean.*; import com.dlbridge.jadp.plugins.cmpt.bean.*;
import com.dlbridge.jadp.plugins.cmpt.bean.Contact; import com.dlbridge.jadp.plugins.cmpt.bean.Contact;
...@@ -15,7 +14,6 @@ import com.dlbridge.jadp.plugins.cmpt.dao.model.Manual; ...@@ -15,7 +14,6 @@ import com.dlbridge.jadp.plugins.cmpt.dao.model.Manual;
import com.dlbridge.jadp.plugins.cmpt.dao.model.NameList; import com.dlbridge.jadp.plugins.cmpt.dao.model.NameList;
import com.dlbridge.jadp.plugins.cmpt.service.*; import com.dlbridge.jadp.plugins.cmpt.service.*;
import com.dlbridge.jadp.plugins.cmpt.utils.*; import com.dlbridge.jadp.plugins.cmpt.utils.*;
import com.dlbridge.jadp.plugins.cmpt.utils.date.DateUtil;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.dlbridge.feign.bean.News; import com.dlbridge.feign.bean.News;
...@@ -122,8 +120,6 @@ public class MicroApiController { ...@@ -122,8 +120,6 @@ public class MicroApiController {
@Resource @Resource
private RoadsGpsCheckpointService roadsGpsCheckpointService; private RoadsGpsCheckpointService roadsGpsCheckpointService;
@Resource @Resource
private ScoreReviewService scoreReviewService;
@Resource
private CmptScoreRuleScoreInfoService cmptScoreRuleScoreInfoService; private CmptScoreRuleScoreInfoService cmptScoreRuleScoreInfoService;
/** /**
...@@ -902,7 +898,7 @@ public class MicroApiController { ...@@ -902,7 +898,7 @@ public class MicroApiController {
cmptScoreFieldValueService.saveOrUpdate(score.getFields()); cmptScoreFieldValueService.saveOrUpdate(score.getFields());
//查看自动审核是否开启，如果开启直接将总成绩存入到计时系统remark1，如果没有开启走手动审核的逻辑 //查看自动审核是否开启，如果开启直接将总成绩存入到计时系统remark1，如果没有开启走手动审核的逻辑
FuncSetting settingByCmptId = funcSettingService.getSettingByCmptId(score.getCmptId()); FuncSetting settingByCmptId = funcSettingService.getSettingByCmptId(score.getCmptId());
scoreReviewService.scoreReviewByMarkNo(score.getCmptId(),score.getMarkNo(),settingByCmptId.getSwitchScoreReview()); cmptScoreRuleScoreInfoService.scoreReviewByMarkNo(score.getCmptId(),score.getMarkNo(),settingByCmptId.getSwitchScoreReview());
return Result.success().setContent(score); return Result.success().setContent(score);
} }
......
src/main/webapp/WEB-INF/views/cmpt/score_review.jsp
View file @ b5a4fdfe
...@@ -316,8 +316,8 @@ ...@@ -316,8 +316,8 @@
<div class="flex-vt" style="width: 240px; margin-right: 20px;"> <div class="flex-vt" style="width: 240px; margin-right: 20px;">
<label>项目</label> <label>项目</label>
<div style="position: relative;"> <div style="position: relative;">
<select class="select " name=""> <select v-on:change="changeRoad" v-model="selectedRoadId" class="select " name="">
<option v-for="road in roads" v-text="road.name" :data-roadId="road.roadId"></option> <option v-for="road in roads" v-text="road.name" :value="road.roadId" :data-roadId="road.roadId"></option>
</select> </select>
<span class="down-arrow"></span> <span class="down-arrow"></span>
</div> </div>
...@@ -325,8 +325,8 @@ ...@@ -325,8 +325,8 @@
<div style="width: 240px;" class="flex-vt"> <div style="width: 240px;" class="flex-vt">
<label>成绩</label> <label>成绩</label>
<div style="position: relative;"> <div style="position: relative;">
<select class="select " name=""> <select v-on:change="changeRule" v-model="selectedRuleId" class="select " name="">
<option value="" v-for="rule in rules" :data-ruleId="rule.id" v-text="'第'+(rule.index+1)+'次成绩'"> </option> <option value="" v-for="rule in rules" :data-ruleId="rule.id" :value="rule.id" v-text="'第'+(rule.index+1)+'次成绩'"> </option>
</select> </select>
<span class="down-arrow"></span> <span class="down-arrow"></span>
</div> </div>
...@@ -340,8 +340,8 @@ ...@@ -340,8 +340,8 @@
<span :class="['review-status',reviewStatus==-1?'active':'']" v-on:click="changeStatus(-1)">未通过（5）</span> <span :class="['review-status',reviewStatus==-1?'active':'']" v-on:click="changeStatus(-1)">未通过（5）</span>
</div> </div>
<div> <div>
<span v-show="reviewStatus<=0" class="pass">通过</span> <span v-on:click="review(1)" v-show="reviewStatus<=0" class="pass">通过</span>
<span v-show="reviewStatus>=0"class="no-pass">不通过</span> <span v-on:click="review(-1)"v-show="reviewStatus>=0"class="no-pass">不通过</span>
</div> </div>
</div> </div>
<div class="data-cloumn"> <div class="data-cloumn">
...@@ -355,38 +355,30 @@ ...@@ -355,38 +355,30 @@
</div> </div>
<div class="score-item"> <div class="score-item" v-for="score in scores">
<div class="score-info"> <div class="score-info">
<span>王教授</span> <span v-text="score.name"></span>
<span>M0912</span> <span v-text="score.markNo"></span>
<span>2019-01-01</span> <span v-text="score.time"></span>
<span>30</span> <span v-text="score.duration"></span>
<span>10:02:12</span> <span v-text="score.ps"></span>
<span>30'12</span> <span v-text="score.ps"></span>
<span><input type="checkbox" :checked="checked?'true':'' "></span> <span><input type="checkbox" :checked="checked?'true':'' "></span>
</div> </div>
<div class="flex score-img"> <div class="flex score-img">
<div class="img-item"> <div class="img-item" v-for="item in score.imgs">
<img v-on:click="preview($event)" class="img" src="http://img.geexek.com/files/enroll/cmpt/images/4e432d31-6b30-453a-88d6-563a9d4c2751.png" alt=""> <img v-on:click="preview($event)" class="img" :src="item" alt="">
<span class="bigger"></span>
</div>
<div class="img-item">
<img class="img" src="http://img.geexek.com/files/enroll/cmpt/images/4e432d31-6b30-453a-88d6-563a9d4c2751.png" alt="">
<span class="bigger"></span>
</div>
<div class="img-item">
<img class="img" src="http://img.geexek.com/files/enroll/cmpt/images/4e432d31-6b30-453a-88d6-563a9d4c2751.png" alt="">
<span class="bigger"></span> <span class="bigger"></span>
</div> </div>
</div> </div>
</div> </div>
<div class="pager"> <div class="pager">
<div class="prev page-btn"></div> <div class="prev page-btn" v-on:click="prev"></div>
<div> <div>
<input type="number"> of 3 <input type="number" v-on:keyup="jumpTo" v-model="jumpToPage"> of 3
</div> </div>
<div class="next page-btn"></div> <div class="next page-btn" v-on:click="next"></div>
</div> </div>
</div> </div>
......
src/main/webapp/static/js/score_review.js
View file @ b5a4fdfe
var score = new Vue({ var score = new Vue({
el : '#score', el : '#score',
data : { data : {
selectedRoadId:-1,
selectedRuleId:-1,
param:{
size:10,
page:1,
cmptId:getCId(),
checkstatus:1
},
jumpToPage:1,
checked:false, checked:false,
reviewStatus : 0, // 0待审核 1审核通过 -1审核不通过 reviewStatus : 0, // 0待审核 1审核通过 -1审核不通过
pass: false, pass: false,
...@@ -9,7 +18,10 @@ var score = new Vue({ ...@@ -9,7 +18,10 @@ var score = new Vue({
dialog: false, dialog: false,
count: 1000, count: 1000,
roads: [], roads: [],
rules: [] rules: [],
scores: [{name:'似懂非懂',markNo:'Adds','time':'2019-01-01','duration':'30','ps':"10'12",imgs:['http://img.geexek.com/files/enroll/cmpt/images/4e432d31-6b30-453a-88d6-563a9d4c2751.png','http://img.geexek.com/files/enroll/cmpt/images/4e432d31-6b30-453a-88d6-563a9d4c2751.png']},
{name:'似懂非懂',markNo:'Adds','time':'2019-01-01','duration':'30','ps':"10'12",imgs:['http://img.geexek.com/files/enroll/cmpt/images/4e432d31-6b30-453a-88d6-563a9d4c2751.png']},
{name:'似懂非懂',markNo:'Adds','time':'2019-01-01','duration':'30','ps':"10'12",imgs:['http://img.geexek.com/files/enroll/cmpt/images/4e432d31-6b30-453a-88d6-563a9d4c2751.png','http://img.geexek.com/files/enroll/cmpt/images/4e432d31-6b30-453a-88d6-563a9d4c2751.png','http://img.geexek.com/files/enroll/cmpt/images/4e432d31-6b30-453a-88d6-563a9d4c2751.png']}]
}, },
methods:{ methods:{
closeDialog:function(){ closeDialog:function(){
...@@ -24,6 +36,28 @@ var score = new Vue({ ...@@ -24,6 +36,28 @@ var score = new Vue({
}, },
checkAll:function () { checkAll:function () {
score.$data.checked = !score.$data.checked score.$data.checked = !score.$data.checked
},
changeRoad:function () {
console.log(score.$data.selectedRoadId)
},
changeRule:function () {
console.log(score.$data.selectedRuleId)
},
next:function () {
score.$data.jumpToPage = ++score.$data.param.page;
reviewPage.reloadPage();
},
prev:function () {
score.$data.jumpToPage = --score.$data.param.page;
reviewPage.reloadPage();
},
jumpTo:function () {
console.log(score.$data.jumpToPage)
score.$data.param.page = score.$data.jumpToPage;
reviewPage.reloadPage();
},
review:function (status) {
console.log(status);
} }
} }
...@@ -34,7 +68,9 @@ var reviewPage = { ...@@ -34,7 +68,9 @@ var reviewPage = {
url:"/gk/review/roads/"+getCId(), url:"/gk/review/roads/"+getCId(),
success:function (data) { success:function (data) {
if(data.status == 1){ if(data.status == 1){
score.$data.roads = data.content score.$data.roads = data.content;
score.$data.selectedRoadId = score.$data.roads[0].roadId;
reviewPage.getRules();
} }
} }
}); });
...@@ -44,10 +80,24 @@ var reviewPage = { ...@@ -44,10 +80,24 @@ var reviewPage = {
url:"/gk/review/rules/"+getCId(), url:"/gk/review/rules/"+getCId(),
success:function (data) { success:function (data) {
if(data.status == 1){ if(data.status == 1){
score.$data.rules = data.content score.$data.rules = data.content;
score.$data.selectedRuleId = score.$data.rules[0].id;
reviewPage.reloadPage();
} }
} }
}); });
},
reloadPage:function () {
score.$data.param.roadId = score.$data.selectedRoadId;
score.$data.param.ruleId = score.$data.selectedRuleId;
$.ajax({
url : '/gk/scoreReview/getCmptScoreRuleScoreInfo',
data:score.$data.param,
success:function (data) {
console.log(JSON.stringify(data));
}
})
} }
} }
...@@ -76,5 +126,4 @@ $(document).ready(function () { ...@@ -76,5 +126,4 @@ $(document).ready(function () {
}) })
reviewPage.getRoads(); reviewPage.getRoads();
reviewPage.getRules();
}); });
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment