Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

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

@@ -24,7 +24,7 @@
     <span class="rightSave">
       <!-- <mat-icon title="查看/编辑模式" (click)="lookpat()" *ngIf="isEditPattern">tv</mat-icon>
       <mat-icon title="查看/编辑模式" (click)="editpat()" *ngIf="!isEditPattern && isediticon">create</mat-icon> -->
-      <label title="保存" (click)="saveSite()"><mat-icon>description</mat-icon>保存</label>
+      <label title="保存" (click)="saveSite()" *ngIf="isEditPattern"><mat-icon>description</mat-icon>保存</label>
     </span>
   </div>
 

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

@@ -609,9 +609,6 @@ export class CollectionToolsBuildingComponent implements OnInit {
     this.canvasData.isChange = true
   }
 
-
-  isSixShow = true  
-  isSixbtn = true //控制想定作业编辑按钮
   isediticon = true //控制查看编辑模式的编辑模式小笔按钮
 
 
@@ -678,17 +675,14 @@ export class CollectionToolsBuildingComponent implements OnInit {
     }, this)
 
 
-    if(this.router.url.indexOf("keyUnit/viewunitinfo") != -1 || this.router.url.indexOf("keyUnit/editplaninfo")!= -1){
+    if(this.router.url.indexOf("keyUnit/viewunitinfo") != -1){ //查看模式
-      this.isSixbtn = false
-    }
-
-    if(!this.isSixbtn && sessionStorage.getItem("six") == "edit"){
-      this.isSixShow = true
-    }
-    if(!this.isSixbtn && sessionStorage.getItem("six") == "look"){
       this.isEditPattern = false
       this.isediticon = false
+      this.canvasData.gameMode = GameMode.Assignment
+    } else if (this.router.url.indexOf("keyUnit/editplaninfo")!= -1) { //编辑模式
+      this.canvasData.gameMode = GameMode.BasicInformation
     }
+
     //gis模块平面图
     if(this.router.url.indexOf("gis") != -1 && sessionStorage.getItem("gisplan") == "look"){
       this.isEditPattern = false
@@ -706,7 +700,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
         event.preventDefault();
       };
     })
