From 529e8b6956e288bf5d1e5e6c9a34760f37268a39 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Fri, 4 Jun 2021 10:50:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=B9=B3=E9=9D=A2?=
 =?UTF-8?q?=E5=9B=BEgis=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collection-tools.component.ts             | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts
index 7e0ec8b..81fd391 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -1400,15 +1400,24 @@ export class CollectionToolsPlanComponent implements OnInit {
       this.showInfoClick(e)
     });
     this.map.on("complete", () => {
-
       for (const key in this.canvasData.originaleveryStoreyData.data) {
         if (Object.prototype.hasOwnProperty.call(this.canvasData.originaleveryStoreyData.data, key)) {
           const element = this.canvasData.originaleveryStoreyData.data[key];
-          let markerContent = '' +
+          let editable = sessionStorage.getItem('editable')
+          let markerContent 
+          if(editable == '1') {
+            markerContent = '' +
             '<div class="custom-content-marker" id="xxxx">' +
             `<img src="${element.ImageUrl}">` +
             `<div class="close-btn" onclick='deleteMarker()'>X</div>` +
             '</div>';
+          }else{
+            markerContent = '' +
+            '<div class="custom-content-marker" id="xxxx">' +
+            `<img src="${element.ImageUrl}">` +
+            '</div>';
+          }
+
           // 将 icon 传入 marker
           let startMarker = new AMap.Marker({
             position: new AMap.LngLat(element.Point.x, element.Point.y),
@@ -1416,7 +1425,7 @@ export class CollectionToolsPlanComponent implements OnInit {
             content: markerContent,
             // 以 icon 的 [center bottom] 为原点
             offset: new AMap.Pixel(-13, -30),
-            draggable: true,
+            draggable: editable == '1' ? true : false,
           });
 
           startMarker.id = element.Id
@@ -1434,8 +1443,9 @@ export class CollectionToolsPlanComponent implements OnInit {
           this.map.add(startMarker);
         }
       }
-
-
+    });
+    this.map.on('rightclick', (e) => {
+      this.selectImage.imageUrl = null
     });
   }
 
@@ -2155,7 +2165,7 @@ export class CollectionToolsPlanComponent implements OnInit {
   selectImg(item, items, index) {
     //如果是gis
     this.selectLibrary = item.name
-    this.selectImage = items
+    this.selectImage = JSON.parse(JSON.stringify(items)) 
     // console.log('选中图片',this.selectImage)
     this.selectImageIndex = index
     if (this.isGis) {
@@ -2175,7 +2185,7 @@ export class CollectionToolsPlanComponent implements OnInit {
   //地图单击事件
   clickId
   showInfoClick(e) {
-    if (!this.selectImage.imageUrl) {
+    if (!this.selectImage || !this.selectImage.imageUrl) {
       return
     }
     this.canvasData.isChange = true

From 3b76cbbeab581cf6a897de32edfbd608279c5dec Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Fri, 4 Jun 2021 11:23:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E5=88=86=E6=95=B0%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../key-unit-management/key-unit-management.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9fc5444..0fd0473 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
@@ -142,7 +142,7 @@
                     <td mat-cell *matCellDef="let element;let i = index">
                         <div class="integrityDiv">
                             <span class="integrityNum">
-                                {{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}分
+                                {{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}%
                             </span>
                             <div class="integrityColorDiv" [style]="integrity((element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed())">
                             </div>