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}}
    •  - -
  • {{node.name}}
    •  -     +
    - +
    @@ -87,20 +95,25 @@
    -
    +
    - + - arrow forward - 🠊 + arrow forward + 🠊 - +
    - +
    - +
    @@ -111,22 +124,26 @@
    - + - - @@ -137,112 +154,140 @@ - - + + - + - + - + @@ -273,12 +319,16 @@ {{element.modifiedTime|date:'yyyy-MM-dd'}} - + -
    + - + + - - star - + + + star + + 信息完整度得分信息完整度
    {{(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 : ''}} 统一社会信用代码 操作 - 查看详情 - 提交审核 - 撤销审核 + + 查看详情 + 提交审核 + 撤销审核 审批结果 关注单位 取消关注 @@ -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}} - - 信息完整度得分 -
      - - {{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}分 - -
      -
      -
      -
      - 分类名称 - 已得分 - 总分 -
      -
      -
        -
      • -
        单位信息
        -
        -
        -
        -
        - {{(element.companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}% -
        -
        5%
        -
        • -
      • -
        建筑信息
        -
        -
        -
        -
        - {{(element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1)}}% -
        -
        10%
        -
        • -
      • -
        平面图
        -
        -
        -
        -
        - {{(element.companyIntegrityScore.planImageScore * 10).toFixed(1)}}% -
        -
        10%
        -
        • -
      • -
        四周毗邻
        -
        -
        -
        -
        - {{(element.companyIntegrityScore.adjoinScore * 10).toFixed(1)}}% -
        -
        10%
        -
        • -
      • -
        消防设施
        -
        -
        -
        -
        - {{(element.companyIntegrityScore.facilityScore * 25).toFixed(1)}}% -
        -
        25%
        -
        • -
      • -
        重点部位
        -
        -
        -
        -
        - {{(element.companyIntegrityScore.importantLocationScore * 10).toFixed(1)}}% -
        -
        10%
        -
        • -
      • -
        功能分区
        -
        -
        -
        -
        - {{(element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1)}}% -
        -
        10%
        -
        • -
      • -
        实景图
        -
        -
        -
        -
        - {{(element.companyIntegrityScore.realityImageScore * 10).toFixed(1)}}% -
        -
        10%
        -
        • -
      • -
        CAD上传
        -
        -
        -
        -
        - {{(element.companyIntegrityScore.cadScore * 10).toFixed(1)}}% -
        -
        10%
        -
        • -
      -
      -
      - 仅供参考 -
      -
      -
      -       		消防救援站{{element.organizationName}}单位类型{{element.buildingTypes.length != 0 ? element.buildingTypes[0].name : ''}}统一社会信用代码{{element.usci}}录入时间 - {{element.createTime|date:'yyyy-MM-dd'}} - 状态 - - {{element.contentVerify.verifyState | state}} - - - 未维护 - - 操作 - - + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - -
      + + + + + + + star + + + 单位名称 + {{element.name}} + + 信息完整度得分 +
      + + {{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}分 + +
      +
      +
      +
      + 分类名称 + 占比 + 总占比 +
      +
      +
        +
      • +
        单位信息
        +
        +
        +
        +
        +
        + {{(element.companyIntegrityScore.basicInfoScore * + 5).toFixed(1)}}% +
        +
        5%
        +
        • +
      • +
        建筑信息
        +
        +
        +
        +
        +
        + {{(element.companyIntegrityScore.buildingInfoScore * + 10).toFixed(1)}}% +
        +
        10%
        +
        • +
      • +
        平面图
        +
        +
        +
        +
        +
        + {{(element.companyIntegrityScore.planImageScore * + 10).toFixed(1)}}% +
        +
        10%
        +
        • +
      • +
        四周毗邻
        +
        +
        +
        +
        +
        + {{(element.companyIntegrityScore.adjoinScore * + 10).toFixed(1)}}% +
        +
        10%
        +
        • +
      • +
        消防设施
        +
        +
        +
        +
        +
        + {{(element.companyIntegrityScore.facilityScore * + 25).toFixed(1)}}% +
        +
        25%
        +
        • +
      • +
        重点部位
        +
        +
        +
        +
        +
        + {{(element.companyIntegrityScore.importantLocationScore * + 10).toFixed(1)}}% +
        +
        10%
        +
        • +
      • +
        功能分区
        +
        +
        +
        +
        +
        + {{(element.companyIntegrityScore.functionalDivisionScore * + 10).toFixed(1)}}% +
        +
        10%
        +
        • +
      • +
        实景图
        +
        +
        +
        +
        +
        + {{(element.companyIntegrityScore.realityImageScore * + 10).toFixed(1)}}% +
        +
        10%
        +
        • +
      • +
        CAD上传
        +
        +
        +
        +
        +
        + {{(element.companyIntegrityScore.cadScore * + 10).toFixed(1)}}% +
        +
        10%
        +
        • +
      +
      +
      + 仅供参考 +
      +
      +
      +       		消防救援站{{element.organizationName}}单位类型{{element.buildingTypes.length != 0 ? + element.buildingTypes[0].name : ''}}统一社会信用代码{{element.usci}}录入时间 + {{element.createTime|date:'yyyy-MM-dd'}} + 状态 + + {{element.contentVerify.verifyState | state}} + + + 未维护 + + 操作 + + - 基本信息维护 - 预案维护 -
      - - - -
      - + 基本信息维护 + 预案维护 +
      + + + +
      +
      \ No newline at end of file diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html index 52f8b93..2e7f14f 100644 --- a/src/app/tabbar/tabbar.component.html +++ b/src/app/tabbar/tabbar.component.html @@ -1,124 +1,144 @@ -

      {{title}} : {{planName}}

      +

      {{title}} : {{planName}}

      -
      - {{(companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}} % +
      + {{(companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}} %
      -
      -
      - 分类名称 - 已得分 - 百分比 -
      -
      -
        -
      • -
        单位信息
        -
        -
        -
        -
        - {{(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 @@
      - 提交审核 + 提交审核 撤销审核 - ( + ( 删除 - 新增 - 更新 + 新增 + 更新 待审核) - (审核通过) - (审核驳回) + (审核通过) + (审核驳回)
      - +