[合并]合并代码

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html

@@ -220,37 +220,50 @@
                         <div class="boxHead">
                             <span>{{item.groupName}}</span>
                         </div>
-                        <div class="boxBody" *ngFor="let element of item.attribute">
+                        <div class="boxBody" *ngFor="let element of item.attribute;let i=index">
                             <div class="boxBodyHead">
                                 <span>{{element.headName}}</span>
+                                <img src="../../../assets/images/deleteblue.png" *ngIf="element.level==1" (click)='delTd(key,i)'>
+                                <img src="../../../assets/images/add.png" *ngIf="element.level==1" (click)='addTd(key,i)'>
                             </div>
                             <div class="body">
                                 <!--表格类型-->
                                 <table *ngIf="element.level==1">
-                                    <thead>
+                                  <thead>
-                                        <th *ngFor="let itemth of element.tableth;let tablethi=index;TrackBy:trackByFn">
+                                     <th *ngFor="let itemth of element.tableth;let tablethi=index;TrackBy:trackByFn"><input type="text"
-                                            <input type="text" placeholder="请输入内容"
+                                       placeholder="请输入内容" [(ngModel)]="element.tableth[tablethi]"></th>
-                                                [(ngModel)]="element.tableth[tablethi]">
+                                  </thead>
-                                        </th>
+                                  <tbody>
-                                    </thead>
+                                     <!--  <tr>
+                                          <td><input type="text"placeholder="请输入内容" ></td>
+                                          <td><input type="text"placeholder="请输入内容" ></td>
+                                          <td><input type="text"placeholder="请输入内容" ></td>
+                                      </tr> -->
+                                      <tr *ngFor="let itemtr of element.tabletr">
+                                          <td *ngFor="let itemtd of itemtr.tabletd;let tabletdi=index;TrackBy:trackByFn">
+                                              <input type="text" placeholder="请输入" [(ngModel)]="itemtr.tabletd[tabletdi]">
+                                          </td>
+                                      </tr>
+                                  </tbody>
                                 </table>
                                 <!--文本区域-->
-                                <textarea style="width: 100%;height: 100px;" *ngIf="element.level==3"
+                                <textarea style="width: 99%;height: 100px;" *ngIf="element.level==3" [(ngModel)]="element.tableth"></textarea>
-                                    [(ngModel)]="element.tableth"></textarea>
                                 <!--输入框-->
                                 <div class="inputtext" *ngIf="element.level==2">
-                                    <div class="inputj" style="height: 100%;width: 100%;"
+                                  <div class="inputj" style="height: 100%;width: 100%;"
-                                        *ngFor="let itemth of element.tableth;let tablethi=index;TrackBy:trackByFn">
+                                   *ngFor="let itemth of element.tableth;let tablethi=index;TrackBy:trackByFn">
-                                        <div style="height: 100%;width: 100%;"
+                                    <div style="height: 100%;width: 100%;"
-                                            *ngFor="let itemthj of element.tableth[tablethi];let tablethj=index;TrackBy:trackByFn">
+                                   *ngFor="let itemthj of element.tableth[tablethi];let tablethj=index;TrackBy:trackByFn">
-                                            <input type="text" placeholder="请输入内容"
+                                   <input type="text" placeholder="请输入内容" style="background-color: #E8E9E9;width: 40%;"
-                                                style="background-color: #E8E9E9;width: 40%;"
+                                      [(ngModel)]="itemthj.head">
-                                                [(ngModel)]="itemthj.head">
+                                     <input type="text" placeholder="请输入内容" style="width: 60%;" [(ngModel)]="itemthj.body">
-                                            <input type="text" placeholder="请输入内容" style="width: 60%;"
-                                                [(ngModel)]="itemthj.body">
-                                        </div>
-                                    </div>
                                 </div>
+                               </div>
+                            </div>
+                            <!--树形图-->
+                             <div style="height: 300px;width: 100%;" *ngIf="element.level==4">
+                                 <tree-diagram [data]="element.tableth" [(ngModel)]="element.tableth"></tree-diagram>
+                             </div>
                             </div>
                         </div>
                     </div>

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss

