From a0c599f3f67ad42a73206e105525263d2ad38460 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 2 Sep 2021 15:34:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-plan-online-five.component.html | 3 ++- .../create-plan-online-five.component.scss | 1 + .../create-plan-online-five.component.ts | 14 ++++---------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html index 5709cf1..b1e9429 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -2,7 +2,8 @@
+ [ngClass]="{'selectedItem': selectedItem == item.groupName}" [title]="item.groupName" + [cdkDragDisabled]="item.groupName == '封面'"> {{key + 1}}.{{item.groupName}}
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss index 6a84615..2727619 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss @@ -39,6 +39,7 @@ overflow: hidden; /*超出部分隐藏*/ white-space: nowrap; /*不换行*/ text-overflow: ellipsis; /*超出部分文字以...显示*/ + user-select: none; } .item:hover { background: #e8f4fe; diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts index 2e423ae..e659797 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts @@ -65,9 +65,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { this.pattern='edit' } this.getUnitData() - //this.getpili() - this.getOrganizations(); - //this.getAllBuildings() + this.getOrganizations() } zdysearch='' organizationName: any //当前单位组织机构名称 @@ -168,6 +166,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { pilinData=[] async getpili(){ let result = await new Promise((resolve) =>{ + console.log(1111,this.planTemplateData) this.planTemplateData[1].building.forEach(element => { let id = {buildingId:element.buildingId} this.http.get('/api/BuildingAdjoins',{params:id}).subscribe(data=>{ @@ -348,13 +347,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } }); - - /* this.planTemplateData[1].building[0].body[0].attinf[0].value=this.planTemplateData[1].attribute[0].attinf[0].olddata = this.unitData.usci - this.planTemplateData[1].attribute[0].attinf[1].value=this.planTemplateData[1].attribute[0].attinf[1].olddata = this.unitData.buildingTypes[0].name - this.planTemplateData[1].attribute[0].attinf[2].value=this.planTemplateData[1].attribute[0].attinf[2].olddata = this.unitData.contacts - this.planTemplateData[1].attribute[0].attinf[3].value=this.planTemplateData[1].attribute[0].attinf[3].olddata = this.unitData.phone - this.planTemplateData[1].attribute[0].attinf[4].value=this.planTemplateData[1].attribute[0].attinf[4].olddata = this.unitData.organizationName - this.planTemplateData[1].attribute[0].attinf[5].value=this.planTemplateData[1].attribute[0].attinf[5].olddata = this.unitData.address */ + console.log(this.planTemplateData) } /* else if (this.selectedItem == '单位概况') { @@ -366,6 +359,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { drop(event: CdkDragDrop) { moveItemInArray(this.planTemplateData, event.previousIndex, event.currentIndex); + console.log('拖拽标题',this.planTemplateData) } //获取建筑信息