Browse Source

[完善]修改提出的问题

tangshan
邵佳豪 3 years ago
parent
commit
e73fcef172
  1. 9
      src/app/key-unit/edit-unit-info/edit-unit-info.component.html
  2. 4
      src/app/key-unit/special-warning/special-warning.component.html
  3. 9
      src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html
  4. 15
      src/app/ui/collection-tools/collection-tools.component.html
  5. 2
      src/app/ui/collection-tools/collection-tools.component.scss
  6. 10
      src/app/ui/collection-tools/collection-tools.component.ts

9
src/app/key-unit/edit-unit-info/edit-unit-info.component.html

@ -5,7 +5,7 @@
</div>
</div>
<mat-tab-group selectedIndex="9" style="height: 100%;">
<mat-tab-group selectedIndex="10" style="height: 100%;">
<mat-tab label="1.基本信息">
<ng-template matTabContent>
<app-basicinfo></app-basicinfo>
@ -51,7 +51,12 @@
<app-uploading-cad></app-uploading-cad>
</ng-template>
</mat-tab>
<mat-tab label="10.作战部署">
<mat-tab label="10.特别警示">
<ng-template matTabContent>
<app-special-warning></app-special-warning>
</ng-template>
</mat-tab>
<mat-tab label="11.作战部署">
<ng-template matTabContent>
<app-collection-tools></app-collection-tools>
</ng-template>

4
src/app/key-unit/special-warning/special-warning.component.html

@ -1,13 +1,13 @@
<div class="bigbox">
<div class="itembox" *ngFor="let item of specialWarningData;let key = index">
<div class="title">
<input [(ngModel)]="item.name" type="text" name="" id="" placeholder="请输入名称(可编辑)">
<input [disabled]="pattern == 'look'" [(ngModel)]="item.name" type="text" name="" id="" placeholder="请输入名称(可编辑)">
<div class="deletebtn" *ngIf="key == specialWarningData.length - 1 && specialWarningData.length != 1 && pattern == 'edit'">
<mat-icon (click)="deleteItem()">delete</mat-icon>
</div>
</div>
<div class="contant">
<textarea [(ngModel)]="item.content" name="" id="" cols="30" rows="10"></textarea>
<textarea [disabled]="pattern == 'look'" [(ngModel)]="item.content" name="" id="" cols="30" rows="10"></textarea>
</div>
</div>
<div class="bottombox" *ngIf="pattern == 'edit'">

9
src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html

@ -1,4 +1,4 @@
<mat-tab-group selectedIndex="9" style="height: 99%;" >
<mat-tab-group selectedIndex="10" style="height: 99%;" >
<mat-tab label="1.基本信息">
<ng-template matTabContent>
<app-basicinfo-look></app-basicinfo-look>
@ -44,7 +44,12 @@
<app-uploading-cad-look></app-uploading-cad-look>
</ng-template>
</mat-tab>
<mat-tab label="10.作战部署">
<mat-tab label="10.特别警示">
<ng-template matTabContent>
<app-special-warning></app-special-warning>
</ng-template>
</mat-tab>
<mat-tab label="11.作战部署">
<ng-template matTabContent>
<app-collection-tools></app-collection-tools>
</ng-template>

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

@ -47,16 +47,16 @@
<div class="bigBox">
<div class="weatherBox" [ngClass]="{'opened': weatherBtn,'close': !weatherBtn}">
<span class="name">天气</span>
<input class="weatherInput" [(ngModel)]="canvasData.selectPanelPointBaseData.weather" type="text"
<input [disabled]="!isEditPattern" class="weatherInput" [(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: 60px;" type="number"
<input [disabled]="!isEditPattern" [(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 class="weatherSelect" [(ngModel)]="canvasData.selectPanelPointBaseData.windScale">
<select [disabled]="!isEditPattern" class="weatherSelect" [(ngModel)]="canvasData.selectPanelPointBaseData.windScale">
<option value="0">0(无风)</option>
<option value="1">1(软风)</option>
<option value="2">2(轻风)</option>
@ -66,7 +66,7 @@
<option value="6">6(强风)</option>
</select>
<span class="name">风向</span>
<select class="weatherSelect" [(ngModel)]="canvasData.selectPanelPointBaseData.windDirection">
<select [disabled]="!isEditPattern" class="weatherSelect" [(ngModel)]="canvasData.selectPanelPointBaseData.windDirection">
<option value="0"></option>
<option value="1">西</option>
<option value="2"></option>
@ -92,7 +92,7 @@
<app-working-area #canvas [init]='this'></app-working-area>
<!-- H5Canvas -->
<!-- 中间建筑+楼层 -->
<div class="centerBuildingDiv" style="user-select: none;" cdkDrag *ngIf="!pattern">
<div class="centerBuildingDiv" style="user-select: none;" cdkDrag *ngIf="!pattern" (mousewheel)="$event.stopPropagation()" >
<div class="centerTotal">
<div class="centerTotalHeader">
<mat-icon cdkDragHandle matTooltip="可移动窗口" matTooltipPosition="above" class="move">open_with</mat-icon>
@ -400,9 +400,8 @@
style="width: 33%;position: absolute;right: 10px;top: 1px;opacity: 0;z-index: 100;cursor: pointer;height: 21px;">
<div
style="width: 33%;height: 21px;line-height: 21px;text-align: center;position: absolute;right: 10px;top: 1px;z-index: 99;border: 1px solid rgb(208, 211, 214);border-radius: 2px;font-size: 13px;cursor: pointer;"
(click)="imgNumBeyond()">添加</div>
(click)="imgNumBeyond()"
*ngIf="isEditPattern">添加</div>
<div
style="position: relative;;width: 89%;border:1px solid rgb(208, 211, 214);height: 100px;margin: 6px auto;"
class="swiper-container">

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

@ -326,6 +326,8 @@
border-radius: 5px;
box-sizing: border-box;
padding: 5px 0;
max-height: 500px;
overflow-y: auto;
.centerTotalHeader {
height: 30px;
line-height: 30px;

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

@ -186,7 +186,7 @@ export class CollectionToolsComponent implements OnInit {
}
//ngzorro tree 拖拽
nzEvent(event: NzFormatEmitEvent): void {
if (this.isDrag) {
if (this.isDrag ) {
let parentId
if (this.pos == 0) {
parentId = event.node.key
@ -278,6 +278,14 @@ export class CollectionToolsComponent implements OnInit {
isDrag //是否可以拖动
pos//放置位置
beforeDrop = (arg: NzFormatBeforeDropEvent) => {
if(!this.isEditPattern){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('查看模式不能拖拽', '确定', config)
this.isDrag = false
return of(false);
}
if (arg.dragNode.origin.isDataNode && arg.node.level === 0) {//如果为数据节点则不允许拖到一级节点
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';

Loading…
Cancel
Save