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

@@ -37,7 +37,7 @@ export function saveZrzInfo(data) {
 }
 
 /**
- * 保存自然幢信息
+ * 根据bsm查询自然幢基本信息
  */
 export function getZrzDetailByBsm(data) {
     return request({
@@ -50,6 +50,20 @@ export function getZrzDetailByBsm(data) {
 }
 
 /**
+ * 根据bsm查询自然幢基本信息-历史回溯
+ */
+export function getZrzDetailByBsmBylshs(data) {
+    return request({
+        url: '/fw/qjZrz/getQjZrzDetailByIdBylshs',
+        method: 'get',
+        params: {
+            id: data
+        }
+    })
+}
+
+
+/**
  * 新增权籍_建筑物区分所有权业主共有部分调查表
  */
 export function saveYzgy(data) {

@@ -76,7 +76,7 @@
   import insertCss from 'insert-css';
   import { getLshs } from "@api/fwsxbg";
   import { getQjZdjbxxDetailByIdBylshs } from "@api/zd";
-  import { getZrzDetailByBsm } from "@api/zrz";
+  import { getZrzDetailByBsmBylshs } from "@api/zrz";
   import { getDzDetailByBsm } from "@api/dz";
 
 export default {
@@ -115,6 +115,7 @@ export default {
   },
   mounted(){
     this.getLshsData();
+
   },
   methods: {
     initG6() {
@@ -122,9 +123,8 @@ export default {
       const data = this.data;
       const eWidth = this.$refs.containerWidth.clientWidth;
       const eHeight = this.$refs.containerWidth.clientHeight;
-
-      // console.log(eWidth+":width")
-      // console.log(eHeight+":height")
+      const mountNodeRight1=document.getElementById('mountNodeRight');
+      mountNodeRight1.style.height=eHeight-20+'px';
 
       G6.registerNode(
         'sql',
@@ -179,11 +179,14 @@ export default {
         'polyline',
       );
 
+
+      //鼠标移动 弹出界面
       const tooltip = new G6.Tooltip({
         offsetX: 10,
         offsetY: 10,
         itemTypes: ['node', 'edge'],
         getContent: (e) => {
+          debugger;
           const outDiv = document.createElement('div');
           outDiv.style.width = 'fit-content';
           outDiv.innerHTML = `
@@ -199,8 +202,9 @@ export default {
         },
       });
 
+
       const container = document.getElementById('mountNode');
-      console.log(container)
+      // console.log(container)
       const graph = new G6.Graph({
         container: 'mountNode',
         width:eWidth,
@@ -222,13 +226,14 @@ export default {
             endArrow: true,
             radius: 10,
             offset: 10,
+            // fontSize:14,
             // endArrow: true,
-            lineWidth: 2,
+            lineWidth: 2,       //箭头宽度
             stroke: 'rgba(78,142,230,0.45)',
           },
         },
         nodeStateStyles: {
-          selected: {
+          selected: {//选中之后样式
             stroke: '#d9d9d9',
             fill: '#5394ef',
           },
@@ -253,15 +258,13 @@ export default {
       graph.on('node:click', e => {
           switch (this.type) {
               case "zrz":
-                  getZrzDetailByBsm(e.item._cfg.id).then((res)=>{
+                  getZrzDetailByBsmBylshs(e.item._cfg.id).then((res)=>{
                       if(res.code === 200){
                           self.result = res.result;
                       }
                   })
                   break;
               case "zd":
-                            debugger;
-
                   getQjZdjbxxDetailByIdBylshs(e.item._cfg.id).then((res)=>{
                       if(res.code === 200){
                           self.result = res.result;
@@ -325,7 +328,7 @@ export default {
           });
         switch (this.type) {
             case "zrz":
-                getZrzDetailByBsm(this.bsm).then((res)=>{
+                getZrzDetailByBsmBylshs(this.bsm).then((res)=>{
                     if(res.code === 200){
                         this.result = res.result;
                     }
@@ -378,7 +381,7 @@ export default {
         margin: 20px 20px 0 0;
         width: 36%;
         float: right;
-        height: 100%;
+        height: 80%;
         border: 1px solid #E6E6E6;
         background: white;
         padding: 20px 20px 0 20px;

@@ -332,7 +332,7 @@ export default {
 								this.close();
 								// 根据res.processInstance.businessId去查询zdbsm TODO
 
-								// this.$store.state.zdbsm = res.result;
+								this.$store.state.zdbsm = res.processInstance.title;
 								// todo 跳转到宗地基本信息内容表页面  (预留)
 								this.close();
 								this.$router.push({

@@ -273,7 +273,7 @@
 
             </table>
 			<div class="header-button" :style="{width:mainBoxWidth+'px'}">
-				<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont el-icon-search">保存</el-button>
+				<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun">保存</el-button>
 				<el-button type="primary" @click="onSubmit" :disabled="disabled">提交</el-button>
 				<el-button type="primary" @click="registerCall">登记调用</el-button>
 				<!-- <el-button type="primary" class="saveBtn"  @click="save">保存</el-button> -->