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

src/app/canvas-share-data.service.ts

@@ -8,11 +8,10 @@ import { GameMode } from './working-area/model/gameMode';
 export class CanvasShareDataService {
   constructor() { }
   private _sendMessage: ReplaySubject<any> = new ReplaySubject<any>(1);
-  GameMode: any;
 
   isChange = false; // 数据 是否改动
 
-  selectTemplateData: any; // 选择当前 模板数据
+  selectTemplateData: any; // 选择当前 素材库模板数据
 
   // 总平面图/建筑 楼层
   selectStorey: any = {area: '', details: ''}; // 选择当前 楼层 数据

src/app/ui/collection-tools/collection-tools.component.html

@@ -4,7 +4,6 @@
     <div class="headerTitle">{{examMsg.conpanyName}}</div>
     <div class="headerCenter"> <input type="text" placeholder="请输入考试要点" [(ngModel)]="examMsg.keynote"> </div>
     <div class="headerRight">
-      <label class="fraction">总分<input type="text" [(ngModel)]="examMsg.grade">分</label>
       <button style="border: 1px solid #07CDCF; border-radius: 5px; margin: 0 15px;" (click)='openFireExamination()'><mat-icon>visibility</mat-icon>消防设施考题设定</button>
       <button (click)="saveSite()"><mat-icon>description</mat-icon>保存</button>
       <button (click)="openUploadQuestions()"><mat-icon>open_in_browser</mat-icon>上传</button>
@@ -19,16 +18,19 @@
       <!-- H5Canvas -->
       <div class="centerBuildingDiv" style="user-select: none;" cdkDrag>
         <div class="centerTotal">
-          <div class="centerTotalHeader"><mat-icon cdkDragHandle matTooltip="可移动窗口" matTooltipPosition="above">open_with</mat-icon>建筑总平面图</div>
-          <div class="everyTotal" (click)="checkedBuilding({name:'总平面图'},-1)" [ngClass]="{'buildingbtnchecked': checkedBuildingIndex==-1}">总平面图</div>
-          <div class="everyTotal overflowText" *ngFor="let item of allBuildings;let key = index" (click)="checkedBuilding(item,key)"[ngClass]="{'buildingbtnchecked': checkedBuildingIndex==key}">
+          <div class="centerTotalHeader overflowText">
+            <mat-icon cdkDragHandle matTooltip="可移动窗口" matTooltipPosition="above">open_with</mat-icon>
+            <label (click)='togglebeforeOneCheckedBuilding()'>{{beforeOneCheckedBuilding.name}}</label>
+          </div>
+          <div class="everyTotal overflowText" *ngFor="let item of sitePlanData;let key = index"
+            [ngClass]="{'selectSitePlan': selectSitePlanIndex==key}" (click)='selectSitePlan(item,key)'>
             {{item.name}}
           </div>
         </div>
-        <div style="flex: 2%;opacity: 0;"></div>
-        <div class="centerTotal">
-          <div class="everyTotal overflowText" *ngFor="let item of sitePlanData;let key = index"
-            [ngClass]="{'isRefugeStorey':item.isRefugeStorey==true,'selectSitePlan': selectSitePlanIndex==key}" (click)='selectSitePlan(item,key)'>
+        <div style="flex: 2%;opacity: 0;" [hidden]="!beforeOneCheckedBuildingIsShow"></div>
+        <div class="centerTotal" [hidden]="!beforeOneCheckedBuildingIsShow">
+          <div class="everyTotal" (click)="checkedBuilding({name:'总平面图'},-1)" [ngClass]="{'buildingbtnchecked': checkedBuildingIndex==-1}">总平面图</div>
+          <div class="everyTotal overflowText" *ngFor="let item of allBuildings;let key = index" (click)="checkedBuilding(item,key)"[ngClass]="{'buildingbtnchecked': checkedBuildingIndex==key}">
             {{item.name}}
           </div>
         </div>
@@ -102,7 +104,7 @@
           </div>
           <div [hidden]="!togglePlane">
             <!-- 消防列表树 -->
-            <mat-tree [dataSource]="dataSource" [treeControl]="treeControl" cdkDropList [cdkDropListData]="dataSource" (cdkDropListDropped)="drop($event)">
+            <mat-tree [dataSource]="dataSource" [treeControl]="treeControl" cdkDropList [cdkDropListData]="dataSource">
 
               <mat-tree-node   [ngClass]="{'isLookPattern': !node.isLookPattern}" *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)" class="treeNode">
                 <button mat-icon-button disabled></button>
@@ -110,7 +112,7 @@
                   {{node.name}}      
                 </span> 
                 <span  *ngIf="node.isTemplate">({{node.children.length}})</span>
-                <span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">check_circle_outline</mat-icon></span>
+                <span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
               </mat-tree-node>
 
               <mat-tree-node  [ngClass]="{'isLookPattern': !node.isLookPattern}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)"class="treeNode" >
@@ -125,7 +127,7 @@
                   {{node.name}}      
                 </span>   
                 <span  *ngIf="node.isTemplate && node.isNewElement">({{node.children.length}})</span>
-                <span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">check_circle_outline</mat-icon></span>
+                <span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
               </mat-tree-node>
 
             </mat-tree>

src/app/ui/collection-tools/collection-tools.component.scss

