Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/examSystem-Anxin

src/app/examiner/create-test-score/create-test-score.component.html

@@ -21,7 +21,7 @@
                         </tr>
                         <tr style="cursor: pointer;" *ngFor="let item of unitId;let key = index" (click)="clickUnitName(key)" [ngClass]="{'selectedLi': key == selectedUnitIndex}">
                             <td>{{item.name}}</td>
-                            <td class="colorspan">{{item.score}}</td>
+                            <td class="colorspan">{{item.score}}+{{item.planScore || 0}}</td>
                         </tr>
                     </table>
                 </div>
@@ -285,7 +285,7 @@
                                     <td>{{item.isPublic ? '已公开' : '未公开'}}</td>
                                     <td>{{item.planLevel | planlevel}}</td>
                                     <td>
-                                        <input (input)="planItemScore()" type="number" [(ngModel)]="item.score">
+                                        <input onchange="if(!value)value=0" (input)="planItemScore()" type="number" [(ngModel)]="item.score">
                                     </td>
                                     <td *ngIf="!(pattern=='look')">
                                         <span style="color: #07CDCF;" (click)="edit(item)" >编辑</span>

src/app/examiner/create-test-score/create-test-score.component.ts

@@ -830,6 +830,7 @@ export class CreateTestScoreComponent implements OnInit {
           x += i.score
         })
       }
+      element.planScore = x
       examScore2 += Number(x) 
     })
     this.examScore = examScore + examScore2