Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

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

@@ -1527,6 +1527,10 @@ export class CollectionToolsBuildingComponent implements OnInit {
     this.canvas.setNameVisible(this.basicInfo, 0)
     this.canvas.setNameVisible(this.wantToWork, 1)
     this.canvas.setLegendVisible(this.isShowLegend) //图例显隐
+    if (this.router.url.indexOf("keyUnit/viewunitinfo") != -1) { //查看模式
+      console.log('查看模式')
+      this.canvas.allowEdit = false
+  }
     isRefresh ? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
     isRefresh ? this.isShowProperty = true : null
     isRefresh ? this.isShowAttribute = true : null

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

@@ -547,6 +547,7 @@ export class CollectionToolsPlanComponent implements OnInit {
             this.isEditPattern = false
             this.isediticon = false
             this.canvasData.gameMode = GameMode.Assignment
+
         } else if (this.router.url.indexOf("keyUnit/editplaninfo") != -1) { //编辑模式
             this.canvasData.gameMode = GameMode.BasicInformation
         }
@@ -1322,9 +1323,14 @@ export class CollectionToolsPlanComponent implements OnInit {
             this.canvas.setNameVisible(this.basicInfo, 0)
             this.canvas.setNameVisible(this.wantToWork, 1)
             this.canvas.setLegendVisible(this.isShowLegend) //图例显隐
+            if (this.router.url.indexOf("keyUnit/viewunitinfo") != -1) { //查看模式
+                console.log('查看模式')
+                this.canvas.allowEdit = false
+            }
             isRefresh ? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
             isRefresh ? this.isShowProperty = true : null
             isRefresh ? this.isShowAttribute = true : null
+            
         } else {
             //加载高德地图
             this.toLoadGis()

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

@@ -1162,6 +1162,9 @@ export class CollectionToolsComponent implements OnInit {
     this.canvas.setNameVisible(this.basicInfo, 0)
     this.canvas.setNameVisible(this.wantToWork, 1)
     this.canvas.setLegendVisible(this.isShowLegend) //图例显隐
+    if (sessionStorage.getItem('editable') == "0") { //查看模式
+      this.canvas.allowEdit = false
+    } 
     isRefresh ? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
     isRefresh ? this.isShowProperty = true : null
     isRefresh ? this.isShowAttribute = true : null