@@ -43,17 +43,10 @@
     }
   }
   .headerRight {
-    width: 450px;
+    width: 350px;
     overflow: hidden;
     box-sizing: border-box;
     padding-left: 10px;
-    .fraction { font-size: 14px; }
-    .fraction input {
-      width: 40px;
-      height: 24px;
-      margin: 0 2px;
-      border-radius: 5px;
-    }
     button {
       font-size: 14px;
       color: #07CDCF; 
@@ -175,6 +168,7 @@
 
 //中间建筑/楼层
 .centerTotal {
+  max-width: 199px;
   flex: 49%;
   background-color: #fff;
   box-shadow: 0px 0px 5px 3px rgb(165, 163, 163);
@@ -357,7 +351,6 @@ input { border: none; outline: none; background-color: #d6dddf; box-sizing: bord
 div:focus {
   outline: none;
 }
-
 //没有图片时显示无图片背景图
 .noImgCss{
   background: url(../../../assets/images/noImg.png) no-repeat center center;

src/app/ui/collection-tools/collection-tools.component.ts

@@ -59,6 +59,8 @@ export class CollectionToolsComponent implements OnInit {
   
   allBuildings //该单位所有建筑
   beforeOneCheckedBuilding:any = {name:"总平面图"}; //当前点击选择的建筑
+  beforeOneCheckedBuildingIsShow:boolean = false; //建筑是否显示
+  togglebeforeOneCheckedBuilding () { this.beforeOneCheckedBuildingIsShow = !this.beforeOneCheckedBuildingIsShow }
   checkedBuildingIndex:number = -1 //当前点击选择的建筑index
   isEditPat:boolean =  true //当前是否是编辑模式
 
@@ -150,9 +152,6 @@ export class CollectionToolsComponent implements OnInit {
   }
   pattern:boolean = false//默认为基本信息编辑
 
-  yyy(){
-    console.log(this.canvasData.selectPanelPoint)
-  }
   //基本信息编辑模式
   baseInfo(){
     if (!this.pattern) {
@@ -629,9 +628,8 @@ export class CollectionToolsComponent implements OnInit {
   isSixbtn = true //控制想定作业编辑按钮
   isxxx = true //控制查看编辑模式的编辑模式按钮
   examMsg = { //单位,考试信息
-    conpanyName: sessionStorage.getItem('companyName'), //单位名称
+    conpanyName: sessionStorage.getItem('companyName') || '暂无数据', //单位名称
     keynote: '', //考试要点
-    grade: '', //分数
   }
 
   ngOnInit(): void {
@@ -657,8 +655,6 @@ export class CollectionToolsComponent implements OnInit {
 
   }
 
-
-
   ngAfterViewInit(): void {
 
     this.getSitePlan() //获取总平面图/楼层
@@ -1015,14 +1011,6 @@ export class CollectionToolsComponent implements OnInit {
     })
   }
 
-  //拖拽tree
-  drop(e){
-    console.log(1111,e)
-  }
-  drop2(e){
-    console.log(222,e)
-  }
-
   //创建建筑
   createBuilding(){
     let data = {
@@ -1325,8 +1313,9 @@ export class CollectionToolsComponent implements OnInit {
   }
 
   //封装 刷新 tree 数据
- async renovateTreeData (isRefresh:boolean = true) {
+  async renovateTreeData (isRefresh:boolean = true) {
     this.allFireElements[this.allFireElements.length-1].children = []
+    this.beforeOneCheckedBuildingIsShow = false
     isRefresh? await this.canvas.refresh() : null
     this.canvas.setNameVisible(this.basicInfo,0)
     this.canvas.setNameVisible(this.wantToWork,1)

src/app/ui/collection-tools/examinationQuestions.html

@@ -29,5 +29,8 @@
     </mat-tree>
     <!-- 消防列表树 -->
   </div>
-  <div style="text-align: center;"><button mat-stroked-button style="border: none;background-color: #FF8678;color: #fff;" mat-dialog-close>退出</button></div>
+  <div style="text-align: center;">
+    <button mat-stroked-button style="margin-right: 15px;border: none;background: #07CDCF;color: #fff;" (click)='submit()'>确定</button>
+    <button mat-stroked-button style="margin-left: 15px;border: none;background: #dfe0e0;" mat-dialog-close>取消</button>
+  </div>
 </div>

src/app/ui/collection-tools/examinationQuestions.ts

@@ -39,6 +39,11 @@ export class examinationQuestions {
       this.treeControl.expandAll()
     }
 
+    //提交
+    submit () {
+      console.log(this.data)
+    }
+
 }
 
 @Component({
@@ -76,18 +81,7 @@ export class uploadQuestions {
 
     //上传
     submit () {
-      if (this.data.question.grade && this.data.question.keynote) {
-        const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
-        config.duration = 3000
-        this.snackBar.open('上传成功','确定',config);
-        this.dialogRef.close()
-      } else {
-        const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
-        config.duration = 3000
-        this.snackBar.open('请填写必填项','确定',config);
-      }
+      console.log(this.data.question)
     }
 
 }

src/app/ui/collection-tools/uploadQuestions.html

@@ -1,9 +1,5 @@
 <div style="min-width: 260px;">
   <div style="text-align: center;font-weight: 550;">上传</div>
-  <div style="padding-left: 10px; font-size: 14px; font-weight: 550;margin: 5px 0;">设置分数</div>
-  <div style="margin-bottom: 25px;">
-    <input type="text" style="width: 100%;border-radius: 5px;height: 26px;background-color: #dfe0e0;" placeholder="请填写考试分数" [(ngModel)]="data.question.grade">
-  </div>
   <div style="padding-left: 10px; font-size: 14px; font-weight: 550;margin: 5px 0;">考试要点</div>
   <div style="margin-bottom: 25px;">
     <textarea style="width: 100%;background-color: #dfe0e0;border: none;outline: none;height: 50px;border-radius: 5px;resize: none;" placeholder="请填写考试要点" [(ngModel)]="data.question.keynote"></textarea>