[完善]考核队站修改

src/app/examiner/review-files/review-files.component.html

@@ -5,12 +5,16 @@
     <div class="left">
       <div class="headerLeft">
         <div>单位列表</div>
-        <div style="text-align: right;">总分: 
+        <div style="text-align: right;">总分:
           <label style="color: #07CDCF;">{{examScore}}</label>
         </div>
       </div>
-      <div class="centerLeft" style="background: #F5FDFE;"><div class="overflowText">单位名称</div><div class="overflowText">总分</div></div>
-      <div class="centerLeft" *ngFor="let item of paperCompanyData" [ngClass]="{'selectPaper': selectPaper.id == item.id}" (click)='togglePaper(item)'>
+      <div class="centerLeft" style="background: #F5FDFE;">
+        <div class="overflowText">单位名称</div>
+        <div class="overflowText">总分</div>
+      </div>
+      <div class="centerLeft" *ngFor="let item of paperCompanyData"
+        [ngClass]="{'selectPaper': selectPaper.id == item.id}" (click)='togglePaper(item)'>
         <div class="overflowText">{{item.companyInfo? item.companyInfo.name:'暂无单位名称'}}</div>
         <div class="overflowText">{{item.score}}+{{item.planScore}}</div>
       </div>
@@ -20,7 +24,7 @@
         <label (click)='togglePaperType(1)' [ngClass]="{'selectPaperType': selectPaperType == '1'}">基本信息</label>
         <label (click)='togglePaperType(2)' [ngClass]="{'selectPaperType': selectPaperType == '2'}">作战部署</label>
         <button (click)='submitResult()' style="width: 100px;" *ngIf="paperType==1">提交阅卷结果</button>
-        <label style="float: right;margin-right: 25px;opacity: 1;width: 150px;" *ngIf="selectPaperType == '1'">基本信息总分: 
+        <label style="float: right;margin-right: 25px;opacity: 1;width: 150px;" *ngIf="selectPaperType == '1'">基本信息总分:
           {{selectPaper.basicInfoTotalPoints+selectPaper.adjoinTotalPoints+selectPaper.importLocationTotalPoints+selectPaper.functionalDivisionTotalPoints+selectPaper.facilityTotalPoints}}分
         </label>
       </div>
@@ -32,21 +36,26 @@
             <mat-expansion-panel *ngIf="selectPaper.basicInfoData && selectPaper.basicInfoData.length">
               <mat-expansion-panel-header class="panelHeader">
                 <label class="mariginRight">基本信息</label>
-                <label>总分: <label class="mark"> {{selectPaper.basicInfoScore}}</label>分, </label><label>单项<label class="mark"> {{selectPaper.basicInfoItemScore}}</label>分</label>
-                <button class="headerButton" *ngIf="selectPaper.basicInfoScore == selectPaper.basicInfoTotalPoints && paperType==1">全部正确</button>
+                <label>总分: <label class="mark"> {{selectPaper.basicInfoScore}}</label>分, </label><label>单项<label
+                    class="mark"> {{selectPaper.basicInfoItemScore}}</label>分</label>
+                <button class="headerButton"
+                  *ngIf="selectPaper.basicInfoScore == selectPaper.basicInfoTotalPoints && paperType==1">全部正确</button>
               </mat-expansion-panel-header>
               <div class="publicTest" *ngFor="let item of selectPaper.basicInfoData;let itemkey = index">
                 <div class="publicTitle">{{item.name}}</div>
                 <div class="publicTable" *ngIf="item.tabledata && item.tabledata.length">
                   <div class="tableRow" *ngFor="let element of item.tabledata; let key = index">
-                    <div class="tabelHeader overflowText" title="{{element.propertyName}}">{{element.propertyName}}</div>
+                    <div class="tabelHeader overflowText" title="{{element.propertyName}}">{{element.propertyName}}
+                    </div>
                     <ng-container *ngFor="let elements of element.data">
-                      <div class="tabelCenter tableInput" *ngIf="rowIsShow(selectPaper.basicInfoData[itemkey].children,elements.tag)">
+                      <div class="tabelCenter tableInput"
+                        *ngIf="rowIsShow(selectPaper.basicInfoData[itemkey].children,elements.tag)">
                         <label *ngIf="key===0" class="overflowText">{{elements.result}}</label>
                         <input type="text" [(ngModel)]="elements.userAnswer" name="userAnswer" *ngIf="key!=0" readonly>
                         <mat-icon *ngIf="key!=0 && elements.isRight" class="rightWrong">done</mat-icon>
                         <mat-icon *ngIf="key!=0 && !elements.isRight" class="mistakeIcon rightWrong">clear</mat-icon>
