Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -53,8 +53,12 @@ export default {
   methods: {
   methods: {
     initG6() {
     initG6() {
       const data = this.data;
       const data = this.data;
-      const eWidth = this.$refs.containerWidth.clientWidth
+      const eWidth = this.$refs.containerWidth.clientWidth;
+      const eHeight = this.$refs.containerWidth.clientHeight;
+
       console.log(eWidth+":width")
       console.log(eWidth+":width")
+      console.log(eHeight+":height")
+
       G6.registerNode(
       G6.registerNode(
         'sql',
         'sql',
         {
         {
@@ -128,7 +132,7 @@ export default {
       const graph = new G6.Graph({
       const graph = new G6.Graph({
         container: 'mountNode',
         container: 'mountNode',
         width:eWidth,
         width:eWidth,
-        height:1000,
+        height:eHeight,
         layout: {
         layout: {
           type: 'dagre',
           type: 'dagre',
           nodesepFunc: (d) => {
           nodesepFunc: (d) => {
@@ -222,8 +226,11 @@ export default {
 
 
     #mountNode{
     #mountNode{
         /*height: calc(100% - 68px);*/
         /*height: calc(100% - 68px);*/
-        margin-top: -60px;
+        margin-top: 20px;
         width: 60%;
         width: 60%;
+        height: 80%;
+
+        position:absolute;
         float: left;
         float: left;
     }
     }