Преглед изворни кода

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-editer into develop

haojianlong пре 4 година
родитељ
комит
979620eb43
3 измењених фајлова са 27 додато и 8 уклоњено
  1. 18 0
      src/components/edit/left_toolbar.vue
  2. 8 8
      src/components/mapClass/EditScence.ts
  3. 1 0
      src/views/drafts.vue

+ 18 - 0
src/components/edit/left_toolbar.vue

@@ -73,6 +73,9 @@
     </a-popover>
 
     <!-- 打开弹窗 -->
+    <div class="drawer-close" v-show="visible" @click="onClose" :style="{opacity: visible? 1: 0, }">
+      <a-icon type="left" style="color: #8D9399;font-size: 10px" />
+    </div>
     <transition name="fade">
       <div class="drawer-model" id="drawer-model" v-show="visible">
         <a-drawer
@@ -603,6 +606,21 @@ export default {
   .fade-leave-to {
     transition: all 0.3s ease;
   }
+ 
+ 
+  .drawer-close {
+      width: 10px;
+      height: 20px;
+      position: absolute;
+      background-color: #E4E5E7;
+      top: 8px;
+      left: 350px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      cursor: pointer;
+      transition: opacity 0s linear 0.3s;
+    }
   .drawer-model {
     position: absolute;
     left: 80px;

+ 8 - 8
src/components/mapClass/EditScence.ts

@@ -276,8 +276,8 @@ export class EditScence extends SGraphScene {
                 FillColor: this._legend.FillColor,
                 LineDash: this._legend.LineDash,
                 LineWidth: this._legend.LineWidth,
-                font: 0,
-                color: '',
+                font: 14,
+                color: '#646A73',
                 TextPos: { X: 0, Y: 0 },
                 InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[],
                 InfoSystemId:this._legend.InfoSystemId ? this._legend.InfoSystemId :'',
@@ -333,8 +333,8 @@ export class EditScence extends SGraphScene {
                     FillColor: this._legend.FillColor,
                     LineDash: this._legend.LineDash,
                     LineWidth: this._legend.LineWidth,
-                    font: 12,
-                    color: '',
+                    font: 14,
+                    color: '#646A73',
                     FID: item.data.SourceId,
                     TextPos: { X: item.data.Location.Points[0].X, Y: -item.data.Location.Points[0].Y },
                     InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[],
@@ -411,8 +411,8 @@ export class EditScence extends SGraphScene {
             Properties: {
                 IconUrl: require(`../../assets/images/t-text-hover.png`),
                 Text: '请在右侧属性栏输入文字!',
-                Color: '',
-                Font: 12,
+                Color: '#646A73',
+                Font: 14,
                 BackgroundColor: '#f7f9fa'
             }
         }
@@ -453,8 +453,8 @@ export class EditScence extends SGraphScene {
                 Num: 1, // 此num与信息工程化得num无关
                 sWidth: 32,  //icon 的宽
                 sHeight: 32,   //icon 的高
-                font: 12,    //font
-                color: '',  //字体颜色
+                font: 14,    //font
+                color: '#646A73',  //字体颜色
                 FrameColor: this._legend.FrameColor,
                 GraphCategoryId: this._legend.GraphCategoryId,
                 InfoSystemId:this._legend.InfoSystemId ? this._legend.InfoSystemId :'' ,

+ 1 - 0
src/views/drafts.vue

@@ -632,6 +632,7 @@ export default {
           top: 0;
           width: 200px;
           border-left: 1px solid #eff0f1;
+          background-color: #ffffff;
           height: 100%;
           overflow-y: scroll;
         }