From ce532aa7dd6a312b5bd8e1a2b31318124a9235e3 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Tue, 10 Mar 2020 16:12:57 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=8A=9F=E8=83=BD=E5=88=86?=
=?UTF-8?q?=E5=8C=BA,=E5=AE=9E=E6=99=AF=E5=9B=BE,=E4=B8=8A=E4=BC=A0CAD?=
=?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
angular.json | 6 +-
package-lock.json | 111 ++++++++--------
package.json | 4 +-
.../ui/function-division/addPartition.html | 0
.../addPartitionAttribute.html | 0
.../function-division.component.html | 50 +++++++-
.../function-division.component.scss | 23 ++++
.../function-division.component.ts | 70 ++++++++++-
.../ui/realistic-picture/addRealPicture.html | 0
.../ui/realistic-picture/editRealPicture.html | 0
src/app/ui/realistic-picture/previewImg.html | 0
.../realistic-picture.component.html | 46 ++++++-
.../realistic-picture.component.scss | 96 ++++++++++++++
.../realistic-picture.component.ts | 119 +++++++++++++++++-
src/app/ui/ui.module.ts | 6 +-
.../uploading-cad.component.html | 53 +++++++-
.../uploading-cad.component.scss | 17 +++
.../uploading-cad/uploading-cad.component.ts | 11 +-
tsconfig.app.json | 2 +-
19 files changed, 542 insertions(+), 72 deletions(-)
create mode 100644 src/app/ui/function-division/addPartition.html
create mode 100644 src/app/ui/function-division/addPartitionAttribute.html
create mode 100644 src/app/ui/realistic-picture/addRealPicture.html
create mode 100644 src/app/ui/realistic-picture/editRealPicture.html
create mode 100644 src/app/ui/realistic-picture/previewImg.html
diff --git a/angular.json b/angular.json
index 1b51971..64adb34 100644
--- a/angular.json
+++ b/angular.json
@@ -29,10 +29,12 @@
"src/assets"
],
"styles": [
- "src/styles.scss"
+ "src/styles.scss",
+ "./node_modules/swiper/css/swiper.css"
],
"scripts": [
- "node_modules/echarts/dist/echarts.js"
+ "node_modules/echarts/dist/echarts.js",
+ "./node_modules/swiper/js/swiper.js"
]
},
"configurations": {
diff --git a/package-lock.json b/package-lock.json
index 531727e..3b94096 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4233,6 +4233,11 @@
"integrity": "sha1-AHiDYGP/rxdBI0m7o2QIfgrALsk=",
"dev": true
},
+ "@types/swiper": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npm.taobao.org/@types/swiper/download/@types/swiper-5.2.1.tgz",
+ "integrity": "sha1-iJq5yQQQB8J/+jIgCXMDtrFnBgg="
+ },
"@types/webpack-sources": {
"version": "0.1.6",
"resolved": "https://registry.npm.taobao.org/@types/webpack-sources/download/@types/webpack-sources-0.1.6.tgz",
@@ -6893,6 +6898,14 @@
"resolved": "https://registry.npm.taobao.org/dom-storage/download/dom-storage-2.1.0.tgz",
"integrity": "sha1-APuGi8kgE1fqJDx7z9MwTB406jk="
},
+ "dom7": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npm.taobao.org/dom7/download/dom7-2.1.3.tgz",
+ "integrity": "sha1-pzb5w7+8TKA5qBzQlfl9HX894Zw=",
+ "requires": {
+ "ssr-window": "^1.0.1"
+ }
+ },
"domain-browser": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz",
@@ -9956,8 +9969,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -9978,14 +9990,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -10000,20 +10010,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -10130,8 +10137,7 @@
"inherits": {
"version": "2.0.4",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -10143,7 +10149,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -10158,7 +10163,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -10166,14 +10170,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -10192,7 +10194,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -10282,8 +10283,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -10295,7 +10295,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -10381,8 +10380,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -10418,7 +10416,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -10438,7 +10435,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -10482,14 +10478,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
@@ -11395,6 +11389,14 @@
"integrity": "sha1-rCetpmFn+ohJpq3dg39rGJrSCBw=",
"dev": true
},
+ "ng2-file-upload": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npm.taobao.org/ng2-file-upload/download/ng2-file-upload-1.4.0.tgz",
+ "integrity": "sha1-jeoo1XMjTFKvR0rSpAAbM1Jx5cQ=",
+ "requires": {
+ "tslib": "^1.9.0"
+ }
+ },
"ngx-echarts": {
"version": "4.2.2",
"resolved": "https://registry.npm.taobao.org/ngx-echarts/download/ngx-echarts-4.2.2.tgz",
@@ -14666,6 +14668,11 @@
"tweetnacl": "~0.14.0"
}
},
+ "ssr-window": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npm.taobao.org/ssr-window/download/ssr-window-1.0.1.tgz",
+ "integrity": "sha1-MHUqakZm53Z/C35qpvwv29DZs2k="
+ },
"ssri": {
"version": "7.1.0",
"resolved": "https://registry.npm.taobao.org/ssri/download/ssri-7.1.0.tgz?cache=0&sync_timestamp=1571961490394&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssri%2Fdownload%2Fssri-7.1.0.tgz",
@@ -14972,6 +14979,15 @@
"util.promisify": "~1.0.0"
}
},
+ "swiper": {
+ "version": "5.3.6",
+ "resolved": "https://registry.npm.taobao.org/swiper/download/swiper-5.3.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fswiper%2Fdownload%2Fswiper-5.3.6.tgz",
+ "integrity": "sha1-ECt/gUXXNOxMMOBGAhYDgjVrWUg=",
+ "requires": {
+ "dom7": "^2.1.3",
+ "ssr-window": "^1.0.1"
+ }
+ },
"symbol-observable": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/symbol-observable/download/symbol-observable-1.2.0.tgz",
@@ -16875,8 +16891,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -16904,7 +16919,6 @@
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -16919,8 +16933,7 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
@@ -16931,8 +16944,7 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -17049,8 +17061,7 @@
"inherits": {
"version": "2.0.4",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -17062,7 +17073,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -17077,7 +17087,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -17085,14 +17094,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -17111,7 +17118,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -17201,8 +17207,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -17214,7 +17219,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -17300,8 +17304,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -17337,7 +17340,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -17357,7 +17359,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -17401,14 +17402,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
diff --git a/package.json b/package.json
index b331317..dc3dc17 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
"@angular/platform-browser-dynamic": "~9.0.0",
"@angular/router": "~9.0.0",
"@types/cesium": "^1.59.5",
+ "@types/swiper": "^5.2.1",
"angular-calendar": "^0.28.2",
"cesium": "^1.64.0",
"date-fns": "^2.9.0",
@@ -33,10 +34,10 @@
"ngx-echarts": "^4.2.2",
"ngx-perfect-scrollbar": "^8.0.0",
"rxjs": "~6.5.4",
+ "swiper": "^5.3.6",
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
},
-
"devDependencies": {
"@angular-devkit/build-angular": "~0.900.1",
"@angular/cli": "~9.0.1",
@@ -58,5 +59,4 @@
"tslint": "~5.15.0",
"typescript": "~3.7.5"
}
-
}
diff --git a/src/app/ui/function-division/addPartition.html b/src/app/ui/function-division/addPartition.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/ui/function-division/addPartitionAttribute.html b/src/app/ui/function-division/addPartitionAttribute.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/ui/function-division/function-division.component.html b/src/app/ui/function-division/function-division.component.html
index 956adf5..cfdef15 100644
--- a/src/app/ui/function-division/function-division.component.html
+++ b/src/app/ui/function-division/function-division.component.html
@@ -1 +1,49 @@
-
function-division works!
+
+
+ add_circle_outline
+
+
+
+
+
+
+ add_circle_outline
+ delete
+
+
+
+
+ |
+
+
+ |
+
+
+
+ 区域 |
+
+
+ |
+
+
+
+ 面积 |
+
+
+ |
+
+
+
+ 基本情况 |
+
+
+ |
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/function-division/function-division.component.scss b/src/app/ui/function-division/function-division.component.scss
index e69de29..5cc8a9d 100644
--- a/src/app/ui/function-division/function-division.component.scss
+++ b/src/app/ui/function-division/function-division.component.scss
@@ -0,0 +1,23 @@
+.content {
+ width: 100%;
+ height: 100%;
+ padding: 10px 0 0 10px;
+ display: flex;
+}
+.tableContent {
+ margin-left: 10px;
+ width: 100%;
+ height: 100%;
+ table {
+ width: 1000px;
+ text-align: center;
+ .cdk-header-cell {
+ text-align: center;
+ }
+ }
+}
+
+//icon统一样式
+.mat-icon {
+ cursor:pointer;
+}
\ No newline at end of file
diff --git a/src/app/ui/function-division/function-division.component.ts b/src/app/ui/function-division/function-division.component.ts
index 6883894..9990b0e 100644
--- a/src/app/ui/function-division/function-division.component.ts
+++ b/src/app/ui/function-division/function-division.component.ts
@@ -1,4 +1,8 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Inject } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+
+
@Component({
selector: 'app-function-division',
@@ -7,9 +11,71 @@ import { Component, OnInit } from '@angular/core';
})
export class FunctionDivisionComponent implements OnInit {
- constructor() { }
+ constructor(private http:HttpClient,public dialog: MatDialog) { }
+
+ ngOnInit(): void {
+
+ }
+
+ displayedColumns: string[] = ['checked', 'region', 'measure', 'situation'];
+ dataSource:any; //所有功能分区
+
+ //创建功能分区
+ addPartition () {
+ let dialogRef = this.dialog.open(addPartition,
+ {data: {}});
+ dialogRef.afterClosed().subscribe();
+ }
+
+ //创建功能分区属性
+ addPartitionAttribute () {
+ let dialogRef = this.dialog.open(addPartitionAttribute,
+ {data: {}});
+ dialogRef.afterClosed().subscribe();
+ }
+
+
+
+}
+
+
+
+//创建功能分区组件
+@Component({
+ selector: 'app-addPartition',
+ templateUrl: './addPartition.html',
+ styleUrls: ['./function-division.component.scss']
+})
+export class addPartition {
+
+ constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data) { }
+
+ ngOnInit(): void {
+
+ }
+
+
+
+}
+
+
+
+//创建功能分区属性组件
+@Component({
+ selector: 'app-addPartitionAttribute',
+ templateUrl: './addPartitionAttribute.html',
+ styleUrls: ['./function-division.component.scss']
+})
+export class addPartitionAttribute {
+
+ constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data) { }
ngOnInit(): void {
+
}
+
+
}
diff --git a/src/app/ui/realistic-picture/addRealPicture.html b/src/app/ui/realistic-picture/addRealPicture.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/ui/realistic-picture/editRealPicture.html b/src/app/ui/realistic-picture/editRealPicture.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/ui/realistic-picture/previewImg.html b/src/app/ui/realistic-picture/previewImg.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/ui/realistic-picture/realistic-picture.component.html b/src/app/ui/realistic-picture/realistic-picture.component.html
index 3b9fd54..3409382 100644
--- a/src/app/ui/realistic-picture/realistic-picture.component.html
+++ b/src/app/ui/realistic-picture/realistic-picture.component.html
@@ -1 +1,45 @@
-realistic-picture works!
+
+
+
+
+ 实景图
+ add_circle_outline
+ create
+ cloud_download
+ delete
+
+
+
+
+ folder{{item.name}}
+
+
+
+
+
+
+
+ {{selectReal.name}}
+
+
+
+
+
+ 已用/容量:
+ 500MB/5G
+
+
+
+
+
+
+
+
+
保存
+
删除
+
+
+
+
+
diff --git a/src/app/ui/realistic-picture/realistic-picture.component.scss b/src/app/ui/realistic-picture/realistic-picture.component.scss
index e69de29..ce2c26d 100644
--- a/src/app/ui/realistic-picture/realistic-picture.component.scss
+++ b/src/app/ui/realistic-picture/realistic-picture.component.scss
@@ -0,0 +1,96 @@
+.content {
+ margin: 0 0 0 10px;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ .leftBox {
+ flex: 15%;
+ padding-top: 10px;
+ .bank {
+ display: flex;
+ padding-left: 10px;
+ .mat-icon {margin-right: 15px;}
+ }
+ }
+ .rightBox {
+ border-left: 1px solid #999;
+ flex: 85%;
+ display: flex;
+ flex-direction: column;
+ .topBox {
+ flex: 5%; padding: 10px;
+ display: flex;
+ :first-child {flex: 85%;};
+ :last-child {flex: 15%;}
+ }
+ .bottomBox {
+ flex: 95%;
+ padding: 5px 0 0 25px;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;}
+ }
+}
+
+//icon统一样式
+.mat-icon {
+ cursor:pointer;
+ width: 18px;
+ height: 18px;
+ vertical-align:top;
+ margin-right: 10px;
+}
+.title {margin-right: 30px;font-weight: 500; font-size: 18px;}
+
+.material {
+ cursor:pointer;
+ height: 30px;
+ font-size: 16px;
+ margin-top: 10px;
+ padding-left: 15px;
+ .btn {
+ color: #FFC122;
+ }
+}
+.imgBox{
+ width: 300px;
+ height: 200px;
+ margin: 0 25px 25px 0;
+ display: inline-block;
+ img {width: 100%;cursor:pointer;}
+ input{
+ font-size:12px;
+ width: 100px;
+ height:18px;
+ border-radius:3px;
+ border:1px solid #c8cccf;
+ outline:0;
+ text-align:left;
+ padding-left: 5px;
+ display:inline-block;
+ cursor: pointer;}
+ input::-webkit-input-placeholder{
+ color: #986655;
+ font-size: 12px;
+ }
+ a {display: inline-block;
+ width: 45px;
+ height: 24px;
+ line-height: 24px;
+ text-align: center;
+ border-radius: 3px;
+ background-color: #2196F3;
+ font-size: 14px;
+ color: #fff;}
+}
+
+//左侧实景图文件样式
+ .leftFile {
+ background-color: rgba(225,225,225,0.8);
+ }
+//选中图片样式
+ .selectImg {
+ -webkit-filter: drop-shadow(0px 0px 5px #000);
+ filter: drop-shadow(0px 0px 5px #000);
+ border: 2px solid #00FF00;
+ }
\ No newline at end of file
diff --git a/src/app/ui/realistic-picture/realistic-picture.component.ts b/src/app/ui/realistic-picture/realistic-picture.component.ts
index b2dc063..aecbc9d 100644
--- a/src/app/ui/realistic-picture/realistic-picture.component.ts
+++ b/src/app/ui/realistic-picture/realistic-picture.component.ts
@@ -1,4 +1,8 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Inject } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+
+
@Component({
selector: 'app-realistic-picture',
@@ -7,9 +11,120 @@ import { Component, OnInit } from '@angular/core';
})
export class RealisticPictureComponent implements OnInit {
- constructor() { }
+ constructor(private http:HttpClient,public dialog: MatDialog) { }
ngOnInit(): void {
+
+ }
+
+ allRealPicture:any=[{name:'单位实景图'},{name:'高科技创业园'}]; //所有实景图文件
+ selectReal:any; //选中的实景图文件
+ selectRealIndex:any=0; //选中的实景图文件下标
+ isDownload:boolean = false; //是否批量下载
+ downloadList:any = []; //选中需要下载的图片
+
+ //切换左侧实际图文件
+ changeReal (e,index) {
+ if (this.selectRealIndex != index) {
+ this.selectReal = e
+ this.selectRealIndex = index
+ }
+ }
+
+ //选择批量下载
+ download () {this.isDownload = !this.isDownload}
+
+ // 预览图片---批量选择图片
+ operation () {
+ if (this.isDownload) { //批量选择图片
+
+ } else { //预览图片
+ let dialogRef = this.dialog.open(previewImg,
+ {height: '400px',
+ width:'600px',
+ data: {}});
+ dialogRef.afterClosed().subscribe();
+ }
+
+ }
+
+ //新建实景图文件
+ addReal () {
+ let dialogRef = this.dialog.open(addRealPicture,
+ {data: {}});
+ dialogRef.afterClosed().subscribe();
+ }
+
+ //编辑实景图文件
+ editReal () {
+ if (this.selectReal) {
+ let dialogRef = this.dialog.open(editRealPicture,
+ {data: {}});
+ dialogRef.afterClosed().subscribe();
+ }
}
+
+
+
+
}
+
+
+
+//预览图片组件
+@Component({
+ selector: 'app-previewImg',
+ templateUrl: './previewImg.html',
+ styleUrls: ['./realistic-picture.component.scss']
+})
+export class previewImg {
+
+ constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data) { }
+
+ ngOnInit(): void {
+
+ }
+
+
+
+}
+
+
+
+//新建实景图文件组件
+@Component({
+ selector: 'app-addRealPicture',
+ templateUrl: './addRealPicture.html',
+ styleUrls: ['./realistic-picture.component.scss']
+})
+export class addRealPicture {
+
+ constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data) { }
+
+ ngOnInit(): void {}
+
+
+
+}
+
+
+
+//编辑实景图文件组件
+@Component({
+ selector: 'app-editRealPicture',
+ templateUrl: './editRealPicture.html',
+ styleUrls: ['./realistic-picture.component.scss']
+})
+export class editRealPicture {
+
+ constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data) { }
+
+ ngOnInit(): void {}
+
+
+
+}
\ No newline at end of file
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index 57f5e54..78f5c29 100644
--- a/src/app/ui/ui.module.ts
+++ b/src/app/ui/ui.module.ts
@@ -85,14 +85,14 @@ import { PlanComponent } from './plan/plan.component';
import { AllaroundComponent } from './allaround/allaround.component';
import { FireFightingDeviceComponent } from './fire-fighting-device/fire-fighting-device.component';
import { KeySiteComponent } from './key-site/key-site.component';
-import { FunctionDivisionComponent } from './function-division/function-division.component';
-import { RealisticPictureComponent } from './realistic-picture/realistic-picture.component';
+import { FunctionDivisionComponent,addPartition,addPartitionAttribute } from './function-division/function-division.component';
+import { RealisticPictureComponent,previewImg,addRealPicture,editRealPicture } from './realistic-picture/realistic-picture.component';
import { UploadingCADComponent } from './uploading-cad/uploading-cad.component';
import { AddHouseInfo } from './basicinfo/addhouseinfo.component';
import { ImgDetails } from './allaround/imgdetails.component';
@NgModule({
- declarations: [UiComponent, CardComponent, StepperComponent, TabgroupComponent, ProgressComponent, SnackbarComponent,PersonaldataComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,EditRole,TimePipe,CreateNewUser,EditNewUser,allRoles,SharePower,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, BasicinfoComponent, PlanComponent, AllaroundComponent, FireFightingDeviceComponent, KeySiteComponent, FunctionDivisionComponent, RealisticPictureComponent, UploadingCADComponent,AddHouseInfo,ImgDetails],
+ declarations: [UiComponent, CardComponent, StepperComponent, TabgroupComponent, ProgressComponent, SnackbarComponent,PersonaldataComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,EditRole,TimePipe,CreateNewUser,EditNewUser,allRoles,SharePower,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, BasicinfoComponent, PlanComponent, AllaroundComponent, FireFightingDeviceComponent, KeySiteComponent, FunctionDivisionComponent, RealisticPictureComponent, UploadingCADComponent,AddHouseInfo,ImgDetails,previewImg,addRealPicture,editRealPicture,addPartition,addPartitionAttribute],
imports: [
CommonModule,
diff --git a/src/app/ui/uploading-cad/uploading-cad.component.html b/src/app/ui/uploading-cad/uploading-cad.component.html
index 927fc6d..c19ea56 100644
--- a/src/app/ui/uploading-cad/uploading-cad.component.html
+++ b/src/app/ui/uploading-cad/uploading-cad.component.html
@@ -1 +1,52 @@
-uploading-cad works!
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+ 名称 |
+
+
+ |
+
+
+
+ 时间 |
+
+
+ |
+
+
+
+ 状态 |
+
+
+ |
+
+
+
+ 大小 |
+
+
+ |
+
+
+
+
+
diff --git a/src/app/ui/uploading-cad/uploading-cad.component.scss b/src/app/ui/uploading-cad/uploading-cad.component.scss
index e69de29..da8d2bb 100644
--- a/src/app/ui/uploading-cad/uploading-cad.component.scss
+++ b/src/app/ui/uploading-cad/uploading-cad.component.scss
@@ -0,0 +1,17 @@
+.header {
+ display: flex;
+ margin: 10px;
+ :first-child{flex:88%}
+ :last-child{flex:12%}
+ .mat-raised-button {
+ margin-left: 15px;
+ }
+}
+table {
+ margin: 10px;
+ width: 100%;
+ text-align: center;
+ .cdk-header-cell {
+ text-align: center;
+ }
+}
\ No newline at end of file
diff --git a/src/app/ui/uploading-cad/uploading-cad.component.ts b/src/app/ui/uploading-cad/uploading-cad.component.ts
index 33a850b..e59a137 100644
--- a/src/app/ui/uploading-cad/uploading-cad.component.ts
+++ b/src/app/ui/uploading-cad/uploading-cad.component.ts
@@ -1,4 +1,7 @@
import { Component, OnInit } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+
+
@Component({
selector: 'app-uploading-cad',
@@ -7,9 +10,15 @@ import { Component, OnInit } from '@angular/core';
})
export class UploadingCADComponent implements OnInit {
- constructor() { }
+ constructor(private http:HttpClient,) { }
ngOnInit(): void {
+
}
+ displayedColumns: string[] = ['checked', 'name', 'time', 'state','size'];
+ dataSource:any; //所有CAD图
+
+
+
}
diff --git a/tsconfig.app.json b/tsconfig.app.json
index df4d05e..d1ca95a 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -2,7 +2,7 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/app",
- "types": []
+ "types": ["swiper"]
},
"files": [
"src/main.ts",