[天津版本] 菜单, 基本信息(组织机构), 秘钥

src/app/navigation/navigation.component.html

@@ -9,8 +9,8 @@
                 <!-- basicinfo -->
                 <li [routerLink]="['/datacollection/basicinfo']" routerLinkActive="router-link-active">基本信息</li>
                 <!-- plan -->
-                <li [routerLink]="['/datacollection/plan']" routerLinkActive="router-link-active">平面图</li>
-                <li [routerLink]="['/datacollection/collectionTools']" routerLinkActive="router-link-active">H5平面图</li>
+                <!-- <li [routerLink]="['/datacollection/plan']" routerLinkActive="router-link-active">平面图</li> -->
+                <li [routerLink]="['/datacollection/collectionTools']" routerLinkActive="router-link-active">平面图</li>
                 <!-- allaround -->
                 <li [routerLink]="['/datacollection/allaround']" routerLinkActive="router-link-active">四周毗邻</li>
                 <!-- fire-fighting-device -->

src/app/ui/basicinfo/basicinfo.component.html

@@ -63,7 +63,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="inputbox" style="width: 700px;">
+                            <!-- <div class="inputbox" style="width: 700px;">
                                 <span style="color: red;">*</span>
                                 <span>辖区中队：</span>
                                 <mat-form-field style="width: 538px;">
@@ -73,7 +73,7 @@
                                     (focus)="openorganizationbox()"
                                     readonly="value" >
                                 </mat-form-field>
-                            </div>
+                            </div> -->
                             <div id="organizationbox" class="organizationbox" *ngIf="isorganizationbox">
                                 <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
                                     <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  (click)='add(node)' class="organizationlist">

src/app/ui/basicinfo/basicinfo.component.scss

@@ -43,7 +43,7 @@
                 position: absolute;
                 bottom: -495px;
                 text-align: center;
-                margin-bottom:20px;
+                margin-bottom:50px;
                 button{
                     margin: 0 4px;
                 }

src/app/ui/basicinfo/basicinfo.component.ts

@@ -103,7 +103,7 @@ export class BasicinfoComponent implements OnInit {
   getorganization() {
     this.http.get('/api/Organizations').subscribe(
       (data: any) => {
-        this.allorganizing = data;
+        this.allorganizing = JSON.parse( JSON.stringify(data) )
         this.dataSource.data = this.tree.toTree(data);
         this.getunitinfo();
       }
@@ -1032,7 +1032,7 @@ export class BasicinfoComponent implements OnInit {
           y: 0
         },
         modifiedTime: time,
-        organizationId: this.selectedorganizationid,
+        organizationId: this.allorganizing.length? this.allorganizing[0].id : null,
         organizationName: null,
         buildingTypes: [
           {