From ac55bd9f10ef3de033e99d5a9640e6c796d1e35e Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 15 Dec 2020 15:57:17 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create-test-score.component.html          |  8 ++--
 .../create-test-score.component.ts            | 38 +++++++++++--------
 .../collection-tools.component.html           |  4 +-
 src/app/ui/collection-tools/panel.scss        |  2 +-
 src/styles.scss                               |  8 +++-
 5 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/app/examiner/create-test-score/create-test-score.component.html b/src/app/examiner/create-test-score/create-test-score.component.html
index 7299db5..4a5b95b 100644
--- a/src/app/examiner/create-test-score/create-test-score.component.html
+++ b/src/app/examiner/create-test-score/create-test-score.component.html
@@ -36,7 +36,7 @@
                     </div>
                 </div>
                 <div class="maincontantbox">
-                    <div class="basicinfodiv" *ngIf="selectedTab == 1">
+                    <div class="basicinfodiv"  [hidden]="!(selectedTab == 1)">
                         <div *ngFor="let unit of unitId;let key = index">
                             <div [hidden]="!(key == selectedUnitIndex)">
                                 <!-- 选择的单位名称 -->
@@ -257,7 +257,7 @@
                             
                         </div>
                     </div>
-                    <div class="fightdeploydiv" *ngIf="selectedTab == 2">
+                    <div class="fightdeploydiv" [hidden]="!(selectedTab == 2)">
                         <div class="addPlan" (click)="addPlan()">
                             <mat-icon style="vertical-align: text-top">add_circle_outline</mat-icon>添加预案
                         </div>
@@ -282,8 +282,8 @@
                                         <input (input)="planItemScore(item)" type="number" [(ngModel)]="item.score">
                                     </td>
                                     <td>
-                                        <span style="color: #07CDCF;">编辑</span>
-                                        <span style="color: #FF8678;">删除</span>
+                                        <span style="color: #07CDCF;" (click)="edit(item)">编辑</span>
+                                        <span style="color: #FF8678;" (click)="deletePlan(item)">删除</span>
                                     </td>
                                 </tr>
                             </table>
