-
+
-
+
\ No newline at end of file
diff --git a/src/app/key-unit/key-unit.module.ts b/src/app/key-unit/key-unit.module.ts
index f41b0c5..c29b7ca 100644
--- a/src/app/key-unit/key-unit.module.ts
+++ b/src/app/key-unit/key-unit.module.ts
@@ -77,7 +77,7 @@ import { LookMaster2 } from './basicinfo-look/lookmaster.component';
@NgModule({
declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeyImgDetail,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,LookMaster2,addPartitionAttribute2],
- exports:[ViewUnitDetailsPlanComponent,BasicinfoComponent,FireFightingDeviceComponent],
+ exports:[ViewUnitDetailsPlanComponent,BasicinfoComponent,FireFightingDeviceComponent,KeySiteComponent],
imports: [
CommonModule,
KeyUnitRoutingModule,
diff --git a/src/app/ui/add-six-familiar/add-six-familiar.component.scss b/src/app/ui/add-six-familiar/add-six-familiar.component.scss
index a941d86..e82cef5 100644
--- a/src/app/ui/add-six-familiar/add-six-familiar.component.scss
+++ b/src/app/ui/add-six-familiar/add-six-familiar.component.scss
@@ -1,6 +1,6 @@
.bigbox{
width: 10rem;
- height: 7.5rem;
+ height: 100%;
position: relative;
background: #F4F5F9;
.content{
diff --git a/src/app/ui/basicinfo/addhouseinfo.component.html b/src/app/ui/basicinfo/addhouseinfo.component.html
deleted file mode 100644
index 3ce162d..0000000
--- a/src/app/ui/basicinfo/addhouseinfo.component.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
新增建筑
-
\ No newline at end of file
diff --git a/src/app/ui/basicinfo/addhouseinfo.component.ts b/src/app/ui/basicinfo/addhouseinfo.component.ts
deleted file mode 100644
index e888232..0000000
--- a/src/app/ui/basicinfo/addhouseinfo.component.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree';
-import {FlatTreeControl} from '@angular/cdk/tree';
-import { HttpClient } from '@angular/common/http';
-import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
-import {FormControl} from '@angular/forms';
-import { MatSnackBar } from '@angular/material/snack-bar';
-
-@Component({
- selector: 'addhouseinfo',
- templateUrl: './addhouseinfo.component.html',
- styleUrls: ['./basicinfo.component.scss']
- })
- export class AddHouseInfo {
- myControl = new FormControl();
- //注入MatDialogRef，可以用来关闭对话框
- //要访问对话框组件中的数据，必须使用MAT_DIALOG_DATA注入令牌
- constructor(private http: HttpClient,public dialogRef: MatDialogRef
,@Inject(MAT_DIALOG_DATA) public data) {}
- allunittype:any
- onNoClick(): void {
- this.dialogRef.close();
- }
- ngOnInit(): void {
- // console.log(this.data)
- this.getallunittype()
- }
- getallunittype(){
- this.http.get("/api/BuildingTypes/Simple").subscribe(data=>{
- this.allunittype = data
- })
- }
- onSubmit(value){
-
- this.http.get("/api/Buildings",{
- params:{
- companyId:this.data.unitId
- }
- }).subscribe((data:any)=>{
- this.data.allBuildings = data
- let order
- if(data.length == 0){
- order = 0
- }else{
- order = data[data.length - 1].order + 1
- }
-
- let buildingTypename = ""
- this.allunittype.forEach(item => {
- if(item.id == value.unittype){
- buildingTypename = item.name
- }
- });
-
- this.http.post("/api/Buildings",{
- id: "",
- name: value.name,
- order: order,
- enabled: true,
- companyId: this.data.unitinfo.id,
- buildingTypes: [
- {
- id: value.unittype,
- name: buildingTypename
- }
- ]
- },{params:{
- companyId : this.data.unitId
- }}).subscribe(data=>{
- this.dialogRef.close(data);
- })
- })
-
-
-
- }
- }
-
\ No newline at end of file
diff --git a/src/app/ui/basicinfo/basicinfo.component.html b/src/app/ui/basicinfo/basicinfo.component.html
deleted file mode 100644
index 43f73ea..0000000
--- a/src/app/ui/basicinfo/basicinfo.component.html
+++ /dev/null
@@ -1,531 +0,0 @@
-
-
-
-
-
-
- 单位信息
- keyboard_arrow_down
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
单位照片
-
-
-
-
-
![]()
-
-
-
- 暂无单位图片，请先上传
-
-
-
-
-
+
tv
create
diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss
index 8b34d62..6411e24 100644
--- a/src/app/ui/collection-tools/collection-tools.component.scss
+++ b/src/app/ui/collection-tools/collection-tools.component.scss
@@ -10,7 +10,7 @@
padding: 1px;
display: flex;
flex-direction: column;
-
+ font-size: 12px;
.buildingbtnchecked{
background-color: #34A6FD;
color: white;
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 3cf8178..3b87b9d 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -614,7 +614,7 @@ export class CollectionToolsComponent implements OnInit {
this.getAllLibrary() //获取素材库
this.getAllBuildings() //获取所有建筑
- this.getAllFirePlan() //获取当前单位灾情
+ // this.getAllFirePlan() //获取当前单位灾情
let that = this
window.setTimeout(()=>{
diff --git a/src/app/ui/photoofthescene/photoofthescene.component.html b/src/app/ui/photoofthescene/photoofthescene.component.html
new file mode 100644
index 0000000..c9dcfc0
--- /dev/null
+++ b/src/app/ui/photoofthescene/photoofthescene.component.html
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+ 
+
+ 熟悉单位照片
+
+ 单位整体建筑或大门照片，要求照拍照时要求设置拍照日期
+
+
+
+
+
+ ![]()
+ |
+
+
+
+
+
+ 领导带队现场熟悉照片
+
+ 人员现场熟悉照片，要求有带队领导及熟悉人员现场熟悉场景，拍照时要求设置拍照日期
+
+
+
+
+
+ ![]()
+ |
+
+
+
+
+
+
+
+ 人员现场熟悉照片
+
+ 人员现场熟悉照片，要求有熟悉人员现场熟悉场景，拍照时要求设置拍照日期
+
+
+
+
+
+ ![]()
+ |
+
+
+
+
+
+ 单位重点部位照片
+
+ 重点部位照片，拍照时要求设置拍照日期
+
+
+
+
+
+ ![]()
+ |
+
+
\ No newline at end of file
diff --git a/src/app/ui/photoofthescene/photoofthescene.component.scss b/src/app/ui/photoofthescene/photoofthescene.component.scss
new file mode 100644
index 0000000..bdf85d9
--- /dev/null
+++ b/src/app/ui/photoofthescene/photoofthescene.component.scss
@@ -0,0 +1,34 @@
+table{
+ margin: 0 auto;
+ width: 85%;
+ height: 80%;
+ margin-top: 5%;
+ border-collapse: collapse;
+ td{
+ position: relative;
+ width: 50%;
+ height: 2.246094rem;
+ p{
+ font-size: 20px;
+ margin: 8px 0;
+ }
+ span{
+ font-size: 15px;
+ font-weight: 500;
+ color: gray;
+ }
+ input{
+ position: absolute;
+ width: 100%;
+ height: 2.246094rem;
+ left: 0;
+ top: 0;
+ opacity: 0;
+ }
+ .image{
+ height: 100%;
+ width: 299px;
+ }
+ }
+}
+table,table tr th, table tr td { border:1px solid black;text-align: center; }
\ No newline at end of file
diff --git a/src/app/ui/basicinfo/basicinfo.component.spec.ts b/src/app/ui/photoofthescene/photoofthescene.component.spec.ts
similarity index 51%
rename from src/app/ui/basicinfo/basicinfo.component.spec.ts
rename to src/app/ui/photoofthescene/photoofthescene.component.spec.ts
index 81d25e7..b2b65fe 100644
--- a/src/app/ui/basicinfo/basicinfo.component.spec.ts
+++ b/src/app/ui/photoofthescene/photoofthescene.component.spec.ts
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { BasicinfoComponent } from './basicinfo.component';
+import { PhotoofthesceneComponent } from './photoofthescene.component';
-describe('BasicinfoComponent', () => {
- let component: BasicinfoComponent;
- let fixture: ComponentFixture;
+describe('PhotoofthesceneComponent', () => {
+ let component: PhotoofthesceneComponent;
+ let fixture: ComponentFixture;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ BasicinfoComponent ]
+ declarations: [ PhotoofthesceneComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(BasicinfoComponent);
+ fixture = TestBed.createComponent(PhotoofthesceneComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/ui/photoofthescene/photoofthescene.component.ts b/src/app/ui/photoofthescene/photoofthescene.component.ts
new file mode 100644
index 0000000..312dd2c
--- /dev/null
+++ b/src/app/ui/photoofthescene/photoofthescene.component.ts
@@ -0,0 +1,147 @@
+import { HttpClient } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { MatSnackBar ,MatSnackBarConfig} from '@angular/material/snack-bar';
+import Viewer from 'viewerjs';
+@Component({
+ selector: 'app-photoofthescene',
+ templateUrl: './photoofthescene.component.html',
+ styleUrls: ['./photoofthescene.component.scss']
+})
+export class PhotoofthesceneComponent implements OnInit {
+
+ constructor(private http: HttpClient,public snackBar: MatSnackBar) { }
+ gallery//viewerJs实例
+ ngOnInit(): void {
+ setTimeout(() => {
+ if(document.getElementById('viewerjs1')){
+ this.gallery = new Viewer(document.getElementById('viewerjs1'),{
+ url: 'data-original'
+ });
+ }
+ if(document.getElementById('viewerjs2')){
+ this.gallery = new Viewer(document.getElementById('viewerjs2'),{
+ url: 'data-original'
+ });
+ }
+ if(document.getElementById('viewerjs3')){
+ this.gallery = new Viewer(document.getElementById('viewerjs3'),{
+ url: 'data-original'
+ });
+ }
+ if(document.getElementById('viewerjs4')){
+ this.gallery = new Viewer(document.getElementById('viewerjs4'),{
+ url: 'data-original'
+ });
+ }
+ }, 0);
+
+ console.log(555,this.unitImg.split("?")[0])
+ }
+
+ unitImg:any = localStorage.getItem(sessionStorage.getItem("companyId") + "1") || ""
+ lingdaoImg:any = localStorage.getItem(sessionStorage.getItem("companyId") + "2") || ""
+ peopleImg:any = localStorage.getItem(sessionStorage.getItem("companyId") + "3") || ""
+ keysiteImg:any = localStorage.getItem(sessionStorage.getItem("companyId") + "4") || ""
+
+
+ //熟悉单位照片上传
+ file:any
+ filechange1(e,index){
+ this.file = e.target.files[0] || null //上传的文件
+ var reader = new FileReader();
+ reader.readAsDataURL(this.file);
+ var image:any = new Image();
+ reader.onload = function(){
+ image.src = reader.result
+ }
+ setTimeout(() => {
+ if(image.width>=4096 || image.height>=5000 ){
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请选择分辨率小于4096*5000的图片','确定',config);
+ }else{
+ if(this.file){
+ this.startUploading(index)
+ }
+ }
+ }, 500);
+ }
+
+
+ isspinner:any //进度圈
+ imgUrl:any //上传后的图片地址
+ imgsrc:any //上传后的缩略图地址
+
+ //上传文件
+ startUploading(type) {
+ this.isspinner = true
+ let file = this.file || null //获取上传的文件
+ let fileSize = file.size || null //上传文件的总大小
+ let shardSize = 5 * 1024 * 1024 //5MB一个分片
+
+ if (file && fileSize <= shardSize) { //上传文件<=5MB时
+ // this.upload()
+ let formData = new FormData()
+ formData.append("file",file)
+ this.http.post(`/api/Objects/PlanPlatform/${sessionStorage.getItem('companyId')}`,formData).subscribe((data:any)=>{
+ this.isspinner = false
+ this.imgUrl = data.objectName
+ this.imgsrc = `/api/Objects/PlanPlatform/${this.imgUrl}?x-oss-process=image/resize,m_fill,h_170,w_299`
+ localStorage.setItem(sessionStorage.getItem("companyId") + type, this.imgsrc)
+ if(type == '1'){
+ this.unitImg = this.imgsrc
+ setTimeout(() => {
+ this.gallery = new Viewer(document.getElementById('viewerjs1'),{
+ url: 'data-original'
+ });
+ }, 0);
+ }
+ if(type == '2'){
+ this.lingdaoImg = this.imgsrc
+ setTimeout(() => {
+ this.gallery = new Viewer(document.getElementById('viewerjs2'),{
+ url: 'data-original'
+ });
+ }, 0);
+ }
+ if(type == '3'){
+ this.peopleImg = this.imgsrc
+ setTimeout(() => {
+ this.gallery = new Viewer(document.getElementById('viewerjs3'),{
+ url: 'data-original'
+ });
+ }, 0);
+ }
+ if(type == '4'){
+ this.keysiteImg = this.imgsrc
+ setTimeout(() => {
+ this.gallery = new Viewer(document.getElementById('viewerjs4'),{
+ url: 'data-original'
+ });
+ }, 0);
+ }
+
+
+
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('上传成功','确定',config);
+
+
+ })
+ } else if (file && fileSize >= shardSize) { //上传文件>5MB时,分块上传
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请上传小于5M图片','确定',config);
+ // let data = { filename: file.name }
+ // this.http.post(`/api/NewMultipartUpload/PlanPlatform/${this.unitinfo.id}`, {}, { params: data }).subscribe((data: any) => { //初始化分段上传
+ // this.objectName = data.objectName
+ // this.uploadId = data.uploadId
+ // this.subsectionUploading()
+ // })
+ }
+ }
+}
diff --git a/src/app/ui/training-recordinfo/training-recordinfo.component.html b/src/app/ui/training-recordinfo/training-recordinfo.component.html
index d9a1f80..196e3f4 100644
--- a/src/app/ui/training-recordinfo/training-recordinfo.component.html
+++ b/src/app/ui/training-recordinfo/training-recordinfo.component.html
@@ -6,22 +6,44 @@
+
-
+
+
+
+
熟悉路线
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 平面图
- 安全疏散设施情况
-
+
水源道路情况
- 重点部位情况
+
+
+
+
+
发现问题
- 现场照片
+
+
+
+
+
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index 37c2d89..3502bda 100644
--- a/src/app/ui/ui.module.ts
+++ b/src/app/ui/ui.module.ts
@@ -65,8 +65,9 @@ import { HomeComponent } from './home/home.component';
import { TrainingRecordinfoComponent } from './training-recordinfo/training-recordinfo.component';
import { RouterGISComponent } from './router-gis/router-gis.component';
import { KeyUnitModule } from '../key-unit/key-unit.module';
+import { PhotoofthesceneComponent } from './photoofthescene/photoofthescene.component';
@NgModule({
- declarations: [UiComponent, FooterComponent, UserdataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe,EditUser,CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,HomeComponent, AddSixFamiliarComponent, TitleComponent, SelectUnit, TrainingRecordinfoComponent,RouterGISComponent],
+ declarations: [UiComponent, FooterComponent, UserdataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe,EditUser,CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,HomeComponent, AddSixFamiliarComponent, TitleComponent, SelectUnit, TrainingRecordinfoComponent,RouterGISComponent, PhotoofthesceneComponent],
imports: [
CommonModule,
diff --git a/src/assets/images/camera.png b/src/assets/images/camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b90b3a5962ea54070e736418047a34d06abafb5
GIT binary patch
literal 942
zcmV;f15x~mP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D14BtfK~!i%)tN1D
z>Od5Q5eNhVQBhHes6ZepD-cLT1p-llKvp7f6%`c~2n3=6fv7+rkq9ILfj}S;6$k_Z
zf!H@^yOgj!g#8J;aAv+4=H_N|FWJ5OlZ5clYPAxtudgDP%ZWrH;l%y@y=((*`N%nu
z#bP0YV8OY7wq~=LYTaJWi99|&(tv!(=ksE_-KrTaRyZmUHvza=jUhYcnzTN
z$VB@6K6SVzWDe&nrI$kXsBAV%FJ2RBt;a9=fI;~7_9javRsjINVZ$|cPXth-6HiZ1
zVltV?!51bh4l9)kZNmd5t{0yMRP_UB>s@v^SKNIvn<)Vq`T?_kY=4S#*c2FN5AJoqPY77O7LtU8VnQs_4
zjX|LZ%Hwc@8be_LxO549eBdy_gC~+WLBy6+uTnd`zrP=}?Ep0zb1X0j|1v5X
z2s>p*;;d~;sL>ew)0mB2g*gaqu(mCsMr*MCvia%+UypSagBqQ{-W`+Wv7I1g$Wl;arVh5}AX`hA3{x9MGR#)=6;z-AZneF#tU_
zGyfeF4(Rub6(%-R9p)TI@FsRiKnI`RP#STVhHvO`>~07i0~=%F@L*7ge^