debug

src/components/editClass/big-edit/items/SBaseLineEdit.ts

@@ -58,12 +58,16 @@ export class SBaseLineEdit extends SLineEdit {
             }
             // 颜色
             if (data.Style.StrokeColor) {
-                this.strokeColor = data.Style.StrokeColor
+                this.strokeColor = new SColor(data.Style.StrokeColor)
             }
             // 线宽
             if (data.Style.LineWidth) {
                 this.lineWidth = data.Style.LineWidth
             }
+            // 线样式
+            if (data.Style.LineStyle) {
+                this.lineStyle = data.Style.LineStyle
+            }
         }
 
     }
@@ -83,7 +87,7 @@ export class SBaseLineEdit extends SLineEdit {
         this.data.Style.Line = Line;
         this.data.Style.StrokeColor = this.strokeColor.value;
         this.data.Style.LineWidth = this.lineWidth;
-        // this.data.Style.
+        this.data.Style.LineStyle = this.lineStyle
         return this.data
     }
 }

src/components/editClass/persagy-edit/PTopoParser.ts

@@ -69,6 +69,7 @@ export class PTopoParser extends SParser {
     } // Function parseData()
     addMarker(data: Marker) {
         if (data.Properties.Type == "BaseLine") {
+            // const item = this.factory.createBaseLineEdit(data);
             this.Markers.push(this.factory.createBaseLineEdit(data))
         }
     }

src/components/editClass/persagy-edit/PTopoScene.ts

@@ -429,10 +429,8 @@ export class PTopoScene extends SBaseEditScene {
         const Markers: any = [];   /**图例节点 */  // 与工程信息无关的标识对象（增加文本注释，图上的图片说明）
         const Nodes: any = [];   /**图例节点 */  // 与工程信息无关的标识对象（增加文本注释，图上的图片说明）
         const Relations: any = [];   /**图例节点 */  // 与工程信息无关的标识对象（增加文本注释，图上的图片说明）
-        console.log('this.root.children', this.root.children)
         this.root.children.forEach(item => {
             if (!(item instanceof SGraphSelectContainer) && MarkType.includes(item.data.Properties.Type)) {
-                console.log('item.toData()', item.toData())
                 Markers.push(item.toData())
             }
         });

src/components/editview/baseTopoEditer.vue

@@ -6,7 +6,6 @@
 </template>
 <script>
 import { PTopoScene, PTopoParser } from "@/components/editClass/persagy-edit";
-// import { BaseLineEdit } from "@/components/editClass/big-edit";
 import { SGraphView } from "@persagy-web/graph";
 import topoTooltip from "./topoTooltip.vue";
 import { mapState, mapMutations } from "vuex";
@@ -80,7 +79,6 @@ export default {
     initBusEvent() {
       // 改变样式
       bus.$on("updateStyle", (type, val) => {
-        console.log("aaaaaaaaa", type, val);
         this.scene.updateStyle(type, val);
       });
       // 撤销
@@ -126,6 +124,11 @@ export default {
             ],
           },
         };
+        Object.assign(obj, {
+          GraphId: "6500f7d6db5a40d4be4313ea654b1373",
+          Id: "d6c1926ee74b438d87c6b06fec9806c6",
+        });
+        console.log(obj);
         saveGroup(obj).then((res) => {
           console.log("res", res);
         });

src/components/editview/rightPropertyBar/BaseExplainPro.vue

@@ -2,7 +2,7 @@
 <!-- 基本图片的属性框 -->
 <template>
   <div class="base-image">
-    <div class="title">属性</div>
+    <!-- <div class="title">属性</div>
     <ul>
       <li>
         <div class="small-title">尺寸大小</div>
@@ -69,14 +69,12 @@
           </div>
         </div>
       </li>
-    </ul>
+    </ul> -->
   </div>
 </template>
 <script>
 import bus from "@/bus/bus";
-// import { Select } from 'ant-design-vue';
 export default {
-  // components:{Select},
   data() {
     return {
       size: 12, //font-size

src/components/editview/rightPropertyBar/BaseImagePro.vue

@@ -1,7 +1,7 @@
 <!-- 基本图片的属性框 -->
 <template>
   <div class="base-image">
-    <div class="title">属性</div>
+    <!-- <div class="title">属性</div>
     <ul>
       <li>
         <div class="small-title">尺寸大小</div>
@@ -47,7 +47,7 @@
           </div>
         </div>
       </li>
-    </ul>
+    </ul> -->
   </div>
 </template>
 <script>

src/components/editview/rightPropertyBar/baseTextPro.vue

@@ -8,7 +8,7 @@
         <div class="property">
           <div class="color-box">
             <div class="cololorSelect">
-              <el-color-picker change class="fix-box-1" v-model="strokeColor"></el-color-picker>
+              <el-color-picker change class="fix-box-1" v-model="color"></el-color-picker>
             </div>
             <span>颜色</span>
           </div>

src/components/editview/topToolBar.vue

@@ -100,7 +100,7 @@
           <span>打散</span>
         </li>-->
         <li>
-          <Icon color="#646A73" :name="isLock?'lock':'unlock'" />
+          <i :class="isLock?'el-icon-lock':'el-icon-unlock'" />
           <span>{{!isLock?"解锁":"锁定"}}</span>
         </li>
         <li @click="deleteItem">
@@ -118,7 +118,9 @@
 import bus from "@/bus/bus";
 export default {
   data() {
-    return {};
+    return {
+      isLock: false,
+    };
   },
   methods: {
     //撤销