diff --git a/src/app/examiner/create-test-score/create-test-score.component.ts b/src/app/examiner/create-test-score/create-test-score.component.ts
index 07bf7ad..0b073ba 100644
--- a/src/app/examiner/create-test-score/create-test-score.component.ts
+++ b/src/app/examiner/create-test-score/create-test-score.component.ts
@@ -20,7 +20,10 @@ export class CreateTestScoreComponent implements OnInit {
   constructor(private router:Router,public dialog: MatDialog,private http: HttpClient,public snackBar: MatSnackBar) { }
   selectedTab:number = 1 //选中的选项卡
   selectTab(index){
-    this.selectedTab = index
+    setTimeout(() => {
+      this.selectedTab = index
+    }, 0);
+   
   }
   ngOnInit(): void {
     for (let y = 0, length = this.unitId.length; y < length; y++){
@@ -279,7 +282,6 @@ export class CreateTestScoreComponent implements OnInit {
   async getKeySite(){
     let that = this
     for (let y = 0, length = this.unitId.length; y < length; y++){
-      console.log("xiba")
       let element = this.unitId[y]
      
       //获得单位重点部位
@@ -531,13 +533,6 @@ export class CreateTestScoreComponent implements OnInit {
   stopPropagation($event){
     $event.stopPropagation()
   }
-  //模拟预案数据
-  planDatas:any = [
-    {name:'5楼电路故障灾情扑救',or:'上海总队',time:'2020-09-24',isOpen:'未公开',level:'总队',score:0},
-    {name:'6楼电路故障灾情扑救',or:'上海总队',time:'2020-09-24',isOpen:'未公开',level:'总队',score:0},
-    {name:'7楼电路故障灾情扑救',or:'上海总队',time:'2020-09-24',isOpen:'未公开',level:'总队',score:0}
-  ]
-
   defaultCheckedKeys = []; //指定选中复选框的树节点 key值
   defaultExpandedKeys = []; //展开指定的树节点 key值
   defaultSelectedKeys = []; //指定选中的树节点 key值
@@ -550,11 +545,6 @@ export class CreateTestScoreComponent implements OnInit {
   calculateScore(key){
     //key代表第几个建筑
     //计算整个单位的总分
-    // console.log(this.unitId[key].basicInfoScore)
-    // console.log(this.unitId[key].aroundScore)
-    // console.log(this.unitId[key].keySiteScore)
-    // console.log(this.unitId[key].funDivScore)
-    // console.log(this.unitId[key].fireFacScore)
     this.unitId[key].score = this.unitId[key].basicInfoScore + this.unitId[key].aroundScore + this.unitId[key].keySiteScore + this.unitId[key].funDivScore + this.unitId[key].fireFacScore  
 
    //计算整个试卷的总分
@@ -760,7 +750,25 @@ export class CreateTestScoreComponent implements OnInit {
     })
     this.examScore = examScore + examScore2
   }
-
+  //编辑每条预案试卷
+  edit(item){
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
+    this.snackBar.open('暂不能编辑','确定',config);
+  }
+  //删除每条预案试卷
+  deletePlan(item){
+    this.unitId[this.selectedUnitIndex].planList.forEach((element,key)=>{
+      if(item == element){
+        this.unitId[this.selectedUnitIndex].planList.splice(key,1)
+      }
+    })
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
+    this.snackBar.open('删除成功','确定',config);
+  }
   //保存
   save(){
      let copyDatas = JSON.parse(JSON.stringify(this.unitId))
diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html
index 32493aa..4760694 100644
--- a/src/app/ui/collection-tools/collection-tools.component.html
+++ b/src/app/ui/collection-tools/collection-tools.component.html
@@ -104,7 +104,7 @@
             <!-- 消防列表树 -->
             <mat-tree [dataSource]="dataSource" [treeControl]="treeControl" cdkDropList [cdkDropListData]="dataSource" (cdkDropListDropped)="drop($event)">
 
-              <mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern}" *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)" class="treeNode">
+              <mat-tree-node   [ngClass]="{'isLookPattern': !node.isLookPattern}" *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)" class="treeNode">
                 <button mat-icon-button disabled></button>
                 <span title="{{node.name}}" [ngClass]="{'treeText': !node.isTemplate}">
                   {{node.name}}      
@@ -113,7 +113,7 @@
                 <span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">check_circle_outline</mat-icon></span>
               </mat-tree-node>
 
-              <mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)"class="treeNode" >
+              <mat-tree-node  [ngClass]="{'isLookPattern': !node.isLookPattern}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)"class="treeNode" >
                 <button mat-icon-button 
                         matTreeNodeToggle
                         [attr.aria-label]="'toggle ' + node.name">
diff --git a/src/app/ui/collection-tools/panel.scss b/src/app/ui/collection-tools/panel.scss
index 2e03c82..245e998 100644
--- a/src/app/ui/collection-tools/panel.scss
+++ b/src/app/ui/collection-tools/panel.scss
@@ -13,7 +13,7 @@
   flex-direction: row;
   align-items: center;
   padding: 0 24px;
-  border-radius: 5px;
+  // border-radius: 5px;
   font-family: Roboto, "Helvetica Neue", sans-serif;
   font-size: 15px;
   font-weight: 400;
diff --git a/src/styles.scss b/src/styles.scss
index 20e211e..16022e1 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -98,11 +98,17 @@ table td.mat-footer-cell:last-of-type{
 }
 
 //可展开面板按钮颜色
-#createtestscore{
+#createtestscore,#materialBank{
 	.mat-expansion-indicator::after {
 		color: #333333;
 	}
 }
+#materialBank{
+	.mat-expansion-panel-header{
+		background-color: #d6f4f5
+	}
+}
+
 //弹出框样式取消padding
 #addPlanTwo,#lookTreeNode{
 	padding: 0;