Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
aee9af55 by 焦泽平
Options

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

2 parents 99354aa1 1b0d010a
Expand all
Inline Side-by-side
Showing 6 changed files with 5 additions and 79 deletions
...@@ -38,11 +38,6 @@ ...@@ -38,11 +38,6 @@
38 <el-tooltip class="item" effect="light" content="定位" placement="top"> 38 <el-tooltip class="item" effect="light" content="定位" placement="top">
39 <i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i> 39 <i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i>
40 </el-tooltip> 40 </el-tooltip>
41 <!-- <el-button type="text" size="small"
42 >办理
43 </el-button
44 >
45 <el-button type="text" size="small">定位</el-button> -->
46 </template> 41 </template>
47 </el-table-column> 42 </el-table-column>
48 </el-table> 43 </el-table>
...@@ -52,15 +47,6 @@ ...@@ -52,15 +47,6 @@
52 </el-pagination> 47 </el-pagination>
53 </div> 48 </div>
54 49
55 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
56 <hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
57 <div class="btnGroup">
58 <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
59 <el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
60 <el-button type="primary" @click="hbjResetInfo">重置</el-button>
61 <el-button type="primary" @click="hbjVisible = false">取消</el-button>
62 </div>
63 </el-dialog>
64 </div> 50 </div>
65 </div> 51 </div>
66 </template> 52 </template>
...@@ -68,11 +54,10 @@ ...@@ -68,11 +54,10 @@
68 <script> 54 <script>
69 import SearchHead from "../../../components/searchHead/searchHead"; 55 import SearchHead from "../../../components/searchHead/searchHead";
70 import {getSearchList} from "../../../api/search"; 56 import {getSearchList} from "../../../api/search";
71 import hbj from "./../../zrz/lpb/bjlp/hbj/index";
72 57
73 export default { 58 export default {
74 name: "", 59 name: "",
75 components: {SearchHead,hbj}, 60 components: {SearchHead},
76 props: {}, 61 props: {},
77 data() { 62 data() {
78 return { 63 return {
...@@ -82,9 +67,6 @@ ...@@ -82,9 +67,6 @@
82 tableData: [], 67 tableData: [],
83 tableHeight: 0, 68 tableHeight: 0,
84 queryData: {}, 69 queryData: {},
85 hbjVisible: false,
86 hbsm:'',
87 tabPosition: "1", //1是实测 0是预测
88 }; 70 };
89 }, 71 },
90 created() { 72 created() {
...@@ -106,20 +88,6 @@ ...@@ -106,20 +88,6 @@
106 return ""; 88 return "";
107 } 89 }
108 }, 90 },
109 //户保存
110 hbjSaveInfo() {
111 this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
112 this.getData({pageSize:15});
113 },
114 //户提交
115 hbjSubmitInfo() {
116 this.$refs.hbj.onSubmit(this.hbsm, this.tabPosition);
117 this.getData({pageSize:15});
118 },
119 //户编辑表单重置
120 hbjResetInfo() {
121 this.$refs.hbj.onReset();
122 },
123 handleCurrentChange(val) { 91 handleCurrentChange(val) {
124 this.pageNo = val; 92 this.pageNo = val;
125 this.queryData.pageNo = val; 93 this.queryData.pageNo = val;
...@@ -159,17 +127,6 @@ ...@@ -159,17 +127,6 @@
159 case "h": 127 case "h":
160 case "h0": 128 case "h0":
161 case "h1": 129 case "h1":
162 this.hbsm = row.glbsm;
163 this.hbjVisible = true;
164 if(row.dylx === "h0"){
165 this.tabPosition = 0;
166 }else {
167 this.tabPosition = 1;
168 }
169 this.$nextTick(()=>{
170 console.log(this.$refs.hbj);
171 this.$refs.hbj.getHInfo(this.hbsm);
172 });
173 path="/h"; 130 path="/h";
174 this.$store.state.hbsm=row.glbsm 131 this.$store.state.hbsm=row.glbsm
175 break; 132 break;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
4 <el-tab-pane label="户基本信息表" name="hjbxx"> 4 <el-tab-pane label="户基本信息表" name="hjbxx">
5 <hbj ></hbj> 5 <hbj :bsm="hbsm"></hbj>
6 </el-tab-pane> 6 </el-tab-pane>
7 <el-tab-pane label="登记簿" name="djb"> 7 <el-tab-pane label="登记簿" name="djb">
8 <djb v-if="djbVisible"></djb> 8 <djb v-if="djbVisible"></djb>
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
26 }, 26 },
27 data() { 27 data() {
28 return { 28 return {
29 hbsm:this.$store.state.hbsm,
29 activeName: "hjbxx", 30 activeName: "hjbxx",
30 djbVisible: false, 31 djbVisible: false,
31 fjclVisible: false, 32 fjclVisible: false,
......
...@@ -95,8 +95,8 @@ export default { ...@@ -95,8 +95,8 @@ export default {
95 ); 95 );
96 96
97 const tooltip = new G6.Tooltip({ 97 const tooltip = new G6.Tooltip({
98 offsetX: 210, 98 offsetX: 10,
99 offsetY: 210, 99 offsetY: 10,
100 itemTypes: ['node', 'edge'], 100 itemTypes: ['node', 'edge'],
101 getContent: (e) => { 101 getContent: (e) => {
102 const outDiv = document.createElement('div'); 102 const outDiv = document.createElement('div');
......
...@@ -257,13 +257,6 @@ ...@@ -257,13 +257,6 @@
257 <!-- 双击户的弹出框 --> 257 <!-- 双击户的弹出框 -->
258 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center> 258 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
259 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj> 259 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
260 <div class="btnGroup">
261 <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
262 <el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
263 <el-button type="primary" @click="hbjResetInfo">重置</el-button>
264 <el-button type="primary" @click="hbjVisible = false">取消</el-button>
265 <el-button type="primary" @click="registerCall">登记调用</el-button>
266 </div>
267 </el-dialog> 260 </el-dialog>
268 </div> 261 </div>
269 </template> 262 </template>
...@@ -281,7 +274,6 @@ import addZdy from "./zdy/index"; ...@@ -281,7 +274,6 @@ import addZdy from "./zdy/index";
281 import addCh from "./ch/index"; 274 import addCh from "./ch/index";
282 import hbj from "./hbj/index"; 275 import hbj from "./hbj/index";
283 import lpbContent from "./lpbContent/index"; 276 import lpbContent from "./lpbContent/index";
284 import {registerCall} from "../../../../api/common";
285 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "../../../../api/lpb"; 277 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "../../../../api/lpb";
286 278
287 export default { 279 export default {
...@@ -406,18 +398,6 @@ export default { ...@@ -406,18 +398,6 @@ export default {
406 }, 100); 398 }, 100);
407 }, 399 },
408 methods: { 400 methods: {
409 registerCall(){
410 let data={
411 type:'h',
412 bsm:this.hbsm
413 }
414 registerCall(data).then(res=>{
415 if (res.success) {
416 this.$message.success("登记成功")
417 this.getRightTree(this.$store.state.zdbsm)
418 }
419 })
420 },
421 batchCommit(){ 401 batchCommit(){
422 if (this.bsms.length <= 0) { 402 if (this.bsms.length <= 0) {
423 Message.warning("请选择操作户") 403 Message.warning("请选择操作户")
...@@ -604,18 +584,6 @@ export default { ...@@ -604,18 +584,6 @@ export default {
604 }); 584 });
605 } 585 }
606 }, 586 },
607 //户保存
608 hbjSaveInfo() {
609 this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
610 },
611 //户保存
612 hbjSubmitInfo() {
613 this.$refs.hbj.onSubmit(this.bsms[this.bsms.length - 1], this.tabPosition);
614 },
615 //户编辑表单重置
616 hbjResetInfo() {
617 this.$refs.hbj.onReset();
618 },
619 //调用楼盘表信息查询接口 587 //调用楼盘表信息查询接口
620 getlpbData() { 588 getlpbData() {
621 this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm); 589 this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm);
......