Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/system-management/organization/organization.component.html

@@ -2,7 +2,8 @@
   <div class="topbox">
     <div class="lefttop">
       <span>组织机构列表</span>
-      <span><img style="vertical-align: top;" src="../../../assets/images/icon/orgrey.png" alt=""> {{totalCount}}个单位</span>
+      <span><img style="vertical-align: top;" src="../../../assets/images/icon/orgrey.png" alt="">
+        {{totalCount}}个单位</span>
     </div>
     <div class="righttop">
       <!-- <form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
@@ -16,7 +17,7 @@
         </nz-form-item>
       </form> -->
       <nz-input-group nzPrefixIcon="search">
-        <input type="text" nz-input placeholder="请输入单位" [(ngModel)]="searchValue"/>
+        <input type="text" nz-input placeholder="请输入单位" [(ngModel)]="searchValue" />
       </nz-input-group>
       <button nz-button nzType="primary" (click)="addOr()"><i nz-icon nzType="plus-circle"
           nzTheme="outline"></i>新增</button>
@@ -26,9 +27,9 @@
     <span>组织机构</span>
     <span>操作</span>
   </div>
-  <nz-tree [nzHideUnMatched]='true' [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes" [nzExpandAll]="nzExpandAll" [nzExpandedKeys]="defaultExpandedKeys"
+  <nz-tree [nzHideUnMatched]='true' [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes"
-    (nzClick)="nzClick($event)" (nzContextMenu)="nzClick($event)" (nzCheckBoxChange)="nzCheck($event)"
+    [nzExpandAll]="nzExpandAll" [nzExpandedKeys]="defaultExpandedKeys" [nzTreeTemplate]="nzTreeTemplate" nzDraggable
-    (nzExpandChange)="nzCheck($event)" [nzTreeTemplate]="nzTreeTemplate">
+    nzBlockNode (nzOnDrop)="nzEvent($event)" [nzBeforeDrop]="beforeDrop">
   </nz-tree>
   <ng-template #nzTreeTemplate let-node let-origin="origin">
     <div class="nodebox">
@@ -40,4 +41,4 @@
       </span>
     </div>
   </ng-template>
-</div>
+</div>

src/app/system-management/organization/organization.component.ts

@@ -7,6 +7,10 @@ import { NzModalService } from 'ng-zorro-antd/modal';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { AddorComponent } from './addor/addor.component';
 import { EditorComponent } from './editor/editor.component';
+
+import { NzFormatBeforeDropEvent } from 'ng-zorro-antd/tree';
+import { Observable, of } from 'rxjs';
+import { delay } from 'rxjs/operators';
 @Component({
   selector: 'app-organization',
   templateUrl: './organization.component.html',
@@ -24,7 +28,6 @@ export class OrganizationComponent implements OnInit {
   }
   //搜索框提交
   submitForm(): void {
-    console.log(12345)
     for (const i in this.validateForm.controls) {
       this.validateForm.controls[i].markAsDirty();
       this.validateForm.controls[i].updateValueAndValidity();
@@ -45,7 +48,6 @@ export class OrganizationComponent implements OnInit {
       params: params
     }).subscribe((data: any) => {
       this.totalCount = data.result.totalCount
-      // console.log('组织机构',data.result.totalCount)
       data.result.items.forEach(element => {
         element.key = element.id
         element.title = element.displayName
@@ -63,33 +65,6 @@ export class OrganizationComponent implements OnInit {
 
   nodes: any[] = []
 
-  nzClick(event: NzFormatEmitEvent): void {
-    // console.log(event);
-    console.log('展开节点', this.nzTreeComponent.getExpandedNodeList())
-
-
-  }
-
-  nzCheck(event: NzFormatEmitEvent): void {
-    console.log(event);
-  }
-
-  // nzSelectedKeys change
-  nzSelect(keys: string[]): void {
-    console.log(keys, this.nzTreeComponent.getSelectedNodeList());
-  }
-
-  ngAfterViewInit(): void {
-    // get node by key: '10011'
-    console.log(this.nzTreeComponent.getTreeNodeByKey('10011'));
-    // use tree methods
-    console.log(
-      this.nzTreeComponent.getTreeNodes(),
-      this.nzTreeComponent.getCheckedNodeList(),
-      this.nzTreeComponent.getSelectedNodeList(),
-      this.nzTreeComponent.getExpandedNodeList()
-    );
-  }
 
   addOr(node?: any) {
     // console.log(node)
@@ -200,4 +175,12 @@ export class OrganizationComponent implements OnInit {
       }
     });
   }
+
+
+  nzEvent(event: NzFormatEmitEvent): void {
+
+  }
+  beforeDrop = (arg: NzFormatBeforeDropEvent) => {
+
+  }
 }

src/index.html

@@ -10,8 +10,5 @@
 <body>
   <app-root></app-root>
 </body>
-<script src="./assets/js/signalr.js"></script>
 <script src="./assets/js/abp.js"></script>
-<!-- <script src="./assets/js/abp.signalr-client.js"></script> -->
-<!-- <script src="../../Sinopec-Anxin/node_modules/angular-load/angular-load.js"></script> -->
 </html>