From 8c75906ecdb2a32d530657ee3b134c528cfd51ab Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Wed, 18 Aug 2021 15:32:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=B6=88=E9=98=B2=E8=AE=BE?= =?UTF-8?q?=E6=96=BD=E5=92=8C=E5=AE=9E=E6=99=AF=E5=9B=BE=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fire-fighting-device.component.html | 99 +--- .../fire-fighting-device.component.scss | 1 - .../fire-fighting-device.component.ts | 20 +- .../realistic-picture.component.html | 8 +- .../realistic-picture.component.scss | 8 +- .../realistic-picture.component.ts | 431 +++++++++++------- src/styles.scss | 7 + 7 files changed, 299 insertions(+), 275 deletions(-) diff --git a/src/app/ui/fire-fighting-device/fire-fighting-device.component.html b/src/app/ui/fire-fighting-device/fire-fighting-device.component.html index 799f1b8..c96238f 100644 --- a/src/app/ui/fire-fighting-device/fire-fighting-device.component.html +++ b/src/app/ui/fire-fighting-device/fire-fighting-device.component.html @@ -1,101 +1,6 @@ -
+
- -
@@ -121,7 +26,7 @@ - +
-
+
folder{{item.name}} @@ -23,7 +23,7 @@
{{selectReal.name}} - @@ -42,8 +42,8 @@
- 保存 - 删除 + 保存 + 删除

暂无数据

