Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
33e383c4 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents f057e5bd 907e9995
Expand all
Inline Side-by-side
Showing 14 changed files with 289 additions and 184 deletions
...@@ -68,4 +68,14 @@ ...@@ -68,4 +68,14 @@
68 .el-message{ 68 .el-message{
69 min-width: 200px!important; 69 min-width: 200px!important;
70 top: 50px!important; 70 top: 50px!important;
71 }
72 .el-pager li{
73 background-color: #FFFFFF!important;
74 }
75 .el-pagination.is-background .el-pager li:not(.disabled).active {
76 background-color: #409EFF!important;
77 color: #FFF;
78 }
79 .el-pagination{
80 margin-left: -8px;
71 } 81 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -216,7 +216,8 @@ export default { ...@@ -216,7 +216,8 @@ export default {
216 path: '/'+item.type, 216 path: '/'+item.type,
217 query:{ 217 query:{
218 source: 2, 218 source: 2,
219 bsm:item.bsm 219 bsm:item.bsm,
220 auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2'
220 } 221 }
221 }); 222 });
222 }else if(item.type == 'zrz'){ 223 }else if(item.type == 'zrz'){
...@@ -225,7 +226,8 @@ export default { ...@@ -225,7 +226,8 @@ export default {
225 path: '/'+item.type, 226 path: '/'+item.type,
226 query:{ 227 query:{
227 source: 2, 228 source: 2,
228 bsm:item.bsm 229 bsm:item.bsm,
230 auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2'
229 } 231 }
230 }); 232 });
231 }else if(item.type == 'dz'){ 233 }else if(item.type == 'dz'){
...@@ -234,7 +236,8 @@ export default { ...@@ -234,7 +236,8 @@ export default {
234 path: '/'+item.type, 236 path: '/'+item.type,
235 query:{ 237 query:{
236 source: 2, 238 source: 2,
237 bsm:item.bsm 239 bsm:item.bsm,
240 auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2'
238 } 241 }
239 }); 242 });
240 } 243 }
......
...@@ -128,7 +128,12 @@ import sxdr from '@components/sxdr/sxdr' ...@@ -128,7 +128,12 @@ import sxdr from '@components/sxdr/sxdr'
128 export default { 128 export default {
129 inheritAttrs: false, 129 inheritAttrs: false,
130 props: { 130 props: {
131 pd: {}, 131 pd: {
132 type:Array,
133 default: () => {
134 return [];
135 },
136 },
132 size: { 137 size: {
133 type: Number, 138 type: Number,
134 default: 16, 139 default: 16,
...@@ -169,7 +174,7 @@ export default { ...@@ -169,7 +174,7 @@ export default {
169 }; 174 };
170 }, 175 },
171 watch: { 176 watch: {
172 pd(n, o) { 177 pd(n, o) {
173 this.formatData = this.preDealData(n); 178 this.formatData = this.preDealData(n);
174 }, 179 },
175 lpbvisible(value) { 180 lpbvisible(value) {
...@@ -196,7 +201,9 @@ export default { ...@@ -196,7 +201,9 @@ export default {
196 // } 201 // }
197 }, 202 },
198 created() { 203 created() {
199 this.preDealData(this.pd); 204 this.$nextTick(()=>{
205 this.preDealData(this.pd);
206 })
200 // this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]); 207 // this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]);
201 }, 208 },
202 209
...@@ -280,6 +287,9 @@ export default { ...@@ -280,6 +287,9 @@ export default {
280 }, 287 },
281 preDealData(list) { 288 preDealData(list) {
282 //楼盘表目录树没有expand属性 289 //楼盘表目录树没有expand属性
290 // if(list == null){
291 // return list
292 // }else{
283 list.forEach((x) => { 293 list.forEach((x) => {
284 if (x.expand == undefined) this.$set(x, "expand", true); 294 if (x.expand == undefined) this.$set(x, "expand", true);
285 if (x.children && x.children.length > 0) { 295 if (x.children && x.children.length > 0) {
...@@ -287,6 +297,7 @@ export default { ...@@ -287,6 +297,7 @@ export default {
287 } 297 }
288 }); 298 });
289 return list; 299 return list;
300 // }
290 }, 301 },
291 // 根据id展开树的具体项 302 // 根据id展开树的具体项
292 expandTreeItemById(idList) { 303 expandTreeItemById(idList) {
...@@ -339,7 +350,8 @@ export default { ...@@ -339,7 +350,8 @@ export default {
339 } 350 }
340 }) 351 })
341 } 352 }
342 }) 353 });
354 this.$store.state.treeData = this.formatData;
343 }, 355 },
344 //自然幢右键点击事件 356 //自然幢右键点击事件
345 openMenu(e,item){ 357 openMenu(e,item){
......
1 <template> 1 <template>
2 <el-row> 2 <el-row class="box">
3 <el-col :span="24" style="margin-left: -10px;"> 3 <el-col :span="24">
4 <el-row> 4 <el-row>
5 <el-col :span="24"> 5 <el-col :span="24">
6 <el-form :inline="true" class="demo-form-inline" label-width="106px"> 6 <el-form :inline="true" class="demo-form-inline" label-width="106px">
7 <el-form-item label="不动产单元号"> 7 <el-form-item label="宗地编码">
8 <el-input 8 <el-input
9 maxlength="28" 9 v-model="queryData.zddm"
10 v-model="queryData.bdcdyh" 10 placeholder="输入宗地编码"
11 placeholder="输入不动产单元号"
12 @change="query" 11 @change="query"
13 ></el-input> 12 ></el-input>
14 </el-form-item> 13 </el-form-item>
...@@ -19,10 +18,11 @@ ...@@ -19,10 +18,11 @@
19 @change="query" 18 @change="query"
20 ></el-input> 19 ></el-input>
21 </el-form-item> 20 </el-form-item>
22 <el-form-item label="宗地编码"> 21 <el-form-item label="不动产单元号">
23 <el-input 22 <el-input
24 v-model="queryData.zddm" 23 maxlength="28"
25 placeholder="输入宗地编码" 24 v-model="queryData.bdcdyh"
25 placeholder="输入不动产单元号"
26 @change="query" 26 @change="query"
27 ></el-input> 27 ></el-input>
28 </el-form-item> 28 </el-form-item>
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
30 <el-button type="warning" @click="reset">重置</el-button> 30 <el-button type="warning" @click="reset">重置</el-button>
31 <el-button 31 <el-button
32 type="primary" 32 type="primary"
33 class="moreSearchBtn"
34 @click="moreSearch" 33 @click="moreSearch"
35 >更多查询 34 >更多查询
36 </el-button> 35 </el-button>
...@@ -41,13 +40,6 @@ ...@@ -41,13 +40,6 @@
41 <el-row class="row3" v-if="ismore"> 40 <el-row class="row3" v-if="ismore">
42 <el-col :span="22"> 41 <el-col :span="22">
43 <el-form :inline="true" class="demo-form-inline" label-width="106px"> 42 <el-form :inline="true" class="demo-form-inline" label-width="106px">
44 <el-form-item label="不动产权证号">
45 <el-input
46 placeholder="输入不动产权证号"
47 v-model="queryData.bdcqzh"
48 @change="query"
49 ></el-input>
50 </el-form-item>
51 <el-form-item label="权利人名称"> 43 <el-form-item label="权利人名称">
52 <el-input 44 <el-input
53 placeholder="输入权利人名称" 45 placeholder="输入权利人名称"
...@@ -62,6 +54,13 @@ ...@@ -62,6 +54,13 @@
62 @change="query" 54 @change="query"
63 ></el-input> 55 ></el-input>
64 </el-form-item> 56 </el-form-item>
57 <el-form-item label="不动产权证号">
58 <el-input
59 placeholder="输入不动产权证号"
60 v-model="queryData.bdcqzh"
61 @change="query"
62 ></el-input>
63 </el-form-item>
65 </el-form> 64 </el-form>
66 </el-col> 65 </el-col>
67 <el-col :span="2" :offset="offset"> 66 <el-col :span="2" :offset="offset">
...@@ -155,8 +154,10 @@ export default { ...@@ -155,8 +154,10 @@ export default {
155 moreSearch(){ 154 moreSearch(){
156 if(this.ismore === true){ 155 if(this.ismore === true){
157 this.ismore = false; 156 this.ismore = false;
157 this.$parent.tableHeight+=55;
158 }else { 158 }else {
159 this.ismore = true; 159 this.ismore = true;
160 this.$parent.tableHeight-=55;
160 } 161 }
161 162
162 // this.$message('待开发'); 163 // this.$message('待开发');
...@@ -178,8 +179,17 @@ export default { ...@@ -178,8 +179,17 @@ export default {
178 }; 179 };
179 </script> 180 </script>
180 <style scoped lang="less"> 181 <style scoped lang="less">
181 .el-row{ 182 .box{
182 background-color: #EAEDF5; 183 background-color: #FFFFFF;
184 box-sizing: border-box;
185 padding: 18px 0 0 0;
186 border: 1px solid #E6E6E6;
187 .el-col{
188 .el-row{
189 margin-left: -10px;
190 }
191 }
192 margin-bottom: 18px;
183 } 193 }
184 .el-button { 194 .el-button {
185 width: 100px; 195 width: 100px;
......
...@@ -289,6 +289,7 @@ export default { ...@@ -289,6 +289,7 @@ export default {
289 if (res.success) { 289 if (res.success) {
290 this.pd = res.result; 290 this.pd = res.result;
291 this.$store.state.newZdbsm = ''; 291 this.$store.state.newZdbsm = '';
292 this.$store.state.treeData = res.result;
292 } 293 }
293 }); 294 });
294 }, 295 },
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <p class="tips">查询条件</p>
3 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead> 4 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
5 <p class="tips">查询列表</p>
4 <div class="dataGrid" ref="dataGrid"> 6 <div class="dataGrid" ref="dataGrid">
5 <el-table 7 <el-table
6 :data="tableData" 8 :data="tableData"
...@@ -82,7 +84,7 @@ ...@@ -82,7 +84,7 @@
82 this.queryData.pageSize=this.pageSize 84 this.queryData.pageSize=this.pageSize
83 this.getData(this.queryData); 85 this.getData(this.queryData);
84 this.$nextTick(() => { 86 this.$nextTick(() => {
85 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255; 87 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
86 }); 88 });
87 }, 89 },
88 methods: { 90 methods: {
...@@ -163,6 +165,11 @@ ...@@ -163,6 +165,11 @@
163 display: flex; 165 display: flex;
164 flex-direction: column; 166 flex-direction: column;
165 background-color: #EAEDF5; 167 background-color: #EAEDF5;
168 .tips{
169 color: #9B9B9B;
170 margin-left: 2px;
171 margin-bottom: 10px;
172 }
166 .demo-form-inline { 173 .demo-form-inline {
167 margin-top: 18px; 174 margin-top: 18px;
168 .moreSearchBtn { 175 .moreSearchBtn {
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <div class="search"> 3 <div>
4 <el-form :inline="true" class="demo-form-inline"> 4 <p class="tips">查询条件</p>
5 <div class="search">
5 <el-row> 6 <el-row>
6 <el-col :span="8"> 7 <el-col :span="24" style="margin-left: -10px;">
7 <el-form-item label="宗地编码"> 8 <el-form :inline="true" class="demo-form-inline" label-width="106px">
8 <el-input 9 <el-form-item label="宗地编码">
9 v-model="queryData.zddm" 10 <el-input
10 placeholder="输入宗地编码" 11 v-model="queryData.zddm"
11 ></el-input> 12 placeholder="输入宗地编码"
12 </el-form-item> 13 ></el-input>
13 </el-col> 14 </el-form-item>
14 <el-col :span="8"> 15 <el-form-item label="不动产权证号">
15 <el-form-item label="不动产权证号"> 16 <el-input
16 <el-input 17 v-model="queryData.bdcqzh"
17 v-model="queryData.bdcqzh" 18 placeholder="输入坐落地址"
18 placeholder="输入坐落地址" 19 ></el-input>
19 ></el-input> 20 </el-form-item>
20 </el-form-item> 21 <el-form-item label="不动产单元号">
21 </el-col> 22 <el-input
22 <el-col :span="8"> 23 maxlength="28"
23 <el-form-item label="不动产单元号"> 24 v-model="queryData.bdcdyh"
24 <el-input 25 placeholder="输入不动产单元号"
25 maxlength="28" 26 ></el-input>
26 v-model="queryData.bdcdyh" 27 </el-form-item>
27 placeholder="输入不动产单元号" 28 <el-button type="primary" @click="search">查询</el-button>
28 ></el-input> 29 <el-button type="warning" style="margin-left:10px" @click="result">重置</el-button>
29 </el-form-item> 30 </el-form>
30 </el-col> 31 </el-col>
31 </el-row> 32 </el-row>
32 <el-row> 33 <el-row>
33 <el-col :span="8"> 34 <el-col :span="24" style="margin-left: -10px;">
34 <el-form-item label="权利人"> 35 <el-form :inline="true" class="demo-form-inline" label-width="106px">
35 <el-input 36 <el-form-item label="权利人">
36 v-model="queryData.qlrmc" 37 <el-input
37 placeholder="输入权利人姓名" 38 v-model="queryData.qlrmc"
38 ></el-input> 39 placeholder="输入权利人姓名"
39 </el-form-item> 40 ></el-input>
40 </el-col> 41 </el-form-item>
41 <el-col :span="8"> 42 <el-form-item label="坐落">
42 <el-form-item label="坐落"> 43 <el-input
43 <el-input 44 v-model="queryData.zl"
44 v-model="queryData.zl" 45 placeholder="输入坐落地址"
45 placeholder="输入坐落地址" 46 ></el-input>
46 ></el-input> 47 </el-form-item>
47 </el-form-item> 48 </el-form>
48 </el-col>
49 <el-col :span="8">
50 <el-button type="primary" @click="search">查询</el-button>
51 <el-button type="warning" style="margin-left:10px" @click="result">重置</el-button>
52 </el-col> 49 </el-col>
53 </el-row> 50 </el-row>
54 </el-form> 51 </div>
55 52 <p class="tips">查询列表</p>
56 <el-table :data="Data" :height="tableHeight"> 53 <el-table :data="Data" :height="tableHeight">
57 <td class="xh">序号</td> 54 <td class="xh">序号</td>
58 <td class="cz">操作</td> 55 <td class="cz">操作</td>
...@@ -139,21 +136,11 @@ export default { ...@@ -139,21 +136,11 @@ export default {
139 created() {}, 136 created() {},
140 mounted() { 137 mounted() {
141 this.getData(this.queryData); 138 this.getData(this.queryData);
142 if ( 139 this.$nextTick(() => {
143 (document.documentElement.clientWidth || document.body.clientWidth) < 1890 140 this.tableHeight =
144 ) { 141 (document.documentElement.clientHeight ||
145 this.$nextTick(() => { 142 document.body.clientHeight) - 396;
146 this.tableHeight = 143 });
147 (document.documentElement.clientHeight ||
148 document.body.clientHeight) - 355;
149 });
150 } else {
151 this.$nextTick(() => {
152 this.tableHeight =
153 (document.documentElement.clientHeight ||
154 document.body.clientHeight) - 304;
155 });
156 }
157 }, 144 },
158 methods: { 145 methods: {
159 currentChange: function(val) { 146 currentChange: function(val) {
...@@ -200,6 +187,22 @@ export default { ...@@ -200,6 +187,22 @@ export default {
200 padding: 18px; 187 padding: 18px;
201 height: auto; 188 height: auto;
202 } 189 }
190 .search{
191
192 background-color: #FFFFFF;
193 box-sizing: border-box;
194 padding: 18px 0 8px 0;
195 border: 1px solid #E6E6E6;
196 margin-bottom: 18px;
197 }
198 .el-button {
199 width: 100px;
200 }
201 .tips{
202 color: #9B9B9B;
203 margin-left: 2px;
204 margin-bottom: 10px;
205 }
203 206
204 table { 207 table {
205 margin-top: 10px; 208 margin-top: 10px;
...@@ -287,21 +290,21 @@ table:hover { ...@@ -287,21 +290,21 @@ table:hover {
287 width: auto; 290 width: auto;
288 height: auto; 291 height: auto;
289 } 292 }
290 /deep/ .el-form-item__label { 293 // /deep/ .el-form-item__label {
291 width: 96px; 294 // width: 96px;
292 } 295 // }
293 /deep/ .el-form { 296 // /deep/ .el-form {
294 margin-left: -28px; 297 // margin-left: -28px;
295 .el-button{ 298 // .el-button{
296 margin: 0 22px; 299 // margin: 0 22px;
297 } 300 // }
298 } 301 // }
299 .el-form-item{ 302 // .el-form-item{
300 width: 100%; 303 // width: 100%;
301 box-sizing: border-box; 304 // box-sizing: border-box;
302 padding: 0 20px; 305 // padding: 0 20px;
303 /deep/.el-form-item__content{ 306 // /deep/.el-form-item__content{
304 width: calc(100% - 96px); 307 // width: calc(100% - 96px);
305 } 308 // }
306 } 309 // }
307 </style> 310 </style>
......
...@@ -485,14 +485,14 @@ ...@@ -485,14 +485,14 @@
485 }, 485 },
486 xzDz(bsm, index) { 486 xzDz(bsm, index) {
487 this.zdFghData.newZdlist.fwlist[index].push({ 487 this.zdFghData.newZdlist.fwlist[index].push({
488 zbsm: bsm, 488 bsm: bsm,
489 ztype: 'dz' 489 type: 'dz'
490 }) 490 })
491 }, 491 },
492 xzZrz(bsm, index) { 492 xzZrz(bsm, index) {
493 this.zdFghData.newZdlist.fwlist[index].push({ 493 this.zdFghData.newZdlist.fwlist[index].push({
494 zbsm: bsm, 494 bsm: bsm,
495 ztype: 'zrz' 495 type: 'zrz'
496 }) 496 })
497 }, 497 },
498 498
...@@ -502,8 +502,8 @@ ...@@ -502,8 +502,8 @@
502 this.zdDzList[childIndex].hasChoosed = index; 502 this.zdDzList[childIndex].hasChoosed = index;
503 if(this.zdFghData.newZdlist[index].dz.indexOf(obj) < 0){ 503 if(this.zdFghData.newZdlist[index].dz.indexOf(obj) < 0){
504 this.zdFghData.newZdlist[index].fwlist.push({ 504 this.zdFghData.newZdlist[index].fwlist.push({
505 zbsm: bsm, 505 bsm: bsm,
506 ztype: 'dz' 506 type: 'dz'
507 }); 507 });
508 this.zdFghData.newZdlist[index].dz.push(obj); 508 this.zdFghData.newZdlist[index].dz.push(obj);
509 this.tempBsmList.push(bsm); 509 this.tempBsmList.push(bsm);
...@@ -523,8 +523,8 @@ ...@@ -523,8 +523,8 @@
523 this.zdZrzList[childIndex].hasChoosed = index; 523 this.zdZrzList[childIndex].hasChoosed = index;
524 if(this.zdFghData.newZdlist[index].zrz.indexOf(obj) < 0){ 524 if(this.zdFghData.newZdlist[index].zrz.indexOf(obj) < 0){
525 this.zdFghData.newZdlist[index].fwlist.push({ 525 this.zdFghData.newZdlist[index].fwlist.push({
526 zbsm: bsm, 526 bsm: bsm,
527 ztype: 'zrz' 527 type: 'zrz'
528 }) 528 })
529 this.zdFghData.newZdlist[index].zrz.push(obj); 529 this.zdFghData.newZdlist[index].zrz.push(obj);
530 this.tempBsmList.push(bsm); 530 this.tempBsmList.push(bsm);
...@@ -595,8 +595,8 @@ ...@@ -595,8 +595,8 @@
595 }, 595 },
596 handleNodeClick(node) { 596 handleNodeClick(node) {
597 this.zdFghData.newZdlist[this.selectIndex].fwlist.push({ 597 this.zdFghData.newZdlist[this.selectIndex].fwlist.push({
598 zbsm: node.label, 598 bsm: node.label,
599 ztype: '多幢' 599 type: '多幢'
600 } 600 }
601 ); 601 );
602 }, 602 },
......
...@@ -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 :isHb="isHb"></lpbContent> 87 <lpbContent ref="lpbContent" :zrzbsm='zrzbsm' lpbParent = 'isHbfg' :isHb="isHb"></lpbContent>
88 </div> 88 </div>
89 <!-- 右侧图例 --> 89 <!-- 右侧图例 -->
90 <div class="lp-legend"> 90 <div class="lp-legend">
...@@ -538,8 +538,11 @@ export default { ...@@ -538,8 +538,11 @@ export default {
538 .lp-overview { 538 .lp-overview {
539 transition: 0.5s; 539 transition: 0.5s;
540 flex: 1; 540 flex: 1;
541 padding-right: 20px; 541 margin-right: 20px;
542 box-sizing: border-box; 542 box-sizing: border-box;
543 border: 1px solid #ececec;
544 border-top: 0;
545 border-bottom: 0;
543 } 546 }
544 .lp-legend { 547 .lp-legend {
545 transition: 0.5s; 548 transition: 0.5s;
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <p class="tips">查询条件</p>
3 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead> 4 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
5 <p class="tips">查询列表</p>
4 <div class="dataGrid" ref="dataGrid"> 6 <div class="dataGrid" ref="dataGrid">
5 <el-table 7 <el-table
6 :data="tableData" 8 :data="tableData"
...@@ -90,7 +92,7 @@ ...@@ -90,7 +92,7 @@
90 this.queryData.pageSize=this.pageSize 92 this.queryData.pageSize=this.pageSize
91 this.getData(this.queryData) 93 this.getData(this.queryData)
92 this.$nextTick(() => { 94 this.$nextTick(() => {
93 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255; 95 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
94 }); 96 });
95 }, 97 },
96 methods: { 98 methods: {
...@@ -232,6 +234,11 @@ ...@@ -232,6 +234,11 @@
232 display: flex; 234 display: flex;
233 flex-direction: column; 235 flex-direction: column;
234 background-color: #EAEDF5; 236 background-color: #EAEDF5;
237 .tips{
238 color: #9B9B9B;
239 margin-left: 2px;
240 margin-bottom: 10px;
241 }
235 .demo-form-inline { 242 .demo-form-inline {
236 margin-top: 18px; 243 margin-top: 18px;
237 .moreSearchBtn { 244 .moreSearchBtn {
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <p class="tips">查询条件</p>
3 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead> 4 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
5 <p class="tips">查询列表</p>
4 <div class="dataGrid" ref="dataGrid"> 6 <div class="dataGrid" ref="dataGrid">
5 <el-table 7 <el-table
6 :data="tableData" 8 :data="tableData"
...@@ -77,7 +79,8 @@ ...@@ -77,7 +79,8 @@
77 created() { 79 created() {
78 }, 80 },
79 mounted() { 81 mounted() {
80 this.queryData.pageSize=this.pageSize 82 this.queryData.pageSize=this.pageSize;
83 this.queryData.pageNo=this.pageNo;
81 this.getData(this.queryData); 84 this.getData(this.queryData);
82 this.$nextTick(()=>{ 85 this.$nextTick(()=>{
83 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; 86 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
...@@ -188,6 +191,11 @@ ...@@ -188,6 +191,11 @@
188 display: flex; 191 display: flex;
189 flex-direction: column; 192 flex-direction: column;
190 background-color: #EAEDF5; 193 background-color: #EAEDF5;
194 .tips{
195 color: #9B9B9B;
196 margin-left: 2px;
197 margin-bottom: 10px;
198 }
191 .demo-form-inline { 199 .demo-form-inline {
192 margin-top: 18px; 200 margin-top: 18px;
193 .moreSearchBtn { 201 .moreSearchBtn {
......
...@@ -65,13 +65,13 @@ ...@@ -65,13 +65,13 @@
65 <el-button class="radioBtn" label="7" border @click="addBdcdyh" 65 <el-button class="radioBtn" label="7" border @click="addBdcdyh"
66 ><i class="iconfont iconpiliangdanyuanhao"></i>批量单元号</el-button 66 ><i class="iconfont iconpiliangdanyuanhao"></i>批量单元号</el-button
67 > 67 >
68 <el-button 68 <!-- <el-button
69 class="radioBtn" 69 class="radioBtn"
70 label="7" 70 label="7"
71 border 71 border
72 @click="hcxlz" 72 @click="hcxlz"
73 ><i class="iconfont iconhuzhongxinlazong"></i>户重新落宗</el-button 73 ><i class="iconfont iconhuzhongxinlazong"></i>户重新落宗</el-button
74 > 74 > -->
75 <el-button 75 <el-button
76 class="radioBtn" 76 class="radioBtn"
77 label="7" 77 label="7"
...@@ -257,10 +257,6 @@ ...@@ -257,10 +257,6 @@
257 :bsms="bsms" 257 :bsms="bsms"
258 @close="hcxlzClose" 258 @close="hcxlzClose"
259 ></h-cxlz> 259 ></h-cxlz>
260 <!-- 双击户的弹出框 -->
261 <el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" >
262 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
263 </el-dialog>
264 </div> 260 </div>
265 </template> 261 </template>
266 262
...@@ -275,7 +271,6 @@ import LineTree from "@components/lineTree/lineTree"; ...@@ -275,7 +271,6 @@ import LineTree from "@components/lineTree/lineTree";
275 import addLjz from "./ljz/index"; 271 import addLjz from "./ljz/index";
276 import addZdy from "./zdy/index"; 272 import addZdy from "./zdy/index";
277 import addCh from "./ch/index"; 273 import addCh from "./ch/index";
278 import hbj from "./hbj/index";
279 import lpbContent from "./lpbContent/index"; 274 import lpbContent from "./lpbContent/index";
280 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb"; 275 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
281 276
...@@ -291,14 +286,12 @@ export default { ...@@ -291,14 +286,12 @@ export default {
291 PlSh, 286 PlSh,
292 PlH, 287 PlH,
293 PlZl, 288 PlZl,
294 hbj,
295 HCxlz, 289 HCxlz,
296 }, 290 },
297 props: {}, 291 props: {},
298 data() { 292 data() {
299 return { 293 return {
300 bsms: [], 294 bsms: [],
301 hbsm: "",
302 dialogVisible: false, 295 dialogVisible: false,
303 plcVisible: false, 296 plcVisible: false,
304 plhVisible: false, 297 plhVisible: false,
...@@ -565,12 +558,7 @@ export default { ...@@ -565,12 +558,7 @@ export default {
565 getHbsm(data, type) { 558 getHbsm(data, type) {
566 if (type) { 559 if (type) {
567 // 双击 560 // 双击
568 this.hbsm = data; 561
569 this.$store.state.hbsm=this.data;
570 this.hbjVisible = true;
571 this.$nextTick(function() {
572 this.$refs.hbj.getHInfo(this.hbsm);
573 });
574 } else { 562 } else {
575 //单击 TO DO 563 //单击 TO DO
576 this.bsms = data; 564 this.bsms = data;
......
...@@ -302,7 +302,9 @@ ...@@ -302,7 +302,9 @@
302 <li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li> 302 <li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li>
303 <!-- 分割 --> 303 <!-- 分割 -->
304 <li v-show="rightClickFlag == 'fg'" @click="handleFg">户分割</li> 304 <li v-show="rightClickFlag == 'fg'" @click="handleFg">户分割</li>
305 <!-- <li v-show="rightClickFlag == 'fg'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li> --> 305 <!-- 范围属性变更 -->
306 <li v-show="rightClickFlag == 'fwsxbg'" @click="handleFwsxbg">变更信息</li>
307
306 308
307 </ul> 309 </ul>
308 <!-- 层操作弹框 --> 310 <!-- 层操作弹框 -->
...@@ -362,6 +364,10 @@ ...@@ -362,6 +364,10 @@
362 :type="scyclx" 364 :type="scyclx"
363 @loading="loadingData($store.state.zrzbsm,$parent.scyclx)" 365 @loading="loadingData($store.state.zrzbsm,$parent.scyclx)"
364 ></move-h> 366 ></move-h>
367 <!-- 双击户的弹出框 -->
368 <el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="80%" >
369 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
370 </el-dialog>
365 </div> 371 </div>
366 </template> 372 </template>
367 <script> 373 <script>
...@@ -369,22 +375,24 @@ import moveH from "@components/moveH/moveH"; ...@@ -369,22 +375,24 @@ import moveH from "@components/moveH/moveH";
369 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb"; 375 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
370 import { hhb,hfg } from "@api/h"; 376 import { hhb,hfg } from "@api/h";
371 import { Message } from 'element-ui'; 377 import { Message } from 'element-ui';
378 import { fwsxbgbl } from "@api/common";
379 import hbj from "../hbj/index";
372 export default { 380 export default {
373 name: "", 381 name: "",
374 components: { moveH }, 382 components: { moveH,hbj },
375 props: { 383 props: {
376 isHbfg:{
377 type:Boolean,
378 default:false
379 },
380 zrzbsm:{ 384 zrzbsm:{
381 type:String, 385 type:String,
382 default:'' 386 default:''
383 }, 387 },
388 lpbParent:{
389 type:String,
390 default:'isLpb'
391 },
384 isHb:{ 392 isHb:{
385 type:Boolean, 393 type:Boolean,
386 default:true 394 default:true
387 } 395 },
388 }, 396 },
389 data() { 397 data() {
390 return { 398 return {
...@@ -394,6 +402,7 @@ export default { ...@@ -394,6 +402,7 @@ export default {
394 cs: [], 402 cs: [],
395 zdys: [], 403 zdys: [],
396 }, 404 },
405 hbjVisible:false,
397 lpbContentWidth: "", 406 lpbContentWidth: "",
398 ljzWidth: 10000, 407 ljzWidth: 10000,
399 zdyWidth: 1000, 408 zdyWidth: 1000,
...@@ -402,6 +411,7 @@ export default { ...@@ -402,6 +411,7 @@ export default {
402 ljzcHeight: 0, //逻辑幢下层户的div高度 411 ljzcHeight: 0, //逻辑幢下层户的div高度
403 ljzzdyHeight: 0, //逻辑幢下幢单元的div高度 412 ljzzdyHeight: 0, //逻辑幢下幢单元的div高度
404 loading: true, 413 loading: true,
414 hbsm:'',
405 hbsmList: [], 415 hbsmList: [],
406 cbsmList: [], 416 cbsmList: [],
407 time: null, //区分单双击事件的定时器 417 time: null, //区分单双击事件的定时器
...@@ -614,11 +624,17 @@ export default { ...@@ -614,11 +624,17 @@ export default {
614 //户双击事件 624 //户双击事件
615 dbclick(bsm) { 625 dbclick(bsm) {
616 clearTimeout(this.time); 626 clearTimeout(this.time);
627 this.hbsm = bsm;
628 this.$store.state.hbsm=this.data;
629 this.hbjVisible = true;
630 this.$nextTick(function() {
631 this.$refs.hbj.getHInfo(this.hbsm);
632 });
617 // if (this.isHbfg) { 633 // if (this.isHbfg) {
618 634
619 // }else{ 635 // }else{
620 // this.hbsmList.push(bsm); // 将户bsm放进hbsmList 636 // this.hbsmList.push(bsm); // 将户bsm放进hbsmList
621 this.$parent.getHbsm(bsm, true); 637 // this.$parent.getHbsm(bsm, true);
622 // } 638 // }
623 }, 639 },
624 //删除多重数组中的某一项 640 //删除多重数组中的某一项
...@@ -646,49 +662,59 @@ export default { ...@@ -646,49 +662,59 @@ export default {
646 openMenu(e, item, type) { 662 openMenu(e, item, type) {
647 this.lpbChLeft = e.pageX; 663 this.lpbChLeft = e.pageX;
648 this.lpbChTop = e.pageY; 664 this.lpbChTop = e.pageY;
649 if (this.isHbfg) { 665 this.chData = item;
650 this.rightClickFlag = this.isHb ? 'hb':'fg'; 666 switch (this.lpbParent) {
651 if (this.fghbChoosedList.length>1) { 667 case 'isHbfg':
652 //合并 668 this.rightClickFlag = this.isHb ? 'hb':'fg';
653 this.lpbChVisible = true; 669 if (this.fghbChoosedList.length>1) {
654 //判断选中户可以执行的合并类型 670 //合并
655 let chIsSame = this.fghbChoosedList.every((item)=> { 671 this.lpbChVisible = true;
656 return item.ch == this.fghbChoosedList[0].ch; 672 //判断选中户可以执行的合并类型
657 }); 673 let chIsSame = this.fghbChoosedList.every((item)=> {
658 let hhIsSame = this.fghbChoosedList.every((item)=> { 674 return item.ch == this.fghbChoosedList[0].ch;
659 return item.hh == this.fghbChoosedList[0].hh; 675 });
660 }); 676 let hhIsSame = this.fghbChoosedList.every((item)=> {
661 this.$nextTick(()=>{ 677 return item.hh == this.fghbChoosedList[0].hh;
662 if(chIsSame){ 678 });
663 this.canHb = 'zyhb' 679 this.$nextTick(()=>{
664 }else if(hhIsSame){ 680 if(chIsSame){
665 this.canHb = 'sxhb' 681 this.canHb = 'zyhb'
682 }else if(hhIsSame){
683 this.canHb = 'sxhb'
684 }else{
685 this.canHb = ''
686 }
687 })
688 }else{
689 //分割
690 this.lpbChVisible = true;
691 this.fgData.oldbsm = item.bsm;
692 console.log(item,'item');
693 //判断户的实际sjcs为1，只能水平分割
694 this.fgData.fgfx = item.sjcs == 1 ? 0 : 1;
695 if(item.sjcs == 1){
696 //判断户的实际sjcs为1，只能水平分割
697 this.fgData.fgfx = 0;
698 this.fgData.fghs = '';
666 }else{ 699 }else{
667 this.canHb = '' 700 this.fgData.fgfx = 1;
701 //判断户的实际sjhs不为1，分割户数为sjhs的值
702 this.fgData.fghs = item.sjcs;
668 } 703 }
669 })
670 }else{
671 //分割
672 this.lpbChVisible = true;
673 this.fgData.oldbsm = item.bsm;
674 console.log(item,'item');
675 //判断户的实际sjcs为1，只能水平分割
676 this.fgData.fgfx = item.sjcs == 1 ? 0 : 1;
677 if(item.sjcs == 1){
678 //判断户的实际sjcs为1，只能水平分割
679 this.fgData.fgfx = 0;
680 this.fgData.fghs = '';
681 }else{
682 this.fgData.fgfx = 1;
683 //判断户的实际sjhs不为1，分割户数为sjhs的值
684 this.fgData.fghs = item.sjcs;
685 } 704 }
686 } 705 break;
687 }else{ 706 case 'isFwsxbg':
688 console.log(e, "e"); 707 console.log(item,'item');
689 this.chData = item; 708 this.rightClickFlag = 'fwsxbg';
690 this.rightClickFlag = type; 709 this.lpbChVisible = true;
691 this.lpbChVisible = true; 710 break;
711 case 'isLpb':
712 this.rightClickFlag = type;
713 this.lpbChVisible = true;
714 break;
715
716 default:
717 break;
692 } 718 }
693 }, 719 },
694 // 户单元状态点击事件 720 // 户单元状态点击事件
...@@ -851,6 +877,33 @@ export default { ...@@ -851,6 +877,33 @@ export default {
851 } 877 }
852 }) 878 })
853 .catch(() => {}); 879 .catch(() => {});
880 },
881 //范围属性变更
882 handleFwsxbg(){
883 let params = { bsm: this.chData.bsm, type: 'h'};
884 this.$confirm('是否确定范围属性变更?', '提示', {
885 confirmButtonText: '确定',
886 cancelButtonText: '取消',
887 type: 'warning'
888 }).then(() => {
889 fwsxbgbl(params)
890 .then((res) => {
891 if (res.code == 200) {
892 console.log('成功');
893 this.getLpb(this.zrzbsm,this.scyclx);
894 this.dbclick(this.chData.bsm);
895 } else {
896 this.$message({
897 message: res.message,
898 type: "warning",
899 });
900 }
901 }).catch((error) => {
902
903 });
904 }).catch(() => {
905
906 });
854 } 907 }
855 }, 908 },
856 computed: { 909 computed: {
......