添加 照片视频混合模式、线上bug处理

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

@@ -43,7 +43,7 @@
     <script src="${ctxStatic}/newdermon/js/jquery-ui.js"></script>
     <script type="text/javascript" charset="utf-8" src="${ctxStatic}/layer/layer.js"></script>
     <link rel="stylesheet" href="${ctxStatic}/layer/skin/layer.css">
-    <script src="${ctxStatic}/js/cmptSetting.js"></script>
+    <script src="${ctxStatic}/js/cmptSetting.js?<%=System.currentTimeMillis()%>"></script>
     <style>
         .tip-one {
             width: 21px;

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

@@ -121,6 +121,7 @@
                                     <select name="" id="" class="select">
                                         <option value="1" ${item.fieldType == 1?'selected':''}>照片</option>
                                         <option value="2" ${item.fieldType == 2?'selected':''}>视频</option>
+                                        <option value="4" ${item.fieldType == 4?'selected':''}>照片/视频</option>
                                     </select>
                                     <span class="down-arrow"></span>
                                 </div>

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

@@ -90,9 +90,9 @@
                     </div>
                 </div>
                 <div class="flex-vt select-section">
-                    <label>成绩</label>
-                    <div style="position: relative;">
-                        <select v-on:change="changeOrigin" class="select" v-model="selectedOrigin" name="">
+                    <label style="width: 100px;">成绩记录方式</label>
+                    <div style="position: relative;    width: 136px;">
+                        <select style="width: 120px;" v-on:change="changeOrigin" class="select" v-model="selectedOrigin" name="">
                             <option value="1" selected>提交成绩</option>
                             <option value="2">扫码打卡</option>
                             <option value="3">自动打卡</option>
@@ -150,7 +150,7 @@
                         <span class="check"><input v-on:click.stop="" type="checkbox" :value="score.cmptScoreRuleScoreinfoId" :checked="checked?'true':'' "></span>
                         <span v-text="score.name"></span>
                         <span v-text="score.markNo"></span>
-                        <span>{{score.insertTime | substr(10)}}</span>
+                        <span>{{score.updateTime | substr(10)}}</span>
                         <span>{{score.subsectionTime | substrDate(10)}}</span>
                         <span>{{Number(score.subsectionMileage/1000).toFixed(3)}}</span>
                         <span>{{score.subsectionscore | date_format}}</span>

src/main/webapp/static/js/cmptSetting.js

@@ -70,12 +70,12 @@ $(function () {
                         } else if (type == 12){
                             layer.alert("要启用此功能，请先在计时管理页面完成名单导入");
                         }else if (type == 15){
-                            layer.alert("要启用此功能，请先导入路线，且路线上至少有3个标注点");
+                            layer.alert("要启用此功能，请先导入路线，且路线上至少有2个标注点");
                             setTimeout(function () {
                                 window.location.href="/gk/road/index/"+getCmptId()+"?"+window.location.search;
                             },3000)
                         } else if (type == 16){
-                            layer.alert("要启用此功能，请先导入路线，且路线上至少有3个标注点");
+                            layer.alert("要启用此功能，请先导入路线，且路线上至少有2个标注点");
                             setTimeout(function () {
                                 window.location.href="/gk/road/index/"+getCmptId()+"?"+window.location.search;
                             },3000)

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

@@ -171,7 +171,7 @@ var score = new Vue({
                 })
             }
             $.ajax({
-               url: baseURL + "geexekscore/api/v1/cmpt-score-rule-scoreinfo/updateScore",
+               url: "/geexekscore/api/v1/cmpt-score-rule-scoreinfo/updateScore",
                contentType :'application/json',
                data: JSON.stringify(param),
                 type:"post",
@@ -189,7 +189,7 @@ var score = new Vue({
                 return ;
             }
             $.ajax({
-                url: baseURL + "geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreDetails?" +
+                url: "/geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreDetails?" +
                     "scoreId="+id+"&roadId="+score.$data.selectedRoadId+"&markNo="+markno,
                 success:function (data) {
                     if(data.code == 200){
@@ -227,7 +227,7 @@ var score = new Vue({
             }
             qikoo.dialog.confirm('确认要删除？',function () {
                 $.ajax({
-                    url : baseURL+'geexekscore/api/v1/cmpt-score-rule-scoreinfo/deleteScoreInfos',
+                    url : '/geexekscore/api/v1/cmpt-score-rule-scoreinfo/deleteScoreInfos',
                     data:{ids:delIds.join(",")},
                     type: 'post',
                     success:function (data) {
@@ -274,7 +274,7 @@ var reviewPage = {
         score.$data.param.origin = score.$data.selectedOrigin;
         score.$data.param.keyword = score.$data.searchWord;
         $.ajax({
-            url : baseURL+'geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreInfo',
+            url : '/geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreInfo',
             data:score.$data.param,
             type:'post',
             beforeSend:function(){
@@ -310,7 +310,7 @@ var reviewPage = {
     },
     getStatistic:function(){
             $.ajax({
-                url : baseURL+'geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreInfoStatistics?cmptId='+getCId()+'&roadId='+
+                url : '/geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreInfoStatistics?cmptId='+getCId()+'&roadId='+
                     score.$data.selectedRoadId
                     +'&origin='+ score.$data.selectedOrigin+"&keyword="+score.$data.searchWord,
                 type:'post',
@@ -346,7 +346,7 @@ var reviewPage = {
         var param = {cmptId : getCId(),'checkstatus':score.$data.param.checkstatus,
             roadId: score.$data.selectedRoadId,passedIds:passedIds.join(','),noPassedIds:noPassedIds.join(',')};
         $.ajax({
-            url : baseURL+'geexekscore/api/v1/cmpt-score-rule-scoreinfo/uploadCmptScoreRuleScoreInfo',
+            url : '/geexekscore/api/v1/cmpt-score-rule-scoreinfo/uploadCmptScoreRuleScoreInfo',
             data: param,
             beforeSend:function(){
                 layer.load();
@@ -384,7 +384,7 @@ $(document).ready(function () {
         });
     })
     $('.export-btn').click(function () {
-        window.open(baseURL+"geexekscore/api/v1/cmpt-score-rank/export/"+getCId())
+        window.open("/geexekscore/api/v1/cmpt-score-rank/export/"+getCId())
     })
     reviewPage.getRoads();
 });