-                        <mat-icon *ngIf="key!=0 && paperType==1" title="修改结果" (click)='editResults(elements)'>create</mat-icon>
+                        <mat-icon *ngIf="key!=0 && paperType==1" title="修改结果"
+                          (click)='editResults(elements)'>create</mat-icon>
                         <p *ngIf="key!=0 && paperType==1" class="rightKey">{{elements.result}}</p>
                       </div>
                     </ng-container>
@@ -54,10 +63,12 @@
                 </div>
                 <ng-container *ngIf="!item.tabledata || !item.tabledata.length">
                   <div class="publicInput" *ngFor="let element of item.children">
-                    <label>{{element.name}}:</label><input type="text" [(ngModel)]="element.userAnswer" name="userAnswer" readonly>
+                    <label>{{element.name}}:</label><input type="text" [(ngModel)]="element.userAnswer"
+                      name="userAnswer" readonly>
                     <mat-icon *ngIf="element.isRight">done</mat-icon>
                     <mat-icon class="mistakeIcon" *ngIf="!element.isRight">clear</mat-icon>
-                    <button class="modificationResults" (click)='editResults(element)' *ngIf="paperType==1">修改结果</button>
+                    <button class="modificationResults" (click)='editResults(element)'
+                      *ngIf="paperType==1">修改结果</button>
                     <p class="rightKey" *ngIf="paperType==1">{{element.result}}</p>
                   </div>
                 </ng-container>
@@ -68,13 +79,16 @@
             <mat-expansion-panel *ngIf="selectPaper.adjoinData && selectPaper.adjoinData.length">
               <mat-expansion-panel-header class="panelHeader">
                 <label class="mariginRight">四周毗邻</label>
-                <label>总分: <label class="mark"> {{selectPaper.adjoinScore}}</label>分, </label><label>单项<label class="mark"> {{selectPaper.adjoinItemScore}}</label>分</label>
-                <button class="headerButton" *ngIf="selectPaper.adjoinScore == selectPaper.adjoinTotalPoints && paperType==1">全部正确</button>
+                <label>总分: <label class="mark"> {{selectPaper.adjoinScore}}</label>分, </label><label>单项<label
+                    class="mark"> {{selectPaper.adjoinItemScore}}</label>分</label>
+                <button class="headerButton"
+                  *ngIf="selectPaper.adjoinScore == selectPaper.adjoinTotalPoints && paperType==1">全部正确</button>
               </mat-expansion-panel-header>
               <div class="publicTest" *ngFor="let item of selectPaper.adjoinData">
                 <div class="publicTitle">{{item.name}}</div>
                 <div class="publicInput" *ngFor="let element of item.children">
-                  <label>{{element.name}}:</label><input type="text" [(ngModel)]="element.userAnswer" name="userAnswer" readonly>
+                  <label>{{element.name}}:</label><input type="text" [(ngModel)]="element.userAnswer" name="userAnswer"
+                    readonly>
                   <mat-icon *ngIf="element.isRight">done</mat-icon>
                   <mat-icon class="mistakeIcon" *ngIf="!element.isRight">clear</mat-icon>
                   <button class="modificationResults" (click)='editResults(element)' *ngIf="paperType==1">修改结果</button>
@@ -87,20 +101,24 @@
             <mat-expansion-panel *ngIf="selectPaper.importLocationData && selectPaper.importLocationData.length">
               <mat-expansion-panel-header class="panelHeader">
                 <label class="mariginRight">重点部位</label>
-                <label>总分: <label class="mark"> {{selectPaper.importLocationScore}}</label>分, </label><label>单项<label class="mark"> {{selectPaper.importLocationItemScore}}</label>分</label>
-                <button class="headerButton" *ngIf="selectPaper.importLocationScore == selectPaper.importLocationTotalPoints && paperType==1">全部正确</button>
+                <label>总分: <label class="mark"> {{selectPaper.importLocationScore}}</label>分, </label><label>单项<label
+                    class="mark"> {{selectPaper.importLocationItemScore}}</label>分</label>
+                <button class="headerButton"
+                  *ngIf="selectPaper.importLocationScore == selectPaper.importLocationTotalPoints && paperType==1">全部正确</button>
               </mat-expansion-panel-header>
               <div class="publicTest" *ngFor="let item of selectPaper.importLocationData">
                 <div class="publicTitle">{{item.name}}</div>
                 <div class="publicTable">
                   <div class="tableRow" *ngFor="let element of item.tabledata; let key = index">