-    
+
     this.canvasData.getMessage().subscribe((message: any)=>{
       if(message == "send a message"){
         this.refurbishTreeData()
@@ -817,10 +811,10 @@ export class CollectionToolsBuildingComponent implements OnInit {
 
 
   ngAfterViewInit(): void {
-     //gis模块平面图
+    //不是gis模块平面图
-     if(this.router.url.indexOf("gis") == -1) {
+    if(this.router.url.indexOf("gis") == -1) {
-      this.getAllBuildings(true) //获取所有建筑
+    this.getAllBuildings(true) //获取所有建筑
-     }
+    }
     // 监听canvas组件选中素材事件
     this.canvas.on("select",obj=>{
       //选中素材属性注入函数

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

@@ -24,7 +24,7 @@
     <span class="rightSave">
       <!-- <mat-icon title="查看/编辑模式" (click)="lookpat()" *ngIf="isEditPattern">tv</mat-icon>
       <mat-icon title="查看/编辑模式" (click)="editpat()" *ngIf="!isEditPattern && isediticon">create</mat-icon> -->
-      <label title="保存" (click)="saveSite()"><mat-icon>description</mat-icon>保存</label>
+      <label title="保存" (click)="saveSite()" *ngIf="isEditPattern"><mat-icon>description</mat-icon>保存</label>
     </span>
   </div>
 

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

@@ -612,8 +612,6 @@ export class CollectionToolsPlanComponent implements OnInit {
     this.canvasData.isChange = true
   }
 
-  isSixShow = true  
-  isSixbtn = true //控制想定作业编辑按钮
   isediticon = true //控制查看编辑模式的编辑模式小笔按钮
 
   isMultipleAsset:boolean = false//框选多个素材属性显隐
@@ -680,16 +678,14 @@ export class CollectionToolsPlanComponent implements OnInit {
       }
     }, this)
 
-    if(this.router.url.indexOf("keyUnit/viewunitinfo") != -1 || this.router.url.indexOf("keyUnit/editplaninfo")!= -1){
+    if(this.router.url.indexOf("keyUnit/viewunitinfo") != -1){ //查看模式
-      this.isSixbtn = false
-    }
-    if(!this.isSixbtn && sessionStorage.getItem("six") == "edit"){
-      this.isSixShow = true
-    }
-    if(!this.isSixbtn && sessionStorage.getItem("six") == "look"){
       this.isEditPattern = false
       this.isediticon = false
+      this.canvasData.gameMode = GameMode.Assignment
+    } else if (this.router.url.indexOf("keyUnit/editplaninfo")!= -1) { //编辑模式
+      this.canvasData.gameMode = GameMode.BasicInformation
     }
+
     //gis模块平面图
     if(this.router.url.indexOf("gis") != -1 && sessionStorage.getItem("gisplan") == "look"){
       this.isEditPattern = false
@@ -817,17 +813,11 @@ export class CollectionToolsPlanComponent implements OnInit {
 
 
 
-
-
-
-
-
-
   ngAfterViewInit(): void {
-     //gis模块平面图
+    //不是gis模块平面图
-     if(this.router.url.indexOf("gis") == -1) {
+    if(this.router.url.indexOf("gis") == -1) {
-      this.getSitePlan()
+    this.getSitePlan()
-     }
+    }
     // // 监听canvas组件选中素材事件
     // this.canvas.on("select",obj=>{
     //   //选中素材属性注入函数

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

@@ -58,7 +58,7 @@
           <option value ="6">东北</option>
           <option value ="7">西北</option>
         </select>
-        <label title="保存" (click)="saveSite()" class="rightSave"><mat-icon>description</mat-icon>保存</label>
+        <label title="保存" (click)="saveSite()" class="rightSave" *ngIf="isEditPattern"><mat-icon>description</mat-icon>保存</label>
       </div>
     </div>
   

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

@@ -621,12 +621,6 @@ export class CollectionToolsComponent implements OnInit {
     this.canvasData.isChange = true
   }
 
-
-  isSixShow = true  
-  isSixbtn = true //控制想定作业编辑按钮
-  isxxx = true //控制查看编辑模式的编辑模式按钮
-
-
   isMultipleAsset:boolean = false//框选多个素材属性显隐
   multipleAsset:any = {
     Width:null,
@@ -689,24 +683,11 @@ export class CollectionToolsComponent implements OnInit {
       }
     }, this)
 
-
-
     this.canvasData.gameMode = GameMode.Assignment
-    if(this.router.url.indexOf("keyUnit/viewunitinfoplan") == -1 && this.router.url.indexOf("keyUnit/viewunitinfo") != -1 || this.router.url.indexOf("keyUnit/editplaninfo")!= -1){
+    if (sessionStorage.getItem('editable') == "0") { //查看模式
-      this.isSixbtn = false
-    }
-
-    if(!this.isSixbtn && sessionStorage.getItem("six") == "edit"){
-      this.isSixShow = true
-    }
-    if(!this.isSixbtn && sessionStorage.getItem("six") == "look"){
       this.isEditPattern = false
-      this.isxxx = false
+    } else {
-    }
 
-    if (sessionStorage.getItem('editable') == "0") {
-      this.isEditPattern = false
-      this.isxxx = false
     }
 
     this.getAllLibrary('plan') //获取素材库
@@ -721,12 +702,13 @@ export class CollectionToolsComponent implements OnInit {
         event.preventDefault();
       };
     })
-    
+
     this.canvasData.getMessage().subscribe((message: any)=>{
       if(message == "send a message"){
         this.refurbishTreeData()
       }
     })
+
   }
 
   //多选宽度共同改变
@@ -831,7 +813,6 @@ export class CollectionToolsComponent implements OnInit {
   }
 
   ngAfterViewInit(): void {
-
     this.getSitePlan()
     // 监听canvas组件选中素材事件
     this.canvas.on("select",obj=>{
@@ -2445,7 +2426,7 @@ export class CollectionToolsComponent implements OnInit {
     if(selectPanelPoint.Data){
       for(let key in selectPanelPoint.Data.Stock){ //筛选数据 没有匹配全部放入到   其他   数组
         let noMatch = this.allFireElements.find( every=> every.id===selectPanelPoint.Data.Stock[key].FireElementId )
-        if (!noMatch) {
+        if (!noMatch && selectPanelPoint.Data.Stock[key].Id != "图例") {
           this.allFireElements[this.allFireElements.length-1].children.push(selectPanelPoint.Data.Stock[key])
         }
       }