[删除] 作战部署删除 基本信息模块

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

@@ -659,7 +659,6 @@ export class CollectionToolsPlanComponent implements OnInit {
     this.canvas.on("select",obj=>{
       //选中素材属性注入函数
       this.setAssetsProperty(obj.assetData)
-      console.log(obj.assetData)
     })
     // 监听canvas组件取消选中素材事件
     this.canvas.on("deselect",obj=>{
@@ -760,7 +759,6 @@ export class CollectionToolsPlanComponent implements OnInit {
         }else{
           //如果是单位 总平面图
           if(this.checkedBuildingIndex==-1){
-            // console.log(111,SitePlanData)
             //保存平面图数据
             this.http.post("/api/SitePlanData",SitePlanData,{
               params:{

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

@@ -18,7 +18,7 @@
       <mat-checkbox color="primary"></mat-checkbox> 多选
     </span> -->
     <span class="marginLeftRight">
-      <mat-checkbox color="primary"></mat-checkbox> 显示图例
+      <mat-checkbox color="primary" [(ngModel)]="isShowLegend" (change)='changeLegend($event)' [disabled]='this.canvasData.selectPanelPoint.BackgroundImageUrl'></mat-checkbox> 显示图例
     </span>
     <button (click)="copyAsset()" class="copytobutn marginLeftRight" mat-button title="复制" *ngIf="isEditPattern">
       复制<mat-icon>library_books</mat-icon>
@@ -28,48 +28,14 @@
       粘贴<mat-icon>screen_share</mat-icon>
     </button>
 
-    <div class="patternSwitch">
-      <span (click)="baseInfo()" [ngClass]="{'selectedPattern': pattern}">
-        基本信息编辑
-      </span>
-      <span *ngIf="isSixbtn" (click)="wantWork()" [ngClass]="{'selectedPattern': !pattern}">
-        想定作业编辑
-      </span>
-    </div>
-    <span class="rightSave">
-      <!-- <mat-icon title="查看/编辑模式" (click)="lookpat()" *ngIf="isEditPattern">tv</mat-icon>
-      <mat-icon title="查看/编辑模式" (click)="editpat()" *ngIf="!isEditPattern && isxxx">create</mat-icon> -->
-      <label title="保存" (click)="saveSite()"><mat-icon>description</mat-icon>保存</label>
-    </span>
-  </div>
-
-  <!-- 头部操作栏 -->
-  <div class="headerOperate">
-    <ng-container *ngIf="pattern">
-      <button mat-button (click)="checkedBuilding({name:'总平面图'},-1)" [ngClass]="{'buildingbtnchecked': checkedBuildingIndex==-1}">
-      <span>总平面图</span>
-    </button>
-    <button mat-button *ngFor="let item of allBuildings;let key = index" (click)="checkedBuilding(item,key)" class="bigeditdeletebtn" [ngClass]="{'buildingbtnchecked': checkedBuildingIndex==key}">
-      <span>{{item.name}}</span>
-      <span class="editdeletebtn" *ngIf="isEditPattern && pattern">
-        <mat-icon (click)="editBuilding($event,item)" style="font-size: 23px;vertical-align:sub;margin-left: 6px;color: rgb(26, 194, 26);">create</mat-icon>
-        <mat-icon (click)="deleteBuilding($event,item)" style="font-size: 23px;vertical-align:sub;color: rgb(224, 51, 51);">delete</mat-icon>
-      </span>
-    </button>
-    </ng-container>
-    <button mat-button (click)="createBuilding()" *ngIf="isEditPattern && pattern">
-      <span style="font-size: 24px;">+</span>
-    </button>
-    <div class="bigBox" *ngIf="!pattern">
+    <div class="bigBox">
       <div class="weatherBox" [ngClass]="{'opened': weatherBtn,'close': !weatherBtn}">
-        <mat-icon class="openbtn" *ngIf="weatherBtn" (click)="weatherBtnHidden()">keyboard_arrow_right</mat-icon>
-        <mat-icon class="openbtn" *ngIf="!weatherBtn" (click)="weatherBtnShow()">keyboard_arrow_left</mat-icon>
         <span class="name">天气</span>
         <input [(ngModel)]="canvasData.selectPanelPointBaseData.weather" type="text" placeholder="最多输入10字节" maxlength="10">
         <span class="name">气温</span>
         <div style="display: inline-block;position: relative;">
-          <input [(ngModel)]="canvasData.selectPanelPointBaseData.airTemperature" style="width: 120px;" type="number" value="0" oninput="if(value.length>2)value=value.slice(0,2)">
-          <span style="position: absolute;right:17px;color: #9c9fa5;">℃</span>
+          <input [(ngModel)]="canvasData.selectPanelPointBaseData.airTemperature" style="width: 60px;" type="number" value="0" oninput="if(value.length>2)value=value.slice(0,2)">
+          <span style="position: absolute;right: 20px;top: 10px;color: #9c9fa5;">℃</span>
         </div>
         <span class="name">风力</span>
         <select [(ngModel)]="canvasData.selectPanelPointBaseData.windScale">
@@ -92,8 +58,10 @@
           <option value ="6">东北</option>
           <option value ="7">西北</option>
         </select>
+        <label title="保存" (click)="saveSite()" class="rightSave"><mat-icon>description</mat-icon>保存</label>
       </div>
     </div>
+  
   </div>
 
   <!--功能区 -->

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

@@ -60,10 +60,10 @@
     }
   }
   .rightSave {
+    margin: 0 10px;
     cursor: pointer;
-    position: absolute;
-    right: 60px;
-    label { vertical-align: middle; color: #279FFF; }
+    vertical-align: middle;
+    color: #279FFF;
   }
 }
 
@@ -113,7 +113,7 @@
   top: 0;
 }
 .functionalDomain {
-  flex: 90%;
+  flex: 95%;
   overflow: hidden;
   .functionalDomainContent {
     position: relative;
@@ -409,19 +409,16 @@ div:focus {
 }
 
 .bigBox{
-  width: 700px;
+  width: 650px;
   height: 40px;
+  line-height: 40px;
   position: absolute;
   overflow: hidden;
   right: 0;
+  top: 0;
 }
 .weatherBox{
-  height: 40px;
-  width: 700px;
-  line-height: 40px;
-  position: absolute;
-  right: 0;
-  transition: right linear .5s;
+  width: 100%;
   .openbtn{
     font-size: 45px;
     height: 45px;

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

@@ -145,7 +145,7 @@ export class CollectionToolsComponent implements OnInit {
       this.isImgNumCss = false
     }
   }
-  pattern:boolean = true//默认为基本信息编辑
+  pattern:boolean = false//默认为基本信息编辑
   
 
   //基本信息编辑模式
@@ -625,7 +625,7 @@ export class CollectionToolsComponent implements OnInit {
   isxxx = true //控制查看编辑模式的编辑模式按钮
 
   ngOnInit(): void {
-
+    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){
       this.isSixbtn = false
     }
@@ -643,7 +643,7 @@ export class CollectionToolsComponent implements OnInit {
       this.isxxx = false
     }
 
-    this.getAllLibrary() //获取素材库
+    this.getAllLibrary('plan') //获取素材库
     this.getAllBuildings() //获取所有建筑
     this.getAllFirePlan() //获取当前单位灾情
 
@@ -666,7 +666,7 @@ export class CollectionToolsComponent implements OnInit {
 
 
   ngAfterViewInit(): void {
-    
+
     this.getSitePlan()
     // 监听canvas组件选中素材事件
     this.canvas.on("select",obj=>{
@@ -680,7 +680,7 @@ export class CollectionToolsComponent implements OnInit {
     //监听数据变化后
     this.canvas.on('canvasDataChanged',()=>{
       // 收到数据表示共享数据发生变化
-      this.renovateTreeData(false)
+      this.canvasData.selectPanelPoint.BackgroundImageUrl? this.customizeNodes() : this.renovateTreeData(false)
     });
   }
 
@@ -695,10 +695,10 @@ export class CollectionToolsComponent implements OnInit {
     let buildingId = this.beforeOneCheckedBuilding.id
     let floorId = this.selectingSitePlan.id
     this.canvas.paste(companyId,buildingId,floorId)
-    this.renovateTreeData(false)
+    this.canvasData.selectPanelPoint.BackgroundImageUrl? this.customizeNodes() : this.renovateTreeData(false)
   }
 
-  basicInfo:boolean = true //基本信息名称显隐
+  basicInfo:boolean = false //基本信息名称显隐
   wantToWork:boolean = true //想定作业名称显隐
   //点击基本信息名称
   basicInfoClick(){
@@ -1239,7 +1239,6 @@ export class CollectionToolsComponent implements OnInit {
     });
     this.dataSource.data = treeData
     this.treeControl.expandAll()
-    
   }
 
   //点击树节点
@@ -1375,6 +1374,7 @@ export class CollectionToolsComponent implements OnInit {
     isRefresh? await this.canvas.refresh() : null
     this.canvas.setNameVisible(this.basicInfo,0)
     this.canvas.setNameVisible(this.wantToWork,1)
+    this.canvas.setLegendVisible(this.isShowLegend) //图例显隐
     isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
     isRefresh? this.isShowProperty = true : null
     isRefresh? this.isShowAttribute = true : null
@@ -1392,7 +1392,7 @@ export class CollectionToolsComponent implements OnInit {
     }
     for(let key in storeyData.data){ //筛选数据 没有匹配全部放入到   其他   数组
       let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId )
-      if (!noMatch) {
+      if (!noMatch && storeyData.data[key].Id != "图例") {
         this.allFireElements[this.allFireElements.length-1].children.push(storeyData.data[key])
       }
     }
@@ -1400,7 +1400,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])
         }
       }
@@ -1427,6 +1427,9 @@ export class CollectionToolsComponent implements OnInit {
 
   beforeOneCheckedBuildingIsShow:boolean = false; //想定作业下 建筑是否显示
   togglebeforeOneCheckedBuilding () { this.beforeOneCheckedBuildingIsShow = !this.beforeOneCheckedBuildingIsShow }
+  isShowLegend:boolean = true; //图例是否显示
+  changeLegend (e) { this.canvasData.selectPanelPoint.BackgroundImageUrl? null : this.canvas.setLegendVisible(this.isShowLegend) }
+
   //可展开面板展开或关闭
   toggle () {
     this.toggleExpandPanel = !this.toggleExpandPanel
@@ -1961,6 +1964,7 @@ export class CollectionToolsComponent implements OnInit {
           let params = {disasterId: this.allFirePlan[0].id || ''}
           this.http.get('/api/DisposalNodes',{params:params}).subscribe(data=>{ //所有处置节点
             this.canvasData.allDisposalNode = data
+            this.getDisposalNode()
           })
         })
       } else { //单位 有灾情时
@@ -1968,6 +1972,7 @@ export class CollectionToolsComponent implements OnInit {
         let params = {disasterId: this.allFirePlan[0].id || ''}
         this.http.get('/api/DisposalNodes',{params:params}).subscribe(data=>{ //所有处置节点
           this.canvasData.allDisposalNode = data
+          this.getDisposalNode()
         })
       }
     })
@@ -2265,6 +2270,7 @@ export class CollectionToolsComponent implements OnInit {
     this.allFireElements = [other]
     this.canvas.setNameVisible(this.basicInfo,0)
     this.canvas.setNameVisible(this.wantToWork,1)
+    // this.canvas.setLegendVisible(this.isShowLegend) //图例显隐
     this.beforeOneCheckedBuildingIsShow = false
 
     let selectPanelPoint =  JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint || {} )) //当前 节点 数据