-                    <div class="tabelHeader overflowText" title="{{element.propertyName}}">{{element.propertyName}}</div>
+                    <div class="tabelHeader overflowText" title="{{element.propertyName}}">{{element.propertyName}}
+                    </div>
                     <div class="tabelCenter" *ngFor="let elements of element.data">
                       <label *ngIf="key===0" class="overflowText">{{elements.result}}</label>
                       <input type="text" [(ngModel)]="elements.userAnswer" name="userAnswer" *ngIf="key!=0" readonly>
                       <mat-icon *ngIf="key!=0 && elements.isRight">done</mat-icon>
                       <mat-icon *ngIf="key!=0 && !elements.isRight" class="mistakeIcon">clear</mat-icon>
-                      <mat-icon *ngIf="key!=0 && paperType==1" title="修改结果" (click)='editResults(elements)'>create</mat-icon>
+                      <mat-icon *ngIf="key!=0 && paperType==1" title="修改结果"
+                        (click)='editResults(elements)'>create</mat-icon>
                       <p *ngIf="key!=0 && paperType==1" class="rightKey">{{elements.result}}</p>
                     </div>
                   </div>
@@ -109,23 +127,28 @@
             </mat-expansion-panel>
             <!-- 重点部位 -->
             <!-- 功能分区 -->
-            <mat-expansion-panel *ngIf="selectPaper.functionalDivisionData && selectPaper.functionalDivisionData.length">
+            <mat-expansion-panel
+              *ngIf="selectPaper.functionalDivisionData && selectPaper.functionalDivisionData.length">
               <mat-expansion-panel-header class="panelHeader">
                 <label class="mariginRight">功能分区</label>
-                <label>总分: <label class="mark"> {{selectPaper.functionalDivisionScore}}</label>分, </label><label>单项<label class="mark"> {{selectPaper.functionalDivisionItemSocre}}</label>分</label>
-                <button class="headerButton" *ngIf="selectPaper.functionalDivisionScore == selectPaper.functionalDivisionTotalPoints && paperType==1">全部正确</button>
+                <label>总分: <label class="mark"> {{selectPaper.functionalDivisionScore}}</label>分,
+                </label><label>单项<label class="mark"> {{selectPaper.functionalDivisionItemSocre}}</label>分</label>
+                <button class="headerButton"
+                  *ngIf="selectPaper.functionalDivisionScore == selectPaper.functionalDivisionTotalPoints && paperType==1">全部正确</button>
               </mat-expansion-panel-header>
               <div class="publicTest" *ngFor="let item of selectPaper.functionalDivisionData">
                 <div class="publicTitle">{{item.name}}</div>
                 <div class="publicTable">
                   <div class="tableRow" *ngFor="let element of item.tabledata; let key = index">
-                    <div class="tabelHeader overflowText" title="{{element.propertyName}}">{{element.propertyName}}</div>
+                    <div class="tabelHeader overflowText" title="{{element.propertyName}}">{{element.propertyName}}
+                    </div>
                     <div class="tabelCenter" *ngFor="let elements of element.data">
                       <label *ngIf="key===0" class="overflowText">{{elements.result}}</label>
                       <input type="text" [(ngModel)]="elements.userAnswer" name="userAnswer" *ngIf="key!=0" readonly>
                       <mat-icon *ngIf="key!=0 && elements.isRight">done</mat-icon>
                       <mat-icon *ngIf="key!=0 && !elements.isRight" class="mistakeIcon">clear</mat-icon>
-                      <mat-icon *ngIf="key!=0 && paperType==1" title="修改结果" (click)='editResults(elements)'>create</mat-icon>
+                      <mat-icon *ngIf="key!=0 && paperType==1" title="修改结果"
+                        (click)='editResults(elements)'>create</mat-icon>
                       <p *ngIf="key!=0 && paperType==1" class="rightKey">{{elements.result}}</p>
                     </div>
                   </div>
@@ -137,13 +160,16 @@
             <mat-expansion-panel *ngIf="selectPaper.facilityData && selectPaper.facilityData.length">
               <mat-expansion-panel-header class="panelHeader">
                 <label class="mariginRight">数据核验</label>
-                <label>总分: <label class="mark"> {{selectPaper.facilityScore}}</label>分, </label><label>单项<label class="mark"> {{selectPaper.facilityItemScore}}</label>分</label>
-                <button class="headerButton" *ngIf="selectPaper.facilityScore == selectPaper.facilityTotalPoints && paperType==1">全部正确</button>
+                <label>总分: <label class="mark"> {{selectPaper.facilityScore}}</label>分, </label><label>单项<label
+                    class="mark"> {{selectPaper.facilityItemScore}}</label>分</label>
+                <button class="headerButton"
+                  *ngIf="selectPaper.facilityScore == selectPaper.facilityTotalPoints && paperType==1">全部正确</button>
               </mat-expansion-panel-header>
               <div class="publicTest" *ngFor="let item of selectPaper.facilityData">
                 <div class="publicTitle">{{item.name}}</div>
                 <div class="publicInput" *ngFor="let element of item.children">
