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

@@ -66,6 +66,11 @@ export default {
 		LineTree,
 		Create,
 	},
+    provide(){
+        return{
+            getRightTree: this.getRightTree
+		}
+	},
 	data() {
 		return {
 			navigationList: [],
@@ -180,7 +185,7 @@ export default {
 		"$store.state.zrzbsm": function(bsm) {
 			this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
 		},
-		
+
 		"$store.state.treeData":function (val) {
 			console.log(val,'val');
 			this.pd = val;

@@ -217,6 +217,7 @@
             Qlr,
             Qlxz,
         },
+        inject:['getRightTree'],
         data () {
             return {
 
@@ -298,6 +299,7 @@
                 registerCall(data).then(res=>{
                     if (res.success) {
                         this.$message.success("登记成功")
+                        this.getRightTree(this.$store.state.zdbsm)
                     }
                 })
             },

@@ -8,9 +8,9 @@
 		@tab-click="handleClick">
 		<el-tab-pane class="eltabspane" v-if="!auth" label="宗地" name="zd">
 			<el-form :inline="true" :rules="rules" :model="ruleForm" ref="ruleForm" class="demo-form-inline">
-				<el-form-item label="行政区划" class="w100" required prop="xmmc">
+				<el-form-item label="行政区划" class="w100"  prop="xzqbsm">
 				 <el-col :span="7">
-					<el-form-item required prop="xzqbsm">
+					<el-form-item  prop="xzqbsm">
 						<el-select v-model="ruleForm.xzqbsm"  value-key="xzqbsm" placeholder="行政区" @change="changeXzq(ruleForm.xzqbsm)">
 							<el-option
 								v-for="item in xzq"
@@ -48,13 +48,13 @@
 					</el-form-item>
 				 </el-col>
 				</el-form-item>
-				<el-form-item label="项目名称" class="w100" required prop="xmmc">
+				<el-form-item label="项目名称" class="w100"  prop="xmmc">
 					<el-input
 						v-model="ruleForm.xmmc"
 						placeholder="项目名称"
 					></el-input>
 				</el-form-item>
-				<el-form-item label="所有权类型" class="w100" required prop="syqlxbsm">
+				<el-form-item label="所有权类型" class="w100"  prop="syqlxbsm">
 					<el-select
 						v-model="ruleForm.syqlxbsm"
 						placeholder="所有权类型"
@@ -68,7 +68,7 @@
 						</el-option>
 					</el-select>
 				</el-form-item>
-				<el-form-item label="特征码" class="w100" required prop="zdtzmbsm">
+				<el-form-item label="特征码" class="w100"  prop="zdtzmbsm">
 					<el-select
 						v-model="ruleForm.zdtzmbsm"
 						placeholder="宗地特征码"

@@ -141,7 +141,7 @@ export default {
       console.log(container)
       const graph = new G6.Graph({
         container: 'mountNode',
-        width:1000,
+        width:eWidth,
         height:1000,
         layout: {
           type: 'dagre',
@@ -190,25 +190,6 @@ export default {
           ],
         },
 
-        // modes: {
-        //   default: [
-        //     'drag-canvas',
-        //     'zoom-canvas',
-        //     'click-select',
-        //     {
-        //       type: 'tooltip',
-        //       formatText(model) {
-        //         const cfg = model.conf;
-        //         const text = [];
-        //         cfg.forEach((row) => {
-        //           text.push(row.label + ':' + row.value + '<br>');
-        //         });
-        //         return text.join('\n');
-        //       },
-        //       offset: -30,
-        //     },
-        //   ],
-        // },
         fitView: true,
       });
 
@@ -295,7 +276,8 @@ export default {
     }
 
     #mountNode{
-        height: calc(100% - 68px);
+        /*height: calc(100% - 68px);*/
+        margin-top: -60px;
     }
 
     .slot{

@@ -367,6 +367,7 @@ import {
 } from "../../../api/zd";
 
 export default {
+    inject:['getRightTree'],
 	name: "",
 	components: {
 		Qlr,
@@ -476,6 +477,7 @@ export default {
             registerCall(data).then(res=>{
                 if (res.success) {
                     this.$message.success("登记成功")
+                    this.getRightTree(this.$store.state.zdbsm)
                 }
             })
         },

@@ -299,6 +299,7 @@ export default {
 		hbj,
 		HCxlz,
 	},
+	inject:['getRightTree'],
 	props: {},
 	data() {
 		return {
@@ -413,6 +414,7 @@ export default {
             registerCall(data).then(res=>{
                 if (res.success) {
                     this.$message.success("登记成功")
+					this.getRightTree(this.$store.state.zdbsm)
                 }
             })
         },

@@ -283,7 +283,7 @@
             Qlr,
             Qlxz,
         },
-        inject:['reload'],
+        inject:['reload','getRightTree'],
         data () {
             return {
 
@@ -404,6 +404,7 @@
                 registerCall(data).then(res=>{
                     if (res.success) {
                         this.$message.success("登记成功")
+                        this.getRightTree(this.$store.state.zdbsm)
                     }
                 })
             },