修改成绩ui、手册删除bug

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/ManualMapper.xml

@@ -81,7 +81,7 @@
 
     <update id="delete">
         UPDATE gk_manual SET
-        del_flag = #{DEL_FLAG_DELETE}
+        del_flag = #{delFlag}
         WHERE id = #{id}
     </update>
 

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

 package com.dlbridge.jadp.plugins.cmpt.web;
 
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
 import com.dlbridge.jadp.common.interceptor.PageView;
-import com.google.gson.Gson;
-import com.neusoft.www.utils.web.Result;
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
 import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
-import com.dlbridge.jadp.plugins.cmpt.dao.model.CmptSetting;
 import com.dlbridge.jadp.plugins.cmpt.dao.model.Manual;
 import com.dlbridge.jadp.plugins.cmpt.service.CmptService;
 import com.dlbridge.jadp.plugins.cmpt.service.CmptSettingService;
 import com.dlbridge.jadp.plugins.cmpt.service.ManualService;
 import com.github.pagehelper.util.StringUtil;
-
+import com.neusoft.www.utils.web.Result;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 import sun.misc.BASE64Decoder;
-import sun.rmi.runtime.Log;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Log4j2
 @Controller
@@ -87,11 +81,7 @@ public class ManualController {
             model.addAttribute("cmpt", cmpt);
         }
 
-        model.addAttribute("manuals", manuals);
-        for (Manual manual :
-                manuals) {
-            log.info("manual id: " + manual.getId() + " CmptId:" + manual.getCmptId() + " name:" + manual.getName() + " seq:" + manual.getSeq());
-        }
+        model.addAttribute("manuals", manuals); 
 
         model.addAttribute("cmptId", cmptId);
         model.addAttribute("pagecount", manuals.size());
