diff --git a/src/app/ui/data-push/data-push.component.scss b/src/app/ui/data-push/data-push.component.scss
index b1ab0c6..f7762b0 100644
--- a/src/app/ui/data-push/data-push.component.scss
+++ b/src/app/ui/data-push/data-push.component.scss
@@ -1,7 +1,7 @@
.content {
width: 100%;
height: 100%;
- overflow: hidden;
+ // overflow: hidden;
display: flex;
}
diff --git a/src/app/ui/data-push/data-push.component.ts b/src/app/ui/data-push/data-push.component.ts
index c76671f..4bf58bb 100644
--- a/src/app/ui/data-push/data-push.component.ts
+++ b/src/app/ui/data-push/data-push.component.ts
@@ -17,13 +17,15 @@ export class DataPushComponent implements OnInit {
routers:any = [
{name:'基本信息', url: '/ui/plan/basicInfo'},
{name:'平面图', url: '/ui/plan/planarGraph'},
- {name:'四周毗邻', url: '/ui/plan/bbb'},
- {name:'消防设施', url: '/ui/plan/ccc'},
- {name:'重点部位', url: '/ui/plan/ddd'},
+ {name:'四周毗邻', url: '/ui/plan/allaround'},
+ {name:'消防设施', url: '/ui/plan/fire-fighting-device'},
+ {name:'重点部位', url: '/ui/plan/key-site'},
{name:'功能分区', url: '/ui/plan/eee'},
- {name:'实景图', url: '/ui/plan/fff'},
- {name:'上传CAD', url: '/ui/plan/ggg'},
- {name:'三维预案', url: '/ui/plan/hhh'},
+ {name:'实景图', url: '/ui/plan/realistic-picture'},
+ {name:'上传CAD', url: '/ui/plan/ggg'}
+ // {name:'三维预案', url: '/ui/plan/3DPlan'},
]
-
+ open3D(){
+ window.open("http://39.106.78.171:8088/%E5%B9%BF%E8%A5%BF%E8%B4%B5%E6%B8%AF%E5%B8%82%E4%B8%89%E7%BB%B4%E7%81%AD%E7%81%AB%E9%A2%84%E6%A1%88/%5B%E7%BD%91%E9%A1%B5%E7%89%88%5D%E8%B4%B5%E6%B8%AF%E6%B2%B9%E5%BA%93%E4%B8%89%E7%BB%B4%E7%81%AD%E7%81%AB%E9%A2%84%E6%A1%88/")
+ }
}
diff --git a/src/app/ui/fire-fighting-device-look/addGrouping.component.ts b/src/app/ui/fire-fighting-device-look/addGrouping.component.ts
new file mode 100644
index 0000000..ef3ae9d
--- /dev/null
+++ b/src/app/ui/fire-fighting-device-look/addGrouping.component.ts
@@ -0,0 +1,69 @@
+import { Component, OnInit, Inject } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
+import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+
+
+
+@Component({
+ selector: 'imgsdatadetail',
+ templateUrl: './addGrouping.html',
+ styleUrls: ['./fire-fighting-device.component.scss']
+ })
+export class ImgsDataDetail2 {
+
+ constructor(private http: HttpClient,public dialogRef: MatDialogRef
,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
+
+ ngOnInit(): void {
+
+ }
+
+ ngAfterViewInit(): void{
+
+ }
+
+ //提交表单
+ onSubmit (e) {
+ if (this.data.buildingId) { //建筑新建内置项
+ let repeat = this.data.item.facilityItems.find(items=>items.name==e.name)
+ if (repeat==undefined) {
+ let header = {buildingId:this.data.buildingId, groupId:this.data.item.id}
+ let msg = {
+ isBuiltin: false,
+ details: '',
+ name: e.name,
+ isEachFloor: false,
+ order: this.data.item.facilityItems.length? this.data.item.facilityItems[this.data.item.facilityItems.length-1].order+1 : 0}
+ this.http.post('/api/CompanyAccount/BuildingFacilityItems',msg,{params:header}).subscribe(data=>{
+ this.dialogRef.close(data); })
+ } else {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('当前分组下禁止创建名称相同内置项','确定',config);
+ }
+ } else { //单位新建内置项
+ let repeat = this.data.facilityItems.find(item=>item.name==e.name)
+ if (repeat==undefined) {
+ let header = {groupId:this.data.id}
+ let msg = {
+ isBuiltin: false,
+ details: '',
+ name: e.name,
+ isEachFloor: false,
+ order: this.data.facilityItems.length? this.data.facilityItems[this.data.facilityItems.length-1].order+1 : 0}
+ this.http.post('/api/CompanyAccount/CompanyFacilityItems',msg,{params:header}).subscribe(data=>{
+ this.dialogRef.close(data); })
+ } else {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('当前分组下禁止创建名称相同内置项','确定',config);
+ }
+ } //else
+ }
+
+
+
+}
+
\ No newline at end of file
diff --git a/src/app/ui/fire-fighting-device-look/addGrouping.html b/src/app/ui/fire-fighting-device-look/addGrouping.html
new file mode 100644
index 0000000..916fc28
--- /dev/null
+++ b/src/app/ui/fire-fighting-device-look/addGrouping.html
@@ -0,0 +1,18 @@
+创建消防设施内置项
+
\ No newline at end of file
diff --git a/src/app/ui/fire-fighting-device-look/fire-fighting-device.component.html b/src/app/ui/fire-fighting-device-look/fire-fighting-device.component.html
new file mode 100644
index 0000000..44661db
--- /dev/null
+++ b/src/app/ui/fire-fighting-device-look/fire-fighting-device.component.html
@@ -0,0 +1,193 @@
+
+
+
+
+
+
暂无数据,请完善单位基本信息
+
+
{{item.name}}
+
+
+
+
+
+
+
+ 项目
+ 照片
+ 总数
+ 主要情况
+
+
+
+
+
+
+
+ {{items.name}}
+ 查看图片 {{items.total ? items.total : '总数: 0'}}
+
+
+
+
+
+ keyboard_arrow_down
+
+
+
+
+
+ {{header}}
+
+
+ {{body[header]? body[header] : '暂无数据'}}
+
+
+
+
+
楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}
+
+
+ {{header}}
+
+
+ {{body[header]? body[header] : '暂无数据'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{item.name}}
+
+
+
+
+
+
+
+ 项目
+ 照片
+ 总数
+ 主要情况
+
+
+
+
+
+
+
+ {{items.name}}
+ 查看图片 {{items.total ? items.total : '总数: 0'}}
+
+
+
+
+
+ keyboard_arrow_down
+
+
+
+
+
+ {{header}}
+
+
+ {{body[header]? body[header] : '暂无数据'}}
+
+
+
+
+
楼层/区域名称: {{tableMsg.name? tableMsg.name : '暂无名称'}}
+
+
+ {{header}}
+
+
+ {{body[header]? body[header] : '暂无数据'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{data.name}}
+
+
+
+
{{item.propertyName}}
+
+
+
,@Inject(MAT_DIALOG_DATA) public data,public dialog: MatDialog) {}
+
+ ngOnInit(): void {
+ this.data.images.forEach(element => {
+ element.newImageUrl = `${element.propertyValue}?x-oss-process=image/resize,m_fill,h_170,w_299`
+ });
+ }
+
+ //查看大图
+ seeImage (index) {
+ let data = {
+ allImages:this.data.images,
+ imgIndex: index}
+ let dialogRef = this.dialog.open(previewBigImg2,
+ {width: '1600px',
+ height:'900px',data});
+ }
+
+}
+
+
+
+@Component({
+ selector: 'previewBigImg',
+ templateUrl: './previewImg.html',
+ styleUrls: ['../realistic-picture-look/realistic-picture.component.scss']
+})
+export class previewBigImg2 {
+
+ constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data) { }
+ testSwiper: Swiper;
+
+ ngOnInit(): void {
+ this.allImages = this.data.allImages
+ this.allImages.forEach(element => {
+ element.previewImageUrl = `${element.propertyValue}?x-oss-process=image/auto-orient,1` //处理图片URL地址
+ });
+ }
+
+ ngAfterViewInit() {
+ this.testSwiper = new Swiper('.swiper-container', {
+ lazy: true,
+ initialSlide: this.data.imgIndex,
+ direction: 'horizontal',
+ loop: false,
+
+
+
+ // 如果需要前进后退按钮
+ navigation: {
+ nextEl: '.swiper-button-next',
+ prevEl: '.swiper-button-prev',
+ }
+ });
+ }
+
+ allImages:any; //展示所有的图片
+ rotationAngle:number=0; //旋转角度
+
+ //旋转图片
+ rotate () {
+ this.rotationAngle = this.rotationAngle+90
+ if (this.rotationAngle === 360) {this.rotationAngle = 0}
+ }
+
+}
+
\ No newline at end of file
diff --git a/src/app/ui/fire-fighting-device-look/previewImg.html b/src/app/ui/fire-fighting-device-look/previewImg.html
new file mode 100644
index 0000000..cd20d6a
--- /dev/null
+++ b/src/app/ui/fire-fighting-device-look/previewImg.html
@@ -0,0 +1,17 @@
+图片详情
+
+
+
+
+
+
+
+
+
+
+
+
+ refresh
\ No newline at end of file
diff --git a/src/app/ui/key-site-look/key-site.component.html b/src/app/ui/key-site-look/key-site.component.html
new file mode 100644
index 0000000..8af5827
--- /dev/null
+++ b/src/app/ui/key-site-look/key-site.component.html
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
重点部位情况
+
+
+ 重点部位名称
+
+ {{element.name}}
+
+
+
+ 重点部位所在位置
+
+ {{element.position}}
+
+
+
+ 建筑结构
+
+ {{element.structure}}
+
+
+
+ 使用性质
+
+ {{element.nature}}
+
+
+
+ 主要危险性
+
+ {{element.hazards}}
+
+
+
+ 图片
+
+ 查看图片
+
+
+
+
暂无数据,请前往平面图进行相关数据录入
+
+
+
+
+
+
+
+
+
+
重点部位情况
+
+
+ 重点部位名称
+
+ {{element.name}}
+
+
+
+ 重点部位所在位置
+
+ {{element.position}}
+
+
+
+ 建筑结构
+
+ {{element.structure}}
+
+
+
+ 使用性质
+
+ {{element.nature}}
+
+
+
+ 主要危险性
+
+ {{element.hazards}}
+
+
+
+ 图片
+
+ 查看图片
+
+
+
+
暂无数据,请前往平面图进行相关数据录入
+
+
+
+
+
+
+
图片详情
+
+
+
+
+
+
+
+
+
+
+
+
+ refresh
\ No newline at end of file
diff --git a/src/app/ui/key-site-look/keysiteimgs.component.ts b/src/app/ui/key-site-look/keysiteimgs.component.ts
new file mode 100644
index 0000000..fb90d71
--- /dev/null
+++ b/src/app/ui/key-site-look/keysiteimgs.component.ts
@@ -0,0 +1,55 @@
+import { Component, OnInit, Inject ,ViewChild} from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import Swiper from 'swiper';
+
+
+
+@Component({
+ selector: 'keysiteimgs',
+ templateUrl: './keysiteimgs.component.html',
+ styleUrls: ['./key-site.component.scss']
+ })
+
+export class KeySiteImgs2 {
+
+ constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data) { }
+ testSwiper: Swiper;
+
+ ngOnInit(): void {
+ this.allImages = []
+ this.data.forEach(element => {
+ element = `${element}?x-oss-process=image/auto-orient,1`
+ this.allImages.push(element)
+ });
+ }
+
+ ngAfterViewInit() {
+
+ this.testSwiper = new Swiper('.swiper-container', {
+ direction: 'horizontal',
+ loop: false,
+ lazy: true,
+ // 如果需要前进后退按钮
+ navigation: {
+ nextEl: '.swiper-button-next',
+ prevEl: '.swiper-button-prev',
+ }
+ });
+
+ }
+
+ allImages:any; //展示所有的图片
+ rotationAngle:number=0; //旋转角度
+
+ //旋转图片
+ rotate () {
+ this.rotationAngle = this.rotationAngle+90
+ if (this.rotationAngle === 360) {this.rotationAngle = 0}
+ }
+
+
+
+}
+
\ No newline at end of file
diff --git a/src/app/ui/realistic-picture-look/addRealPicture.html b/src/app/ui/realistic-picture-look/addRealPicture.html
new file mode 100644
index 0000000..542256f
--- /dev/null
+++ b/src/app/ui/realistic-picture-look/addRealPicture.html
@@ -0,0 +1,18 @@
+创建实景图分组
+
\ No newline at end of file
diff --git a/src/app/ui/realistic-picture-look/editRealPicture.html b/src/app/ui/realistic-picture-look/editRealPicture.html
new file mode 100644
index 0000000..820857d
--- /dev/null
+++ b/src/app/ui/realistic-picture-look/editRealPicture.html
@@ -0,0 +1,18 @@
+编辑实景图分组
+
\ No newline at end of file
diff --git a/src/app/ui/realistic-picture-look/previewImg.html b/src/app/ui/realistic-picture-look/previewImg.html
new file mode 100644
index 0000000..1cde6b9
--- /dev/null
+++ b/src/app/ui/realistic-picture-look/previewImg.html
@@ -0,0 +1,17 @@
+图片详情
+
+
+
+
+
+
+
+
+
+
+
+
+ refresh
\ No newline at end of file
diff --git a/src/app/ui/realistic-picture-look/realistic-picture.component.html b/src/app/ui/realistic-picture-look/realistic-picture.component.html
new file mode 100644
index 0000000..0f42fc6
--- /dev/null
+++ b/src/app/ui/realistic-picture-look/realistic-picture.component.html
@@ -0,0 +1,59 @@
+
+
+
+
+
+ folder {{item.name}}
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
+
+
+
check_circle
+
+
图片名称:
+
+
保存
+
删除
+
+
+
暂无数据
+
+
+
+
+
+
+
document.getElementById('uploadFile')).value = null //清空input框缓存
+ }else{ that.startUploading() }
+ } //onload
+ } else {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请选择或创建实景图文件夹','确定',config);
+ this.uploader.clearQueue(); //清空input控件文件
+ (document.getElementById('uploadFile')).value = null //清空input框缓存
+ }
+ }
+
+ //上传文件
+ startUploading () {
+ let file = this.file || null //获取上传的文件
+ let fileSize = file.size || null //上传文件的总大小
+ let shardSize = 5 * 1024 * 1024 //5MB一个分片
+ let maxdSize = 20 * 1024 * 1024 //限制20MB
+
+ if (file && fileSize<=shardSize) { //上传文件<=5MB时
+ this.uploader.queue[0].upload();//开始上传
+ this.uploader.queue[0].onSuccess = (response, status, headers) => {
+ if (status == 201) { // 上传文件成功,上传文件后获取服务器返回的数据
+ let tempRes = JSON.parse(response);
+ this.objectName = tempRes.objectName
+ this.addRealImg()
+ }else { // 上传文件后获取服务器返回的数据错误
+ let tempRes = JSON.parse(response);
+ }};
+ } else if (file && fileSize>shardSize && fileSize5MB时,分块上传
+ let data = {filename: file.name}
+ this.isLoading = true
+ this.http.post(`/api/NewMultipartUpload/PlanPlatform/${this.companyId}/RealImgs`,{},{params:data}).subscribe((data:any)=>{ //初始化分段上传
+ this.objectName = data.objectName
+ this.uploadId = data.uploadId
+ this.subsectionUploading()
+ })
+ }
+
+ }
+
+ PartNumberETag:any=[]; //每次返回需要保存的信息
+ //开始分段上传
+ async subsectionUploading () {
+ let file = this.file || null //获取上传的文件
+ let fileSize = file.size || null //上传文件的总大小
+ let shardSize = 5 * 1024 * 1024 //5MB一个分片
+ let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段
+
+ for (let i = 0;i < allSlice;i++) { //循环分段上传
+ let start = i * shardSize //切割文件开始位置
+ let end = Math.min(fileSize, start + shardSize); //切割文件结束位置
+ let formData = new FormData()
+ formData.append("file",file.slice(start, end))
+
+ //同步写法实现异步调用
+ let result = await new Promise((resolve, reject) => {
+ // await 需要后面返回一个 promise 对象
+ this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i+1}`,formData).subscribe((data:any)=>{
+ let msg = {
+ "partNumber":data.partNumber || null,
+ "eTag": data.eTag || null}
+ resolve(msg) // 调用 promise 内置方法处理成功
+ })
+ });
+ this.PartNumberETag.push(result)
+ if (this.PartNumberETag.length === allSlice) {this.endUploading()}
+ }//for循环
+
+ }
+
+ //完成分块上传
+ endUploading () {
+ let data = this.PartNumberETag
+ let paramsData = {uploadId:this.uploadId}
+ this.http.post(`/api/CompleteMultipartUpload/PlanPlatform/${this.objectName}`,data,{params:paramsData}).subscribe(data=>{
+ this.addRealImg() //上传完成后,发送请求创建实景图
+ this.isLoading = false
+ this.uploader.clearQueue(); //清空input控件文件
+ this.PartNumberETag =[] //清空保存返回的信息
+ })
+ }
+
+ //上传图片成功后获取url地址发送请求创建实景图
+ addRealImg () {
+ let data = {
+ name: this.file.name,
+ imageUrl:this.objectName,
+ realityImageGroupId: this.selectReal.id,
+ }
+ this.http.post('/api/RealityImages',data).subscribe(data=>{
+ (document.getElementById('uploadFile')).value = null //清空input框缓存
+ this.getAllRealPicture()
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('图片上传成功','确定',config);
+ })
+ }
+
+
+
+ //批量下载↓
+ //开始下载
+ async batchDownload () {
+ if (this.downloadList.length) { //开始批量循环下载
+ this.isLoading = true
+ for (let i=0;i{
+ this.http.get(`/api/Objects/PlanPlatform/${this.downloadList[i].imageUrl}`,{responseType: 'blob'},).subscribe(data=>{
+ let url = window.URL.createObjectURL(new Blob([data])); //createObjectURL创建一个下载Blob的url地址
+ let link = document.createElement("a");
+ link.style.display = "none";
+ link.href = url;
+ link.setAttribute("download", this.downloadList[i].name);
+ document.body.appendChild(link);
+ link.click();
+ result('success')})
+ })
+ if(i == this.downloadList.length-1) { //判断是否下载完毕
+ this.isLoading = false
+ this.isDownload = false
+ this.allImages.forEach(element => {element.checked = false});
+ this.downloadList = []}
+
+ } //for循环
+ } else {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请选择图片','确定',config);}
+ }
+
+
+
+
+
+}
+
+
+
+//预览图片组件
+@Component({
+ selector: 'app-previewImg',
+ templateUrl: './previewImg.html',
+ styleUrls: ['./realistic-picture.component.scss']
+})
+export class previewImg3 {
+
+ constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data) { }
+ testSwiper: Swiper;
+
+ ngOnInit(): void {
+ this.allImages = this.data.allImages
+ this.allImages.forEach(element => {
+ element.previewImageUrl = `/api/Objects/PlanPlatform/${element.imageUrl}?x-oss-process=image/auto-orient,1` //处理图片URL地址
+ });
+ }
+
+ ngAfterViewInit() {
+ this.testSwiper = new Swiper('.swiper-container', {
+ lazy: true,
+ initialSlide: this.data.imgIndex,
+ direction: 'horizontal',
+ loop: false,
+
+
+
+ // 如果需要前进后退按钮
+ navigation: {
+ nextEl: '.swiper-button-next',
+ prevEl: '.swiper-button-prev',
+ }
+ });
+ }
+
+ allImages:any; //展示所有的图片
+ rotationAngle:number=0; //旋转角度
+
+ //旋转图片
+ rotate () {
+ this.rotationAngle = this.rotationAngle+90
+ if (this.rotationAngle === 360) {this.rotationAngle = 0}
+ }
+
+}
+
+
diff --git a/src/app/ui/threetype-plan/threetype-plan.component.html b/src/app/ui/threetype-plan/threetype-plan.component.html
new file mode 100644
index 0000000..643b6b5
--- /dev/null
+++ b/src/app/ui/threetype-plan/threetype-plan.component.html
@@ -0,0 +1,3 @@
+
+
+
diff --git a/src/app/ui/threetype-plan/threetype-plan.component.scss b/src/app/ui/threetype-plan/threetype-plan.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/ui/threetype-plan/threetype-plan.component.spec.ts b/src/app/ui/threetype-plan/threetype-plan.component.spec.ts
new file mode 100644
index 0000000..2dd589e
--- /dev/null
+++ b/src/app/ui/threetype-plan/threetype-plan.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ThreetypePlanComponent } from './threetype-plan.component';
+
+describe('ThreetypePlanComponent', () => {
+ let component: ThreetypePlanComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ThreetypePlanComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ThreetypePlanComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/ui/threetype-plan/threetype-plan.component.ts b/src/app/ui/threetype-plan/threetype-plan.component.ts
new file mode 100644
index 0000000..0d0903e
--- /dev/null
+++ b/src/app/ui/threetype-plan/threetype-plan.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-threetype-plan',
+ templateUrl: './threetype-plan.component.html',
+ styleUrls: ['./threetype-plan.component.scss']
+})
+export class ThreetypePlanComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit(): void {
+ }
+
+}
diff --git a/src/app/ui/ui-routing.module.ts b/src/app/ui/ui-routing.module.ts
index de79c0a..4f046a4 100644
--- a/src/app/ui/ui-routing.module.ts
+++ b/src/app/ui/ui-routing.module.ts
@@ -9,6 +9,11 @@ import { RealCasesComponent } from './real-cases/real-cases.component';
import { SimilarPlansComponent } from './similar-plans/similar-plans.component';
import { DataPushComponent } from './data-push/data-push.component';
import { BasicinfoLookComponent } from './basicinfo-look/basicinfo.component';
+import { AllaroundComponent } from './allaround/allaround.component';
+import { FireFightingDeviceLookComponent } from './fire-fighting-device-look/fire-fighting-device.component';
+import { KeySiteLookComponent } from './key-site-look/key-site.component';
+import { RealisticPictureLookComponent } from './realistic-picture-look/realistic-picture.component';
+import { ThreetypePlanComponent } from './threetype-plan/threetype-plan.component';
@@ -16,7 +21,12 @@ const routes: Routes = [
{ path: 'plan', component:DataPushComponent, //子级路由
children:[
{ path: 'planarGraph', component:planComponent},
- { path: 'basicInfo', component:BasicinfoLookComponent}
+ { path: 'basicInfo', component:BasicinfoLookComponent},
+ { path: 'allaround', component:AllaroundComponent},
+ { path: 'fire-fighting-device', component:FireFightingDeviceLookComponent},
+ { path: 'key-site', component:KeySiteLookComponent},
+ { path: 'realistic-picture', component:RealisticPictureLookComponent},
+ { path: '3DPlan', component:ThreetypePlanComponent},
]},
{ path: 'collectionTools', component:CollectionToolsComponent},
{ path: 'dangerous', component:DangerousComponent},
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index 77b39d6..9f34a9e 100644
--- a/src/app/ui/ui.module.ts
+++ b/src/app/ui/ui.module.ts
@@ -66,9 +66,18 @@ import { CountdownModule } from 'ngx-countdown';
import { DataPushComponent } from './data-push/data-push.component';
import { BasicinfoLookComponent } from './basicinfo-look/basicinfo.component';
import { LookMaster2 } from './basicinfo-look/lookmaster.component';
+import { AllaroundComponent } from './allaround/allaround.component';
+import { ImgDetails } from './allaround/imgdetails.component';
+import { FireFightingDeviceLookComponent } from './fire-fighting-device-look/fire-fighting-device.component';
+import { ImagesData2, previewBigImg2 } from './fire-fighting-device-look/imagesdata.component';
+import { ImgsDataDetail2 } from './fire-fighting-device-look/addGrouping.component';
+import { KeySiteLookComponent } from './key-site-look/key-site.component';
+import { KeySiteImgs2 } from './key-site-look/keysiteimgs.component';
+import { RealisticPictureLookComponent, previewImg3 } from './realistic-picture-look/realistic-picture.component';
+import { ThreetypePlanComponent } from './threetype-plan/threetype-plan.component';
@NgModule({
- declarations: [SafeHtmlPipe,GisComponent,UiComponent,PersonaldataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent, DisposalNodeComponent, DangerousComponent, SimilarPlansComponent, RealCasesComponent, PlanAssistanceComponent,planComponent, DataPushComponent,BasicinfoLookComponent,LookMaster2],
+ declarations: [SafeHtmlPipe,GisComponent,UiComponent,PersonaldataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent, DisposalNodeComponent, DangerousComponent, SimilarPlansComponent, RealCasesComponent, PlanAssistanceComponent,planComponent, DataPushComponent,BasicinfoLookComponent,LookMaster2,AllaroundComponent,ImgDetails,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,KeySiteLookComponent,KeySiteImgs2,previewBigImg2,RealisticPictureLookComponent,previewImg3, ThreetypePlanComponent],
imports: [
CommonModule,
+