-                  <label>{{element.name}}:</label><input type="text" [(ngModel)]="element.userAnswer" name="userAnswer" readonly>
+                  <label>{{element.name}}:</label><input type="text" [(ngModel)]="element.userAnswer" name="userAnswer"
+                    readonly>
                   <mat-icon *ngIf="element.isRight">done</mat-icon>
                   <mat-icon class="mistakeIcon" *ngIf="!element.isRight">clear</mat-icon>
                   <button class="modificationResults" (click)='editResults(element)' *ngIf="paperType==1">修改结果</button>
@@ -159,28 +185,28 @@
         <div class="paperCenter" *ngIf="selectPaperType == '2'">
           <div class="planList">
             <table>
-                <tr>
-                  <td>预案名称</td>
-                  <td>添加人</td>
-                  <td>修改时间</td>
-                  <td>编制级别</td>
-                  <td>得分</td>
-                  <td>状态</td>
-                  <td>操作</td>
-                </tr>
-                <tr *ngFor="let item of selectPaper.planList">
-                  <td>{{item.paperPlanInfo.title}}</td>
-                  <td>{{item.paperPlanInfo.creatorName}}</td>
-                  <td>{{item.paperPlanInfo.modifiedTime | date:'yyyy-MM-dd'}}</td>
-                  <td>{{item.paperPlanInfo.planLevel | planlevel}}</td>
-                  <td style="color: #FF8678;">{{item.score || '暂未评分'}}</td>
-                  <td>{{item.score ? '已阅' : '未阅'}}</td>
-                  <td>
-                    <span style="color: #07CDCF;" (click)="readExam(item,0)" *ngIf="paperType==1">阅卷</span>
-                    <span style="color: #07CDCF;" (click)="readExam(item,1)" *ngIf="paperType!=1">查看</span>
-                    <span style="color: #07CDCF;" (click)="editFraction(item)" >修改得分</span>
-                  </td>
-                </tr>
+              <tr>
+                <td>预案名称</td>
+                <td>添加人</td>
+                <td>修改时间</td>
+                <td>编制级别</td>
+                <td>得分</td>
+                <td>状态</td>
+                <td>操作</td>
+              </tr>
+              <tr *ngFor="let item of selectPaper.planList">
+                <td>{{item.paperPlanInfo.title}}</td>
+                <td>{{item.paperPlanInfo.creatorName}}</td>
+                <td>{{item.paperPlanInfo.modifiedTime | date:'yyyy-MM-dd'}}</td>
+                <td>{{item.paperPlanInfo.planLevel | planlevel}}</td>
+                <td style="color: #FF8678;">{{item.score || '暂未评分'}}</td>
+                <td>{{item.score ? '已阅' : '未阅'}}</td>
+                <td>
+                  <span style="color: #07CDCF;" (click)="readExam(item,0)" *ngIf="paperType==1">阅卷</span>
+                  <span style="color: #07CDCF;" (click)="readExam(item,1)" *ngIf="paperType!=1">查看</span>
+                  <span style="color: #07CDCF;" (click)="editFraction(item)" *ngIf="paperType==1">修改得分</span>
+                </td>
+              </tr>
             </table>
           </div>
           <div class="refresh" *ngIf="paperType==1">
@@ -193,5 +219,4 @@
     </div>
 
   </div>
-</div>
-
+</div>

src/app/student/student-exam-record/student-exam-record.component.html

@@ -22,7 +22,12 @@
                 <tr *ngFor="let item of tabledataSource">
                     <td>{{item.name}}</td>
                     <td>{{item.examineeName}}</td>
-                    <td>{{item.paperInfo.organizationsName}}</td>
+                    <td>
+                        <!-- {{item.paperInfo.organizationsName}} -->
+                        <span *ngFor="let item of item.paperInfo.organizationNames" style="margin: 0 2px;">
+                            {{item}}
+                        </span>
+                    </td>
                     <td>{{item.paperInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
                     <td style="color: #FF8678;">{{ item.totalScore && item.totalScore!=0 ? item.totalScore+'分' : '未阅卷'
                         }}</td>

src/app/student/student-index/student-index.component.html

@@ -20,7 +20,11 @@
             <tbody>
                 <tr *ngFor="let item of tabledataSource">
                     <td>{{item.title}}</td>
-                    <td>{{item.organizationsName}}</td>
+                    <td>
+                        <span *ngFor="let item of item.organizationNames" style="margin: 0 2px;">
+                            {{item}}
+                        </span>
+                    </td>
                     <td>{{item.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
                     <td>{{item.endTime|date:'yyyy-MM-dd HH:mm'}}</td>
                     <td>{{item.duration}}分钟</td>