Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
4b2ce327 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 25b586d1 599df7a2
Inline Side-by-side
Showing 41 changed files with 253 additions and 55 deletions
...@@ -47,6 +47,22 @@ export function getListByPbsm(pbsm) { ...@@ -47,6 +47,22 @@ export function getListByPbsm(pbsm) {
47 } 47 }
48 48
49 /** 49 /**
50 * 跟据所有权类型及其所在行政区，地籍区，地籍子区查询宗地和自然幢信息
51 */
52 export function getZdDetailList(data) {
53 return request({
54 url: 'system/xzq/getZdDetailList',
55 method: 'get',
56 params: {
57 xzqbsm:data.xzqbsm,
58 djqbsm:data.djqbsm,
59 djzqbsm:data.djzqbsm,
60 syqlx:data.syqlx
61 }
62 })
63 }
64
65 /**
50 * 通过名称获取字典 66 * 通过名称获取字典
51 */ 67 */
52 export function getDdicByMC(mc) { 68 export function getDdicByMC(mc) {
......
...@@ -89,7 +89,18 @@ ol, ul { list-style:none; } ...@@ -89,7 +89,18 @@ ol, ul { list-style:none; }
89 } 89 }
90 //二级菜单样式 90 //二级菜单样式
91 .tabs{ 91 .tabs{
92 >.is-top>.is-top>.el-tabs__nav-scroll{ 92 >.el-tabs__content{
93 position: unset;
94 margin-top: 50px;
95 }
96 >.is-top{
97 position: -webkit-fixed;
98 position: fixed;
99 top: 60px;
100 z-index: 999;
101 width: 100%;
102 margin-bottom: 0;
103 >.is-top>.el-tabs__nav-scroll{
93 height: 50px; 104 height: 50px;
94 background-color: #ffffff; 105 background-color: #ffffff;
95 box-sizing: border-box; 106 box-sizing: border-box;
...@@ -111,6 +122,7 @@ ol, ul { list-style:none; } ...@@ -111,6 +122,7 @@ ol, ul { list-style:none; }
111 } 122 }
112 } 123 }
113 } 124 }
125 }
114 } 126 }
115 //弹框遮罩层样式 127 //弹框遮罩层样式
116 .v-modal{ 128 .v-modal{
...@@ -121,9 +133,6 @@ ol, ul { list-style:none; } ...@@ -121,9 +133,6 @@ ol, ul { list-style:none; }
121 -webkit-box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4); 133 -webkit-box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4);
122 box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4); 134 box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4);
123 } 135 }
124 .el-tabs__content{
125 position: unset;
126 }
127 // 自定义右键菜单样式 136 // 自定义右键菜单样式
128 .contextmenu { 137 .contextmenu {
129 margin: 0; 138 margin: 0;
......
1 <template> 1 <template>
2 <div class="tree_item_box"> 2 <div class="tree_item_box" :class="list.length>10 ? 'ofy_scroll':''" :style="{maxHeight:(list.length > 10 ? treeXzqHeight:'unset')+'px'}">
3 <div 3 <div
4 class="column-start-start linkLine_default" 4 class="column-start-start linkLine_default"
5 v-for="(item, s_index) in list" 5 v-for="(item, s_index) in list"
...@@ -34,6 +34,14 @@ ...@@ -34,6 +34,14 @@
34 }" 34 }"
35 ></div> 35 ></div>
36 <div 36 <div
37 v-if="item.children==null"
38 class="reTree_icon reTree_expand_icon"
39 :style="{
40 height: (size || 14 * 1.2) + 'px',
41 width: (size || 14 * 1.2) + 'px',
42 }"
43 ></div>
44 <div
37 class="layer_text nowrap" 45 class="layer_text nowrap"
38 @contextmenu.prevent="openMenu($event, item,list)" 46 @contextmenu.prevent="openMenu($event, item,list)"
39 :class="{ 47 :class="{
...@@ -53,6 +61,7 @@ ...@@ -53,6 +61,7 @@
53 </div> 61 </div>
54 </template> 62 </template>
55 <script> 63 <script>
64 import {getZdDetailList} from "../../api/common"
56 export default { 65 export default {
57 name: "line-item", 66 name: "line-item",
58 props: { 67 props: {
...@@ -62,6 +71,12 @@ export default { ...@@ -62,6 +71,12 @@ export default {
62 return []; 71 return [];
63 }, 72 },
64 }, 73 },
74 formatData: {
75 type: Array,
76 default: () => {
77 return [];
78 },
79 },
65 size: { 80 size: {
66 type: Number, 81 type: Number,
67 default: 14, 82 default: 14,
...@@ -77,20 +92,43 @@ export default { ...@@ -77,20 +92,43 @@ export default {
77 }, 92 },
78 data() { 93 data() {
79 return { 94 return {
80 time:null 95 time:null,
96 treeXzqHeight:0,
81 } 97 }
82 }, 98 },
99 mounted(){
100 this.$nextTick(()=>{
101 this.treeXzqHeight = this.$parent.$el.clientHeight-(this.formatData.length-1)*26+60;
102 })
103 },
83 methods: { 104 methods: {
84 itemClick(item) { 105 itemClick(item) {
85 let self = this; 106 let self = this;
86 // 开启延时器，300ms的间隔区分单击和双击，解决双击时执行两次单击事件 107 // 开启延时器，300ms的间隔区分单击和双击，解决双击时执行两次单击事件
87 clearTimeout(self.time); 108 clearTimeout(self.time);
88 self.time = setTimeout(() => { 109 self.time = setTimeout(() => {
89
90 item.expand = item.expand == undefined? true:!item.expand; 110 item.expand = item.expand == undefined? true:!item.expand;
91 self.$emit("itemClick", item); 111 // self.$emit("itemClick", item);
92 if (!item.children) { 112 if (!item.children) {
93 self.$emit("valClick", item); 113 let data = {
114 xzqbsm:item.xzq,
115 djqbsm:item.djq,
116 djzqbsm:item.djzq,
117 syqlx:item.dm
118 }
119 getZdDetailList(data).then((res) => {
120 if (res.result.length>0) {
121 res.result.forEach(i=>{
122 if(i.children.length>0){
123 i.expand = false;
124 }
125 })
126 self.$emit("ownerMethod", item,res.result);
127 }
128 })
129 .catch((error) => {
130
131 });
94 } 132 }
95 }, 300); 133 }, 300);
96 }, 134 },
...@@ -190,6 +228,10 @@ export default { ...@@ -190,6 +228,10 @@ export default {
190 width: 100%; 228 width: 100%;
191 cursor: pointer; 229 cursor: pointer;
192 } 230 }
231 .ofy_scroll{
232 overflow-y: scroll;
233 overflow-x: hidden;
234 }
193 .basic_layer { 235 .basic_layer {
194 width: 100%; 236 width: 100%;
195 position: relative; 237 position: relative;
...@@ -222,7 +264,7 @@ export default { ...@@ -222,7 +264,7 @@ export default {
222 position: relative; 264 position: relative;
223 // padding-bottom: 15px; 265 // padding-bottom: 15px;
224 width: 100%; 266 width: 100%;
225 padding-left: 40px; 267 padding-left: 25px;
226 } 268 }
227 .white_layer { 269 .white_layer {
228 color: black!important; 270 color: black!important;
...@@ -243,7 +285,7 @@ export default { ...@@ -243,7 +285,7 @@ export default {
243 content: ""; 285 content: "";
244 position: absolute; 286 position: absolute;
245 height: 1px; 287 height: 1px;
246 width: 22px; 288 width: 16px;
247 left: 8px; 289 left: 8px;
248 top: 8px; 290 top: 8px;
249 opacity: .5; 291 opacity: .5;
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
34 <lineItem 34 <lineItem
35 v-if="item.expand && item.children.length > 0" 35 v-if="item.expand && item.children.length > 0"
36 v-on="$listeners" 36 v-on="$listeners"
37 @ownerMethod="ownerMethod(arguments)"
37 @changeTop="changeTop" 38 @changeTop="changeTop"
38 @changeZdData="changeZdData" 39 @changeZdData="changeZdData"
39 @changeLeft="changeLeft" 40 @changeLeft="changeLeft"
...@@ -45,6 +46,7 @@ ...@@ -45,6 +46,7 @@
45 :visible="visible" 46 :visible="visible"
46 :size="size" 47 :size="size"
47 :islpb="islpb" 48 :islpb="islpb"
49 :formatData="formatData"
48 ></lineItem> 50 ></lineItem>
49 </div> 51 </div>
50 52
...@@ -184,8 +186,7 @@ export default { ...@@ -184,8 +186,7 @@ export default {
184 this.dialogVisible = false; 186 this.dialogVisible = false;
185 }, 187 },
186 preDealData(list) { 188 preDealData(list) {
187 // //楼盘表目录树没有expand属性 189 //楼盘表目录树没有expand属性
188 // list[0].expand = list[0].expand == undefined ? true:list[0].expand;
189 list.forEach((x) => { 190 list.forEach((x) => {
190 if (x.expand == undefined) this.$set(x, "expand", true); 191 if (x.expand == undefined) this.$set(x, "expand", true);
191 if (x.children && x.children.length > 0) { 192 if (x.children && x.children.length > 0) {
...@@ -213,8 +214,42 @@ export default { ...@@ -213,8 +214,42 @@ export default {
213 }, 214 },
214 itemClick(item) { 215 itemClick(item) {
215 // item.expand = item.expand == undefined? true:!item.expand; 216 // item.expand = item.expand == undefined? true:!item.expand;
217 console.log(item,'item');
218 console.log(this.formatData,'this.formatData');
219 this.formatData.forEach(i=>{
220 if(i.bsm != item.bsm){
221 i.expand = false
222 }else{
223 // i.expand = !item.expand
224 }
225 })
216 item.expand = !item.expand; 226 item.expand = !item.expand;
217 this.$emit("itemClick", item); 227 // this.$emit("itemClick", item);
228 },
229 //给所有权类型添加子节点
230 ownerMethod(arr){
231 let item = arr[0];
232 let list = arr[1]
233 this.formatData.forEach(i=>{
234 if (i.bsm == item.xzq){
235 i.children.forEach(j=>{
236 if (j.bsm == item.djq) {
237 j.children.forEach(k=>{
238 if(k.bsm == item.djzq){
239 k.children.forEach(n=>{
240 if(n.dm == item.dm){
241 this.$nextTick(()=>{
242 n.children = list;
243 })
244 }
245 })
246 }
247 })
248 }
249 })
250 }
251 })
252 console.log(this.formatData,'formatData');
218 }, 253 },
219 //自然幢右键点击事件 254 //自然幢右键点击事件
220 openMenu(e,item){ 255 openMenu(e,item){
...@@ -274,6 +309,7 @@ export default { ...@@ -274,6 +309,7 @@ export default {
274 flex-direction: column; 309 flex-direction: column;
275 justify-content: flex-start; 310 justify-content: flex-start;
276 align-items: center; 311 align-items: center;
312
277 } 313 }
278 .row-flex-start { 314 .row-flex-start {
279 display: flex; 315 display: flex;
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
43 <el-form-item class="demo-form-inline" label="查询范围"> 43 <el-form-item class="demo-form-inline" label="查询范围">
44 <el-checkbox-group v-model="queryData.dylxs" @change="query"> 44 <el-checkbox-group v-model="queryData.dylxs" @change="query">
45 <el-checkbox label="zd" name="type">宗地</el-checkbox> 45 <el-checkbox label="zd" name="type">宗地</el-checkbox>
46 <el-checkbox label="dz" name="type">多幢</el-checkbox>
46 <el-checkbox label="zrz" name="type">自然幢</el-checkbox> 47 <el-checkbox label="zrz" name="type">自然幢</el-checkbox>
47 <el-checkbox label="h" name="type">户</el-checkbox> 48 <el-checkbox label="h" name="type">户</el-checkbox>
48 <el-checkbox label="gzw" name="type">构筑物</el-checkbox> 49 <el-checkbox label="gzw" name="type">构筑物</el-checkbox>
......
...@@ -33,5 +33,9 @@ let bdcLxArray = [ ...@@ -33,5 +33,9 @@ let bdcLxArray = [
33 label: "户", 33 label: "户",
34 value: "h", 34 value: "h",
35 }, 35 },
36 {
37 label: "多幢",
38 value: "dz",
39 },
36 ]; 40 ];
37 createFilter("bdcLxFilter", bdcLxArray); 41 createFilter("bdcLxFilter", bdcLxArray);
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -63,25 +63,25 @@ const constantRoutes = [ ...@@ -63,25 +63,25 @@ const constantRoutes = [
63 path: "/zrz", 63 path: "/zrz",
64 name: "自然幢", 64 name: "自然幢",
65 code: "1-1", 65 code: "1-1",
66 component: () => import("@/views/systemZRZ/index"), 66 component: () => import("@/views/zrz/index"),
67 }, 67 },
68 { 68 {
69 path: "/dz", 69 path: "/dz",
70 name: "多幢", 70 name: "多幢",
71 code: "1-2", 71 code: "1-2",
72 component: () => import("@/views/systemDZ/index"), 72 component: () => import("@/views/dz/index"),
73 }, 73 },
74 { 74 {
75 path: "/zd", 75 path: "/zd",
76 name: "宗地", 76 name: "宗地",
77 code: "1-5", 77 code: "1-5",
78 component: () => import("@/views/systemZD/index"), 78 component: () => import("@/views/zd/index"),
79 }, 79 },
80 { 80 {
81 path: "/c", 81 path: "/c",
82 name: "层", 82 name: "层",
83 code: "1-7", 83 code: "1-7",
84 component: () => import("@/views/systemZRZ/c/index"), 84 component: () => import("@/views/zrz/c/index"),
85 }, 85 },
86 ], 86 ],
87 }, 87 },
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 /> 10 />
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"> 13 <div class="treeModule" :style="{height:treeHeight+'px'}">
14 <LineTree :pd="pd" @itemClick="itemClick"></LineTree> 14 <LineTree :pd="pd" @itemClick="itemClick"></LineTree>
15 </div> 15 </div>
16 </el-aside> 16 </el-aside>
...@@ -123,6 +123,7 @@ export default { ...@@ -123,6 +123,7 @@ export default {
123 }, 123 },
124 pd: [], 124 pd: [],
125 dialogVisible: false, 125 dialogVisible: false,
126 treeHeight:0, //树结构区域高度
126 }; 127 };
127 }, 128 },
128 computed: { 129 computed: {
...@@ -193,6 +194,9 @@ export default { ...@@ -193,6 +194,9 @@ export default {
193 // } 194 // }
194 this.getDic(); 195 this.getDic();
195 this.getTreeList(); 196 this.getTreeList();
197 this.$nextTick(()=>{
198 this.treeHeight = this.$el.clientHeight - 120;
199 });
196 }, 200 },
197 methods: { 201 methods: {
198 //请求字典数据 202 //请求字典数据
......
...@@ -14,8 +14,9 @@ ...@@ -14,8 +14,9 @@
14 </td> 14 </td>
15 <td colspan="2" align="center" >不动产单元号</td> 15 <td colspan="2" align="center" >不动产单元号</td>
16 <td colspan="4" > 16 <td colspan="4" >
17 <el-input v-model="form.bdcdyh" style="width: 70%"></el-input> 17 <el-input v-model="form.bdcdyh" style="width: 70%" v-show="form.bdcdyh===''||form.bdcdyh==null"></el-input>
18 <el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button> 18 <el-input v-model="form.bdcdyh" v-show="form.bdcdyh!==''&&form.bdcdyh!=null"></el-input>
19 <el-button @click.prevent="generatorCode" size="mini" v-show="form.bdcdyh===''||form.bdcdyh==null" type="primary" style="width:25%;margin-left:3%">生成</el-button>
19 </td> 20 </td>
20 </tr> 21 </tr>
21 <tr height="30"> 22 <tr height="30">
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" @tab-click="handleClick">
4 <el-tab-pane label="自然幢信息" name="dzxx"><dzxx></dzxx></el-tab-pane> 4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx></dzxx></el-tab-pane>
5 </el-tabs> 5 </el-tabs>
6 </div> 6 </div>
7 </template> 7 </template>
......
...@@ -79,7 +79,9 @@ ...@@ -79,7 +79,9 @@
79 pageNo: this.pageNo, 79 pageNo: this.pageNo,
80 pageSize: this.pageSize, 80 pageSize: this.pageSize,
81 }) 81 })
82 this.$nextTick(()=>{
82 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; 83 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
84 })
83 }, 85 },
84 methods: { 86 methods: {
85 handleCurrentChange(val) { 87 handleCurrentChange(val) {
......
1 <template> 1 <template>
2 <div> 2 <div class="fg" ref="fgBox">
3 <el-tabs v-model="tabName"> 3 <el-tabs v-model="tabName" type="card" class="menu">
4 <el-tab-pane label="宗地分割" name="zd"> 4 <el-tab-pane label="宗地分割" name="zd">
5 <div class="main"> 5 <div class="fg-tabs">
6 <div class="button"> 6 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
7 <el-button type="primary" @click="newAdd">新增</el-button>
8 </div>
9 <div class="table"> 7 <div class="table">
8 <span class="tips">分割前宗地信息</span>
10 <table border="1"> 9 <table border="1">
11 <tr> 10 <tr>
12 <td>序号</td> 11 <td>序号</td>
...@@ -39,7 +38,7 @@ ...@@ -39,7 +38,7 @@
39 </table> 38 </table>
40 </div> 39 </div>
41 <div class="fgh"> 40 <div class="fgh">
42 <span>分割后宗地:</span> 41 <span class="tips">分割后宗地信息</span>
43 <table border="1"> 42 <table border="1">
44 <tr> 43 <tr>
45 <td>操作</td> 44 <td>操作</td>
...@@ -167,17 +166,16 @@ ...@@ -167,17 +166,16 @@
167 166
168 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" 167 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
169 @close="close"></query-data> 168 @close="close"></query-data>
170 <div class="header-button"> 169 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
171 <el-button type="primary" @click="save">保存</el-button> 170 <el-button type="primary" @click="save">保存</el-button>
172 </div> 171 </div>
173 </div> 172 </div>
174 </el-tab-pane> 173 </el-tab-pane>
175 <el-tab-pane label="多幢分割" name="dz"> 174 <el-tab-pane label="多幢分割" name="dz">
176 <div class="main"> 175 <div class="fg-tabs">
177 <div class="button"> 176 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
178 <el-button type="primary" @click="newAdd">新增</el-button>
179 </div>
180 <div class="table"> 177 <div class="table">
178 <span class="tips">分割前宗地信息</span>
181 <table border="1"> 179 <table border="1">
182 <tr> 180 <tr>
183 <td>序号</td> 181 <td>序号</td>
...@@ -210,7 +208,7 @@ ...@@ -210,7 +208,7 @@
210 </table> 208 </table>
211 </div> 209 </div>
212 <div class="fgh"> 210 <div class="fgh">
213 <span>分割后宗地:</span> 211 <span class="tips">分割后宗地信息</span>
214 <table border="1"> 212 <table border="1">
215 <tr> 213 <tr>
216 <td>操作</td> 214 <td>操作</td>
...@@ -337,17 +335,16 @@ ...@@ -337,17 +335,16 @@
337 335
338 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']" 336 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
339 @close="close"></query-data> 337 @close="close"></query-data>
340 <div class="header-button"> 338 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
341 <el-button type="primary" @click="save">保存</el-button> 339 <el-button type="primary" @click="save">保存</el-button>
342 </div> 340 </div>
343 </div> 341 </div>
344 </el-tab-pane> 342 </el-tab-pane>
345 <el-tab-pane label="户分割" name="h"> 343 <el-tab-pane label="户分割" name="h">
346 <div class="main"> 344 <div class="fg-tabs">
347 <div class="button"> 345 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
348 <el-button type="primary" @click="newAdd">新增</el-button>
349 </div>
350 <div class="table"> 346 <div class="table">
347 <span class="tips">分割前宗地信息</span>
351 <table border="1"> 348 <table border="1">
352 <tr> 349 <tr>
353 <td>序号</td> 350 <td>序号</td>
...@@ -380,7 +377,7 @@ ...@@ -380,7 +377,7 @@
380 </table> 377 </table>
381 </div> 378 </div>
382 <div class="fgh"> 379 <div class="fgh">
383 <span>分割后宗地:</span> 380 <span class="tips">分割后宗地信息</span>
384 <table border="1"> 381 <table border="1">
385 <tr> 382 <tr>
386 <td>操作</td> 383 <td>操作</td>
...@@ -507,13 +504,26 @@ ...@@ -507,13 +504,26 @@
507 504
508 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']" 505 <query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']"
509 @close="close"></query-data> 506 @close="close"></query-data>
510 <div class="header-button"> 507 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
511 <el-button type="primary" @click="save">保存</el-button> 508 <el-button type="primary" @click="save">保存</el-button>
512 </div> 509 </div>
513 </div> 510 </div>
514 </el-tab-pane> 511 </el-tab-pane>
515 </el-tabs> 512 </el-tabs>
516 </div> 513 </div>
514 <!-- <div class="lpb">
515 <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
516 <el-tab-pane label="编辑楼盘" name="edit">
517 <bjlp></bjlp>
518 </el-tab-pane>
519 <el-tab-pane label="预览楼盘" name="preview">
520 <yllp></yllp>
521 </el-tab-pane>
522 <el-tab-pane label="详细信息" name="detail">
523 <xxxx></xxxx>
524 </el-tab-pane>
525 </el-tabs>
526 </div> -->
517 </template> 527 </template>
518 528
519 <script> 529 <script>
...@@ -619,7 +629,7 @@ ...@@ -619,7 +629,7 @@
619 oldZdbsm: "", 629 oldZdbsm: "",
620 newZdlist: [] 630 newZdlist: []
621 }, 631 },
622 632 fgBoxWidth:0,
623 } 633 }
624 }, 634 },
625 created() { 635 created() {
...@@ -627,6 +637,9 @@ ...@@ -627,6 +637,9 @@
627 mounted() { 637 mounted() {
628 this.getXzqList(); 638 this.getXzqList();
629 this.getzdtzm(); 639 this.getzdtzm();
640 this.$nextTick(()=>{
641 this.fgBoxWidth = this.$refs.fgBox.clientWidth;
642 })
630 }, 643 },
631 methods: { 644 methods: {
632 handleNodeClick(node) { 645 handleNodeClick(node) {
...@@ -789,15 +802,65 @@ ...@@ -789,15 +802,65 @@
789 } 802 }
790 </script> 803 </script>
791 <style scoped lang="less"> 804 <style scoped lang="less">
805 .fg{
806 .menu{
807 /deep/.el-tabs__content{
808 position: unset;
809 margin-top: 62px;
810 overflow: visible;
811 }
812 /deep/.el-tabs__header{
813 position: -webkit-fixed;
814 position: fixed;
815 top: 120px;
816 z-index: 999;
817 width: 100%;
818 margin-bottom: 0;
819 border: 0;
820 /deep/.el-tabs__nav-scroll{
821 height: 50px;
822 box-sizing: border-box;
823 padding-left: 20px;
824 .el-tabs__active-bar{
825 display: none;
826 }
827 >.el-tabs__nav{
828 border: 0;
829 >.el-tabs__item{
830 border: 1px solid #DEDEDE;
831 height: 36px;
832 line-height: 36px;
833 padding: 0 20px;
834 margin: 9px 10px 9px 0;
835 background-color: #ffffff;
836 }
837 .is-active{
838 color: #006CFF;
839 border: 1px solid #006CFF;
840 }
841 }
842 }
843 }
844 }
845 }
792 .v-model { 846 .v-model {
793 z-index: 99 !important; 847 z-index: 99 !important;
794 } 848 }
795 849
796 .main { 850 .fg-tabs {
851 height: auto;
852 width: 100%;
853 position: relative;
854 .table{
855 margin-top: 12px;
797 box-sizing: border-box; 856 box-sizing: border-box;
798 padding: 18px; 857 padding: 18px;
799 height: auto; 858 }
800 width: 80%; 859 .addBtn{
860 position: absolute;
861 right: 30px;
862 top: -46px;
863 }
801 table { 864 table {
802 margin-top: 10px; 865 margin-top: 10px;
803 background-color: #fff; 866 background-color: #fff;
...@@ -833,11 +896,19 @@ ...@@ -833,11 +896,19 @@
833 color: #b2b2b2; 896 color: #b2b2b2;
834 } 897 }
835 .fgh { 898 .fgh {
836 margin-top: 20px; 899 box-sizing: border-box;
900 padding: 0 18px;
901 margin-top: 10px;
837 } 902 }
838 .header-button { 903 .header-button {
839 margin-top: 20px; 904 height: 50px;
905 position: fixed;
906 bottom: 0;
840 text-align: center; 907 text-align: center;
908 background-color: #ffffff;
909 /deep/ .el-button{
910 margin-top: 5px;
911 }
841 } 912 }
842 .xz-container { 913 .xz-container {
843 border: 1px solid #000; 914 border: 1px solid #000;
...@@ -845,5 +916,8 @@ ...@@ -845,5 +916,8 @@
845 grid-template-columns: 70% 30%; 916 grid-template-columns: 70% 30%;
846 grid-template-rows: 1fr; 917 grid-template-rows: 1fr;
847 } 918 }
919 .tips{
920 color: #9B9B9B;
921 }
848 } 922 }
849 </style> 923 </style>
......
...@@ -73,7 +73,9 @@ ...@@ -73,7 +73,9 @@
73 }, 73 },
74 mounted() { 74 mounted() {
75 this.getData({}) 75 this.getData({})
76 this.$nextTick(()=>{
76 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; 77 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
78 })
77 }, 79 },
78 methods: { 80 methods: {
79 onSubmit() { 81 onSubmit() {
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" @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></fg></el-tab-pane>
5 <el-tab-pane label="合并" name="hb"><hb></hb></el-tab-pane> 5 <el-tab-pane label="合并" name="hb"><hb></hb></el-tab-pane>
6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg></fwsxbg></el-tab-pane> 6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg></fwsxbg></el-tab-pane>
......
...@@ -285,6 +285,7 @@ export default { ...@@ -285,6 +285,7 @@ export default {
285 //todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm 285 //todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
286 this.$refs['ruleForm2'].validate((valid) => { 286 this.$refs['ruleForm2'].validate((valid) => {
287 if (valid) { 287 if (valid) {
288 this.ruleForm2.zdbsm = this.$store.state.rightClickZdbsm != '' ? this.$store.state.rightClickZdbsm : '';
288 insertDzjbxx(this.ruleForm2) 289 insertDzjbxx(this.ruleForm2)
289 .then((res) => { 290 .then((res) => {
290 if (res.code == "200") { 291 if (res.code == "200") {
......
...@@ -95,7 +95,9 @@ export default { ...@@ -95,7 +95,9 @@ export default {
95 }; 95 };
96 }, 96 },
97 mounted() { 97 mounted() {
98 this.$nextTick(()=>{
98 this.tableHeight = this.$refs.notice.offsetHeight - 53; 99 this.tableHeight = this.$refs.notice.offsetHeight - 53;
100 })
99 }, 101 },
100 methods: { 102 methods: {
101 handleSelect() {}, 103 handleSelect() {},
......
...@@ -78,7 +78,9 @@ ...@@ -78,7 +78,9 @@
78 }, 78 },
79 mounted() { 79 mounted() {
80 this.getData({}) 80 this.getData({})
81 this.$nextTick(()=>{
81 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; 82 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
83 })
82 }, 84 },
83 methods: { 85 methods: {
84 handleCurrentChange(val) { 86 handleCurrentChange(val) {
......
...@@ -63,15 +63,17 @@ ...@@ -63,15 +63,17 @@
63 pageNo: 1, 63 pageNo: 1,
64 pageSize: 15, 64 pageSize: 15,
65 tableData: [], 65 tableData: [],
66 tableHeight: "", 66 tableHeight: 0,
67 queryData: {} 67 queryData: {}
68 }; 68 };
69 }, 69 },
70 created() { 70 created() {
71 }, 71 },
72 mounted() { 72 mounted() {
73 this.getData({pageSize:15}) 73 this.getData({pageSize:15});
74 this.$nextTick(()=>{
74 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; 75 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
76 })
75 }, 77 },
76 methods: { 78 methods: {
77 onSubmit() { 79 onSubmit() {
......
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
43 width: 100%; 43 width: 100%;
44 height: 100%; 44 height: 100%;
45 box-sizing: border-box; 45 box-sizing: border-box;
46 padding: 0 18px !important; 46 padding:18px;
47 -webkit-user-select:none; 47 -webkit-user-select:none;
48 -moz-user-select:none; 48 -moz-user-select:none;
49 -ms-user-select:none; 49 -ms-user-select:none;
......
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
24 </td> 24 </td>
25 <td colspan="2" >不动产单元号</td> 25 <td colspan="2" >不动产单元号</td>
26 <td colspan="4" > 26 <td colspan="4" >
27 <input class="formInput percent78" :disabled="form.qszt!='0'" v-model="form.bdcdyh" style="width: 70%"> 27 <input class="formInput percent78" v-show="form.bdcdyh === ''||form.bdcdyh == null " :disabled="form.qszt!='0'" v-model="form.bdcdyh" style="width: 70%">
28 <input class="formInput percent78" v-show="false" v-model="form.dyhbsm" style="width: 70%"> 28 <input class="formInput" :disabled="form.qszt!='0'" v-show="form.bdcdyh !== ''&&form.bdcdyh != null " v-model="form.bdcdyh" style="width: 100%">
29 <el-button @click.prevent="" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button> 29 <el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%" v-show="form.bdcdyh === ''||form.bdcdyh == null ">生成</el-button>
30 </td> 30 </td>
31 </tr> 31 </tr>
32 32
......