@@ -196,17 +186,19 @@ public class ManualController {
      *
      * @param id
      */
-    @ResponseBody
     @RequestMapping(value = "delManual")
+    @ResponseBody
     public Map<String, Object> delManual(String id) {
         Map<String, Object> resultMap = new HashMap<>();
         String result = "删除成功";
         String code = "200";
         Manual manual = new Manual();
         manual.setId(id);
+        manual.setDelFlag("1");
         try {
             manualService.delete(manual);
         } catch (Exception e) {
+            log.info(e.getMessage(),e);
             result = "删除失败";
             code = "201";
         }

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

@@ -22,7 +22,7 @@
     <link rel="shortcut icon" href="img/favicon.ico">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
     <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css?v=<%=System.currentTimeMillis()%>"/>

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

@@ -189,7 +189,7 @@
 <script src="${ctxStatic}/newdermon/vendor/jquery.cookie/jquery.cookie.js"></script>
 <script src="${ctxStatic}/newdermon/vendor/jquery-validation/jquery.validate.min.js"></script>
 <script src="${ctxStatic}/newdermon/js/jquery-ui.js"></script>
-<script src="${ctxStatic}/js/cmptManual.js"></script>
+<script src="${ctxStatic}/js/cmptManual.js?v=<%=System.currentTimeMillis()%>"></script>
 <script src="${ctxStatic}/js/qikoo.js"></script>
 
 <!-- Main File-->

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

@@ -14,7 +14,7 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
@@ -22,7 +22,7 @@
     <link rel="shortcut icon" href="img/favicon.ico">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
 
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>

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

@@ -23,7 +23,7 @@
     <link rel="shortcut icon" href="img/favicon.ico">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
 
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>

src/main/webapp/WEB-INF/views/cmpt/outter-link.jsp

@@ -179,6 +179,14 @@
                     }
                 },
                 save : function () {
+                    if(customerV.$data.letter.nameWeb.length == 0){
+                        layer.msg("功能名称不能为空！",{icon:5,duration:1500});
+                        return ;
+                    }
+                    if(customerV.$data.letter.appId.length == 0){
+                        layer.msg("AppId不能为空！",{icon:5,duration:1500});
+                        return ;
+                    }
                     $.ajax({
                         url : '/gk/sure-letter/updateName',
                         data : customerV.$data.letter,

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

@@ -23,7 +23,7 @@
     <link rel="shortcut icon" href="img/favicon.ico">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
     <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css?v=<%=System.currentTimeMillis()%>"/>

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

@@ -23,7 +23,7 @@
     <link rel="shortcut icon" href="img/favicon.ico">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
     <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css?v=<%=System.currentTimeMillis()%>"/>

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

@@ -23,12 +23,12 @@
     <link rel="shortcut icon" href="img/favicon.ico">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
     <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css?v=<%=System.currentTimeMillis()%>"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/score_review.css"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/score_review.css?<%=System.currentTimeMillis()%>"/>
     <script src="${ctxStatic}/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
     <script type="text/javascript" charset="utf-8" src="${ctxStatic}/layer/layer.js"></script>
@@ -79,7 +79,7 @@
                 <span class="export-btn">导出名单</span>
             </div>
 
-            <div class="flex">
+            <div class="flex" style="margin: 20px 0px 0px 0px">
                 <div class="flex-vt select-section">
                     <label>项目</label>
                     <div style="position: relative;">
@@ -136,7 +136,7 @@
                 <span>参赛号码</span>
                 <span>上传时间</span>
                 <span>完成时间</span>
-                <span>里程（KM）</span>
+                <span>里程(KM)</span>
                 <span>用时</span>
                 <span>平均配速</span>
                 <span>操作</span>
@@ -168,8 +168,8 @@
                         <span v-text="score.name"></span>
                         <span v-text="score.markNo"></span>
                         <span>{{score.insertTime | substr(10)}}</span>
-                        <span><input v-on:click.stop="" class="score-input doneTime" type="text"
-                                     onclick="WdatePicker({skin:'whyGreen',dateFmt:'yyyy-MM-dd'})"
+                        <span><input :scoreId="score.cmptScoreRuleScoreinfoId" v-on:click.stop="" class="score-input doneTime" type="text"
+                                     onclick="WdatePicker({skin:'whyGreen',dateFmt:'yyyy-MM-dd',onpicked: calculateDate})"
                                      :value="score.subsectionTime | substrDate(10)"></span>
                         <span><input v-on:click.stop="" class="score-input miles" type="text"
                                      :value="Number(score.subsectionMileage/1000).toFixed(3)" @input="calculateMile($event,score)"></span>
@@ -188,7 +188,8 @@
                 <template v-if="score.save">
                     <div  class="flex score-img" v-on:click.stop="">
                         <div class="img-item" v-for="item in score.scoreFieldValueList">
-                            <video v-if="item.fieldType == 2 && (item.scoreFieldValue.indexOf('mp4')> -1 ||item.scoreFieldValue.indexOf('mov') > -1)"
+                            <video v-if="item.fieldType == 2 && (item.scoreFieldValue.indexOf('mp4')> -1 ||
+                                                    item.scoreFieldValue.toLocaleLowerCase().indexOf('mov') > -1)"
                                    v-on:click="preview($event,item)" name="media" :src="item.scoreFieldValue" type="video/mp4"></video>
                             <img v-else v-on:click.stop=""
                                  v-on:click="preview($event,item)" class="img"
@@ -245,10 +246,12 @@
             </div>
         </div>
 
-        <div id="dialog" v-show="dialog" >
-            <div style="position: relative;"  class="preview">
-                <video v-if="previewItem.fieldType==2" v-bind:src="previewItem.previewImg" controls name="media" preload="none"></video>
-                <img v-else width="auto" height="100%" v-bind:src="previewItem.previewImg" alt="">
+        <div id="dialog" v-show="dialog" style="display: none">
+            <div class="dialog-content">
+                <div class="preview">
+                    <video width="100%" v-if="previewItem.fieldType==2" v-bind:src="previewItem.previewImg" controls name="media" preload="none"></video>
+                    <img width="100%" v-else width="auto" width="100%" v-bind:src="previewItem.previewImg" alt="">
+                </div>
                 <span v-on:click="closeDialog" class="iconClose"></span>
             </div>
         </div>
@@ -258,7 +261,7 @@
 <script src="${ctxStatic}/newdermon/vendor/popper.js/umd/popper.min.js"></script>
 <script src="${ctxStatic}/js/qikoo.js"></script>
 
-<script src="${ctxStatic}/js/score_review.js"></script>
+<script src="${ctxStatic}/js/score_review.js?<%=System.currentTimeMillis()%>"></script>
 
 
 </body>

src/main/webapp/WEB-INF/views/cmpt/sure-letter.jsp

@@ -148,6 +148,10 @@
                       }
                     },
                     save : function () {
+                        if(customerV.$data.letter.nameWeb.length == 0){
+                            layer.msg("功能名称不能为空！",{icon:5,duration:1500});
+                            return ;
+                        }
                         $.ajax({
                             url : '/gk/sure-letter/updateName',
                             data : customerV.$data.letter,

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

@@ -15,12 +15,11 @@
     .menu-item.active{
         color: #ce3939;
         opacity: 0.9;
+        box-shadow: 0px 0px 8px #ffdcdc;
+        border-radius: 4px;
     }
     .menu-sub-item.active {
-        border-left: #ce3939;
-        border-left-width: 4px;
-        border-left-style: solid;
-        background: rgba(206, 57, 57, 0.1);
+
     }
 
     .active span.menu-txt {
@@ -28,21 +27,26 @@
         font-weight: bold;
 
     }
-
+    .menu-hidden{
+        display: none;
+    }
     .left-arrow {
         background: url(/static/images/left_arrow.png) no-repeat;
-        width: 8px;
+        width: 30px;
         display: none;
-        height: 13px;
+        height: 30px;
         background-size: contain;
         position: absolute;
-        left: 62px;
-        top: 20px;
+        left: 26px;
+        top: 10px;
+        background-color: #ffffff!Important;
+        z-index: 99999;
     }
     .active .left-arrow{
         display: inline-block;
         background: url(/static/images/left_arrow_select.png) no-repeat;
-        background-size: contain;
+        background-size: 25%;
+        background-position: center;
     }
     .flex {
         display: flex;
@@ -62,7 +66,7 @@
         background: url(/static/images/manage/iconset_grey.png) no-repeat center;
         background-size: 50%;
         position: absolute;
-        left: 45px;
+        left: 25px;
         top: 6px;
     }
     .active .icon-xingxiang{
@@ -73,10 +77,10 @@
         width: 32px;
         height: 32px;
         display: inline-block;
-        background: url('/static/images/manage/func_white.png') no-repeat center;
+        background: url(/static/images/manage/func_white.png) no-repeat center;
         background-size: 50%;
         position: absolute;
-        left: 45px;
+        left: 25px;
         top: 6px;
     }
     .active .icon-function{
@@ -90,7 +94,7 @@
         background: url('/static/images/manage/base-setting.png') no-repeat center;
         background-size: 50%;
         position: absolute;
-        left: 45px;
+        left: 25px;
         top: 6px;
     }
     .menu-sub-item{
@@ -111,6 +115,33 @@
         font-size:16px;
         color: #999;
     }
+    .menu-sub-item:first-child::after{
+        content: "";
+        height: 29px;
+        width: 1px;
+        background: #ce3939;
+        position: absolute;
+        left: 43px;
+        top: 20px;
+    }
+    .menu-sub-item:last-child::after{
+        content: "";
+        height: 29px;
+        width: 1px;
+        background: #ce3939;
+        position: absolute;
+        left: 43px;
+        top: 0px;
+    }
+    .menu-sub-item::after{
+        content: "";
+        height: 49px;
+        width: 1px;
+        background: #ce3939;
+        position: absolute;
+        left: 43px;
+        top: 0px;
+    }
 </style>
 <input type="hidden" value="${cmpt.cmptId}" id="cmpt">
 <input type="hidden" value="${uId}" id="uId">
@@ -125,8 +156,8 @@
                 <span class="menu-txt">形象管理</span>
             </a>
         </li>
-        <ul style="padding: 0px">
-            <li class="cmptSetting menu-item">
+        <ul style="padding: 0px;margin: 15px 0px;">
+            <li id="cmptSetting" class="cmptSetting menu-item">
                 <a href="/gk/cmpt/cmptSetting/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
                     <span class="icon-function"></span>
                     <span class="menu-txt">功能管理</span>
@@ -141,7 +172,7 @@
                     </a>
                 </li>
 
-                <li class="news menu-item menu-sub-item ">
+                <li class="news  menu-sub-item ">
                     <a href="/gk/news/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
                         <span class="left-arrow"></span>
                         <span class="menu-txt">赛事公告</span>
@@ -215,15 +246,15 @@
             </ul>
         </li>
         </ul>
-        <ul>
-            <li class="base menu-item">
-                <a href="#">
+        <ul style="padding: 0px 0;">
+            <li id="base" class="base menu-item" style="cursor: pointer">
+                <a>
                     <span class="icon-base-setting"></span>
                     <span class="menu-txt">基础设置</span>
                     <span class="arrow"></span>
                 </a>
             </li>
-            <ul  style="padding: 0px">
+            <ul style="padding: 0px">
                 <li class="road menu-sub-item">
                     <a href="/gk/road/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
                         <span class="left-arrow"></span>
@@ -266,22 +297,38 @@
     var classes = ['cmptSetting', 'nameList', 'manual', 'contact','manage',
                     'route', 'road', 'equip', 'photo', 'news','cert','data',
                     'banner','score','auto','scan','review','customer','rule',
-    'outter-link','sure-letter'];
+                    'outter-link','sure-letter'];
     let url = document.location.href;
     var done = false;
     for (var i in classes) {
         if (url.indexOf(classes[i]) > -1) {
             document.getElementsByClassName(classes[i])[0].classList.add('active');
             if(classes[i] != 'cmptSetting'){
+                let classesStr = document.getElementsByClassName(classes[i])[0].parentNode.parentNode.firstElementChild.classList;
                 document.getElementsByClassName(classes[i])[0].parentNode.parentNode.firstElementChild.classList.add('active');
+                if(classesStr.contains('cmptSetting')){
+                    document.getElementById('base').nextSibling.nextSibling.classList.add('menu-hidden');
+                }else{
+                    document.getElementById('cmptSetting').nextSibling.nextSibling.classList.add('menu-hidden');
+                }
+            }else{
+                document.getElementById('cmptSetting').nextSibling.nextSibling.classList.remove('menu-hidden');
+                document.getElementById('base').nextSibling.nextSibling.classList.add('menu-hidden');
             }
             done = true;
             break;
         }
+
     }
+    document.getElementById('base').addEventListener('click',function () {
+        document.getElementById('base').nextSibling.nextSibling.classList.remove('menu-hidden');
+        document.getElementById('cmptSetting').nextSibling.nextSibling.classList.add('menu-hidden');
+    });
     if (!done) {
         var classList = document.getElementsByClassName('main')[0].classList;
         classList.add('active');
+        document.getElementById('base').nextSibling.nextSibling.classList.add('menu-hidden');
+        document.getElementById('cmptSetting').nextSibling.nextSibling.classList.add('menu-hidden');
     }
 
     function getCmptId() {

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

@@ -95,7 +95,7 @@ input[type=checkbox] {
     border-bottom: none;
 }
 input.score-input{
-    width: 100px;
+    width: 110px;
     height: 40px;
     background: whitesmoke;
 }
@@ -126,12 +126,13 @@ input.score-input-bigger{
     border-right: 1px solid rgba(229,229,229,1);
 }
 .data-cloumn{
-    padding: 0px 20px;
+    padding: 0px 0px;
+    display: flex;
 }
 
 .data-cloumn>span,.score-info>span{
     display: inline-block;
-    width: 110px;
+    width: 117px;
     height: 45px;
     line-height: 45px;
     font-size:16px;
@@ -144,7 +145,7 @@ input.score-input-bigger{
 .score-item{
     background:rgba(250,250,250,1);
     border-radius:4px;
-    padding: 0px 20px;
+    padding: 0px 0px;
     margin-bottom: 10px;
 }
 .score-info{
@@ -211,13 +212,22 @@ input.score-input-bigger{
     border:1px solid rgba(229,229,229,1);
 }
 .preview{
-    max-width: 80%;
-    height: 80%;
+    max-width: 800px;
+    height: 100%;
     margin: auto;
     position: relative;
     padding: 20px;
     background: white;
     z-index: 9999;
+    overflow: scroll;
+    overflow-x: hidden;
+    width: 100%;
+    text-align: center;
+}
+.preview::-webkit-scrollbar {
+    width: 4px;
+    height: 4px;
+    background-color: #f1f1f1;
 }
 #dialog{
     display: none;
@@ -227,7 +237,22 @@ input.score-input-bigger{
     position: fixed;
     width: 100%;
     height: 100%;
-    top: 0px;left: 0px;background: rgba(0,0,0,0.4);z-index: 99
+    top: 0px;
+    left: 0px;
+    background: rgba(0,0,0,0.4);
+    z-index: 99;
+}
+.dialog-content{
+    position: relative;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+    width: 80%;
+    height: 80%;
+    top: 0px;
+    left: 0px;
+    max-width: 800px;
+    z-index: 99;
 }
 .select{
     text-transform: none;
@@ -297,9 +322,9 @@ input.score-input-bigger{
     background-image: url(/static/images/close-red.png);
     background-position: center;
     background-repeat: no-repeat;
-    right: -10px;
-    z-index: 100;
-    top: -10px;
+    right: -17px;
+    z-index: 100000;
+    top: -15px;
     border-radius: 50%;
     background-color: white;
     cursor: pointer;
@@ -332,7 +357,7 @@ input.score-input-bigger{
 }
 .search-btn-text{
     display: inline-block;
-    width: 80px;
+    width: 100px;
     text-align: center;
     color: #333;
     cursor: pointer;
@@ -343,7 +368,7 @@ input.score-input-bigger{
 }
 .search-ipt{
     border: 0px;
-    width: 340px;
+    width: 300px;
     height: 46px;
 }
 .export-btn{

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

@@ -63,6 +63,7 @@ input[type=checkbox]::before {
 
 .disabled input[type=checkbox]::before {
     background-color: #d8d8d8 !important;
+    border: 2px solid #d8d8d8!important;
 }
 
 input[type=checkbox]:checked::before {
@@ -326,12 +327,13 @@ input[type=checkbox]:checked::before {
 .mod-dialog {
     background-color: #fff;
     border-top: none;
-    width: 580px;
-    height: 256px;
-    *padding-top: 27px;
+    width: 480px;
+    height: 226px;
+    padding-top: 27px;
     position: absolute;
     z-index: 1001;
     margin-top: -20px;
+    border-radius: 4px;
 }
 
 .mod-inputdialog {
@@ -393,7 +395,7 @@ input[type=checkbox]:checked::before {
 
 .mod-dialog .dialog-main {
     font-size: 14px;
-    padding: 45px;
+    padding: 35px;
     /*text-align: center;*/
 }
 
@@ -495,25 +497,29 @@ input[type=checkbox]:checked::before {
 
 .mod-dialog .dialog-console .console-btn-confirm {
     background: #ce3939 repeat-x;
-    width: 146px;
+    width: 120px;
     height: 42px;
     color: #fff;
     text-align: center;
-    font-size: 20px;
+    font-size: 18px;
     margin-top: -6px;
     line-height: 42px;
     margin-left: 12px;
+    border-radius: 4px;
+    letter-spacing: 4px;
 }
 
 .mod-dialog .dialog-console .console-btn-cancel {
     background: #949494 repeat-x;
-    width: 146px;
+    width: 116px;
     height: 42px;
     color: #fff;
     text-align: center;
-    font-size: 20px;
+    font-size: 18px;
     margin-top: -6px;
     line-height: 42px;
+    border-radius: 4px;
+    letter-spacing: 4px;
 }
 
 .mod-pop .pop-close:hover {

src/main/webapp/static/js/cmptManual.js

@@ -59,9 +59,6 @@ $(function () {
                 //确认
                 $.ajax({
                     url: '/gk/cmpt/manual/delManual?id=' + id, /*接口域名地址*/
-                    type: 'post',
-                    contentType: 'application/json',
-                    processData: false,
                     success: function (res) {
                         parent.remove();
                         console.log(res);

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

@@ -143,7 +143,7 @@ var score = new Vue({
             let miles = parent.find('.miles').val();
             let duration = parent.find('.duration').val();
 
-            let time = Number(duration.split(':')[0]*3600)+Number(duration.split(':')[1]+60)+Number(duration.split(':')[2]);
+            let time = Number(duration.split(':')[0]*3600)+Number(duration.split(':')[1]*60)+Number(duration.split(':')[2]);
             let param = {};
             param.cmptId = scoreObj.cmptId;
             param.roadId= score.$data.selectedRoadId;
@@ -225,17 +225,21 @@ var score = new Vue({
                 layer.msg("请选择行进行删除！",{icon:5})
                 return;
             }
-            $.ajax({
-                url : baseURL+'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();
+            qikoo.dialog.confirm('确认要删除？',function () {
+                $.ajax({
+                    url : baseURL+'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();
+                        }
                     }
-                }
-            })
+                })
+            },function () {
+
+            });
         }
 
     }
@@ -417,4 +421,15 @@ function calculateDuration() {
     var min = duration.split(':')[1]*60;
     var sec = duration.split(':')[2];
     scoreObj.subsectionscore = Number(hour)+Number(min)+Number(sec);
+}
+
+function calculateDate() {
+    let date = $($dp.el).val();
+    var scoreId = $($dp.el).attr('scoreId');
+    var scoreObj = score.getScoreById(scoreId);
+    var dateStr =  date+" 00:00:00";
+    scoreObj.subsectionTime = dateStr;
+}
+function del () {
+    
 }
\ No newline at end of file

src/main/webapp/static/newdermon/css/style.default.css

@@ -470,6 +470,8 @@ nav.side-navbar ul {
 
 nav.side-navbar ul li {
     height: 49px;
+    margin: auto;
+    width: 200px;
     list-style: none;
 }
 
@@ -489,94 +491,94 @@ nav.side-navbar ul li a {
 }
 
 nav.side-navbar ul li a:hover {
-    background: rgba(196, 196, 196, 0.3);
-    color: #fff;
+/*background: rgba(196, 196, 196, 0.3);*/
+color: #fff;
 }
 
 nav.side-navbar ul li li a {
-    padding-left: 50px;
-    background: #f6f6f6;
+padding-left: 50px;
+background: #f6f6f6;
 }
 
 nav.side-navbar ul li.menu-sub-item.active > a {
-    color: rgba(206, 57, 57, 1);
+color: rgba(206, 57, 57, 1);
 }
 
 nav.side-navbar ul li.active > a:hover {
-    background: rgba(196, 196, 196, 0.3);
+/*background: rgba(196, 196, 196, 0.3);*/
 }
 
 nav.side-navbar ul li li.active > a {
-    background: rgba(196, 196, 196, 0.3);
+background: rgba(196, 196, 196, 0.3);
 }
 
 nav.side-navbar ul li ul {
-    padding: 0;
+padding: 0;
 }
 
 nav.side-navbar.shrinked {
-    min-width: 90px;
-    max-width: 90px;
-    text-align: center;
+min-width: 90px;
+max-width: 90px;
+text-align: center;
 }
 
 nav.side-navbar.shrinked span.heading {
-    margin: 0;
+margin: 0;
 }
 
 nav.side-navbar.shrinked ul li a {
-    padding: 15px 2px;
-    border: none;
-    font-size: 0.8em;
-    color: #aaa;
-    -webkit-transition: color 0.3s, background 0.3s;
-    transition: color 0.3s, background 0.3s;
+padding: 15px 2px;
+border: none;
+font-size: 0.8em;
+color: #aaa;
+-webkit-transition: color 0.3s, background 0.3s;
+transition: color 0.3s, background 0.3s;
 }
 
 nav.side-navbar.shrinked ul li a[data-toggle="collapse"]::before {
-    content: '\f107';
-    -webkit-transform: translateX(50%);
-    transform: translateX(50%);
-    position: absolute;
-    top: auto;
-    right: 50%;
-    bottom: 0;
-    left: auto;
+content: '\f107';
+-webkit-transform: translateX(50%);
+transform: translateX(50%);
+position: absolute;
+top: auto;
+right: 50%;
+bottom: 0;
+left: auto;
 }
 
 nav.side-navbar.shrinked ul li a[data-toggle="collapse"][aria-expanded="true"]::before {
-    content: '\f106';
+content: '\f106';
 }
 
 nav.side-navbar.shrinked ul li a:hover {
-    color: #fff;
-    border: none;
+color: #fff;
+border: none;
 }
 
 nav.side-navbar.shrinked ul li a:hover i {
-    color: #fff;
+color: #fff;
 }
 
 nav.side-navbar.shrinked ul li a i {
-    margin-right: 0;
-    margin-bottom: 2px;
-    display: block;
-    font-size: 1rem;
-    color: #333;
-    -webkit-transition: color 0.3s;
-    transition: color 0.3s;
+margin-right: 0;
+margin-bottom: 2px;
+display: block;
+font-size: 1rem;
+color: #333;
+-webkit-transition: color 0.3s;
+transition: color 0.3s;
 }
 
 nav.side-navbar.shrinked ul li.active > a {
-    color: #fff;
+color: #fff;
 }
 
 nav.side-navbar.shrinked ul li.active > a i {
-    color: #fff;
+color: #fff;
 }
 
 nav.side-navbar.shrinked .sidebar-header .title {
-    display: none;
+display: none;
 }
 
 /* SIDEBAR MEDIAQUERIES ----------------------------------- */
@@ -2844,7 +2846,6 @@ a {
 
 a:focus, a:hover {
     color: #3b25e6;
-    text-decoration: underline;
 }
 
 h1,