From 5da3594e99617c72e652ec3b57d122090378b5ae Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sun, 8 Nov 2020 14:29:11 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=AE=8C=E5=96=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2ui=EF=BC=88=E5=89=A9=E4=BD=99=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E9=83=A8=E4=BD=8D=E5=9B=BE=E7=89=87=E6=9F=A5=E7=9C=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicinfo/basicinfo.component.html | 27 +++--- .../basicinfo/basicinfo.component.scss | 83 +++++++++---------- .../key-unit/basicinfo/basicinfo.component.ts | 26 ++++-- .../fire-fighting-device.component.html | 8 +- .../fire-fighting-device.component.scss | 20 +++-- .../fire-fighting-device.component.ts | 6 +- .../imagesdata.component.html | 4 +- .../imagesdata.component.ts | 20 +++-- .../fire-fighting-device/previewImg.html | 32 +++---- .../key-unit/key-site/key-site.component.html | 17 ++-- .../key-unit/key-site/key-site.component.scss | 4 + .../key-unit/key-site/key-site.component.ts | 22 +++-- .../key-site/keysiteimgs.component.html | 31 ++++--- .../add-six-familiar.component.scss | 5 ++ .../collection-tools.component.html | 6 +- src/app/ui/home/home.component.ts | 2 +- .../ui/know-route/know-route.component.html | 23 ++--- .../ui/know-route/know-route.component.scss | 75 ++++++++--------- src/app/ui/know-route/know-route.component.ts | 82 +++--------------- .../photoofthescene.component.html | 2 +- .../photoofthescene.component.scss | 3 +- .../photoofthescene.component.ts | 8 ++ .../ui/water-road/water-road.component.scss | 1 + src/app/ui/water-road/water-road.component.ts | 1 - src/styles.scss | 2 +- 25 files changed, 243 insertions(+), 267 deletions(-) diff --git a/src/app/key-unit/basicinfo/basicinfo.component.html b/src/app/key-unit/basicinfo/basicinfo.component.html index 2cf3c2a..a1bcb95 100644 --- a/src/app/key-unit/basicinfo/basicinfo.component.html +++ b/src/app/key-unit/basicinfo/basicinfo.component.html @@ -2,10 +2,10 @@ - + 单位信息 - keyboard_arrow_down + keyboard_arrow_down
@@ -64,10 +64,10 @@
-
+
* 辖区中队： - +
-
+
* 单位地址： - +
单位照片： -
- +
+
@@ -119,9 +119,6 @@
- - -
@@ -160,7 +157,7 @@

{{item.name}}

-
+
{{i.propertyName}}({{i.physicalUnit}})： @@ -201,7 +198,7 @@
-
+
*

{{item.buildingBasicGroups[0].name}}

