Browse Source

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

YaolongHan 4 years ago
parent
commit
6b31d85114
1 changed files with 6 additions and 4 deletions
  1. 6 4
      src/components/baseEditer.vue

+ 6 - 4
src/components/baseEditer.vue

@@ -437,8 +437,9 @@ export default {
                           Width: val.age.Size?val.age.Size.Width?val.age.Size.Width:32:32,  //icon 的宽
                           Height: val.age.Size?val.age.Size.Height?val.age.Size.Height:32:32,   //icon 的高
                         },
-                        font: 14,    //font
+                        font: 16,    //font
                         color: "#1F2429",  //字体颜色
+                        FrameColor: val.age.FrameColor,
                         GraphCategoryId: val.age.GraphCategoryId,
                         InfoSystemId: val.age.InfoSystemId?val.age.InfoSystemId:'',   //信息工程话分类ID分类
                         FID: t.data.SourceId,
@@ -472,7 +473,7 @@ export default {
                     AttachObjectIds: [],
                     Pos: { x: t.x, y: t.y },
                     OutLine: t.pointArr[0],
-                    SubType: "",
+                    SubType: val.age.SubType,
                     Properties: {
                       IconUrl:
                         "/serve/topology-wanda/Picture/query/" + val.age.Url,
@@ -481,9 +482,10 @@ export default {
                         : "", //信息工程话分类ID分类
                       StrokeColor: val.age.Color,
                       FillColor: val.age.FillColor,
+                      LineWidth: val.age.LineWidth,
                       LineDash: val.age.LineDash,
-                      font: 20,
-                      color: "#646A73",
+                      font: 14,
+                      color: "#1F2429",
                       TextPos: { X: 0, Y: 0 },
                       FID: t.data.SourceId,
                       InfoTypeId: val.age.InfoTypeId.length