Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
79c6ad3b by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents d72e43cd 2b2e9512
Inline Side-by-side
Showing 9 changed files with 86 additions and 29 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;
......
...@@ -280,6 +280,7 @@ export default { ...@@ -280,6 +280,7 @@ export default {
280 if (res.success) { 280 if (res.success) {
281 this.pd = res.result; 281 this.pd = res.result;
282 this.$store.state.newZdbsm = ''; 282 this.$store.state.newZdbsm = '';
283 this.$store.state.treeData = res.result;
283 } 284 }
284 }); 285 });
285 }, 286 },
......
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 {
......
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
93 this.$nextTick(() => { 93 this.$nextTick(() => {
94 this.tableHeight = 94 this.tableHeight =
95 (document.documentElement.clientHeight || document.body.clientHeight) - 95 (document.documentElement.clientHeight || document.body.clientHeight) -
96 304; 96 340;
97 }); 97 });
98 }, 98 },
99 methods: { 99 methods: {
......
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"
...@@ -188,6 +190,11 @@ ...@@ -188,6 +190,11 @@
188 display: flex; 190 display: flex;
189 flex-direction: column; 191 flex-direction: column;
190 background-color: #EAEDF5; 192 background-color: #EAEDF5;
193 .tips{
194 color: #9B9B9B;
195 margin-left: 2px;
196 margin-bottom: 10px;
197 }
191 .demo-form-inline { 198 .demo-form-inline {
192 margin-top: 18px; 199 margin-top: 18px;
193 .moreSearchBtn { 200 .moreSearchBtn {
......