修改成绩

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

@@ -94,6 +94,34 @@ input[type=checkbox] {
     color:rgba(206,57,57,1);
     border-bottom: none;
 }
+input.score-input{
+    width: 100px;
+    height: 40px;
+    background: whitesmoke;
+}
+input.score-input-bigger{
+    width: 120px;
+    height: 40px;
+    background: whitesmoke;
+}
+.icon-score-edit{
+    width: 16px;
+    height: 18px;
+    background: url(/static/images/manage/score-edit.png) no-repeat center;
+    background-size: contain;
+    background-position: center;
+}
+.icon-score-save{
+    width: 20px;
+    height: 16px;
+    background: url(/static/images/manage/icon-score-save.png) no-repeat center;
+    background-size: contain;
+    background-position: center;
+}
+.score-edit{
+    color: #ce3939!important;
+    font-size: 14px;
+}
 .tab .review-status:last-child{
     border-right: 1px solid rgba(229,229,229,1);
 }
@@ -101,26 +129,29 @@ input[type=checkbox] {
     padding: 0px 20px;
 }
 
-.data-cloumn  span,.score-info span{
+.data-cloumn>span,.score-info>span{
     display: inline-block;
-    width: 120px;
+    width: 110px;
     height: 45px;
     line-height: 45px;
     font-size:16px;
     color:rgba(153,153,153,1);
 }
-.data-cloumn span:last-child,.score-info span:last-child{
-    width: 50px;
+.data-cloumn>span:last-child,.score-info>span:last-child{
+    width: 62px;
     text-align: center;
 }
 .score-item{
     background:rgba(250,250,250,1);
     border-radius:4px;
     padding: 0px 20px;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
 }
 .score-info{
     border-bottom: 1px solid rgba(221,221,221,1);
+    height: 45px;
+    line-height: 45px;
+    display: flex;
 }
 .score-info span{
     color:rgba(51,51,51,1);

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

+var baseURL = 'http://localhost:8081/'
 var score = new Vue({
     el : '#score',
     data : {
@@ -32,14 +33,18 @@ var score = new Vue({
     },
     filters: {
         substr:function(value,length){
-            console.log(value+","+length)
             if(!value || value.length < 18) return "";
             return value.substr(5,5)+" "+value.substr(11,5);
         },
         substrYear:function(value){
             if(!value) return "";
-            var date = new Date(value);
-            return date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+":"+date.getSeconds();
+            let date = new Date(value);
+            let month = (date.getMonth()+1) < 10 ? "0"+(date.getMonth()+1) : (date.getMonth()+1);
+            let day = (date.getDate()) < 10 ? "0"+(date.getDate()) : date.getDate();
+            let hour = date.getHours() < 10 ? "0"+(date.getHours()) : date.getHours();
+            let min = date.getMinutes() < 10 ?  "0"+(date.getMinutes()) : date.getMinutes();
+            let sec = date.getSeconds() < 10  ?  "0"+(date.getSeconds()) : date.getSeconds();
+            return month+"-"+day+" "+hour+":"+min+":"+sec;
         },
         substrDate:function(value,length){
             if(!value || value.length < 18) return "";
@@ -64,6 +69,9 @@ var score = new Vue({
         }
     },
     methods:{
+        changeScoreStatus:function(score){
+            score.save = !score.save;
+        },
         closeDialog:function(){
             score.$data.dialog = false;
         },
@@ -82,7 +90,6 @@ var score = new Vue({
             score.$data.checked = !score.$data.checked
         },
         changeRoad:function () {
-            console.log(score.$data.selectedRoadId);
             score.$data.jumpToPage = 1;
             score.$data.param.page = 0;
             reviewPage.reloadPage();
@@ -93,7 +100,6 @@ var score = new Vue({
             reviewPage.reloadPage();
         },
         changeOrigin:function () {
-            console.log(score.$data.selectedOrigin);
             reviewPage.reloadPage();
         },
         next:function () {
@@ -126,13 +132,61 @@ var score = new Vue({
             });
             return obj;
         },
-        showDetail:function(id,event){
+        saveScoreDetail:function(scoreObj,event){
+            scoreObj.save = !scoreObj.save;
+            let parent = $(event.target).parents('.score-info');
+            let doneTime = parent.find('.doneTime').val();
+            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 param = {};
+            param.cmptId = scoreObj.cmptId;
+            param.roadId= score.$data.selectedRoadId;
+            param.markNo= scoreObj.markNo;
+            param.scoreId = scoreObj.cmptScoreRuleScoreinfoId;
+            param.duration = time;
+            param.doneTime = doneTime+" 00:00:00";
+            param.miles = miles*1000;
+            console.log(JSON.stringify(param));
+            if(score.$data.selectedOrigin != 1){
+                let details = parent.siblings('.score-detail');
+                let trs = details.find('tbody tr');
+                param.details = [];
+                $.each(trs,function (i,e) {
+                    let detail = {};
+                    let checkPointId= $(e).attr('checkpointid');
+                    let checkpointTimeId = $(e).attr('checkpointtimeid');
+                    let time = $(e).find('input').val();
+                    detail.checkPointId = checkPointId;
+                    detail.checkpointTimeId = checkpointTimeId;
+                    if(time){
+                        detail.time = new Date().getFullYear() + "-"+ time;
+                        param.details.push(detail)
+                    }
+                })
+            }
+            $.ajax({
+               url: baseURL + "geexekscore/api/v1/cmpt-score-rule-scoreinfo/updateScore",
+               contentType :'application/json',
+               data: JSON.stringify(param),
+                type:"post",
+               success:function (data) {
+                    if(data.code == 200){
+                        console.log(data);
+                    }
+               }
+            });
+        },
+        showDetail:function(id,event,markno){
+            if(score.$data.selectedOrigin == 1) return;
             if($(event.currentTarget).find('.score-detail-item').length > 0){
                 score.getScoreById(id).scoreDetails = [];
                 return ;
             }
             $.ajax({
-                url:baseURL+"geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreDetails?scoreId="+id,
+                url: baseURL + "geexekscore/api/v1/cmpt-score-rule-scoreinfo/getCmptScoreRuleScoreDetails?" +
+                    "scoreId="+id+"&roadId="+score.$data.selectedRoadId+"&markNo="+markno,
                 success:function (data) {
                     if(data.code == 200){
                         if(data.data.length == 0){
@@ -222,6 +276,7 @@ var reviewPage = {
                 if(data.code == 200){
                     $.each( data.data.records,function (i,e) {
                         e.scoreDetails = [];
+                        e.save = true;
                     });
                     score.$data.scores = data.data.records;
                     score.$data.totalPage = data.data.total;