Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
417eb778 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 663c7eac 898dbff4
Inline Side-by-side
Showing 21 changed files with 107 additions and 242 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{
......
...@@ -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",
......
...@@ -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,33 +189,15 @@ ...@@ -189,33 +189,15 @@
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);
194 /deep/.el-tabs__content{
195 height: 100%;
196 /deep/.el-tab-pane{
197 height: 100%;
198 }
199 //background: #F4F9FF;
200 background-color: #F4F9FF;
201 padding: 0;
202 }
203 /deep/ .el-tabs__item {
204 height: 48px;
205 }
206 /deep/ .el-tabs__header{
207 background-color: #ffffff;
208 margin: 0;
209 }
210 .main {
211 width: 100%; 193 width: 100%;
212 height: 100%; 194 height: 100%;
213 box-sizing: border-box; 195 box-sizing: border-box;
214 padding: 0 18px 0 0; 196 padding: 0 18px 0 0;
215 display: flex; 197 display: flex;
216 flex-direction: column; 198 flex-direction: column;
217 //background-color: #F4F9FF; 199 //background-color: #F4F9FF;
218 background-color: #F4F9FF; 200 background-color: #F4F9FF;
219 .tips{ 201 .tips{
220 color: #9B9B9B; 202 color: #9B9B9B;
221 margin-left: 2px; 203 margin-left: 2px;
...@@ -247,6 +229,5 @@ ...@@ -247,6 +229,5 @@
247 margin: 20px auto 0; 229 margin: 20px auto 0;
248 width: 230px; 230 width: 230px;
249 } 231 }
250 } 232 }
251 }
252 </style> 233 </style>
......
...@@ -72,33 +72,13 @@ ...@@ -72,33 +72,13 @@
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);
77 /deep/.el-tabs__content{
78 height: 100%;
79 /deep/.el-tab-pane{
80 height: 100%;
81 }
82 //background: #F4F9FF;
83 background-color: #F4F9FF;
84 padding: 0;
85 }
86 /deep/ .el-tabs__item {
87 height: 48px;
88 }
89 /deep/ .el-tabs__header{
90 background-color: #ffffff;
91 margin: 0;
92 border-top: 1px solid #E4E7ED;
93 }
94 .main {
95 width: 100%; 76 width: 100%;
96 height: 100%; 77 height: 100%;
97 box-sizing: border-box; 78 box-sizing: border-box;
98 padding: 0 18px 0 0; 79 padding: 0 18px 0 0;
99 display: flex; 80 display: flex;
100 flex-direction: column; 81 flex-direction: column;
101 //background-color: #F4F9FF;
102 background-color: #F4F9FF; 82 background-color: #F4F9FF;
103 .tips{ 83 .tips{
104 color: #9B9B9B; 84 color: #9B9B9B;
...@@ -131,6 +111,5 @@ ...@@ -131,6 +111,5 @@
131 margin: 20px auto 0; 111 margin: 20px auto 0;
132 width: 230px; 112 width: 230px;
133 } 113 }
134 } 114 }
135 }
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,25 +162,7 @@ ...@@ -162,25 +162,7 @@
162 }; 162 };
163 </script> 163 </script>
164 <style scoped lang="less"> 164 <style scoped lang="less">
165 165 .main {
166 .el-tabs{
167 height: calc(100% - 50px);
168 /deep/.el-tabs__content{
169 height: 100%;
170 /deep/.el-tab-pane{
171 height: 100%;
172 }
173 //background: #F4F9FF;
174 background-color: #F4F9FF;
175 padding: 0;
176 }
177 /deep/ .el-tabs__item {
178 height: 48px;
179 }
180 /deep/ .el-tabs__header{
181 background-color: #ffffff;
182 }
183 .main {
184 width: 100%; 166 width: 100%;
185 height: 100%; 167 height: 100%;
186 box-sizing: border-box; 168 box-sizing: border-box;
...@@ -211,6 +193,5 @@ ...@@ -211,6 +193,5 @@
211 padding: 18px 0; 193 padding: 18px 0;
212 } 194 }
213 } 195 }
214 }
215 } 196 }
216 </style> 197 </style>
......
...@@ -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,24 +243,7 @@ ...@@ -243,24 +243,7 @@
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);
248 /deep/.el-tabs__content{
249 height: 100%;
250 /deep/.el-tab-pane{
251 height: 100%;
252 }
253 //background: #F4F9FF;
254 background-color: #F4F9FF;
255 padding: 0;
256 }
257 /deep/ .el-tabs__item {
258 height: 48px;
259 }
260 /deep/ .el-tabs__header{
261 background-color: #ffffff;
262 }
263 .main {
264 width: 100%; 247 width: 100%;
265 height: 100%; 248 height: 100%;
266 box-sizing: border-box; 249 box-sizing: border-box;
...@@ -291,6 +274,5 @@ ...@@ -291,6 +274,5 @@
291 padding: 18px 0; 274 padding: 18px 0;
292 } 275 }
293 } 276 }
294 }
295 } 277 }
296 </style> 278 </style>
......
...@@ -193,24 +193,7 @@ ...@@ -193,24 +193,7 @@
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);
198 /deep/.el-tabs__content{
199 height: 100%;
200 /deep/.el-tab-pane{
201 height: 100%;
202 }
203 //background: #F4F9FF;
204 background-color: #F4F9FF;
205 padding: 0;
206 }
207 /deep/ .el-tabs__item {
208 height: 48px;
209 }
210 /deep/ .el-tabs__header{
211 background-color: #ffffff;
212 }
213 .main {
214 width: 100%; 197 width: 100%;
215 height: 100%; 198 height: 100%;
216 box-sizing: border-box; 199 box-sizing: border-box;
...@@ -250,6 +233,5 @@ ...@@ -250,6 +233,5 @@
250 margin: 20px auto 0; 233 margin: 20px auto 0;
251 width: 230px; 234 width: 230px;
252 } 235 }
253 }
254 } 236 }
255 </style> 237 </style>
......
...@@ -109,23 +109,4 @@ export default { ...@@ -109,23 +109,4 @@ export default {
109 }; 109 };
110 </script> 110 </script>
111 <style scoped lang="less"> 111 <style scoped lang="less">
112 .el-tabs{
113 height: calc(100% - 50px);
114 /deep/.el-tabs__content{
115 //height: 100%;
116 /deep/.el-tab-pane{
117 height: 100%;
118 }
119 //background: #F4F9FF;
120 background-color: #F4F9FF;
121 padding: 0;
122 }
123 /deep/ .el-tabs__item {
124 height: 48px;
125 }
126 /deep/ .el-tabs__header{
127 background-color: #ffffff;
128 }
129 }
130
131 </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+'不能为空',
......
...@@ -913,8 +913,9 @@ export default { ...@@ -913,8 +913,9 @@ export default {
913 "zdybsm": this.fghbChoosedList[0].zdybsm, 913 "zdybsm": this.fghbChoosedList[0].zdybsm,
914 "zrzbsm": this.fghbChoosedList[0].zrzbsm 914 "zrzbsm": this.fghbChoosedList[0].zrzbsm
915 } 915 }
916 // console.log(params,'params'); 916 vm.loadingShow('请求发送中');
917 hhb(params).then((res) => { 917 hhb(params).then((res) => {
918 vm.loadingHide();
918 if(res.code == 200){ 919 if(res.code == 200){
919 Message.success('合并成功'); 920 Message.success('合并成功');
920 // 清除选中户 921 // 清除选中户
...@@ -926,7 +927,10 @@ export default { ...@@ -926,7 +927,10 @@ export default {
926 Message.error(res.message); 927 Message.error(res.message);
927 } 928 }
928 }) 929 })
929 .catch(() => {}); 930 .catch((error) => {
931 vm.loadingHide();
932 console.log(error);
933 });
930 }) 934 })
931 .catch(() => {}); 935 .catch(() => {});
932 }else{ 936 }else{
...@@ -939,7 +943,9 @@ export default { ...@@ -939,7 +943,9 @@ export default {
939 }, 943 },
940 //户分割保存 944 //户分割保存
941 savefgData(){ 945 savefgData(){
946 vm.loadingShow('请求发送中');
942 hfg(this.fgData).then((res) => { 947 hfg(this.fgData).then((res) => {
948 vm.loadingHide();
943 if(res.code == 200){ 949 if(res.code == 200){
944 Message.success('分割成功'); 950 Message.success('分割成功');
945 // 清除选中户 951 // 清除选中户
...@@ -952,7 +958,10 @@ export default { ...@@ -952,7 +958,10 @@ export default {
952 Message.error(res.message); 958 Message.error(res.message);
953 } 959 }
954 }) 960 })
955 .catch(() => {}); 961 .catch((error) => {
962 vm.loadingHide();
963 console.log(error);
964 });
956 }, 965 },
957 //范围属性变更 966 //范围属性变更
958 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{
......