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

-<template>
+<template >
   <div class="lshs-content">
-<!--      <div class="slot">-->
-<!--          <div><span class="tip-title">范围属性变更：</span></div>-->
-<!--          <div><span class="tip-title">宗地分割：</span></div>-->
-<!--          <div><span class="tip-title">宗地合并：</span></div>-->
-<!--      </div>-->
     <div id="mountNode" ref="containerWidth"></div>
     <div id="mountNodeRight">
         <div><span class="tip-title">详细信息</span></div>
@@ -15,12 +10,16 @@
                 <el-col :span="18"><div class="grid-right">{{result.xmmc}}</div></el-col>
             </el-row>
             <el-row>
+                <el-col :span="6"><div class="grid-left">宗地代码</div></el-col>
+                <el-col :span="18"><div class="grid-right">{{result.zddm}}</div></el-col>
+            </el-row>
+            <el-row>
                 <el-col :span="6"><div class="grid-left">不动产单元号</div></el-col>
                 <el-col :span="18"><div class="grid-right">{{result.bdcdyh}}</div></el-col>
             </el-row>
             <el-row>
-                <el-col :span="6"><div class="grid-left">宗地代码</div></el-col>
-                <el-col :span="18"><div class="grid-right">{{result.zddm}}</div></el-col>
+                <el-col :span="6"><div class="grid-left">不动产权证号</div></el-col>
+                <el-col :span="18"><div class="grid-right">{{result.bdcdyh}}</div></el-col>
             </el-row>
             <el-row>
                 <el-col :span="6"><div class="grid-left">自然幢号</div></el-col>
@@ -29,43 +28,41 @@
             <el-row>
                 <el-col :span="6"><div class="grid-left">权利人</div></el-col>
                 <el-col :span="18"><div class="grid-right">{{result.qlr}}</div></el-col>
-            </el-row>            <el-row>
-            <el-col :span="6"><div class="grid-left">用途</div></el-col>
-            <el-col :span="18"><div class="grid-right">{{result.fwyt}}</div></el-col>
             </el-row>           
             <el-row>
                 <el-col :span="6"><div class="grid-left">权利性质</div></el-col>
                 <el-col :span="18"><div class="grid-right">{{result.qlxz}}</div></el-col>
             </el-row>
+
+            <el-row>
+                <el-col :span="6"><div class="grid-left">土地用途</div></el-col>
+                <el-col :span="18"><div class="grid-right">{{result.fwyt}}</div></el-col>
+            </el-row>
             <el-row>
                 <el-col :span="6"><div class="grid-left">坐落</div></el-col>
                 <el-col :span="18"><div class="grid-right">{{result.zl}}</div></el-col>
             </el-row>
             <el-row>
-                <el-col :span="6"><div class="grid-left">宗地四至</div></el-col>
-                <el-col :span="18">
-                    <div class="grid-content" style="">
+                <el-col :span="6"><div class="grid-left">宗地面积</div></el-col>
+                <el-col :span="18"><div class="grid-right">{{result.zdmj}}</div></el-col>
+            </el-row>
             <el-row>
-                            <el-col :span="6"><div class="grid-left">北至</div></el-col>
+                <el-col :span="6"><div class="grid-left">宗地四至-北至</div></el-col>
                 <el-col :span="18"><div class="grid-right">{{result.zdszb}}</div></el-col>
             </el-row>
             <el-row>
-                            <el-col :span="6"><div class="grid-left">东至</div></el-col>
+                <el-col :span="6"><div class="grid-left">宗地四至-东至</div></el-col>
                 <el-col :span="18"><div class="grid-right">{{result.zdszd}}</div></el-col>
             </el-row>
             <el-row>
-                            <el-col :span="6"><div class="grid-left">南至</div></el-col>
+                <el-col :span="6"><div class="grid-left">宗地四至-南至</div></el-col>
                 <el-col :span="18"><div class="grid-right">{{result.zdszn}}</div></el-col>
             </el-row>
             <el-row>
-                            <el-col :span="6"><div class="grid-left">西至</div></el-col>
+                <el-col :span="6"><div class="grid-left">宗地四至-西至</div></el-col>
                 <el-col :span="18"><div class="grid-right">{{result.zdszx}}</div></el-col>
             </el-row>
         </div>
-                </el-col>
-            </el-row>
-
-        </div>
     </div>
   </div>
 </template>
@@ -122,8 +119,8 @@ export default {
       const eWidth = this.$refs.containerWidth.clientWidth;
       const eHeight = this.$refs.containerWidth.clientHeight;
 
-      console.log(eWidth+":width")
-      console.log(eHeight+":height")
+      // console.log(eWidth+":width")
+      // console.log(eHeight+":height")
 
       G6.registerNode(
         'sql',
@@ -310,8 +307,14 @@ export default {
           getLshs(data).then((res)=>{
             if(res.code===200){
               _this.data=res.result;
+              //_this.data.nodes.length;// 判断个数
+              if(_this.data.nodes.length==0){
+                //暂无变更业务，没有历史回溯数据。
+
+              }else{
                 this.initG6();
               }              
+            }
           });
         switch (this.type) {
             case "zrz":
@@ -353,9 +356,11 @@ export default {
 
     #mountNode{
         /*height: calc(100% - 68px);*/
-        margin-top: 20px;
+        margin: 20px 0 0 20px;
         width: 50%;
         height: 80%;
+        border: 1px solid #E6E6E6;
+        background: white;
 
         position:absolute;
         float: left;
@@ -366,8 +371,8 @@ export default {
         margin: 20px 20px 0 0;
         width: 36%;
         float: right;
-        height: 800px;
-        border: 1px solid #5ebbff;
+        height: 100%;
+        border: 1px solid #E6E6E6;
         background: white;
         padding: 20px 20px 0 20px;
     }