|
@@ -113,8 +113,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="grade_item">
|
|
|
-<!-- {{ item.syntheticTaskScore }}-->
|
|
|
- {{ Number(item.syntheticTaskScore).toFixed(2) }}
|
|
|
+ {{item.syntheticTaskScore==null?'-':Number(item.syntheticTaskScore).toFixed(2)}}
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="task_date_box">
|
|
@@ -193,8 +192,7 @@
|
|
|
{{ item.subjectName ||'-' }}
|
|
|
</div>
|
|
|
<div class="SubjectNumber_style" style="color: #F1D73A;">
|
|
|
-<!-- {{ item.overallScore || '-' }}-->
|
|
|
- {{ Number(item.overallScore).toFixed(2) || '-' }}
|
|
|
+ {{item.overallScore==null?'-':Number(item.overallScore).toFixed(2)}}
|
|
|
</div>
|
|
|
<div class="orgainzers">
|
|
|
参与人员:{{ item.participatingPeople && item.participatingPeople.join(',') || '-' }}
|
|
@@ -770,7 +768,6 @@ export default {
|
|
|
console.log("动态计算当前页的数据",this.gridData2)
|
|
|
const start = (this.gridData2.currentPage - 1) * this.gridData2.pageSize
|
|
|
const end = start + this.gridData2.pageSize
|
|
|
- // if(this.gridData.data!=null){
|
|
|
if(this.gridData2.data.length!=0){
|
|
|
return this.gridData2.data.slice(start, end)
|
|
|
}else{
|
|
@@ -779,13 +776,13 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods:{
|
|
|
+ /**
|
|
|
+ * 保留两位小数
|
|
|
+ */
|
|
|
formatScore(score) {
|
|
|
- // score = Number(
|
|
|
- // console.log("score1",score)
|
|
|
if (isNaN(score)) {
|
|
|
return score;
|
|
|
}
|
|
|
- // console.log("score3",score.toFixed(2))
|
|
|
return Number(score).toFixed(2);
|
|
|
},
|
|
|
/**
|
|
@@ -1285,9 +1282,11 @@ export default {
|
|
|
this.wholeOutTaskId = data[0].taskId
|
|
|
this.currentTaskName = data[0].taskName
|
|
|
|
|
|
- // this.currentTaskGrade = 14.77777777
|
|
|
- this.currentTaskGrade = Number(data[0].syntheticTaskScore).toFixed(2)
|
|
|
- // this.currentTaskGrade = Number(this.currentTaskGrade).toFixed(2);
|
|
|
+ if(data[0].syntheticTaskScore==null){
|
|
|
+ this.currentTaskGrade = data[0].syntheticTaskScore
|
|
|
+ }else{
|
|
|
+ this.currentTaskGrade = Number(data[0].syntheticTaskScore).toFixed(2)
|
|
|
+ }
|
|
|
|
|
|
// 获取地图的信息
|
|
|
if (data.length) {
|
|
@@ -1380,8 +1379,11 @@ export default {
|
|
|
this.unitSubjectValue=''
|
|
|
this.currentTaskName = this.taskOPtion.find( item => item.value== this.wholeOutTaskId ).label
|
|
|
|
|
|
- this.currentTaskGrade = Number(this.taskList.find( item=> item.taskId==this.wholeOutTaskId).syntheticTaskScore).toFixed(2)
|
|
|
- // this.currentTaskGrade = Number(this.currentTaskGrade).toFixed(2);
|
|
|
+ if(this.taskList.find( item=> item.taskId==this.wholeOutTaskId).syntheticTaskScore==null){
|
|
|
+ this.currentTaskGrade = this.taskList.find( item=> item.taskId==this.wholeOutTaskId).syntheticTaskScore
|
|
|
+ }else{
|
|
|
+ this.currentTaskGrade = Number(this.taskList.find( item=> item.taskId==this.wholeOutTaskId).syntheticTaskScore).toFixed(2)
|
|
|
+ }
|
|
|
|
|
|
this.getUnitListByTaskId(this.wholeOutTaskId)
|
|
|
// 获取任务的系统列表
|