@@ -230,6 +230,7 @@
                 height: 100%;
                 display: flex;
                 flex-direction: column;
+                overflow-y: auto;
                 .boxHead{
                     height: 40px;
                     width: 100%;
@@ -261,6 +262,14 @@
                             line-height: 40px;
                             color: #B99A00;
                         }
+                        img{
+                            cursor: pointer;
+                            width: 20px;
+                            height: 20px;
+                            float: right;
+                            margin-top: 10px;
+                            margin-right: 10px;
+                        }
                     }
                     .body{
                         width: 100%;
@@ -290,6 +299,21 @@
                                 outline: none;
                             }
                         }
+                        td{
+                            border: 1px solid #999;
+                            height: 40px;
+                            font-size: 16px;
+                            text-align: center;
+                            input {
+                                background-color: #FFFFFF;
+                                text-align: center;
+                                height: 100%;
+                                width: 100%;
+                                font-size: 16px;
+                                border: none;
+                                outline: none;
+                            }
+                        }
                         .inputtext {
                             width: 100%;
                             height: 100%;

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts

@@ -4,13 +4,13 @@
  * @Author: sueRimn
  * @Date: 2021-06-16 13:56:54
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-06-17 10:01:26
+ * @LastEditTime: 2021-06-17 17:05:09
  */
 import { HttpClient } from '@angular/common/http';
 import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { MatSnackBar } from '@angular/material/snack-bar';
+import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
 
 @Component({
   selector: 'app-create-plan-online-five',
@@ -30,8 +30,28 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
     console.log('级别', this.planLevel)
     this.getTemplateData()
     this.getUnitData()
+    this.tree = {
+      json:this.treedate,
+      config: this.treeConfig
+  };
+  }
+//树形结构数据
+treedate=[
+  {
+    "guid": "bc4c7a02-5379-4046-92be-12c67af4295a",
+    "displayName": "Elentrix",
+    "children": [
+      /* "85d412c2-ebc1-4d56-96c9-7da433ac9bb2",
+      "28aac445-83b1-464d-9695-a4157dab6eac" */
+    ]
   }
   
+]
+tree
+treeConfig = {
+  nodeWidth: 90,
+  nodeHeight: 60
+};
 
   //获得单位信息
   unitData: any
@@ -51,6 +71,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
 
   selectedItem: string = '封面'
   clickTitleItem(item) {
+    this.addNumber=-1
     item == '封面' ? this.selectedItem = '封面' : this.selectedItem = item.groupName
     if (this.selectedItem == '重点图示') {
       this.getAllBuildings()
@@ -202,15 +223,6 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
     dialogRef.afterClosed().subscribe((data) => { });
   }
 
-
-
-
-  //input key值，一个字符焦点消失问题
-  trackByFn(index) {
-    return index
-  }
-
-
   //正常上传
   async uploadFile(companyId: string, planId: string, file) {
     let formData = new FormData()
@@ -221,6 +233,46 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
       })
     })
   }