diff --git a/src/app/ui/realistic-picture/realistic-picture.component.scss b/src/app/ui/realistic-picture/realistic-picture.component.scss index 761c269..3e5dcc8 100644 --- a/src/app/ui/realistic-picture/realistic-picture.component.scss +++ b/src/app/ui/realistic-picture/realistic-picture.component.scss @@ -49,11 +49,13 @@ .material { cursor:pointer; - height: 30px; - line-height: 26px; + height: 35px; + line-height: 35px; font-size: 16px; - margin-top: 10px; padding-left: 15px; + .mat-icon { + vertical-align:super; + } span { max-width: 200px; display: inline-block; diff --git a/src/app/ui/realistic-picture/realistic-picture.component.ts b/src/app/ui/realistic-picture/realistic-picture.component.ts index cd26dc4..5711add 100644 --- a/src/app/ui/realistic-picture/realistic-picture.component.ts +++ b/src/app/ui/realistic-picture/realistic-picture.component.ts @@ -15,81 +15,132 @@ import Swiper from 'swiper'; }) export class RealisticPictureComponent implements OnInit { - uploader:FileUploader = new FileUploader({ //初始化上传文件 - url: `/api/Objects/PlanPlatform/${sessionStorage.getItem('companyId')}/RealImgs`, - method: "POST", + uploader: FileUploader = new FileUploader({ //初始化上传文件 + url: `/api/Objects/PlanPlatform/${sessionStorage.getItem('companyId')}/RealImgs`, + method: "POST", itemAlias: "uploadedfile", autoUpload: false, - removeAfterUpload:true, - }); + removeAfterUpload: true, + }); - constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } + constructor(private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar) { } ngOnInit(): void { this.companyId = sessionStorage.getItem('companyId') - this.http.get('/api/CompanyAccount/RealityImageGroups').subscribe((data:any)=>{ + this.http.get('/api/CompanyAccount/RealityImageGroups').subscribe((data: any) => { this.allRealPicture = data + this.allRealPicture.unshift({ + companyId: sessionStorage.getItem('companyId'), + id: '重点部位', + name: "重点部位", + realityImages: null + }, { + companyId: sessionStorage.getItem('companyId'), + id: '安全出口', + name: "安全出口", + realityImages: null + }) this.selectReal = data[0] this.getAllRealPicture() }) } - companyId:any; //单位编号 - allRealPicture:any=[]; //所有实景图文件 - selectReal:any; //选中的实景图文件 - selectRealIndex:number=0; //选中的实景图文件下标 - allImages:any=[]; //实景图文件对应所有的实景图 - isDownload:boolean = false; //是否批量下载 - downloadList:any = []; //选中需要下载的图片 + companyId: any; //单位编号 + allRealPicture: any = []; //所有实景图文件 + selectReal: any; //选中的实景图文件 + selectRealIndex: number = 0; //选中的实景图文件下标 + allImages: any = []; //实景图文件对应所有的实景图 + isDownload: boolean = false; //是否批量下载 + downloadList: any = []; //选中需要下载的图片 //分页 - @ViewChild(MatPaginator, {static: true}) + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; - length:any; //共多少条数据 - pageSize:any = '12'; //每页条数 + length: any; //共多少条数据 + pageSize: any = '12'; //每页条数 pageSizeOptions: number[] = [12] //设置每页条数 - PageNumber:any; //第几页 + PageNumber: any; //第几页 //分页切换 - chagePage (e) { - this.PageNumber = e.pageIndex+1 + chagePage(e) { + this.PageNumber = e.pageIndex + 1 this.getAllRealPicture() } //获取所有实景图分组 - getAllGrouping () { - this.http.get('/api/CompanyAccount/RealityImageGroups').subscribe((data:any)=>{ + getAllGrouping() { + this.http.get('/api/CompanyAccount/RealityImageGroups').subscribe((data: any) => { this.allRealPicture = data this.selectReal = data[this.selectRealIndex] }) } //获取实景图分组对应实景图 - getAllRealPicture () { + getAllRealPicture() { if (this.selectReal) { - let data ={ - groupId: this.selectReal.id, - PageNumber: this.PageNumber || 1, - pageSize: this.pageSize, + + if (this.selectReal.id == '安全出口') { + let params = { + companyId: this.selectReal.companyId, + PageNumber: this.PageNumber || 1, + pageSize: this.pageSize, + } + this.http.get('/api/CompanyAccount/GetCompanySafetyExitImages', { params: params }).subscribe((data: any) => { + // console.log('当前单位安全出口', data) + this.allImages = data.items + this.length = data.totalCount + this.pageSize = this.pageSize + this.downloadList = [] + this.allImages.forEach(element => { //每张图片设置选中状态为false + element.newImageUrl = `${element.imageUrl}?x-oss-process=image/resize,m_fill,h_170,w_299` //处理图片URL地址 + element.nameStart = element.name + element.checked = false //图片是否选中布尔值 + }); + }) + } else { + let data + if (this.selectReal.id == '重点部位') { + data = { + groupId: this.selectReal.id, + // companyId: this.selectReal.companyId, + PageNumber: this.PageNumber || 1, + pageSize: this.pageSize, + } + } else { + data = { + groupId: this.selectReal.id, + PageNumber: this.PageNumber || 1, + pageSize: this.pageSize, + } + } + this.http.get('/api/CompanyAccount/RealityImages', { params: data }).subscribe((data: any) => { + this.allImages = data.items + this.length = data.totalCount + this.pageSize = data.pageSize + this.downloadList = [] + this.allImages.forEach(element => { //每张图片设置选中状态为false + // element.newImageUrl = `/api/Objects/PlanPlatform/${element.imageUrl}?x-oss-process=image/resize,m_fill,h_170,w_299` //处理图片URL地址 + if (this.selectReal.id == '重点部位') { + element.newImageUrl = `${element.imageUrl}?x-oss-process=image/resize,m_fill,h_170,w_299` + element.nameStart = element.name + } else { + element.newImageUrl = `/api/Objects/PlanPlatform/${element.imageUrl}?x-oss-process=image/resize,m_fill,h_170,w_299` //处理图片URL地址 + element.nameStart = element.name.substring(0, element.name.lastIndexOf(".")); //图片名称前缀 + } + element.checked = false //图片是否选中布尔值 + // element.nameStart = element.name.substring(0,element.name.lastIndexOf(".")); //图片名称前缀 + element.nameEnd = element.name.substring(element.name.lastIndexOf("."), element.name.length); //图片名称后缀 + }); + + }) } - this.http.get('/api/CompanyAccount/RealityImages',{params:data}).subscribe((data:any)=>{ - this.allImages = data.items - this.length = data.totalCount - this.pageSize = data.pageSize - this.downloadList = [] - this.allImages.forEach(element => { //每张图片设置选中状态为false - element.newImageUrl = `/api/Objects/PlanPlatform/${element.imageUrl}?x-oss-process=image/resize,m_fill,h_170,w_299` //处理图片URL地址 - element.checked = false //图片是否选中布尔值 - element.nameStart = element.name.substring(0,element.name.lastIndexOf(".")); //图片名称前缀 - element.nameEnd = element.name.substring(element.name.lastIndexOf("."),element.name.length); //图片名称后缀 - }); - }) + } } //切换左侧实景图文件 - changeReal (e,index) { + changeReal(e, index) { if (this.selectRealIndex != index) { this.selectReal = e this.selectRealIndex = index @@ -100,59 +151,81 @@ export class RealisticPictureComponent implements OnInit { } //选择批量下载 - download () { + download() { this.isDownload = !this.isDownload if (!this.isDownload) { //取消批量下载时数组清空 - this.allImages.forEach(element => {element.checked = false}); + this.allImages.forEach(element => { element.checked = false }); this.downloadList = [] } } - + // 预览图片---批量选择图片 - operation (e,index) { + operation(e, index) { if (this.isDownload) { //批量选择图片 e.checked = !e.checked - if (e.checked==true) {this.downloadList.push(e)} - else {this.downloadList.splice(this.downloadList.findIndex(item => item.id === e.id), 1)} + if (e.checked == true) { this.downloadList.push(e) } + else { this.downloadList.splice(this.downloadList.findIndex(item => item.id === e.id), 1) } } else { //预览图片 let data = { - allImages:this.allImages, - imgIndex: index} + selectReal: this.selectReal, + allImages: this.allImages, + imgIndex: index + } let dialogRef = this.dialog.open(previewImg, - {width: '1600px', - height:'900px',data}); - dialogRef.afterClosed().subscribe(); + { + width: '1600px', + height: '900px', data + }); + dialogRef.afterClosed().subscribe(); } } //新建实景图文件 - addReal () { + addReal() { let dialogRef = this.dialog.open(addRealPicture); - dialogRef.afterClosed().subscribe(data=>{ - if (data) {this.getAllGrouping()} - }); + dialogRef.afterClosed().subscribe(data => { + if (data) { this.getAllGrouping() } + }); } //编辑实景图文件 - editReal () { + editReal() { let data = this.selectReal if (this.selectReal) { - let dialogRef = this.dialog.open(editRealPicture, {data}); - dialogRef.afterClosed().subscribe(data=>{ - if (data) {this.getAllGrouping()} - }); + let dialogRef = this.dialog.open(editRealPicture, { data }); + dialogRef.afterClosed().subscribe(data => { + if (data) { this.getAllGrouping() } + }); } } //删除实景图文件 - delete () { + delete() { + if(this.selectReal.name == '重点部位' || this.selectReal.name == '安全出口' || this.selectReal.name == '外观'){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('内置项不允许删除', '确定', config); + return + } if (this.selectReal) { let isDelete = confirm('您确定要删除吗') if (isDelete) { - this.http.delete(`/api/CompanyAccount/RealityImageGroups/${this.selectReal.id}`).subscribe(data=>{ - this.http.get('/api/CompanyAccount/RealityImageGroups').subscribe((data:any)=>{ + this.http.delete(`/api/CompanyAccount/RealityImageGroups/${this.selectReal.id}`).subscribe(data => { + this.http.get('/api/CompanyAccount/RealityImageGroups').subscribe((data: any) => { this.allRealPicture = data + this.allRealPicture.unshift({ + companyId: sessionStorage.getItem('companyId'), + id: '重点部位', + name: "重点部位", + realityImages: null + }, { + companyId: sessionStorage.getItem('companyId'), + id: '安全出口', + name: "安全出口", + realityImages: null + }) this.selectReal = data[this.selectRealIndex] this.allImages = [] this.getAllRealPicture() @@ -165,34 +238,34 @@ export class RealisticPictureComponent implements OnInit { //实景图修改 - preservationImg (e) { + preservationImg(e) { let data = { - id:e.id, - name:e.nameStart+e.nameEnd, - imageUrl:e.imageUrl, - realityImageGroupId:e.realityImageGroupId + id: e.id, + name: e.nameStart + e.nameEnd, + imageUrl: e.imageUrl, + realityImageGroupId: e.realityImageGroupId } - this.http.put(`/api/CompanyAccount/RealityImages/${e.id}`,data).subscribe(data=>{ + this.http.put(`/api/CompanyAccount/RealityImages/${e.id}`, data).subscribe(data => { this.getAllRealPicture() const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('图片修改成功','确定',config); + this.snackBar.open('图片修改成功', '确定', config); }) } //实景图删除 - deleteImg (e) { + deleteImg(e) { let isDelete = confirm('您确定要删除吗') if (isDelete) { - this.http.delete(`/api/CompanyAccount/RealityImages/${e.id}`).subscribe(data=>{ + this.http.delete(`/api/CompanyAccount/RealityImages/${e.id}`).subscribe(data => { this.getAllRealPicture() const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('图片删除成功','确定',config); + this.snackBar.open('图片删除成功', '确定', config); }) - this.http.delete(`/api/Objects/PlanPlatform/${e.imageUrl}`).subscribe(data=>{}) + this.http.delete(`/api/Objects/PlanPlatform/${e.imageUrl}`).subscribe(data => { }) } } @@ -200,14 +273,14 @@ export class RealisticPictureComponent implements OnInit { - isLoading:boolean = false; //loading加载 + isLoading: boolean = false; //loading加载 //上传文件↓ - file:any; //上传的文件 - objectName:any; //上传对象名 - uploadId:any; //上传分块上传事件编号 + file: any; //上传的文件 + objectName: any; //上传对象名 + uploadId: any; //上传分块上传事件编号 //change选择文件 - uploadFile (e) { + uploadFile(e) { if (this.selectReal) { this.file = e.target.files[0] || null //上传的文件 let URL = window.URL.createObjectURL(this.file) @@ -215,46 +288,47 @@ export class RealisticPictureComponent implements OnInit { img.src = URL let that = this img.onload = function () { - if(img.width>=4096 || img.height>=5000 ){ + if (img.width >= 4096 || img.height >= 5000) { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - that.snackBar.open('请选择分辨率小于4096*5000的图片','确定',config); + that.snackBar.open('请选择分辨率小于4096*5000的图片', '确定', config); that.uploader.clearQueue(); //清空input控件文件 (document.getElementById('uploadFile')).value = null //清空input框缓存 - }else{ that.startUploading() } + } else { that.startUploading() } } //onload } else { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('请选择或创建实景图文件夹','确定',config); + this.snackBar.open('请选择或创建实景图文件夹', '确定', config); this.uploader.clearQueue(); //清空input控件文件 (document.getElementById('uploadFile')).value = null //清空input框缓存 } } //上传文件 - startUploading () { + 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时 + if (file && fileSize <= shardSize) { //上传文件<=5MB时 this.uploader.queue[0].upload();//开始上传 - this.uploader.queue[0].onSuccess = (response, status, headers) => { + 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} + } else { // 上传文件后获取服务器返回的数据错误 + let tempRes = JSON.parse(response); + } + }; + } else if (file && fileSize > shardSize && fileSize < maxdSize) { //上传文件>5MB时,分块上传 + let data = { filename: file.name } this.isLoading = true - this.http.post(`/api/NewMultipartUpload/PlanPlatform/${this.companyId}/RealImgs`,{},{params:data}).subscribe((data:any)=>{ //初始化分段上传 + this.http.post(`/api/NewMultipartUpload/PlanPlatform/${this.companyId}/RealImgs`, {}, { params: data }).subscribe((data: any) => { //初始化分段上传 this.objectName = data.objectName this.uploadId = data.uploadId this.subsectionUploading() @@ -263,62 +337,63 @@ export class RealisticPictureComponent implements OnInit { } - PartNumberETag:any=[]; //每次返回需要保存的信息 + PartNumberETag: any = []; //每次返回需要保存的信息 //开始分段上传 - async subsectionUploading () { + 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 (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 () { + endUploading() { let data = this.PartNumberETag - let paramsData = {uploadId:this.uploadId} - this.http.post(`/api/CompleteMultipartUpload/PlanPlatform/${this.objectName}`,data,{params:paramsData}).subscribe(data=>{ + 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 =[] //清空保存返回的信息 + this.PartNumberETag = [] //清空保存返回的信息 }) } //上传图片成功后获取url地址发送请求创建实景图 - addRealImg () { + addRealImg() { let data = { name: this.file.name, - imageUrl:this.objectName, + imageUrl: this.objectName, realityImageGroupId: this.selectReal.id, } - this.http.post('/api/CompanyAccount/RealityImages',data).subscribe(data=>{ + this.http.post('/api/CompanyAccount/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); + this.snackBar.open('图片上传成功', '确定', config); }) } @@ -326,33 +401,50 @@ export class RealisticPictureComponent implements OnInit { //批量下载↓ //开始下载 - async batchDownload () { + 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=>{ + for (let i = 0; i < this.downloadList.length; i++) { + let result = await new Promise((result, reject) => { + // this.http.get(`/api/Objects/PlanPlatform/${this.downloadList[i].imageUrl}`,{responseType: 'blob'},).subscribe(data=>{ + let url + if (this.selectReal.id == '重点部位') { + url = this.downloadList[i].imageUrl + } else { + url = `/api/Objects/PlanPlatform/${this.downloadList[i].imageUrl}` + } + this.http.get(url, { responseType: 'blob' },).subscribe((data: any) => { 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); + // link.setAttribute("download", this.downloadList[i].name); + let imgName + if (this.selectReal.id == '重点部位') { + imgName = this.downloadList[i].name + '.' + data.type.split('/')[data.type.split('/').length - 1] + } else { + imgName = this.downloadList[i].name + } + link.setAttribute("download", imgName); document.body.appendChild(link); link.click(); - result('success')}) + result('success') + }) }) - if(i == this.downloadList.length-1) { //判断是否下载完毕 + if (i == this.downloadList.length - 1) { //判断是否下载完毕 this.isLoading = false this.isDownload = false - this.allImages.forEach(element => {element.checked = false}); - this.downloadList = []} + 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);} + this.snackBar.open('请选择图片', '确定', config); + } } @@ -371,14 +463,19 @@ export class RealisticPictureComponent implements OnInit { }) export class previewImg { - constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef, + constructor(private http: HttpClient, public dialog: MatDialog, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data) { } - testSwiper: Swiper; + 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地址 + // element.previewImageUrl = `/api/Objects/PlanPlatform/${element.imageUrl}?x-oss-process=image/auto-orient,1` //处理图片URL地址 + if (this.data.selectReal.id == '重点部位' || this.data.selectReal.id == '安全出口') { + element.previewImageUrl = `${element.imageUrl}` //处理图片URL地址 + } else { + element.previewImageUrl = `/api/Objects/PlanPlatform/${element.imageUrl}?x-oss-process=image/auto-orient,1` //处理图片URL地址 + } }); } @@ -388,24 +485,24 @@ export class previewImg { initialSlide: this.data.imgIndex, direction: 'horizontal', loop: false, - + // 如果需要前进后退按钮 navigation: { - nextEl: '.swiper-button-next', - prevEl: '.swiper-button-prev', + nextEl: '.swiper-button-next', + prevEl: '.swiper-button-prev', } }); } - allImages:any; //展示所有的图片 - rotationAngle:number=0; //旋转角度 + allImages: any; //展示所有的图片 + rotationAngle: number = 0; //旋转角度 //旋转图片 - rotate () { - this.rotationAngle = this.rotationAngle+90 - if (this.rotationAngle === 360) {this.rotationAngle = 0} + rotate() { + this.rotationAngle = this.rotationAngle + 90 + if (this.rotationAngle === 360) { this.rotationAngle = 0 } } } @@ -420,23 +517,31 @@ export class previewImg { }) export class addRealPicture { - constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef) { } + constructor(private http: HttpClient, public dialog: MatDialog, public dialogRef: MatDialogRef, public snackBar: MatSnackBar) { } ngOnInit(): void { this.companyId = sessionStorage.getItem('companyId') } - companyId:any; //单位编号 + companyId: any; //单位编号 //提交表单 - onSubmit (e) { - let data={ - name:e.name, + onSubmit(e) { + let data = { + name: e.name, companyId: this.companyId } - this.http.post('/api/CompanyAccount/RealityImageGroups',data).subscribe(data=>{ - this.dialogRef.close(data); - }) + if(e.name == '安全出口' || e.name == '重点部位' || e.name == '外观'){ + let config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('不允许创建名为安全出口、重点部位、外观的文件夹', '确定', config); + }else{ + this.http.post('/api/CompanyAccount/RealityImageGroups', data).subscribe(data => { + this.dialogRef.close(data); + }) + } + } } @@ -451,25 +556,33 @@ export class addRealPicture { }) export class editRealPicture { - constructor(private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) { } + constructor(private http: HttpClient, public dialog: MatDialog, public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { } ngOnInit(): void { this.name = this.data.name } - name:any //实景图分组名称 + name: any //实景图分组名称 //提交表单 - onSubmit (e) { + onSubmit(e) { let data = { - id:this.data.id, - name:e.name, - companyId:this.data.companyId + id: this.data.id, + name: e.name, + companyId: this.data.companyId } - this.http.put(`/api/CompanyAccount/RealityImageGroups/${this.data.id}`,data).subscribe(data=>{ - this.dialogRef.close('success'); - }) + if(e.name == '安全出口' || e.name == '重点部位'){ + let config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('文件名不允许为安全出口、重点部位、外观', '确定', config); + }else{ + this.http.put(`/api/CompanyAccount/RealityImageGroups/${this.data.id}`, data).subscribe(data => { + this.dialogRef.close('success'); + }) + } + } } \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index d91fc77..828ba6e 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -176,3 +176,10 @@ table td.mat-footer-cell:last-of-type { background: #666; } } + +#firefightingdevice{ + .expansionheader{ + height: auto!important; + } + +} \ No newline at end of file