Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
09d5079e by 杨威
Options

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

2 parents b2fe4b48 af4c6928
Inline Side-by-side
Showing 7 changed files with 21 additions and 27 deletions
...@@ -66,6 +66,11 @@ export default { ...@@ -66,6 +66,11 @@ export default {
66 LineTree, 66 LineTree,
67 Create, 67 Create,
68 }, 68 },
69 provide(){
70 return{
71 getRightTree: this.getRightTree
72 }
73 },
69 data() { 74 data() {
70 return { 75 return {
71 navigationList: [], 76 navigationList: [],
......
...@@ -217,6 +217,7 @@ ...@@ -217,6 +217,7 @@
217 Qlr, 217 Qlr,
218 Qlxz, 218 Qlxz,
219 }, 219 },
220 inject:['getRightTree'],
220 data () { 221 data () {
221 return { 222 return {
222 223
...@@ -298,6 +299,7 @@ ...@@ -298,6 +299,7 @@
298 registerCall(data).then(res=>{ 299 registerCall(data).then(res=>{
299 if (res.success) { 300 if (res.success) {
300 this.$message.success("登记成功") 301 this.$message.success("登记成功")
302 this.getRightTree(this.$store.state.zdbsm)
301 } 303 }
302 }) 304 })
303 }, 305 },
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
8 @tab-click="handleClick"> 8 @tab-click="handleClick">
9 <el-tab-pane class="eltabspane" v-if="!auth" label="宗地" name="zd"> 9 <el-tab-pane class="eltabspane" v-if="!auth" label="宗地" name="zd">
10 <el-form :inline="true" :rules="rules" :model="ruleForm" ref="ruleForm" class="demo-form-inline"> 10 <el-form :inline="true" :rules="rules" :model="ruleForm" ref="ruleForm" class="demo-form-inline">
11 <el-form-item label="行政区划" class="w100" required prop="xmmc"> 11 <el-form-item label="行政区划" class="w100" prop="xzqbsm">
12 <el-col :span="7"> 12 <el-col :span="7">
13 <el-form-item required prop="xzqbsm"> 13 <el-form-item prop="xzqbsm">
14 <el-select v-model="ruleForm.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(ruleForm.xzqbsm)"> 14 <el-select v-model="ruleForm.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(ruleForm.xzqbsm)">
15 <el-option 15 <el-option
16 v-for="item in xzq" 16 v-for="item in xzq"
...@@ -48,13 +48,13 @@ ...@@ -48,13 +48,13 @@
48 </el-form-item> 48 </el-form-item>
49 </el-col> 49 </el-col>
50 </el-form-item> 50 </el-form-item>
51 <el-form-item label="项目名称" class="w100" required prop="xmmc"> 51 <el-form-item label="项目名称" class="w100" prop="xmmc">
52 <el-input 52 <el-input
53 v-model="ruleForm.xmmc" 53 v-model="ruleForm.xmmc"
54 placeholder="项目名称" 54 placeholder="项目名称"
55 ></el-input> 55 ></el-input>
56 </el-form-item> 56 </el-form-item>
57 <el-form-item label="所有权类型" class="w100" required prop="syqlxbsm"> 57 <el-form-item label="所有权类型" class="w100" prop="syqlxbsm">
58 <el-select 58 <el-select
59 v-model="ruleForm.syqlxbsm" 59 v-model="ruleForm.syqlxbsm"
60 placeholder="所有权类型" 60 placeholder="所有权类型"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
68 </el-option> 68 </el-option>
69 </el-select> 69 </el-select>
70 </el-form-item> 70 </el-form-item>
71 <el-form-item label="特征码" class="w100" required prop="zdtzmbsm"> 71 <el-form-item label="特征码" class="w100" prop="zdtzmbsm">
72 <el-select 72 <el-select
73 v-model="ruleForm.zdtzmbsm" 73 v-model="ruleForm.zdtzmbsm"
74 placeholder="宗地特征码" 74 placeholder="宗地特征码"
......
...@@ -141,7 +141,7 @@ export default { ...@@ -141,7 +141,7 @@ export default {
141 console.log(container) 141 console.log(container)
142 const graph = new G6.Graph({ 142 const graph = new G6.Graph({
143 container: 'mountNode', 143 container: 'mountNode',
144 width:1000, 144 width:eWidth,
145 height:1000, 145 height:1000,
146 layout: { 146 layout: {
147 type: 'dagre', 147 type: 'dagre',
...@@ -190,25 +190,6 @@ export default { ...@@ -190,25 +190,6 @@ export default {
190 ], 190 ],
191 }, 191 },
192 192
193 // modes: {
194 // default: [
195 // 'drag-canvas',
196 // 'zoom-canvas',
197 // 'click-select',
198 // {
199 // type: 'tooltip',
200 // formatText(model) {
201 // const cfg = model.conf;
202 // const text = [];
203 // cfg.forEach((row) => {
204 // text.push(row.label + ':' + row.value + '<br>');
205 // });
206 // return text.join('\n');
207 // },
208 // offset: -30,
209 // },
210 // ],
211 // },
212 fitView: true, 193 fitView: true,
213 }); 194 });
214 195
...@@ -295,7 +276,8 @@ export default { ...@@ -295,7 +276,8 @@ export default {
295 } 276 }
296 277
297 #mountNode{ 278 #mountNode{
298 height: calc(100% - 68px); 279 /*height: calc(100% - 68px);*/
280 margin-top: -60px;
299 } 281 }
300 282
301 .slot{ 283 .slot{
......
...@@ -367,6 +367,7 @@ import { ...@@ -367,6 +367,7 @@ import {
367 } from "../../../api/zd"; 367 } from "../../../api/zd";
368 368
369 export default { 369 export default {
370 inject:['getRightTree'],
370 name: "", 371 name: "",
371 components: { 372 components: {
372 Qlr, 373 Qlr,
...@@ -476,6 +477,7 @@ export default { ...@@ -476,6 +477,7 @@ export default {
476 registerCall(data).then(res=>{ 477 registerCall(data).then(res=>{
477 if (res.success) { 478 if (res.success) {
478 this.$message.success("登记成功") 479 this.$message.success("登记成功")
480 this.getRightTree(this.$store.state.zdbsm)
479 } 481 }
480 }) 482 })
481 }, 483 },
......
...@@ -299,6 +299,7 @@ export default { ...@@ -299,6 +299,7 @@ export default {
299 hbj, 299 hbj,
300 HCxlz, 300 HCxlz,
301 }, 301 },
302 inject:['getRightTree'],
302 props: {}, 303 props: {},
303 data() { 304 data() {
304 return { 305 return {
...@@ -413,6 +414,7 @@ export default { ...@@ -413,6 +414,7 @@ export default {
413 registerCall(data).then(res=>{ 414 registerCall(data).then(res=>{
414 if (res.success) { 415 if (res.success) {
415 this.$message.success("登记成功") 416 this.$message.success("登记成功")
417 this.getRightTree(this.$store.state.zdbsm)
416 } 418 }
417 }) 419 })
418 }, 420 },
......
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
283 Qlr, 283 Qlr,
284 Qlxz, 284 Qlxz,
285 }, 285 },
286 inject:['reload'], 286 inject:['reload','getRightTree'],
287 data () { 287 data () {
288 return { 288 return {
289 289
...@@ -404,6 +404,7 @@ ...@@ -404,6 +404,7 @@
404 registerCall(data).then(res=>{ 404 registerCall(data).then(res=>{
405 if (res.success) { 405 if (res.success) {
406 this.$message.success("登记成功") 406 this.$message.success("登记成功")
407 this.getRightTree(this.$store.state.zdbsm)
407 } 408 }
408 }) 409 })
409 }, 410 },
......