Browse Source

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

YaolongHan 4 years ago
parent
commit
9a3acb8d57

+ 2 - 1
src/components/edit/left_toolbar.vue

@@ -604,7 +604,8 @@ export default {
   }
   .drawer-model {
     position: absolute;
-    left: 81px;
+    left: 80px;
+    border-left: 1px solid #e8e8e8;
     top: 0;
     overflow: hidden;
     width: 100%;

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

@@ -448,8 +448,8 @@ export class EditScence extends SGraphScene {
                 IconUrl: '/serve/topology-wanda/Picture/query/' + this._legend.Url,
                 Url: '/serve/topology-wanda/Picture/query/' + this._legend.Url,
                 Num: 1, // 此num与信息工程化得num无关
-                sWidth: 24,  //icon 的宽
-                sHeight: 24,   //icon 的高
+                sWidth: 32,  //icon 的宽
+                sHeight: 32,   //icon 的高
                 font: 12,    //font
                 color: '',  //字体颜色
                 GraphCategoryId: this._legend.GraphCategoryId,

File diff suppressed because it is too large
+ 1 - 1
src/lib/items/SImageMarkerItem.ts