-
+
{{i.propertyName}} ({{i.physicalUnit}}) ： @@ -486,7 +483,7 @@
-
+
{ + if(document.getElementById('viewerjs')){ + this.gallery = new Viewer(document.getElementById('viewerjs'),{ + url: 'data-original' + }); + } + }, 0); if(localStorage.getItem("pattern") == "edit"){ this.pattern = true }else if(localStorage.getItem("pattern") == "look"){ @@ -869,14 +877,14 @@ export class BasicinfoComponent implements OnInit { } //查看单位大图 lookmaster(){ - const dialogRef = this.dialog.open(LookMaster, {//调用open方法打开对话框并且携带参数过去 - width: '800px', - height:'640px', - data: {img:this.imgsrc} - }); - dialogRef.afterClosed().subscribe( + // const dialogRef = this.dialog.open(LookMaster, {//调用open方法打开对话框并且携带参数过去 + // width: '800px', + // height:'640px', + // data: {img:this.imgsrc} + // }); + // dialogRef.afterClosed().subscribe( - ); + // ); } //上传文件 startUploading() { @@ -897,6 +905,7 @@ export class BasicinfoComponent implements OnInit { config.verticalPosition = 'top'; config.duration = 3000 this.snackBar.open('上传成功','确定',config); + this.gallery.update() }) } else if (file && fileSize >= shardSize) { //上传文件>5MB时,分块上传 @@ -980,6 +989,7 @@ export class BasicinfoComponent implements OnInit { this.isspinner = false this.PartNumberETag = [] this.uploader.clearQueue(); //清空input控件文件 + this.gallery.update() }) } //删除具体建筑 diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html index 7de851e..9350bfd 100644 --- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html +++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html @@ -5,7 +5,7 @@

暂无数据,请完善单位基本信息

-

{{item.name}}

+

{{item.name}}

add_circle_outline description @@ -73,7 +73,7 @@ -

{{item.name}}

+

{{item.name}}

description
@@ -99,7 +99,7 @@
-

{{item.name}}

+

{{item.name}}

add_circle_outline description @@ -167,7 +167,7 @@ -

{{item.name}}

+

{{item.name}}

description
diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss index 3ea1f32..8cfac6f 100644 --- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss +++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss @@ -14,7 +14,9 @@ color: black; cursor:pointer; } - +.titlename{ + font-size: 0.175781rem; +} //可展开面板每一行css @@ -118,9 +120,9 @@ textarea { //img图片列表页面 .imageList { - width: 100%; - height: 100%; - overflow-y: auto; + width: 7.617188rem; + height: 5.859375rem; + // overflow-y: auto; .imageListBox { width: 100%; height: 90%; @@ -128,8 +130,8 @@ textarea { flex-direction: row; flex-wrap: wrap; .imagesBox { - width: 300px; - height: 200px; + width: 2.929688rem; + height: 1.953125rem; margin: 0 11px 0 11px; display: inline-block; img { @@ -137,9 +139,13 @@ textarea { width: auto; height: auto; max-width: 100%; - height: 170px; + height: 1.660156rem; cursor:pointer; } } } } +.imgdetailstwo{ + width: 7.617188rem; + height: 5.859375rem; +} \ No newline at end of file diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts index 3e2f3e3..339e642 100644 --- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts +++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts @@ -447,7 +447,7 @@ export class FireFightingDeviceComponent implements OnInit { }); //newDate if (data.images.length) { - let dialogRef = this.dialog.open(ImagesData,{width:'1350px',height:'700px',data}); //打开图片弹窗 + let dialogRef = this.dialog.open(ImagesData,{data}); //打开图片弹窗 } else { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -473,7 +473,7 @@ export class FireFightingDeviceComponent implements OnInit { data.images.push(elements)} }); }); if (data.images.length) { - let dialogRef = this.dialog.open(ImagesData,{width:'1350px',height:'700px',data}); //打开图片弹窗 + let dialogRef = this.dialog.open(ImagesData,{data}); //打开图片弹窗 } else { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -535,7 +535,7 @@ export class FireFightingDeviceComponent implements OnInit { }); }); if (data.images.length) { - let dialogRef = this.dialog.open(ImagesData,{width:'1350px',height:'700px',data}); //打开图片弹窗 + let dialogRef = this.dialog.open(ImagesData,{data}); //打开图片弹窗 } else { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; diff --git a/src/app/key-unit/fire-fighting-device/imagesdata.component.html b/src/app/key-unit/fire-fighting-device/imagesdata.component.html index 534df3e..f338a46 100644 --- a/src/app/key-unit/fire-fighting-device/imagesdata.component.html +++ b/src/app/key-unit/fire-fighting-device/imagesdata.component.html @@ -1,8 +1,8 @@
{{data.name}}
-
+
- +
diff --git a/src/app/key-unit/fire-fighting-device/imagesdata.component.ts b/src/app/key-unit/fire-fighting-device/imagesdata.component.ts index 05c43e1..93604f0 100644 --- a/src/app/key-unit/fire-fighting-device/imagesdata.component.ts +++ b/src/app/key-unit/fire-fighting-device/imagesdata.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; import Swiper from 'swiper'; - +import Viewer from 'viewerjs'; @Component({ @@ -13,21 +13,25 @@ import Swiper from 'swiper'; export class ImagesData { constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public dialog: MatDialog) {} - + gallery ngOnInit(): void { this.data.images.forEach(element => { element.newImageUrl = `${element.propertyValue}?x-oss-process=image/resize,m_fill,h_170,w_299` }); + setTimeout(() => { + this.gallery = new Viewer(document.getElementById('viewerjs'),{ + url: 'data-original' + }); + }, 0); } //查看大图 seeImage (index) { - let data = { - allImages:this.data.images, - imgIndex: index} - let dialogRef = this.dialog.open(previewBigImg, - {width: '1600px', - height:'900px',data}); + // let data = { + // allImages:this.data.images, + // imgIndex: index} + // let dialogRef = this.dialog.open(previewBigImg, + // {data}); } } diff --git a/src/app/key-unit/fire-fighting-device/previewImg.html b/src/app/key-unit/fire-fighting-device/previewImg.html index 1cde6b9..b40da5c 100644 --- a/src/app/key-unit/fire-fighting-device/previewImg.html +++ b/src/app/key-unit/fire-fighting-device/previewImg.html @@ -1,17 +1,19 @@ -
图片详情
-
-
-
- -
+
+
图片详情
+
+
+
+ +
+
-
- - -
-
+ + +
+
+
+ +
+ +
- -
- -
\ No newline at end of file diff --git a/src/app/key-unit/key-site/key-site.component.html b/src/app/key-unit/key-site/key-site.component.html index df62c75..cfa5061 100644 --- a/src/app/key-unit/key-site/key-site.component.html +++ b/src/app/key-unit/key-site/key-site.component.html @@ -45,10 +45,10 @@ -

暂无数据,请前往平面图进行相关数据录入

+

暂无数据,请前往平面图进行相关数据录入

-

重点提示

+

重点提示

description

@@ -58,11 +58,11 @@

- +
-

重点部位情况

+

重点部位情况

@@ -97,16 +97,19 @@
重点部位名称图片 - 查看图片 + 查看图片 +
-

暂无数据,请前往平面图进行相关数据录入

+

暂无数据,请前往平面图进行相关数据录入

-

重点提示

+

重点提示

description

diff --git a/src/app/key-unit/key-site/key-site.component.scss b/src/app/key-unit/key-site/key-site.component.scss index 29d9aee..60e43c6 100644 --- a/src/app/key-unit/key-site/key-site.component.scss +++ b/src/app/key-unit/key-site/key-site.component.scss @@ -56,3 +56,7 @@ table { height: 30px; margin: 20px auto; } +.imgdialog{ + width: 800px; + height: 650px; +} \ No newline at end of file diff --git a/src/app/key-unit/key-site/key-site.component.ts b/src/app/key-unit/key-site/key-site.component.ts index 4fc4efc..a329731 100644 --- a/src/app/key-unit/key-site/key-site.component.ts +++ b/src/app/key-unit/key-site/key-site.component.ts @@ -4,7 +4,7 @@ import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dial import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { KeySiteImgs } from './keysiteimgs.component' import { ActivatedRoute } from '@angular/router'; - +import Viewer from 'viewerjs'; @Component({ @@ -66,6 +66,7 @@ export class KeySiteComponent implements OnInit { element.companyInput = null }) //建筑重点提示数据 this.getAllBuildingPositon() this.getAllBuildingTips() + console.log(111,this.allBuilding) } }) } @@ -147,13 +148,18 @@ export class KeySiteComponent implements OnInit { } //查看图片 - seeImg (e) { + seeImg (e,key) { if (e.length) { - let data = e - const dialogRef = this.dialog.open(KeySiteImgs, {//调用open方法打开对话框并且携带参数过去 - width: '820px', - height:'670px',data}); - dialogRef.afterClosed().subscribe(); + // let data = e + // const dialogRef = this.dialog.open(KeySiteImgs, {//调用open方法打开对话框并且携带参数过去 + // width: '820px', + // height:'670px',data}); + // dialogRef.afterClosed().subscribe(); + var image = new Viewer(document.getElementById(`viewerjs${key}`),{ + url: 'data-original' + }); + // document.getElementById('viewerjs').click(); + this.xxx() } else { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -161,7 +167,9 @@ export class KeySiteComponent implements OnInit { this.snackBar.open('暂无图片数据','确定',config); } } + xxx(){ + } //封装方法获取更新当前tab页重点提示 toUpdate (e) { let id = {buildingId:e.id} diff --git a/src/app/key-unit/key-site/keysiteimgs.component.html b/src/app/key-unit/key-site/keysiteimgs.component.html index ae2fc95..cabfc8e 100644 --- a/src/app/key-unit/key-site/keysiteimgs.component.html +++ b/src/app/key-unit/key-site/keysiteimgs.component.html @@ -1,18 +1,17 @@ -

图片详情
-
-
-
- -
-
-
- -
-
+
+
图片详情
+
+
+
+ +
+
+
+ + +
+
+
- \ No newline at end of file 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 e82cef5..4ddad46 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 @@ -76,6 +76,11 @@ line-height: 0.195313rem; font-size: 0.15625rem; } + button{ + height: 0.322266rem; + line-height: 0.292969rem; + text-align: center; + } } .listbox{ height: 5.3rem; diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index 903c4ec..da14b77 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -401,9 +401,9 @@
- + - + {{node.name}} @@ -413,7 +413,7 @@ - +
- 添加路线: - - {{item.name}}-> + 添加路线: + + {{item.name}}->
-
+
- + +
+
+
-
- -
+
- 备注：
- +
备注：
+
\ No newline at end of file diff --git a/src/app/ui/know-route/know-route.component.scss b/src/app/ui/know-route/know-route.component.scss index 2324b7a..bc01adc 100644 --- a/src/app/ui/know-route/know-route.component.scss +++ b/src/app/ui/know-route/know-route.component.scss @@ -3,9 +3,10 @@ height: 100%; //添加熟悉部位 .addbw{ - height: 0.488281rem; + height: 0.976563rem; + line-height: 0.976563rem; width: 100%; - margin: 0.488281rem 0.78125rem; + button{ margin-left: 0.097656rem; } @@ -24,9 +25,8 @@ } //添加路线 .addRoute{ - width: 100%; - height: 1.464844rem; - margin: 0.488281rem 0.78125rem; + height: 0.976563rem; + line-height: 0.976563rem; position:relative; white-space: nowrap; input{ @@ -58,57 +58,50 @@ //底部div .bottomAll{ width: 100%; - height: 30%; - //margin-top: 0.976563rem; + height: 230px; + margin-top: 0.488281rem; display: flex; .upload{ - width: 50%; - height: 100%; + position: relative; + flex: 1; + display: flex; + justify-content: center; .uploadingimg{ - width: 40%; - height: 30%; - // background: url('../../../assets/images/upload2.png') no-repeat center center; - + width: 70%; + height: 75%; + top: 0.058594rem; position: absolute; - left: 0.488281rem; - //top: 0.097656rem; - bottom: 80px; - //border: 1px dashed gray; + left: 8%; border-radius:3px; img{ - margin-left: 0.195313rem; - margin-top: 0.097656rem; + width: 100%; + height: 100%; } } - } - .image{ - // position: absolute; - // top: 199px; - // left: 160px; - // width: 299px; - // height: 170px; - input{ - width: 2.929688rem; - height: 1.708984rem; + .image{ + width: 70%; + height: 75%; + left: 8%; + top: 0.058594rem; position: absolute; - left: 0.683594rem; - bottom: 0.78125rem; - opacity: 0; - margin-top: 0.048828rem; - cursor: pointer; + border-radius:3px; + input{ + width: 100%; + height: 100%; + opacity: 0; + cursor: pointer; + } } - // opacity:0; - } + .remarks{ - width: 50%; - height: 50%; + flex: 1; input{ - height: 0.488281rem; - width: 0.488281rem; + width: 30%; + height: 30%; } textarea{ - margin-left: 0.195313rem; + } } } diff --git a/src/app/ui/know-route/know-route.component.ts b/src/app/ui/know-route/know-route.component.ts index a281344..8745cf0 100644 --- a/src/app/ui/know-route/know-route.component.ts +++ b/src/app/ui/know-route/know-route.component.ts @@ -21,7 +21,7 @@ export class KnowRouteComponent implements OnInit { constructor(public snackBar: MatSnackBar,private http: HttpClient) { } ngOnInit(): void { - // this.uploadSucced = JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx")) || [] + } @@ -84,11 +84,9 @@ export class KnowRouteComponent implements OnInit { this.imgUrl = data.objectName this.imgsrc = `/api/Objects/PlanPlatform/${this.imgUrl}?x-oss-process=image/resize,m_fill,h_170,w_299` console.log(this.imgsrc) - //localStorage.setItem(this.clickName,this.imgsrc) - //this.uploadSucced.push({name:this.clickName,src:this.imgsrc,smark}) this.uploadSucced[this.chooseid].src=this.imgsrc this.inputShow=false - //this.uploadSucced[this.chooseid].smark=this.textareazhi + console.log(this.uploadSucced) const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -97,95 +95,40 @@ export class KnowRouteComponent implements OnInit { }) } else if (file && fileSize >= shardSize) { //上传文件>5MB时,分块上传 - /* 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() - }) */ - } - } - //开始分块上传 - 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() - } } } - //完成分块上传 - endUploading() { - let data = this.PartNumberETag - let paramsData = { uploadId: this.uploadId } - this.http.post(`/api/CompleteMultipartUpload/PlanPlatform/${this.objectName}`, data, { params: paramsData }).subscribe(data => { - this.imgsrc = `/api/Objects/PlanPlatform/${this.objectName}?x-oss-process=image/resize,m_fill,h_170,w_299` - this.isspinner = false - this.PartNumberETag = [] - }) - } //熟悉部位点击事件 addRoute(event,item){ - this.showorfalse = "show" this.knowRoute.push({name:event.target.innerHTML,idnum:"🠖"}) this.uploadSucced.push({name:item.name,src:"",smark:""}) - console.log(this.uploadSucced) } - clickName savekey uploadSucced:any = JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx")) || []//上传成功暂存对象 gallery //熟悉路线点击事件 - knowroutwClick(event,key,item){ + knowroutwClick(key,item){ + this.showorfalse = "show" + this.chooseid=key setTimeout(() => { if(document.getElementById('viewerjs')){ this.gallery = new Viewer(document.getElementById('viewerjs'),{ url: 'data-original' }); } - }, 0); - this.showorfalse="show" - this.uploadSucced[key].smark = this.textareazhi - this.chooseid=key - this.clickName=item.name+key+sessionStorage.getItem("companyId") - //console.log("sss"+JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx"))[key].src) - /* if(JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx"))[key]){ - - } */ - if( JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx"))&& JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx"))[key] && JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx"))[key].src!=""){ + if( JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx")) + && JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx"))[key] + && JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx"))[key].src!=""){ this.imgsrc=JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx"))[key].src this.textareazhi=JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx"))[key].smark this.inputShow=false }else if(this.uploadSucced[key].src!=""){ this.imgsrc=this.uploadSucced[key].src this.inputShow=false - } - else{ + }else{ this.imgsrc="../../../assets/images/upload.jpg" this.textareazhi="" this.inputShow=true @@ -193,10 +136,11 @@ export class KnowRouteComponent implements OnInit { } //保存点击事件 savaClick(){ - this.uploadSucced[this.chooseid].smark=this.textareazhi localStorage.setItem(sessionStorage.getItem("companyId")+"xxx",JSON.stringify(this.uploadSucced)) - alert("保存成功") - console.log(JSON.parse(localStorage.getItem(sessionStorage.getItem("companyId")+"xxx")) ) + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('保存成功','确定',config); } } diff --git a/src/app/ui/photoofthescene/photoofthescene.component.html b/src/app/ui/photoofthescene/photoofthescene.component.html index 43fa83c..1df8dfa 100644 --- a/src/app/ui/photoofthescene/photoofthescene.component.html +++ b/src/app/ui/photoofthescene/photoofthescene.component.html @@ -2,7 +2,7 @@
-
+
diff --git a/src/app/ui/photoofthescene/photoofthescene.component.scss b/src/app/ui/photoofthescene/photoofthescene.component.scss index 75329d2..625135f 100644 --- a/src/app/ui/photoofthescene/photoofthescene.component.scss +++ b/src/app/ui/photoofthescene/photoofthescene.component.scss @@ -3,6 +3,7 @@ table{ width: 85%; height: 80%; margin-top: 5%; + overflow-y: auto; border-collapse: collapse; td{ position: relative; @@ -27,7 +28,7 @@ table{ } .image{ height: 100%; - width: 299px; + width: 2.919922rem; } .deleteicon{ position: absolute; diff --git a/src/app/ui/photoofthescene/photoofthescene.component.ts b/src/app/ui/photoofthescene/photoofthescene.component.ts index 6c1120b..24815fe 100644 --- a/src/app/ui/photoofthescene/photoofthescene.component.ts +++ b/src/app/ui/photoofthescene/photoofthescene.component.ts @@ -170,4 +170,12 @@ export class PhotoofthesceneComponent implements OnInit { // }) } } + dialog(){ + if(localStorage.getItem("pattern")=="look"){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('查看模式无法上传','确定',config); + } + } } diff --git a/src/app/ui/water-road/water-road.component.scss b/src/app/ui/water-road/water-road.component.scss index 0158e8c..8a32d4d 100644 --- a/src/app/ui/water-road/water-road.component.scss +++ b/src/app/ui/water-road/water-road.component.scss @@ -42,6 +42,7 @@ .dialogbox{ width: 7.441406rem; height: 5.761719rem; + // overflow-y: auto; .title{ span{ font-size: 16px; diff --git a/src/app/ui/water-road/water-road.component.ts b/src/app/ui/water-road/water-road.component.ts index c4af7d7..f0bf367 100644 --- a/src/app/ui/water-road/water-road.component.ts +++ b/src/app/ui/water-road/water-road.component.ts @@ -82,7 +82,6 @@ export class WaterRoadComponent implements OnInit { console.log(e.lnglat.getLng() + ',' + e.lnglat.getLat()) }); - // this.map.setCity('南宁市') this.map.add(Arr);//火源标点 diff --git a/src/styles.scss b/src/styles.scss index e402cd7..a887f93 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -83,5 +83,5 @@ table td.mat-footer-cell:last-of-type{ height: 100%; } .mat-tab-body-content{ - overflow: hidden!important; + overflow-x: hidden!important; } \ No newline at end of file