Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
544079a9 by 杨威
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents aa44139c 70b2a021
Inline Side-by-side
Showing 11 changed files with 65 additions and 14 deletions
...@@ -447,7 +447,7 @@ export default { ...@@ -447,7 +447,7 @@ export default {
447 position: relative; 447 position: relative;
448 color: #4a4a4a; 448 color: #4a4a4a;
449 // border-left: 1px solid #EAEAEA; 449 // border-left: 1px solid #EAEAEA;
450 border-right: 1px solid #EAEAEA; 450 /*border-right: 1px solid #EAEAEA;*/
451 i { 451 i {
452 margin-right: 6px; 452 margin-right: 6px;
453 font-size: 18px; 453 font-size: 18px;
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
4 <el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane> 4 <el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane>
5 <el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane> 5 <el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane>
6 </el-tabs> 6 </el-tabs>
...@@ -31,6 +31,15 @@ ...@@ -31,6 +31,15 @@
31 } 31 }
32 </script> 32 </script>
33 33
34 <style scoped> 34 <style scoped lang="less">
35 35 .el-tabs{
36 height: calc(100% - 50px);
37 /deep/.el-tabs__content{
38 height: 100%;
39 /deep/.el-tab-pane{
40 height: 100%;
41 }
42 background: #eaedf5;
43 }
44 }
36 </style> 45 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" class="tabs"> 2 <el-tabs v-model="activeName" type="border-card">
3 <el-tab-pane label="添加" name="tj"> 3 <el-tab-pane label="添加" name="tj">
4 <div class="main"> 4 <div class="main">
5 <!-- <p class="tips">查询条件</p> --> 5 <!-- <p class="tips">查询条件</p> -->
...@@ -163,13 +163,14 @@ ...@@ -163,13 +163,14 @@
163 </script> 163 </script>
164 <style scoped lang="less"> 164 <style scoped lang="less">
165 165
166 .tabs{ 166 .el-tabs{
167 height: calc(100% - 50px); 167 height: calc(100% - 50px);
168 /deep/.el-tabs__content{ 168 /deep/.el-tabs__content{
169 height: 100%; 169 height: 100%;
170 /deep/.el-tab-pane{ 170 /deep/.el-tab-pane{
171 height: 100%; 171 height: 100%;
172 } 172 }
173 background: #eaedf5;
173 } 174 }
174 .main { 175 .main {
175 width: 100%; 176 width: 100%;
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 </div> 45 </div>
46 </div> 46 </div>
47 <div class="fgh" :style="{'minHeight':tableHeight+'px'}"> 47 <div class="fgh" :style="{'minHeight':tableHeight+'px'}">
48 <span class="tips">分割后宗地信息</span> 48 <span class="tips">分割后宗地信息(总计分割宗地数量{{zdFghData.newZdlist.length}}个)</span>
49 <table border="1"> 49 <table border="1">
50 <tr> 50 <tr>
51 <th class="cz"><el-button 51 <th class="cz"><el-button
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
55 >+ 55 >+
56 </el-button 56 </el-button
57 ></th> 57 ></th>
58 <th class="xh">序号</th>
58 <th class="xzq">行政区</th> 59 <th class="xzq">行政区</th>
59 <th class="djq">地籍区</th> 60 <th class="djq">地籍区</th>
60 <th class="djzq">地籍子区</th> 61 <th class="djzq">地籍子区</th>
...@@ -75,6 +76,7 @@ ...@@ -75,6 +76,7 @@
75 </el-button 76 </el-button
76 > 77 >
77 </td> 78 </td>
79 <td rowspan="2">{{index+1}}</td>
78 <td class="xzq"> 80 <td class="xzq">
79 <el-select class="" v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)"> 81 <el-select class="" v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
80 <el-option 82 <el-option
...@@ -222,7 +224,7 @@ ...@@ -222,7 +224,7 @@
222 </div> 224 </div>
223 </div> 225 </div>
224 <div class="fgh"> 226 <div class="fgh">
225 <span class="tips">分割后多幢信息</span> 227 <span class="tips">分割后多幢信息(总计分割多幢数量{{dzFghData.fwlist.length}}个)</span>
226 <table border="1"> 228 <table border="1">
227 <tr> 229 <tr>
228 <th class="cz"> 230 <th class="cz">
...@@ -233,6 +235,7 @@ ...@@ -233,6 +235,7 @@
233 >+ 235 >+
234 </el-button> 236 </el-button>
235 </th> 237 </th>
238 <th class="xh">序号</th>
236 <th class="xzq">幢类型</th> 239 <th class="xzq">幢类型</th>
237 <th class="xmmc" width="300px">项目名称</th> 240 <th class="xmmc" width="300px">项目名称</th>
238 <th class="xmmc">幢信息</th> 241 <th class="xmmc">幢信息</th>
...@@ -247,6 +250,7 @@ ...@@ -247,6 +250,7 @@
247 </el-button 250 </el-button
248 > 251 >
249 </td> 252 </td>
253 <td>{{index+1}}</td>
250 <td class="xzq"> 254 <td class="xzq">
251 <el-select v-model="item.ztype" @change="changeXzq(item.xzqbsm,index)"> 255 <el-select v-model="item.ztype" @change="changeXzq(item.xzqbsm,index)">
252 <el-option 256 <el-option
...@@ -617,6 +621,10 @@ ...@@ -617,6 +621,10 @@
617 } 621 }
618 }, 622 },
619 saveZd() { 623 saveZd() {
624 if(this.zdFghData.oldZdbsm === ''){
625 Message.info("请选择需要分割的宗地")
626 return
627 }
620 if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){ 628 if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
621 zdfg(this.zdFghData).then(res => { 629 zdfg(this.zdFghData).then(res => {
622 if (res.success) { 630 if (res.success) {
...@@ -640,6 +648,10 @@ ...@@ -640,6 +648,10 @@
640 }, 648 },
641 saveDz() { 649 saveDz() {
642 console.log(this.dzFghData,'dzFghData'); 650 console.log(this.dzFghData,'dzFghData');
651 if(this.dzFghData.olddzbsm === ""||this.dzFghData.fwlist.length === 0){
652 Message.info("请选择需要分割的多幢或者填写分割后多幢的基本信息！")
653 return
654 }
643 saveDzFg(this.dzFghData).then(res => { 655 saveDzFg(this.dzFghData).then(res => {
644 if (res.success) { 656 if (res.success) {
645 Message.success("保存成功") 657 Message.success("保存成功")
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
4 <el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane> 4 <el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane>
5 <el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane> 5 <el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane>
6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane> 6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
...@@ -58,4 +58,15 @@ export default { ...@@ -58,4 +58,15 @@ export default {
58 watch: {}, 58 watch: {},
59 }; 59 };
60 </script> 60 </script>
61 <style scoped lang="less"></style> 61 <style scoped lang="less">
62 .el-tabs{
63 height: calc(100% - 50px);
64 /deep/.el-tabs__content{
65 height: 100%;
66 /deep/.el-tab-pane{
67 height: 100%;
68 }
69 background: #eaedf5;
70 }
71 }
72 </style>
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" class="tabs"> 2 <el-tabs v-model="activeName" type="border-card">
3 <el-tab-pane label="更正" name="gz"> 3 <el-tab-pane label="更正" name="gz">
4 <div class="main"> 4 <div class="main">
5 <!-- <p class="tips">查询条件</p> --> 5 <!-- <p class="tips">查询条件</p> -->
...@@ -231,13 +231,14 @@ ...@@ -231,13 +231,14 @@
231 }; 231 };
232 </script> 232 </script>
233 <style scoped lang="less"> 233 <style scoped lang="less">
234 .tabs{ 234 .el-tabs{
235 height: calc(100% - 50px); 235 height: calc(100% - 50px);
236 /deep/.el-tabs__content{ 236 /deep/.el-tabs__content{
237 height: 100%; 237 height: 100%;
238 /deep/.el-tab-pane{ 238 /deep/.el-tab-pane{
239 height: 100%; 239 height: 100%;
240 } 240 }
241 background: #eaedf5;
241 } 242 }
242 .main { 243 .main {
243 width: 100%; 244 width: 100%;
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" class="tabs"> 2 <el-tabs v-model="activeName" type="border-card">
3 <el-tab-pane label="综合查询" name="zhcx"> 3 <el-tab-pane label="综合查询" name="zhcx">
4 <div class="main"> 4 <div class="main">
5 <!-- <p class="tips">查询条件</p> --> 5 <!-- <p class="tips">查询条件</p> -->
...@@ -188,13 +188,14 @@ ...@@ -188,13 +188,14 @@
188 }; 188 };
189 </script> 189 </script>
190 <style scoped lang="less"> 190 <style scoped lang="less">
191 .tabs{ 191 .el-tabs{
192 height: calc(100% - 50px); 192 height: calc(100% - 50px);
193 /deep/.el-tabs__content{ 193 /deep/.el-tabs__content{
194 height: 100%; 194 height: 100%;
195 /deep/.el-tab-pane{ 195 /deep/.el-tab-pane{
196 height: 100%; 196 height: 100%;
197 } 197 }
198 background: #eaedf5;
198 } 199 }
199 .main { 200 .main {
200 width: 100%; 201 width: 100%;
......
...@@ -191,6 +191,10 @@ ...@@ -191,6 +191,10 @@
191 }) 191 })
192 }, 192 },
193 save() { 193 save() {
194 if(this.jzdlist.length === 0){
195 Message.info("至少填写一条界址点信息")
196 return
197 }
194 jzdsingleModify(this.jzdlist).then(res => { 198 jzdsingleModify(this.jzdlist).then(res => {
195 if (res.success) { 199 if (res.success) {
196 Message.success("保存成功") 200 Message.success("保存成功")
......
...@@ -261,6 +261,10 @@ ...@@ -261,6 +261,10 @@
261 }) 261 })
262 }, 262 },
263 save() { 263 save() {
264 if(this.jzxlist.length === 0){
265 Message.info("至少填写一条界址线信息")
266 return
267 }
264 jzxsingleModify(this.jzxlist).then(res => { 268 jzxsingleModify(this.jzxlist).then(res => {
265 if (res.success) { 269 if (res.success) {
266 Message.success("保存成功") 270 Message.success("保存成功")
......
...@@ -120,6 +120,10 @@ ...@@ -120,6 +120,10 @@
120 }) 120 })
121 }, 121 },
122 save() { 122 save() {
123 if(this.mjftData.list.length === 0){
124 Message.info("请填写相关定着物或者面积信息")
125 return
126 }
123 for (let val of this.mjftData.list) { 127 for (let val of this.mjftData.list) {
124 if (val.dzwdm == '') { 128 if (val.dzwdm == '') {
125 Message.error("定着物代码不能为空") 129 Message.error("定着物代码不能为空")
......
...@@ -100,6 +100,10 @@ ...@@ -100,6 +100,10 @@
100 }, 100 },
101 save() { 101 save() {
102 console.log(this.Data); 102 console.log(this.Data);
103 if(this.Data.list.length === 0){
104 Message.info("至少填写一条建筑物信息")
105 return
106 }
103 saveYzgy(this.Data).then(res => { 107 saveYzgy(this.Data).then(res => {
104 console.log(res) 108 console.log(res)
105 if (res.success) { 109 if (res.success) {
......