删除成绩，调整ui

src/main/java/com/dlbridge/feign/GeexekScoreService.java

@@ -8,6 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 废弃单独处理成绩工程
@@ -30,4 +31,7 @@ public interface GeexekScoreService {
 
     @RequestMapping("hasCheckPoint/{cmptId}")
     int hasCheckPoint(@PathVariable("cmptId") Integer cmptId);
+
+    @RequestMapping("getRoadCheckPointMap/{cmptId}")
+    List<Map> getRoadCheckPointMap(@PathVariable("cmptId") Integer cmptId);
 }

src/main/java/com/dlbridge/feign/bean/CmptScoreCheckpoint.java

 package com.dlbridge.feign.bean;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -47,11 +44,11 @@ public class CmptScoreCheckpoint{
     private Boolean isDelete;
 
     @ApiModelProperty(value = "记录插入时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime insertTime;
 
     @ApiModelProperty(value = "记录更新时间")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
     private Double longitude;

src/main/java/com/dlbridge/jadp/Application.java

 package com.dlbridge.jadp;
 
 
+import org.apache.catalina.Context;
+import org.apache.tomcat.util.scan.StandardJarScanner;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
@@ -33,6 +37,17 @@ public class Application extends SpringBootServletInitializer {
         return application.sources(Application.class);
     }
 
+    @Bean
+    public TomcatServletWebServerFactory tomcatFactory() {
+        return new TomcatServletWebServerFactory() {
+
+            @Override
+            protected void postProcessContext(Context context) {
+                ((StandardJarScanner) context.getJarScanner()).setScanManifest(false);
+            }
+        };
+    }
+
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }

src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/Road.java

@@ -29,6 +29,7 @@ public class Road {
     private double fileSize;
 
     private int times;
+
     private String createTime;
 
     @Override

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptService.java

@@ -2,18 +2,16 @@ package com.dlbridge.jadp.plugins.cmpt.service;
 
 import com.dlbridge.jadp.plugins.cmpt.bean.*;
 import com.dlbridge.jadp.plugins.cmpt.dao.mapper.CmptMapper;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
 import com.dlbridge.jadp.plugins.cmpt.dao.model.UserCmpt;
 import com.dlbridge.jadp.plugins.cmpt.utils.Page;
 import com.dlbridge.jadp.plugins.cmpt.utils.PageFactory;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
-
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
@@ -51,22 +49,11 @@ public class CmptService {
                 save(cmpt);
                 return cmptMapper.queryCmptBycmptId(cmptId);
             } else {
-                if ((StringUtils.isNotBlank(localCmpt.getCmptName()) && !localCmpt.getCmptName().equals(cmpt.getCmptName()))
-                        || (StringUtils.isNotBlank(localCmpt.getStartTime()) && !localCmpt.getStartTime().equals(cmpt.getStartTime()))) {
-                    localCmpt.setCmptName(cmpt.getCmptName());
-                    localCmpt.setStartTime(cmpt.getStartTime());
-                    update(localCmpt);
-                }
-                if(StringUtils.isBlank(localCmpt.getStartTime())){
-                    localCmpt.setStartTime(cmpt.getStartTime());
-                    update(localCmpt);
-                }
-                if(cmpt.getCmptType() != localCmpt.getCmptType()){
-                    localCmpt.setCmptType(cmpt.getCmptType());
-                    update(localCmpt);
-                }
+                localCmpt.setCmptName(cmpt.getCmptName());
+                localCmpt.setStartTime(cmpt.getStartTime());
                 localCmpt.setEndTime(cmpt.getEndTime());
-
+                localCmpt.setCmptType(cmpt.getCmptType());
+                update(localCmpt);
                 return localCmpt;
             }
         }catch (Exception ex){

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ExceptionController.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-//@ControllerAdvice
+@ControllerAdvice
 @Order(0)
 @Log4j2
 public class ExceptionController {

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

@@ -251,7 +251,6 @@ public class MicroApiController {
             @ApiResponse(code = -1, message = "失败", response = ObjectUtils.Null.class),
             @ApiResponse(code = 200, message = "成功", response = Result.class, responseContainer = "List")})
     public Result getCustomer(@PathVariable("cmptId") Integer cmptId) {
-        int a = 1/0;
         Customer customer = customerService.getCusomerServiceInfo(cmptId);
         FuncSetting setting = funcSettingService.getSettingByCmptId(cmptId);
         Map<String,String> result = new HashMap<>();
@@ -971,9 +970,6 @@ public class MicroApiController {
         }
         log.info("用户信息："+userInfo);
         Map<String,Object> result = new HashMap<>();
-        result.put("user",userInfo);
-//EnrollInfo(id=0, enrollId=10629228, userName=孙玉华, markNo=S100002, roadName=3公里, phone=18121278668, roadId=21296, remark=null, gender=男)
-        //Integer scoreItemId = cmptScoreRuleService.getCmptScoreRulesMapByMarkNoAndRuleId(userInfo.getMarkNo(),rule.getId());
         Integer scoreItemId=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoIdByruleIdAndMarkNo(score.getCmptId(),userInfo.getMarkNo(), rule.getId());
         //小程序添加里程的是否需要用户填写
         FuncSetting funcSetting =funcSettingService.getSettingByCmptId(score.getCmptId());
@@ -982,8 +978,6 @@ public class MicroApiController {
 
         if(scoreItemId != null){
             CmptScoreRuleScoreInfo cmptScoreRuleScoreInfo=cmptScoreRuleScoreInfoService.getCmptScoreRuleScoreInfoByruleIdAndMarkNo(score.getCmptId(),score.getMarkNo(),rule.getId());
-            //Result<ScoreItem> scoreItem = scoreService1.getScoreItem(scoreItemId);
-            //ScoreItem content = scoreItem.getContent();
             if(cmptScoreRuleScoreInfo.getSubsectionMileage()==0){
                 subsectionMileage=0;
             }else{

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/RoadController.java

@@ -5,13 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.dlbridge.feign.GeexekScoreService;
 import com.dlbridge.feign.bean.CmptScoreCheckpoint;
 import com.dlbridge.jadp.common.interceptor.PageView;
-import com.dlbridge.jadp.plugins.cmpt.bean.Equipment;
 import com.dlbridge.jadp.plugins.cmpt.bean.Road;
 import com.dlbridge.jadp.plugins.cmpt.bean.RoadGpsPoint;
 import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
 import com.dlbridge.jadp.plugins.cmpt.service.CmptService;
-import com.dlbridge.jadp.plugins.cmpt.service.EquipmentService;
-import com.dlbridge.jadp.plugins.cmpt.service.RemoteService;
 import com.dlbridge.jadp.plugins.cmpt.service.RoadService;
 import com.neusoft.www.utils.web.Result;
 import lombok.extern.log4j.Log4j2;
@@ -23,7 +20,6 @@ import springfox.documentation.annotations.ApiIgnore;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -49,8 +45,7 @@ public class RoadController {
         Cmpt cmpt = cmptService.queryCmptBycmptId(cmptId);
         mv.addObject("cmpt", cmpt);
         List<Road> list = roadService.queryRoads(cmptId);
-        for (Road road :
-                list) {
+        for (Road road : list) {
             log.info("RoadController getName:" + road.getName() + " getRoadId：" + road.getRoadId() + " getFileName:" + road.getFileName());
         }
         log.info(list);
@@ -96,7 +91,6 @@ public class RoadController {
             cp.setRoadId(road.getRoadId());
             cp.setIsDelete(false);
             cp.setInsertTime(LocalDateTime.now());
-            cp.setUpdateTime(LocalDateTime.now());
             cp.setName(next.getString("name"));
             cp.setLatitude(next.getDouble("latitude"));
             cp.setLongitude(next.getDouble("longitude"));

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ScanController.java

@@ -29,6 +29,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -62,8 +63,15 @@ public class ScanController {
         mv.addObject("cmpt", cmpt);
         mv.addObject("roads", roads);
 
-        int count = geexekScoreService.hasCheckPoint(cmptId);
-        mv.addObject("hasCp", count > 0);
+        //int count = geexekScoreService.hasCheckPoint(cmptId);
+        List<Map> map =  geexekScoreService.getRoadCheckPointMap(cmptId);
+        mv.addObject("hasCps", map.size() > 0);
+
+        Map<Integer,Integer> result = new HashMap<>();
+        for(Map m : map){
+            result.put(Integer.valueOf(m.get("road_id")+""),Integer.valueOf(m.get("number")+""));
+        }
+        mv.addObject("cpMap", result);
         return mv;
     }
 
@@ -76,7 +84,6 @@ public class ScanController {
     }
     /**
      * 根据赛事id或者项目Id，获取全部的二维码图片，下载zip文件
-     * @param httpServletRequest
      * @param httpServletResponse
      * @param cmptId
      * @param roadId
@@ -116,6 +123,7 @@ public class ScanController {
             //获取这个项目有多少打卡点，生成相应的二维码
             List<CmptScoreCheckpoint> checkPoints = geexekScoreService.getCheckPointByRoadId(roadId);
             for (int i = 0; i < checkPoints.size(); i++) {
+                if(!checkPoints.get(i).getIsTime()) continue;
                 int checkpointId = checkPoints.get(i).getCheckpointId();
                 String checkpointName = checkPoints.get(i).getName();
                 BufferedImage buffImg = QRCodeUtil.getBufferedImage(logoimg, String.valueOf(checkpointId));

src/main/resources/application-dev.properties

@@ -98,7 +98,7 @@ spring.cloud.sentinel.skip-keys=cmptId
 spring.cloud.sentinel.exclude-urls=/static/**,**.css,**.js
 
 ## nacos 地址
-spring.cloud.sentinel.datasource.ds.nacos.server-addr=192.168.43.254:8848
+spring.cloud.sentinel.datasource.ds.nacos.server-addr=192.168.0.106:8848
 spring.cloud.sentinel.datasource.ds.nacos.dataId=micro-gksite-sentinel
 spring.cloud.sentinel.datasource.ds.nacos.data-type=json
 spring.cloud.sentinel.datasource.ds.nacos.groupId=dev

src/main/resources/bootstrap.yml

@@ -4,14 +4,14 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: http://192.168.43.254:8848
+        server-addr: http://192.168.0.106:8848
         file-extension: properties
         group: dev
-        namespace: 7fad8a39-a3e7-49a1-ae96-0f7aaf39136b
-      server-addr: http://192.168.43.254:8848
+        namespace: 187c2f4d-80c2-4a67-b4e5-319d5c9151d1
+      server-addr: http://192.168.0.106:8848
       discovery:
         group: dev
-        namespace: 7fad8a39-a3e7-49a1-ae96-0f7aaf39136b
+        namespace: 187c2f4d-80c2-4a67-b4e5-319d5c9151d1
 ---
 spring:
   profiles: test

src/main/webapp/WEB-INF/views/cmpt/cert.jsp

@@ -93,7 +93,7 @@
         <div class="force">
             <div class="title-new" style="background:rgba(255,255,255,1)!important;">
                 <div>
-                    <span class="title-txt">赛事广告</span>
+                    <span class="title-txt">软件下载</span>
                 </div>
                 <div>
                     <span class="road-notice"></span>
@@ -104,7 +104,7 @@
 
 
             <div class="section">
-                <label for="">容制作步骤</label>
+                <label for="">制作步骤</label>
                 <ul>
                     <li><span style="transform: scale(1.2);margin-right: 5px">❶</span> 登录：用平台账户登录；</li>
                     <li><span style="transform: scale(1.2);margin-right: 5px">❷</span> 证书模板：点击 <span style="background:rgba(246,194,194,0.5);">‘插入电子证书模板’</span> 载入证书底图，如同标注‘2’所示；</li>
@@ -130,6 +130,10 @@
         </div>
     </div>
 </div>
-
+<script>
+    $('.download').click(function () {
+        window.open("http://img.geexek.com/files/timerDownload/GeexekAssistant.2.0.7.3.exe?v=1593514668671")
+    })
+</script>
 </body>
 </html>

src/main/webapp/WEB-INF/views/cmpt/news.jsp

@@ -416,7 +416,7 @@
 
 <div class="item copy" style="display: none">
     <span class="title" style="flex:11.6">${item.title}</span>
-    <span class="type" style="flex:2">${item.type == 1 ? '通知':'赛训' }</span>
+    <%--<span class="type" style="flex:2">${item.type == 1 ? '通知':'赛训' }</span>--%>
     <div style="flex:2;display: flex;flex-direction: column">
         <div class="opt edit">
             <span class="icon-edit"></span>

src/main/webapp/WEB-INF/views/cmpt/scan.jsp

@@ -111,7 +111,7 @@
 </head>
 <body>
 <jsp:include page="../common/header.jsp"></jsp:include>
-<c:if test="${!hasCp}">
+<c:if test="${!hasCps}">
     <style>
         .title,.road-text,.down {
             color: #999;
@@ -129,13 +129,13 @@
                     <div class="road-name ${idx.index==0?'active':''}" road-id="${item.roadId}">
                         <input type="hidden" id="roadId" name="roadId" value="${item.roadId}">
                         <span class="road-text">${item.name}</span>
-                        <span class="down QRCodeDown" data-hasCp="${hasCp}">下载全部二维码</span>
+                        <span class="down QRCodeDown" style="${cpMap.get(item.roadId) > 0 ? '':'color: #999'}" data-hasCp="${cpMap.get(item.roadId) > 0}">下载全部二维码</span>
                     </div>
                 </c:forEach>
             </div>
         </div>
 
-        <div class="tip-section" style="display: ${hasCp ? 'none':'flex'}">
+        <div class="tip-section" style="display: ${hasCps ? 'none':'flex'}">
             <div>
                 <span class="notice"></span>
                 <span>当前功能无法启用</span>

src/main/webapp/WEB-INF/views/cmpt/score.jsp

@@ -43,10 +43,10 @@
     <div class="rght">
         <div class="title-new">
             <span class="title">提交成绩</span>
-            <div style="line-height: 22px">
+           <%-- <div style="line-height: 22px">
                 <span class="road-notice"></span>
                 <span class="road-notice-txt">此功能仅适用于自助赛事的成绩提交，比赛开始后不可修改</span>
-            </div>
+            </div>--%>
         </div>
 
         <%--<div class="section">
@@ -86,53 +86,7 @@
 
 
 
-        <div class="section">
-            <div style="display: flex;justify-content: space-between">
-                <h3 class="title">批量删除</h3>
-                <div class="search-group" style="display: flex;align-items: center;justify-content: center;">
-                    <input type="text" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm'})" class="time-input start" placeholder="起始时间">
-                    <span>~</span>
-                    <input type="text" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm'})" class="time-input end" placeholder="终止时间">
-                </div>
-                <div class="deleteBtn">
-                    <span>删除</span>
-                </div>
-            </div>
-        </div>
-        <div class="section" >
-            <div style="display: flex;justify-content: space-between">
-                <h3 class="title">成绩管理</h3>
-                <div class="search-group">
-                    <input type="text" class="search" placeholder="请输入号码牌">
-                    <span id="search" class="search-btn">查询</span>
-                </div>
 
-            </div>
-            <table id="data" style="width: 100%;display: none">
-                <colgroup>
-                    <col width="18%">
-                    <col width="18%">
-                    <col width="10%">
-                    <col width="20%">
-                    <col width="12%">
-                    <col width="25%">
-                </colgroup>
-                <thead>
-
-                <tr>
-                    <th>姓名</th>
-                    <th>项目</th>
-                    <th>参赛号</th>
-                    <th>完赛时间</th>
-                    <th>成绩</th>
-                    <th style="text-align: right"></th>
-                </tr>
-                </thead>
-                <tbody id="score-body">
-
-                </tbody>
-            </table>
-        </div>
         <div class="section">
             <h3 class="title">成绩照片</h3>
             <div style="line-height: 22px">
@@ -178,7 +132,7 @@
             </table>
         </div>
         <!--成绩附加项-->
-        <div class="section">
+        <%--<div class="section">
             <h3 class="title">成绩附加项</h3>
             <div style="line-height: 22px">
                 <span class="road-notice"></span>
@@ -192,7 +146,7 @@
                     <span class="dot"></span>
                 </div>
             </div>
-        </div>
+        </div>--%>
 
     </div>
 </div>

src/main/webapp/WEB-INF/views/cmpt/score_review.jsp

@@ -57,6 +57,20 @@
                 <span class="road-notice-txt">选手提交成绩时，如果“平均配速”（根据里程和用时计算获得）在正常范围（大于2’27”）则自动通过审核，可以立刻领取完赛证书。</span>
             </div>
         </div>
+        <%--<div class="section">
+            <div style="display: flex;justify-content: space-between">
+                <h3 class="title">批量删除</h3>
+                <div class="search-group" style="display: flex;align-items: center;justify-content: center;">
+                    <input type="text" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm'})" class="time-input start" placeholder="起始时间">
+                    <span>~</span>
+                    <input type="text" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm'})" class="time-input end" placeholder="终止时间">
+                </div>
+                <div class="deleteBtn">
+                    <span>删除</span>
+                </div>
+            </div>
+        </div>--%>
+
 
 
         <div class="section data">
@@ -107,6 +121,7 @@
                     <span v-on:click="review(1)" v-show="reviewStatus==0 || reviewStatus==2" class="pass">通过</span>
                     <span v-on:click="review(-1)"v-show="reviewStatus==0  || reviewStatus== 1"class="no-pass">不通过</span>
                 </div>
+                <span v-on:click="deleteScores" class="del">删除</span>
             </div>
             <div class="data-cloumn">
                 <span>姓名</span>

src/main/webapp/WEB-INF/views/cmpt/statistic.jsp

@@ -54,7 +54,7 @@
     getCharts();
     function getCharts() {
         $.ajax({
-            url : 'http://testzs.geexek.com.cn/geexekscore/api/v1/cmpt-score-rule-scoreinfo/scoreStatistic?cmptId='+getCId(),
+            url : 'http://localhost:8081/geexekscore/api/v1/cmpt-score-rule-scoreinfo/scoreStatistic?cmptId='+getCId(),
             success:function (data) {
                 var roads = data.data;
                 var roadNames = [];

src/main/webapp/WEB-INF/views/common/menu.jsp

@@ -160,12 +160,12 @@
                         <span class="menu-txt">提交成绩</span>
                     </a>
                 </li>
-                <li class="auto menu-sub-item">
+               <%-- <li class="auto menu-sub-item">
                     <a href="/gk/auto/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
                         <span class="left-arrow"></span>
                         <span class="menu-txt">自动打卡</span>
                     </a>
-                </li>
+                </li>--%>
                 <li class="scan menu-sub-item">
                     <a href="/gk/scan/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
                         <span class="left-arrow"></span>

src/main/webapp/static/cmpt/score_review.css

@@ -103,7 +103,7 @@ input[type=checkbox] {
 
 .data-cloumn  span,.score-info span{
     display: inline-block;
-    width: 105px;
+    width: 120px;
     height: 45px;
     line-height: 45px;
     font-size:16px;
@@ -213,7 +213,7 @@ input[type=checkbox] {
 .pass{
     cursor: pointer;
     display: inline-block;
-    width: 146px;
+    width: 120px;
     height: 40px;
     border-radius: 4px;
     border: 1px solid rgba(206,57,57,1);
@@ -226,7 +226,7 @@ input[type=checkbox] {
 .no-pass{
     cursor: pointer;
     display: inline-block;
-    width: 146px;
+    width: 120px;
     height: 40px;
     border-radius: 4px;
     border: 1px solid rgba(51,51,51,1);
@@ -235,6 +235,18 @@ input[type=checkbox] {
     letter-spacing: 2px;
     color: rgba(51,51,51,1);
 }
+.del{
+    cursor: pointer;
+    display: inline-block;
+    width: 120px;
+    height: 40px;
+    border-radius: 4px;
+    background: #ce3939;
+    line-height: 40px;
+    text-align: center;
+    letter-spacing: 2px;
+    color: white;
+}
 .bigger{
     display: inline-block;
     position: absolute;

src/main/webapp/static/js/contact.js

@@ -98,7 +98,7 @@ $(document).ready(function () {
                             async: false,
                             dataType: "json",
                             success: function (data) {
-                                if(data.code == 1){
+                                if(data.code == 200){
                                     param.acceptTime = Date.now();
                                     $.ajax({
                                         type: "POST",

src/main/webapp/static/js/news.js

@@ -123,6 +123,10 @@ $(document).ready(function () {
 function uploadFile(obj) {
     var reads = new FileReader();
     logoFile = obj.files[0];
+    if(logoFile.type && logoFile.type.indexOf("image") == -1){
+        layer.msg('请上传图片',{icon:5})
+        return;
+    }
     reads.readAsDataURL(logoFile);
     reads.onload = function (e) {
         //将处理完的图片文件上传到阿里云服务器

src/main/webapp/static/js/road-new.js

@@ -299,6 +299,8 @@ function getPlaceMakers(roadId) {
         success:function (data) {
             console.log(JSON.stringify(data))
             if(data.code == 200){
+                $('.markers .marker').empty();
+                $('.markers-edit .marker').empty()
                 $.each(data.content, function (i, e) {
                     var myIcon1 = L.divIcon({
                         html: '<div class="cp-div"><span>' + e.name + '</span></div>',

src/main/webapp/static/js/score_review.js

@@ -122,9 +122,9 @@ var score = new Vue({
                 return ;
             }
             $.ajax({
-                url:"http://testzs.geexek.com.cn/geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreDetails?scoreId="+id,
+                url:"http://localhost:8081/geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreDetails?scoreId="+id,
                 success:function (data) {
-                    if(data.code == 1){
+                    if(data.code == 200){
                         if(data.data.length == 0){
                             layer.msg("无详细成绩信息！");
                             return ;
@@ -147,6 +147,27 @@ var score = new Vue({
         },
         review:function (status) {
             reviewPage.reviewScore(status);
+        },
+        deleteScores:function () {
+            var delIds = [];
+            $.each($('.score-item input:checked'),function (i,e) {
+                delIds.push($(e).val());
+            });
+            if(delIds.length == 0){
+                layer.msg("请选择行进行删除！",{icon:5})
+                return;
+            }
+            $.ajax({
+                url : 'http://localhost:8081/geexekscore/api/v1/cmpt-score-rule-scoreinfo/deleteScoreInfos',
+                data:{ids:delIds.join(",")},
+                type: 'post',
+                success:function (data) {
+                    if(data.code == 200){
+                        layer.msg('删除成功！');
+                        reviewPage.reloadPage();
+                    }
+                }
+            })
         }
 
     }
@@ -181,14 +202,14 @@ var reviewPage = {
         score.$data.param.origin = score.$data.selectedOrigin;
         score.$data.param.keyword = score.$data.searchWord;
         $.ajax({
-            url : 'http://testzs.geexek.com.cn/geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreInfo',
+            url : 'http://localhost:8081/geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreInfo',
             data:score.$data.param,
             type:'post',
             beforeSend:function(){
                 layer.load();
             },
             success:function (data) {
-                if(data.code == 1){
+                if(data.code == 200){
                     $.each( data.data.records,function (i,e) {
                         e.scoreDetails = [];
                     });
@@ -214,12 +235,12 @@ var reviewPage = {
     },
     getStatistic:function(){
             $.ajax({
-                url : 'http://testzs.geexek.com.cn/geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreInfoStatistics?cmptId='+getCId()+'&roadId='+
+                url : 'http://localhost:8081/geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreInfoStatistics?cmptId='+getCId()+'&roadId='+
                     score.$data.selectedRoadId
                     +'&origin='+ score.$data.selectedOrigin+"&keyword="+score.$data.searchWord,
                 type:'post',
                 success:function (data) {
-                    if(data.code == 1){
+                    if(data.code == 200){
                         score.$data.reviewCount.waiting = data.data.unprocessed;
                         score.$data.reviewCount.pass = data.data.pass;
                         score.$data.reviewCount.nopass = data.data.nopass;
@@ -250,7 +271,7 @@ var reviewPage = {
         var param = {cmptId : getCId(),'checkstatus':score.$data.param.checkstatus,
             roadId: score.$data.selectedRoadId,passedIds:passedIds.join(','),noPassedIds:noPassedIds.join(',')};
         $.ajax({
-            url : 'http://testzs.geexek.com.cn/geexekscore/api/v1/cmpt-score-rule-scoreinfo/uploadCmptScoreRuleScoreInfo',
+            url : 'http://localhost:8081/geexekscore/api/v1/cmpt-score-rule-scoreinfo/uploadCmptScoreRuleScoreInfo',
             data: param,
             beforeSend:function(){
                 layer.load();