Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
1f374220 by 杨威
Options

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

2 parents 4cd04f02 b266090b
Expand all
Inline Side-by-side
Showing 37 changed files with 636 additions and 246 deletions
...@@ -13,42 +13,42 @@ ...@@ -13,42 +13,42 @@
13 }, 13 },
14 "dependencies": { 14 "dependencies": {
15 "@antv/g6": "^4.0.3", 15 "@antv/g6": "^4.0.3",
16 "axios": "^0.19.0", 16 "axios": "^0.19.2",
17 "core-js": "^2.6.5", 17 "core-js": "^2.6.12",
18 "e-icon-picker": "^1.0.7", 18 "e-icon-picker": "^1.0.15",
19 "el-select-tree": "^1.0.26", 19 "el-select-tree": "^1.0.26",
20 "el-tree-select": "^3.1.10", 20 "el-tree-select": "^3.1.11",
21 "element-ui": "^2.13.2", 21 "element-ui": "^2.14.1",
22 "esri-loader": "^2.16.0", 22 "esri-loader": "^2.16.0",
23 "file-saver": "^2.0.2", 23 "file-saver": "^2.0.5",
24 "form-making": "^1.2.9", 24 "form-making": "^1.2.10",
25 "insert-css": "^2.0.0", 25 "insert-css": "^2.0.0",
26 "js-cookie": "^2.2.1", 26 "js-cookie": "^2.2.1",
27 "mockjs": "^1.1.0", 27 "mockjs": "^1.1.0",
28 "screenfull": "^5.0.2", 28 "screenfull": "^5.0.2",
29 "shapefile": "^0.6.6", 29 "shapefile": "^0.6.6",
30 "style-resources-loader": "^1.3.3", 30 "style-resources-loader": "^1.4.1",
31 "terraformer-arcgis-parser": "^1.1.0", 31 "terraformer-arcgis-parser": "^1.1.0",
32 "terraformer-wkt-parser": "^1.2.1", 32 "terraformer-wkt-parser": "^1.2.1",
33 "vue": "^2.6.10", 33 "vue": "^2.6.12",
34 "vue-cli-plugin-style-resources-loader": "^0.1.4", 34 "vue-cli-plugin-style-resources-loader": "^0.1.4",
35 "vue-quill-editor": "^3.0.6", 35 "vue-quill-editor": "^3.0.6",
36 "vue-router": "^3.0.3", 36 "vue-router": "^3.4.9",
37 "vuex": "^3.0.1", 37 "vuex": "^3.6.0",
38 "webpack-theme-color-replacer": "^1.3.14", 38 "webpack-theme-color-replacer": "^1.3.14",
39 "xlsx": "^0.16.6" 39 "xlsx": "^0.16.9"
40 }, 40 },
41 "devDependencies": { 41 "devDependencies": {
42 "@vue/cli-plugin-babel": "^3.11.0", 42 "@vue/cli-plugin-babel": "^3.12.1",
43 "@vue/cli-plugin-eslint": "^3.11.0", 43 "@vue/cli-plugin-eslint": "^3.12.1",
44 "@vue/cli-service": "^3.11.0", 44 "@vue/cli-service": "^3.12.1",
45 "babel-eslint": "^10.0.1", 45 "babel-eslint": "^10.1.0",
46 "babel-polyfill": "^6.26.0", 46 "babel-polyfill": "^6.26.0",
47 "eslint": "^5.16.0", 47 "eslint": "^5.16.0",
48 "eslint-plugin-vue": "^5.0.0", 48 "eslint-plugin-vue": "^5.0.0",
49 "less": "^3.0.4", 49 "less": "^3.12.2",
50 "less-loader": "^5.0.0", 50 "less-loader": "^5.0.0",
51 "script-loader": "^0.7.2", 51 "script-loader": "^0.7.2",
52 "vue-template-compiler": "^2.6.10" 52 "vue-template-compiler": "^2.6.12"
53 } 53 }
54 } 54 }
......
...@@ -43,22 +43,27 @@ export default { ...@@ -43,22 +43,27 @@ export default {
43 margin-bottom: 10px; 43 margin-bottom: 10px;
44 li{ 44 li{
45 cursor: pointer; 45 cursor: pointer;
46 padding: 4px 16px; 46 padding: 8px 16px;
47 position: relative; 47 position: relative;
48 i{ 48 i{
49 position: absolute; 49 position: absolute;
50 right: 20px; 50 right: 20px;
51 top: 6px; 51 top: 11px;
52 color: #4EB2FF; 52 color: #4EB2FF;
53 display: none; 53 display: none;
54 } 54 }
55 } 55 }
56 li:hover{ 56 li:hover{
57 background: #eee; 57 background: #F0F9FF;
58 }
59 .cantClick{
60 color: #BBB!important;
61 cursor: not-allowed!important;
62 }
63 .cantClick:hover{
64 background: #ffffff!important;
58 } 65 }
59 .choosed{ 66 .choosed{
60 color: #4EB2FF;
61 background-color: #F0F9FF!important;
62 i{ 67 i{
63 display: inline-block; 68 display: inline-block;
64 } 69 }
......
...@@ -166,12 +166,12 @@ export function getFileLis(glbsm) { ...@@ -166,12 +166,12 @@ export function getFileLis(glbsm) {
166 /** 166 /**
167 * 获取文件预览地址 167 * 获取文件预览地址
168 */ 168 */
169 export function loadFile(url) { 169 export function loadFile(id) {
170 return request({ 170 return request({
171 url:"/file/loadImage", 171 url:"/file/loadImage",
172 method:'get', 172 method:'get',
173 params:{ 173 params:{
174 url 174 id
175 } 175 }
176 }) 176 })
177 } 177 }
......
...@@ -75,3 +75,25 @@ export function ZdfggetZxx(zdbsm) { ...@@ -75,3 +75,25 @@ export function ZdfggetZxx(zdbsm) {
75 } 75 }
76 }) 76 })
77 } 77 }
78 /**
79 * 多幢分割获取自然幢信息
80 */
81 export function dzfgGetZrzxx(dzbsm) {
82 return request({
83 url:"/bg/dzSplitMerge/fgSelectZrz",
84 method:'get',
85 params:{
86 dzbsm
87 }
88 })
89 }
90 /**
91 * 多幢分割保存
92 */
93 export function saveDzFg(data) {
94 return request({
95 url: '/bg/dzSplitMerge/dzFg',
96 method: 'post',
97 data: data,
98 })
99 }
......
...@@ -179,3 +179,18 @@ export function batchCommit(data) { ...@@ -179,3 +179,18 @@ export function batchCommit(data) {
179 data:data 179 data:data
180 }) 180 })
181 } 181 }
182
183
184 /**
185 * 批量提交
186 */
187 export function getDetailInfo(zrzbsm,lx) {
188 return request({
189 url:'/fw/lpb/getDetailInfo',
190 method:'get',
191 params: {
192 zrzbsm:zrzbsm,
193 scyclx:lx,
194 },
195 })
196 }
......
...@@ -31,6 +31,18 @@ ...@@ -31,6 +31,18 @@
31 <ul class="icon_lists dib-box"> 31 <ul class="icon_lists dib-box">
32 32
33 <li class="dib"> 33 <li class="dib">
34 <span class="icon iconfont">&#xe779;</span>
35 <div class="name">多幢</div>
36 <div class="code-name">&amp;#xe779;</div>
37 </li>
38
39 <li class="dib">
40 <span class="icon iconfont">&#xe77a;</span>
41 <div class="name">自然幢</div>
42 <div class="code-name">&amp;#xe77a;</div>
43 </li>
44
45 <li class="dib">
34 <span class="icon iconfont">&#xe778;</span> 46 <span class="icon iconfont">&#xe778;</span>
35 <div class="name">户重新落宗</div> 47 <div class="name">户重新落宗</div>
36 <div class="code-name">&amp;#xe778;</div> 48 <div class="code-name">&amp;#xe778;</div>
...@@ -285,6 +297,24 @@ ...@@ -285,6 +297,24 @@
285 <ul class="icon_lists dib-box"> 297 <ul class="icon_lists dib-box">
286 298
287 <li class="dib"> 299 <li class="dib">
300 <span class="icon iconfont iconduochuang"></span>
301 <div class="name">
302 多幢
303 </div>
304 <div class="code-name">.iconduochuang
305 </div>
306 </li>
307
308 <li class="dib">
309 <span class="icon iconfont iconziranchuang"></span>
310 <div class="name">
311 自然幢
312 </div>
313 <div class="code-name">.iconziranchuang
314 </div>
315 </li>
316
317 <li class="dib">
288 <span class="icon iconfont iconhuzhongxinlazong"></span> 318 <span class="icon iconfont iconhuzhongxinlazong"></span>
289 <div class="name"> 319 <div class="name">
290 户重新落宗 320 户重新落宗
...@@ -621,6 +651,22 @@ ...@@ -621,6 +651,22 @@
621 651
622 <li class="dib"> 652 <li class="dib">
623 <svg class="icon svg-icon" aria-hidden="true"> 653 <svg class="icon svg-icon" aria-hidden="true">
654 <use xlink:href="#iconduochuang"></use>
655 </svg>
656 <div class="name">多幢</div>
657 <div class="code-name">#iconduochuang</div>
658 </li>
659
660 <li class="dib">
661 <svg class="icon svg-icon" aria-hidden="true">
662 <use xlink:href="#iconziranchuang"></use>
663 </svg>
664 <div class="name">自然幢</div>
665 <div class="code-name">#iconziranchuang</div>
666 </li>
667
668 <li class="dib">
669 <svg class="icon svg-icon" aria-hidden="true">
624 <use xlink:href="#iconhuzhongxinlazong"></use> 670 <use xlink:href="#iconhuzhongxinlazong"></use>
625 </svg> 671 </svg>
626 <div class="name">户重新落宗</div> 672 <div class="name">户重新落宗</div>
......
...@@ -6,6 +6,20 @@ ...@@ -6,6 +6,20 @@
6 "description": "", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
9 "icon_id": "18727148",
10 "name": "多幢",
11 "font_class": "duochuang",
12 "unicode": "e779",
13 "unicode_decimal": 59257
14 },
15 {
16 "icon_id": "18727149",
17 "name": "自然幢",
18 "font_class": "ziranchuang",
19 "unicode": "e77a",
20 "unicode_decimal": 59258
21 },
22 {
9 "icon_id": "18623953", 23 "icon_id": "18623953",
10 "name": "户重新落宗", 24 "name": "户重新落宗",
11 "font_class": "huzhongxinlazong", 25 "font_class": "huzhongxinlazong",
......
...@@ -20,6 +20,12 @@ Created by iconfont ...@@ -20,6 +20,12 @@ Created by iconfont
20 /> 20 />
21 <missing-glyph /> 21 <missing-glyph />
22 22
23 <glyph glyph-name="duochuang" unicode="&#59257;" d="M68.266667 793.6h546.133333v-819.2H68.266667v819.2z m68.266666-68.266667v-682.666666h409.6v682.666666H136.533333zM238.933333 622.933333h68.266667v-68.266666h-68.266667V622.933333z m136.533334 0h68.266666v-68.266666h-68.266666V622.933333zM238.933333 486.4h68.266667v-68.266667h-68.266667V486.4z m136.533334 0h68.266666v-68.266667h-68.266666V486.4zM238.933333 349.866667h68.266667v-68.266667h-68.266667V349.866667z m136.533334 0h68.266666v-68.266667h-68.266666V349.866667zM238.933333 213.333333h68.266667v-68.266666h-68.266667v68.266666z m136.533334 0h68.266666v-68.266666h-68.266666v68.266666zM546.133333 588.8h409.6v-614.4H546.133333v614.4z m68.266667-68.266667v-477.866666h273.066667v477.866666H614.4zM716.8 486.4h68.266667v-68.266667h-68.266667zM716.8 349.866667h68.266667v-68.266667h-68.266667zM716.8 213.333333h68.266667v-68.266666h-68.266667z" horiz-adv-x="1024" />
24
25
26 <glyph glyph-name="ziranchuang" unicode="&#59258;" d="M170.666667 793.6h682.666666v-819.2h-682.666666v819.2z m68.266666-68.266667v-682.666666h546.133334v682.666666h-546.133334zM341.333333 622.933333h68.266667v-68.266666H341.333333V622.933333z m136.533334 0h68.266666v-68.266666H477.866667V622.933333z m136.533333 0h68.266667v-68.266666H614.4V622.933333zM341.333333 486.4h68.266667v-68.266667H341.333333V486.4z m136.533334 0h68.266666v-68.266667H477.866667V486.4z m136.533333 0h68.266667v-68.266667H614.4V486.4zM341.333333 349.866667h68.266667v-68.266667H341.333333V349.866667z m136.533334 0h68.266666v-68.266667H477.866667V349.866667z m136.533333 0h68.266667v-68.266667H614.4V349.866667zM341.333333 213.333333h68.266667v-68.266666H341.333333v68.266666z m136.533334 0h68.266666v-68.266666H477.866667v68.266666z m136.533333 0h68.266667v-68.266666H614.4v68.266666z" horiz-adv-x="1024" />
27
28
23 <glyph glyph-name="huzhongxinlazong" unicode="&#59256;" d="M146.285714 896h731.428572a146.285714 146.285714 0 0 0 146.285714-146.285714v-731.428572a146.285714 146.285714 0 0 0-146.285714-146.285714H146.285714a146.285714 146.285714 0 0 0-146.285714 146.285714V749.714286a146.285714 146.285714 0 0 0 146.285714 146.285714z m0-73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857v-731.428572a73.142857 73.142857 0 0 1 73.142857-73.142857h731.428572a73.142857 73.142857 0 0 1 73.142857 73.142857V749.714286a73.142857 73.142857 0 0 1-73.142857 73.142857H146.285714zM512 214.674286l-152.137143-98.084572a36.571429 36.571429 0 0 0-55.222857 40.082286l46.299429 175.030857L210.651429 446.098286a36.571429 36.571429 0 0 0 21.065142 64.804571l180.736 10.093714 65.462858 168.813715a36.571429 36.571429 0 0 0 68.169142 0l65.462858-168.813715 180.736-10.093714a36.571429 36.571429 0 0 0 21.065142-64.804571L673.060571 331.702857l46.299429-175.030857a36.571429 36.571429 0 0 0-55.222857-40.082286L512 214.674286zM492.178286 288.914286a36.571429 36.571429 0 0 0 39.643428 0l92.672-59.757715-28.233143 106.642286a36.571429 36.571429 0 0 0 12.288 37.668572l85.430858 69.705142-110.08 6.070858a36.571429 36.571429 0 0 0-32.036572 23.332571L512 575.341714l-39.862857-102.765714a36.571429 36.571429 0 0 0-32.036572-23.332571l-110.08-6.070858 85.430858-69.705142a36.571429 36.571429 0 0 0 12.288-37.668572l-28.233143-106.642286L492.251429 288.914286z" horiz-adv-x="1024" /> 29 <glyph glyph-name="huzhongxinlazong" unicode="&#59256;" d="M146.285714 896h731.428572a146.285714 146.285714 0 0 0 146.285714-146.285714v-731.428572a146.285714 146.285714 0 0 0-146.285714-146.285714H146.285714a146.285714 146.285714 0 0 0-146.285714 146.285714V749.714286a146.285714 146.285714 0 0 0 146.285714 146.285714z m0-73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857v-731.428572a73.142857 73.142857 0 0 1 73.142857-73.142857h731.428572a73.142857 73.142857 0 0 1 73.142857 73.142857V749.714286a73.142857 73.142857 0 0 1-73.142857 73.142857H146.285714zM512 214.674286l-152.137143-98.084572a36.571429 36.571429 0 0 0-55.222857 40.082286l46.299429 175.030857L210.651429 446.098286a36.571429 36.571429 0 0 0 21.065142 64.804571l180.736 10.093714 65.462858 168.813715a36.571429 36.571429 0 0 0 68.169142 0l65.462858-168.813715 180.736-10.093714a36.571429 36.571429 0 0 0 21.065142-64.804571L673.060571 331.702857l46.299429-175.030857a36.571429 36.571429 0 0 0-55.222857-40.082286L512 214.674286zM492.178286 288.914286a36.571429 36.571429 0 0 0 39.643428 0l92.672-59.757715-28.233143 106.642286a36.571429 36.571429 0 0 0 12.288 37.668572l85.430858 69.705142-110.08 6.070858a36.571429 36.571429 0 0 0-32.036572 23.332571L512 575.341714l-39.862857-102.765714a36.571429 36.571429 0 0 0-32.036572-23.332571l-110.08-6.070858 85.430858-69.705142a36.571429 36.571429 0 0 0 12.288-37.668572l-28.233143-106.642286L492.251429 288.914286z" horiz-adv-x="1024" />
24 30
25 31
......
...@@ -101,9 +101,11 @@ ...@@ -101,9 +101,11 @@
101 <li> 101 <li>
102 <el-date-picker 102 <el-date-picker
103 v-model="childItem.tdsyqssj" 103 v-model="childItem.tdsyqssj"
104 :picker-options="childItem.pickerStart"
104 type="date" 105 type="date"
105 value-format="yyyy-MM-dd" 106 value-format="yyyy-MM-dd"
106 placeholder="选择日期" 107 placeholder="选择日期"
108 @input="startTime(index,childIndex)"
107 > 109 >
108 </el-date-picker> 110 </el-date-picker>
109 </li> 111 </li>
...@@ -148,7 +150,9 @@ ...@@ -148,7 +150,9 @@
148 v-model="childItem.tdsyjssj" 150 v-model="childItem.tdsyjssj"
149 type="date" 151 type="date"
150 value-format="yyyy-MM-dd" 152 value-format="yyyy-MM-dd"
153 :picker-options="childItem.pickerEnd"
151 placeholder="选择日期" 154 placeholder="选择日期"
155 @input="endTime(index,childIndex)"
152 > 156 >
153 </el-date-picker> 157 </el-date-picker>
154 </li> 158 </li>
...@@ -221,6 +225,8 @@ export default { ...@@ -221,6 +225,8 @@ export default {
221 syqx: "", 225 syqx: "",
222 tdsyjssj: "", 226 tdsyjssj: "",
223 tdsyqssj: "", 227 tdsyqssj: "",
228 pickerStart:{},
229 pickerEnd:{},
224 tdzh: "", 230 tdzh: "",
225 }, 231 },
226 ], 232 ],
...@@ -317,6 +323,42 @@ export default { ...@@ -317,6 +323,42 @@ export default {
317 getQlxzDataList() { 323 getQlxzDataList() {
318 return this.countList; 324 return this.countList;
319 }, 325 },
326 //起始时间判断
327 startTime(index,childIndex){
328 let startTime= this.countList[index].list[childIndex].tdsyqssj;
329 let endTime=this.countList[index].list[childIndex].tdsyjssj;
330 this.countList[index].list[childIndex].pickerEnd={
331 disabledDate: (time) => {
332 if (Object.keys(startTime).length>0) {
333 return new Date(startTime).getTime()>time.getTime();
334 }else {
335 return time.getTime()< Date.now();
336 }
337 }
338 }
339 if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) {
340 let startYear= new Date(startTime).getFullYear();
341 let endYear=new Date(endTime).getFullYear();
342 }
343 },
344 endTime(index,childIndex,e){
345 console.log(e,'eeeeee');
346 let startTime = this.countList[index].list[childIndex].tdsyqssj;
347 let endTime = this.countList[index].list[childIndex].tdsyjssj;
348 this.countList[index].list[childIndex].pickerStart={
349 disabledDate: (time) => {
350 if (Object.keys(endTime).length>0) {
351 return new Date(endTime).getTime()<time.getTime();
352 }else {
353 return time.getTime() > Date.now();
354 }
355 }
356 }
357 if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) {
358 let startYear= new Date(startTime).getFullYear();
359 let endYear=new Date(endTime).getFullYear();
360 }
361 },
320 }, 362 },
321 }; 363 };
322 </script> 364 </script>
......
...@@ -175,31 +175,35 @@ export default { ...@@ -175,31 +175,35 @@ export default {
175 // 左键双击事件 175 // 左键双击事件
176 dbclick(item) { 176 dbclick(item) {
177 clearTimeout(this.time); 177 clearTimeout(this.time);
178 if(item.type == 'zd' || item.type == 'zrz' ||item.type == 'dz'){ 178 //此处不要将$router移到if的外面，因为可能是双击行政区，就不知道去哪儿了
179 if (item.type == 'zd') {
180 this.$store.state.zdbsm = item.bsm;
179 this.$router.push({ 181 this.$router.push({
180 path: '/'+item.type, 182 path: '/'+item.type,
183 query:{
184 source: 2,
185 bsm:item.bsm
186 }
187 });
188 }else if(item.type == 'zrz'){
189 this.$store.state.zrzbsm = item.bsm;
190 this.$router.push({
191 path: '/'+item.type,
192 query:{
193 source: 2,
194 bsm:item.bsm
195 }
196 });
197 }else if(item.type == 'dz'){
198 this.$store.state.dzbsm = item.bsm;
199 this.$router.push({
200 path: '/'+item.type,
181 query:{ 201 query:{
182 source: 2, 202 source: 2,
183 bsm:item.bsm 203 bsm:item.bsm
184 } 204 }
185 }); 205 });
186 } 206 }
187 // if (item.type == 'zd') {
188 // this.$router.push({
189 // path: '/zd',
190 // query:{
191 // source: 2,
192 // bsm:item.bsm
193 // }
194 // });
195 // }else if(item.type == 'zrz'){
196 // this.$router.push({
197 // path: '/zrz',
198 // query:{
199 // bsm:item.bsm
200 // }
201 // });
202 // }
203 }, 207 },
204 closeMenu() { 208 closeMenu() {
205 this.$emit("changeVisible", false); 209 this.$emit("changeVisible", false);
......
...@@ -255,6 +255,8 @@ export default { ...@@ -255,6 +255,8 @@ export default {
255 this.$store.state.zdbsm = this.zdData.zdbsm; 255 this.$store.state.zdbsm = this.zdData.zdbsm;
256 if(this.zdData.type == 'dz'){ 256 if(this.zdData.type == 'dz'){
257 this.$store.state.dzbsm = this.zdData.bsm; 257 this.$store.state.dzbsm = this.zdData.bsm;
258 }else{
259 this.$store.state.dzbsm = '';
258 } 260 }
259 }, 261 },
260 //关闭添加定着物弹框 262 //关闭添加定着物弹框
......
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
187 187
188 <tr> 188 <tr>
189 <td colspan="12" rowspan="4" align="center"> 189 <td colspan="12" rowspan="4" align="center">
190 <Qlxz ref="qlxzModule"></Qlxz> 190 <Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz>
191 </td> 191 </td>
192 </tr> 192 </tr>
193 <tr></tr> 193 <tr></tr>
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
218 </template> 218 </template>
219 219
220 <script> 220 <script>
221 import Qlxz from "./../../components/formMenu/qlxz_simple"; 221 import Qlxz from "./../../components/formMenu/qlxz";
222 import {batchUpdateQjH} from "../../api/h"; 222 import {batchUpdateQjH} from "../../api/h";
223 export default { 223 export default {
224 name: "plH", 224 name: "plH",
......
...@@ -3,14 +3,60 @@ ...@@ -3,14 +3,60 @@
3 <el-dialog 3 <el-dialog
4 title="新增" 4 title="新增"
5 :visible.sync="isVisible" 5 :visible.sync="isVisible"
6 width="50%" 6 width="70%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 center> 9 center>
10 <div class="search"> 10 <div class="search">
11 <el-button type="primary" @click="search">查询</el-button> 11 <!-- <el-button type="primary" @click="search">查询</el-button>
12 <el-button type="primary" @click="result">重置</el-button> 12 <el-button type="primary" @click="result">重置</el-button> -->
13 <el-row :gutter="10" class="shop"> 13
14 <el-row>
15 <el-col :span="24">
16 <el-form :inline="true" class="demo-form-inline">
17 <el-form-item label="宗地编码">
18 <el-input
19 v-model="queryData.zddm"
20 placeholder="输入宗地编码"
21 ></el-input>
22 </el-form-item>
23 <el-form-item label="不动产权证号">
24 <el-input
25 v-model="queryData.bdcqzh"
26 placeholder="输入不动产权证号"
27 ></el-input>
28 </el-form-item>
29 <el-form-item label="不动产单元号">
30 <el-input
31 maxlength="28"
32 v-model="queryData.bdcdyh"
33 placeholder="输入不动产单元号"
34 ></el-input>
35 </el-form-item>
36 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
37 <el-button type="warning" @click="reset">重置</el-button>
38 </el-form>
39 </el-col>
40 </el-row>
41 <el-row>
42 <el-col :span="24">
43 <el-form :inline="true" class="demo-form-inline">
44 <el-form-item label="权利人">
45 <el-input
46 v-model="queryData.qlrmc"
47 placeholder="输入权利人"
48 ></el-input>
49 </el-form-item>
50 <el-form-item label="坐落">
51 <el-input
52 v-model="queryData.zl"
53 placeholder="输入坐落"
54 ></el-input>
55 </el-form-item>
56 </el-form>
57 </el-col>
58 </el-row>
59 <!-- <el-row :gutter="10" class="shop">
14 <el-col :span="4" class="inputtitle"> 60 <el-col :span="4" class="inputtitle">
15 宗地编码: 61 宗地编码:
16 </el-col> 62 </el-col>
...@@ -23,10 +69,10 @@ ...@@ -23,10 +69,10 @@
23 <el-col :span="8" class=""> 69 <el-col :span="8" class="">
24 <el-input v-model="queryData.bdcqzh"></el-input> 70 <el-input v-model="queryData.bdcqzh"></el-input>
25 </el-col> 71 </el-col>
26 </el-row> 72 </el-row> -->
27 <el-row :gutter="10"> 73 <!-- <el-row :gutter="10">
28 <el-col :span="4" class="inputtitle"> 74 <el-col :span="4" class="inputtitle">
29 不动产权单元号: 75 不动产单元号:
30 </el-col> 76 </el-col>
31 <el-col :span="8"> 77 <el-col :span="8">
32 <el-input v-model="queryData.bdcdyh"></el-input> 78 <el-input v-model="queryData.bdcdyh"></el-input>
...@@ -45,7 +91,7 @@ ...@@ -45,7 +91,7 @@
45 <el-col :span="8"> 91 <el-col :span="8">
46 <el-input v-model="queryData.zl"></el-input> 92 <el-input v-model="queryData.zl"></el-input>
47 </el-col> 93 </el-col>
48 </el-row> 94 </el-row> -->
49 <table border="1"> 95 <table border="1">
50 <tr> 96 <tr>
51 <td>序号</td> 97 <td>序号</td>
...@@ -77,8 +123,6 @@ ...@@ -77,8 +123,6 @@
77 123
78 </table> 124 </table>
79 </div> 125 </div>
80 <span slot="footer" class="dialog-footer">
81 </span>
82 <div class="page"> 126 <div class="page">
83 <el-pagination 127 <el-pagination
84 background 128 background
...@@ -142,11 +186,11 @@ ...@@ -142,11 +186,11 @@
142 created() { 186 created() {
143 }, 187 },
144 methods: { 188 methods: {
145 currentChange: function (val) { 189 currentChange(val) {
146 this.queryData.pageNo = val; 190 this.queryData.pageNo = val;
147 this.getData(this.queryData); 191 this.getData(this.queryData);
148 }, 192 },
149 result: function () { 193 reset(){
150 this.queryData = { 194 this.queryData = {
151 bdcdyh: "", 195 bdcdyh: "",
152 bdcqzh: "", 196 bdcqzh: "",
...@@ -160,25 +204,25 @@ ...@@ -160,25 +204,25 @@
160 }; 204 };
161 this.getData(this.queryData) 205 this.getData(this.queryData)
162 }, 206 },
163 getData: function (data) { 207 getData(data){
164 data['dylxs'] = this.dylxs; 208 data['dylxs'] = this.dylxs;
165 getSearchList(data).then(res => { 209 getSearchList(data).then(res => {
166 this.Data = res.result.records 210 this.Data = res.result.records
167 this.total = res.result.total; 211 this.total = res.result.total;
168 }) 212 })
169 }, 213 },
170 search: function () { 214 search(){
171 this.getData(this.queryData) 215 this.getData(this.queryData)
172 }, 216 },
173 addData: function (val) { 217 addData(val){
174 this.$emit("getData", val) 218 this.$emit("getData", val)
175 if (this.isZdClose) { 219 if (this.isZdClose) {
176 this.close(); 220 this.close();
177 } 221 }
178 }, 222 },
179 close: function () { 223 close(){
180 this.$emit('close') 224 this.$emit('close')
181 this.result(); 225 this.reset();
182 } 226 }
183 }, 227 },
184 watch: { 228 watch: {
...@@ -197,6 +241,10 @@ ...@@ -197,6 +241,10 @@
197 height: auto; 241 height: auto;
198 width: 80%; 242 width: 80%;
199 } 243 }
244 /deep/ .el-form-item__label{
245 width: 96px;
246 text-align: right;
247 }
200 248
201 table { 249 table {
202 margin-top: 10px; 250 margin-top: 10px;
...@@ -233,5 +281,8 @@ ...@@ -233,5 +281,8 @@
233 .noData { 281 .noData {
234 color: #b2b2b2; 282 color: #b2b2b2;
235 } 283 }
284 .page{
285 margin-top: 20px;
286 }
236 287
237 </style> 288 </style>
......
...@@ -3,47 +3,54 @@ ...@@ -3,47 +3,54 @@
3 <el-dialog 3 <el-dialog
4 title="新增" 4 title="新增"
5 :visible.sync="isVisible" 5 :visible.sync="isVisible"
6 width="50%" 6 width="70%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 center> 9 center>
10 <div class="search"> 10 <div class="search">
11 <el-button type="primary" @click="search">查询</el-button> 11 <el-row>
12 <el-button type="primary" @click="result">重置</el-button> 12 <el-col :span="24">
13 <el-row :gutter="10" class="shop"> 13 <el-form :inline="true" class="demo-form-inline">
14 <el-col :span="4" class="inputtitle"> 14 <el-form-item label="宗地编码">
15 宗地编码: 15 <el-input
16 </el-col> 16 v-model="queryData.zddm"
17 <el-col :span="8" class=""> 17 placeholder="输入宗地编码"
18 <el-input v-model="queryData.zddm"></el-input> 18 ></el-input>
19 </el-col> 19 </el-form-item>
20 <el-col :span="4" class="inputtitle"> 20 <el-form-item label="不动产权证号">
21 不动产权证号: 21 <el-input
22 </el-col> 22 v-model="queryData.bdcqzh"
23 <el-col :span="8" class=""> 23 placeholder="输入不动产权证号"
24 <el-input v-model="queryData.bdcqzh"></el-input> 24 ></el-input>
25 </el-form-item>
26 <el-form-item label="不动产单元号">
27 <el-input
28 maxlength="28"
29 v-model="queryData.bdcdyh"
30 placeholder="输入不动产单元号"
31 ></el-input>
32 </el-form-item>
33 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
34 <el-button type="warning" @click="reset">重置</el-button>
35 </el-form>
25 </el-col> 36 </el-col>
26 </el-row> 37 </el-row>
27 <el-row :gutter="10"> 38 <el-row>
28 <el-col :span="4" class="inputtitle"> 39 <el-col :span="24">
29 不动产权单元号: 40 <el-form :inline="true" class="demo-form-inline">
30 </el-col> 41 <el-form-item label="权利人">
31 <el-col :span="8"> 42 <el-input
32 <el-input v-model="queryData.bdcdyh"></el-input> 43 v-model="queryData.qlrmc"
33 </el-col> 44 placeholder="输入权利人"
34 <el-col :span="4" class="inputtitle"> 45 ></el-input>
35 权利人: 46 </el-form-item>
36 </el-col> 47 <el-form-item label="坐落">
37 <el-col :span="8"> 48 <el-input
38 <el-input v-model="queryData.qlrmc"></el-input> 49 v-model="queryData.zl"
39 </el-col> 50 placeholder="输入坐落"
40 </el-row> 51 ></el-input>
41 <el-row :gutter="10"> 52 </el-form-item>
42 <el-col :span="4" class="inputtitle"> 53 </el-form>
43 坐落:
44 </el-col>
45 <el-col :span="8">
46 <el-input v-model="queryData.zl"></el-input>
47 </el-col> 54 </el-col>
48 </el-row> 55 </el-row>
49 <table border="1"> 56 <table border="1">
...@@ -77,8 +84,6 @@ ...@@ -77,8 +84,6 @@
77 84
78 </table> 85 </table>
79 </div> 86 </div>
80 <span slot="footer" class="dialog-footer">
81 </span>
82 <div class="page"> 87 <div class="page">
83 <el-pagination 88 <el-pagination
84 background 89 background
...@@ -146,7 +151,7 @@ ...@@ -146,7 +151,7 @@
146 this.queryData.pageNo = val; 151 this.queryData.pageNo = val;
147 this.getData(this.queryData); 152 this.getData(this.queryData);
148 }, 153 },
149 result: function () { 154 reset: function () {
150 this.queryData = { 155 this.queryData = {
151 bdcdyh: "", 156 bdcdyh: "",
152 bdcqzh: "", 157 bdcqzh: "",
...@@ -178,7 +183,7 @@ ...@@ -178,7 +183,7 @@
178 }, 183 },
179 close: function () { 184 close: function () {
180 this.$emit('close') 185 this.$emit('close')
181 this.result(); 186 this.reset();
182 } 187 }
183 }, 188 },
184 watch: { 189 watch: {
...@@ -197,6 +202,11 @@ ...@@ -197,6 +202,11 @@
197 height: auto; 202 height: auto;
198 width: 80%; 203 width: 80%;
199 } 204 }
205 /deep/ .el-form-item__label{
206 width: 96px;
207 text-align: right;
208 }
209
200 210
201 table { 211 table {
202 margin-top: 10px; 212 margin-top: 10px;
...@@ -233,5 +243,8 @@ ...@@ -233,5 +243,8 @@
233 .noData { 243 .noData {
234 color: #b2b2b2; 244 color: #b2b2b2;
235 } 245 }
246 .page{
247 margin-top: 20px;
248 }
236 249
237 </style> 250 </style>
......
...@@ -169,6 +169,8 @@ export default { ...@@ -169,6 +169,8 @@ export default {
169 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm); 169 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
170 }else if(newPath == "/dz"){ 170 }else if(newPath == "/dz"){
171 this.getRightTreeByDzbsm(this.$store.state.dzbsm); 171 this.getRightTreeByDzbsm(this.$store.state.dzbsm);
172 }else if(newPath == "/h"){
173 this.getRightTreeByHbsm(this.$store.state.hbsm);
172 } else if(newPath == "/viewMap"){ 174 } else if(newPath == "/viewMap"){
173 this.isMap = true; 175 this.isMap = true;
174 if(this.$route.query.type == "zd"){ 176 if(this.$route.query.type == "zd"){
...@@ -329,6 +331,14 @@ export default { ...@@ -329,6 +331,14 @@ export default {
329 }); 331 });
330 }, 332 },
331 333
334 getRightTreeByHbsm(bsm) {
335 getTreeByBsm(bsm,"h").then((res) => {
336 if (res.success) {
337 this.pd = res.result;
338 }
339 });
340 },
341
332 sortNavigation(data, selectId) { 342 sortNavigation(data, selectId) {
333 let headTop = this.headTop; 343 let headTop = this.headTop;
334 data.forEach((item, index) => { 344 data.forEach((item, index) => {
...@@ -439,7 +449,7 @@ export default { ...@@ -439,7 +449,7 @@ export default {
439 width: 100%; 449 width: 100%;
440 height: 100vh; 450 height: 100vh;
441 position: relative; 451 position: relative;
442 min-width: 1500px; 452 min-width: 1680px;
443 overflow-x: auto; 453 overflow-x: auto;
444 .calcWidth{ 454 .calcWidth{
445 width: calc(100% - 300px); 455 width: calc(100% - 300px);
......
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
141 141
142 <tr> 142 <tr>
143 <td colspan="12" align="center"> 143 <td colspan="12" align="center">
144 <Qlxz ref="qlxzModule" :formData="form"></Qlxz> 144 <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
145 </td> 145 </td>
146 </tr> 146 </tr>
147 147
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
207 207
208 <script> 208 <script>
209 import Qlr from "../../../components/formMenu/qlr"; 209 import Qlr from "../../../components/formMenu/qlr";
210 import Qlxz from "../../../components/formMenu/qlxz_simple"; 210 import Qlxz from "../../../components/formMenu/qlxz";
211 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz"; 211 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz";
212 import {getQjZdjbxxDetailById} from "../../../api/zd" 212 import {getQjZdjbxxDetailById} from "../../../api/zd"
213 import {submit,registerCall} from "../../../api/common" 213 import {submit,registerCall} from "../../../api/common"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 data() { 19 data() {
20 return { 20 return {
21 activeName: "dzxx", 21 activeName: "dzxx",
22 dzJbxxVisble:false, 22 dzJbxxVisble:true,
23 fjclVisible:false 23 fjclVisible:false
24 }; 24 };
25 }, 25 },
......
...@@ -564,7 +564,7 @@ ...@@ -564,7 +564,7 @@
564 let arr=[]; 564 let arr=[];
565 switch (this.tabName) { 565 switch (this.tabName) {
566 case "zd": 566 case "zd":
567 arr=this.zdhbqData.filter(i=>i.zddm==data.zddm); 567 arr=this.zdhbqData.filter(i=>i.zdbsm==data.zdbsm);
568 if (arr.length>0) { 568 if (arr.length>0) {
569 break 569 break
570 } 570 }
...@@ -756,4 +756,7 @@ ...@@ -756,4 +756,7 @@
756 color: blue; 756 color: blue;
757 text-decoration: underline; 757 text-decoration: underline;
758 } 758 }
759 /deep/ .el-select {
760 width: 100%;
761 }
759 </style> 762 </style>
......
...@@ -290,8 +290,9 @@ export default { ...@@ -290,8 +290,9 @@ export default {
290 //todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm 290 //todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
291 this.$refs['ruleForm1'].validate((valid) => { 291 this.$refs['ruleForm1'].validate((valid) => {
292 if (valid) { 292 if (valid) {
293 this.ruleForm1.zdbsm = this.$store.state.zdbsm != '' ? this.$store.state.zdbsm : ''; 293
294 this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : ''; 294 this.ruleForm1.zdbsm = this.auth ? this.$store.state.zdbsm : '';
295 this.ruleForm1.dzbsm = this.auth ? this.$store.state.dzbsm : '';
295 insertZrzjbxx(this.ruleForm1) 296 insertZrzjbxx(this.ruleForm1)
296 .then((res) => { 297 .then((res) => {
297 if (res.code == "200") { 298 if (res.code == "200") {
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
6 :data="tableData" 6 :data="tableData"
7 :height="tableHeight" 7 :height="tableHeight"
8 :row-class-name="tableRowClassName" 8 :row-class-name="tableRowClassName"
9 @row-dblclick="doubleClick"
9 > 10 >
10 <el-table-column type="index" width="80" align="center" label="序号"> 11 <el-table-column type="index" width="80" align="center" label="序号">
11 </el-table-column> 12 </el-table-column>
...@@ -81,6 +82,9 @@ ...@@ -81,6 +82,9 @@
81 methods: { 82 methods: {
82 onSubmit() { 83 onSubmit() {
83 }, 84 },
85 doubleClick(row, column, event){
86 this.handleClick(row);
87 },
84 tableRowClassName({row, rowIndex}) { 88 tableRowClassName({row, rowIndex}) {
85 if (rowIndex % 2 !== 0) { 89 if (rowIndex % 2 !== 0) {
86 return "even-row"; 90 return "even-row";
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 <el-upload 3 <el-upload
4 class="upload-demo" 4 class="upload-demo"
5 action="/api/file/uploadList" 5 action="/api/file/uploadList"
6 :data="fileData"
6 :on-preview="handlePreview" 7 :on-preview="handlePreview"
7 :on-remove="handleRemove" 8 :on-remove="handleRemove"
8 :before-remove="beforeRemove" 9 :before-remove="beforeRemove"
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
33 <td class="cz"> 34 <td class="cz">
34 <span @click="downloadFile(item.fileurl)">下载</span> 35 <span @click="downloadFile(item.fileurl)">下载</span>
35 <span>/</span> 36 <span>/</span>
36 <span @click="loadFile(item.fileurl)">预览</span> 37 <span @click="loadFile(item.bsm)">预览</span>
37 <span>/</span> 38 <span>/</span>
38 <span @click="deleteFile(item.bsm)">删除</span> 39 <span @click="deleteFile(item.bsm)">删除</span>
39 </td> 40 </td>
...@@ -50,24 +51,24 @@ ...@@ -50,24 +51,24 @@
50 name: "fjcl", 51 name: "fjcl",
51 data() { 52 data() {
52 return { 53 return {
54 fileData:{
55 glbsm:'',
56 dylx:''
57 },
53 list: [ 58 list: [
54 {
55 filename: '调查文档1',
56 filepostfix: 'doc',
57 fileurl: ''
58 }
59 ], 59 ],
60 filesData: { 60 /* filesData: {
61 dylx: "", 61 dylx: "",
62 glbsm: "", 62 glbsm: "",
63 list: [ 63 list: [
64 { 64 {
65 filename: "", 65 filename: "",
66 filepostfix: "", 66 filepostfix: "",
67 fileurl: "" 67 fileurl: "",
68 preViewUrl:""
68 } 69 }
69 ] 70 ]
70 }, 71 },*/
71 } 72 }
72 }, 73 },
73 mounted() { 74 mounted() {
...@@ -94,8 +95,8 @@ ...@@ -94,8 +95,8 @@
94 }); 95 });
95 }); 96 });
96 }, 97 },
97 loadFile(url){ 98 loadFile(bsm){
98 loadFile(url).then(res=>{ 99 loadFile(bsm).then(res=>{
99 if (res.success) { 100 if (res.success) {
100 window.open(res.message) 101 window.open(res.message)
101 } 102 }
...@@ -105,28 +106,27 @@ ...@@ -105,28 +106,27 @@
105 window.open(`/api/file/download?url=`+url); 106 window.open(`/api/file/download?url=`+url);
106 }, 107 },
107 getFileList() { 108 getFileList() {
108 console.log(this.$route.name,'NAME')
109 switch (this.$route.name) { 109 switch (this.$route.name) {
110 case "宗地": 110 case "宗地":
111 this.filesData.dylx = 'zd'; 111 this.fileData.dylx = 'zd';
112 this.filesData.glbsm = this.$store.state.zdbsm 112 this.fileData.glbsm = this.$store.state.zdbsm
113 break; 113 break;
114 case "自然幢": 114 case "自然幢":
115 this.filesData.dylx = 'zrz'; 115 this.fileData.dylx = 'zrz';
116 this.filesData.glbsm = this.$store.state.zrzbsm 116 this.fileData.glbsm = this.$store.state.zrzbsm
117 break 117 break
118 case "多幢": 118 case "多幢":
119 this.filesData.dylx = 'dz'; 119 this.fileData.dylx = 'dz';
120 this.filesData.glbsm = this.$store.state.dzbsm 120 this.fileData.glbsm = this.$store.state.dzbsm
121 break 121 break
122 case "户": 122 case "户":
123 this.filesData.dylx = 'h'; 123 this.fileData.dylx = 'h';
124 this.filesData.glbsm = this.$store.state.hbsm 124 this.fileData.glbsm = this.$store.state.hbsm
125 break; 125 break;
126 default: 126 default:
127 break 127 break
128 } 128 }
129 getFileLis(this.filesData.glbsm ).then(res => { 129 getFileLis(this.fileData.glbsm ).then(res => {
130 if (res.success) { 130 if (res.success) {
131 this.list = res.result; 131 this.list = res.result;
132 } else { 132 } else {
...@@ -138,15 +138,7 @@ ...@@ -138,15 +138,7 @@
138 console.log("上传文件失败", err) 138 console.log("上传文件失败", err)
139 }, 139 },
140 uploadSuccess(res, file, fileList) { 140 uploadSuccess(res, file, fileList) {
141 this.filesData.list = res.result; 141 this.getFileList();
142 insertFile(this.filesData).then(res => {
143 if (res.success) {
144 Message.success("上传成功")
145 this.getFileList(this.filesData.glbsm)
146 } else {
147 Message.error(res.message)
148 }
149 })
150 }, 142 },
151 handleRemove(file, fileList) { 143 handleRemove(file, fileList) {
152 console.log(file, fileList); 144 console.log(file, fileList);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div ref="lpb" class="content_box"> 2 <div ref="lpb" 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="zrzxx"><zrzxx></zrzxx></el-tab-pane> 4 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
5 <el-tab-pane label="业主共有" name="yzgy"><yzgy></yzgy></el-tab-pane> 5 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad"></yzgy></el-tab-pane>
6 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> 6 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
7 <el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane> 7 <el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
8 <el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane> 8 <el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane>
...@@ -28,6 +28,7 @@ export default { ...@@ -28,6 +28,7 @@ export default {
28 return { 28 return {
29 activeName: "zrzxx", 29 activeName: "zrzxx",
30 lpbLoad:false, //默认不加载楼盘表组件 30 lpbLoad:false, //默认不加载楼盘表组件
31 yzgyLoad:false,
31 }; 32 };
32 }, 33 },
33 methods: { 34 methods: {
...@@ -35,6 +36,9 @@ export default { ...@@ -35,6 +36,9 @@ export default {
35 if(!this.lpbLoad){ 36 if(!this.lpbLoad){
36 this.lpbLoad = tab.name == 'lpb' ? true : false 37 this.lpbLoad = tab.name == 'lpb' ? true : false
37 } 38 }
39 if(!this.yzgyLoad){
40 this.yzgyLoad = tab.name == 'yzgy' ? true : false
41 }
38 }, 42 },
39 }, 43 },
40 created() {}, 44 created() {},
......
1 <template> 1 <template>
2 <div class="h content-form"> 2 <div class="h content-form" ref="mainBox" :class="$route.path == '/h' ? 'hpage':''">
3 <el-form ref="form" :model="form" label-width="160px"> 3 <el-form ref="form" :model="form" label-width="160px" class="form" :style="{'height': $route.path == '/h' ? '100%' : formHeight+'px'}">
4 <Qlr ref="qlrxxModule" :bsm='bsm'></Qlr> 4 <Qlr ref="qlrxxModule" :bsm='bsm'></Qlr>
5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable"> 5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable">
6 <tbody> 6 <tbody>
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
310 310
311 <tr> 311 <tr>
312 <td colspan="12" rowspan="4" align="center"> 312 <td colspan="12" rowspan="4" align="center">
313 <Qlxz ref="qlxzModule"></Qlxz> 313 <Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz>
314 </td> 314 </td>
315 </tr> 315 </tr>
316 <tr></tr> 316 <tr></tr>
...@@ -391,22 +391,19 @@ ...@@ -391,22 +391,19 @@
391 </tbody> 391 </tbody>
392 </table> 392 </table>
393 </el-form> 393 </el-form>
394 <div class="btnGroup"> 394 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
395 <el-button type="primary" @click="onSave">保存</el-button> 395 <el-button type="primary" class="saveBtn" @click="onSave">保存</el-button>
396 <el-button type="primary" @click="onSubmit">提交</el-button> 396 <el-button type="primary" @click="onSubmit">提交</el-button>
397 <el-button type="primary" @click="registerCall">登记调用</el-button> 397 <el-button type="primary" @click="registerCall">登记调用</el-button>
398 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
398 </div> 399 </div>
399 <!-- <div style="min-height: 40px;text-align: center;margin-top: 10px">
400 <el-button type="success" @click="onSave">保存</el-button>
401 <el-button type="primary" @click="onSubmit">提交</el-button>
402 </div> -->
403 </div> 400 </div>
404 401
405 </template> 402 </template>
406 403
407 <script> 404 <script>
408 import Qlr from "./../../../../../components/formMenu/qlr"; 405 import Qlr from "./../../../../../components/formMenu/qlr";
409 import Qlxz from "./../../../../../components/formMenu/qlxz_simple"; 406 import Qlxz from "./../../../../../components/formMenu/qlxz";
410 import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h"; 407 import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
411 import {getBdcdyh} from "./../../../../../api/zrz"; 408 import {getBdcdyh} from "./../../../../../api/zrz";
412 import {submit,registerCall} from "./../../../../../api/common" 409 import {submit,registerCall} from "./../../../../../api/common"
...@@ -425,9 +422,7 @@ ...@@ -425,9 +422,7 @@
425 }, 422 },
426 data () { 423 data () {
427 return { 424 return {
428
429 disableFlag:false, 425 disableFlag:false,
430
431 //树型结构 426 //树型结构
432 show:true, 427 show:true,
433 clearable: true, 428 clearable: true,
...@@ -523,12 +518,18 @@ ...@@ -523,12 +518,18 @@
523 value: '', 518 value: '',
524 ytTitleRowspan:1, //用途的单元格垂直合并数量 519 ytTitleRowspan:1, //用途的单元格垂直合并数量
525 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量 520 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
521 formHeight:0,
522 mainBoxWidth:0,
526 } 523 }
527 }, 524 },
528 created(){ 525 created(){
529 let bsm=this.$store.state.hbsm 526 let bsm=this.$store.state.hbsm
530 console.log(bsm,'户BSM') 527 console.log(bsm,'户BSM')
531 this.getHInfo(bsm); 528 this.getHInfo(bsm);
529 this.$nextTick(()=>{
530 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
531 this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320
532 })
532 }, 533 },
533 methods: { 534 methods: {
534 registerCall(){ 535 registerCall(){
...@@ -590,13 +591,8 @@ ...@@ -590,13 +591,8 @@
590 if(res.code===200){ 591 if(res.code===200){
591 this.form = res.result; 592 this.form = res.result;
592 if(res.result.qszt !== '0'){ 593 if(res.result.qszt !== '0'){
593 console.log(JSON.stringify(res)+":res")
594 console.log(JSON.stringify(res.result)+":res.result")
595 console.log(res.result.qszt+":res.result.qszt")
596 console.log(res.result.qszt !== '0'+":res.result.qszt!==0")
597 this.disableFlag = true; 594 this.disableFlag = true;
598 } 595 }
599 console.log(this.disableFlag)
600 if(this.form.scyclx==='0'){ 596 if(this.form.scyclx==='0'){
601 this.$set(this.form,"ycjzmj", this.form.jzmj) 597 this.$set(this.form,"ycjzmj", this.form.jzmj)
602 this.$set(this.form,"yctnjzmj", this.form.tnjzmj) 598 this.$set(this.form,"yctnjzmj", this.form.tnjzmj)
...@@ -888,6 +884,15 @@ ...@@ -888,6 +884,15 @@
888 .el-select{ 884 .el-select{
889 display:block; 885 display:block;
890 } 886 }
887 .form{
888 overflow-y: scroll;
889 overflow-x: hidden;
890 margin-bottom: 30px;
891 }
892 }
893 .hpage{
894 box-sizing: border-box;
895 padding: 8px 6px 18px 18px;
891 } 896 }
892 897
893 table{ 898 table{
...@@ -904,8 +909,25 @@ ...@@ -904,8 +909,25 @@
904 height: 30px !important; 909 height: 30px !important;
905 } 910 }
906 } 911 }
907 .btnGroup{ 912
908 text-align: center; 913 .header-button {
909 margin-top: 20px; 914 height: 50px;
910 } 915 position: fixed;
916 bottom: 0;
917 right: 6px;
918 text-align: center;
919 background-color: #ffffff;
920 .el-button{
921 padding: 10px 30px;
922 margin-top: 8px;
923 }
924 .saveBtn {
925 background-color: #00CACD;
926 border-color: #00CACD;
927 }
928 .saveBtn:hover {
929 background-color: rgba(0, 202, 205, .8);
930 border-color: rgba(0, 202, 205, .8);
931 }
932 }
911 </style> 933 </style>
......
...@@ -468,6 +468,7 @@ export default { ...@@ -468,6 +468,7 @@ export default {
468 //清空已选中层户 468 //清空已选中层户
469 this.cbsmList = []; 469 this.cbsmList = [];
470 this.bsms = []; 470 this.bsms = [];
471 this.$refs.lpbContent.hbsmList = [];
471 this.$nextTick(()=>{ 472 this.$nextTick(()=>{
472 //户 473 //户
473 this.$refs.lpbContent.$refs.hBsm.forEach(item=>{ 474 this.$refs.lpbContent.$refs.hBsm.forEach(item=>{
...@@ -484,6 +485,7 @@ export default { ...@@ -484,6 +485,7 @@ export default {
484 }) 485 })
485 //获取图例数据 486 //获取图例数据
486 this.getDyztBsmList(); 487 this.getDyztBsmList();
488 this.getLpbFwytAndQlxz();
487 }, 489 },
488 //获取高度计算lpb内容区高度 490 //获取高度计算lpb内容区高度
489 getHeight() { 491 getHeight() {
...@@ -550,16 +552,17 @@ export default { ...@@ -550,16 +552,17 @@ export default {
550 }, 552 },
551 //获取选中户bsm 553 //获取选中户bsm
552 getHbsm(data, type) { 554 getHbsm(data, type) {
553 this.bsms = data;
554 if (type) { 555 if (type) {
555 // 双击 556 // 双击
556 this.hbsm = this.bsms[this.bsms.length - 1]; 557 this.hbsm = data;
558 this.$store.state.hbsm=this.data;
557 this.hbjVisible = true; 559 this.hbjVisible = true;
558 this.$nextTick(function() { 560 this.$nextTick(function() {
559 this.$refs.hbj.getHInfo(this.hbsm); 561 this.$refs.hbj.getHInfo(this.hbsm);
560 }); 562 });
561 } else { 563 } else {
562 //单击 TO DO 564 //单击 TO DO
565 this.bsms = data;
563 } 566 }
564 }, 567 },
565 //获取选中层bsmlist 568 //获取选中层bsmlist
...@@ -586,9 +589,9 @@ export default { ...@@ -586,9 +589,9 @@ export default {
586 }, 589 },
587 //调用楼盘表信息查询接口 590 //调用楼盘表信息查询接口
588 getlpbData() { 591 getlpbData() {
589 this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm); 592 this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,this.scyclx);
590 //改变楼盘表子组件的key值，重新渲染 593 //改变楼盘表子组件的key值，重新渲染
591 this.time = new Date().getTime(); 594 // this.time = new Date().getTime();
592 }, 595 },
593 //实预测装换 596 //实预测装换
594 plScYcChange() { 597 plScYcChange() {
...@@ -607,7 +610,7 @@ export default { ...@@ -607,7 +610,7 @@ export default {
607 //每次切换房屋状态，将之前高亮的户边框颜色重置为默认 610 //每次切换房屋状态，将之前高亮的户边框颜色重置为默认
608 this.$refs.lpbContent.choosedList = []; 611 this.$refs.lpbContent.choosedList = [];
609 this.$refs.lpbContent.$refs.hBsm.forEach((item) => { 612 this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
610 item.style.borderColor = '#E6E6E6'; 613 item.style.border = '';
611 }); 614 });
612 // console.log(bsms,'bsms'); 615 // console.log(bsms,'bsms');
613 // console.log(color,'color'); 616 // console.log(color,'color');
...@@ -740,7 +743,7 @@ export default { ...@@ -740,7 +743,7 @@ export default {
740 }, 743 },
741 selectedZt(n){ 744 selectedZt(n){
742 this.legendToggleFlag = true; 745 this.legendToggleFlag = true;
743 } 746 },
744 }, 747 },
745 }; 748 };
746 </script> 749 </script>
......
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
21 ref="ljz" 21 ref="ljz"
22 v-for="(ljzs, ljzIndex) in lpbData.ljzs" 22 v-for="(ljzs, ljzIndex) in lpbData.ljzs"
23 :key="ljzIndex" 23 :key="ljzIndex"
24 :style="{'marginTop':ljzs.zdys.length > 0 ? '-30px':0}" 24 :style="{'marginTop':ljzs.zdys.length>0?'0':'30px'}"
25 > 25 >
26 <!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> --> 26 <!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
27 <!-- 循环逻辑幢下的幢单元 --> 27 <!-- 循环逻辑幢下的幢单元 -->
28 <div 28 <div
29 class="ljz-zdy" 29 class="ljz-zdy"
30 :style="{ 'min-height': ljzzdyHeight + 40 + 'px' }" 30 :style="{ 'min-height': ljzzdyHeight + 40 + 'px','marginRight':zdyIndex<(ljzs.zdys.length-1)?'20px':'0'}"
31 ref="ljzzdy" 31 ref="ljzzdy"
32 v-show="ljzs.zdys.length > 0" 32 v-show="ljzs.zdys.length > 0"
33 v-for="(zdys, zdyIndex) in ljzs.zdys" 33 v-for="(zdys, zdyIndex) in ljzs.zdys"
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
294 @close="moveHClose" 294 @close="moveHClose"
295 :move-hvisible="moveHvisible" 295 :move-hvisible="moveHvisible"
296 :type="scyclx" 296 :type="scyclx"
297 @loading="loadingData" 297 @loading="loadingData($store.state.zrzbsm,$parent.scyclx)"
298 ></move-h> 298 ></move-h>
299 </div> 299 </div>
300 </template> 300 </template>
...@@ -363,11 +363,11 @@ export default { ...@@ -363,11 +363,11 @@ export default {
363 }, 200); 363 }, 200);
364 }, 364 },
365 methods: { 365 methods: {
366 loadingData() { 366 loadingData(zrzbsm,scyclx) {
367 this.getLpb(this.$store.state.zrzbsm, this.$parent.scyclx); 367 this.getLpb(zrzbsm,scyclx,true);
368 }, 368 },
369 //获取楼盘表数据 369 //获取楼盘表数据
370 getLpb(zrzbsm, scyclx) { 370 getLpb(zrzbsm, scyclx,actual) {
371 getLpb(zrzbsm, scyclx).then((res) => { 371 getLpb(zrzbsm, scyclx).then((res) => {
372 if (res.code == 200) { 372 if (res.code == 200) {
373 this.loading = false; 373 this.loading = false;
...@@ -382,6 +382,9 @@ export default { ...@@ -382,6 +382,9 @@ export default {
382 }else{ 382 }else{
383 this.sclpbData = res.result == null ? this.sclpbData : res.result; 383 this.sclpbData = res.result == null ? this.sclpbData : res.result;
384 } 384 }
385 if(actual){
386 this.lpbData = res.result == null ? this.yclpbData : res.result;
387 }
385 this.$nextTick(() => { 388 this.$nextTick(() => {
386 //渲染楼盘表 389 //渲染楼盘表
387 this.dataChange(); 390 this.dataChange();
...@@ -508,8 +511,8 @@ export default { ...@@ -508,8 +511,8 @@ export default {
508 //户双击事件 511 //户双击事件
509 dbclick(bsm) { 512 dbclick(bsm) {
510 clearTimeout(this.time); 513 clearTimeout(this.time);
511 this.hbsmList.push(bsm); // 将户bsm放进hbsmList 514 // this.hbsmList.push(bsm); // 将户bsm放进hbsmList
512 this.$parent.getHbsm(this.hbsmList, true); 515 this.$parent.getHbsm(bsm, true);
513 }, 516 },
514 //删除多重数组中的某一项 517 //删除多重数组中的某一项
515 deleteArrOption(arr, item) { 518 deleteArrOption(arr, item) {
...@@ -689,9 +692,9 @@ export default { ...@@ -689,9 +692,9 @@ export default {
689 // console.log(this.choosedList,'this.choosedList'); 692 // console.log(this.choosedList,'this.choosedList');
690 this.choosedList.forEach((i) => { 693 this.choosedList.forEach((i) => {
691 if (item.dataset.bsm == i) { 694 if (item.dataset.bsm == i) {
692 console.log(item.style.borderColor ,'item.style.borderColor '); 695 // console.log(item.style.border,'item.style.border');
693 console.log(this.borderColor,'this.borderColor'); 696 // console.log(this.borderColor,'this.borderColor');
694 item.style.borderColor = this.borderColor; 697 item.style.border = '1px solid '+this.borderColor;
695 } 698 }
696 }); 699 });
697 }); 700 });
...@@ -724,7 +727,7 @@ export default { ...@@ -724,7 +727,7 @@ export default {
724 height: auto; 727 height: auto;
725 overflow: hidden; 728 overflow: hidden;
726 .ljz { 729 .ljz {
727 margin-bottom: 20px; 730 // margin-bottom: 20px;
728 display: table; 731 display: table;
729 // position: relative; 732 // position: relative;
730 // .ljz-zdy-wrap { 733 // .ljz-zdy-wrap {
...@@ -732,7 +735,6 @@ export default { ...@@ -732,7 +735,6 @@ export default {
732 // display: table; 735 // display: table;
733 .ljz-zdy { 736 .ljz-zdy {
734 height: auto; 737 height: auto;
735 margin-right: 20px;
736 float: left; 738 float: left;
737 position: relative; 739 position: relative;
738 .zdy-name { 740 .zdy-name {
...@@ -772,13 +774,13 @@ export default { ...@@ -772,13 +774,13 @@ export default {
772 } 774 }
773 } 775 }
774 .bottom40 { 776 .bottom40 {
775 position: absolute; 777 margin-bottom: -30px;
776 bottom: 40px;
777 } 778 }
778 .zdy-wrap { 779 .zdy-wrap {
779 height: auto; 780 height: auto;
780 overflow: hidden; 781 overflow: hidden;
781 margin-bottom: 60px; 782 margin-bottom: 60px;
783 margin-top: 30px;
782 .zdy { 784 .zdy {
783 float: left; 785 float: left;
784 margin-right: 20px; 786 margin-right: 20px;
......
1 <template> 1 <template>
2 <div class=""></div> 2 <div class="">
3 <el-table
4 :data="tableData"
5 style="width: 100%;margin-bottom: 20px;"
6 row-key="bsm"
7 border
8 default-expand-all
9 :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
10 <el-table-column
11 prop="mc"
12 label="地址(单元名称)">
13 </el-table-column>
14 <el-table-column
15 prop="bdcdyh"
16 label="不动产单元号">
17 </el-table-column>
18 <el-table-column
19 prop="ch"
20 label="层号"
21 :formatter="chFilter">
22 </el-table-column>
23 <el-table-column
24 prop="hh"
25 label="户号"
26 :formatter="hhFilter">
27 </el-table-column>
28 <el-table-column
29 prop="fwyt"
30 label="房屋用途">
31 </el-table-column>
32 <el-table-column
33 prop="fwjg"
34 label="房屋结构">
35 </el-table-column>
36 <el-table-column
37 prop="jzmj"
38 label="面积">
39 </el-table-column>
40 <el-table-column
41 prop="tnjzmj"
42 label="套内建筑面积">
43 </el-table-column>
44 <el-table-column
45 prop="ftjzmj"
46 label="分摊建筑面积">
47 </el-table-column>
48 <el-table-column
49 prop="dxbfjzmj"
50 label="地下部分建筑面积">
51 </el-table-column>
52 <el-table-column
53 prop="qtjzmj"
54 label="其它建筑面积">
55 </el-table-column>
56 </el-table>
57 </div>
3 </template> 58 </template>
4 59
5 <script> 60 <script>
61 import {getDetailInfo} from "./../../../../api/lpb"
6 export default { 62 export default {
7 name:"", 63 name:"",
8 components:{}, 64 components:{},
9 props:{}, 65 props:{},
10 data(){ 66 data(){
11 return { 67 return {
68 tableData: []
12 } 69 }
13 }, 70 },
14 created(){}, 71 created(){},
15 mounted(){}, 72 mounted(){
16 methods:{}, 73 this.getData();
74 },
75 methods:{
76
77 chFilter(row, column){
78 if(row.ch === 0){
79 return ''
80 }else {
81 return row.ch;
82 }
83 },
84
85 hhFilter(row, column){
86 if(row.hh === 0){
87 return ''
88 }else {
89 return row.hh;
90 }
91 },
92
93 getData(){
94 let zrzbsm = '12a4eb0cf2b527273ff5f0b96820715a';
95 let scyclx = '0';
96 getDetailInfo(zrzbsm,scyclx).then((res)=>{
97 if(res.code===200){
98 console.log(res.result)
99 this.tableData = res.result;
100 }
101 })
102 },
103
104 load(tree, treeNode, resolve) {
105 setTimeout(() => {
106 resolve([
107 {
108 id: 31,
109 date: '2016-05-01',
110 name: '王小虎',
111 address: '上海市普陀区金沙江路 1519 弄'
112 }, {
113 id: 32,
114 date: '2016-05-01',
115 name: '王小虎',
116 address: '上海市普陀区金沙江路 1519 弄'
117 }
118 ])
119 }, 1000)
120 }
121
122
123 },
17 computed: {}, 124 computed: {},
18 watch: {}, 125 watch: {},
19 } 126 }
......
1 <template> 1 <template>
2 <div class=""> 2 <div class="main" ref="mainBox">
3 <div class="main"> 3 <table border="1">
4 <table border="1"> 4 <tr>
5 <tr> 5 <td colspan="3">宗地代码</td>
6 <td colspan="3">宗地代码</td> 6 <td colspan="4"><input type="text" class="formInput" v-model="zddm " disabled/></td>
7 <td colspan="4"><input type="text" class="formInput" v-model="zddm " disabled/></td> 7 </tr>
8 </tr> 8 <tr>
9 <tr> 9 <td colspan="3">建筑物区分所有权业主共有部分权利人</td>
10 <td colspan="3">建筑物区分所有权业主共有部分权利人</td> 10 <td colspan="4"><input type="text" class="formInput" v-model="Data.qlr" disabled/></td>
11 <td colspan="4"><input type="text" class="formInput" v-model="Data.qlr" disabled/></td> 11 </tr>
12 </tr> 12 </table>
13 </table> 13 <table border="1">
14 <table border="1"> 14 <tr>
15 <tr> 15 <td>
16 <td> 16 <el-button
17 <el-button 17 type="primary"
18 type="primary" 18 class="changeBtn outAdd addMinus"
19 class="changeBtn outAdd addMinus" 19 @click="addRow"
20 @click="addRow" 20 >+</el-button
21 >+</el-button 21 >
22 > 22 </td>
23 </td> 23 <td>建(构)筑物编号</td>
24 <td>建(构)筑物编号</td> 24 <td>建(构)筑物数量</td>
25 <td>建(构)筑物数量</td> 25 <td>建(构)筑物面积(㎡)</td>
26 <td>建(构)筑物面积(㎡)</td> 26 <td>占地面积(㎡)</td>
27 <td>占地面积(㎡)</td> 27 <td>分摊土地面积(㎡)</td>
28 <td>分摊土地面积(㎡)</td> 28 <td>附记</td>
29 <td>附记</td> 29 </tr>
30 </tr> 30 <tr v-for="(item,i) in Data.list" :key="i">
31 <tr v-for="(item,i) in Data.list" :key="i"> 31 <td>
32 <td> 32 <el-button
33 <el-button 33 type="primary"
34 type="primary" 34 class="changeBtn outMinus addMinus"
35 class="changeBtn outMinus addMinus" 35 @click="delRow(i)"
36 @click="delRow(i)" 36 >-</el-button
37 >-</el-button 37 >
38 > 38 </td>
39 </td> 39 <td><el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号"></el-input></td>
40 <td><el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号"></el-input></td> 40 <td><el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d*/g)) || null" placeholder="请输入建(构)筑物数量"></el-input></td>
41 <td><el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d*/g)) || null" placeholder="请输入建(构)筑物数量"></el-input></td> 41 <td><el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入建(构)筑物面积(㎡)"></el-input></td>
42 <td><el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入建(构)筑物面积(㎡)"></el-input></td> 42 <td><el-input v-model="item.zdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入占地面积(㎡)"></el-input></td>
43 <td><el-input v-model="item.zdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入占地面积(㎡)"></el-input></td> 43 <td><el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入分摊土地面积(㎡)"></el-input></td>
44 <td><el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入分摊土地面积(㎡)"></el-input></td> 44 <td><el-input v-model="item.fj" placeholder="请输入附记"></el-input></td>
45 <td><el-input v-model="item.fj" placeholder="请输入附记"></el-input></td> 45 </tr>
46 </tr> 46 <!-- <tr>
47 <!-- <tr> 47 <td>统计</td>
48 <td>统计</td> 48 <td>{{sumTdsyqsyqmj}}</td>
49 <td>{{sumTdsyqsyqmj}}</td> 49 <td>{{sumDydytdmj}}</td>
50 <td>{{sumDydytdmj}}</td> 50 <td>{{sumFttdmj}}</td>
51 <td>{{sumFttdmj}}</td> 51 <td>{{sumFttdmj}}</td>
52 <td>{{sumFttdmj}}</td> 52 <td>{{sumFttdmj}}</td>
53 <td>{{sumFttdmj}}</td> 53 <td>{{sumFttdmj}}</td>
54 <td>{{sumFttdmj}}</td> 54 </tr>-->
55 </tr>--> 55 </table>
56 </table> 56 <!-- <div class="pers">
57 <div class="pers"> 57 <el-button @click="save" type="primary">保存</el-button>
58 <el-button @click="save" type="primary">保存</el-button> 58 </div> -->
59 </div> 59 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
60 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
60 </div> 61 </div>
61 </div> 62 </div>
62 </template> 63 </template>
...@@ -83,7 +84,8 @@ ...@@ -83,7 +84,8 @@
83 fttdmj: '', //分摊土地面积 84 fttdmj: '', //分摊土地面积
84 fj: '' 85 fj: ''
85 }] 86 }]
86 } 87 },
88 mainBoxWidth:0
87 } 89 }
88 }, 90 },
89 91
...@@ -127,10 +129,12 @@ ...@@ -127,10 +129,12 @@
127 console.log("create init...") 129 console.log("create init...")
128 }, 130 },
129 mounted() { 131 mounted() {
130 console.log("mounted init...") 132 // console.log(this.$refs.mainBox.clientWidth,"this.$refs.mainBox.clientWidth")
131 this.Data.glbsm = this.$store.state.zrzbsm 133 this.Data.glbsm = this.$store.state.zrzbsm
132 this.zddm = this.$store.state.zddm 134 this.zddm = this.$store.state.zddm
133 this.getData(this.Data.glbsm) 135 this.$nextTick(() => {
136 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
137 })
134 }, 138 },
135 watch: { 139 watch: {
136 "$store.state.zdbsm": function (bsm) { 140 "$store.state.zdbsm": function (bsm) {
...@@ -147,7 +151,7 @@ ...@@ -147,7 +151,7 @@
147 box-sizing: border-box; 151 box-sizing: border-box;
148 padding: 18px; 152 padding: 18px;
149 height: auto; 153 height: auto;
150 width: 80%; 154 width: 100%;
151 } 155 }
152 156
153 table { 157 table {
...@@ -186,4 +190,22 @@ ...@@ -186,4 +190,22 @@
186 .dzwsl { 190 .dzwsl {
187 width: 200px; 191 width: 200px;
188 } 192 }
193 .header-button {
194 height: 50px;
195 position: fixed;
196 bottom: 0;
197 right: 0;
198 text-align: center;
199 background-color: #ffffff;
200 .saveBtn {
201 background-color: #00CACD;
202 border-color: #00CACD;
203 padding: 10px 30px;
204 margin-top: 8px;
205 }
206 .saveBtn:hover {
207 background-color: rgba(0, 202, 205, .8);
208 border-color: rgba(0, 202, 205, .8);
209 }
210 }
189 </style> 211 </style>
......