From b1813b36dd4d7d1a6c9917277dbe30b2fc01a1c7 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Fri, 4 Jun 2021 10:31:07 +0800
Subject: [PATCH 1/7] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=20=E4=BD=9C=E6=88=98?=
=?UTF-8?q?=E9=83=A8=E7=BD=B2=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BA=95=E5=9B=BE?=
=?UTF-8?q?=E5=8A=A0=E8=BD=BDBUG=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/ui/collection-tools/collection-tools.component.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index c2d5bd2..52129a7 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -2496,6 +2496,8 @@ export class CollectionToolsComponent implements OnInit {
let dialogRef = this.dialog.open(addBGCDisposalNodeComponent);
dialogRef.afterClosed().subscribe(data => {
if (data) {
+ this.canvasData.selectStorey.imageWidth = 0 //修正加载底图BUG
+
this.canvasData.customizeDisposalNode = data //自定义数据节点
let imgURL = window.URL.createObjectURL(data.file) //将图片生成 url地址
// this.canvasData.selectPanelPointBaseData = {description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: ''} //更新 当前数据节点对应父级节点
From 529e8b6956e288bf5d1e5e6c9a34760f37268a39 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Fri, 4 Jun 2021 10:50:54 +0800
Subject: [PATCH 2/7] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=B9=B3=E9=9D=A2?=
=?UTF-8?q?=E5=9B=BEgis=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../collection-tools.component.ts | 24 +++++++++++++------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts
index 7e0ec8b..81fd391 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -1400,15 +1400,24 @@ export class CollectionToolsPlanComponent implements OnInit {
this.showInfoClick(e)
});
this.map.on("complete", () => {
-
for (const key in this.canvasData.originaleveryStoreyData.data) {
if (Object.prototype.hasOwnProperty.call(this.canvasData.originaleveryStoreyData.data, key)) {
const element = this.canvasData.originaleveryStoreyData.data[key];
- let markerContent = '' +
+ let editable = sessionStorage.getItem('editable')
+ let markerContent
+ if(editable == '1') {
+ markerContent = '' +
'' +
`
` +
`
X
` +
'
' +
+ `
` +
+ '
- {{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}分
+ {{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}%
From 05e65ed9b710a09eba1fe00f621c94be35046204 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Fri, 4 Jun 2021 15:09:27 +0800
Subject: [PATCH 4/7] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E9=99=90=E5=88=B6?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../collection-tools.component.ts | 7 +++++++
.../ui/collection-tools-plan/collection-tools.component.ts | 7 +++++++
src/app/ui/collection-tools-plan/leftFunctionalDomain.ts | 7 +++++++
src/app/ui/collection-tools/collection-tools.component.ts | 7 +++++++
src/app/ui/collection-tools/leftFunctionalDomain.ts | 7 +++++++
5 files changed, 35 insertions(+)
diff --git a/src/app/ui/collection-tools-building/collection-tools.component.ts b/src/app/ui/collection-tools-building/collection-tools.component.ts
index 1ce5d4a..134dff5 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-building/collection-tools.component.ts
@@ -2087,6 +2087,13 @@ export class CollectionToolsBuildingComponent implements OnInit {
let fileSize = file.size || null //上传文件的总大小
let maxSize = 5 * 1024 * 1024 //5MB一个分片
let tenSize = 10 * 1024 * 1024 //10MB限制
+ if (file && file.name.toLowerCase().indexOf('png') == -1 && file.name.toLowerCase().indexOf('jpg') == -1 && file.name.toLowerCase().indexOf('jpeg') == -1) {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请上传图片后缀为png,jpg,jpeg的文件', '确定', config);
+ return
+ }
if (file && fileSize <= maxSize) { //上传文件<=5MB时
let formData = new FormData()
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts
index 7e0ec8b..9c95c63 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -2019,6 +2019,13 @@ export class CollectionToolsPlanComponent implements OnInit {
let fileSize = file.size || null //上传文件的总大小
let maxSize = 5 * 1024 * 1024 //5MB一个分片
let tenSize = 10 * 1024 * 1024 //10MB限制
+ if (file && file.name.toLowerCase().indexOf('png') == -1 && file.name.toLowerCase().indexOf('jpg') == -1 && file.name.toLowerCase().indexOf('jpeg') == -1) {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请上传图片后缀为png,jpg,jpeg的文件', '确定', config);
+ return
+ }
if (file && fileSize <= maxSize) { //上传文件<=5MB时
let formData = new FormData()
diff --git a/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts b/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
index 4fc836d..0a0a338 100644
--- a/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
+++ b/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
@@ -60,6 +60,13 @@ export class leftFunctionalDomainComponentPlan implements OnInit {
//提交表单创建平面图
onSubmit (e) {
if (this.file && this.selectedType == 'image') {
+ if (this.file.name.toLowerCase().indexOf('png') == -1 && this.file.name.toLowerCase().indexOf('jpg') == -1 && this.file.name.toLowerCase().indexOf('jpeg') == -1) {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请上传图片后缀为png,jpg,jpeg的文件', '确定', config);
+ return
+ }
this.maskLayerService.sendMessage(true)
if (this.file.size<=5*1024*1024) { //小于5MB
let formData = new FormData()
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 52129a7..7281f41 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -2156,6 +2156,13 @@ export class CollectionToolsComponent implements OnInit {
let fileSize = file.size || null //上传文件的总大小
let maxSize = 5 * 1024 * 1024 //5MB一个分片
let tenSize = 10 * 1024 * 1024 //10MB限制
+ if (file && file.name.toLowerCase().indexOf('png') == -1 && file.name.toLowerCase().indexOf('jpg') == -1 && file.name.toLowerCase().indexOf('jpeg') == -1) {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请上传图片后缀为png,jpg,jpeg的文件', '确定', config);
+ return
+ }
if (file && fileSize <= maxSize) { //上传文件<=5MB时
let formData = new FormData()
diff --git a/src/app/ui/collection-tools/leftFunctionalDomain.ts b/src/app/ui/collection-tools/leftFunctionalDomain.ts
index b13a965..3570e0a 100644
--- a/src/app/ui/collection-tools/leftFunctionalDomain.ts
+++ b/src/app/ui/collection-tools/leftFunctionalDomain.ts
@@ -230,6 +230,13 @@ export class addBGCDisposalNodeComponent implements OnInit {
//提交表单
onSubmit (e) {
if (e.name && this.file) {
+ if (this.file.name.toLowerCase().indexOf('png') == -1 && this.file.name.toLowerCase().indexOf('jpg') == -1 && this.file.name.toLowerCase().indexOf('jpeg') == -1) {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请上传图片后缀为png,jpg,jpeg的文件', '确定', config);
+ return
+ }
e.file = this.file
this.dialogRef.close(e);
} else {
From 61282794708f805390fc199e181ce882ee5be5b2 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Mon, 7 Jun 2021 13:46:09 +0800
Subject: [PATCH 5/7] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E5=88=86=E6=95=B0?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A0=B7=E5=BC=8F=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../key-unit/edit-plan-info/edit-plan-info.component.scss | 5 ++++-
.../view-unit-details/view-unit-details.component.scss | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/app/key-unit/edit-plan-info/edit-plan-info.component.scss b/src/app/key-unit/edit-plan-info/edit-plan-info.component.scss
index e411244..2896172 100644
--- a/src/app/key-unit/edit-plan-info/edit-plan-info.component.scss
+++ b/src/app/key-unit/edit-plan-info/edit-plan-info.component.scss
@@ -6,9 +6,12 @@
width: 100%;
height: 0px;
.scorePrompt {
- width: 100%;
+ width: 300px;
+ height: 0px;
text-align: center;
position: absolute;
+ left: 50%;
+ margin-left: -150px;
top: 88px;
font-size: 15px;
z-index: 111;
diff --git a/src/app/key-unit/view-unit-details/view-unit-details.component.scss b/src/app/key-unit/view-unit-details/view-unit-details.component.scss
index 01a9116..1eb53a5 100644
--- a/src/app/key-unit/view-unit-details/view-unit-details.component.scss
+++ b/src/app/key-unit/view-unit-details/view-unit-details.component.scss
@@ -6,9 +6,12 @@
width: 100%;
height: 0px;
.scorePrompt {
- width: 100%;
+ width: 300px;
+ height: 0px;
text-align: center;
position: absolute;
+ left: 50%;
+ margin-left: -150px;
top: 88px;
font-size: 15px;
z-index: 111;
From 204e65d96c28b9385dcb995b670f60d1ab71c1a6 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 7 Jun 2021 14:34:04 +0800
Subject: [PATCH 6/7] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=B8=AD=E6=96=87?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E8=8B=B1?=
=?UTF-8?q?=E6=96=87=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=88=86=E6=95=B0=E4=B8=BA?=
=?UTF-8?q?=E5=8D=A0=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fire-force/fire-force.component.html | 2 +-
.../fire-force/fire-force.component.ts | 14 +-
.../linkage-forces.component.html | 2 +-
.../linkage-forces.component.ts | 94 +--
.../water-collection.component.html | 2 +-
.../water-collection.component.ts | 16 +-
.../gis-labeling/gis-labeling.component.ts | 80 +--
.../key-unit-management.component.html | 224 +++---
.../water-road/water-road.component.ts | 18 +-
.../fireforce-audit.component.ts | 2 +-
.../linkageforces-audit.component.ts | 32 +-
.../water-audit/water-audit.component.ts | 2 +-
.../entry-plan/entry-plan.component.html | 4 +-
.../maintain-up/maintain-up.component.html | 644 ++++++++++--------
src/app/tabbar/tabbar.component.html | 347 +++++-----
.../collection-tools.component.html | 4 +-
.../collection-tools.component.html | 12 +-
.../collection-tools.component.ts | 2 +
.../leftFunctionalDomain.ts | 2 +
.../collection-tools.component.html | 4 +-
.../working-area/working-area.component.ts | 1 +
.../{大队.png => dadui.png} | Bin
.../{其他.png => qita.png} | Bin
.../{支队.png => zhidui.png} | Bin
.../{中队.png => zhongdui.png} | Bin
.../{总队.png => zongdui.png} | Bin
src/assets/images/{餐饮.png => canyin.png} | Bin
.../images/{厂房.png => changfang.png} | Bin
.../images/{储罐类.png => chuguanlei.png} | Bin
.../images/{重置缩放.png => czsf.png} | Bin
src/assets/images/{定位.png => dingwei.png} | Bin
src/assets/images/{地下.png => dixia.png} | Bin
.../images/{方形储水池.png => fxcsc.png} | Bin
.../{轨道交通.png => guidaojiaotong.png} | Bin
.../images/{古建筑.png => gujianzhu.png} | Bin
.../images/{联动力量.png => ldll.png} | Bin
src/assets/images/{其他.png => qita.png} | Bin
...商场超市.png => shangchangchaoshi.png} | Bin
src/assets/images/{隧道.png => suidao.png} | Bin
.../images/{适应缩放.png => sysf.png} | Bin
.../images/{市政消火栓.png => szxhs.png} | Bin
.../images/{天然水源.png => trsy.png} | Bin
.../images/{危化品.png => weihuapin.png} | Bin
.../images/{消防力量.png => xfll.png} | Bin
src/assets/images/{学校.png => xuexiao.png} | Bin
.../images/{向下收起.png => xxsq.png} | Bin
.../images/{影剧院.png => yingjuyuan.png} | Bin
src/assets/images/{医院.png => yiyuan.png} | Bin
src/assets/images/{娱乐.png => yule.png} | Bin
.../{展览建筑.png => zhanlanjianzhu.png} | Bin
.../linkageForces/{安监.png => anjian.png} | Bin
.../{电力局.png => dianliju.png} | Bin
.../linkageForces/{公安.png => gongan.png} | Bin
.../linkageForces/{海事.png => haishi.png} | Bin
.../{环保局.png => huanbaoju.png} | Bin
.../{交通.png => jiaotong.png} | Bin
.../{民政.png => minzheng.png} | Bin
.../{气象局.png => qixiangju.png} | Bin
.../{燃气局.png => ranqiju.png} | Bin
.../{市政.png => shizheng.png} | Bin
.../linkageForces/{水利.png => shuili.png} | Bin
.../linkageForces/{通信.png => tongxin.png} | Bin
.../linkageForces/{医疗.png => yiliao.png} | Bin
.../{应急管理.png => yingjiguanli.png} | Bin
.../linkageForces/{住建.png => zhujian.png} | Bin
.../{安监.png => anjian.png} | Bin
.../{电力局.png => dianliju.png} | Bin
.../{公安.png => gongan.png} | Bin
.../{海事.png => haishi.png} | Bin
.../{环保局.png => huanbaoju.png} | Bin
.../{交通.png => jiaotong.png} | Bin
.../{民政.png => minzheng.png} | Bin
.../{气象局.png => qixiangju.png} | Bin
.../{燃气局.png => ranqiju.png} | Bin
.../{市政.png => shizheng.png} | Bin
.../{水利.png => shuili.png} | Bin
.../{通信.png => tongxin.png} | Bin
.../{医疗.png => yiliao.png} | Bin
.../{应急管理.png => yingjiguanli.png} | Bin
.../{住建.png => zhujian.png} | Bin
.../{方形储水池.png => fxcsc.png} | Bin
.../{市政消火栓.png => szxhs.png} | Bin
.../{天然水源.png => trsy.png} | Bin
83 files changed, 817 insertions(+), 691 deletions(-)
rename src/assets/fireForcesMarkers/{大队.png => dadui.png} (100%)
rename src/assets/fireForcesMarkers/{其他.png => qita.png} (100%)
rename src/assets/fireForcesMarkers/{支队.png => zhidui.png} (100%)
rename src/assets/fireForcesMarkers/{中队.png => zhongdui.png} (100%)
rename src/assets/fireForcesMarkers/{总队.png => zongdui.png} (100%)
rename src/assets/images/{餐饮.png => canyin.png} (100%)
rename src/assets/images/{厂房.png => changfang.png} (100%)
rename src/assets/images/{储罐类.png => chuguanlei.png} (100%)
rename src/assets/images/{重置缩放.png => czsf.png} (100%)
rename src/assets/images/{定位.png => dingwei.png} (100%)
rename src/assets/images/{地下.png => dixia.png} (100%)
rename src/assets/images/{方形储水池.png => fxcsc.png} (100%)
rename src/assets/images/{轨道交通.png => guidaojiaotong.png} (100%)
rename src/assets/images/{古建筑.png => gujianzhu.png} (100%)
rename src/assets/images/{联动力量.png => ldll.png} (100%)
rename src/assets/images/{其他.png => qita.png} (100%)
rename src/assets/images/{商场超市.png => shangchangchaoshi.png} (100%)
rename src/assets/images/{隧道.png => suidao.png} (100%)
rename src/assets/images/{适应缩放.png => sysf.png} (100%)
rename src/assets/images/{市政消火栓.png => szxhs.png} (100%)
rename src/assets/images/{天然水源.png => trsy.png} (100%)
rename src/assets/images/{危化品.png => weihuapin.png} (100%)
rename src/assets/images/{消防力量.png => xfll.png} (100%)
rename src/assets/images/{学校.png => xuexiao.png} (100%)
rename src/assets/images/{向下收起.png => xxsq.png} (100%)
rename src/assets/images/{影剧院.png => yingjuyuan.png} (100%)
rename src/assets/images/{医院.png => yiyuan.png} (100%)
rename src/assets/images/{娱乐.png => yule.png} (100%)
rename src/assets/images/{展览建筑.png => zhanlanjianzhu.png} (100%)
rename src/assets/linkageForces/{安监.png => anjian.png} (100%)
rename src/assets/linkageForces/{电力局.png => dianliju.png} (100%)
rename src/assets/linkageForces/{公安.png => gongan.png} (100%)
rename src/assets/linkageForces/{海事.png => haishi.png} (100%)
rename src/assets/linkageForces/{环保局.png => huanbaoju.png} (100%)
rename src/assets/linkageForces/{交通.png => jiaotong.png} (100%)
rename src/assets/linkageForces/{民政.png => minzheng.png} (100%)
rename src/assets/linkageForces/{气象局.png => qixiangju.png} (100%)
rename src/assets/linkageForces/{燃气局.png => ranqiju.png} (100%)
rename src/assets/linkageForces/{市政.png => shizheng.png} (100%)
rename src/assets/linkageForces/{水利.png => shuili.png} (100%)
rename src/assets/linkageForces/{通信.png => tongxin.png} (100%)
rename src/assets/linkageForces/{医疗.png => yiliao.png} (100%)
rename src/assets/linkageForces/{应急管理.png => yingjiguanli.png} (100%)
rename src/assets/linkageForces/{住建.png => zhujian.png} (100%)
rename src/assets/linkageForcesMarkers/{安监.png => anjian.png} (100%)
rename src/assets/linkageForcesMarkers/{电力局.png => dianliju.png} (100%)
rename src/assets/linkageForcesMarkers/{公安.png => gongan.png} (100%)
rename src/assets/linkageForcesMarkers/{海事.png => haishi.png} (100%)
rename src/assets/linkageForcesMarkers/{环保局.png => huanbaoju.png} (100%)
rename src/assets/linkageForcesMarkers/{交通.png => jiaotong.png} (100%)
rename src/assets/linkageForcesMarkers/{民政.png => minzheng.png} (100%)
rename src/assets/linkageForcesMarkers/{气象局.png => qixiangju.png} (100%)
rename src/assets/linkageForcesMarkers/{燃气局.png => ranqiju.png} (100%)
rename src/assets/linkageForcesMarkers/{市政.png => shizheng.png} (100%)
rename src/assets/linkageForcesMarkers/{水利.png => shuili.png} (100%)
rename src/assets/linkageForcesMarkers/{通信.png => tongxin.png} (100%)
rename src/assets/linkageForcesMarkers/{医疗.png => yiliao.png} (100%)
rename src/assets/linkageForcesMarkers/{应急管理.png => yingjiguanli.png} (100%)
rename src/assets/linkageForcesMarkers/{住建.png => zhujian.png} (100%)
rename src/assets/waterMarkers/{方形储水池.png => fxcsc.png} (100%)
rename src/assets/waterMarkers/{市政消火栓.png => szxhs.png} (100%)
rename src/assets/waterMarkers/{天然水源.png => trsy.png} (100%)
diff --git a/src/app/data-collection/fire-force/fire-force.component.html b/src/app/data-collection/fire-force/fire-force.component.html
index dfbadb3..5e0e8df 100644
--- a/src/app/data-collection/fire-force/fire-force.component.html
+++ b/src/app/data-collection/fire-force/fire-force.component.html
@@ -107,7 +107,7 @@
-
+
diff --git a/src/app/data-collection/fire-force/fire-force.component.ts b/src/app/data-collection/fire-force/fire-force.component.ts
index 4ecfb1b..9387947 100644
--- a/src/app/data-collection/fire-force/fire-force.component.ts
+++ b/src/app/data-collection/fire-force/fire-force.component.ts
@@ -73,15 +73,15 @@ export class FireForceComponent implements OnInit {
list.forEach((item) => {
let image
if(item.forceType == 2){
- image = '/assets/fireForcesMarkers/其他.png'
+ image = '/assets/fireForcesMarkers/qita.png'
}else if(item.level == 0){
- image = '/assets/fireForcesMarkers/总队.png'
+ image = '/assets/fireForcesMarkers/zongdui.png'
}else if(item.level == 1){
- image = '/assets/fireForcesMarkers/支队.png'
+ image = '/assets/fireForcesMarkers/zhidui.png'
}else if(item.level == 2){
- image = '/assets/fireForcesMarkers/大队.png'
+ image = '/assets/fireForcesMarkers/dadui.png'
}else if(item.level == 3){
- image = '/assets/fireForcesMarkers/中队.png'
+ image = '/assets/fireForcesMarkers/zhongdui.png'
}
// 用于点集合的数组
item.fireForceDetailInfo.location ?
@@ -798,11 +798,11 @@ export class FireForceComponent implements OnInit {
isMapLabel:boolean = false //是否已经标记坐标
newPositionMarkerContent:any =
'
' +
- '
' +
+ '
' +
'
'
newPositionMarkerContentBtn:any =
'
' +
- '
' +
+ '
' +
'
| ' +
'
'
//创建地图
diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.html b/src/app/data-collection/linkage-forces/linkage-forces.component.html
index 014e2b2..4abfb4b 100644
--- a/src/app/data-collection/linkage-forces/linkage-forces.component.html
+++ b/src/app/data-collection/linkage-forces/linkage-forces.component.html
@@ -98,7 +98,7 @@
下载中...({{progressBarValue}}%)
-
+
diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.ts b/src/app/data-collection/linkage-forces/linkage-forces.component.ts
index d1e6527..5df61bb 100644
--- a/src/app/data-collection/linkage-forces/linkage-forces.component.ts
+++ b/src/app/data-collection/linkage-forces/linkage-forces.component.ts
@@ -40,21 +40,21 @@ export class LinkageForcesComponent implements OnInit {
{id:5,name:'90%-100%'}
]
checkBoxList:any[] = [
- {id:0,name:'安监',imgUrl:'/assets/linkageForces/安监.png',isChecked:false},
- {id:1,name:'电力局',imgUrl:'/assets/linkageForces/电力局.png',isChecked:false},
- {id:2,name:'公安',imgUrl:'/assets/linkageForces/公安.png',isChecked:false},
- {id:3,name:'海事',imgUrl:'/assets/linkageForces/海事.png',isChecked:false},
- {id:4,name:'环保局',imgUrl:'/assets/linkageForces/环保局.png',isChecked:false},
- {id:5,name:'交通',imgUrl:'/assets/linkageForces/交通.png',isChecked:false},
- {id:6,name:'民政',imgUrl:'/assets/linkageForces/民政.png',isChecked:false},
- {id:7,name:'气象局',imgUrl:'/assets/linkageForces/气象局.png',isChecked:false},
- {id:8,name:'燃气局',imgUrl:'/assets/linkageForces/燃气局.png',isChecked:false},
- {id:9,name:'市政',imgUrl:'/assets/linkageForces/市政.png',isChecked:false},
- {id:10,name:'水利',imgUrl:'/assets/linkageForces/水利.png',isChecked:false},
- {id:11,name:'通信',imgUrl:'/assets/linkageForces/通信.png',isChecked:false},
- {id:12,name:'医疗',imgUrl:'/assets/linkageForces/医疗.png',isChecked:false},
- {id:13,name:'应急管理',imgUrl:'/assets/linkageForces/应急管理.png',isChecked:false},
- {id:14,name:'住建',imgUrl:'/assets/linkageForces/住建.png',isChecked:false}
+ {id:0,name:'安监',imgUrl:'/assets/linkageForces/anjian.png',isChecked:false},
+ {id:1,name:'电力局',imgUrl:'/assets/linkageForces/dianliju.png',isChecked:false},
+ {id:2,name:'公安',imgUrl:'/assets/linkageForces/gongan.png',isChecked:false},
+ {id:3,name:'海事',imgUrl:'/assets/linkageForces/haishi.png',isChecked:false},
+ {id:4,name:'环保局',imgUrl:'/assets/linkageForces/huanbaoju.png',isChecked:false},
+ {id:5,name:'交通',imgUrl:'/assets/linkageForces/jiaotong.png',isChecked:false},
+ {id:6,name:'民政',imgUrl:'/assets/linkageForces/minzheng.png',isChecked:false},
+ {id:7,name:'气象局',imgUrl:'/assets/linkageForces/qixiangju.png',isChecked:false},
+ {id:8,name:'燃气局',imgUrl:'/assets/linkageForces/ranqiju.png',isChecked:false},
+ {id:9,name:'市政',imgUrl:'/assets/linkageForces/shizheng.png',isChecked:false},
+ {id:10,name:'水利',imgUrl:'/assets/linkageForces/shuili.png',isChecked:false},
+ {id:11,name:'通信',imgUrl:'/assets/linkageForces/tongxin.png',isChecked:false},
+ {id:12,name:'医疗',imgUrl:'/assets/linkageForces/yiliao.png',isChecked:false},
+ {id:13,name:'应急管理',imgUrl:'/assets/linkageForces/yingjiguanli.png',isChecked:false},
+ {id:14,name:'住建',imgUrl:'/assets/linkageForces/zhujian.png',isChecked:false}
]
//勾选力量类型checkbox在地图上显示marker
checkBoxChange(){
@@ -85,35 +85,35 @@ export class LinkageForcesComponent implements OnInit {
list.forEach((item) => {
let image
if(item.linkageForceType == 0){//消火栓
- image = '/assets/linkageForcesMarkers/安监.png'
+ image = '/assets/linkageForcesMarkers/anjian.png'
}else if(item.linkageForceType == 1){//消防水池
- image = '/assets/linkageForcesMarkers/电力局.png'
+ image = '/assets/linkageForcesMarkers/dianliju.png'
}else if(item.linkageForceType == 2){//天然联动力量
- image = '/assets/linkageForcesMarkers/公安.png'
+ image = '/assets/linkageForcesMarkers/gongan.png'
}else if(item.linkageForceType == 3){//天然水源
- image = '/assets/linkageForcesMarkers/海事.png'
+ image = '/assets/linkageForcesMarkers/haishi.png'
}else if(item.linkageForceType == 4){//天然水源
- image = '/assets/linkageForcesMarkers/环保局.png'
+ image = '/assets/linkageForcesMarkers/huanbaoju.png'
}else if(item.linkageForceType == 5){//天然水源
- image = '/assets/linkageForcesMarkers/交通.png'
+ image = '/assets/linkageForcesMarkers/jiaotong.png'
}else if(item.linkageForceType == 6){//天然水源
- image = '/assets/linkageForcesMarkers/民政.png'
+ image = '/assets/linkageForcesMarkers/minzheng.png'
}else if(item.linkageForceType == 7){//天然水源
- image = '/assets/linkageForcesMarkers/气象局.png'
+ image = '/assets/linkageForcesMarkers/qixiangju.png'
}else if(item.linkageForceType == 8){//天然水源
- image = '/assets/linkageForcesMarkers/燃气局.png'
+ image = '/assets/linkageForcesMarkers/ranqiju.png'
}else if(item.linkageForceType == 9){//天然水源
- image = '/assets/linkageForcesMarkers/市政.png'
+ image = '/assets/linkageForcesMarkers/shizheng.png'
}else if(item.linkageForceType == 10){//天然水源
- image = '/assets/linkageForcesMarkers/水利.png'
+ image = '/assets/linkageForcesMarkers/shuili.png'
}else if(item.linkageForceType == 11){//天然水源
- image = '/assets/linkageForcesMarkers/通信.png'
+ image = '/assets/linkageForcesMarkers/tongxin.png'
}else if(item.linkageForceType == 12){//天然水源
- image = '/assets/linkageForcesMarkers/医疗.png'
+ image = '/assets/linkageForcesMarkers/yiliao.png'
}else if(item.linkageForceType == 13){//天然水源
- image = '/assets/linkageForcesMarkers/应急管理.png'
+ image = '/assets/linkageForcesMarkers/yingjiguanli.png'
}else if(item.linkageForceType == 14){//天然水源
- image = '/assets/linkageForcesMarkers/住建.png'
+ image = '/assets/linkageForcesMarkers/zhujian.png'
}
// 用于点集合的数组
if(item.location && item.location.x){
@@ -517,11 +517,11 @@ export class LinkageForcesComponent implements OnInit {
isMapLabel:boolean = false //是否已经标记坐标
newPositionMarkerContent:any =
'
' +
- '
' +
+ '
' +
'
'
newPositionMarkerContentBtn:any =
'
' +
- '
' +
+ '
' +
'
| ' +
'
'
//创建地图
@@ -919,21 +919,21 @@ export class AddLinkageForce {
addList:any = [
- {id:0,name:'安监',imgUrl:'/assets/linkageForces/安监.png'},
- {id:1,name:'电力局',imgUrl:'/assets/linkageForces/电力局.png'},
- {id:2,name:'公安',imgUrl:'/assets/linkageForces/公安.png'},
- {id:3,name:'海事',imgUrl:'/assets/linkageForces/海事.png'},
- {id:4,name:'环保局',imgUrl:'/assets/linkageForces/环保局.png'},
- {id:5,name:'交通',imgUrl:'/assets/linkageForces/交通.png'},
- {id:6,name:'民政',imgUrl:'/assets/linkageForces/民政.png'},
- {id:7,name:'气象局',imgUrl:'/assets/linkageForces/气象局.png'},
- {id:8,name:'燃气局',imgUrl:'/assets/linkageForces/燃气局.png'},
- {id:9,name:'市政',imgUrl:'/assets/linkageForces/市政.png'},
- {id:10,name:'水利',imgUrl:'/assets/linkageForces/水利.png'},
- {id:11,name:'通信',imgUrl:'/assets/linkageForces/通信.png'},
- {id:12,name:'医疗',imgUrl:'/assets/linkageForces/医疗.png'},
- {id:13,name:'应急管理',imgUrl:'/assets/linkageForces/应急管理.png'},
- {id:14,name:'住建',imgUrl:'/assets/linkageForces/住建.png'}
+ {id:0,name:'安监',imgUrl:'/assets/linkageForces/anjian.png'},
+ {id:1,name:'电力局',imgUrl:'/assets/linkageForces/dianliju.png'},
+ {id:2,name:'公安',imgUrl:'/assets/linkageForces/gongan.png'},
+ {id:3,name:'海事',imgUrl:'/assets/linkageForces/haishi.png'},
+ {id:4,name:'环保局',imgUrl:'/assets/linkageForces/huanbaoju.png'},
+ {id:5,name:'交通',imgUrl:'/assets/linkageForces/jiaotong.png'},
+ {id:6,name:'民政',imgUrl:'/assets/linkageForces/minzheng.png'},
+ {id:7,name:'气象局',imgUrl:'/assets/linkageForces/qixiangju.png'},
+ {id:8,name:'燃气局',imgUrl:'/assets/linkageForces/ranqiju.png'},
+ {id:9,name:'市政',imgUrl:'/assets/linkageForces/shizheng.png'},
+ {id:10,name:'水利',imgUrl:'/assets/linkageForces/shuili.png'},
+ {id:11,name:'通信',imgUrl:'/assets/linkageForces/tongxin.png'},
+ {id:12,name:'医疗',imgUrl:'/assets/linkageForces/yiliao.png'},
+ {id:13,name:'应急管理',imgUrl:'/assets/linkageForces/yingjiguanli.png'},
+ {id:14,name:'住建',imgUrl:'/assets/linkageForces/zhujian.png'}
]
selectedFireForceTypeIndex:any = 0
selecteAddType(item,key){
diff --git a/src/app/data-collection/water-collection/water-collection.component.html b/src/app/data-collection/water-collection/water-collection.component.html
index 74d7e68..8c341b5 100644
--- a/src/app/data-collection/water-collection/water-collection.component.html
+++ b/src/app/data-collection/water-collection/water-collection.component.html
@@ -72,7 +72,7 @@
-
+
diff --git a/src/app/data-collection/water-collection/water-collection.component.ts b/src/app/data-collection/water-collection/water-collection.component.ts
index c312045..56e12e2 100644
--- a/src/app/data-collection/water-collection/water-collection.component.ts
+++ b/src/app/data-collection/water-collection/water-collection.component.ts
@@ -65,11 +65,11 @@ export class WaterCollectionComponent implements OnInit {
list.forEach((item) => {
let image
if(item.waterSourceType == 0){//消火栓
- image = '/assets/waterMarkers/市政消火栓.png'
+ image = '/assets/waterMarkers/szxhs.png'
}else if(item.waterSourceType == 1){//消防水池
- image = '/assets/waterMarkers/方形储水池.png'
+ image = '/assets/waterMarkers/fxcsc.png'
}else if(item.waterSourceType == 2){//天然水源
- image = '/assets/waterMarkers/天然水源.png'
+ image = '/assets/waterMarkers/trsy.png'
}
// 用于点集合的数组
if(item.location && item.location.x){
@@ -523,11 +523,11 @@ export class WaterCollectionComponent implements OnInit {
isMapLabel:boolean = false //是否已经标记坐标
newPositionMarkerContent:any =
'
' +
- '
' +
+ '
' +
'
'
newPositionMarkerContentBtn:any =
'
' +
- '
' +
+ '
' +
'
| ' +
'
'
//创建地图
@@ -671,9 +671,9 @@ export class AddWater {
addList:any = [
- {name:'消火栓',src:'/assets/images/市政消火栓.png'},
- {name:'消防水池',src:'/assets/images/方形储水池.png'},
- {name:'天然水源',src:'/assets/images/天然水源.png'}
+ {name:'消火栓',src:'/assets/images/szxhs.png'},
+ {name:'消防水池',src:'/assets/images/fxcsc.png'},
+ {name:'天然水源',src:'/assets/images/trsy.png'}
]
selectedWaterTypeIndex:any = 0
selecteAddType(item,key){
diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.ts b/src/app/gis-management/gis-labeling/gis-labeling.component.ts
index ebed877..1318c34 100644
--- a/src/app/gis-management/gis-labeling/gis-labeling.component.ts
+++ b/src/app/gis-management/gis-labeling/gis-labeling.component.ts
@@ -19,8 +19,8 @@ export class GisLabelingComponent implements OnInit {
selectedTitle:number
titleList = [ {name:'重点单位',iconImg:'/assets/images/uniticon.png'},
{name:'水源',iconImg:'/assets/images/watericon.png'},
- {name:'消防力量',iconImg:'/assets/images/消防力量.png'},
- {name:'联动力量',iconImg:'/assets/images/联动力量.png'},
+ {name:'消防力量',iconImg:'/assets/images/xfll.png'},
+ {name:'联动力量',iconImg:'/assets/images/ldll.png'},
{name:'测量工具',iconImg:'/assets/images/distanceicon.png'},
{name:'图层选择',iconImg:'/assets/images/coverageicon.png'}
]
@@ -324,35 +324,35 @@ export class GisLabelingComponent implements OnInit {
}else if(item.buildingTypes[0].name.indexOf('化工') != -1){
image = '/assets/images/Chemicalindustry.png'
}else if(item.buildingTypes[0].name.indexOf('餐饮') != -1){
- image = '/assets/images/餐饮.png'
+ image = '/assets/images/canyin.png'
}else if(item.buildingTypes[0].name.indexOf('厂房') != -1){
- image = '/assets/images/厂房.png'
+ image = '/assets/images/changfang.png'
}else if(item.buildingTypes[0].name.indexOf('储罐') != -1){
- image = '/assets/images/储罐类.png'
+ image = '/assets/images/chuguanlei.png'
}else if(item.buildingTypes[0].name.indexOf('地下') != -1){
- image = '/assets/images/地下.png'
+ image = '/assets/images/dixia.png'
}else if(item.buildingTypes[0].name.indexOf('古建筑') != -1){
- image = '/assets/images/古建筑.png'
+ image = '/assets/images/gujianzhu.png'
}else if(item.buildingTypes[0].name.indexOf('轨道' || '地铁' || '交通') != -1){
- image = '/assets/images/轨道交通.png'
+ image = '/assets/images/guidaojiaotong.png'
}else if(item.buildingTypes[0].name.indexOf('商场' || '超市') != -1){
- image = '/assets/images/商场超市.png'
+ image = '/assets/images/shangchangchaoshi.png'
}else if(item.buildingTypes[0].name.indexOf('隧道') != -1){
- image = '/assets/images/隧道.png'
+ image = '/assets/images/suidao.png'
}else if(item.buildingTypes[0].name.indexOf('危化品') != -1){
- image = '/assets/images/危化品.png'
+ image = '/assets/images/weihuapin.png'
}else if(item.buildingTypes[0].name.indexOf('学校' || '教育') != -1){
- image = '/assets/images/学校.png'
+ image = '/assets/images/xuexiao.png'
}else if(item.buildingTypes[0].name.indexOf('医院' || '医疗') != -1){
- image = '/assets/images/医院.png'
+ image = '/assets/images/yiyuan.png'
}else if(item.buildingTypes[0].name.indexOf('影' || '剧') != -1){
- image = '/assets/images/影剧院.png'
+ image = '/assets/images/yingjuyuan.png'
}else if(item.buildingTypes[0].name.indexOf('娱乐') != -1){
- image = '/assets/images/娱乐.png'
+ image = '/assets/images/yule.png'
}else if(item.buildingTypes[0].name.indexOf('展览' || '景点' || '景区') != -1){
- image = '/assets/images/展览建筑.png'
+ image = '/assets/images/zhanlanjianzhu.png'
}else{
- image = '/assets/images/其他.png'
+ image = '/assets/images/qita.png'
}
// 用于点集合的数组
unitMarkerArrcluster.push({
@@ -514,15 +514,15 @@ export class GisLabelingComponent implements OnInit {
list.forEach((item) => {
let image
if(item.forceType == 2){
- image = '/assets/fireForcesMarkers/其他.png'
+ image = '/assets/fireForcesMarkers/qita.png'
}else if(item.level == 0){
- image = '/assets/fireForcesMarkers/总队.png'
+ image = '/assets/fireForcesMarkers/zongdui.png'
}else if(item.level == 1){
- image = '/assets/fireForcesMarkers/支队.png'
+ image = '/assets/fireForcesMarkers/zhidui.png'
}else if(item.level == 2){
- image = '/assets/fireForcesMarkers/大队.png'
+ image = '/assets/fireForcesMarkers/dadui.png'
}else if(item.level == 3){
- image = '/assets/fireForcesMarkers/中队.png'
+ image = '/assets/fireForcesMarkers/zhongdui.png'
}
// 用于点集合的数组
item.fireForceDetailInfo.location ?
@@ -635,35 +635,35 @@ export class GisLabelingComponent implements OnInit {
list.forEach((item) => {
let image
if(item.linkageForceType == 0){//消火栓
- image = '/assets/linkageForcesMarkers/安监.png'
+ image = '/assets/linkageForcesMarkers/anjian.png'
}else if(item.linkageForceType == 1){//消防水池
- image = '/assets/linkageForcesMarkers/电力局.png'
+ image = '/assets/linkageForcesMarkers/dianliju.png'
}else if(item.linkageForceType == 2){//天然联动力量
- image = '/assets/linkageForcesMarkers/公安.png'
+ image = '/assets/linkageForcesMarkers/gongan.png'
}else if(item.linkageForceType == 3){//天然水源
- image = '/assets/linkageForcesMarkers/海事.png'
+ image = '/assets/linkageForcesMarkers/haishi.png'
}else if(item.linkageForceType == 4){//天然水源
- image = '/assets/linkageForcesMarkers/环保局.png'
+ image = '/assets/linkageForcesMarkers/huanbaoju.png'
}else if(item.linkageForceType == 5){//天然水源
- image = '/assets/linkageForcesMarkers/交通.png'
+ image = '/assets/linkageForcesMarkers/jiaotong.png'
}else if(item.linkageForceType == 6){//天然水源
- image = '/assets/linkageForcesMarkers/民政.png'
+ image = '/assets/linkageForcesMarkers/minzheng.png'
}else if(item.linkageForceType == 7){//天然水源
- image = '/assets/linkageForcesMarkers/气象局.png'
+ image = '/assets/linkageForcesMarkers/qixiangju.png'
}else if(item.linkageForceType == 8){//天然水源
- image = '/assets/linkageForcesMarkers/燃气局.png'
+ image = '/assets/linkageForcesMarkers/ranqiju.png'
}else if(item.linkageForceType == 9){//天然水源
- image = '/assets/linkageForcesMarkers/市政.png'
+ image = '/assets/linkageForcesMarkers/shizheng.png'
}else if(item.linkageForceType == 10){//天然水源
- image = '/assets/linkageForcesMarkers/水利.png'
+ image = '/assets/linkageForcesMarkers/shuili.png'
}else if(item.linkageForceType == 11){//天然水源
- image = '/assets/linkageForcesMarkers/通信.png'
+ image = '/assets/linkageForcesMarkers/tongxin.png'
}else if(item.linkageForceType == 12){//天然水源
- image = '/assets/linkageForcesMarkers/医疗.png'
+ image = '/assets/linkageForcesMarkers/yiliao.png'
}else if(item.linkageForceType == 13){//天然水源
- image = '/assets/linkageForcesMarkers/应急管理.png'
+ image = '/assets/linkageForcesMarkers/yingjiguanli.png'
}else if(item.linkageForceType == 14){//天然水源
- image = '/assets/linkageForcesMarkers/住建.png'
+ image = '/assets/linkageForcesMarkers/zhujian.png'
}
// 用于点集合的数组
if(item.location && item.location.x){
@@ -802,11 +802,11 @@ export class GisLabelingComponent implements OnInit {
list.forEach((item) => {
let image
if(item.waterSourceType == 0){//消火栓
- image = '/assets/waterMarkers/市政消火栓.png'
+ image = '/assets/waterMarkers/szxhs.png'
}else if(item.waterSourceType == 1){//消防水池
- image = '/assets/waterMarkers/方形储水池.png'
+ image = '/assets/waterMarkers/fxcsc.png'
}else if(item.waterSourceType == 2){//天然水源
- image = '/assets/waterMarkers/天然水源.png'
+ image = '/assets/waterMarkers/trsy.png'
}
// 用于点集合的数组
waterMarkerArrcluster.push({
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.html b/src/app/key-unit/key-unit-management/key-unit-management.component.html
index 0fd0473..2408e26 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.html
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.html
@@ -5,21 +5,24 @@
单位名称:
-
-
+
统一社会信用代码:
-
更多筛选条件
-
收起
+
更多筛选条件
+
收起
-
+
查询
- 重置
+ 重置
关注单位:
@@ -29,54 +32,59 @@
已关注
-
+
单位类型:
-
+
{{unit.name}}
-
更多筛选条件
-
收起
+
更多筛选条件
+
收起
-
+
查询
- 重置
+ 重置
-
+
消防救援站:
-
-
包含下级
-
+
包含下级
+
+
-
clear
+
+ clear
+
-
-
+ {{node.name}}
-
-
+
-
- {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
-
+
+ {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
+
{{node.name}}
-
+
-
+
信息完整度排序:
@@ -87,20 +95,25 @@
-
-
+
@@ -111,22 +124,26 @@
删除
-
+
-
+
-
-
+
-
- star
+ star
+
+
@@ -137,112 +154,140 @@
-
- 信息完整度得分
+
+ 信息完整度
{{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}%
-
+
分类名称
- 已得分
- 总分
+ 占比
+ 总占比
-
+
单位信息
-
{{(element.companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}%
+
{{(element.companyIntegrityScore.basicInfoScore *
+ 5).toFixed(1)}}%
- 5%
+ 5%
建筑信息
-
{{(element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1)}}%
+
{{(element.companyIntegrityScore.buildingInfoScore *
+ 10).toFixed(1)}}%
- 10%
+ 10%
平面图
-
{{(element.companyIntegrityScore.planImageScore * 10).toFixed(1)}}%
+
{{(element.companyIntegrityScore.planImageScore *
+ 10).toFixed(1)}}%
- 10%
+ 10%
四周毗邻
-
{{(element.companyIntegrityScore.adjoinScore * 10).toFixed(1)}}%
+
{{(element.companyIntegrityScore.adjoinScore *
+ 10).toFixed(1)}}%
- 10%
+ 10%
消防设施
-
{{(element.companyIntegrityScore.facilityScore * 25).toFixed(1)}}%
+
{{(element.companyIntegrityScore.facilityScore *
+ 25).toFixed(1)}}%
- 25%
+ 25%
重点部位
-
{{(element.companyIntegrityScore.importantLocationScore * 10).toFixed(1)}}%
+
{{(element.companyIntegrityScore.importantLocationScore *
+ 10).toFixed(1)}}%
- 10%
+ 10%
功能分区
-
{{(element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1)}}%
+
{{(element.companyIntegrityScore.functionalDivisionScore *
+ 10).toFixed(1)}}%
- 10%
+ 10%
实景图
-
{{(element.companyIntegrityScore.realityImageScore * 10).toFixed(1)}}%
+
{{(element.companyIntegrityScore.realityImageScore *
+ 10).toFixed(1)}}%
- 10%
+ 10%
CAD上传
-
{{(element.companyIntegrityScore.cadScore * 10).toFixed(1)}}%
+
{{(element.companyIntegrityScore.cadScore *
+ 10).toFixed(1)}}%
- 10%
+ 10%
@@ -253,15 +298,16 @@
-
+
消防救援站
{{element.organizationName}}
-
+
单位类型
- {{element.buildingTypes.length != 0 ? element.buildingTypes[0].name : ''}}
+ {{element.buildingTypes.length != 0 ?
+ element.buildingTypes[0].name : ''}}
统一社会信用代码
@@ -273,12 +319,16 @@
{{element.modifiedTime|date:'yyyy-MM-dd'}}
-
+
操作
-
- 查看详情
- 提交审核
- 撤销审核
+
+ 查看详情
+ 提交审核
+ 撤销审核
审批结果
关注单位
取消关注
@@ -287,12 +337,10 @@
-
-
+
\ No newline at end of file
diff --git a/src/app/key-unit/water-road/water-road.component.ts b/src/app/key-unit/water-road/water-road.component.ts
index 3e87285..c20f9fd 100644
--- a/src/app/key-unit/water-road/water-road.component.ts
+++ b/src/app/key-unit/water-road/water-road.component.ts
@@ -187,11 +187,11 @@ export class WaterRoadComponent implements OnInit {
let image
if(item.waterSourceType == 0 || item.waterSourceType == 1 || item.waterSourceType == 2){
if(item.waterSourceType == 0){//消火栓
- image = '/assets/waterMarkers/市政消火栓.png'
+ image = '/assets/waterMarkers/szxhs.png'
}else if(item.waterSourceType == 1){//消防水池
- image = '/assets/waterMarkers/方形储水池.png'
+ image = '/assets/waterMarkers/fxcsc.png'
}else if(item.waterSourceType == 2){//天然水源
- image = '/assets/waterMarkers/天然水源.png'
+ image = '/assets/waterMarkers/trsy.png'
}
// 用于点集合的数组
item.location ? waterMarkerArrcluster.push({
@@ -201,15 +201,15 @@ export class WaterRoadComponent implements OnInit {
}) : null
}else{
if(item.forceType == 2){
- image = '/assets/fireForcesMarkers/其他.png'
+ image = '/assets/fireForcesMarkers/qita.png'
}else if(item.level == 0){
- image = '/assets/fireForcesMarkers/总队.png'
+ image = '/assets/fireForcesMarkers/zongdui.png'
}else if(item.level == 1){
- image = '/assets/fireForcesMarkers/支队.png'
+ image = '/assets/fireForcesMarkers/zhidui.png'
}else if(item.level == 2){
- image = '/assets/fireForcesMarkers/大队.png'
+ image = '/assets/fireForcesMarkers/dadui.png'
}else if(item.level == 3){
- image = '/assets/fireForcesMarkers/中队.png'
+ image = '/assets/fireForcesMarkers/zhongdui.png'
}
// 用于点集合的数组
item.fireForceDetailInfo.location ?
@@ -295,7 +295,7 @@ export class WaterRoadComponent implements OnInit {
unitMarker:any//单位标点
newPositionMarkerContent:any =
'
' +
- '
' +
+ '
' +
'
'
creatMap(){
this.map = new AMap.Map('center',{
diff --git a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts
index 737bc3c..615d782 100644
--- a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts
+++ b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts
@@ -60,7 +60,7 @@ export class FireforceAuditComponent implements OnInit {
newPositionMarker:any
newPositionMarkerContent:any =
'
' +
- '
' +
+ '
' +
'
'
//当前点击tab页面第几个
tabIndex:any = 1
diff --git a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts
index 2338e51..c64562e 100644
--- a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts
+++ b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts
@@ -16,28 +16,28 @@ export class LinkageforcesAuditComponent implements OnInit {
constructor(public snackBar: MatSnackBar,private http:HttpClient,public dialog: MatDialog) { }
checkBoxList:any[] = [
- {id:0,name:'安监',imgUrl:'/assets/linkageForces/安监.png',isChecked:false},
- {id:1,name:'电力局',imgUrl:'/assets/linkageForces/电力局.png',isChecked:false},
- {id:2,name:'公安',imgUrl:'/assets/linkageForces/公安.png',isChecked:false},
- {id:3,name:'海事',imgUrl:'/assets/linkageForces/海事.png',isChecked:false},
- {id:4,name:'环保局',imgUrl:'/assets/linkageForces/环保局.png',isChecked:false},
- {id:5,name:'交通',imgUrl:'/assets/linkageForces/交通.png',isChecked:false},
- {id:6,name:'民政',imgUrl:'/assets/linkageForces/民政.png',isChecked:false},
- {id:7,name:'气象局',imgUrl:'/assets/linkageForces/气象局.png',isChecked:false},
- {id:8,name:'燃气局',imgUrl:'/assets/linkageForces/燃气局.png',isChecked:false},
- {id:9,name:'市政',imgUrl:'/assets/linkageForces/市政.png',isChecked:false},
- {id:10,name:'水利',imgUrl:'/assets/linkageForces/水利.png',isChecked:false},
- {id:11,name:'通信',imgUrl:'/assets/linkageForces/通信.png',isChecked:false},
- {id:12,name:'医疗',imgUrl:'/assets/linkageForces/医疗.png',isChecked:false},
- {id:13,name:'应急管理',imgUrl:'/assets/linkageForces/应急管理.png',isChecked:false},
- {id:14,name:'住建',imgUrl:'/assets/linkageForces/住建.png',isChecked:false}
+ {id:0,name:'安监',imgUrl:'/assets/linkageForces/anjian.png',isChecked:false},
+ {id:1,name:'电力局',imgUrl:'/assets/linkageForces/dianliju.png',isChecked:false},
+ {id:2,name:'公安',imgUrl:'/assets/linkageForces/gongan.png',isChecked:false},
+ {id:3,name:'海事',imgUrl:'/assets/linkageForces/haishi.png',isChecked:false},
+ {id:4,name:'环保局',imgUrl:'/assets/linkageForces/huanbaoju.png',isChecked:false},
+ {id:5,name:'交通',imgUrl:'/assets/linkageForces/jiaotong.png',isChecked:false},
+ {id:6,name:'民政',imgUrl:'/assets/linkageForces/minzheng.png',isChecked:false},
+ {id:7,name:'气象局',imgUrl:'/assets/linkageForces/qixiangju.png',isChecked:false},
+ {id:8,name:'燃气局',imgUrl:'/assets/linkageForces/ranqiju.png',isChecked:false},
+ {id:9,name:'市政',imgUrl:'/assets/linkageForces/shizheng.png',isChecked:false},
+ {id:10,name:'水利',imgUrl:'/assets/linkageForces/shuili.png',isChecked:false},
+ {id:11,name:'通信',imgUrl:'/assets/linkageForces/tongxin.png',isChecked:false},
+ {id:12,name:'医疗',imgUrl:'/assets/linkageForces/yiliao.png',isChecked:false},
+ {id:13,name:'应急管理',imgUrl:'/assets/linkageForces/yingjiguanli.png',isChecked:false},
+ {id:14,name:'住建',imgUrl:'/assets/linkageForces/zhujian.png',isChecked:false}
]
AttachmentArr:any//附件
map:any
newPositionMarker:any
newPositionMarkerContent:any =
'
' +
- '
' +
+ '
' +
'
'
ngOnInit(): void {
this.AttachmentArr = JSON.parse(this.LinkageForceDetailInfo.relevantInfomationData)
diff --git a/src/app/plan-audit/water-audit/water-audit.component.ts b/src/app/plan-audit/water-audit/water-audit.component.ts
index cf81d83..680375c 100644
--- a/src/app/plan-audit/water-audit/water-audit.component.ts
+++ b/src/app/plan-audit/water-audit/water-audit.component.ts
@@ -12,7 +12,7 @@ export class WaterAuditComponent implements OnInit {
newPositionMarker:any
newPositionMarkerContent:any =
'
' +
- '
' +
+ '
' +
'
'
ngOnInit(): void {
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.html b/src/app/plan-management/entry-plan/entry-plan.component.html
index 274a12b..7ee59f9 100644
--- a/src/app/plan-management/entry-plan/entry-plan.component.html
+++ b/src/app/plan-management/entry-plan/entry-plan.component.html
@@ -149,8 +149,8 @@
分类名称
- 已得分
- 总分
+ 占比
+ 总占比
diff --git a/src/app/plan-management/maintain-up/maintain-up.component.html b/src/app/plan-management/maintain-up/maintain-up.component.html
index c489c17..fb1ea18 100644
--- a/src/app/plan-management/maintain-up/maintain-up.component.html
+++ b/src/app/plan-management/maintain-up/maintain-up.component.html
@@ -1,307 +1,351 @@
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- star
-
-
- 单位名称
-
- {{element.name}}
-
-
-
+
+
+
+
+
+
- {{title}} : {{planName}}
+ {{title}} : {{planName}}
-
-
+
-
-
- 分类名称
- 已得分
- 百分比
-
-
-
-
- 单位信息
-
-
-
{{(companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}%
-
5%
-
-
- 建筑信息
-
-
-
{{(companyIntegrityScore.buildingInfoScore * 10).toFixed(1)}}%
-
10%
-
-
- 平面图
-
-
-
{{(companyIntegrityScore.planImageScore * 10).toFixed(1)}}%
-
10%
-
-
- 四周毗邻
-
-
-
{{(companyIntegrityScore.adjoinScore * 10).toFixed(1)}}%
-
10%
-
-
- 消防设施
-
-
-
{{(companyIntegrityScore.facilityScore * 25).toFixed(1)}}%
-
25%
-
-
- 重点部位
-
-
-
{{(companyIntegrityScore.importantLocationScore * 10).toFixed(1)}}%
-
10%
-
-
- 功能分区
-
-
-
{{(companyIntegrityScore.functionalDivisionScore * 10).toFixed(1)}}%
-
10%
-
-
- 实景图
-
-
-
{{(companyIntegrityScore.realityImageScore * 10).toFixed(1)}}%
-
10%
-
-
- CAD上传
-
-
-
{{(companyIntegrityScore.cadScore * 10).toFixed(1)}}%
-
10%
-
-
-
-
- 仅供参考
- 关闭
-
+
+
+ 分类名称
+ 占比
+ 总占比
+
+
+
+
+ 单位信息
+
+
+
{{(companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}%
+
5%
+
+
+ 建筑信息
+
+
+
{{(companyIntegrityScore.buildingInfoScore * 10).toFixed(1)}}%
+
10%
+
+
+ 平面图
+
+
+
{{(companyIntegrityScore.planImageScore * 10).toFixed(1)}}%
+
10%
+
+
+ 四周毗邻
+
+
+
{{(companyIntegrityScore.adjoinScore * 10).toFixed(1)}}%
+
10%
+
+
+ 消防设施
+
+
+
{{(companyIntegrityScore.facilityScore * 25).toFixed(1)}}%
+
25%
+
+
+ 重点部位
+
+
+
{{(companyIntegrityScore.importantLocationScore * 10).toFixed(1)}}%
+
10%
+
+
+ 功能分区
+
+
+
{{(companyIntegrityScore.functionalDivisionScore * 10).toFixed(1)}}%
+
10%
+
+
+ 实景图
+
+
+
{{(companyIntegrityScore.realityImageScore * 10).toFixed(1)}}%
+
10%
+
+
+ CAD上传
+
+
+
{{(companyIntegrityScore.cadScore * 10).toFixed(1)}}%
+
10%
+
+
+
+
+ 仅供参考
+ 关闭
+
-
+
欢迎您, {{realName}}
-
-
-
+
+
+
信息完整度规则
-
+
信息完整度规则
@@ -155,12 +175,16 @@
消防设施
25%
- 消防水源占30% 安全疏散占30% 30% 内部消防力量占10%
+ 消防水源占30% 安全疏散占30% 30%
+ 内部消防力量占10%
重点部位
10%
- 根据耐火等级做区分 :一级:添加3 个重点部位（1个50%，2个80%，3个满分）二级 :添加2 个重点部位（一个占50%）三级 添加1 个重点部位 其它:填写重点提示自动满分根据耐火等级做区分 :一级:添加3 个重点部位（1个50%，2个80%，3个满分）二级 :添加2 个重点部位（一个占50%）三级 添加1 个重点部位 其它:填写重点提示自动满分
功能分区
@@ -170,7 +194,9 @@
实景图
10%
- 外观，保证有2 张照片（占30% ）; 室内，保证有2 张照片（占30% ）;安全出口，保证有2 张照片（占40% ）
+ 外观，保证有2 张照片（占30% ）; 室内，保证有2 张照片（占30% ）;安全出口，保证有2 张照片（占40% ）
CAD上传
@@ -187,19 +213,22 @@
- 提交审核
+ 提交审核
撤销审核
- (
+ (
删除
- 新增
- 更新
+ 新增
+ 更新
待审核)
- (审核通过)
- (审核驳回)
+ (审核通过)
+ (审核驳回)
-
+
帮助文档下载中,请等待...
@@ -209,19 +238,19 @@
help
-
- save_alt
- 下载帮助文档
+
+ save_alt
+ 下载帮助文档
-
- fullscreen
-
-
- fullscreen_exit
-
+
+ fullscreen
+
+
+ fullscreen_exit
+
@@ -237,18 +266,18 @@
account_circle
-
- pin_drop
- 个人资料
-
-
- verified_user
- 修改密码
-
-
- power_settings_new
- 退出系统
-
+
+ pin_drop
+ 个人资料
+
+
+ verified_user
+ 修改密码
+
+
+ power_settings_new
+ 退出系统
+
@@ -256,21 +285,21 @@
settings
-
- palette
- 默认主题
-
-
- whatshot
- 亮色主题
-
-
- settings_overscan
- 标准模式
-
-
- laptop
- 盒子模式
-
+
+ palette
+ 默认主题
+
+
+ whatshot
+ 亮色主题
+
+
+ settings_overscan
+ 标准模式
+
+
+ laptop
+ 盒子模式
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-building/collection-tools.component.html b/src/app/ui/collection-tools-building/collection-tools.component.html
index d979ced..d1f2efc 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.html
+++ b/src/app/ui/collection-tools-building/collection-tools.component.html
@@ -28,11 +28,11 @@
-
-
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.html b/src/app/ui/collection-tools-plan/collection-tools.component.html
index 01a15f7..633c521 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.html
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.html
@@ -28,11 +28,11 @@
-
-
@@ -187,7 +187,7 @@
*ngIf="isShowProperty && !isShowAttribute && !isMultipleAsset">
{{assetName}}
-
-
+
厚度
选中高亮
-
+
-->
消防要素
-
+
全部显示/隐藏
visibility
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts
index 81fd391..6444352 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -1391,6 +1391,7 @@ export class CollectionToolsPlanComponent implements OnInit {
}
map: any
toLoadGis() {
+ console.log(666666,this.selectingSitePlan)
this.map = new AMap.Map('planContainer', {
viewMode: '2D', // 默认使用 2D 模式，如果希望使用带有俯仰角的 3D 模式，请设置 viewMode: '3D',
zoom: 11, //初始化地图层级
@@ -1689,6 +1690,7 @@ export class CollectionToolsPlanComponent implements OnInit {
isBuilding: this.checkedBuildingIndex == -1 ? false : true,
Panel: this.beforeOneCheckedBuilding,
buildingData: e,
+ isGis:this.isGis
}
let dialogRef = this.dialog.open(editPlaneFigureComponentPlan, { disableClose: true, hasBackdrop: false, position: { left: '150px', top: '200px' }, data });
dialogRef.keydownEvents().subscribe(data => {
diff --git a/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts b/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
index 4fc836d..0e720da 100644
--- a/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
+++ b/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
@@ -191,6 +191,7 @@ export class editPlaneFigureComponentPlan implements OnInit {
constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef
,@Inject(MAT_DIALOG_DATA) public data,public canvasData: CanvasShareDataService,private eventManager: EventManager,) { }
ngOnInit(): void {
+ console.log(this.data.isGis)
this.name = this.data.buildingData.name || ''
this.checked = this.data.buildingData.isRefugeStorey || false
this.area = this.data.buildingData.area || 0
@@ -284,6 +285,7 @@ export class editPlaneFigureComponentPlan implements OnInit {
details:e.details,
enabled: this.data.buildingData.enabled,
modifiedTime: new Date(),
+ isGis: this.data.isGis
}
this.http.put(`/api/SitePlans/${this.data.buildingData.id}`,data).subscribe(data=>{
this.dialogRef.close('总平面图');
diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html
index 88f058b..54466d1 100644
--- a/src/app/ui/collection-tools/collection-tools.component.html
+++ b/src/app/ui/collection-tools/collection-tools.component.html
@@ -30,11 +30,11 @@
-
-
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index 76e673a..c2359b9 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -641,6 +641,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
* 重置画布
*/
public resetCanvas() {
+ console.log(this.init)
this.app.renderer.resize(this.content.nativeElement.clientWidth, this.content.nativeElement.clientHeight);
}
diff --git a/src/assets/fireForcesMarkers/大队.png b/src/assets/fireForcesMarkers/dadui.png
similarity index 100%
rename from src/assets/fireForcesMarkers/大队.png
rename to src/assets/fireForcesMarkers/dadui.png
diff --git a/src/assets/fireForcesMarkers/其他.png b/src/assets/fireForcesMarkers/qita.png
similarity index 100%
rename from src/assets/fireForcesMarkers/其他.png
rename to src/assets/fireForcesMarkers/qita.png
diff --git a/src/assets/fireForcesMarkers/支队.png b/src/assets/fireForcesMarkers/zhidui.png
similarity index 100%
rename from src/assets/fireForcesMarkers/支队.png
rename to src/assets/fireForcesMarkers/zhidui.png
diff --git a/src/assets/fireForcesMarkers/中队.png b/src/assets/fireForcesMarkers/zhongdui.png
similarity index 100%
rename from src/assets/fireForcesMarkers/中队.png
rename to src/assets/fireForcesMarkers/zhongdui.png
diff --git a/src/assets/fireForcesMarkers/总队.png b/src/assets/fireForcesMarkers/zongdui.png
similarity index 100%
rename from src/assets/fireForcesMarkers/总队.png
rename to src/assets/fireForcesMarkers/zongdui.png
diff --git a/src/assets/images/餐饮.png b/src/assets/images/canyin.png
similarity index 100%
rename from src/assets/images/餐饮.png
rename to src/assets/images/canyin.png
diff --git a/src/assets/images/厂房.png b/src/assets/images/changfang.png
similarity index 100%
rename from src/assets/images/厂房.png
rename to src/assets/images/changfang.png
diff --git a/src/assets/images/储罐类.png b/src/assets/images/chuguanlei.png
similarity index 100%
rename from src/assets/images/储罐类.png
rename to src/assets/images/chuguanlei.png
diff --git a/src/assets/images/重置缩放.png b/src/assets/images/czsf.png
similarity index 100%
rename from src/assets/images/重置缩放.png
rename to src/assets/images/czsf.png
diff --git a/src/assets/images/定位.png b/src/assets/images/dingwei.png
similarity index 100%
rename from src/assets/images/定位.png
rename to src/assets/images/dingwei.png
diff --git a/src/assets/images/地下.png b/src/assets/images/dixia.png
similarity index 100%
rename from src/assets/images/地下.png
rename to src/assets/images/dixia.png
diff --git a/src/assets/images/方形储水池.png b/src/assets/images/fxcsc.png
similarity index 100%
rename from src/assets/images/方形储水池.png
rename to src/assets/images/fxcsc.png
diff --git a/src/assets/images/轨道交通.png b/src/assets/images/guidaojiaotong.png
similarity index 100%
rename from src/assets/images/轨道交通.png
rename to src/assets/images/guidaojiaotong.png
diff --git a/src/assets/images/古建筑.png b/src/assets/images/gujianzhu.png
similarity index 100%
rename from src/assets/images/古建筑.png
rename to src/assets/images/gujianzhu.png
diff --git a/src/assets/images/联动力量.png b/src/assets/images/ldll.png
similarity index 100%
rename from src/assets/images/联动力量.png
rename to src/assets/images/ldll.png
diff --git a/src/assets/images/其他.png b/src/assets/images/qita.png
similarity index 100%
rename from src/assets/images/其他.png
rename to src/assets/images/qita.png
diff --git a/src/assets/images/商场超市.png b/src/assets/images/shangchangchaoshi.png
similarity index 100%
rename from src/assets/images/商场超市.png
rename to src/assets/images/shangchangchaoshi.png
diff --git a/src/assets/images/隧道.png b/src/assets/images/suidao.png
similarity index 100%
rename from src/assets/images/隧道.png
rename to src/assets/images/suidao.png
diff --git a/src/assets/images/适应缩放.png b/src/assets/images/sysf.png
similarity index 100%
rename from src/assets/images/适应缩放.png
rename to src/assets/images/sysf.png
diff --git a/src/assets/images/市政消火栓.png b/src/assets/images/szxhs.png
similarity index 100%
rename from src/assets/images/市政消火栓.png
rename to src/assets/images/szxhs.png
diff --git a/src/assets/images/天然水源.png b/src/assets/images/trsy.png
similarity index 100%
rename from src/assets/images/天然水源.png
rename to src/assets/images/trsy.png
diff --git a/src/assets/images/危化品.png b/src/assets/images/weihuapin.png
similarity index 100%
rename from src/assets/images/危化品.png
rename to src/assets/images/weihuapin.png
diff --git a/src/assets/images/消防力量.png b/src/assets/images/xfll.png
similarity index 100%
rename from src/assets/images/消防力量.png
rename to src/assets/images/xfll.png
diff --git a/src/assets/images/学校.png b/src/assets/images/xuexiao.png
similarity index 100%
rename from src/assets/images/学校.png
rename to src/assets/images/xuexiao.png
diff --git a/src/assets/images/向下收起.png b/src/assets/images/xxsq.png
similarity index 100%
rename from src/assets/images/向下收起.png
rename to src/assets/images/xxsq.png
diff --git a/src/assets/images/影剧院.png b/src/assets/images/yingjuyuan.png
similarity index 100%
rename from src/assets/images/影剧院.png
rename to src/assets/images/yingjuyuan.png
diff --git a/src/assets/images/医院.png b/src/assets/images/yiyuan.png
similarity index 100%
rename from src/assets/images/医院.png
rename to src/assets/images/yiyuan.png
diff --git a/src/assets/images/娱乐.png b/src/assets/images/yule.png
similarity index 100%
rename from src/assets/images/娱乐.png
rename to src/assets/images/yule.png
diff --git a/src/assets/images/展览建筑.png b/src/assets/images/zhanlanjianzhu.png
similarity index 100%
rename from src/assets/images/展览建筑.png
rename to src/assets/images/zhanlanjianzhu.png
diff --git a/src/assets/linkageForces/安监.png b/src/assets/linkageForces/anjian.png
similarity index 100%
rename from src/assets/linkageForces/安监.png
rename to src/assets/linkageForces/anjian.png
diff --git a/src/assets/linkageForces/电力局.png b/src/assets/linkageForces/dianliju.png
similarity index 100%
rename from src/assets/linkageForces/电力局.png
rename to src/assets/linkageForces/dianliju.png
diff --git a/src/assets/linkageForces/公安.png b/src/assets/linkageForces/gongan.png
similarity index 100%
rename from src/assets/linkageForces/公安.png
rename to src/assets/linkageForces/gongan.png
diff --git a/src/assets/linkageForces/海事.png b/src/assets/linkageForces/haishi.png
similarity index 100%
rename from src/assets/linkageForces/海事.png
rename to src/assets/linkageForces/haishi.png
diff --git a/src/assets/linkageForces/环保局.png b/src/assets/linkageForces/huanbaoju.png
similarity index 100%
rename from src/assets/linkageForces/环保局.png
rename to src/assets/linkageForces/huanbaoju.png
diff --git a/src/assets/linkageForces/交通.png b/src/assets/linkageForces/jiaotong.png
similarity index 100%
rename from src/assets/linkageForces/交通.png
rename to src/assets/linkageForces/jiaotong.png
diff --git a/src/assets/linkageForces/民政.png b/src/assets/linkageForces/minzheng.png
similarity index 100%
rename from src/assets/linkageForces/民政.png
rename to src/assets/linkageForces/minzheng.png
diff --git a/src/assets/linkageForces/气象局.png b/src/assets/linkageForces/qixiangju.png
similarity index 100%
rename from src/assets/linkageForces/气象局.png
rename to src/assets/linkageForces/qixiangju.png
diff --git a/src/assets/linkageForces/燃气局.png b/src/assets/linkageForces/ranqiju.png
similarity index 100%
rename from src/assets/linkageForces/燃气局.png
rename to src/assets/linkageForces/ranqiju.png
diff --git a/src/assets/linkageForces/市政.png b/src/assets/linkageForces/shizheng.png
similarity index 100%
rename from src/assets/linkageForces/市政.png
rename to src/assets/linkageForces/shizheng.png
diff --git a/src/assets/linkageForces/水利.png b/src/assets/linkageForces/shuili.png
similarity index 100%
rename from src/assets/linkageForces/水利.png
rename to src/assets/linkageForces/shuili.png
diff --git a/src/assets/linkageForces/通信.png b/src/assets/linkageForces/tongxin.png
similarity index 100%
rename from src/assets/linkageForces/通信.png
rename to src/assets/linkageForces/tongxin.png
diff --git a/src/assets/linkageForces/医疗.png b/src/assets/linkageForces/yiliao.png
similarity index 100%
rename from src/assets/linkageForces/医疗.png
rename to src/assets/linkageForces/yiliao.png
diff --git a/src/assets/linkageForces/应急管理.png b/src/assets/linkageForces/yingjiguanli.png
similarity index 100%
rename from src/assets/linkageForces/应急管理.png
rename to src/assets/linkageForces/yingjiguanli.png
diff --git a/src/assets/linkageForces/住建.png b/src/assets/linkageForces/zhujian.png
similarity index 100%
rename from src/assets/linkageForces/住建.png
rename to src/assets/linkageForces/zhujian.png
diff --git a/src/assets/linkageForcesMarkers/安监.png b/src/assets/linkageForcesMarkers/anjian.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/安监.png
rename to src/assets/linkageForcesMarkers/anjian.png
diff --git a/src/assets/linkageForcesMarkers/电力局.png b/src/assets/linkageForcesMarkers/dianliju.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/电力局.png
rename to src/assets/linkageForcesMarkers/dianliju.png
diff --git a/src/assets/linkageForcesMarkers/公安.png b/src/assets/linkageForcesMarkers/gongan.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/公安.png
rename to src/assets/linkageForcesMarkers/gongan.png
diff --git a/src/assets/linkageForcesMarkers/海事.png b/src/assets/linkageForcesMarkers/haishi.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/海事.png
rename to src/assets/linkageForcesMarkers/haishi.png
diff --git a/src/assets/linkageForcesMarkers/环保局.png b/src/assets/linkageForcesMarkers/huanbaoju.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/环保局.png
rename to src/assets/linkageForcesMarkers/huanbaoju.png
diff --git a/src/assets/linkageForcesMarkers/交通.png b/src/assets/linkageForcesMarkers/jiaotong.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/交通.png
rename to src/assets/linkageForcesMarkers/jiaotong.png
diff --git a/src/assets/linkageForcesMarkers/民政.png b/src/assets/linkageForcesMarkers/minzheng.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/民政.png
rename to src/assets/linkageForcesMarkers/minzheng.png
diff --git a/src/assets/linkageForcesMarkers/气象局.png b/src/assets/linkageForcesMarkers/qixiangju.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/气象局.png
rename to src/assets/linkageForcesMarkers/qixiangju.png
diff --git a/src/assets/linkageForcesMarkers/燃气局.png b/src/assets/linkageForcesMarkers/ranqiju.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/燃气局.png
rename to src/assets/linkageForcesMarkers/ranqiju.png
diff --git a/src/assets/linkageForcesMarkers/市政.png b/src/assets/linkageForcesMarkers/shizheng.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/市政.png
rename to src/assets/linkageForcesMarkers/shizheng.png
diff --git a/src/assets/linkageForcesMarkers/水利.png b/src/assets/linkageForcesMarkers/shuili.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/水利.png
rename to src/assets/linkageForcesMarkers/shuili.png
diff --git a/src/assets/linkageForcesMarkers/通信.png b/src/assets/linkageForcesMarkers/tongxin.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/通信.png
rename to src/assets/linkageForcesMarkers/tongxin.png
diff --git a/src/assets/linkageForcesMarkers/医疗.png b/src/assets/linkageForcesMarkers/yiliao.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/医疗.png
rename to src/assets/linkageForcesMarkers/yiliao.png
diff --git a/src/assets/linkageForcesMarkers/应急管理.png b/src/assets/linkageForcesMarkers/yingjiguanli.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/应急管理.png
rename to src/assets/linkageForcesMarkers/yingjiguanli.png
diff --git a/src/assets/linkageForcesMarkers/住建.png b/src/assets/linkageForcesMarkers/zhujian.png
similarity index 100%
rename from src/assets/linkageForcesMarkers/住建.png
rename to src/assets/linkageForcesMarkers/zhujian.png
diff --git a/src/assets/waterMarkers/方形储水池.png b/src/assets/waterMarkers/fxcsc.png
similarity index 100%
rename from src/assets/waterMarkers/方形储水池.png
rename to src/assets/waterMarkers/fxcsc.png
diff --git a/src/assets/waterMarkers/市政消火栓.png b/src/assets/waterMarkers/szxhs.png
similarity index 100%
rename from src/assets/waterMarkers/市政消火栓.png
rename to src/assets/waterMarkers/szxhs.png
diff --git a/src/assets/waterMarkers/天然水源.png b/src/assets/waterMarkers/trsy.png
similarity index 100%
rename from src/assets/waterMarkers/天然水源.png
rename to src/assets/waterMarkers/trsy.png
From 30781da4cf824a2acdd50c19e747568f8be94c15 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 8 Jun 2021 09:35:35 +0800
Subject: [PATCH 7/7] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=B9=B3=E9=9D=A2?=
=?UTF-8?q?=E5=9B=BE=E5=BC=95=E5=85=A5gis=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../collection-tools.component.ts | 112 +++++++++++-------
.../leftFunctionalDomain.ts | 4 +-
.../working-area/working-area.component.ts | 6 +-
3 files changed, 73 insertions(+), 49 deletions(-)
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts
index bd0195a..c0d1811 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -231,17 +231,17 @@ export class CollectionToolsPlanComponent implements OnInit {
assetWidthIunput() {
this.canvasAssetObj.Width = this.assetWidth
this.canvasData.isChange = true
- if(!this.isGis){
+ if (!this.isGis) {
this.canvas.refreshIcon(this.canvasAssetObj.Id)
}
-
+
}
//素材高度输入框改变
assetHeightIunput() {
this.canvasAssetObj.Height = this.assetHeight
this.canvasData.isChange = true
- if(!this.isGis){
+ if (!this.isGis) {
this.canvas.refreshIcon(this.canvasAssetObj.Id)
}
}
@@ -250,7 +250,7 @@ export class CollectionToolsPlanComponent implements OnInit {
assetAngleIunput() {
this.canvasAssetObj.Angle = this.sliderValue
this.canvasData.isChange = true
- if(!this.isGis){
+ if (!this.isGis) {
this.canvas.refreshIcon(this.canvasAssetObj.Id)
}
}
@@ -259,7 +259,7 @@ export class CollectionToolsPlanComponent implements OnInit {
assetThicknessIunput() {
this.canvasAssetObj.Thickness = this.sliderValueThickness
this.canvasData.isChange = true
- if(!this.isGis){
+ if (!this.isGis) {
this.canvas.refreshIcon(this.canvasAssetObj.Id)
}
}
@@ -286,7 +286,7 @@ export class CollectionToolsPlanComponent implements OnInit {
}
this.canvasAssetObj.PropertyInfos[index].PropertyValue = e.target.value
this.canvasData.isChange = true
- if(!this.isGis){
+ if (!this.isGis) {
this.canvas.refreshIcon(this.canvasAssetObj.Id)
}
}
@@ -308,7 +308,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.selectedcolor = item + this.selectedcolor.substring(this.selectedcolor.length - 2)
this.canvasAssetObj.Color = this.selectedcolor
this.canvasData.isChange = true
- if(!this.isGis){
+ if (!this.isGis) {
this.canvas.refreshIcon(this.canvasAssetObj.Id)
}
}
@@ -324,7 +324,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.selectedcolor = replacepos(this.selectedcolor, 7, 8, colorOpacity.toString(16))
this.canvasAssetObj.Color = this.selectedcolor
this.canvasData.isChange = true
- if(!this.isGis){
+ if (!this.isGis) {
this.canvas.refreshIcon(this.canvasAssetObj.Id)
}
}
@@ -789,7 +789,6 @@ export class CollectionToolsPlanComponent implements OnInit {
});
}
}
-
if ((new Set(adjoinArr)).size != adjoinArr.length) {
this.maskLayerService.sendMessage(false)
let config = new MatSnackBarConfig();
@@ -800,6 +799,21 @@ export class CollectionToolsPlanComponent implements OnInit {
} else {
//如果是单位 总平面图
if (this.checkedBuildingIndex == -1) {
+
+ if(this.isGis){
+ let data = JSON.parse(JSON.stringify(this.selectingSitePlan))
+ data.zoomLevel = this.map.getZoom(),
+ data.defaultCenter = {x:this.map.getCenter().lng,y:this.map.getCenter().lat}
+ delete data.userId
+ delete data.userName
+ delete data.sitePlanDataInfo
+ console.log('gisselectingSitePlan',this.selectingSitePlan)
+
+ this.http.put(`/api/SitePlans/${this.selectingSitePlan.id}`,data).subscribe(data=>{
+ console.log('保存中心点成功')
+ })
+ }
+
//保存平面图数据
this.http.post("/api/SitePlanData", SitePlanData, {
params: {
@@ -1391,12 +1405,20 @@ export class CollectionToolsPlanComponent implements OnInit {
}
map: any
toLoadGis() {
- console.log(666666,this.selectingSitePlan)
+ console.log(666666, this.selectingSitePlan)
+
this.map = new AMap.Map('planContainer', {
viewMode: '2D', // 默认使用 2D 模式，如果希望使用带有俯仰角的 3D 模式，请设置 viewMode: '3D',
zoom: 11, //初始化地图层级
});
- this.map.setCity('上海市');
+ if(this.selectingSitePlan.defaultCenter){
+ console.log('设置了吗')
+ this.map.setZoom(this.selectingSitePlan.zoomLevel); //设置地图层级
+ this.map.setCenter([this.selectingSitePlan.defaultCenter.x, this.selectingSitePlan.defaultCenter.y])
+ }else{
+ this.map.setCity('上海市');
+ }
+
this.map.on('click', (e) => {
this.showInfoClick(e)
});
@@ -1405,18 +1427,18 @@ export class CollectionToolsPlanComponent implements OnInit {
if (Object.prototype.hasOwnProperty.call(this.canvasData.originaleveryStoreyData.data, key)) {
const element = this.canvasData.originaleveryStoreyData.data[key];
let editable = sessionStorage.getItem('editable')
- let markerContent
- if(editable == '1') {
+ let markerContent
+ if (editable == '1') {
markerContent = '' +
- '' +
- `
` +
- `
X
` +
- '
' +
+ `
` +
+ `
X
` +
+ '
' +
- `
` +
- '
' +
+ `
` +
+ '
+ 
' +
+ ' 
' +
'
|
+ 
适应缩放
- 
+ 
重置缩放
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.html b/src/app/ui/collection-tools-plan/collection-tools.component.html
index 01a15f7..633c521 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.html
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.html
@@ -28,11 +28,11 @@
-