Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
ddf3d039 by 杨威
Options

Merge remote-tracking branch 'origin/master' into master

2 parents 4c0e9097 18776a57
Expand all
Inline Side-by-side
Showing 26 changed files with 372 additions and 167 deletions
...@@ -20,4 +20,7 @@ yarn-error.log* ...@@ -20,4 +20,7 @@ yarn-error.log*
20 *.sln 20 *.sln
21 *.sw? 21 *.sw?
22 package-lock.json 22 package-lock.json
23 CadastralSystem.iml 23 CadastralSyst
24 em.iml
25 *.env
26 *.gitignore
......
...@@ -69,4 +69,14 @@ export function hhb(data) { ...@@ -69,4 +69,14 @@ export function hhb(data) {
69 method: 'post', 69 method: 'post',
70 data: data 70 data: data
71 }) 71 })
72 }
73 /**
74 * 户分割
75 */
76 export function hfg(data) {
77 return request({
78 url: '/bg/hSplitMerge/hFg',
79 method: 'post',
80 data: data
81 })
72 } 82 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -116,7 +116,7 @@ ol, ul { list-style:none; } ...@@ -116,7 +116,7 @@ ol, ul { list-style:none; }
116 >.el-tabs__item{ 116 >.el-tabs__item{
117 border: 1px solid #DEDEDE; 117 border: 1px solid #DEDEDE;
118 height: 30px; 118 height: 30px;
119 line-height: 30px; 119 line-height: 28px;
120 padding: 0 20px; 120 padding: 0 20px;
121 margin: 9px 10px 9px 0; 121 margin: 9px 10px 9px 0;
122 } 122 }
...@@ -128,6 +128,9 @@ ol, ul { list-style:none; } ...@@ -128,6 +128,9 @@ ol, ul { list-style:none; }
128 } 128 }
129 } 129 }
130 } 130 }
131 .el-tabs__item{
132 font-size: 16px;
133 }
131 //弹框遮罩层样式 134 //弹框遮罩层样式
132 .v-modal{ 135 .v-modal{
133 opacity: .2; 136 opacity: .2;
...@@ -261,4 +264,12 @@ ol, ul { list-style:none; } ...@@ -261,4 +264,12 @@ ol, ul { list-style:none; }
261 } 264 }
262 .iconfontEdit:hover{ 265 .iconfontEdit:hover{
263 color: rgb(0, 108, 255); 266 color: rgb(0, 108, 255);
267 }
268 .el-select,.el-select-tree,.el-date-editor{
269 /deep/ .el-input__inner{
270 text-align: left!important;
271 }
272 }
273 .el-input__prefix, .el-input__suffix{
274 top: -2px;
264 } 275 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -720,6 +720,8 @@ export default { ...@@ -720,6 +720,8 @@ export default {
720 // height: 100%; 720 // height: 100%;
721 border-right: 1px solid #E6E6E6; 721 border-right: 1px solid #E6E6E6;
722 position: relative; 722 position: relative;
723 text-align: right;
724 padding-right: 10px;
723 .qlxz { 725 .qlxz {
724 line-height: 34px; 726 line-height: 34px;
725 } 727 }
......
...@@ -373,6 +373,8 @@ export default { ...@@ -373,6 +373,8 @@ export default {
373 // height: 100%; 373 // height: 100%;
374 border-right: 1px solid #E6E6E6; 374 border-right: 1px solid #E6E6E6;
375 position: relative; 375 position: relative;
376 text-align: right;
377 padding-right: 10px;
376 .qlxz { 378 .qlxz {
377 line-height: 34px; 379 line-height: 34px;
378 } 380 }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 <div 15 <div
16 class="row-flex-start basic_banner" 16 class="row-flex-start basic_banner"
17 @click="itemClick(item)" 17 @click="itemClick(item)"
18 @dblclick="dbclick(item)" 18 @dblclick="dbclick(item,item.zdbsm)"
19 :class="{ 19 :class="{
20 active_color: item.expand, 20 active_color: item.expand,
21 }" 21 }"
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
24 v-if="item.children" 24 v-if="item.children"
25 class="reTree_icon" 25 class="reTree_icon"
26 :style="{ 26 :style="{
27 height: (size || 14 * 1.2) + 'px', 27 height: (size || 16 * 1.2) + 'px',
28 width: (size || 14 * 1.2) + 'px', 28 width: (size || 16 * 1.2) + 'px',
29 }" 29 }"
30 :class="{ 30 :class="{
31 reTree_default_icon: item.children.length === 0, 31 reTree_default_icon: item.children.length === 0,
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
37 v-if="item.children==null" 37 v-if="item.children==null"
38 class="reTree_icon reTree_expand_icon" 38 class="reTree_icon reTree_expand_icon"
39 :style="{ 39 :style="{
40 height: (size || 14 * 1.2) + 'px', 40 height: (size || 16 * 1.2) + 'px',
41 width: (size || 14 * 1.2) + 'px', 41 width: (size || 16 * 1.2) + 'px',
42 }" 42 }"
43 ></div> 43 ></div>
44 <div 44 <div
...@@ -46,8 +46,10 @@ ...@@ -46,8 +46,10 @@
46 @contextmenu.prevent="openMenu($event, item,list)" 46 @contextmenu.prevent="openMenu($event, item,list)"
47 :class="{ 47 :class="{
48 active_color: item.expand, 48 active_color: item.expand,
49 curPage:$route.query.bsm==item.bsm 49 curPage:$route.query.bsm && $route.query.bsm==item.bsm
50 }" 50 }"
51 :ref="($route.query.bsm && $route.query.bsm==item.bsm)?'curZxx':''"
52 :data-zdbsm="item.zdbsm"
51 > 53 >
52 <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/> 54 <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/>
53 <img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/> 55 <img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/>
...@@ -83,7 +85,7 @@ export default { ...@@ -83,7 +85,7 @@ export default {
83 }, 85 },
84 size: { 86 size: {
85 type: Number, 87 type: Number,
86 default: 14, 88 default: 16,
87 }, 89 },
88 visible: { 90 visible: {
89 type: Boolean, 91 type: Boolean,
...@@ -104,7 +106,11 @@ export default { ...@@ -104,7 +106,11 @@ export default {
104 } 106 }
105 }, 107 },
106 mounted(){ 108 mounted(){
107 109 // console.log(this.$refs.curZxx,'this.$refs.curZxx');
110 if(this.$refs.curZxx){
111 console.log(this.$refs.curZxx[0].dataset.zdbsm);
112 this.$store.state.oldZdbsm = this.$refs.curZxx[0].dataset.zdbsm;
113 }
108 }, 114 },
109 methods: { 115 methods: {
110 itemClick(item) { 116 itemClick(item) {
...@@ -174,8 +180,9 @@ export default { ...@@ -174,8 +180,9 @@ export default {
174 } 180 }
175 }, 181 },
176 // 左键双击事件 182 // 左键双击事件
177 dbclick(item) { 183 dbclick(item,bsm) {
178 clearTimeout(this.time); 184 clearTimeout(this.time);
185 this.$store.state.newZdbsm = bsm;
179 //此处不要将$router移到if的外面，因为可能是双击行政区，就不知道去哪儿了 186 //此处不要将$router移到if的外面，因为可能是双击行政区，就不知道去哪儿了
180 if (item.type == 'zd') { 187 if (item.type == 'zd') {
181 this.$store.state.zdbsm = item.bsm; 188 this.$store.state.zdbsm = item.bsm;
...@@ -342,8 +349,8 @@ export default { ...@@ -342,8 +349,8 @@ export default {
342 content: ""; 349 content: "";
343 position: absolute; 350 position: absolute;
344 /* 为了触顶 */ 351 /* 为了触顶 */
345 top: -14px; 352 top: -16px;
346 height: calc(100% + 14px); 353 height: calc(100% + 16px);
347 width: 1px; 354 width: 1px;
348 left: 7px; 355 left: 7px;
349 opacity: .5; 356 opacity: .5;
...@@ -355,7 +362,7 @@ export default { ...@@ -355,7 +362,7 @@ export default {
355 content: ""; 362 content: "";
356 position: absolute; 363 position: absolute;
357 height: 23px; 364 height: 23px;
358 top: -14px; 365 top: -16px;
359 width: 1px; 366 width: 1px;
360 left: 7px; 367 left: 7px;
361 opacity: .5; 368 opacity: .5;
...@@ -401,7 +408,7 @@ export default { ...@@ -401,7 +408,7 @@ export default {
401 background-size: contain; 408 background-size: contain;
402 } 409 }
403 .qsztImg{ 410 .qsztImg{
404 width: 14px; 411 width: 16px;
405 position: relative; 412 position: relative;
406 top: 1px; 413 top: 1px;
407 } 414 }
......
1 <template> 1 <template>
2 <div 2 <div
3 class="content column-start-center reTree_box" 3 class="content column-start-center reTree_box"
4 :style="{ fontSize: (size || 14) + 'px', lineHeight: (size || 14) + 'px', width: (islpb ? '200':'374') + 'px' }" 4 :style="{ fontSize: (size || 16) + 'px', lineHeight: (size || 16) + 'px', width: (islpb ? '200':'374') + 'px' }"
5 > 5 >
6 <div 6 <div
7 class="column-start-center basic_layer" 7 class="column-start-center basic_layer"
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
19 <div 19 <div
20 class="reTree_icon" 20 class="reTree_icon"
21 :style="{ 21 :style="{
22 height: (size || 14 * 1.2) + 'px', 22 height: (size || 16 * 1.2) + 'px',
23 width: (size || 14 * 1.2) + 'px', 23 width: (size || 16 * 1.2) + 'px',
24 }" 24 }"
25 :class="{ 25 :class="{
26 reTree_default_icon: item.children.length === 0, 26 reTree_default_icon: item.children.length === 0,
...@@ -129,7 +129,7 @@ export default { ...@@ -129,7 +129,7 @@ export default {
129 pd: {}, 129 pd: {},
130 size: { 130 size: {
131 type: Number, 131 type: Number,
132 default: 14, 132 default: 16,
133 }, 133 },
134 islpb:{ 134 islpb:{
135 type: Boolean, 135 type: Boolean,
...@@ -137,20 +137,20 @@ export default { ...@@ -137,20 +137,20 @@ export default {
137 } 137 }
138 }, 138 },
139 components: { lineItem,Create,ImportGeo,sxdr }, 139 components: { lineItem,Create,ImportGeo,sxdr },
140 mixins:[geoUtils,featureUpdate], 140 mixins:[geoUtils,featureUpdate],
141 data() { 141 data() {
142 return { 142 return {
143 sxdrVisible:false, 143 sxdrVisible:false,
144 selectedDetail: {}, 144 selectedDetail: {},
145 timer: {}, 145 timer: {},
146 formatData: [], 146 formatData: this.$store.state.treeData,
147 visible: false, 147 visible: false,
148 top: 0, 148 top: 0,
149 left: 0, 149 left: 0,
150 isZD: true, 150 isZD: true,
151 zdData:{}, 151 zdData:{},
152 currentClickZdGeo:"", 152 currentClickZdGeo:"",
153 improtDialog:false, 153 improtDialog:false,
154 dialogVisible:false, 154 dialogVisible:false,
155 //控制楼盘表 155 //控制楼盘表
156 lpbvisible: false, 156 lpbvisible: false,
...@@ -168,9 +168,7 @@ export default { ...@@ -168,9 +168,7 @@ export default {
168 watch: { 168 watch: {
169 pd(n, o) { 169 pd(n, o) {
170 this.formatData = this.preDealData(n); 170 this.formatData = this.preDealData(n);
171 console.log(this.formatData);
172 }, 171 },
173
174 lpbvisible(value) { 172 lpbvisible(value) {
175 if (value) { 173 if (value) {
176 document.body.addEventListener("click", this.closeMenu); 174 document.body.addEventListener("click", this.closeMenu);
...@@ -195,7 +193,6 @@ export default { ...@@ -195,7 +193,6 @@ export default {
195 // } 193 // }
196 }, 194 },
197 created() { 195 created() {
198 console.log("lineTree create");
199 this.preDealData(this.pd); 196 this.preDealData(this.pd);
200 // this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]); 197 // this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]);
201 }, 198 },
...@@ -303,8 +300,6 @@ export default { ...@@ -303,8 +300,6 @@ export default {
303 }, 300 },
304 itemClick(item) { 301 itemClick(item) {
305 // item.expand = item.expand == undefined? true:!item.expand; 302 // item.expand = item.expand == undefined? true:!item.expand;
306 console.log(item,'item');
307 console.log(this.formatData,'this.formatData');
308 this.formatData.forEach(i=>{ 303 this.formatData.forEach(i=>{
309 if(i.bsm != item.bsm){ 304 if(i.bsm != item.bsm){
310 i.expand = false 305 i.expand = false
...@@ -338,11 +333,9 @@ export default { ...@@ -338,11 +333,9 @@ export default {
338 }) 333 })
339 } 334 }
340 }) 335 })
341 console.log(this.formatData,'formatData');
342 }, 336 },
343 //自然幢右键点击事件 337 //自然幢右键点击事件
344 openMenu(e,item){ 338 openMenu(e,item){
345 console.log(item,'右键item');
346 this.lpbleft = e.pageX; 339 this.lpbleft = e.pageX;
347 this.lpbtop = e.pageY; 340 this.lpbtop = e.pageY;
348 this.zdData = item; 341 this.zdData = item;
...@@ -731,8 +724,8 @@ export default { ...@@ -731,8 +724,8 @@ export default {
731 content: ""; 724 content: "";
732 position: absolute; 725 position: absolute;
733 /* 为了触顶 */ 726 /* 为了触顶 */
734 top: -14px; 727 top: -16px;
735 height: calc(100% + 14px); 728 height: calc(100% + 16px);
736 width: 1px; 729 width: 1px;
737 left: 9px; 730 left: 9px;
738 background: #c3c5c8; 731 background: #c3c5c8;
...@@ -742,7 +735,7 @@ export default { ...@@ -742,7 +735,7 @@ export default {
742 content: ""; 735 content: "";
743 position: absolute; 736 position: absolute;
744 height: 23px; 737 height: 23px;
745 top: -14px; 738 top: -16px;
746 width: 1px; 739 width: 1px;
747 left: 9px; 740 left: 9px;
748 background: #c3c5c8; 741 background: #c3c5c8;
......
...@@ -292,7 +292,7 @@ export default { ...@@ -292,7 +292,7 @@ export default {
292 } 292 }
293 }, 293 },
294 cadFileSuccess(response, file, fileList){ 294 cadFileSuccess(response, file, fileList){
295 debugger 295
296 }, 296 },
297 excelFileSuccess(response, file, fileList){ 297 excelFileSuccess(response, file, fileList){
298 var self = this; 298 var self = this;
......
...@@ -12,31 +12,31 @@ ...@@ -12,31 +12,31 @@
12 <tr> 12 <tr>
13 <td>层建筑面积(㎡)</td> 13 <td>层建筑面积(㎡)</td>
14 <td> 14 <td>
15 <el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层建筑面积(㎡)"></el-input> 15 <el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
16 </td> 16 </td>
17 <td> 17 <td>
18 层套内建筑面积(㎡) 18 层套内建筑面积(㎡)
19 </td> 19 </td>
20 <td> 20 <td>
21 <el-input v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层套内建筑面积(㎡)" ></el-input> 21 <el-input v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
22 </td> 22 </td>
23 </tr> 23 </tr>
24 <tr> 24 <tr>
25 <td>层阳台面积(㎡)</td> 25 <td>层阳台面积(㎡)</td>
26 <td> 26 <td>
27 <el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层阳台面积(㎡)"></el-input> 27 <el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
28 </td> 28 </td>
29 <td> 29 <td>
30 层半墙面积(㎡) 30 层半墙面积(㎡)
31 </td> 31 </td>
32 <td> 32 <td>
33 <el-input v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层半墙面积(㎡)"></el-input> 33 <el-input v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
34 </td> 34 </td>
35 </tr> 35 </tr>
36 <tr> 36 <tr>
37 <td>层共有建筑面积(㎡)</td> 37 <td>层共有建筑面积(㎡)</td>
38 <td> 38 <td>
39 <el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层共有建筑面积(㎡)"></el-input> 39 <el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
40 </td> 40 </td>
41 <td> 41 <td>
42 层分摊建筑面积(㎡) 42 层分摊建筑面积(㎡)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 width="50%" 6 width="50%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 > 9 >
10 <div> 10 <div>
11 <span class="xl" @click="xl">祥例</span> 11 <span class="xl" @click="xl">祥例</span>
12 <table border="1"> 12 <table border="1">
...@@ -128,13 +128,30 @@ ...@@ -128,13 +128,30 @@
128 key: '2', 128 key: '2',
129 label: '实际层', 129 label: '实际层',
130 value: '2' 130 value: '2'
131 }, {
132 key: '3',
133 label: '空',
134 value: '3'
131 } 135 }
132 ] 136 ]
133 } 137 }
134 }, 138 },
135 methods: { 139 methods: {
136 lodding:function(){ 140 test: function () {
137 this.$emit('lodding') 141 for (let key in this.plshData) {
142 console.log(key)
143 console.log(this.plshData[key])
144 if (key === 'chqbl') {
145 continue;
146 }
147 if (this.plshData[key] !== '' && this.plshData[key] !== '3' && this.plshData[key] !== false) {
148 return true;
149 }
150 }
151 return false;
152 },
153 lodding: function () {
154 this.$emit('lodding')
138 }, 155 },
139 xl: function () { 156 xl: function () {
140 this.xlVisible = true; 157 this.xlVisible = true;
...@@ -156,6 +173,10 @@ ...@@ -156,6 +173,10 @@
156 } 173 }
157 }, 174 },
158 save: function () { 175 save: function () {
176 if (!this.test()) {
177 this.$message.info("请选择")
178 return;
179 }
159 this.plshData['bsms'] = this.bsms 180 this.plshData['bsms'] = this.bsms
160 updateSh(this.plshData).then(res => { 181 updateSh(this.plshData).then(res => {
161 if (res.success) { 182 if (res.success) {
...@@ -174,25 +195,25 @@ ...@@ -174,25 +195,25 @@
174 computed: { 195 computed: {
175 gz: function () { 196 gz: function () {
176 let gz = ""; 197 let gz = "";
177 if (this.plshData.shqz != "") { 198 if (this.plshData.shqz !== "") {
178 gz += this.plshData.shqz 199 gz += this.plshData.shqz
179 } 200 }
180 if (this.plshData.selectDyh) { 201 if (this.plshData.selectDyh) {
181 gz += "[单元号]" 202 gz += "[单元号]"
182 } 203 }
183 if (this.plshData.fgfA != "") { 204 if (this.plshData.fgfA !== "") {
184 gz += this.plshData.fgfA 205 gz += this.plshData.fgfA
185 } 206 }
186 if (this.plshData.c == 1) { 207 if (this.plshData.c === 1) {
187 gz += "[名义层]" 208 gz += "[名义层]"
188 } else if (this.plshData.c == 2) { 209 } else if (this.plshData.c === 2) {
189 gz += "[实际层]" 210 gz += "[实际层]"
190 } 211 }
191 if (this.plshData.fgfB != "") { 212 if (this.plshData.fgfB !== "") {
192 gz += this.plshData.fgfB 213 gz += this.plshData.fgfB
193 } 214 }
194 gz += "[户号]"; 215 gz += "[户号]";
195 if (this.plshData.shhz != "") { 216 if (this.plshData.shhz !== "") {
196 gz += this.plshData.shhz 217 gz += this.plshData.shhz
197 } 218 }
198 return gz; 219 return gz;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 width="60%" 6 width="60%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 > 9 >
10 <div> 10 <div>
11 <table border="1"> 11 <table border="1">
12 <tr> 12 <tr>
...@@ -121,12 +121,12 @@ ...@@ -121,12 +121,12 @@
121 isVisible: false, 121 isVisible: false,
122 plzlData: { 122 plzlData: {
123 qz: '', 123 qz: '',
124 zd: '', 124 zd: '3',
125 zrz: '', 125 zrz: '3',
126 ljz: '', 126 ljz: '3',
127 zdy: '', 127 zdy: '3',
128 c: '', 128 c: '3',
129 h: '', 129 h: '3',
130 hz: '' 130 hz: ''
131 }, 131 },
132 zdgz: [ 132 zdgz: [
...@@ -160,6 +160,9 @@ ...@@ -160,6 +160,9 @@
160 }, { 160 }, {
161 label: "逻辑幢号", 161 label: "逻辑幢号",
162 value: '2' 162 value: '2'
163 }, {
164 label: "空",
165 value: '3'
163 } 166 }
164 ], 167 ],
165 zdygz: [ 168 zdygz: [
...@@ -169,6 +172,9 @@ ...@@ -169,6 +172,9 @@
169 }, { 172 }, {
170 label: "幢单元号", 173 label: "幢单元号",
171 value: '2' 174 value: '2'
175 }, {
176 label: "空",
177 value: '3'
172 } 178 }
173 ], 179 ],
174 cgz: [ 180 cgz: [
...@@ -180,6 +186,9 @@ ...@@ -180,6 +186,9 @@
180 key: '2', 186 key: '2',
181 label: '实际层', 187 label: '实际层',
182 value: '2' 188 value: '2'
189 }, {
190 label: "空",
191 value: '3'
183 } 192 }
184 ], 193 ],
185 hgz: [ 194 hgz: [
...@@ -191,15 +200,22 @@ ...@@ -191,15 +200,22 @@
191 key: '2', 200 key: '2',
192 label: '户号', 201 label: '户号',
193 value: '2' 202 value: '2'
203 }, {
204 label: "空",
205 value: '3'
194 } 206 }
195 ] 207 ]
196 } 208 }
197 }, 209 },
198 methods: { 210 methods: {
199 lodding:function(){ 211 lodding: function () {
200 this.$emit('lodding') 212 this.$emit('lodding')
201 }, 213 },
202 save: function () { 214 save: function () {
215 if (!this.test()) {
216 this.$message.info("请选择")
217 return;
218 }
203 this.plzlData['bsms'] = this.bsms; 219 this.plzlData['bsms'] = this.bsms;
204 updateZl(this.plzlData).then(res => { 220 updateZl(this.plzlData).then(res => {
205 if (res.success) { 221 if (res.success) {
...@@ -210,8 +226,15 @@ ...@@ -210,8 +226,15 @@
210 } 226 }
211 }) 227 })
212 }, 228 },
229 test: function () {
230 for (let key in this.plzlData) {
231 if (this.plzlData[key] !== '' && this.plzlData[key] !== '3') {
232 return true;
233 }
234 }
235 return false;
236 },
213 cancel: function () { 237 cancel: function () {
214 console.log("cancel......")
215 this.close(); 238 this.close();
216 }, 239 },
217 close: function () { 240 close: function () {
...@@ -220,7 +243,6 @@ ...@@ -220,7 +243,6 @@
220 this.result(); 243 this.result();
221 }, 244 },
222 result: function () { 245 result: function () {
223 console.log("重置")
224 this.plzlData = { 246 this.plzlData = {
225 qz: '', 247 qz: '',
226 zd: '', 248 zd: '',
...@@ -237,45 +259,45 @@ ...@@ -237,45 +259,45 @@
237 gz: function () { 259 gz: function () {
238 // [前缀][宗地][自然幢][单元][室号][室号][后缀] 260 // [前缀][宗地][自然幢][单元][室号][室号][后缀]
239 let gz = ""; 261 let gz = "";
240 if (this.plzlData.qz != '') { 262 if (this.plzlData.qz !== '') {
241 gz += this.plzlData.qz 263 gz += this.plzlData.qz
242 } 264 }
243 265
244 if (this.plzlData.zd == 1) { 266 if (this.plzlData.zd === 1) {
245 gz += "[宗地坐落]"; 267 gz += "[宗地坐落]";
246 } else if (this.plzlData.zd == 2) { 268 } else if (this.plzlData.zd === 2) {
247 gz += "[宗地名称]"; 269 gz += "[宗地名称]";
248 } 270 }
249 271
250 if (this.plzlData.zrz == 1) { 272 if (this.plzlData.zrz === 1) {
251 gz += "[自然幢坐落]" 273 gz += "[自然幢坐落]"
252 } else if (this.plzlData.zrz == 2) { 274 } else if (this.plzlData.zrz === 2) {
253 gz += "[自然幢名称]"; 275 gz += "[自然幢名称]";
254 } 276 }
255 if (this.plzlData.ljz == 1) { 277 if (this.plzlData.ljz === 1) {
256 gz += "[逻辑幢名称]" 278 gz += "[逻辑幢名称]"
257 } else if (this.plzlData.ljz == 2) { 279 } else if (this.plzlData.ljz === 2) {
258 gz += "[逻辑幢号]" 280 gz += "[逻辑幢号]"
259 } 281 }
260 if (this.plzlData.zdy == 1) { 282 if (this.plzlData.zdy === 1) {
261 gz += "[幢单元名称]"; 283 gz += "[幢单元名称]";
262 } else if (this.plzlData.zdy == 2) { 284 } else if (this.plzlData.zdy === 2) {
263 gz += "[幢单元号]" 285 gz += "[幢单元号]"
264 } 286 }
265 if (this.plzlData.c == 1) { 287 if (this.plzlData.c === 1) {
266 gz += "[名义层]" 288 gz += "[名义层]"
267 } else if (this.plzlData.c == 2) { 289 } else if (this.plzlData.c === 2) {
268 gz += "[实际层]" 290 gz += "[实际层]"
269 } 291 }
270 if (this.plzlData.h == 1) { 292 if (this.plzlData.h === 1) {
271 gz += "[室号]" 293 gz += "[室号]"
272 } else if (this.plzlData.h == 2) { 294 } else if (this.plzlData.h === 2) {
273 gz += "[户号]" 295 gz += "[户号]"
274 } 296 }
275 if (this.plzlData.hz != "") { 297 if (this.plzlData.hz !== "") {
276 gz += this.plzlData.hz 298 gz += this.plzlData.hz
277 } 299 }
278 if (gz == "") { 300 if (gz === "") {
279 gz += "无" 301 gz += "无"
280 } 302 }
281 return gz; 303 return gz;
......
...@@ -50,7 +50,8 @@ ...@@ -50,7 +50,8 @@
50 uploadUrl: '', 50 uploadUrl: '',
51 isVisible: false, 51 isVisible: false,
52 sxdrData: { 52 sxdrData: {
53 bsm: '' 53 bsm: '',
54 type:''
54 }, 55 },
55 errorData: [] 56 errorData: []
56 } 57 }
...@@ -72,13 +73,12 @@ ...@@ -72,13 +73,12 @@
72 this.reset(); 73 this.reset();
73 }, 74 },
74 downloadTemplate() { 75 downloadTemplate() {
75 window.open(`/api/tx/excelGeo/zdTemplate?type=` + this.dylx); 76 window.open(`/api/tx/excelGeo/template?type=` + this.dylx);
76 }, 77 },
77 uploadSuccess(res, file, fileList) { 78 uploadSuccess(res, file, fileList) {
78 this.errorData = []; 79 this.errorData = [];
79 if (res.success) { 80 if (res.success) {
80 this.$message.success("上传成功") 81 this.$message.success("上传成功")
81 debugger
82 this.loading(); 82 this.loading();
83 this.close() 83 this.close()
84 } else { 84 } else {
...@@ -96,9 +96,10 @@ ...@@ -96,9 +96,10 @@
96 this.isVisible = val; 96 this.isVisible = val;
97 }, 97 },
98 dylx(val) { 98 dylx(val) {
99 this.sxdrData.type=val;
99 switch (val) { 100 switch (val) {
100 case "zd": 101 case "zd":
101 this.uploadUrl = "/api/tx/excelGeo/Zdimport"; 102 this.uploadUrl = "/api/tx/excelGeo/import";
102 break; 103 break;
103 default: 104 default:
104 break; 105 break;
......
...@@ -50,6 +50,8 @@ const store = new Vuex.Store({ ...@@ -50,6 +50,8 @@ const store = new Vuex.Store({
50 zrzh:'', //自然幢号 50 zrzh:'', //自然幢号
51 dzbsm:'', // 多幢bsm 51 dzbsm:'', // 多幢bsm
52 treeData:[], // 树数据 52 treeData:[], // 树数据
53 oldZdbsm:'',
54 newZdbsm:'',
53 }, 55 },
54 modules: { 56 modules: {
55 user, 57 user,
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span> 11 <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span>
12 </div> 12 </div>
13 <div class="treeModule" :style="{height:treeHeight+'px'}"> 13 <div class="treeModule" :style="{height:treeHeight+'px'}">
14 <LineTree :pd="pd" @itemClick="itemClick"></LineTree> 14 <LineTree :pd="pd" v-if="lineTreeVisible" @itemClick="itemClick"></LineTree>
15 </div> 15 </div>
16 </el-aside> 16 </el-aside>
17 <el-container class="calcWidth"> 17 <el-container class="calcWidth">
...@@ -137,11 +137,12 @@ export default { ...@@ -137,11 +137,12 @@ export default {
137 "/announcement_template": "PSH019", 137 "/announcement_template": "PSH019",
138 "/business_management": "PSH020", 138 "/business_management": "PSH020",
139 }, 139 },
140 pd: [], 140 pd: this.$store.state.treeData,
141 dialogVisible: false, 141 dialogVisible: false,
142 isMap:false, 142 isMap:false,
143 treeHeight:0, 143 treeHeight:0,
144 routerInfo:null 144 routerInfo:null,
145 lineTreeVisible:false,
145 }; 146 };
146 }, 147 },
147 computed: { 148 computed: {
...@@ -192,10 +193,15 @@ export default { ...@@ -192,10 +193,15 @@ export default {
192 "$store.state.treeData":function (val) { 193 "$store.state.treeData":function (val) {
193 console.log(val,'val'); 194 console.log(val,'val');
194 this.pd = val; 195 this.pd = val;
195 } 196 },
197 '$store.state.treeZdbsm':function (val) {
198 console.log(val,'val');
199 },
196 }, 200 },
197 mounted(){ 201 mounted(){
198 202 this.$nextTick(()=>{
203 this.lineTreeVisible = true
204 })
199 }, 205 },
200 created() { 206 created() {
201 if (this.$route.meta) { 207 if (this.$route.meta) {
...@@ -248,6 +254,8 @@ export default { ...@@ -248,6 +254,8 @@ export default {
248 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm) 254 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm)
249 }else if(this.$route.path == '/zd'){ 255 }else if(this.$route.path == '/zd'){
250 this.getRightTree(this.$store.state.zdbsm) 256 this.getRightTree(this.$store.state.zdbsm)
257 }else if(this.$route.path == '/dz'){
258 this.getRightTreeByDzbsm(this.$store.state.dzbsm)
251 }else{ 259 }else{
252 this.getTreeList(); 260 this.getTreeList();
253 } 261 }
...@@ -311,24 +319,35 @@ export default { ...@@ -311,24 +319,35 @@ export default {
311 getTree(bsm).then((res) => { 319 getTree(bsm).then((res) => {
312 if (res.success) { 320 if (res.success) {
313 this.pd = res.result; 321 this.pd = res.result;
322 this.$store.state.newZdbsm = '';
314 } 323 }
315 }); 324 });
316 }, 325 },
317 326
318 getRightTreeByZrzbsm(bsm) { 327 getRightTreeByZrzbsm(bsm) {
319 getTreeByBsm(bsm,"zrz").then((res) => { 328 if (this.$store.state.newZdbsm != this.$store.state.oldZdbsm) {
320 if (res.success) { 329 getTreeByBsm(bsm,"zrz").then((res) => {
321 this.pd = res.result; 330 if (res.success) {
322 } 331 this.pd = res.result;
323 }); 332 this.$store.state.treeData = res.result;
333 }
334 });
335 }else{
336
337 }
324 }, 338 },
325 339
326 getRightTreeByDzbsm(bsm) { 340 getRightTreeByDzbsm(bsm) {
327 getTreeByBsm(bsm,"dz").then((res) => { 341 if (this.$store.state.newZdbsm != this.$store.state.oldZdbsm) {
328 if (res.success) { 342 getTreeByBsm(bsm,"dz").then((res) => {
329 this.pd = res.result; 343 if (res.success) {
330 } 344 this.pd = res.result;
331 }); 345 this.$store.state.treeData = res.result;
346 }
347 });
348 }else{
349
350 }
332 }, 351 },
333 352
334 getRightTreeByHbsm(bsm) { 353 getRightTreeByHbsm(bsm) {
...@@ -400,6 +419,7 @@ export default { ...@@ -400,6 +419,7 @@ export default {
400 getTreeList(){ 419 getTreeList(){
401 getTreeList().then((res)=>{ 420 getTreeList().then((res)=>{
402 this.pd=res.result; 421 this.pd=res.result;
422 this.$store.state.newZdbsm = '';
403 }) 423 })
404 }, 424 },
405 goBack(){ 425 goBack(){
...@@ -468,7 +488,7 @@ export default { ...@@ -468,7 +488,7 @@ export default {
468 cursor: pointer; 488 cursor: pointer;
469 height: 60px; 489 height: 60px;
470 padding: 0 30px; 490 padding: 0 30px;
471 font-size: 16px; 491 font-size: 18px;
472 line-height: 60px; 492 line-height: 60px;
473 float: left; 493 float: left;
474 position: relative; 494 position: relative;
......
...@@ -37,20 +37,14 @@ ...@@ -37,20 +37,14 @@
37 </tr> 37 </tr>
38 38
39 <tr height="30"> 39 <tr height="30">
40 <td colspan="2" align="center" >房屋类型</td> 40 <td colspan="2" align="center" >共有土地面积（㎡）</td>
41 <td colspan="4" > 41 <td colspan="4" >
42 <el-select class="formSelect" v-model="form.fwlxbsm" placeholder="请选择" > 42 <input class="formInput" v-model="form.zdmj">
43 <el-option
44 v-for="item in $store.state.fwlxList"
45 :key="item.bsm"
46 :label="item.mc"
47 :value="item.bsm">
48 </el-option>
49 </el-select>
50 </td> 43 </td>
51 <td colspan="2" align="center" >竣工日期</td> 44 <td colspan="2" align="center" >竣工日期</td>
52 <td colspan="4" > 45 <td colspan="4" >
53 <el-date-picker 46 <el-date-picker
47 style="width:100%"
54 v-model="form.jgrq" 48 v-model="form.jgrq"
55 type="date" 49 type="date"
56 placeholder="选择日期"> 50 placeholder="选择日期">
...@@ -59,6 +53,10 @@ ...@@ -59,6 +53,10 @@
59 </tr> 53 </tr>
60 54
61 <tr height="30"> 55 <tr height="30">
56 <td colspan="2" align="center" >分摊土地面积（㎡）</td>
57 <td colspan="4" >
58 <input class="formInput" v-model="form.fttdsymj">
59 </td>
62 <td colspan="2" align="center" >产别</td> 60 <td colspan="2" align="center" >产别</td>
63 <td colspan="4" > 61 <td colspan="4" >
64 <el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" > 62 <el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" >
...@@ -70,6 +68,13 @@ ...@@ -70,6 +68,13 @@
70 </el-option> 68 </el-option>
71 </el-select> 69 </el-select>
72 </td> 70 </td>
71 </tr>
72
73 <tr height="30">
74 <td colspan="2" align="center" >多幢独用土地面积（㎡）</td>
75 <td colspan="4" >
76 <input class="formInput" v-model="form.dlsytdmj">
77 </td>
73 <td colspan="2" align="center" >产权来源</td> 78 <td colspan="2" align="center" >产权来源</td>
74 <td colspan="4" > 79 <td colspan="4" >
75 <el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" > 80 <el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" >
...@@ -96,6 +101,7 @@ ...@@ -96,6 +101,7 @@
96 <td colspan="3" align="center" > 101 <td colspan="3" align="center" >
97 <el-select-tree style="width:100%" 102 <el-select-tree style="width:100%"
98 v-if="show" 103 v-if="show"
104 @change="updateSjfyyt(item1)"
99 :default-expand-all="defaultExpandAll" 105 :default-expand-all="defaultExpandAll"
100 :multiple="multiple" 106 :multiple="multiple"
101 :placeholder="placeholder" 107 :placeholder="placeholder"
...@@ -124,21 +130,6 @@ ...@@ -124,21 +130,6 @@
124 </td> 130 </td>
125 </tr> 131 </tr>
126 132
127 <tr height="30">
128 <td colspan="2" align="center" >共有土地面积（㎡）</td>
129 <td colspan="2" >
130 <input class="formInput" v-model="form.zdmj">
131 </td>
132 <td colspan="2" align="center" >分摊土地面积（㎡）</td>
133 <td colspan="2" >
134 <input class="formInput" v-model="form.fttdsymj">
135 </td>
136 <td colspan="2" align="center" >多幢独用土地面积（㎡）</td>
137 <td colspan="2" >
138 <input class="formInput" v-model="form.dlsytdmj">
139 </td>
140 </tr>
141
142 <tr> 133 <tr>
143 <td colspan="12" align="center"> 134 <td colspan="12" align="center">
144 <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz> 135 <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
...@@ -450,6 +441,11 @@ ...@@ -450,6 +441,11 @@
450 } 441 }
451 }) 442 })
452 }, 443 },
444
445 updateSjfyyt(data){
446 data.fwsjytbsm = data.fwytzdbsm;
447 },
448
453 open() { 449 open() {
454 this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', { 450 this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', {
455 confirmButtonText: '确定', 451 confirmButtonText: '确定',
...@@ -497,7 +493,17 @@ ...@@ -497,7 +493,17 @@
497 this.getDzDetailByBsm(this.$route.query.bsm) 493 this.getDzDetailByBsm(this.$route.query.bsm)
498 } 494 }
499 }, 495 },
496 computed: {
497 dzbsm() {
498 return this.$route.query.bsm;
499 },
500 },
500 watch:{ 501 watch:{
502
503 dzbsm:function (val) {
504 this.getDzDetailByBsm(val)
505 },
506
501 "$store.state.sxdrType": { 507 "$store.state.sxdrType": {
502 handler(n) { 508 handler(n) {
503 this.$nextTick(()=>{ 509 this.$nextTick(()=>{
......
...@@ -184,11 +184,11 @@ ...@@ -184,11 +184,11 @@
184 </div> 184 </div>
185 </el-tab-pane> 185 </el-tab-pane>
186 <el-tab-pane label="户合并" name="h"> 186 <el-tab-pane label="户合并" name="h">
187 <div class="hb-tabs psn"> 187 <div class="hb-tabs psn" v-if="hhbtabs">
188 <hfghb></hfghb> 188 <hfghb></hfghb>
189 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 189 <!-- <div class="header-button" :style="{width:fgBoxWidth+'px'}">
190 <el-button type="primary" class="saveBtn">保存</el-button> 190 <el-button type="primary" class="saveBtn">保存</el-button>
191 </div> 191 </div> -->
192 </div> 192 </div>
193 </el-tab-pane> 193 </el-tab-pane>
194 </el-tabs> 194 </el-tabs>
...@@ -201,11 +201,11 @@ ...@@ -201,11 +201,11 @@
201 getListByXzqbsm, 201 getListByXzqbsm,
202 getListByPbsm, 202 getListByPbsm,
203 getDdicByMC 203 getDdicByMC
204 } from "./../../../../api/common"; 204 } from "@api/common";
205 import {ZdHb} from "./../../../../api/zd" 205 import {ZdHb} from "@api/zd"
206 import {saveDzHb} from "./../../../../api/dz" 206 import {saveDzHb} from "@api/dz"
207 import QueryData from './../../../../components/queryData/queryData' 207 import QueryData from '@components/queryData/queryData'
208 import zdQueryData from './../../../../components/zdQueryData/zdQueryData' 208 import zdQueryData from '@components/zdQueryData/zdQueryData'
209 import hfghb from '../hfghb/index' 209 import hfghb from '../hfghb/index'
210 210
211 export default { 211 export default {
...@@ -245,6 +245,7 @@ ...@@ -245,6 +245,7 @@
245 value: "Z", 245 value: "Z",
246 } 246 }
247 ], 247 ],
248 hhbtabs:false,
248 } 249 }
249 }, 250 },
250 created() { 251 created() {
...@@ -257,6 +258,11 @@ ...@@ -257,6 +258,11 @@
257 }) 258 })
258 }, 259 },
259 methods: { 260 methods: {
261 handleClick(tab, event) {
262 if (tab.name == 'h') {
263 this.hhbtabs = true
264 }
265 },
260 save(){ 266 save(){
261 switch (this.tabName) { 267 switch (this.tabName) {
262 case "zd": 268 case "zd":
...@@ -277,13 +283,14 @@ ...@@ -277,13 +283,14 @@
277 let data={ 283 let data={
278 newzddjqbsm: this.zdhbhData.djqbsm, 284 newzddjqbsm: this.zdhbhData.djqbsm,
279 newzddjzqbsm: this.zdhbhData.djzqbsm, 285 newzddjzqbsm: this.zdhbhData.djzqbsm,
280 newzdsyqlxbsm: this.zdhbqData.syqlxbsm, 286 newzdsyqlxbsm: this.zdhbhData.syqlxbsm,
281 newzduserbsm: "", 287 newzduserbsm: "",
282 newzdxmmc: this.zdhbqData.xmmc, 288 newzdxmmc: this.zdhbhData.xmmc,
283 newzdxzqbsm: this.zdhbqData.xzqbsm, 289 newzdxzqbsm: this.zdhbhData.xzqbsm,
284 newzdzdtzmbsm: this.zdhbqData.zdtzmbsm, 290 newzdzdtzmbsm: this.zdhbhData.zdtzmbsm,
285 oldzdbsms: oldBsm 291 oldzdbsms: oldBsm
286 } 292 }
293 console.log(data,'宗地合并数据')
287 ZdHb(data).then(res=>{ 294 ZdHb(data).then(res=>{
288 if (res.success) { 295 if (res.success) {
289 this.$message.success("合并成功") 296 this.$message.success("合并成功")
...@@ -392,9 +399,6 @@ ...@@ -392,9 +399,6 @@
392 }); 399 });
393 } 400 }
394 }, 401 },
395 handleClick(tab, event) {
396 console.log(tab, event);
397 },
398 close: function () { 402 close: function () {
399 this.centerDialogVisible = false; 403 this.centerDialogVisible = false;
400 }, 404 },
...@@ -453,10 +457,10 @@ ...@@ -453,10 +457,10 @@
453 console.log(params); 457 console.log(params);
454 //TODO 调用保存接口 458 //TODO 调用保存接口
455 // saveDzHb(params).then((res) => { 459 // saveDzHb(params).then((res) => {
456 460
457 // }) 461 // })
458 // .catch((error) => { 462 // .catch((error) => {
459 463
460 // }); 464 // });
461 }) 465 })
462 } 466 }
...@@ -493,7 +497,7 @@ ...@@ -493,7 +497,7 @@
493 > .el-tabs__item { 497 > .el-tabs__item {
494 border: 1px solid #DEDEDE; 498 border: 1px solid #DEDEDE;
495 height: 36px; 499 height: 36px;
496 line-height: 36px; 500 line-height: 32px;
497 padding: 0 20px; 501 padding: 0 20px;
498 margin: 9px 10px 9px 0; 502 margin: 9px 10px 9px 0;
499 background-color: #ffffff; 503 background-color: #ffffff;
...@@ -626,5 +630,5 @@ ...@@ -626,5 +630,5 @@
626 } 630 }
627 /deep/ .el-select { 631 /deep/ .el-select {
628 width: 100%; 632 width: 100%;
629 } 633 }
630 </style> 634 </style>
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 <div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }"> 84 <div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }">
85 <!-- 楼盘表主体 --> 85 <!-- 楼盘表主体 -->
86 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }"> 86 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
87 <lpbContent ref="lpbContent" :zrzbsm='zrzbsm' :isHbfg = true></lpbContent> 87 <lpbContent ref="lpbContent" :zrzbsm='zrzbsm' :isHbfg = true :isHb="isHb"></lpbContent>
88 </div> 88 </div>
89 <!-- 右侧图例 --> 89 <!-- 右侧图例 -->
90 <div class="lp-legend"> 90 <div class="lp-legend">
...@@ -215,7 +215,12 @@ import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFw ...@@ -215,7 +215,12 @@ import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFw
215 export default { 215 export default {
216 name:"", 216 name:"",
217 components:{lpbContent}, 217 components:{lpbContent},
218 props:{}, 218 props:{
219 isHb:{
220 type:Boolean,
221 default:true
222 }
223 },
219 data(){ 224 data(){
220 return { 225 return {
221 queryData:{ 226 queryData:{
...@@ -299,8 +304,8 @@ export default { ...@@ -299,8 +304,8 @@ export default {
299 created(){}, 304 created(){},
300 mounted(){ 305 mounted(){
301 this.$nextTick(()=>{ 306 this.$nextTick(()=>{
302 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 360; 307 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320;
303 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320; 308 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 270;
304 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6; 309 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
305 }) 310 })
306 }, 311 },
...@@ -313,7 +318,7 @@ export default { ...@@ -313,7 +318,7 @@ export default {
313 xmmc:'测试自然幢', 318 xmmc:'测试自然幢',
314 bdcqzh:'A12111111111111111', 319 bdcqzh:'A12111111111111111',
315 dylx:'zrz', 320 dylx:'zrz',
316 zrzbsm:'b7162d97848b0d31d301f8d4a5b4596b' 321 zrzbsm:'1a94f3ab0f95ecc7137c5c3e51c15ac6'
317 } 322 }
318 ] 323 ]
319 }, 324 },
...@@ -495,12 +500,14 @@ export default { ...@@ -495,12 +500,14 @@ export default {
495 </script> 500 </script>
496 <style scoped lang="less"> 501 <style scoped lang="less">
497 .main{ 502 .main{
498 margin-bottom: 14px;
499 .el-row{ 503 .el-row{
500 box-sizing: border-box; 504 box-sizing: border-box;
501 padding-left: 2px; 505 padding-left: 2px;
502 margin-bottom: 6px; 506 margin-bottom: 6px;
503 } 507 }
508 .pagination{
509 padding-bottom: 0!important;
510 }
504 .lpb{ 511 .lpb{
505 box-sizing: border-box; 512 box-sizing: border-box;
506 padding-left: 2px; 513 padding-left: 2px;
......
1 <template> 1 <template>
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="fg"><fg></fg></el-tab-pane> 4 <el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane>
5 <el-tab-pane label="合并" name="hb"><hb v-if="hbLoad"></hb></el-tab-pane> 5 <el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane>
6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane> 6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
7 <el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane> 7 <el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane>
8 </el-tabs> 8 </el-tabs>
...@@ -23,6 +23,7 @@ export default { ...@@ -23,6 +23,7 @@ export default {
23 data() { 23 data() {
24 return { 24 return {
25 activeName: "fg", 25 activeName: "fg",
26 fgLoad:true,
26 hbLoad:false, //默认不加载合并tab 27 hbLoad:false, //默认不加载合并tab
27 fwsxbgLoad:false, //默认不加载范围属性变更tab 28 fwsxbgLoad:false, //默认不加载范围属性变更tab
28 cxlzLoad:false, //默认不加载重新落宗tab 29 cxlzLoad:false, //默认不加载重新落宗tab
...@@ -30,10 +31,19 @@ export default { ...@@ -30,10 +31,19 @@ export default {
30 }, 31 },
31 methods: { 32 methods: {
32 handleClick(tab, event) { 33 handleClick(tab, event) {
33 console.log(tab.name); 34 // this.$refs.fg.$refs.isSearch = true;
35 if (tab.name != 'fg') {
36 this.fgLoad = false;
37 }
38 if (tab.name != 'hb') {
39 this.hbLoad = false;
40 }
34 if(!this.hbLoad){ 41 if(!this.hbLoad){
35 this.hbLoad = tab.name == 'hb' ? true : false 42 this.hbLoad = tab.name == 'hb' ? true : false
36 } 43 }
44 if(!this.fgLoad){
45 this.fgLoad = tab.name == 'fg' ? true : false
46 }
37 if(!this.fwsxbgLoad){ 47 if(!this.fwsxbgLoad){
38 this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false 48 this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false
39 } 49 }
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
21 {{scope.row.dylx | bdcLxFilter}} 21 {{scope.row.dylx | bdcLxFilter}}
22 </template> 22 </template>
23 </el-table-column> 23 </el-table-column>
24 <el-table-column prop="qsztValue" align="left" label="权属状态">
25 </el-table-column>
24 <el-table-column prop="qlrmc" align="left" width="120" label="权利人"> 26 <el-table-column prop="qlrmc" align="left" width="120" label="权利人">
25 </el-table-column> 27 </el-table-column>
26 <el-table-column prop="zl" align="left" label="坐落"></el-table-column> 28 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
......
...@@ -189,7 +189,7 @@ export default { ...@@ -189,7 +189,7 @@ export default {
189 getLshsData(){ 189 getLshsData(){
190 let _this = this; 190 let _this = this;
191 const data = { 191 const data = {
192 "bsm": "d85a274a332ad2d35c922a3a95eb154f", 192 "bsm": this.$store.state.zdbsm,
193 "type": "zd" 193 "type": "zd"
194 }; 194 };
195 getLshs(data).then((res)=>{ 195 getLshs(data).then((res)=>{
......
...@@ -43,7 +43,9 @@ ...@@ -43,7 +43,9 @@
43 > 43 >
44 </td> 44 </td>
45 <td class="dzwdm"> 45 <td class="dzwdm">
46 <el-input v-model="item.dzwdm" placeholder="请输入定着物代码"> 46 <el-input v-model="item.dzwdm" placeholder="请输入定着物代码"
47 maxlength="9"
48 >
47 </el-input> 49 </el-input>
48 </td> 50 </td>
49 <td class="syqmj"> 51 <td class="syqmj">
...@@ -70,7 +72,7 @@ ...@@ -70,7 +72,7 @@
70 <!-- <div class="pers"> 72 <!-- <div class="pers">
71 <el-button @click="save" type="primary">保存</el-button> 73 <el-button @click="save" type="primary">保存</el-button>
72 </div> --> 74 </div> -->
73 75
74 <div class="header-button" :style="{width:mainBoxWidth+'px'}"> 76 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
75 <el-button type="primary" class="saveBtn" @click="save">保存</el-button> 77 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
76 </div> 78 </div>
...@@ -237,7 +239,7 @@ ...@@ -237,7 +239,7 @@
237 padding: 18px; 239 padding: 18px;
238 height: auto; 240 height: auto;
239 width: 100%; 241 width: 100%;
240 242
241 table { 243 table {
242 margin-top: 10px; 244 margin-top: 10px;
243 background-color: #fff; 245 background-color: #fff;
......
...@@ -238,6 +238,7 @@ ...@@ -238,6 +238,7 @@
238 <el-select-tree 238 <el-select-tree
239 v-if="show" 239 v-if="show"
240 :default-expand-all="defaultExpandAll" 240 :default-expand-all="defaultExpandAll"
241 @change="updateSjfyyt(item1)"
241 :multiple="multiple" 242 :multiple="multiple"
242 :placeholder="placeholder" 243 :placeholder="placeholder"
243 :disabled="disableFlag" 244 :disabled="disableFlag"
...@@ -524,8 +525,10 @@ ...@@ -524,8 +525,10 @@
524 }, 525 },
525 created(){ 526 created(){
526 let bsm=this.$store.state.hbsm 527 let bsm=this.$store.state.hbsm
527 console.log(bsm,'户BSM') 528 // console.log(bsm,'户BSM')
528 this.getHInfo(bsm); 529 if (bsm) {
530 this.getHInfo(bsm);
531 }
529 this.$nextTick(()=>{ 532 this.$nextTick(()=>{
530 this.mainBoxWidth = this.$refs.mainBox.clientWidth; 533 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
531 this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320 534 this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320
...@@ -544,6 +547,11 @@ ...@@ -544,6 +547,11 @@
544 } 547 }
545 }) 548 })
546 }, 549 },
550
551 updateSjfyyt(data){
552 data.fwsjytbsm = data.fwytzdbsm;
553 },
554
547 addYtInfo(){ 555 addYtInfo(){
548 this.form.fwytList.push({ 556 this.form.fwytList.push({
549 glbsm:'', 557 glbsm:'',
...@@ -585,8 +593,7 @@ ...@@ -585,8 +593,7 @@
585 }, 593 },
586 //根据户bsm查询户信息 594 //根据户bsm查询户信息
587 getHInfo(hbsm){ 595 getHInfo(hbsm){
588 this.bsm = hbsm; 596 //this.bsm = hbsm;
589 console.log(hbsm);
590 getQjHDetailByBsm(hbsm).then((res)=>{ 597 getQjHDetailByBsm(hbsm).then((res)=>{
591 if(res.code===200){ 598 if(res.code===200){
592 this.form = res.result; 599 this.form = res.result;
...@@ -621,8 +628,6 @@ ...@@ -621,8 +628,6 @@
621 this.$set(this.form,"ycftxs", this.form.glftxs) 628 this.$set(this.form,"ycftxs", this.form.glftxs)
622 629
623 } 630 }
624 console.log("=============")
625 console.log(this.form)
626 if(res.result.fwytList.length===0){ 631 if(res.result.fwytList.length===0){
627 this.form.fwytList.push({ 632 this.form.fwytList.push({
628 glbsm:'', //关联标识码 633 glbsm:'', //关联标识码
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
13 ? 'bottom40 ljz-wrap' 13 ? 'bottom40 ljz-wrap'
14 : 'ljz-wrap' 14 : 'ljz-wrap'
15 " 15 "
16 :style="{'width':ljzWidth+'px'}"
16 v-show="lpbData.ljzs.length > 0" 17 v-show="lpbData.ljzs.length > 0"
17 > 18 >
18 <!-- 循环逻辑幢数据 --> 19 <!-- 循环逻辑幢数据 -->
...@@ -83,6 +84,7 @@ ...@@ -83,6 +84,7 @@
83 <!-- 循环逻辑幢下的层户 --> 84 <!-- 循环逻辑幢下的层户 -->
84 <div 85 <div
85 class="ljz-ch" 86 class="ljz-ch"
87 ref="ljzDlch"
86 :style="{ height: 'auto' }" 88 :style="{ height: 'auto' }"
87 v-if="ljzs.cs.length > 0" 89 v-if="ljzs.cs.length > 0"
88 > 90 >
...@@ -195,6 +197,7 @@ ...@@ -195,6 +197,7 @@
195 <!-- <template > --> 197 <!-- <template > -->
196 <div 198 <div
197 class="zdy column-reverse" 199 class="zdy column-reverse"
200 ref="zrzDlch"
198 :style="{ 'min-height': cHeight + 'px' }" 201 :style="{ 'min-height': cHeight + 'px' }"
199 > 202 >
200 <table 203 <table
...@@ -262,6 +265,9 @@ ...@@ -262,6 +265,9 @@
262 <!-- 合并 --> 265 <!-- 合并 -->
263 <li v-show="rightClickFlag == 'hb'" :class="canHb!='zyhb'? 'cantHb':''" @click="handleHb('zyhb')">左右合并</li> 266 <li v-show="rightClickFlag == 'hb'" :class="canHb!='zyhb'? 'cantHb':''" @click="handleHb('zyhb')">左右合并</li>
264 <li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li> 267 <li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li>
268 <!-- 分割 -->
269 <li v-show="rightClickFlag == 'fg'" @click="handleFg">户分割</li>
270 <!-- <li v-show="rightClickFlag == 'fg'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li> -->
265 271
266 </ul> 272 </ul>
267 <!-- 层操作弹框 --> 273 <!-- 层操作弹框 -->
...@@ -293,6 +299,26 @@ ...@@ -293,6 +299,26 @@
293 <el-button type="primary" @click="saveAddC">保存</el-button> 299 <el-button type="primary" @click="saveAddC">保存</el-button>
294 <el-button type="primary" @click="addCVisible = false">取消</el-button> 300 <el-button type="primary" @click="addCVisible = false">取消</el-button>
295 </div> 301 </div>
302 </el-dialog >
303 <!-- 户分割弹框 -->
304 <el-dialog
305 title = "户分割"
306 :visible.sync="hfgDialogVisible"
307 width="800px"
308 >
309 <el-form :model="fgData">
310 <el-form-item label="分割户数" required="" :label-width="formLabelWidth">
311 <el-input
312 :disabled="fgData.fgfx!=0"
313 v-model="fgData.fghs"
314 autocomplete="off"
315 ></el-input>
316 </el-form-item>
317 </el-form>
318 <div class="btnGroup">
319 <el-button type="primary" @click="savefgData">保存</el-button>
320 <el-button type="primary" @click="hfgDialogVisible = false">取消</el-button>
321 </div>
296 </el-dialog> 322 </el-dialog>
297 <move-h 323 <move-h
298 :hbsm="chData.bsm" 324 :hbsm="chData.bsm"
...@@ -304,9 +330,9 @@ ...@@ -304,9 +330,9 @@
304 </div> 330 </div>
305 </template> 331 </template>
306 <script> 332 <script>
307 import moveH from "./../../../../../components/moveH/moveH"; 333 import moveH from "@components/moveH/moveH";
308 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb"; 334 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
309 import { hhb } from "@api/h"; 335 import { hhb,hfg } from "@api/h";
310 import { Message } from 'element-ui'; 336 import { Message } from 'element-ui';
311 export default { 337 export default {
312 name: "", 338 name: "",
...@@ -319,6 +345,10 @@ export default { ...@@ -319,6 +345,10 @@ export default {
319 zrzbsm:{ 345 zrzbsm:{
320 type:String, 346 type:String,
321 default:'' 347 default:''
348 },
349 isHb:{
350 type:Boolean,
351 default:true
322 } 352 }
323 }, 353 },
324 data() { 354 data() {
...@@ -363,7 +393,13 @@ export default { ...@@ -363,7 +393,13 @@ export default {
363 yclpbData:{}, 393 yclpbData:{},
364 sclpbData:{}, 394 sclpbData:{},
365 fghbChoosedList:[], 395 fghbChoosedList:[],
366 canHb:''//判断合并类型 396 canHb:'',//判断合并类型
397 hfgDialogVisible:false, //户分割弹框
398 fgData:{
399 fghs:"",
400 oldbsm:'',
401 fgfx:0
402 }
367 }; 403 };
368 }, 404 },
369 created() {}, 405 created() {},
...@@ -433,11 +469,16 @@ export default { ...@@ -433,11 +469,16 @@ export default {
433 dataChange() { 469 dataChange() {
434 //计算逻辑幢宽度 20为marginRight值 470 //计算逻辑幢宽度 20为marginRight值
435 this.ljzWidth = 20; 471 this.ljzWidth = 20;
436 if (this.$refs.ljz != undefined) { 472 if (this.$refs.ljzzdy != undefined) {
437 this.$refs.ljz.forEach((item) => { 473 this.$refs.ljzzdy.forEach((item) => {
438 this.ljzWidth += item.offsetWidth + 20; 474 this.ljzWidth += item.offsetWidth + 20;
439 }); 475 });
440 } else { 476 } else {
477 if (this.$refs.ljzDlch != undefined) {
478 this.$refs.ljzDlch.forEach((item) => {
479 this.ljzWidth += item.offsetWidth + 20;
480 });
481 }
441 } 482 }
442 //计算独立幢单元和独立层户宽度 483 //计算独立幢单元和独立层户宽度
443 //考虑this.$refs.zdy的length为0的情况，即自然幢下没有独立幢单元 484 //考虑this.$refs.zdy的length为0的情况，即自然幢下没有独立幢单元
...@@ -466,10 +507,8 @@ export default { ...@@ -466,10 +507,8 @@ export default {
466 } 507 }
467 } else { 508 } else {
468 //有且仅有独立层户 509 //有且仅有独立层户
469 if (this.$refs.hBsm != undefined) { 510 if (this.$refs.zrzDlch != undefined) {
470 this.$refs.hBsm.forEach((item) => { 511 this.zdyWidth = this.$refs.zrzDlch.offsetWidth+20;
471 this.zdyWidth += item.offsetWidth + 21;
472 });
473 } 512 }
474 } 513 }
475 514
...@@ -504,7 +543,7 @@ export default { ...@@ -504,7 +543,7 @@ export default {
504 }); 543 });
505 } 544 }
506 } else { 545 } else {
507 // this.zdyWidth = 124; 546
508 } 547 }
509 }, 548 },
510 //户单击事件 549 //户单击事件
...@@ -576,8 +615,9 @@ export default { ...@@ -576,8 +615,9 @@ export default {
576 this.lpbChLeft = e.pageX; 615 this.lpbChLeft = e.pageX;
577 this.lpbChTop = e.pageY; 616 this.lpbChTop = e.pageY;
578 if (this.isHbfg) { 617 if (this.isHbfg) {
579 this.rightClickFlag = 'hb'; 618 this.rightClickFlag = this.isHb ? 'hb':'fg';
580 if (this.fghbChoosedList.length>1) { 619 if (this.fghbChoosedList.length>1) {
620 //合并
581 this.lpbChVisible = true; 621 this.lpbChVisible = true;
582 //判断选中户可以执行的合并类型 622 //判断选中户可以执行的合并类型
583 let chIsSame = this.fghbChoosedList.every((item)=> { 623 let chIsSame = this.fghbChoosedList.every((item)=> {
...@@ -595,6 +635,22 @@ export default { ...@@ -595,6 +635,22 @@ export default {
595 this.canHb = '' 635 this.canHb = ''
596 } 636 }
597 }) 637 })
638 }else{
639 //分割
640 this.lpbChVisible = true;
641 this.fgData.oldbsm = item.bsm;
642 console.log(item,'item');
643 //判断户的实际sjcs为1，只能水平分割
644 this.fgData.fgfx = item.sjcs == 1 ? 0 : 1;
645 if(item.sjcs == 1){
646 //判断户的实际sjcs为1，只能水平分割
647 this.fgData.fgfx = 0;
648 this.fgData.fghs = '';
649 }else{
650 this.fgData.fgfx = 1;
651 //判断户的实际sjhs不为1，分割户数为sjhs的值
652 this.fgData.fghs = item.sjcs;
653 }
598 } 654 }
599 }else{ 655 }else{
600 console.log(e, "e"); 656 console.log(e, "e");
...@@ -741,6 +797,25 @@ export default { ...@@ -741,6 +797,25 @@ export default {
741 }else{ 797 }else{
742 798
743 } 799 }
800 },
801 //户分割
802 handleFg(){
803 this.hfgDialogVisible = true;
804 },
805 //户分割保存
806 savefgData(){
807 hfg(this.fgData).then((res) => {
808 if(res.code == 200){
809 Message.success('分割成功');
810 // 清除选中户
811 this.hfgDialogVisible = false
812 this.clearChoosedH();
813 this.fghbChoosedList = [];
814 // 更新楼盘表
815 this.getLpb(this.zrzbsm, this.$parent.scyclx);
816 }
817 })
818 .catch(() => {});
744 } 819 }
745 }, 820 },
746 computed: { 821 computed: {
......