From a692ca44fe8703fca2a4ddf95645d3253a43730d Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Mon, 29 Nov 2021 11:25:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8A=A0=E6=B2=B9=E7=AB=99?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/left-domain/left-domain.component.html | 15 ++++++++++++--- src/app/pages/plan/plan.component.html | 4 ++++ src/app/pages/plan/plan.component.scss | 1 + src/app/pages/plan/plan.component.ts | 15 ++++++++------- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html index 7960582..3aacebb 100644 --- a/src/app/pages/left-domain/left-domain.component.html +++ b/src/app/pages/left-domain/left-domain.component.html @@ -101,8 +101,7 @@

- - +

@@ -126,8 +125,18 @@

+
+
+

连接的加油机

+

连接的油罐

+
+
+

+

+
+
-

设计图纸

+

设计图纸

diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index 8769b30..14d41b5 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -57,6 +57,10 @@
+
+
方向
+
+
详情
diff --git a/src/app/pages/plan/plan.component.scss b/src/app/pages/plan/plan.component.scss index bec982c..a14884e 100644 --- a/src/app/pages/plan/plan.component.scss +++ b/src/app/pages/plan/plan.component.scss @@ -194,6 +194,7 @@ padding: 0 20px; margin-bottom: 5px; .natureTitle{ margin-bottom: 5px; height: 20px; line-height: 20px; } + input{ width: 100%; height: 28px; background: rgba(145, 204, 255, 0.41); border: 1px solid #91CCFF; padding: 0; resize: none; outline: none; } textarea{ width: 100%; height: 75px; background: rgba(145, 204, 255, 0.41); border: 1px solid #91CCFF; padding: 0; resize: none; outline: none; } .natureImg{ margin-bottom: 5px; img{ width: auto; height: auto; max-height: 120px; } } .natureUpload{ margin: 0; text-align: center; width: 50px; height: 50px; line-height: 50px; } diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index e88e00d..a0a3c25 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -50,7 +50,7 @@ export class PlanComponent implements OnInit { public userMode: boolean = ModeManager.s_isMakeMode; //是否为 内部权限 public bucketName: string = ObjectsService.getFullPath("文件路径"); //当前桶名 public isShowLoading: boolean = true; //显隐 loading加载条 - public companyData: any; //当前加油站 信息 + public companyData: any; //当前加油站所属组织机构 data ngOnInit(): void { PlanComponent.instance = this; @@ -79,13 +79,14 @@ export class PlanComponent implements OnInit { } ngAfterViewInit(): void { - let simpleData: InsitutionDataSimple = new InsitutionDataSimple(); - simpleData.id = 1; //this.companyData.id || 来自选中的单位的信息 ,测试：1 - simpleData.key = "ceshi"; //`${this.companyData.id}` || 测试："ceshi" - simpleData.name = this.companyData.displayName || "测试"; //来自选中的单位的信息 ,测试："测试" - this.getGasStationBaseInfo().then((res: any)=>{ //获取单位 基本信息 - let has3dData = true;//是否有三维数据，来自选中单位的信息 + console.log(res,"当前加油站信息") + let simpleData: InsitutionDataSimple = new InsitutionDataSimple(); + simpleData.id = res.id || 1; //来自选中的单位的信息 ,测试：1 + simpleData.key = `${res.id}` || "ceshi"; //测试："ceshi" + simpleData.name = res.stationName || "测试"; //来自选中的单位的信息 ,测试："测试" + + let has3dData = res.hasBuildingInfo; //是否有三维数据，来自选中单位的信息 let loginStatus = StatusManager.getStatus(LoginSatus); if (ModeManager.institutionDemoKey == ModeManager.c_demoKey_null) { //无指定测试单位，则为正式启动，根据当前单位key寻找 if (has3dData) { //如果已经有三维数据，直接进入