[完善]中文图片名称改为英文，修改分数为占比

src/app/data-collection/fire-force/fire-force.component.html

@@ -107,7 +107,7 @@
         </div>
         <div class="detailsbox" *ngIf="selectedFireForceLevel != null" [ngClass]="{'noHeight': isPutDown}">
             <div class="putDown" (click)="putDown()">
-                <img src="/assets/images/向下收起.png" alt="">
+                <img src="/assets/images/xxsq.png" alt="">
             </div>
             <div class="masklayer" *ngIf="isMasklayer">
                 <mat-spinner [diameter]='30'></mat-spinner>

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  = 
   '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/定位.png">' +
+  '   <img src="/assets/images/dingwei.png">' +
   '</div>'
   newPositionMarkerContentBtn:any = 
   '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/定位.png">' +
+  '   <img src="/assets/images/dingwei.png">' +
   '   <div  class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' +
   '</div>'
   //创建地图

src/app/data-collection/linkage-forces/linkage-forces.component.html

@@ -98,7 +98,7 @@
                 <span>下载中...({{progressBarValue}}%)</span>
             </div>
             <div class="putDown" (click)="putDown()">
-                <img src="/assets/images/向下收起.png" alt="">
+                <img src="/assets/images/xxsq.png" alt="">
             </div>
             <div class="tabsbox">
                 <div class="tabs">

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  = 
   '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/定位.png">' +
+  '   <img src="/assets/images/dingwei.png">' +
   '</div>'
   newPositionMarkerContentBtn:any = 
   '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/定位.png">' +
+  '   <img src="/assets/images/dingwei.png">' +
   '   <div  class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' +
   '</div>'
   //创建地图
