diff --git a/src/app/key-unit/edit-unit-info/edit-unit-info.component.html b/src/app/key-unit/edit-unit-info/edit-unit-info.component.html index d2b71c7..62440f4 100644 --- a/src/app/key-unit/edit-unit-info/edit-unit-info.component.html +++ b/src/app/key-unit/edit-unit-info/edit-unit-info.component.html @@ -5,7 +5,7 @@ - + @@ -51,7 +51,12 @@ - + + + + + + diff --git a/src/app/key-unit/special-warning/special-warning.component.html b/src/app/key-unit/special-warning/special-warning.component.html index fba6576..45b5cd1 100644 --- a/src/app/key-unit/special-warning/special-warning.component.html +++ b/src/app/key-unit/special-warning/special-warning.component.html @@ -1,13 +1,13 @@
- +
delete
- +
diff --git a/src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html b/src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html index c9d9edb..7a11dd8 100644 --- a/src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html +++ b/src/app/key-unit/view-unit-details-plan/view-unit-details-plan.component.html @@ -1,4 +1,4 @@ - + @@ -44,7 +44,12 @@ - + + + + + + diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index aa4f7a2..d94e6bf 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -47,16 +47,16 @@
天气 - 气温
-
风力 - @@ -66,7 +66,7 @@ 风向 - @@ -92,7 +92,7 @@ -
+
open_with @@ -400,9 +400,8 @@ style="width: 33%;position: absolute;right: 10px;top: 1px;opacity: 0;z-index: 100;cursor: pointer;height: 21px;">
添加
- - + (click)="imgNumBeyond()" + *ngIf="isEditPattern">添加
diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss index 487c95c..0a40338 100644 --- a/src/app/ui/collection-tools/collection-tools.component.scss +++ b/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; diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 8bef174..10e1867 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/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';