Merge branch 'develop' of http://39.106.78.171:3000/shaojiahao/AX.Angular9DataCollection into develop

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

@@ -23,7 +23,7 @@
     </div>
 
     <div class="keyMargin">
-      <textarea name="details" required ngModel placeholder="详情"></textarea>
+      <textarea name="details" ngModel placeholder="详情"></textarea>
     </div>
 
     <div class="submitBottom">

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

@@ -62,7 +62,7 @@
 
   <!--功能区 -->
   <div class="functionalDomain">
-    <div class='functionalDomainContent'>
+    <div class='functionalDomainContent' id="functionalDomainContent">
 
       <!-- H5Canvas -->
       <app-working-area #canvas></app-working-area>

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

@@ -416,7 +416,15 @@ export class CollectionToolsComponent implements OnInit {
     this.getAllLibrary()
     this.getSitePlan()
     this.getAllBuildings()
-    
+
+    let that = this
+    window.setTimeout(()=>{
+      document.getElementById("functionalDomainContent").oncontextmenu = function (event) {
+        that.selectImageIndex = -1
+        event.preventDefault();
+       };
+    })
+  
   }
 
   
@@ -931,7 +939,9 @@ export class CollectionToolsComponent implements OnInit {
   backGroundScale () {
     let that = this
     let dad = document.querySelector('.functionalDomainContent').clientWidth
-    let imgWidth = dad - 460 //可是区域内 宽度
+    let left = document.querySelector('.functionalDomainLeft').clientWidth
+    let right = document.querySelector('.functionalDomainRight').clientWidth
+    let imgWidth = dad - left - right//可是区域内 宽度
     let img = new Image()
     img.src = this.selectingSitePlan.imageUrl;  
     img.onload = function(){
@@ -946,7 +956,7 @@ export class CollectionToolsComponent implements OnInit {
     isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
     isRefresh? this.isShowProperty = true : null
     isRefresh? this.isShowAttribute = true : null
-    this.selectingSitePlan.imageUrl? this.backGroundScale() : null
+    isRefresh && this.selectingSitePlan.imageUrl? this.backGroundScale() : null
 
     let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id
     let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 

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

@@ -24,7 +24,7 @@
     </div>
 
     <div class="keyMargin">
-      <textarea name="details" required [(ngModel)]="details" placeholder="详情"></textarea>
+      <textarea name="details" [(ngModel)]="details" placeholder="详情"></textarea>
     </div>
 
     <div class="submitBottom">

src/app/ui/collection-tools/panel.scss

@@ -17,20 +17,20 @@
   font-size: 15px;
   font-weight: 400;
   color: #000;
-  background: linear-gradient(to right,#c5c3c3,#868080);
-  // background: linear-gradient(to top,#cdced1,#FFF);
+  background: linear-gradient(to top,#cdced1,#FFF);
 }
 //平面图头部字体图标样式
 .hover {
   width: 18px;
   height: 18px;
-  margin-left: 40%;
-  border: 1px solid #fff;
+  margin-left: 90px;
+  border: 1px solid #999;
   border-radius: 3px;
-  .mat-icon {font-size: 18px; color: #fff;}
+  .mat-icon {font-size: 18px; color: #999;}
 }
 .hover:hover { 
   background-color: #4DA5FA;
+  .mat-icon {color: #fff;}
 }
 
 //平面图
@@ -50,7 +50,7 @@
 .a-upload {
   display: block;
   float: right;
-  margin: 8px 5px 0 0;
+  margin: 8px 18px 0 0;
   width: 20px;
   height: 20px;
   line-height: 20px;
@@ -112,10 +112,11 @@
   height: 100px;
   position: absolute;
   top: -32px;
-  right: -50.5px;
+  right: -48px;
+  z-index: 99999;
   border-radius: 0 100px 100px 0;
-  background-color: #cdced1;
-  // #F0F4F7
+  background-color: #F0F4F7;
+  // #F0F4F7 cdced1
   display: none;
   .functionButton {
     height: 25%;
@@ -124,6 +125,9 @@
   .bigFunctionIcon {
     font-size: 24px;
   }
+  .functionIcon {
+    color: #999;
+  }
   .functionIcon:hover {
     color: #4DA5FA;
   }