diff --git a/proxy.config.json b/proxy.config.json
index 8129e12..e61e510 100644
--- a/proxy.config.json
+++ b/proxy.config.json
@@ -1,6 +1,6 @@
{
"/api": {
- "target": "http://121.36.37.70:8201/",
+ "target": "http://10.81.73.39:8000/",
"生产": "http://10.81.73.39:8000/",
"测试": "http://121.36.37.70:8201/",
"生产2": "http://183.194.244.232:8088/",
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index e0d9402..1adb160 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -30,6 +30,7 @@ import { registerLocaleData } from "@angular/common";
import zh from "@angular/common/locales/zh";
import { KeyUnitModule } from "./key-unit/key-unit.module";
import { MatTabsModule } from "@angular/material/tabs";
+import { PlanManagementModule } from "./plan-management/plan-management.module";
registerLocaleData(zh);
@NgModule({
declarations: [
@@ -59,7 +60,8 @@ registerLocaleData(zh);
MatProgressSpinnerModule,
UiModule,
KeyUnitModule,
- MatTabsModule
+ MatTabsModule,
+ PlanManagementModule,
],
providers: [httpInterceptorProviders, CacheTokenService, TreeService],
bootstrap: [AppComponent],
diff --git a/src/app/external-links-plan/external-links-plan.component.html b/src/app/external-links-plan/external-links-plan.component.html
index 6551685..cdb65b3 100644
--- a/src/app/external-links-plan/external-links-plan.component.html
+++ b/src/app/external-links-plan/external-links-plan.component.html
@@ -55,12 +55,14 @@
-
+
+
+
diff --git a/src/app/external-links-plan/external-links-plan.component.ts b/src/app/external-links-plan/external-links-plan.component.ts
index 19cc2e7..1741c02 100644
--- a/src/app/external-links-plan/external-links-plan.component.ts
+++ b/src/app/external-links-plan/external-links-plan.component.ts
@@ -41,21 +41,47 @@ export class ExternalLinksPlanComponent implements OnInit {
);
sessionStorage.setItem("editable", "0");
sessionStorage.setItem("planName", data.name);
- this.router.navigate([`/linksPlan`], {
- queryParams: {
+ let queryParams = {};
+ if (data.webTextData && data.planType === 16) {
+ queryParams = {
id: data.companyId,
planId: data.id,
orName: data.company.organizationName,
orId: data.company.organizationId,
- },
+ companyId: data.companyId,
+ planName: data.name,
+ unitName: data.companyName,
+ planCategory: data.planCategory,
+ unitTypeId: data.company.buildingTypes[0].id,
+ pattern: "false",
+ };
+ } else {
+ queryParams = {
+ id: data.companyId,
+ planId: data.id,
+ orName: data.company.organizationName,
+ orId: data.company.organizationId,
+ };
+ }
+ this.router.navigate([`/linksPlan`], {
+ queryParams: queryParams,
});
this.planData = data;
//如果是查看文件类型
+
+ console.log("data.planType", data.planType);
if (data.planType != 1 && data.planType != 2) {
- this.fetchUrl = data.attachmentUrls[0];
+ this.fetchUrl = data.attachmentUrls ? data.attachmentUrls[0] : "";
var index = this.fetchUrl.indexOf("/");
- //图片
+
+ // 在线编制预案
+ if (data.webTextData && data.planType === 16) {
+ this.showType = 2;
+ return;
+ }
+
+ //全景图图片
if (this.fetchUrl.substr(0, index) == "psw") {
this.showType = 1;
var obj = document.getElementById("viewer");
@@ -122,21 +148,6 @@ export class ExternalLinksPlanComponent implements OnInit {
if (this.planData.planMode == 1 || this.planData.planMode == 2) {
//预案planMode=2时, 跳查看页面组件
this.showType = 3;
- // this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => {
- // console.log(data);
- // data && data.company ? (this.companyData = data.company) : null;
- // sessionStorage.setItem(
- // "buildingTypeId",
- // this.companyData.buildingTypes.length
- // ? this.companyData.buildingTypes[0].id
- // : undefined
- // );
- // sessionStorage.setItem("companyId", data.companyId);
- // sessionStorage.setItem("planId", this.planId);
- // sessionStorage.setItem("editable", "0");
- // sessionStorage.setItem("planName", this.planData.name);
-
- // });
} else if (this.planData.planMode == 3) {
//网页地址
let localhostPath = window.document.location.href.substring(
diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts
index 32c20d5..1d203f8 100644
--- a/src/app/plan-management/plan-management.module.ts
+++ b/src/app/plan-management/plan-management.module.ts
@@ -209,6 +209,12 @@ import { NzTreeModule } from "ng-zorro-antd/tree";
NzSpinModule,
NzTreeModule,
],
- exports: [PlanType, AuditSatus, PlanLevel, state],
+ exports: [
+ PlanType,
+ AuditSatus,
+ PlanLevel,
+ state,
+ CreatePlanOnlineFiveComponent,
+ ],
})
export class PlanManagementModule {}
diff --git a/src/index.html b/src/index.html
index 3931af2..93a46ec 100644
--- a/src/index.html
+++ b/src/index.html
@@ -19,14 +19,14 @@
-
-
+ -->