Browse Source

[完善] 类似预案UI完成

develop
陈鹏飞 4 years ago
parent
commit
a6d9f9f4f4
  1. 2
      src/app/ui/collection-tools/collection-tools.component.html
  2. 16
      src/app/ui/collection-tools/collection-tools.component.ts
  3. 3
      src/app/working-area/working-area.component.ts

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

@ -231,7 +231,7 @@
<!-- 素材库 --> <!-- 素材库 -->
<!-- 处置预案 --> <!-- 处置预案 -->
<div class="handlePlan" *ngIf="!pattern"> <div class="handlePlan">
<div class="planarGraphHeader" (click)='toggleHandlePlan()'> <div class="planarGraphHeader" (click)='toggleHandlePlan()'>
<mat-icon *ngIf="toggleHandlePlans">keyboard_arrow_up</mat-icon> <mat-icon *ngIf="toggleHandlePlans">keyboard_arrow_up</mat-icon>
<mat-icon *ngIf="!toggleHandlePlans">keyboard_arrow_down</mat-icon> <mat-icon *ngIf="!toggleHandlePlans">keyboard_arrow_down</mat-icon>

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

@ -1077,24 +1077,21 @@ export class CollectionToolsComponent implements OnInit {
//计算 可视区域内宽度, 是否缩放背景图 //计算 可视区域内宽度, 是否缩放背景图
backGroundScale () { backGroundScale () {
let that = this let that = this
let dad = document.querySelector('.functionalDomainContent').clientWidth let dadWidth = document.querySelector('.canvas').clientWidth
let dadHeight = document.querySelector('.functionalDomainContent').clientHeight let dadHeight = document.querySelector('.canvas').clientHeight
let left = document.querySelector('.functionalDomainLeft').clientWidth
let right = document.querySelector('.functionalDomainRight').clientWidth
let imgWidth = dad - left - right//可视区域内 宽度
let img = new Image() let img = new Image()
img.src = this.selectingSitePlan.imageUrl; img.src = this.selectingSitePlan.imageUrl;
img.onload = function(){ img.onload = function(){
if (img.height > dadHeight && img.width > imgWidth) { if (img.height > dadHeight && img.width > dadWidth) {
let width = imgWidth/img.width let width = dadWidth/img.width
let height = dadHeight/img.height let height = dadHeight/img.height
that.canvas.setBackgroundScale((width>height? height : width)-0.005) that.canvas.setBackgroundScale((width>height? height : width)-0.005)
return return
} else if (img.height > dadHeight) { } else if (img.height > dadHeight) {
that.canvas.setBackgroundScale((dadHeight/img.height)-0.005) that.canvas.setBackgroundScale((dadHeight/img.height)-0.005)
return return
} else if (img.width > imgWidth) { } else if (img.width > dadWidth) {
that.canvas.setBackgroundScale((imgWidth/img.width)-0.005) that.canvas.setBackgroundScale((dadWidth/img.width)-0.005)
return return
} }
}; };
@ -1674,6 +1671,7 @@ export class CollectionToolsComponent implements OnInit {
let params = {componentId: sessionStorage.getItem('planId')} let params = {componentId: sessionStorage.getItem('planId')}
this.http.get('/api/Disasters',{params:params}).subscribe((data:any)=>{ this.http.get('/api/Disasters',{params:params}).subscribe((data:any)=>{
this.allFirePlan = data this.allFirePlan = data
this.getDisposalNode()
if (!data.length) { if (!data.length) {
let msg = { let msg = {
name: '灾情', name: '灾情',

3
src/app/working-area/working-area.component.ts

@ -121,6 +121,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
// 是否登录 // 是否登录
public verificationURL = '/ui/plan'; // 验证url地址是否为验证页面 public verificationURL = '/ui/plan'; // 验证url地址是否为验证页面
public verificationURLTwo = '/ui/similarPlans'; // 验证url地址是否为验证页面
count = 0; count = 0;
isLogin() { isLogin() {
const token = sessionStorage.getItem('token'); // 判断 是否登录状态 const token = sessionStorage.getItem('token'); // 判断 是否登录状态
@ -241,7 +242,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
this.content.nativeElement.appendChild(this.app.view); this.content.nativeElement.appendChild(this.app.view);
const url = this.router.url; const url = this.router.url;
// tslint:disable-next-line: no-unused-expression // tslint:disable-next-line: no-unused-expression
url === this.verificationURL ? this.isLogin() : null; url === this.verificationURL || url === this.verificationURLTwo ? this.isLogin() : null;
this.createBackgroundImage(); this.createBackgroundImage();
// this.createPreviewSinglePointIcon(); // this.createPreviewSinglePointIcon();

Loading…
Cancel
Save