+  //input key值，一个字符焦点消失问题
+  trackByFn(index){
+    return index
+  }
+  //表格增加一行
+  addNumber=-1
+  addTd(key,i){
+    this.addNumber++
+    //this.planTemplateData[key].attribute[i].push({tabletr:[]})
+    if(this.planTemplateData[key].attribute[i].tabletr==undefined){
+      this.planTemplateData[key].attribute[i].tabletr=[]
+    }
+    this.planTemplateData[key].attribute[i].tabletr.push({tabletd:[]})
+    for(var j=0;j<this.planTemplateData[key].attribute[i].tableth.length;j++){
+      if(this.planTemplateData[key].attribute[i].tabletr!=undefined){
+        this.planTemplateData[key].attribute[i].tabletr[this.planTemplateData[key].attribute[i].tabletr.length-1].tabletd.push('')
+      }
+      else{
+        this.planTemplateData[key].attribute[i].tabletr[this.addNumber].tabletd.push('')
+      }
+    }
+    console.log(this.planTemplateData)
+  }
+  //表格删除一行
+  delTd(key,i){
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
+    if(this.planTemplateData[key].attribute[i].tabletr!=undefined){
+      this.planTemplateData[key].attribute[i].tabletr.splice(this.planTemplateData[key].attribute[i].tabletr.length-1,1)
+      this.addNumber--
+      if(this.planTemplateData[key].attribute[i].tabletr.length==0){
+        this.addNumber=-1
+      }
+    }else{
+      this.snackBar.open('请先增加一行!','确定',config);
+    }
+    
+  }
+
   //分段上传
   sectionUpload(companyId: string, planId: string, file) {
     let data = { filename: file.name }

src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@@ -209,8 +209,8 @@ export class EntryPlanLookComponent implements OnInit {
         if (e.attachmentUrls == null) {
           window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}`)
         }
-        else {
+        else{
-          let body = JSON.stringify("");
+          let body = {};
           let resetAudit = true
           let headers = new HttpHeaders({
             'Content-Type': 'text/json'
@@ -1209,9 +1209,12 @@ export class ChangeName {
     let options = {
       headers
     };
-    let body = JSON.stringify(value.name);
+    let body = {
+      name:value.name
+    }
+    let body2d=JSON.stringify(value.name)
     if (this.data.element.planType == 1) {//如果是二维预案
-      this.http.put(`/api/PlanComponents2D/${this.data.element.id}`, body, options).subscribe(data => {
+      this.http.put(`/api/PlanComponents2D/${this.data.element.id}`, body2d, options).subscribe(data => {
         this.dialogRef.close("success");
       })
     } else {

src/app/plan-management/plan-management.module.ts

@@ -67,7 +67,7 @@ import { ReinforcePlanComponent } from './reinforce-plan/reinforce-plan.componen
 import { CreatePlanOnlineFiveComponent, OpenPlanToolDialog } from './create-plan-online-five/create-plan-online-five.component';
 import { CreatePlanOnlineThreeComponent } from './create-plan-online-three/create-plan-online-three.component'
 import { UiModule } from '../ui/ui.module';
-
+import { TreeDiagramModule } from '../ui/ng-tree-diagram/src/ng-tree-diagram';
 
 @NgModule({
   declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName,
@@ -120,7 +120,8 @@ import { UiModule } from '../ui/ui.module';
     MatToolbarModule,
     MatTooltipModule,
     MatTreeModule,
-    UiModule
+    UiModule,
+    TreeDiagramModule
   ],
   exports: [PlanType, AuditSatus, PlanLevel, state]
 })

src/app/ui/plan-template/addgroup.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-05-24 10:08:22
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-06-01 14:25:50
+ * @LastEditTime: 2021-06-18 15:17:41
 -->
 <div class="box">
     <div class="top">

src/app/ui/plan-template/plan-template.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-05-19 15:50:20
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-06-16 10:10:05
+ * @LastEditTime: 2021-06-18 10:55:32
 -->
 <div class="box">
   <div class="boxleft">
@@ -251,7 +251,7 @@
             </div>
             <!--树形图-->
             <div style="height: 500px;width: 100%;" *ngIf="element.level==4">
-              <tree-diagram [data]="element.tableth" [(ngModel)]="element.tableth"></tree-diagram>
+              <tree-diagram [data]="element.tableth" ></tree-diagram>
             </div>
           </div>
         </div>

src/app/ui/plan-template/plan-template.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-05-31 10:40:01
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-06-15 13:54:16
+ * @LastEditTime: 2021-06-18 15:15:40
  */
 
 import { Component, Inject, OnInit,ViewEncapsulation } from '@angular/core';
@@ -658,8 +658,8 @@ export class addGroup{
   }
   //复选框点击事件
   clicki
-  checkClick(i){
+  checkClick(){
-    this.clicki=i
+    //this.clicki=i
     //console.log(e,item)
     /* if (e.checked) {
       this.groupName.push(item)
@@ -670,7 +670,7 @@ export class addGroup{
         }
       })
     } */
-    //console.log(this.data)
+    console.log(this.data)
   }
   //确定提交
   newGroup(){