@@ -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){

src/app/data-collection/water-collection/water-collection.component.html

@@ -72,7 +72,7 @@
         </div>
         <div class="detailsbox" *ngIf="selectedWaterTypeIndex != null" [ngClass]="{'noHeight': isPutDown}">
             <div class="putDown" (click)="putDown()">
-                <img src="/assets/images/向下收起.png" alt="">
+                <img src="/assets/images/xxsq.png" alt="">
             </div>
             <div class="tabsbox">
                 <div class="tabs">

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  = 
   '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/定位.png">' +
+  '   <img src="/assets/images/dingwei.png">' +
   '</div>'
   newPositionMarkerContentBtn:any = 
   '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/定位.png">' +
+  '   <img src="/assets/images/dingwei.png">' +
   '   <div  class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' +
   '</div>'
   //创建地图
@@ -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){

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({

src/app/key-unit/key-unit-management/key-unit-management.component.html

@@ -5,7 +5,8 @@
                 <div class="queryField">
                     <label style="margin-right: 10px;">单位名称:</label>
                     <mat-form-field class="example-full-width">
-                        <input  matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName" autocomplete="off">
+                        <input matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName"
+                            autocomplete="off">
                     </mat-form-field>
                 </div>
                 <div class="queryField">
@@ -13,8 +14,10 @@
                     <mat-form-field class="example-full-width">
                         <input matInput placeholder="请输入统一社会信用代码" name="shehui" [(ngModel)]="shehui" autocomplete="off">
                     </mat-form-field>
-                    <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
-                    <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
+                    <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img
+                            [src]='imgsrcopen'> </span>
+                    <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img
+                            [src]='imgsrcdown'> </span>
                 </div>
 
                 <div class="queryField" *ngIf="!pcfind">
@@ -40,8 +43,10 @@
                             </mat-option>
                         </mat-select>
                     </mat-form-field>
-                    <span *ngIf="pcMore" style="margin-left: 10px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
-                    <span *ngIf="pcput" style="margin-left: 10px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>收起<img [src]='imgsrcdown'> </span>
+                    <span *ngIf="pcMore" style="margin-left: 10px; color: #0080FF; cursor: pointer;"
+                        (click)='pcInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
+                    <span *ngIf="pcput" style="margin-left: 10px; color: #0080FF; cursor: pointer;"
+                        (click)='pcInfo()'>收起<img [src]='imgsrcdown'> </span>
                 </div>
                 <div class="queryField" *ngIf="pcfind">
                     <button mat-raised-button color="primary">查询</button>
@@ -51,22 +56,25 @@
                 <div class="queryField ordiv" *ngIf="!padMore&&!pcMore">
                     <label style="margin-right: 10px;">消防救援站:</label>
                     <mat-form-field class="example-full-width">
-                        <input (click)="stopclose($event)" readonly matInput placeholder="请选择消防救援站" autocomplete="off" [(ngModel)]="js" name="js"  (focus)="openorganizationbox()">
+                        <input (click)="stopclose($event)" readonly matInput placeholder="请选择消防救援站" autocomplete="off"
+                            [(ngModel)]="js" name="js" (focus)="openorganizationbox()">
                     </mat-form-field>
-                    <mat-checkbox color="primary" style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox>
+                    <mat-checkbox color="primary" style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级
+                    </mat-checkbox>
 
                     <div class="organizationbox" *ngIf="isorganizationbox">
-                        <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
+                        <div (click)="closediv()" class="closediv">
+                            <mat-icon>clear</mat-icon>
+                        </div>
                         <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
-                            <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  (click)='add(node)' class="organizationlist">
+                            <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='add(node)'
+                                class="organizationlist">
                                 <button type="button" mat-icon-button disabled></button>
                                 <li>{{node.name}}</li>
                             </mat-tree-node>
-                            <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding  (click)='add(node)'  class="organizationlist">
-                                <button 
-                                    type="button" 
-                                    mat-icon-button 
-                                    matTreeNodeToggle
+                            <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding
+                                (click)='add(node)' class="organizationlist">
+                                <button type="button" mat-icon-button matTreeNodeToggle
                                     [attr.aria-label]="'toggle ' + node.name">
                                     <mat-icon class="mat-icon-rtl-mirror">
                                         {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
@@ -90,12 +98,17 @@
                 <div class="queryField" *ngIf="!padMore&&!pcMore">
                     <label style="margin-right: 10px;">完整度查询:</label>
                     <mat-form-field class="example-full-width">
-                        <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最小值" name="integrityScoreMin" [(ngModel)]="integrityScoreMin" autocomplete="off">
+                        <input type="number" oninput="if(value>100)value=100;if(value<0)value=0" matInput
+                            placeholder="请输入完整度最小值" name="integrityScoreMin" [(ngModel)]="integrityScoreMin"
+                            autocomplete="off">
                     </mat-form-field>
-                    <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+                    <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;"
+                        id="padshow">arrow forward</mat-icon>
                     <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
                     <mat-form-field class="example-full-width" style="margin-left: 5px;">
-                        <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最大值" name="integrityScoreMax" [(ngModel)]="integrityScoreMax" autocomplete="off">
+                        <input type="number" oninput="if(value>100)value=100;if(value<0)value=0" matInput
+                            placeholder="请输入完整度最大值" name="integrityScoreMax" [(ngModel)]="integrityScoreMax"
+                            autocomplete="off">
                     </mat-form-field>
                 </div>
 
@@ -117,7 +130,9 @@
                     <th mat-header-cell *matHeaderCellDef>
                     </th>
                     <td mat-cell *matCellDef="let element">
-                        <mat-checkbox color="primary" (change)="checkChange($event,element)" [disabled]="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3)" (click)='checkClick(element,$event)'></mat-checkbox>      
+                        <mat-checkbox color="primary" (change)="checkChange($event,element)"
+                            [disabled]="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3)"
+                            (click)='checkClick(element,$event)'></mat-checkbox>
                     </td>
                 </ng-container>
                 <ng-container matColumnDef="Follow">
@@ -125,7 +140,9 @@
                     </th>
                     <td mat-cell *matCellDef="let element">
 
-                        <span title="已关注"  *ngIf="element.isFollowed"><mat-icon style="margin-top: 6px;color: red;">star</mat-icon></span>
+                        <span title="已关注" *ngIf="element.isFollowed">
+                            <mat-icon style="margin-top: 6px;color: red;">star</mat-icon>
+                        </span>
 
                     </td>
                 </ng-container>
@@ -138,19 +155,20 @@
                 </ng-container>
 
                 <ng-container matColumnDef="integrity">
-                    <th mat-header-cell *matHeaderCellDef style="text-align: center;">信息完整度得分</th>
+                    <th mat-header-cell *matHeaderCellDef style="text-align: center;">信息完整度</th>
                     <td mat-cell *matCellDef="let element;let i = index">
                         <div class="integrityDiv">
                             <span class="integrityNum">
                                 {{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}%
                             </span>
-                            <div class="integrityColorDiv" [style]="integrity((element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed())">
+                            <div class="integrityColorDiv"
+                                [style]="integrity((element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed())">
                             </div>
                             <div class="integrityDetails" [ngClass]="{'bottomposition': i <= 5,'topposition': i > 5}">
                                 <div class="integrityDetailsTop">
                                     <span class="span1">分类名称</span>
-                                    <span class="span2">已得分</span>
-                                    <span class="span3">总分</span>
+                                    <span class="span2">占比</span>
+                                    <span class="span3">总占比</span>
                                 </div>
                                 <div class="integrityDetailsBody">
                                     <ul>
@@ -158,9 +176,12 @@
                                             <div class="name">单位信息</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                    <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.basicInfoScore * 5).toFixed(1),5)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.basicInfoScore * 5).toFixed(1),5)">
+                                                    </div>
                                                 </div>
-                                                <span>{{(element.companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}%</span>
+                                                <span>{{(element.companyIntegrityScore.basicInfoScore *
+                                                    5).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">5%</div>
                                         </li>
@@ -168,9 +189,12 @@
                                             <div class="name">建筑信息</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                    <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1),10)">
                                                     </div>
-                                                <span>{{(element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1)}}%</span>
+                                                </div>
+                                                <span>{{(element.companyIntegrityScore.buildingInfoScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -178,9 +202,12 @@
                                             <div class="name">平面图</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                    <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.planImageScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.planImageScore * 10).toFixed(1),10)">
+                                                    </div>
                                                 </div>
-                                                <span>{{(element.companyIntegrityScore.planImageScore * 10).toFixed(1)}}%</span>
+                                                <span>{{(element.companyIntegrityScore.planImageScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -188,9 +215,12 @@
                                             <div class="name">四周毗邻</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                    <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.adjoinScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.adjoinScore * 10).toFixed(1),10)">
+                                                    </div>
                                                 </div>
-                                                <span>{{(element.companyIntegrityScore.adjoinScore * 10).toFixed(1)}}%</span>
+                                                <span>{{(element.companyIntegrityScore.adjoinScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -198,9 +228,12 @@
                                             <div class="name">消防设施</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                    <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.facilityScore * 25).toFixed(1),25)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.facilityScore * 25).toFixed(1),25)">
                                                     </div>
-                                                <span>{{(element.companyIntegrityScore.facilityScore * 25).toFixed(1)}}%</span>
+                                                </div>
+                                                <span>{{(element.companyIntegrityScore.facilityScore *
+                                                    25).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">25%</div>
                                         </li>
@@ -208,9 +241,12 @@
                                             <div class="name">重点部位</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                    <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.importantLocationScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.importantLocationScore * 10).toFixed(1),10)">
+                                                    </div>
                                                 </div>
-                                                <span>{{(element.companyIntegrityScore.importantLocationScore * 10).toFixed(1)}}%</span>
+                                                <span>{{(element.companyIntegrityScore.importantLocationScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -218,9 +254,12 @@
                                             <div class="name">功能分区</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                    <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1),10)">
+                                                    </div>
                                                 </div>
-                                                <span>{{(element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1)}}%</span>
+                                                <span>{{(element.companyIntegrityScore.functionalDivisionScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -228,9 +267,12 @@
                                             <div class="name">实景图</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                    <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.realityImageScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.realityImageScore * 10).toFixed(1),10)">
                                                     </div>
-                                                <span>{{(element.companyIntegrityScore.realityImageScore * 10).toFixed(1)}}%</span>
+                                                </div>
+                                                <span>{{(element.companyIntegrityScore.realityImageScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -238,9 +280,12 @@
                                             <div class="name">CAD上传</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                    <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.cadScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.cadScore * 10).toFixed(1),10)">
+                                                    </div>
                                                 </div>
-                                                <span>{{(element.companyIntegrityScore.cadScore * 10).toFixed(1)}}%</span>
+                                                <span>{{(element.companyIntegrityScore.cadScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -261,7 +306,8 @@
 
                 <ng-container matColumnDef="unittype">
                     <th mat-header-cell *matHeaderCellDef>单位类型</th>
-                    <td mat-cell *matCellDef="let element">{{element.buildingTypes.length != 0 ? element.buildingTypes[0].name : ''}}</td>
+                    <td mat-cell *matCellDef="let element">{{element.buildingTypes.length != 0 ?
+                        element.buildingTypes[0].name : ''}}</td>
                 </ng-container>
                 <ng-container matColumnDef="scc">
                     <th mat-header-cell *matHeaderCellDef>统一社会信用代码</th>
@@ -277,8 +323,12 @@
                     <th mat-header-cell *matHeaderCellDef>操作</th>
                     <td mat-cell *matCellDef="let element" class="operation">
                         <span (click)="unitdetails(element)">查看详情</span>
-                        <span style="color: blue;margin-left: 4px;"  *ngIf="element.contentVerify==null||element.contentVerify.verifyState==-1||element.contentVerify.verifyState==1||element.contentVerify.verifyState==2||element.contentVerify.verifyState==4||element.contentVerify.verifyState==5" (click)='submitAudit(element)'>提交审核</span>
-                        <span style="color: blue;margin-left: 4px;"  *ngIf="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3) " (click)="cancelAudit(element)">撤销审核</span>
+                        <span style="color: blue;margin-left: 4px;"
+                            *ngIf="element.contentVerify==null||element.contentVerify.verifyState==-1||element.contentVerify.verifyState==1||element.contentVerify.verifyState==2||element.contentVerify.verifyState==4||element.contentVerify.verifyState==5"
+                            (click)='submitAudit(element)'>提交审核</span>
+                        <span style="color: blue;margin-left: 4px;"
+                            *ngIf="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3) "
+                            (click)="cancelAudit(element)">撤销审核</span>
                         <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
                         <span (click)="Follow(element)" *ngIf="!element.isFollowed">关注单位</span>
                         <span (click)="unFollow(element)" *ngIf="element.isFollowed">取消关注</span>
@@ -287,9 +337,7 @@
                 <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
                 <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
             </table>
-            <mat-paginator [length]="length"
-                [pageSize]="pageSize"
-                [pageSizeOptions]="pageSizeOptions"
+            <mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions"
                 (page)="chagePage($event)">
             </mat-paginator>
 

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  = 
   '<div class="custom-content-marker">' +
-  '   <img style="width:20px;height:26px" src="/assets/images/定位.png">' +
+  '   <img style="width:20px;height:26px" src="/assets/images/dingwei.png">' +
   '</div>'
   creatMap(){
     this.map = new AMap.Map('center',{

src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts

@@ -60,7 +60,7 @@ export class FireforceAuditComponent implements OnInit {
   newPositionMarker:any
   newPositionMarkerContent:any  = 
   '<div class="custom-content-marker">' +
-  '   <img style="width:20px;height:24px" src="/assets/images/定位.png">' +
+  '   <img style="width:20px;height:24px" src="/assets/images/dingwei.png">' +
   '</div>'
   //当前点击tab页面第几个
   tabIndex:any = 1

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  = 
   '<div class="custom-content-marker">' +
-  '   <img style="width:20px;height:24px" src="/assets/images/定位.png">' +
+  '   <img style="width:20px;height:24px" src="/assets/images/dingwei.png">' +
   '</div>'
   ngOnInit(): void {
     this.AttachmentArr = JSON.parse(this.LinkageForceDetailInfo.relevantInfomationData) 

src/app/plan-audit/water-audit/water-audit.component.ts

@@ -12,7 +12,7 @@ export class WaterAuditComponent implements OnInit {
   newPositionMarker:any
   newPositionMarkerContent:any  = 
   '<div class="custom-content-marker">' +
-  '   <img style="width:20px;height:24px" src="/assets/images/定位.png">' +
+  '   <img style="width:20px;height:24px" src="/assets/images/dingwei.png">' +
   '</div>'
   ngOnInit(): void {
    

src/app/plan-management/entry-plan/entry-plan.component.html

@@ -149,8 +149,8 @@
                             <div class="integrityDetails" [ngClass]="{'bottomposition': i <= 5,'topposition': i > 5}">
                                 <div class="integrityDetailsTop">
                                     <span class="span1">分类名称</span>
-                                    <span class="span2">已得分</span>
-                                    <span class="span3">总分</span>
+                                    <span class="span2">占比</span>
+                                    <span class="span3">总占比</span>
                                 </div>
                                 <div class="integrityDetailsBody">
                                     <ul> 

src/app/plan-management/maintain-up/maintain-up.component.html

@@ -5,30 +5,36 @@
                 <div class="queryField">
                     <label style="margin-right: 10px;">单位名称:</label>
                     <mat-form-field class="example-full-width">
-                      <input  matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName" autocomplete="off">
+                        <input matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName"
+                            autocomplete="off">
                     </mat-form-field>
                 </div>
 
                 <div class="queryField ordiv">
                     <label style="margin-right: 10px;">消防救援站:</label>
                     <mat-form-field class="example-full-width">
-                      <input (click)="stopclose($event)" readonly matInput placeholder="请选择消防救援站" autocomplete="off" [(ngModel)]="js" name="js"  (focus)="openorganizationbox()">
+                        <input (click)="stopclose($event)" readonly matInput placeholder="请选择消防救援站" autocomplete="off"
+                            [(ngModel)]="js" name="js" (focus)="openorganizationbox()">
                     </mat-form-field>
-                  <mat-checkbox color="primary" style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox>
-                  <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
-                  <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
+                    <mat-checkbox color="primary" style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级
+                    </mat-checkbox>
+                    <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img
+                            [src]='imgsrcopen'> </span>
+                    <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img
+                            [src]='imgsrcdown'> </span>
                     <div class="organizationbox" *ngIf="isorganizationbox">
-                      <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
+                        <div (click)="closediv()" class="closediv">
+                            <mat-icon>clear</mat-icon>
+                        </div>
                         <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
-                          <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  (click)='add(node)' class="organizationlist">
+                            <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='add(node)'
+                                class="organizationlist">
                                 <button type="button" mat-icon-button disabled></button>
                                 <li>{{node.name}}</li>
                             </mat-tree-node>
-                          <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding  (click)='add(node)'  class="organizationlist">
-                              <button 
-                                  type="button" 
-                                  mat-icon-button 
-                                  matTreeNodeToggle
+                            <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding
+                                (click)='add(node)' class="organizationlist">
+                                <button type="button" mat-icon-button matTreeNodeToggle
                                     [attr.aria-label]="'toggle ' + node.name">
                                     <mat-icon class="mat-icon-rtl-mirror">
                                         {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
@@ -59,8 +65,10 @@
                             </mat-option>
                         </mat-select>
                     </mat-form-field>
-                  <span *ngIf="pcMore" style="margin-left: 20px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
-                  <span *ngIf="pcput" style="margin-left: 10px; color: #0080FF; cursor: pointer;" (click)='pcInfo()'>收起<img [src]='imgsrcdown'> </span>
+                    <span *ngIf="pcMore" style="margin-left: 20px; color: #0080FF; cursor: pointer;"
+                        (click)='pcInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
+                    <span *ngIf="pcput" style="margin-left: 10px; color: #0080FF; cursor: pointer;"
+                        (click)='pcInfo()'>收起<img [src]='imgsrcdown'> </span>
                 </div>
                 <div class="queryField" *ngIf="pcfind">
                     <button mat-raised-button color="primary">查询</button>
@@ -87,12 +95,17 @@
                 <div class="queryField" *ngIf="!padMore&&!pcMore">
                     <label style="margin-right: 10px;">完整度查询:</label>
                     <mat-form-field class="example-full-width">
-                      <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最小值" name="integrityScoreMin" [(ngModel)]="integrityScoreMin" autocomplete="off">
+                        <input type="number" oninput="if(value>100)value=100;if(value<0)value=0" matInput
+                            placeholder="请输入完整度最小值" name="integrityScoreMin" [(ngModel)]="integrityScoreMin"
+                            autocomplete="off">
                     </mat-form-field>
-                  <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+                    <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;"
+                        id="padshow">arrow forward</mat-icon>
                     <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
                     <mat-form-field class="example-full-width" style="margin-left: 5px;">
-                      <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最大值" name="integrityScoreMax" [(ngModel)]="integrityScoreMax" autocomplete="off">
+                        <input type="number" oninput="if(value>100)value=100;if(value<0)value=0" matInput
+                            placeholder="请输入完整度最大值" name="integrityScoreMax" [(ngModel)]="integrityScoreMax"
+                            autocomplete="off">
                     </mat-form-field>
                 </div>
 
@@ -113,7 +126,9 @@
                     <th mat-header-cell *matHeaderCellDef>
                     </th>
                     <td mat-cell *matCellDef="let element">
-                      <mat-checkbox color="primary" (change)="checkChange($event,element)" [disabled]="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3)" (click)='checkClick(element)'></mat-checkbox>      
+                        <mat-checkbox color="primary" (change)="checkChange($event,element)"
+                            [disabled]="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3)"
+                            (click)='checkClick(element)'></mat-checkbox>
                     </td>
                 </ng-container>
                 <ng-container matColumnDef="Follow">
@@ -121,7 +136,9 @@
                     </th>
                     <td mat-cell *matCellDef="let element">
 
-                      <span title="已关注"  *ngIf="element.isFollowed"><mat-icon style="margin-top: 6px;color: red;">star</mat-icon></span>
+                        <span title="已关注" *ngIf="element.isFollowed">
+                            <mat-icon style="margin-top: 6px;color: red;">star</mat-icon>
+                        </span>
 
                     </td>
                 </ng-container>
@@ -140,13 +157,14 @@
                             <span class="integrityNum">
                                 {{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}分
                             </span>
-                          <div class="integrityColorDiv" [style]="integrity((element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed())">
+                            <div class="integrityColorDiv"
+                                [style]="integrity((element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed())">
                             </div>
                             <div class="integrityDetails" [ngClass]="{'bottomposition': i <= 5,'topposition': i > 5}">
                                 <div class="integrityDetailsTop">
                                     <span class="span1">分类名称</span>
-                                  <span class="span2">已得分</span>
-                                  <span class="span3">总分</span>
+                                    <span class="span2">占比</span>
+                                    <span class="span3">总占比</span>
                                 </div>
                                 <div class="integrityDetailsBody">
                                     <ul>
@@ -154,9 +172,12 @@
                                             <div class="name">单位信息</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                  <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.basicInfoScore * 5).toFixed(1),5)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.basicInfoScore * 5).toFixed(1),5)">
+                                                    </div>
                                                 </div>
-                                              <span>{{(element.companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}%</span>
+                                                <span>{{(element.companyIntegrityScore.basicInfoScore *
+                                                    5).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">5%</div>
                                         </li>
@@ -164,9 +185,12 @@
                                             <div class="name">建筑信息</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                  <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1),10)">
                                                     </div>
-                                              <span>{{(element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1)}}%</span>
+                                                </div>
+                                                <span>{{(element.companyIntegrityScore.buildingInfoScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -174,9 +198,12 @@
                                             <div class="name">平面图</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                  <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.planImageScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.planImageScore * 10).toFixed(1),10)">
+                                                    </div>
                                                 </div>
-                                              <span>{{(element.companyIntegrityScore.planImageScore * 10).toFixed(1)}}%</span>
+                                                <span>{{(element.companyIntegrityScore.planImageScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -184,9 +211,12 @@
                                             <div class="name">四周毗邻</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                  <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.adjoinScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.adjoinScore * 10).toFixed(1),10)">
+                                                    </div>
                                                 </div>
-                                              <span>{{(element.companyIntegrityScore.adjoinScore * 10).toFixed(1)}}%</span>
+                                                <span>{{(element.companyIntegrityScore.adjoinScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -194,9 +224,12 @@
                                             <div class="name">消防设施</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                  <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.facilityScore * 25).toFixed(1),25)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.facilityScore * 25).toFixed(1),25)">
                                                     </div>
-                                              <span>{{(element.companyIntegrityScore.facilityScore * 25).toFixed(1)}}%</span>
+                                                </div>
+                                                <span>{{(element.companyIntegrityScore.facilityScore *
+                                                    25).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">25%</div>
                                         </li>
@@ -204,9 +237,12 @@
                                             <div class="name">重点部位</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                  <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.importantLocationScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.importantLocationScore * 10).toFixed(1),10)">
+                                                    </div>
                                                 </div>
-                                              <span>{{(element.companyIntegrityScore.importantLocationScore * 10).toFixed(1)}}%</span>
+                                                <span>{{(element.companyIntegrityScore.importantLocationScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -214,9 +250,12 @@
                                             <div class="name">功能分区</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                  <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1),10)">
+                                                    </div>
                                                 </div>
-                                              <span>{{(element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1)}}%</span>
+                                                <span>{{(element.companyIntegrityScore.functionalDivisionScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -224,9 +263,12 @@
                                             <div class="name">实景图</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                  <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.realityImageScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.realityImageScore * 10).toFixed(1),10)">
                                                     </div>
-                                              <span>{{(element.companyIntegrityScore.realityImageScore * 10).toFixed(1)}}%</span>
+                                                </div>
+                                                <span>{{(element.companyIntegrityScore.realityImageScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -234,9 +276,12 @@
                                             <div class="name">CAD上传</div>
                                             <div class="colorDiv">
                                                 <div class="colorDivBac">
-                                                  <div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.cadScore * 10).toFixed(1),10)"></div>
+                                                    <div class="colorDivCon"
+                                                        [style]="integrityDetails((element.companyIntegrityScore.cadScore * 10).toFixed(1),10)">
+                                                    </div>
                                                 </div>
-                                              <span>{{(element.companyIntegrityScore.cadScore * 10).toFixed(1)}}%</span>
+                                                <span>{{(element.companyIntegrityScore.cadScore *
+                                                    10).toFixed(1)}}%</span>
                                             </div>
                                             <div class="number">10%</div>
                                         </li>
@@ -257,7 +302,8 @@
 
                 <ng-container matColumnDef="unittype">
                     <th mat-header-cell *matHeaderCellDef>单位类型</th>
-                  <td mat-cell *matCellDef="let element">{{element.buildingTypes.length != 0 ? element.buildingTypes[0].name : ''}}</td>
+                    <td mat-cell *matCellDef="let element">{{element.buildingTypes.length != 0 ?
+                        element.buildingTypes[0].name : ''}}</td>
                 </ng-container>
                 <ng-container matColumnDef="scc">
                     <th mat-header-cell *matHeaderCellDef>统一社会信用代码</th>
@@ -296,9 +342,7 @@
                 <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
                 <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
             </table>
-          <mat-paginator [length]="length"
-              [pageSize]="pageSize"
-              [pageSizeOptions]="pageSizeOptions"
+            <mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions"
                 (page)="chagePage($event)">
             </mat-paginator>
 

src/app/tabbar/tabbar.component.html

@@ -1,16 +1,18 @@
 <mat-toolbar [color]="theme?'primary':'accent'">
     <!-- <mat-toolbar> -->
-    <h1 style="max-width: 240px;display: block;overflow: hidden;text-overflow: ellipsis;">{{title}} <span *ngIf="planName != null">: {{planName}}</span> </h1>
+    <h1 style="max-width: 240px;display: block;overflow: hidden;text-overflow: ellipsis;">{{title}} <span
+            *ngIf="planName != null">: {{planName}}</span> </h1>
     <!--分数框-->
-    <div class="grade" *ngIf="companyIntegrityScore" onmouseover="xiangqing.style.display='block';" onmouseout="xiangqing.style.display='none';">
+    <div class="grade" *ngIf="companyIntegrityScore" onmouseover="xiangqing.style.display='block';"
+        onmouseout="xiangqing.style.display='none';">
         <a class="active"><span><a></a>{{(companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}} %</span></a>
     </div>
 
     <div class="integrityDetails" id="xiangqing" *ngIf="companyIntegrityScore">
         <div class="integrityDetailsTop">
             <span class="span1">分类名称</span>
-          <span class="span2">已得分</span>
-          <span class="span3">百分比</span>
+            <span class="span2">占比</span>
+            <span class="span3">总占比</span>
         </div>
         <div class="integrityDetailsBody">
             <ul>
@@ -18,7 +20,9 @@
                     <div class="name">单位信息</div>
                     <div class="colorDiv">
                         <div class="colorDivBac">
-                          <div class="colorDivCon" [style]="integrityDetails((companyIntegrityScore.basicInfoScore * 5).toFixed(1),5)"></div>
+                            <div class="colorDivCon"
+                                [style]="integrityDetails((companyIntegrityScore.basicInfoScore * 5).toFixed(1),5)">
+                            </div>
                         </div>
                         <span>{{(companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}%</span>
                     </div>
@@ -28,7 +32,9 @@
                     <div class="name">建筑信息</div>
                     <div class="colorDiv">
                         <div class="colorDivBac">
-                          <div class="colorDivCon" [style]="integrityDetails((companyIntegrityScore.buildingInfoScore * 10).toFixed(1),10)"></div>
+                            <div class="colorDivCon"
+                                [style]="integrityDetails((companyIntegrityScore.buildingInfoScore * 10).toFixed(1),10)">
+                            </div>
                         </div>
                         <span>{{(companyIntegrityScore.buildingInfoScore * 10).toFixed(1)}}%</span>
                     </div>
@@ -38,7 +44,9 @@
                     <div class="name">平面图</div>
                     <div class="colorDiv">
                         <div class="colorDivBac">
-                          <div class="colorDivCon" [style]="integrityDetails((companyIntegrityScore.planImageScore * 10).toFixed(1),10)"></div>
+                            <div class="colorDivCon"
+                                [style]="integrityDetails((companyIntegrityScore.planImageScore * 10).toFixed(1),10)">
+                            </div>
                         </div>
                         <span>{{(companyIntegrityScore.planImageScore * 10).toFixed(1)}}%</span>
                     </div>
@@ -48,7 +56,9 @@
                     <div class="name">四周毗邻</div>
                     <div class="colorDiv">
                         <div class="colorDivBac">
-                          <div class="colorDivCon" [style]="integrityDetails((companyIntegrityScore.adjoinScore * 10).toFixed(1),10)"></div>
+                            <div class="colorDivCon"
+                                [style]="integrityDetails((companyIntegrityScore.adjoinScore * 10).toFixed(1),10)">
+                            </div>
                         </div>
                         <span>{{(companyIntegrityScore.adjoinScore * 10).toFixed(1)}}%</span>
                     </div>
@@ -58,7 +68,9 @@
                     <div class="name">消防设施</div>
                     <div class="colorDiv">
                         <div class="colorDivBac">
-                          <div class="colorDivCon" [style]="integrityDetails((companyIntegrityScore.facilityScore * 25).toFixed(1),25)"></div>
+                            <div class="colorDivCon"
+                                [style]="integrityDetails((companyIntegrityScore.facilityScore * 25).toFixed(1),25)">
+                            </div>
                         </div>
                         <span>{{(companyIntegrityScore.facilityScore * 25).toFixed(1)}}%</span>
                     </div>
@@ -68,7 +80,9 @@
                     <div class="name">重点部位</div>
                     <div class="colorDiv">
                         <div class="colorDivBac">
-                          <div class="colorDivCon" [style]="integrityDetails((companyIntegrityScore.importantLocationScore * 10).toFixed(1),10)"></div>
+                            <div class="colorDivCon"
+                                [style]="integrityDetails((companyIntegrityScore.importantLocationScore * 10).toFixed(1),10)">
+                            </div>
                         </div>
                         <span>{{(companyIntegrityScore.importantLocationScore * 10).toFixed(1)}}%</span>
                     </div>
@@ -78,7 +92,9 @@
                     <div class="name">功能分区</div>
                     <div class="colorDiv">
                         <div class="colorDivBac">
-                          <div class="colorDivCon" [style]="integrityDetails((companyIntegrityScore.functionalDivisionScore * 10).toFixed(1),10)"></div>
+                            <div class="colorDivCon"
+                                [style]="integrityDetails((companyIntegrityScore.functionalDivisionScore * 10).toFixed(1),10)">
+                            </div>
                         </div>
                         <span>{{(companyIntegrityScore.functionalDivisionScore * 10).toFixed(1)}}%</span>
                     </div>
@@ -88,7 +104,9 @@
                     <div class="name">实景图</div>
                     <div class="colorDiv">
                         <div class="colorDivBac">
-                          <div class="colorDivCon" [style]="integrityDetails((companyIntegrityScore.realityImageScore * 10).toFixed(1),10)"></div>
+                            <div class="colorDivCon"
+                                [style]="integrityDetails((companyIntegrityScore.realityImageScore * 10).toFixed(1),10)">
+                            </div>
                         </div>
                         <span>{{(companyIntegrityScore.realityImageScore * 10).toFixed(1)}}%</span>
                     </div>
@@ -98,7 +116,8 @@
                     <div class="name">CAD上传</div>
                     <div class="colorDiv">
                         <div class="colorDivBac">
-                          <div class="colorDivCon" [style]="integrityDetails((companyIntegrityScore.cadScore * 10).toFixed(1),10)"></div>
+                            <div class="colorDivCon"
+                                [style]="integrityDetails((companyIntegrityScore.cadScore * 10).toFixed(1),10)"></div>
                         </div>
                         <span>{{(companyIntegrityScore.cadScore * 10).toFixed(1)}}%</span>
                     </div>
@@ -108,7 +127,8 @@
         </div>
         <div style="width: 100%;text-align: center;font-size: 13px;position: relative;">
             仅供参考
-          <span class="closeScore" style="position: absolute;right: 12px;top: 0px;" onmouseover="xiangqing.style.display='none';">关闭</span>
+            <span class="closeScore" style="position: absolute;right: 12px;top: 0px;"
+                onmouseover="xiangqing.style.display='none';">关闭</span>
         </div>
     </div>
 
@@ -155,12 +175,16 @@
                     <tr>
                         <td>消防设施</td>
                         <td class="bulecolor">25%</td>
-                        <td>消防水源占<span class="bulecolor">30%</span>  &nbsp;&nbsp;&nbsp;   安全疏散占<span class="bulecolor">30%</span> <br> 消防水系统占<span class="bulecolor">30%</span>   &nbsp;&nbsp;&nbsp;   内部消防力量占<span class="bulecolor">10%</span></td>
+                        <td>消防水源占<span class="bulecolor">30%</span> &nbsp;&nbsp;&nbsp; 安全疏散占<span
+                                class="bulecolor">30%</span> <br> 消防水系统占<span class="bulecolor">30%</span>
+                            &nbsp;&nbsp;&nbsp; 内部消防力量占<span class="bulecolor">10%</span></td>
                     </tr>
                     <tr>
                         <td>重点部位</td>
                         <td class="bulecolor">10%</td>
-                        <td><span>根据耐火等级做区分</span>:一级:添加<span class="bulecolor">3</span>个重点部位（1个50%，2个80%，3个满分）<span class="bulecolor">二级</span>:添加<span class="bulecolor">2</span>个重点部位（一个占50%）<span class="bulecolor">三级</span>   添加<span class="bulecolor">1</span>个重点部位 其它:填写重点提示自动满分</td>
+                        <td><span>根据耐火等级做区分</span>:一级:添加<span class="bulecolor">3</span>个重点部位（1个50%，2个80%，3个满分）<span
+                                class="bulecolor">二级</span>:添加<span class="bulecolor">2</span>个重点部位（一个占50%）<span
+                                class="bulecolor">三级</span> 添加<span class="bulecolor">1</span>个重点部位 其它:填写重点提示自动满分</td>
                     </tr>
                     <tr>
                         <td>功能分区</td>
@@ -170,7 +194,9 @@
                     <tr>
                         <td>实景图</td>
                         <td class="bulecolor">10%</td>
-                        <td>外观，保证有<span class="bulecolor">2</span>张照片（占<span class="bulecolor">30%</span>）; 室内，保证有<span class="bulecolor">2</span>张照片（占<span class="bulecolor">30%</span>）;安全出口，保证有<span class="bulecolor">2</span>张照片（占<span class="bulecolor">40%</span>）</td>
+                        <td>外观，保证有<span class="bulecolor">2</span>张照片（占<span class="bulecolor">30%</span>）; 室内，保证有<span
+                                class="bulecolor">2</span>张照片（占<span class="bulecolor">30%</span>）;安全出口，保证有<span
+                                class="bulecolor">2</span>张照片（占<span class="bulecolor">40%</span>）</td>
                     </tr>
                     <tr>
                         <td>CAD上传</td>
@@ -187,7 +213,8 @@
         </div>
     </div>
     <div class="isUpdates" *ngIf="isUpdates">
-        <span class="name" (click)="submitAudit()" *ngIf="!contentVerify || contentVerify.verifyState == 5 || contentVerify.verifyState == 4">提交审核</span>
+        <span class="name" (click)="submitAudit()"
+            *ngIf="!contentVerify || contentVerify.verifyState == 5 || contentVerify.verifyState == 4">提交审核</span>
         <span class="name" (click)="cancelAudit()" *ngIf="contentVerify && contentVerify.verifyState == 3">撤销审核</span>
 
         <span class="span" *ngIf="contentVerify && contentVerify.verifyState == 3">(
@@ -195,8 +222,10 @@
             <span *ngIf="contentVerify.operation == 0">新增</span>
             <span *ngIf="contentVerify.operation == 1">更新</span>
             待审核)</span>
-        <span [matTooltip]="contentVerify.remark" class="span" *ngIf="contentVerify && contentVerify.verifyState == 4">(审核通过)</span>
-        <span [matTooltip]="contentVerify.remark" class="span" *ngIf="contentVerify && contentVerify.verifyState == 5">(审核驳回)</span>
+        <span [matTooltip]="contentVerify.remark" class="span"
+            *ngIf="contentVerify && contentVerify.verifyState == 4">(审核通过)</span>
+        <span [matTooltip]="contentVerify.remark" class="span"
+            *ngIf="contentVerify && contentVerify.verifyState == 5">(审核驳回)</span>
     </div>
 
 

src/app/ui/collection-tools-building/collection-tools.component.html

@@ -28,11 +28,11 @@
     </button>
 
     <span title="适应缩放" class="zoom" (click)="adaptZoom()">
-      <img src="/assets/images/适应缩放.png" alt="">
+      <img src="/assets/images/sysf.png" alt="">
       适应缩放
     </span>
     <span title="重置缩放" class="zoom" (click)="resetZoom()">
-      <img src="/assets/images/重置缩放.png" alt="">
+      <img src="/assets/images/czsf.png" alt="">
       重置缩放
     </span>
     <span title="导出图片" class="zoom" (click)="takeScreenshot()">

src/app/ui/collection-tools-plan/collection-tools.component.html

@@ -28,11 +28,11 @@
     </button>
 
     <span title="适应缩放" class="zoom" (click)="adaptZoom()">
-      <img src="/assets/images/适应缩放.png" alt="">
+      <img src="/assets/images/sysf.png" alt="">
       适应缩放
     </span>
     <span title="重置缩放" class="zoom" (click)="resetZoom()">
-      <img src="/assets/images/重置缩放.png" alt="">
+      <img src="/assets/images/czsf.png" alt="">
       重置缩放
     </span>
     <span title="导出图片" class="zoom" (click)="takeScreenshot()">
@@ -187,7 +187,7 @@
             *ngIf="isShowProperty && !isShowAttribute && !isMultipleAsset">
             <h3 style="text-align: center;font-weight: 900;">{{assetName}}</h3>
 
-            <div *ngIf="canvasAssetObj.InteractiveMode == 0">
+            <div *ngIf="canvasAssetObj.InteractiveMode == 0 && !isGis">
               <p>宽度(像素)</p>
               <input type="number" class="biginput" [(ngModel)]="assetWidth" (input)="assetWidthIunput()"
                 [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)">
@@ -205,7 +205,7 @@
               </div>
             </div>
             <!-- 如果是多点连线 -->
-            <div *ngIf="canvasAssetObj.InteractiveMode == 1 || canvasAssetObj.InteractiveMode == 3">
+            <div *ngIf="canvasAssetObj.InteractiveMode == 1 || canvasAssetObj.InteractiveMode == 3 && !isGis">
               <p>厚度</p>
               <div style="width: 100%;display: flex;vertical-align: top;height: 22px;">
                 <input type="number" class="smallinput" [(ngModel)]="sliderValueThickness"
@@ -223,7 +223,7 @@
                 [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)">
               <span style="font-size: 14px;">选中高亮</span>
             </div>
-            <div class="colorBigDiv" *ngIf="canvasAssetObj.FillMode == 0">
+            <div class="colorBigDiv" *ngIf="canvasAssetObj.FillMode == 0 && !isGis">
               <div class="colorBigTemplateDiv">
                 <span>颜色</span>
                 <div class="colorTemplateDiv" [style]="{'background-color':selectedcolor}">
@@ -496,7 +496,7 @@
             </div>
           </div> -->
           <div class="rightTitle">消防要素</div>
-          <div class="firecategoriesTree">
+          <div class="firecategoriesTree" *ngIf="!isGis">
             <div class="hideAllTreeNode" (click)='toggoleAllTreenode()' *ngIf="allFireElements.length">
               <label>全部显示/隐藏</label>
               <mat-icon [ngClass]="{'icongray': hideAllTreenode == false}">visibility</mat-icon>

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 => {

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<any>,@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('总平面图');

src/app/ui/collection-tools/collection-tools.component.html

@@ -30,11 +30,11 @@
     </button>
     
     <span title="适应缩放" class="zoom" (click)="adaptZoom()">
-      <img src="/assets/images/适应缩放.png" alt="">
+      <img src="/assets/images/sysf.png" alt="">
       适应缩放
     </span>
     <span title="重置缩放" class="zoom" (click)="resetZoom()">
-      <img src="/assets/images/重置缩放.png" alt="">
+      <img src="/assets/images/czsf.png" alt="">
       重置缩放
     </span>
     <span title="导出图片" class="zoom" (click)="takeScreenshot()">

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);
 
   }