Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
9dba7c9f by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 1ea00911 417eb778
Inline Side-by-side
Showing 23 changed files with 489 additions and 413 deletions
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
60 position: absolute; 60 position: absolute;
61 top: 0; 61 top: 0;
62 left: 0; 62 left: 0;
63 z-index: 1; 63 z-index: 1000;
64 .content{ 64 .content{
65 width: 240px; 65 width: 240px;
66 height: 160px; 66 height: 160px;
......
...@@ -101,6 +101,7 @@ ol, ul { list-style:none; } ...@@ -101,6 +101,7 @@ ol, ul { list-style:none; }
101 /deep/ .el-tabs--border-card{ 101 /deep/ .el-tabs--border-card{
102 border: 0; 102 border: 0;
103 } 103 }
104
104 //二级菜单样式 105 //二级菜单样式
105 .tabs{ 106 .tabs{
106 >.el-tabs__content{ 107 >.el-tabs__content{
...@@ -115,28 +116,24 @@ ol, ul { list-style:none; } ...@@ -115,28 +116,24 @@ ol, ul { list-style:none; }
115 width: 100%; 116 width: 100%;
116 margin-bottom: 0; 117 margin-bottom: 0;
117 border-top: 1px solid #F4F9FF; 118 border-top: 1px solid #F4F9FF;
118 // >.is-top>.el-tabs__nav-scroll{ 119 }
119 // height: 50px; 120 }
120 // background-color: #ffffff; 121 .el-tabs{
121 // box-sizing: border-box; 122 height: calc(100% - 50px);
122 // padding-left: 20px; 123 /deep/.el-tabs__content{
123 // .el-tabs__active-bar{ 124 height: 100%;
124 // display: none; 125 position: unset;
125 // } 126 /deep/.el-tab-pane{
126 // >.el-tabs__nav{ 127 height: 100%;
127 // >.el-tabs__item{ 128 }
128 // border: 1px solid #DEDEDE; 129 background-color: #F4F9FF;
129 // height: 30px; 130 padding: 0;
130 // line-height: 28px; 131 }
131 // padding: 0 20px; 132 /deep/ .el-tabs__item {
132 // margin: 9px 10px 9px 0; 133 height: 48px;
133 // } 134 }
134 // .is-active{ 135 /deep/ .el-tabs__header{
135 // color: #006CFF; 136 background-color: #ffffff;
136 // background-color: #ffffff;
137 // }
138 // }
139 // }
140 } 137 }
141 } 138 }
142 .el-tabs__item{ 139 .el-tabs__item{
......
1 <template>
2 <div >
3 <table border="1">
4 <thead>
5 <tr rowspan="2">
6 <th colspan="4">
7 <h2> 集体土地所有权宗地分类面积调查表</h2><br/>
8 <div class="dw">
9 单位:
10 <el-radio-group v-model="flmjData.dw">
11 <el-radio :label="3">平方米</el-radio>
12 <el-radio :label="6">公顷</el-radio>
13 <el-radio :label="9">亩</el-radio>
14 </el-radio-group>
15 </div>
16 </th>
17 </tr>
18 </thead>
19 <tbody>
20 <tr>
21 <th>权利人</th>
22 <td colspan="3">
23 <el-input v-model="flmjData.qlr" disabled></el-input>
24 </td>
25 </tr>
26 <tr>
27 <th>宗地代码</th>
28 <td colspan="3">
29 <el-input v-model="flmjData.zddm" disabled></el-input>
30 </td>
31 </tr>
32 <tr>
33 <th>不动产单元号</th>
34 <td colspan="3">
35 <el-input v-model="flmjData.bdcdyh" disabled></el-input>
36 </td>
37 </tr>
38 <tr >
39 <th rowspan="7">
40 分类面积
41 </th>
42 <th colspan="2">农用地</th>
43 <td>
44 <el-input v-model="flmjData.lyd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
45 </td>
46 </tr>
47 <tr>
48 <th rowspan="4">
49 其他
50 </th>
51 <th>
52 耕地
53 </th>
54 <th colspan="2">
55 <el-input v-model="flmjData.gd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
56 </th>
57 </tr>
58 <tr>
59 <th>林地</th>
60 <td colspan="2">
61 <el-input v-model="flmjData.ld" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
62 </td>
63 </tr>
64 <tr>
65 <th>
66 草地
67 </th>
68 <td colspan="2">
69 <el-input v-model="flmjData.cd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
70 </td>
71 </tr>
72 <tr>
73 <th>其他</th>
74 <td colspan="2">
75 <el-input v-model="flmjData.qt" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
76 </td>
77 </tr>
78 <tr>
79 <th>建设用地</th>
80 <td colspan="3">
81 <el-input v-model="flmjData.jsyd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
82 </td>
83 </tr>
84 <tr>
85 <th>
86 未利用地
87 </th>
88 <td colspan="3">
89 <el-input v-model="flmjData.wlyd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
90 </td>
91 </tr>
92 <tr>
93 <th rowspan="2">调查记事</th>
94 <td colspan="3">
95 <el-input type="textarea"
96 :autosize="{ minRows: 2, maxRows: 4}" v-model="flmjData.dcjs"></el-input>
97 </td>
98 </tr>
99 <tr>
100 <td colspan="3">
101
102 <el-form :inline="true" :model="flmjData" class="demo-form-inline">
103 <el-form-item label="调查员:">
104 <el-input v-model="flmjData.dcy" ></el-input>
105 </el-form-item>
106 <el-form-item label="日期:">
107 <el-input
108 placeholder="请选择日期"
109 title="调查日期"
110 type="date"
111 v-model="flmjData.dcrq">
112 </el-input>
113 </el-form-item>
114 </el-form>
115 </td>
116 </tr>
117 <tr>
118 <th rowspan="2">审核意见</th>
119 <td colspan="3">
120 <el-input type="textarea"
121 :autosize="{ minRows: 2, maxRows: 4}" v-model="flmjData.shyj"></el-input>
122 </td>
123 </tr>
124 <tr>
125 <td colspan="3">
126 <el-form :inline="true" :model="flmjData" class="demo-form-inline">
127 <el-form-item label="审核员:">
128 <el-input v-model="flmjData.shy" ></el-input>
129 </el-form-item>
130 <el-form-item label="日期:">
131 <el-input
132 placeholder="请选择日期"
133 title="调查日期"
134 type="date"
135 v-model="flmjData.shrq">
136 </el-input>
137 </el-form-item>
138 </el-form>
139 </td>
140 </tr>
141 <tr>
142 <td colspan="4" style="text-align: center">
143 <el-button>保存</el-button>
144 </td>
145 </tr>
146 </tbody>
147 </table>
148 </div>
149 </template>
150
151 <script>
152 export default {
153 name: "Fldcb",
154 data(){
155 return{
156 flmjData:{
157 dw:'', // 单位
158 qlr:'', // 权利人
159 zddm:'', // 宗地代码
160 bdcdyh:'', // 不动产单元号
161 lyd:'', // 农用地
162 gd:'', // 耕地
163 ld:'', // 林地
164 cd:'', // 草地
165 qt:'', //其他
166 jsyd:'', // 建设用地
167 wlyd:'', // 未利用地
168 dcjs:"", // 调查记事
169 dcy:'', // 调查员
170 dcrq:'', // 调查日期
171 shyj:'', // 审核意见
172 shy:'', // 审核员
173 shrq:'' // 审核日期
174 }
175 }
176 }
177 }
178 </script>
179
180 <style scoped lang="less">
181 table{
182 margin-top: 20px;
183 background-color: #fff;
184 font-size: 14px;
185 width: 100%;
186 cursor: pointer;
187 th{
188 height: 36px;
189 }
190 }
191 .dw{
192 float: right;
193 }
194 .demo-form-inline{
195 float: right;
196 }
197 </style>
...@@ -495,8 +495,10 @@ ...@@ -495,8 +495,10 @@
495 cancelButtonText: '取消', 495 cancelButtonText: '取消',
496 type: 'warning' 496 type: 'warning'
497 }).then(() => { 497 }).then(() => {
498 vm.loadingShow('业务办理中');
498 fwsxbgbl(params) 499 fwsxbgbl(params)
499 .then((res) => { 500 .then((res) => {
501 vm.loadingHide();
500 if (res.success) { 502 if (res.success) {
501 // this.$message({ 503 // this.$message({
502 // message: res.message, 504 // message: res.message,
...@@ -538,6 +540,7 @@ ...@@ -538,6 +540,7 @@
538 } 540 }
539 }) 541 })
540 .catch((error) => { 542 .catch((error) => {
543 vm.loadingHide();
541 this.$message({ 544 this.$message({
542 message: res.message, 545 message: res.message,
543 type: "error", 546 type: "error",
......
...@@ -10,24 +10,25 @@ ...@@ -10,24 +10,25 @@
10 <div> 10 <div>
11 <table border="1"> 11 <table border="1">
12 <tr> 12 <tr>
13 <td>室号前缀</td> 13 <th>室号前缀</th>
14 <td>幢单元号</td> 14 <th>幢单元号</th>
15 <td>分割符A</td> 15 <th>分割符A</th>
16 <td>层号前自动补0</td> 16 <th>层号前自动补0</th>
17 <td>层</td> 17 <th>层号</th>
18 <td>分割符B</td> 18 <th>分割符B</th>
19 <td>户号</td> 19 <th>户号前自动补零</th>
20 <td>室号后缀</td> 20 <th>户号</th>
21 <th>室号后缀</th>
21 </tr> 22 </tr>
22 <tr> 23 <tr>
23 <td> 24 <td>
24 <input type="text" class="inputtitle" v-model="plshData.shqz"/> 25 <el-input v-model="plshData.shqz"></el-input>
25 </td> 26 </td>
26 <td> 27 <td>
27 <el-checkbox v-model="plshData.selectDyh"></el-checkbox> 28 <el-checkbox v-model="plshData.selectDyh"></el-checkbox>
28 </td> 29 </td>
29 <td> 30 <td>
30 <input type="text" class="inputtitle" v-model="plshData.fgfA"/> 31 <el-input v-model="plshData.fgfA"></el-input>
31 </td> 32 </td>
32 <td> 33 <td>
33 <el-checkbox v-model="plshData.chqbl"></el-checkbox> 34 <el-checkbox v-model="plshData.chqbl"></el-checkbox>
...@@ -43,13 +44,15 @@ ...@@ -43,13 +44,15 @@
43 </el-select> 44 </el-select>
44 </td> 45 </td>
45 <td> 46 <td>
46 <input type="text" class="inputtitle" v-model="plshData.fgfB"/> 47 <el-input v-model="plshData.fgfB"></el-input>
48 </td>
49 <td>
50 <el-checkbox v-model="plshData.hhqbl"></el-checkbox>
47 </td> 51 </td>
48 <td> 52 <td>
49
50 </td> 53 </td>
51 <td> 54 <td>
52 <input type="text" class="inputtitle" v-model="plshData.shhz"/> 55 <el-input v-model="plshData.shhz"></el-input>
53 </td> 56 </td>
54 </tr> 57 </tr>
55 </table> 58 </table>
...@@ -60,15 +63,15 @@ ...@@ -60,15 +63,15 @@
60 <span> 63 <span>
61 样例1：1011 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”) 64 样例1：1011 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
62 <br/> 65 <br/>
63 样例2：1131室<span>（1单元13层01室）</span>([单元号][层号][后缀]) 66 样例2：1131室<span>（1单元13层01室）</span>([单元号][层号][后缀],后缀填写'室')
64 <br/> 67 <br/>
65 样例3：11<span>(1层01室)</span>([层号]) 68 样例3：101<span>(1层01室)</span>([层号],勾选“户号自动补0”)
66 <br/> 69 <br/>
67 样例4：1-011<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”) 70 样例4：1-011<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号自动补0”)
68 <br/> 71 <br/>
69 样例5：1-13-1<span>(1单元13层01室)</span>([单元号][分隔符A][层号][分隔符B]) 72 样例5：1-12-1<span>(1单元12层01室)</span>([单元号][分隔符A][层号][分隔符B])
70 <br/> 73 <br/>
71 样例6：1-1<span>(1单元13层01室)</span>([单元号][分隔符]，勾选“室号之前增加分隔符”) 74 样例6：1-12<span>(1层12室)</span>([层号][分隔符B])
72 </span> 75 </span>
73 </div> 76 </div>
74 </div> 77 </div>
...@@ -106,6 +109,7 @@ ...@@ -106,6 +109,7 @@
106 chqbl: false, 109 chqbl: false,
107 c: '', 110 c: '',
108 fgfB: '', 111 fgfB: '',
112 hhqbl:false,
109 shhz: '' 113 shhz: ''
110 }, 114 },
111 cs: [ 115 cs: [
...@@ -128,8 +132,6 @@ ...@@ -128,8 +132,6 @@
128 methods: { 132 methods: {
129 test: function () { 133 test: function () {
130 for (let key in this.plshData) { 134 for (let key in this.plshData) {
131 console.log(key)
132 console.log(this.plshData[key])
133 if (key === 'chqbl') { 135 if (key === 'chqbl') {
134 continue; 136 continue;
135 } 137 }
...@@ -153,6 +155,7 @@ ...@@ -153,6 +155,7 @@
153 selectDyh: false, 155 selectDyh: false,
154 fgfA: '', 156 fgfA: '',
155 chqbl: false, 157 chqbl: false,
158 hhqbl:false,
156 c: '', 159 c: '',
157 fgfB: '', 160 fgfB: '',
158 shhz: '' 161 shhz: ''
...@@ -223,7 +226,9 @@ ...@@ -223,7 +226,9 @@
223 cursor: pointer; 226 cursor: pointer;
224 } 227 }
225 } 228 }
226 229 th{
230 height: 36px;
231 }
227 td { 232 td {
228 text-align: center; 233 text-align: center;
229 height: 36px; 234 height: 36px;
......
...@@ -55,6 +55,10 @@ ...@@ -55,6 +55,10 @@
55 <i class="iconfont icondiqiu" title="图形管理" v-if="!isMap" @click="goMap"></i> 55 <i class="iconfont icondiqiu" title="图形管理" v-if="!isMap" @click="goMap"></i>
56 <i class="iconfont iconxinxi" title="属性管理" v-else @click="goBack"></i> 56 <i class="iconfont iconxinxi" title="属性管理" v-else @click="goBack"></i>
57 </div> 57 </div>
58 <div class="user-info">
59 <span>admin</span>
60 <img src="https://himg.bdimg.com/sys/portraitn/item/a1b5badad3b61739" alt="">
61 </div>
58 </div> 62 </div>
59 <!-- <div class="header-bottom"> 63 <!-- <div class="header-bottom">
60 <Navigation ref="navigation"></Navigation> 64 <Navigation ref="navigation"></Navigation>
...@@ -528,10 +532,38 @@ export default { ...@@ -528,10 +532,38 @@ export default {
528 right: 18px; 532 right: 18px;
529 top: 20px; 533 top: 20px;
530 .tuOrShu{ 534 .tuOrShu{
535 float: left;
531 .iconfont{ 536 .iconfont{
532 cursor: pointer; 537 cursor: pointer;
533 color:#ffffff; 538 color:#ffffff;
534 font-size:30px 539 font-size:26px;
540 position: relative;
541 top: 2px;
542 }
543 }
544 .user-info{
545 float: left;
546 margin-left: 20px;
547 cursor: pointer;
548 span{
549 line-height: 30px;
550 vertical-align: middle;
551 color: #fff;
552 font-size: 14px;
553 }
554 img{
555 // padding: 2px;
556 width: 24px;
557 height: 24px;
558 margin-left: 6px;
559 border-radius: 50%;
560 border: 1px solid #fff;
561 vertical-align: middle;
562 }
563 }
564 .user-info:hover{
565 span{
566 color: #006CFF;
535 } 567 }
536 } 568 }
537 } 569 }
......
...@@ -189,64 +189,45 @@ ...@@ -189,64 +189,45 @@
189 }; 189 };
190 </script> 190 </script>
191 <style scoped lang="less"> 191 <style scoped lang="less">
192 .el-tabs{ 192 .main {
193 height: calc(100% - 50px); 193 width: 100%;
194 /deep/.el-tabs__content{ 194 height: 100%;
195 height: 100%; 195 box-sizing: border-box;
196 /deep/.el-tab-pane{ 196 padding: 0 18px 0 0;
197 height: 100%; 197 display: flex;
198 } 198 flex-direction: column;
199 //background: #F4F9FF; 199 //background-color: #F4F9FF;
200 background-color: #F4F9FF; 200 background-color: #F4F9FF;
201 padding: 0; 201 .tips{
202 color: #9B9B9B;
203 margin-left: 2px;
204 margin-bottom: 10px;
205 }
206 .demo-form-inline {
207 margin-top: 18px;
208 .moreSearchBtn {
209 background-color: #1ad6e1;
210 border-color: #1ad6e1;
202 } 211 }
203 /deep/ .el-tabs__item { 212 .moreSearchBtn:focus,
204 height: 48px; 213 .moreSearchBtn:hover {
214 background-color: rgba(28, 200, 229, 0.6);
205 } 215 }
206 /deep/ .el-tabs__header{ 216 }
207 background-color: #ffffff; 217 .dataGrid {
208 margin: 0; 218 flex: 1;
219 .pagination {
220 padding: 18px 0;
209 } 221 }
210 .main { 222 }
211 width: 100%; 223 .hbjDialog{
212 height: 100%; 224 /deep/ .el-dialog{
213 box-sizing: border-box; 225 margin-top: 10vh!important;
214 padding: 0 18px 0 0;
215 display: flex;
216 flex-direction: column;
217 //background-color: #F4F9FF;
218 background-color: #F4F9FF;
219 .tips{
220 color: #9B9B9B;
221 margin-left: 2px;
222 margin-bottom: 10px;
223 }
224 .demo-form-inline {
225 margin-top: 18px;
226 .moreSearchBtn {
227 background-color: #1ad6e1;
228 border-color: #1ad6e1;
229 }
230 .moreSearchBtn:focus,
231 .moreSearchBtn:hover {
232 background-color: rgba(28, 200, 229, 0.6);
233 }
234 }
235 .dataGrid {
236 flex: 1;
237 .pagination {
238 padding: 18px 0;
239 }
240 }
241 .hbjDialog{
242 /deep/ .el-dialog{
243 margin-top: 10vh!important;
244 }
245 }
246 .btnGroup{
247 margin: 20px auto 0;
248 width: 230px;
249 }
250 } 226 }
251 } 227 }
228 .btnGroup{
229 margin: 20px auto 0;
230 width: 230px;
231 }
232 }
252 </style> 233 </style>
......
...@@ -72,65 +72,44 @@ ...@@ -72,65 +72,44 @@
72 }; 72 };
73 </script> 73 </script>
74 <style scoped lang="less"> 74 <style scoped lang="less">
75 .el-tabs{ 75 .main {
76 height: calc(100% - 50px); 76 width: 100%;
77 /deep/.el-tabs__content{ 77 height: 100%;
78 height: 100%; 78 box-sizing: border-box;
79 /deep/.el-tab-pane{ 79 padding: 0 18px 0 0;
80 height: 100%; 80 display: flex;
81 } 81 flex-direction: column;
82 //background: #F4F9FF; 82 background-color: #F4F9FF;
83 background-color: #F4F9FF; 83 .tips{
84 padding: 0; 84 color: #9B9B9B;
85 margin-left: 2px;
86 margin-bottom: 10px;
87 }
88 .demo-form-inline {
89 margin-top: 18px;
90 .moreSearchBtn {
91 background-color: #1ad6e1;
92 border-color: #1ad6e1;
85 } 93 }
86 /deep/ .el-tabs__item { 94 .moreSearchBtn:focus,
87 height: 48px; 95 .moreSearchBtn:hover {
96 background-color: rgba(28, 200, 229, 0.6);
88 } 97 }
89 /deep/ .el-tabs__header{ 98 }
90 background-color: #ffffff; 99 .dataGrid {
91 margin: 0; 100 flex: 1;
92 border-top: 1px solid #E4E7ED; 101 .pagination {
102 padding: 18px 0;
93 } 103 }
94 .main { 104 }
95 width: 100%; 105 .hbjDialog{
96 height: 100%; 106 /deep/ .el-dialog{
97 box-sizing: border-box; 107 margin-top: 10vh!important;
98 padding: 0 18px 0 0;
99 display: flex;
100 flex-direction: column;
101 //background-color: #F4F9FF;
102 background-color: #F4F9FF;
103 .tips{
104 color: #9B9B9B;
105 margin-left: 2px;
106 margin-bottom: 10px;
107 }
108 .demo-form-inline {
109 margin-top: 18px;
110 .moreSearchBtn {
111 background-color: #1ad6e1;
112 border-color: #1ad6e1;
113 }
114 .moreSearchBtn:focus,
115 .moreSearchBtn:hover {
116 background-color: rgba(28, 200, 229, 0.6);
117 }
118 }
119 .dataGrid {
120 flex: 1;
121 .pagination {
122 padding: 18px 0;
123 }
124 }
125 .hbjDialog{
126 /deep/ .el-dialog{
127 margin-top: 10vh!important;
128 }
129 }
130 .btnGroup{
131 margin: 20px auto 0;
132 width: 230px;
133 }
134 } 108 }
135 } 109 }
110 .btnGroup{
111 margin: 20px auto 0;
112 width: 230px;
113 }
114 }
136 </style> 115 </style>
......
...@@ -507,7 +507,9 @@ ...@@ -507,7 +507,9 @@
507 507
508 this.$nextTick(()=> { 508 this.$nextTick(()=> {
509 if (flag && this.$refs.qlxzModule.getRulesResult()) { 509 if (flag && this.$refs.qlxzModule.getRulesResult()) {
510 vm.loadingShow('请求发送中');
510 saveDzInfo(this.form).then((res)=>{ 511 saveDzInfo(this.form).then((res)=>{
512 vm.loadingHide();
511 if(res.code===200){ 513 if(res.code===200){
512 this.$message.success("保存完成！") 514 this.$message.success("保存完成！")
513 }else { 515 }else {
...@@ -517,6 +519,10 @@ ...@@ -517,6 +519,10 @@
517 }); 519 });
518 } 520 }
519 }) 521 })
522 .catch((error) => {
523 vm.loadingHide();
524 console.log(error);
525 });
520 }else { 526 }else {
521 this.$message({ 527 this.$message({
522 // message: item.name+'不能为空', 528 // message: item.name+'不能为空',
......
...@@ -63,22 +63,4 @@ ...@@ -63,22 +63,4 @@
63 }; 63 };
64 </script> 64 </script>
65 <style scoped lang="less"> 65 <style scoped lang="less">
66 .el-tabs{
67 height: calc(100% - 50px);
68 /deep/.el-tabs__content{
69 //height: 100%;
70 /deep/.el-tab-pane{
71 height: 100%;
72 }
73 //background: #F4F9FF;
74 background-color: #F4F9FF;
75 padding: 0;
76 }
77 /deep/ .el-tabs__item {
78 height: 48px;
79 }
80 /deep/ .el-tabs__header{
81 background-color: #ffffff;
82 }
83 }
84 </style> 66 </style>
......
...@@ -237,11 +237,17 @@ ...@@ -237,11 +237,17 @@
237 this.bsm=this.$route.query.bsm; 237 this.bsm=this.$route.query.bsm;
238 this.form.bsm=this.bsm; 238 this.form.bsm=this.bsm;
239 this.form.jgsj=this.form.jgrq; 239 this.form.jgsj=this.form.jgrq;
240 vm.loadingShow('请求发送中');
240 updateGzwjbxx(this.form).then((res)=>{ 241 updateGzwjbxx(this.form).then((res)=>{
242 vm.loadingHide();
241 if(res.code === 200){ 243 if(res.code === 200){
242 this.$message.success("保存完成!"); 244 this.$message.success("保存完成!");
243 } 245 }
244 }) 246 })
247 .catch((error) => {
248 vm.loadingHide();
249 console.log(error);
250 });
245 } 251 }
246 }) 252 })
247 253
......
...@@ -30,19 +30,4 @@ ...@@ -30,19 +30,4 @@
30 </script> 30 </script>
31 31
32 <style scoped lang="less"> 32 <style scoped lang="less">
33 .el-tabs{
34 height: calc(100% - 50px);
35 /deep/.el-tabs__content{
36 height: 100%;
37 /deep/.el-tab-pane{
38 height: 100%;
39 }
40 //background: #F4F9FF;
41 background-color: #F4F9FF;
42 }
43 /deep/ .el-tabs__item {
44 height: 48px;
45 }
46 }
47
48 </style> 33 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -162,54 +162,35 @@ ...@@ -162,54 +162,35 @@
162 }; 162 };
163 </script> 163 </script>
164 <style scoped lang="less"> 164 <style scoped lang="less">
165 165 .main {
166 .el-tabs{ 166 width: 100%;
167 height: calc(100% - 50px); 167 height: 100%;
168 /deep/.el-tabs__content{ 168 box-sizing: border-box;
169 height: 100%; 169 padding: 0 18px;
170 /deep/.el-tab-pane{ 170 display: flex;
171 height: 100%; 171 flex-direction: column;
172 } 172 //background-color: #F4F9FF;
173 //background: #F4F9FF; 173 background-color: #F4F9FF;
174 background-color: #F4F9FF; 174 .tips{
175 padding: 0; 175 color: #9B9B9B;
176 } 176 margin-left: 2px;
177 /deep/ .el-tabs__item { 177 margin-bottom: 10px;
178 height: 48px;
179 } 178 }
180 /deep/ .el-tabs__header{ 179 .demo-form-inline {
181 background-color: #ffffff; 180 margin-top: 18px;
182 } 181 .moreSearchBtn {
183 .main { 182 background-color: #1ad6e1;
184 width: 100%; 183 border-color: #1ad6e1;
185 height: 100%;
186 box-sizing: border-box;
187 padding: 0 18px;
188 display: flex;
189 flex-direction: column;
190 //background-color: #F4F9FF;
191 background-color: #F4F9FF;
192 .tips{
193 color: #9B9B9B;
194 margin-left: 2px;
195 margin-bottom: 10px;
196 } 184 }
197 .demo-form-inline { 185 .moreSearchBtn:focus,
198 margin-top: 18px; 186 .moreSearchBtn:hover {
199 .moreSearchBtn { 187 background-color: rgba(28, 200, 229, 0.6);
200 background-color: #1ad6e1;
201 border-color: #1ad6e1;
202 }
203 .moreSearchBtn:focus,
204 .moreSearchBtn:hover {
205 background-color: rgba(28, 200, 229, 0.6);
206 }
207 } 188 }
208 .dataGrid { 189 }
209 flex: 1; 190 .dataGrid {
210 .pagination { 191 flex: 1;
211 padding: 18px 0; 192 .pagination {
212 } 193 padding: 18px 0;
213 } 194 }
214 } 195 }
215 } 196 }
......
...@@ -305,8 +305,7 @@ ...@@ -305,8 +305,7 @@
305 newzdzdtzmbsm: this.zdhbhData.zdtzmbsm, 305 newzdzdtzmbsm: this.zdhbhData.zdtzmbsm,
306 oldzdbsms: oldBsm 306 oldzdbsms: oldBsm
307 } 307 }
308 console.log(data, '宗地合并数据') 308 vm.loadingShow('请求发送中');
309 vm.loadingShow();
310 ZdHb(data).then(res => { 309 ZdHb(data).then(res => {
311 vm.loadingHide(); 310 vm.loadingHide();
312 if (res.success) { 311 if (res.success) {
...@@ -335,7 +334,7 @@ ...@@ -335,7 +334,7 @@
335 newdzxmmc: this.$refs.dzhb.dzhbhData.xmmc, 334 newdzxmmc: this.$refs.dzhb.dzhbhData.xmmc,
336 zdbsm: this.$refs.dzhb.zdbsm 335 zdbsm: this.$refs.dzhb.zdbsm
337 } 336 }
338 vm.loadingShow(); 337 vm.loadingShow('请求发送中');
339 DzHb(data).then(res => { 338 DzHb(data).then(res => {
340 vm.loadingHide(); 339 vm.loadingHide();
341 if (res.success) { 340 if (res.success) {
......
...@@ -69,23 +69,4 @@ export default { ...@@ -69,23 +69,4 @@ export default {
69 }; 69 };
70 </script> 70 </script>
71 <style scoped lang="less"> 71 <style scoped lang="less">
72 .el-tabs{
73 height: calc(100% - 50px);
74 /deep/.el-tabs__content{
75 height: 100%;
76 position: unset;
77 /deep/.el-tab-pane{
78 height: calc(100% - 40px);
79 }
80 //background: #F4F9FF;
81 background-color: #F4F9FF;
82 padding: 0;
83 }
84 /deep/ .el-tabs__item {
85 height: 48px;
86 }
87 /deep/ .el-tabs__header{
88 background-color: #ffffff;
89 }
90 }
91 </style> 72 </style>
......
...@@ -493,11 +493,14 @@ export default { ...@@ -493,11 +493,14 @@ export default {
493 </script> 493 </script>
494 <style lang="less"> 494 <style lang="less">
495 .eltabs { 495 .eltabs {
496 height: 366px; 496 height: 366px!important;
497 width: 100%; 497 width: 100%;
498 position: relative; 498 position: relative;
499 margin-left: 20px; 499 margin-left: 20px;
500 margin-top: 20px; 500 margin-top: 20px;
501 /deep/.el-tabs__content{
502 position: relative!important;
503 }
501 .eltabspane { 504 .eltabspane {
502 height: 100%; 505 height: 100%;
503 width: 100%; 506 width: 100%;
......
...@@ -243,53 +243,35 @@ ...@@ -243,53 +243,35 @@
243 }; 243 };
244 </script> 244 </script>
245 <style scoped lang="less"> 245 <style scoped lang="less">
246 .el-tabs{ 246 .main {
247 height: calc(100% - 50px); 247 width: 100%;
248 /deep/.el-tabs__content{ 248 height: 100%;
249 height: 100%; 249 box-sizing: border-box;
250 /deep/.el-tab-pane{ 250 padding: 0 18px;
251 height: 100%; 251 display: flex;
252 } 252 flex-direction: column;
253 //background: #F4F9FF; 253 //background-color: #F4F9FF;
254 background-color: #F4F9FF; 254 background-color: #F4F9FF;
255 padding: 0; 255 .tips{
256 } 256 color: #9B9B9B;
257 /deep/ .el-tabs__item { 257 margin-left: 2px;
258 height: 48px; 258 margin-bottom: 10px;
259 } 259 }
260 /deep/ .el-tabs__header{ 260 .demo-form-inline {
261 background-color: #ffffff; 261 margin-top: 18px;
262 } 262 .moreSearchBtn {
263 .main { 263 background-color: #1ad6e1;
264 width: 100%; 264 border-color: #1ad6e1;
265 height: 100%;
266 box-sizing: border-box;
267 padding: 0 18px;
268 display: flex;
269 flex-direction: column;
270 //background-color: #F4F9FF;
271 background-color: #F4F9FF;
272 .tips{
273 color: #9B9B9B;
274 margin-left: 2px;
275 margin-bottom: 10px;
276 } 265 }
277 .demo-form-inline { 266 .moreSearchBtn:focus,
278 margin-top: 18px; 267 .moreSearchBtn:hover {
279 .moreSearchBtn { 268 background-color: rgba(28, 200, 229, 0.6);
280 background-color: #1ad6e1;
281 border-color: #1ad6e1;
282 }
283 .moreSearchBtn:focus,
284 .moreSearchBtn:hover {
285 background-color: rgba(28, 200, 229, 0.6);
286 }
287 } 269 }
288 .dataGrid { 270 }
289 flex: 1; 271 .dataGrid {
290 .pagination { 272 flex: 1;
291 padding: 18px 0; 273 .pagination {
292 } 274 padding: 18px 0;
293 } 275 }
294 } 276 }
295 } 277 }
......
...@@ -193,63 +193,45 @@ ...@@ -193,63 +193,45 @@
193 }; 193 };
194 </script> 194 </script>
195 <style scoped lang="less"> 195 <style scoped lang="less">
196 .el-tabs{ 196 .main {
197 height: calc(100% - 50px); 197 width: 100%;
198 /deep/.el-tabs__content{ 198 height: 100%;
199 height: 100%; 199 box-sizing: border-box;
200 /deep/.el-tab-pane{ 200 padding: 0 18px 0 0;
201 height: 100%; 201 display: flex;
202 } 202 flex-direction: column;
203 //background: #F4F9FF; 203 //background-color: #F4F9FF;
204 background-color: #F4F9FF; 204 background-color: #F4F9FF;
205 padding: 0; 205 .tips{
206 } 206 color: #9B9B9B;
207 /deep/ .el-tabs__item { 207 margin-left: 2px;
208 height: 48px; 208 margin-bottom: 10px;
209 }
210 /deep/ .el-tabs__header{
211 background-color: #ffffff;
212 } 209 }
213 .main { 210 .demo-form-inline {
214 width: 100%; 211 margin-top: 18px;
215 height: 100%; 212 .moreSearchBtn {
216 box-sizing: border-box; 213 background-color: #1ad6e1;
217 padding: 0 18px 0 0; 214 border-color: #1ad6e1;
218 display: flex;
219 flex-direction: column;
220 //background-color: #F4F9FF;
221 background-color: #F4F9FF;
222 .tips{
223 color: #9B9B9B;
224 margin-left: 2px;
225 margin-bottom: 10px;
226 } 215 }
227 .demo-form-inline { 216 .moreSearchBtn:focus,
228 margin-top: 18px; 217 .moreSearchBtn:hover {
229 .moreSearchBtn { 218 background-color: rgba(28, 200, 229, 0.6);
230 background-color: #1ad6e1;
231 border-color: #1ad6e1;
232 }
233 .moreSearchBtn:focus,
234 .moreSearchBtn:hover {
235 background-color: rgba(28, 200, 229, 0.6);
236 }
237 } 219 }
238 .dataGrid { 220 }
239 flex: 1; 221 .dataGrid {
240 .pagination { 222 flex: 1;
241 padding: 18px 0; 223 .pagination {
242 } 224 padding: 18px 0;
243 }
244 .hbjDialog{
245 /deep/ .el-dialog{
246 margin-top: 10vh!important;
247 }
248 } 225 }
249 .btnGroup{ 226 }
250 margin: 20px auto 0; 227 .hbjDialog{
251 width: 230px; 228 /deep/ .el-dialog{
229 margin-top: 10vh!important;
252 } 230 }
253 } 231 }
232 .btnGroup{
233 margin: 20px auto 0;
234 width: 230px;
235 }
254 } 236 }
255 </style> 237 </style>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 <!-- <div class="content_box"> --> 2 <!-- <div class="content_box"> -->
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane> 4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
5 <el-tab-pane label="分类调查表" name="fldcb"><fldcb v-if="fldbcVisible"></fldcb></el-tab-pane>
5 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane> 6 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
6 <el-tab-pane label="界址点" name="jzd"> 7 <el-tab-pane label="界址点" name="jzd">
7 <jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd> 8 <jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd>
...@@ -26,10 +27,11 @@ import djb from "./djb"; ...@@ -26,10 +27,11 @@ import djb from "./djb";
26 import lshs from "./lshs"; 27 import lshs from "./lshs";
27 import fjcl from "./fjcl/fjcl" 28 import fjcl from "./fjcl/fjcl"
28 import {queryStatus} from "@api/search" 29 import {queryStatus} from "@api/search"
30 import Fldcb from "@components/Fldcb/Fldcb"
29 export default { 31 export default {
30 name: "", 32 name: "",
31 components: { 33 components: {
32 zddcb,mjftb,jzd,jzx,djb,lshs,fjcl 34 zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Fldcb
33 }, 35 },
34 props: {}, 36 props: {},
35 data() { 37 data() {
...@@ -38,6 +40,7 @@ export default { ...@@ -38,6 +40,7 @@ export default {
38 activeName: "djdcb", 40 activeName: "djdcb",
39 mjftbVisible:false, 41 mjftbVisible:false,
40 jzdVisible:false, 42 jzdVisible:false,
43 fldbcVisible:false,
41 jzxVisible:false, 44 jzxVisible:false,
42 djbVisible:false, 45 djbVisible:false,
43 lshsVisible:false, 46 lshsVisible:false,
...@@ -67,6 +70,9 @@ export default { ...@@ -67,6 +70,9 @@ export default {
67 case 'mjftb': 70 case 'mjftb':
68 this.mjftbVisible = true; 71 this.mjftbVisible = true;
69 break; 72 break;
73 case 'fldcb':
74 this.fldbcVisible = true;
75 break;
70 case 'jzd': 76 case 'jzd':
71 this.jzdVisible = true; 77 this.jzdVisible = true;
72 break; 78 break;
...@@ -103,23 +109,4 @@ export default { ...@@ -103,23 +109,4 @@ export default {
103 }; 109 };
104 </script> 110 </script>
105 <style scoped lang="less"> 111 <style scoped lang="less">
106 .el-tabs{
107 height: calc(100% - 50px);
108 /deep/.el-tabs__content{
109 //height: 100%;
110 /deep/.el-tab-pane{
111 height: 100%;
112 }
113 //background: #F4F9FF;
114 background-color: #F4F9FF;
115 padding: 0;
116 }
117 /deep/ .el-tabs__item {
118 height: 48px;
119 }
120 /deep/ .el-tabs__header{
121 background-color: #ffffff;
122 }
123 }
124
125 </style> 112 </style>
......
...@@ -72,41 +72,5 @@ export default { ...@@ -72,41 +72,5 @@ export default {
72 <style scoped lang="less"> 72 <style scoped lang="less">
73 .content_box{ 73 .content_box{
74 padding: 0 0 6px; 74 padding: 0 0 6px;
75 // padding: 0 20px;
76 // .el-tabs{
77 // width: 100%;
78 // height: 100%;
79 // display: flex;
80 // flex-direction: column;
81 // }
82 // /deep/.el-tabs__content{
83 // width: 100%;
84 // height: 100%;
85 // flex:1;
86 // position: unset;
87 // }
88 // .el-tab-pane{
89 // width: 100%;
90 // height: 100%;
91 // }
92
93 .el-tabs{
94 height: calc(100% - 50px);
95 /deep/ .el-tabs__content{
96 //height: 100%;
97 /deep/.el-tab-pane{
98 height: 100%;
99 }
100 //background: #F4F9FF;
101 background-color: #F4F9FF;
102 padding: 0;
103 }
104 /deep/ .el-tabs__item {
105 height: 48px;
106 }
107 /deep/ .el-tabs__header{
108 background-color: #ffffff;
109 }
110 }
111 } 75 }
112 </style> 76 </style>
......
...@@ -904,7 +904,9 @@ ...@@ -904,7 +904,9 @@
904 this.form.qtjzmj=this.form.scqtjzmj; 904 this.form.qtjzmj=this.form.scqtjzmj;
905 this.form.ftxs=this.form.scftxs; 905 this.form.ftxs=this.form.scftxs;
906 } 906 }
907 vm.loadingShow('请求发送中');
907 updateQjH(this.form).then((res)=>{ 908 updateQjH(this.form).then((res)=>{
909 vm.loadingHide();
908 if(res.code===200){ 910 if(res.code===200){
909 this.$message.success("保存成功！") 911 this.$message.success("保存成功！")
910 console.log(this,"this") 912 console.log(this,"this")
...@@ -912,6 +914,10 @@ ...@@ -912,6 +914,10 @@
912 this.$message.warning(res.message) 914 this.$message.warning(res.message)
913 } 915 }
914 }) 916 })
917 .catch((error) => {
918 vm.loadingHide();
919 console.log(error);
920 });
915 }else { 921 }else {
916 this.$message({ 922 this.$message({
917 // message: item.name+'不能为空', 923 // message: item.name+'不能为空',
......
...@@ -659,6 +659,8 @@ export default { ...@@ -659,6 +659,8 @@ export default {
659 } else { 659 } else {
660 //选中→未选中 660 //选中→未选中
661 e.className = ""; 661 e.className = "";
662 this.hbsmList = this.hbsmList.filter(i=>i!=bsm);
663 this.hqsztList = this.hqsztList.filter(i=>i!=hs.qszt);
662 switch (this.lpbParent) { 664 switch (this.lpbParent) {
663 case 'isHbfg': 665 case 'isHbfg':
664 self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs) 666 self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs)
...@@ -891,6 +893,7 @@ export default { ...@@ -891,6 +893,7 @@ export default {
891 //户合并 893 //户合并
892 handleHb(type){ 894 handleHb(type){
893 let olbBsms = ''; 895 let olbBsms = '';
896 console.log(this.fghbChoosedList,'fghbChoosedList');
894 this.hbsmList.forEach((item,index)=>{ 897 this.hbsmList.forEach((item,index)=>{
895 olbBsms+= index<this.hbsmList.length-1? item+',':item 898 olbBsms+= index<this.hbsmList.length-1? item+',':item
896 }) 899 })
...@@ -910,8 +913,9 @@ export default { ...@@ -910,8 +913,9 @@ export default {
910 "zdybsm": this.fghbChoosedList[0].zdybsm, 913 "zdybsm": this.fghbChoosedList[0].zdybsm,
911 "zrzbsm": this.fghbChoosedList[0].zrzbsm 914 "zrzbsm": this.fghbChoosedList[0].zrzbsm
912 } 915 }
913 // console.log(params,'params'); 916 vm.loadingShow('请求发送中');
914 hhb(params).then((res) => { 917 hhb(params).then((res) => {
918 vm.loadingHide();
915 if(res.code == 200){ 919 if(res.code == 200){
916 Message.success('合并成功'); 920 Message.success('合并成功');
917 // 清除选中户 921 // 清除选中户
...@@ -923,7 +927,10 @@ export default { ...@@ -923,7 +927,10 @@ export default {
923 Message.error(res.message); 927 Message.error(res.message);
924 } 928 }
925 }) 929 })
926 .catch(() => {}); 930 .catch((error) => {
931 vm.loadingHide();
932 console.log(error);
933 });
927 }) 934 })
928 .catch(() => {}); 935 .catch(() => {});
929 }else{ 936 }else{
...@@ -936,7 +943,9 @@ export default { ...@@ -936,7 +943,9 @@ export default {
936 }, 943 },
937 //户分割保存 944 //户分割保存
938 savefgData(){ 945 savefgData(){
946 vm.loadingShow('请求发送中');
939 hfg(this.fgData).then((res) => { 947 hfg(this.fgData).then((res) => {
948 vm.loadingHide();
940 if(res.code == 200){ 949 if(res.code == 200){
941 Message.success('分割成功'); 950 Message.success('分割成功');
942 // 清除选中户 951 // 清除选中户
...@@ -949,7 +958,10 @@ export default { ...@@ -949,7 +958,10 @@ export default {
949 Message.error(res.message); 958 Message.error(res.message);
950 } 959 }
951 }) 960 })
952 .catch(() => {}); 961 .catch((error) => {
962 vm.loadingHide();
963 console.log(error);
964 });
953 }, 965 },
954 //范围属性变更 966 //范围属性变更
955 handleFwsxbg(){ 967 handleFwsxbg(){
......
...@@ -565,7 +565,9 @@ ...@@ -565,7 +565,9 @@
565 type: "warning", 565 type: "warning",
566 }); 566 });
567 }else{ 567 }else{
568 vm.loadingShow('请求发送中');
568 saveZrzInfo(this.form).then((res)=>{ 569 saveZrzInfo(this.form).then((res)=>{
570 vm.loadingHide();
569 if(res.code===200){ 571 if(res.code===200){
570 this.$message.success("保存完成！") 572 this.$message.success("保存完成！")
571 this.getZrzDetailByBsm(this.$route.query.bsm) 573 this.getZrzDetailByBsm(this.$route.query.bsm)
...@@ -577,6 +579,10 @@ ...@@ -577,6 +579,10 @@
577 } 579 }
578 this.loading=false; 580 this.loading=false;
579 }) 581 })
582 .catch((error) => {
583 vm.loadingHide();
584 console.log(error);
585 });
580 this.loading=false; 586 this.loading=false;
581 this.saveGraphicAttributes(); } 587 this.saveGraphicAttributes(); }
582 }else{ 588 }else{
......