Merge remote-tracking branch 'origin/master'

@@ -167,6 +167,12 @@ export default {
             stroke: 'rgba(78,142,230,0.45)',
             stroke: 'rgba(78,142,230,0.45)',
           },
           },
         },
         },
+        //   defaultEdge: {
+        //       type: 'cubic-vertical',
+        //       style: {
+        //         stroke: '#F6BD16',
+        //       },
+        //   },
         nodeStateStyles: {
         nodeStateStyles: {
           selected: {
           selected: {
             stroke: '#d9d9d9',
             stroke: '#d9d9d9',
@@ -240,6 +246,38 @@ export default {
       getLshs(data).then((res)=>{
       getLshs(data).then((res)=>{
         if(res.code===200){
         if(res.code===200){
           _this.data=res.result;
           _this.data=res.result;
+          _this.data = {"nodes":[
+                  {"id":"836524edab33ab19bb0e0b4fd064cd77","dataType":"sql","name":"20201127宗地A",
+                        "conf":[{"label":"宗地代码","value":"610102123666GA10002"},{"label":"项目名称","value":"20201127宗地A"},
+                         {"label":"不动产单元号","value":"610102123666GA10002W00000000"},{"label":"坐落","value":"610102123666G10003W"},
+                            {"label":"权利人","value":""}]},
+                  {"id":"601130536a6bf6efc7a248af469e982c","dataType":"sql","name":"20201127宗地A222221",
+                      "conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地A222221"},
+                          {"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
+                  {"id":"c0818d9e4286b35b8ee9b96d90b522aa","dataType":"sql","name":"20201127宗地A2222222",
+                      "conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地A2222222"},
+                          {"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
+
+                  {"id":"601130536a6bf6efc7a248af469e982c1","dataType":"sql","name":"20201127宗地B",
+                      "conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地B"},
+                          {"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
+                  {"id":"c0818d9e4286b35b8ee9b96d90b522aa1","dataType":"sql","name":"20201127宗地B1",
+                      "conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地B1"},
+                          {"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
+
+                  {"id":"c0818d9e4286b35b8ee9b96d90b522aa12","dataType":"sql","name":"20201127宗地C",
+                      "conf":[{"label":"宗地代码","value":null},{"label":"项目名称","value":"20201127宗地C"},
+                          {"label":"不动产单元号","value":null},{"label":"坐落","value":null},{"label":"权利人","value":""}]},
+              ],
+
+              "edges":[
+                  {"source":"836524edab33ab19bb0e0b4fd064cd77","target":"601130536a6bf6efc7a248af469e982c"},
+                  {"source":"836524edab33ab19bb0e0b4fd064cd77","target":"c0818d9e4286b35b8ee9b96d90b522aa"},
+                  {"source":"c0818d9e4286b35b8ee9b96d90b522aa","target":"601130536a6bf6efc7a248af469e982c1"},
+                  {"source":"c0818d9e4286b35b8ee9b96d90b522aa","target":"c0818d9e4286b35b8ee9b96d90b522aa1"},
+                  {"source":"601130536a6bf6efc7a248af469e982c1","target":"c0818d9e4286b35b8ee9b96d90b522aa12"},
+                  {"source":"c0818d9e4286b35b8ee9b96d90b522aa1","target":"c0818d9e4286b35b8ee9b96d90b522aa12"},
+                  ]};
           this.initG6();
           this.initG6();
         }
         }
       })
       })
@@ -256,7 +294,7 @@ export default {
     }
     }
 
 
     #mountNode{
     #mountNode{
-       width: 100%;
+        margin-left: 15%;
     }
     }
 
 
     .slot{
     .slot{