Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
67e63168 by 杨威
Options

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

2 parents 2c0aea17 abd57533
Inline Side-by-side
Showing 18 changed files with 193 additions and 125 deletions
...@@ -105,6 +105,17 @@ ...@@ -105,6 +105,17 @@
105 "XZQMC": "行政区名称", 105 "XZQMC": "行政区名称",
106 "XZQMJ": "行政区面积" 106 "XZQMJ": "行政区面积"
107 } 107 }
108 108 },
109 {
110 "layerName":"JZD",
111 "layerLabel":"界址点",
112 "layerUrl":"http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
113 "id":3
114 },
115 {
116 "layerName":"JZX",
117 "layerLabel":"界址线",
118 "layerUrl":"http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
119 "id":4
109 } 120 }
110 ] 121 ]
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row> 8 <el-row>
9 <el-col :span="14" class="fl" style="line-height:32px"> 9 <el-col :span="14" class="fl" style="line-height:32px">
10 <el-radio-group v-model="gyfs" @change="updateGyfs"> 10 <el-radio-group v-model="gyfs" @change="updateGyfs">
11 <el-radio :label="item.bsm" :disabled="+qszt!==0" :key="item.bsm" v-for="item in gyfsList">{{item.mc}}</el-radio> 11 <el-radio :label="item.bsm" :disabled="+qszt!==0 || item.disabled" :key="item.bsm" v-for="item in gyfsList">{{item.mc}}</el-radio>
12 </el-radio-group> 12 </el-radio-group>
13 </el-col> 13 </el-col>
14 <el-col :span="10" class="fr"> 14 <el-col :span="10" class="fr">
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
75 <tr> 75 <tr>
76 <td colspan="4" class="tdright"><i class="requisite">*</i>权利人名称</td> 76 <td colspan="4" class="tdright"><i class="requisite">*</i>权利人名称</td>
77 <td colspan="6"> 77 <td colspan="6">
78 <input type="text" class="formInput" v-model="formData.qlrmc" ref="qlrmc" @blur="inputBlur($event)"/> 78 <el-input v-model="formData.qlrmc" ref="qlrmc" @blur="inputBlur($event)"></el-input>
79 </td> 79 </td>
80 <td colspan="4" class="tdright"><i class="requisite">*</i>权利人类型</td> 80 <td colspan="4" class="tdright"><i class="requisite">*</i>权利人类型</td>
81 <td colspan="6"> 81 <td colspan="6">
...@@ -105,18 +105,18 @@ ...@@ -105,18 +105,18 @@
105 </td> 105 </td>
106 <td colspan="4" class="tdright"><i class="requisite">*</i>证件号</td> 106 <td colspan="4" class="tdright"><i class="requisite">*</i>证件号</td>
107 <td colspan="6"> 107 <td colspan="6">
108 <input type="text" class="formInput" maxlength="18" v-model="formData.zjh" ref="zjh" @blur="inputBlur($event)"/> 108 <el-input maxlength="18" v-model="formData.zjh" ref="zjh" @blur="inputBlur($event)"></el-input>
109 </td> 109 </td>
110 </tr> 110 </tr>
111 <tr> 111 <tr>
112 <td colspan="4" class="tdright"><i class="requisite">*</i>电话</td> 112 <td colspan="4" class="tdright"><i class="requisite">*</i>电话</td>
113 <td colspan="6"> 113 <td colspan="6">
114 <!-- @blur="inputBlur($event)"--> 114 <!-- @blur="inputBlur($event)"-->
115 <input type="text" class="formInput" v-model="formData.dh" ref="dh" @blur="inputBlur($event)"/> 115 <el-input v-model="formData.dh" ref="dh" @blur="inputBlur($event)"></el-input>
116 </td> 116 </td>
117 <td colspan="4" class="tdright"><i class="requisite">*</i>地址</td> 117 <td colspan="4" class="tdright"><i class="requisite">*</i>地址</td>
118 <td colspan="6"> 118 <td colspan="6">
119 <input type="text" class="formInput" v-model="formData.dz" ref="dz" @blur="inputBlur($event)"/> 119 <el-input v-model="formData.dz" ref="dz" @blur="inputBlur($event)"></el-input>
120 </td> 120 </td>
121 </tr> 121 </tr>
122 <tr> 122 <tr>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
160 </td> 160 </td>
161 <td colspan="4" class="tdright">邮编</td> 161 <td colspan="4" class="tdright">邮编</td>
162 <td colspan="6"> 162 <td colspan="6">
163 <input type="text" class="formInput" v-model="formData.yb" /> 163 <el-input v-model="formData.yb" />
164 </td> 164 </td>
165 </tr> 165 </tr>
166 <tr> 166 <tr>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
178 </td> 178 </td>
179 <td colspan="4" class="tdright">电子邮件</td> 179 <td colspan="4" class="tdright">电子邮件</td>
180 <td colspan="6"> 180 <td colspan="6">
181 <input type="text" class="formInput" v-model="formData.dzyj" /> 181 <el-input v-model="formData.dzyj" />
182 </td> 182 </td>
183 </tr> 183 </tr>
184 <tr> 184 <tr>
...@@ -187,9 +187,7 @@ ...@@ -187,9 +187,7 @@
187 <tr> 187 <tr>
188 <td colspan="4" class="tdright">法定代表人或负责人姓名</td> 188 <td colspan="4" class="tdright">法定代表人或负责人姓名</td>
189 <td colspan="6"> 189 <td colspan="6">
190 <input 190 <el-input
191 type="text"
192 class="formInput"
193 v-model="formData.fr.dlrfrmc" 191 v-model="formData.fr.dlrfrmc"
194 /> 192 />
195 </td> 193 </td>
...@@ -209,11 +207,11 @@ ...@@ -209,11 +207,11 @@
209 <tr> 207 <tr>
210 <td colspan="4" class="tdright">证件号码</td> 208 <td colspan="4" class="tdright">证件号码</td>
211 <td colspan="6"> 209 <td colspan="6">
212 <input type="text" class="formInput" v-model="formData.fr.zjh" /> 210 <el-input v-model="formData.fr.zjh" />
213 </td> 211 </td>
214 <td colspan="4" class="tdright">电话</td> 212 <td colspan="4" class="tdright">电话</td>
215 <td colspan="6"> 213 <td colspan="6">
216 <input type="text" class="formInput" v-model="formData.fr.dh" /> 214 <el-input v-model="formData.fr.dh" />
217 </td> 215 </td>
218 </tr> 216 </tr>
219 <tr> 217 <tr>
...@@ -234,7 +232,7 @@ ...@@ -234,7 +232,7 @@
234 </td> 232 </td>
235 <td class="tdright" colspan="2">代理人姓名</td> 233 <td class="tdright" colspan="2">代理人姓名</td>
236 <td colspan="6"> 234 <td colspan="6">
237 <input type="text" class="formInput" v-model="item.dlrfrmc" /> 235 <el-input v-model="item.dlrfrmc" />
238 </td> 236 </td>
239 <td colspan="4" class="tdright">证件类型</td> 237 <td colspan="4" class="tdright">证件类型</td>
240 <td colspan="6"> 238 <td colspan="6">
...@@ -253,11 +251,11 @@ ...@@ -253,11 +251,11 @@
253 <tr :key="'dh'+index"> 251 <tr :key="'dh'+index">
254 <td class="tdright" colspan="2">证件号码</td> 252 <td class="tdright" colspan="2">证件号码</td>
255 <td colspan="6"> 253 <td colspan="6">
256 <input type="text" class="formInput" v-model="item.zjh" /> 254 <el-input v-model="item.zjh" />
257 </td> 255 </td>
258 <td colspan="4" class="tdright">电话</td> 256 <td colspan="4" class="tdright">电话</td>
259 <td colspan="6"> 257 <td colspan="6">
260 <input type="text" class="formInput" v-model="item.dh" /> 258 <el-input v-model="item.dh" />
261 </td> 259 </td>
262 </tr> 260 </tr>
263 </template> 261 </template>
...@@ -280,23 +278,23 @@ ...@@ -280,23 +278,23 @@
280 </td> 278 </td>
281 <td colspan="4" class="tdright">权利比例(%)</td> 279 <td colspan="4" class="tdright">权利比例(%)</td>
282 <td colspan="6"> 280 <td colspan="6">
283 <input type="text" class="formInput" v-model="formData.qlbl" /> 281 <el-input v-model="formData.qlbl" ></el-input>
284 </td> 282 </td>
285 </tr> 283 </tr>
286 <tr> 284 <tr>
287 <td colspan="4" class="tdright">房产证号</td> 285 <td colspan="4" class="tdright">房产证号</td>
288 <td colspan="6"> 286 <td colspan="6">
289 <input type="text" class="formInput" v-model="formData.fczh" /> 287 <el-input v-model="formData.fczh" ></el-input>
290 </td> 288 </td>
291 <td colspan="4" class="tdright">土地证号</td> 289 <td colspan="4" class="tdright">土地证号</td>
292 <td colspan="6"> 290 <td colspan="6">
293 <input type="text" class="formInput" v-model="formData.tdzh" /> 291 <el-input v-model="formData.tdzh" ></el-input>
294 </td> 292 </td>
295 </tr> 293 </tr>
296 <tr> 294 <tr>
297 <td colspan="4" class="tdright">共有情况</td> 295 <td colspan="4" class="tdright">共有情况</td>
298 <td colspan="8"> 296 <td colspan="8">
299 <input type="text" class="formInput" v-model="formData.gyqk" /> 297 <el-input v-model="formData.gyqk" ></el-input>
300 </td> 298 </td>
301 </tr> 299 </tr>
302 </table> 300 </table>
...@@ -487,6 +485,8 @@ ...@@ -487,6 +485,8 @@
487 flag = false; 485 flag = false;
488 return false 486 return false
489 } 487 }
488 console.log(this.tableData,'权利人信息')
489 console.log(this.$store.state.gyfsList[0].bsm,'确定之后共有方式')
490 }) 490 })
491 this.$nextTick(()=>{ 491 this.$nextTick(()=>{
492 if (flag) { 492 if (flag) {
...@@ -519,8 +519,9 @@ ...@@ -519,8 +519,9 @@
519 if(res.code===200){ 519 if(res.code===200){
520 this.dialogVisible = false; 520 this.dialogVisible = false;
521 this.tableData.push(this.formData); 521 this.tableData.push(this.formData);
522 Object.assign(this.$data, this.$options.data())
523 this.getQlrInfo(this.bsm); 522 this.getQlrInfo(this.bsm);
523 Object.assign(this.$data, this.$options.data())
524
524 } 525 }
525 }) 526 })
526 } 527 }
...@@ -664,19 +665,18 @@ ...@@ -664,19 +665,18 @@
664 watch:{ 665 watch:{
665 tableData:{ 666 tableData:{
666 handler:function (v) { 667 handler:function (v) {
667 console.log(v,'权利人') 668 this.gyfsList[0].disabled = v.length > 1;
668 this.gyfsList[0].disabled = v.length() > 1;
669 } , 669 } ,
670 deep:true 670 deep:true
671 }, 671 },
672 gyfsList:{ 672 /* gyfsList:{
673 handler:function(v){ 673 handler:function(v){
674 console.log(v,"共有方式") 674 //console.log(v,"共有方式")
675 }, 675 },
676 deep:true 676 deep:true
677 }, 677 },*/
678 dialogVisible(n){ 678 dialogVisible(n){
679 if(n == false){ 679 if(n === false){
680 this.formData = { 680 this.formData = {
681 addQjDlrFrRequest:[], 681 addQjDlrFrRequest:[],
682 dlrList: [ 682 dlrList: [
...@@ -721,7 +721,7 @@ ...@@ -721,7 +721,7 @@
721 } 721 }
722 } 722 }
723 }, 723 },
724 tableData(){ 724 /* tableData(){
725 this.gyfsList = this.$store.state.gyfsList; 725 this.gyfsList = this.$store.state.gyfsList;
726 if(this.tableData.length>1){ 726 if(this.tableData.length>1){
727 for(let i = 0;i<this.gyfsList.length;i++){ 727 for(let i = 0;i<this.gyfsList.length;i++){
...@@ -729,41 +729,41 @@ ...@@ -729,41 +729,41 @@
729 this.gyfsList[i].disabled = item.mc === "单独所有"; 729 this.gyfsList[i].disabled = item.mc === "单独所有";
730 } 730 }
731 } 731 }
732 }, 732 },*/
733 733
734 "formData.qlrlxbsm":function (val) { 734 "formData.qlrlxbsm":function (val) {
735 console.log(this.$refs.qlrlxbsm.$el.style.border+":console.log(this.$refs.qlrlxbsm.$el.style.border)") 735 //console.log(this.$refs.qlrlxbsm.$el.style.border+":console.log(this.$refs.qlrlxbsm.$el.style.border)")
736 if (val != '') { 736 if (val != '') {
737 console.log(this.$refs.qlrlxbsm.$el.style.border+":console.log(this.$refs.qlrlxbsm.$el.style.border)") 737 // console.log(this.$refs.qlrlxbsm.$el.style.border+":console.log(this.$refs.qlrlxbsm.$el.style.border)")
738 this.$refs.qlrlxbsm.$el.style.border = ''; 738 this.$refs.qlrlxbsm.$el.style.border = '';
739 } 739 }
740 }, 740 },
741 741
742 "formData.zjzlbsm":function (val) { 742 /* "formData.zjzlbsm":function (val) {
743 if (val != '') { 743 if (val != '') {
744 this.$refs.zjzlbsm.$el.style.border = ''; 744 this.$refs.zjzlbsm.$el.style.border = '';
745 } 745 }
746 }, 746 },
747 // "formData.gyfsbsm":function (val) { 747 "formData.gyfsbsm":function (val) {
748 // let ddsy = ''; 748 let ddsy = '';
749 // for(let i = 0;i<this.gyfsList.length;i++){ 749 for(let i = 0;i<this.gyfsList.length;i++){
750 // if(this.gyfsList[i].mc === "单独所有"){ 750 if(this.gyfsList[i].mc === "单独所有"){
751 // ddsy = this.gyfsList[i].bsm 751 ddsy = this.gyfsList[i].bsm
752 // } 752 }
753 // } 753 }
754 // if(ddsy === val){ 754 if(ddsy === val){
755 // if(this.update){ 755 if(this.update){
756 // if(this.tableData.length > 1){ 756 if(this.tableData.length > 1){
757 // this.$message.warning("权利人人数大于1，不能选择单独所有") 757 this.$message.warning("权利人人数大于1，不能选择单独所有")
758 // } 758 }
759 // }else{ 759 }else{
760 // if(this.tableData.length > 0){ 760 if(this.tableData.length > 0){
761 // this.$message.warning("权利人人数大于1，不能选择单独所有") 761 this.$message.warning("权利人人数大于1，不能选择单独所有")
762 // } 762 }
763 // } 763 }
764 // 764
765 // } 765 }
766 // } 766 }*/
767 } 767 }
768 }; 768 };
769 </script> 769 </script>
......
...@@ -513,7 +513,6 @@ export default { ...@@ -513,7 +513,6 @@ export default {
513 this.$message.warning("不是临时数据，不能导入图形!!!"); 513 this.$message.warning("不是临时数据，不能导入图形!!!");
514 return; 514 return;
515 } 515 }
516 //先这么写着 后面返回类型 根据类型判断
517 var type = this.zdData.type; 516 var type = this.zdData.type;
518 if(type == "zd"){ 517 if(type == "zd"){
519 BSM = this.zdData.zdbsm; 518 BSM = this.zdData.zdbsm;
......
...@@ -544,12 +544,15 @@ export default { ...@@ -544,12 +544,15 @@ export default {
544 } 544 }
545 savePoints.push(obj); 545 savePoints.push(obj);
546 } 546 }
547 //保存矢量数据表
547 addjzd(savePoints).then(res=>{ 548 addjzd(savePoints).then(res=>{
548 if(res.succcess){ 549 if(res.succcess){
549 //触发查询接口 550 //触发查询接口
550 console.log("界址点保存成成功！！！"); 551 console.log("界址点保存成成功！！！");
551 } 552 }
552 }); 553 });
554 //保存空间数据
555
553 }, 556 },
554 saveJzx(lines){ 557 saveJzx(lines){
555 var jzxLines = []; 558 var jzxLines = [];
...@@ -568,12 +571,15 @@ export default { ...@@ -568,12 +571,15 @@ export default {
568 } 571 }
569 jzxLines.push(obj); 572 jzxLines.push(obj);
570 } 573 }
574 //保存矢量数据表
571 addjzx(jzxLines).then(res=>{ 575 addjzx(jzxLines).then(res=>{
572 if(res.success){ 576 if(res.success){
573 //触发查询界址线 577 //触发查询界址线
574 console.log("界址线保存成功!!!!!"); 578 console.log("界址线保存成功!!!!!");
575 } 579 }
576 }); 580 });
581 //保存空间数据表
582
577 }, 583 },
578 saveZRZ(graphic){ 584 saveZRZ(graphic){
579 var self = this; 585 var self = this;
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
3 <div :id="viewId" class="viewDiv"> 3 <div :id="viewId" class="viewDiv">
4 </div> 4 </div>
5 <div class="mapViewPoint"> 5 <div class="mapViewPoint">
6 <span class="key">比例尺:</span> 6 <!-- <span class="key">比例尺:</span> -->
7 <span class="value">{{ mapInfo.scale }}km</span> 7 <div class="viewScale"><span class="value">{{ mapInfo.scale }}公里</span></div>
8 <span class="key">经度:</span> 8 <span class="key">X坐标</span>
9 <span class="value">{{ mapInfo.x }}</span> 9 <span class="value">{{ mapInfo.x }}</span>
10 <span class="key">纬度:</span> 10 <span class="key">Y坐标</span>
11 <span class="value">{{ mapInfo.y }}</span> 11 <span class="value">{{ mapInfo.y }}</span>
12 </div> 12 </div>
13 </div> 13 </div>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
70 var point = view.toMap({x: event.x, y: event.y}); 70 var point = view.toMap({x: event.x, y: event.y});
71 self.mapInfo.x = point.longitude.toFixed(6); 71 self.mapInfo.x = point.longitude.toFixed(6);
72 self.mapInfo.y = point.latitude.toFixed(6); 72 self.mapInfo.y = point.latitude.toFixed(6);
73 self.mapInfo.scale = (view.scale/1000).toFixed(3); 73 self.mapInfo.scale = (view.scale/1000).toFixed(0);
74 74
75 }); 75 });
76 }).catch(err => { 76 }).catch(err => {
...@@ -90,22 +90,33 @@ ...@@ -90,22 +90,33 @@
90 width: 100%; 90 width: 100%;
91 } 91 }
92 .mapViewPoint{ 92 .mapViewPoint{
93 display: inline-flex;
93 position: absolute; 94 position: absolute;
94 bottom: 10px; 95 bottom: 10px;
95 left: 5px; 96 left: 5px;
96 background-color: white; 97 line-height: 12px;
97 line-height: 36px;
98 font-size: 12px;
99 border-radius: 4px;
100 box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
101 .key{
102 font-weight: 600;
103 }
104 .value{ 98 .value{
105 margin-left: 0px; 99 margin-left: 0px;
106 } 100 }
107 span{ 101 span{
108 margin:0px 5px; 102 margin:0px 5px;
103 font-family: SFUIDisplay-Medium;
104 font-size: 12px;
105 color: #4A4A4A;
106 font-weight: bold;
107 letter-spacing: 0;
108 text-shadow: 0 -1px 0 #FFFFFF;
109 position: relative;
110 bottom: 9px;
111 }
112 .viewScale{
113 width: auto;
114 background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANIAAAAOCAYAAABaZUIWAAAABGdBTUEAALGPC/xhBQAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAA0qADAAQAAAABAAAADgAAAAD7u0TwAAAA4ElEQVRoBe3a4QnCMBCG4UQcpKPU39kpq8UFsoObxBzVH6WeNHBQ2nsDFYlH4j3lI1QMoY/WWumXNorUMBDwKtCDUbRwyGficvOKQ98IWAqsglRrfaWUglzy3nIj1kLg7AL/8rEK0tkb5fsjcJQAQTpKnn0vJXDf0c0sD1o76ihBwK0AJ5LbW0/jlgLqiZRzniw3Yi0ELiAwaT1wImkyzCMwIECQBrAoRUAT+BUkfljQtJhHYBHYZCTK/OdvDvNSwysCCAwIPGOMj++JtEnYwEKUIuBVQHJDdrzeffq2F3gDSn1fbXNQA8oAAAAASUVORK5CYII=) top no-repeat;
115 background-size: contain;
116 background-position-y: 6px;
117 span{
118 margin: 0px 21px;
119 }
109 } 120 }
110 } 121 }
111 } 122 }
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
10 <div> 10 <div>
11 <table border="1"> 11 <table border="1">
12 <tr> 12 <tr>
13 <td>层建筑面积(㎡)</td> 13 <td class="tdright">层建筑面积(㎡)</td>
14 <td> 14 <td>
15 <el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input> 15 <el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
16 </td> 16 </td>
17 <td> 17 <td class="tdright">
18 层套内建筑面积(㎡) 18 层套内建筑面积(㎡)
19 </td> 19 </td>
20 <td> 20 <td>
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
22 </td> 22 </td>
23 </tr> 23 </tr>
24 <tr> 24 <tr>
25 <td>层阳台面积(㎡)</td> 25 <td class="tdright">层阳台面积(㎡)</td>
26 <td> 26 <td>
27 <el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input> 27 <el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
28 </td> 28 </td>
29 <td> 29 <td class="tdright">
30 层半墙面积(㎡) 30 层半墙面积(㎡)
31 </td> 31 </td>
32 <td> 32 <td>
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
34 </td> 34 </td>
35 </tr> 35 </tr>
36 <tr> 36 <tr>
37 <td>层共有建筑面积(㎡)</td> 37 <td class="tdright">层共有建筑面积(㎡)</td>
38 <td> 38 <td>
39 <el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input> 39 <el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
40 </td> 40 </td>
41 <td> 41 <td class="tdright">
42 层分摊建筑面积(㎡) 42 层分摊建筑面积(㎡)
43 </td> 43 </td>
44 <td> 44 <td>
...@@ -46,11 +46,11 @@ ...@@ -46,11 +46,11 @@
46 </td> 46 </td>
47 </tr> 47 </tr>
48 <tr> 48 <tr>
49 <td>层高(m)</td> 49 <td class="tdright">层高(m)</td>
50 <td> 50 <td>
51 <el-input v-model="qlcData.cg" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层高(m)"></el-input> 51 <el-input v-model="qlcData.cg" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层高(m)"></el-input>
52 </td> 52 </td>
53 <td> 53 <td class="tdright">
54 水平投影面积(㎡) 54 水平投影面积(㎡)
55 </td> 55 </td>
56 <td> 56 <td>
......
...@@ -10,25 +10,25 @@ ...@@ -10,25 +10,25 @@
10 <div> 10 <div>
11 <table border="1"> 11 <table border="1">
12 <tr> 12 <tr>
13 <td colspan="2">建筑面积(㎡)</td> 13 <td colspan="2" class="tdright">建筑面积(㎡)</td>
14 <td colspan="4"><input type="text" v-model="form.jzmj" class="inputtitle"/></td> 14 <td colspan="4"><input type="text" v-model="form.jzmj" class="inputtitle"/></td>
15 <td colspan="2">套内建筑面积(㎡)</td> 15 <td colspan="2" class="tdright">套内建筑面积(㎡)</td>
16 <td colspan="4"><input type="text" v-model="form.tnjzmj" class="inputtitle"/></td> 16 <td colspan="4"><input type="text" v-model="form.tnjzmj" class="inputtitle"/></td>
17 </tr> 17 </tr>
18 <tr> 18 <tr>
19 <td colspan="2">分摊建筑面积(㎡)</td> 19 <td colspan="2" class="tdright">分摊建筑面积(㎡)</td>
20 <td colspan="4"><input type="text" v-model="form.ftjzmj" class="inputtitle"/></td> 20 <td colspan="4"><input type="text" v-model="form.ftjzmj" class="inputtitle"/></td>
21 <td colspan="2">地下部分建筑面积(㎡)</td> 21 <td colspan="2" class="tdright">地下部分建筑面积(㎡)</td>
22 <td colspan="4"><input type="text" v-model="form.dxbfjzmj" class="inputtitle"/></td> 22 <td colspan="4"><input type="text" v-model="form.dxbfjzmj" class="inputtitle"/></td>
23 </tr> 23 </tr>
24 <tr> 24 <tr>
25 <td colspan="2">其他建筑面积(㎡)</td> 25 <td colspan="2" class="tdright">其他建筑面积(㎡)</td>
26 <td colspan="4"><input type="text" v-model="form.qtjzmj" class="inputtitle"/></td> 26 <td colspan="4"><input type="text" v-model="form.qtjzmj" class="inputtitle"/></td>
27 <td colspan="2">分摊系数</td> 27 <td colspan="2" class="tdright">分摊系数</td>
28 <td colspan="4"><input type="number" @blur="inputBlur($event)" ref="ftxs" v-model="form.ftxs" class="inputtitle"/></td> 28 <td colspan="4"><input type="number" @blur="inputBlur($event)" ref="ftxs" v-model="form.ftxs" class="inputtitle"/></td>
29 </tr> 29 </tr>
30 <tr> 30 <tr>
31 <td colspan="2">户型</td> 31 <td colspan="2" class="tdright">户型</td>
32 <td colspan="4"> 32 <td colspan="4">
33 <el-select class="selectTitle" v-model="form.hxbsm"> 33 <el-select class="selectTitle" v-model="form.hxbsm">
34 <el-option 34 <el-option
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 ></el-option> 39 ></el-option>
40 </el-select> 40 </el-select>
41 </td> 41 </td>
42 <td colspan="2">户型结构</td> 42 <td colspan="2" class="tdright">户型结构</td>
43 <td colspan="4"> 43 <td colspan="4">
44 <el-select class="selectTitle" v-model="form.hxjgbsm"> 44 <el-select class="selectTitle" v-model="form.hxjgbsm">
45 <el-option 45 <el-option
...@@ -52,15 +52,15 @@ ...@@ -52,15 +52,15 @@
52 </td> 52 </td>
53 </tr> 53 </tr>
54 <tr> 54 <tr>
55 <td colspan="2">共有土地面积(㎡)</td> 55 <td colspan="2" class="tdright">共有土地面积(㎡)</td>
56 <td colspan="4"><input type="text" class="inputtitle" v-model="form.gytdmj"/></td> 56 <td colspan="4"><input type="text" class="inputtitle" v-model="form.gytdmj"/></td>
57 <td colspan="2">分摊土地面积(㎡)</td> 57 <td colspan="2" class="tdright">分摊土地面积(㎡)</td>
58 <td colspan="4"><input type="text" class="inputtitle" v-model="form.fttdmj"/></td> 58 <td colspan="4"><input type="text" class="inputtitle" v-model="form.fttdmj"/></td>
59 </tr> 59 </tr>
60 <tr> 60 <tr>
61 <td colspan="2">独有土地面积(㎡)</td> 61 <td colspan="2" class="tdright">独有土地面积(㎡)</td>
62 <td colspan="4"><input type="text" class="inputtitle" v-model="form.dytdmj"/></td> 62 <td colspan="4"><input type="text" class="inputtitle" v-model="form.dytdmj"/></td>
63 <td colspan="2">房屋类型</td> 63 <td colspan="2" class="tdright">房屋类型</td>
64 <td colspan="4"> 64 <td colspan="4">
65 <el-select class="selectTitle" v-model="form.fwlxbsm"> 65 <el-select class="selectTitle" v-model="form.fwlxbsm">
66 <el-option 66 <el-option
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 </td> 73 </td>
74 </tr> 74 </tr>
75 <tr> 75 <tr>
76 <td colspan="2">产别</td> 76 <td colspan="2" class="tdright">产别</td>
77 <td colspan="4"> 77 <td colspan="4">
78 <el-select class="selectTitle" v-model="form.fwcbbsm"> 78 <el-select class="selectTitle" v-model="form.fwcbbsm">
79 <el-option 79 <el-option
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 ></el-option> 84 ></el-option>
85 </el-select> 85 </el-select>
86 </td> 86 </td>
87 <td colspan="2">产权来源</td> 87 <td colspan="2" class="tdright">产权来源</td>
88 <td colspan="4"> 88 <td colspan="4">
89 <el-select class="selectTitle" v-model="form.fwcqlybsm"> 89 <el-select class="selectTitle" v-model="form.fwcqlybsm">
90 <el-option 90 <el-option
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
97 </td> 97 </td>
98 </tr> 98 </tr>
99 <tr> 99 <tr>
100 <td colspan="2">房屋性质</td> 100 <td colspan="2" class="tdright">房屋性质</td>
101 <td colspan="4"> 101 <td colspan="4">
102 <el-select class="selectTitle" v-model="form.fwxzbsm"> 102 <el-select class="selectTitle" v-model="form.fwxzbsm">
103 <el-option 103 <el-option
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
112 <td colspan="4"></td> 112 <td colspan="4"></td>
113 </tr> 113 </tr>
114 <tr> 114 <tr>
115 <td colspan="2">房屋结构</td> 115 <td colspan="2" class="tdright">房屋结构</td>
116 <td colspan="5"> 116 <td colspan="5">
117 <el-select class="selectTitle" v-model="form.fwjgbsm"> 117 <el-select class="selectTitle" v-model="form.fwjgbsm">
118 <el-option 118 <el-option
...@@ -125,12 +125,12 @@ ...@@ -125,12 +125,12 @@
125 </td> 125 </td>
126 </tr> 126 </tr>
127 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> 127 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
128 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> 128 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle" class="tdright">
129 <i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> 129 <i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
130 <span>用途</span> 130 <span>用途</span>
131 </td> 131 </td>
132 132
133 <td width="30" colspan="1" align="center" > 133 <td width="30" colspan="1" align="center" class="tdright">
134 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> 134 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i>
135 规划用途 135 规划用途
136 </td> 136 </td>
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
148 v-model="item1.fwytzdbsm" 148 v-model="item1.fwytzdbsm"
149 ></el-select-tree> 149 ></el-select-tree>
150 </td> 150 </td>
151 <td width="30" colspan="1" align="center" >用途</td> 151 <td width="30" colspan="1" align="center" class="tdright">用途</td>
152 <td width="30" colspan="4" align="center" > 152 <td width="30" colspan="4" align="center" >
153 <el-select-tree 153 <el-select-tree
154 v-if="show" 154 v-if="show"
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
166 </tr> 166 </tr>
167 167
168 <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> 168 <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
169 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" > 169 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" class="tdright">
170 <i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i> 170 <i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i>
171 <span>房屋结构</span> 171 <span>房屋结构</span>
172 </td> 172 </td>
...@@ -193,15 +193,15 @@ ...@@ -193,15 +193,15 @@
193 </tr> 193 </tr>
194 194
195 <tr> 195 <tr>
196 <td colspan="2">东墙体归属</td> 196 <td colspan="2" class="tdright">东墙体归属</td>
197 <td colspan="4"><input type="text" class="inputtitle" v-model="form.dqtgs"/></td> 197 <td colspan="4"><input type="text" class="inputtitle" v-model="form.dqtgs"/></td>
198 <td colspan="2">南墙体归属</td> 198 <td colspan="2" class="tdright">南墙体归属</td>
199 <td colspan="4"><input type="text" class="inputtitle" v-model="form.nqtgs"/></td> 199 <td colspan="4"><input type="text" class="inputtitle" v-model="form.nqtgs"/></td>
200 </tr> 200 </tr>
201 <tr> 201 <tr>
202 <td colspan="2">西墙体归属</td> 202 <td colspan="2" class="tdright">西墙体归属</td>
203 <td colspan="4"><input type="text" class="inputtitle" v-model="form.xqtgs"/></td> 203 <td colspan="4"><input type="text" class="inputtitle" v-model="form.xqtgs"/></td>
204 <td colspan="2">北墙体归属</td> 204 <td colspan="2" class="tdright">北墙体归属</td>
205 <td colspan="4"><input type="text" class="inputtitle" v-model="form.bqtgs"/></td> 205 <td colspan="4"><input type="text" class="inputtitle" v-model="form.bqtgs"/></td>
206 </tr> 206 </tr>
207 </table> 207 </table>
......
1 import {loadModules} from 'esri-loader' 1 import {loadModules} from 'esri-loader'
2 2
3 export default { 3 export default {
4 4
...@@ -19,6 +19,7 @@ export default { ...@@ -19,6 +19,7 @@ export default {
19 findParameters.layerIds = layerIds; 19 findParameters.layerIds = layerIds;
20 findParameters.searchFields = searchFields; 20 findParameters.searchFields = searchFields;
21 findParameters.searchText = searchText; 21 findParameters.searchText = searchText;
22 findParameters.outSpatialReference = {wkid:3857};
22 findTask.execute(findParameters).then(function (result) { 23 findTask.execute(findParameters).then(function (result) {
23 if(callBackFunction){ 24 if(callBackFunction){
24 callBackFunction(result); 25 callBackFunction(result);
......
...@@ -169,7 +169,9 @@ export default { ...@@ -169,7 +169,9 @@ export default {
169 if(this.isMap){ 169 if(this.isMap){
170 this.isMap = false; 170 this.isMap = false;
171 } 171 }
172 } else { 172 } else if(newPath == '/viewMap'){
173 this.isMap = true;
174 }else{
173 175
174 } 176 }
175 }, 177 },
......
...@@ -636,7 +636,7 @@ ...@@ -636,7 +636,7 @@
636 if (res.success) { 636 if (res.success) {
637 this.getRightTree(res.result,'0,1,2'); 637 this.getRightTree(res.result,'0,1,2');
638 this.$router.push({ 638 this.$router.push({
639 path: '/dz', 639 path: '/zd',
640 query: { 640 query: {
641 bsm: res.result, 641 bsm: res.result,
642 source: 3, //分割标识 642 source: 3, //分割标识
......
...@@ -213,6 +213,7 @@ ...@@ -213,6 +213,7 @@
213 import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index"; 213 import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index";
214 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb"; 214 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
215 import {getSearchList} from "@api/search"; 215 import {getSearchList} from "@api/search";
216 import {getQjHDetailByBsm} from "@api/h";
216 export default { 217 export default {
217 name:"", 218 name:"",
218 components:{lpbContent}, 219 components:{lpbContent},
...@@ -227,7 +228,7 @@ export default { ...@@ -227,7 +228,7 @@ export default {
227 queryData:{ 228 queryData:{
228 bdcdyh: "", 229 bdcdyh: "",
229 bdcqzh: "", 230 bdcqzh: "",
230 dylxs: ['zrz'], 231 dylxs: ['zrz','h'],
231 qlrmc: "", 232 qlrmc: "",
232 qszt: [], 233 qszt: [],
233 xmmc: "", 234 xmmc: "",
...@@ -349,8 +350,16 @@ export default { ...@@ -349,8 +350,16 @@ export default {
349 }, 350 },
350 //办理 351 //办理
351 handleClick(row){ 352 handleClick(row){
353 if(row.dylx === 'zrz'){
352 this.isSearch = false; 354 this.isSearch = false;
353 this.zrzbsm = row.glbsm; 355 this.zrzbsm = row.glbsm;
356 }else {
357 getQjHDetailByBsm(row.glbsm).then((res)=>{
358 this.isSearch = false;
359 this.zrzbsm = res.result.zrzbsm;
360 })
361 }
362
354 }, 363 },
355 //分页 364 //分页
356 handleCurrentChange(val) { 365 handleCurrentChange(val) {
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
93 </div> 93 </div>
94 <!-- 底部数据展示区域 --> 94 <!-- 底部数据展示区域 -->
95 <div class="bottomResult" v-if="bottomResultDialog"> 95 <div class="bottomResult" v-if="bottomResultDialog">
96 <div class="closeButn" @click="closeBufferDialog"> 96 <div class="closeButn" @click="closeBufferDialog(false)">
97 <i class="el-icon-close"></i> 97 <i class="el-icon-close"></i>
98 </div> 98 </div>
99 <el-tabs v-model="activeName" > 99 <el-tabs v-model="activeName" >
...@@ -164,6 +164,8 @@ import ChangeMap from "@/components/map/ChangeMap"; ...@@ -164,6 +164,8 @@ import ChangeMap from "@/components/map/ChangeMap";
164 164
165 import sideTools from "./mapWeight/sideTools.vue" 165 import sideTools from "./mapWeight/sideTools.vue"
166 166
167 import mapTools from './mapWeight/js/mapTools.js'
168
167 export default { 169 export default {
168 inject:['getRightTree','getTreeByBsm'], 170 inject:['getRightTree','getTreeByBsm'],
169 components:{ 171 components:{
...@@ -190,7 +192,7 @@ export default { ...@@ -190,7 +192,7 @@ export default {
190 bottomResultDialog:false 192 bottomResultDialog:false
191 } 193 }
192 }, 194 },
193 mixins:[mapLayerManager,findTask], 195 mixins:[mapLayerManager,findTask,mapTools],
194 mounted(){ 196 mounted(){
195 197
196 var query = this.$route.query 198 var query = this.$route.query
...@@ -331,7 +333,7 @@ export default { ...@@ -331,7 +333,7 @@ export default {
331 this.clearSearchLayer(this.viewId); 333 this.clearSearchLayer(this.viewId);
332 this.dialogVisible = false; 334 this.dialogVisible = false;
333 }, 335 },
334 closeBufferDialog(){ 336 closeBufferDialog(flag){
335 //关闭时清除查询结果 清除数据 337 //关闭时清除查询结果 清除数据
336 this.results = []; 338 this.results = [];
337 this.selectResLayerId =null; 339 this.selectResLayerId =null;
...@@ -340,8 +342,10 @@ export default { ...@@ -340,8 +342,10 @@ export default {
340 this.heighGraphic = null; 342 this.heighGraphic = null;
341 //清除查询图层 343 //清除查询图层
342 this.clearSearchLayer(this.viewId); 344 this.clearSearchLayer(this.viewId);
343 this.clearBufferLayer(this.viewId);
344 this.bottomResultDialog = false; 345 this.bottomResultDialog = false;
346 if(!flag){
347 this.clearBufferLayer(this.viewId);
348 }
345 }, 349 },
346 //处理数据 350 //处理数据
347 delIdentifyData(data){ 351 delIdentifyData(data){
...@@ -472,8 +476,8 @@ export default { ...@@ -472,8 +476,8 @@ export default {
472 color: #F39835; 476 color: #F39835;
473 } 477 }
474 .active{ 478 .active{
475 border-bottom: 1.5px solid #409eff; 479 border-bottom: 2px solid #409eff;
476 padding-bottom: 5px; 480 padding-bottom: 10px;
477 } 481 }
478 } 482 }
479 .searchResult{ 483 .searchResult{
...@@ -571,11 +575,10 @@ export default { ...@@ -571,11 +575,10 @@ export default {
571 background-color: #ffffff; 575 background-color: #ffffff;
572 margin: 10px; 576 margin: 10px;
573 border-radius: 4px; 577 border-radius: 4px;
574 padding: 5px;
575 .closeButn{ 578 .closeButn{
576 position: relative; 579 position: relative;
577 float: right; 580 float: right;
578 font-size: 20px; 581 font-size: 18px;
579 color: #9B9B9B; 582 color: #9B9B9B;
580 z-index: 16; 583 z-index: 16;
581 } 584 }
...@@ -588,6 +591,14 @@ export default { ...@@ -588,6 +591,14 @@ export default {
588 /deep/ .el-table td, .el-table th.is-leaf { 591 /deep/ .el-table td, .el-table th.is-leaf {
589 text-align: center; 592 text-align: center;
590 } 593 }
594 /deep/ .el-tabs__nav :first{
595 margin-left: 33px;
596 }
597
598 /deep/ .el-tabs__item.is-active{
599 color: #505050;
600 background-color:#ffffff;
601 }
591 } 602 }
592 } 603 }
593 </style> 604 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -249,10 +249,6 @@ export default { ...@@ -249,10 +249,6 @@ export default {
249 geometry.spatialReference = { 249 geometry.spatialReference = {
250 wkt:wkt 250 wkt:wkt
251 } 251 }
252 var graphic = {
253 attributes:self.currentClickZd,
254 geometry:geometry
255 }
256 // self.checkGeo(graphic); 252 // self.checkGeo(graphic);
257 self.resultDialog = false; 253 self.resultDialog = false;
258 self.$emit("setGeometry",geometry); 254 self.$emit("setGeometry",geometry);
......
...@@ -50,6 +50,7 @@ export default { ...@@ -50,6 +50,7 @@ export default {
50 symbol:graphicSymbol.fillSymbol.bufferGeoSymbol 50 symbol:graphicSymbol.fillSymbol.bufferGeoSymbol
51 }) 51 })
52 layer.add(graphic); 52 layer.add(graphic);
53 view.center = graphic.geometry.extent.center;
53 if(callBackFunction && typeof callBackFunction == 'function'){ 54 if(callBackFunction && typeof callBackFunction == 'function'){
54 callBackFunction(bufferGeometry); 55 callBackFunction(bufferGeometry);
55 } 56 }
...@@ -119,7 +120,7 @@ export default { ...@@ -119,7 +120,7 @@ export default {
119 layer.removeAll(); 120 layer.removeAll();
120 }else { 121 }else {
121 layer = new GraphicsLayer({ 122 layer = new GraphicsLayer({
122 id:"overLayer" 123 id:"identifyLayer"
123 }) 124 })
124 view.map.add(layer); 125 view.map.add(layer);
125 } 126 }
......
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
150 </div> 150 </div>
151 <el-dialog title="图形导入" :visible.sync="importDialog" 151 <el-dialog title="图形导入" :visible.sync="importDialog"
152 width="30%"> 152 width="30%">
153 <import-geometry @setGeometry="setGeometry"></import-geometry> 153 <import-geometry @setGeometry = "setBufferGeometry"></import-geometry>
154 </el-dialog> 154 </el-dialog>
155 </div> 155 </div>
156 </template> 156 </template>
...@@ -281,7 +281,6 @@ ...@@ -281,7 +281,6 @@
281 //缓冲区分析 281 //缓冲区分析
282 bufferAnalysis(){ 282 bufferAnalysis(){
283 this.bufferDialog = true; 283 this.bufferDialog = true;
284
285 }, 284 },
286 //缓冲区分析执行语句 285 //缓冲区分析执行语句
287 toIdentity(){ 286 toIdentity(){
...@@ -309,7 +308,7 @@ ...@@ -309,7 +308,7 @@
309 }else{ 308 }else{
310 self.$message.success("暂无数据!!!"); 309 self.$message.success("暂无数据!!!");
311 //清除上次的结果 关闭上次的结果 清除地图数据 310 //清除上次的结果 关闭上次的结果 清除地图数据
312 self.$parent.closeBufferDialog(); 311 self.$parent.closeBufferDialog(true);
313 } 312 }
314 },true,'all',3,view.extent); 313 },true,'all',3,view.extent);
315 }) 314 })
...@@ -351,6 +350,8 @@ ...@@ -351,6 +350,8 @@
351 self.$parent.bottomResultDialog = true; 350 self.$parent.bottomResultDialog = true;
352 }else{ 351 }else{
353 self.$message.success("暂无数据!!!"); 352 self.$message.success("暂无数据!!!");
353 //清除上次的结果 关闭上次的结果 清除地图数据
354 self.$parent.closeBufferDialog(true);
354 } 355 }
355 },true,'all',3,view.extent); 356 },true,'all',3,view.extent);
356 }) 357 })
...@@ -375,6 +376,7 @@ ...@@ -375,6 +376,7 @@
375 return; 376 return;
376 } 377 }
377 } 378 }
379 //将那个导入图层清除
378 self.createBuffer(this.importGeo,self.bufferParams.distance,self.viewId,function (bufGeo) { 380 self.createBuffer(this.importGeo,self.bufferParams.distance,self.viewId,function (bufGeo) {
379 self.identify(self.layerUrl,self.bufferParams.layerId,bufGeo,function(res){ 381 self.identify(self.layerUrl,self.bufferParams.layerId,bufGeo,function(res){
380 var resultes = res.results; 382 var resultes = res.results;
...@@ -383,6 +385,8 @@ ...@@ -383,6 +385,8 @@
383 self.$parent.bottomResultDialog = true; 385 self.$parent.bottomResultDialog = true;
384 }else{ 386 }else{
385 self.$message.success("暂无数据!!!"); 387 self.$message.success("暂无数据!!!");
388 //清除上次的结果 关闭上次的结果 清除地图数据
389 self.$parent.closeBufferDialog(true);
386 } 390 }
387 },true,'all',3,view.extent); 391 },true,'all',3,view.extent);
388 }) 392 })
...@@ -401,7 +405,7 @@ ...@@ -401,7 +405,7 @@
401 } 405 }
402 //清除结果图层和绘制图层 406 //清除结果图层和绘制图层
403 this.$parent.closeResultDialog(); 407 this.$parent.closeResultDialog();
404 this.clearBufferLayer(); 408 this.clearBufferLayer(this.viewId);
405 }, 409 },
406 //获取地籍区/地籍子区数据 410 //获取地籍区/地籍子区数据
407 getDjqList(){ 411 getDjqList(){
...@@ -426,6 +430,7 @@ ...@@ -426,6 +430,7 @@
426 getDjzqList(){ 430 getDjzqList(){
427 var self = this, 431 var self = this,
428 djzqLayer= this.getLayerByName("DJZQ"); 432 djzqLayer= this.getLayerByName("DJZQ");
433 self.bufferParams.selectDjzq = "";
429 self.djzqList = []; 434 self.djzqList = [];
430 this.queryAttributes(this.layerUrl+"/"+djzqLayer.id,{"DJZQDM":this.bufferParams.selectDjq},function (features) { 435 this.queryAttributes(this.layerUrl+"/"+djzqLayer.id,{"DJZQDM":this.bufferParams.selectDjq},function (features) {
431 if(features != null){ 436 if(features != null){
...@@ -449,7 +454,8 @@ ...@@ -449,7 +454,8 @@
449 } 454 }
450 }, 455 },
451 //设置导入的空间数据 456 //设置导入的空间数据
452 setGeometry(geo){ 457 setBufferGeometry(geo){
458 debugger
453 this.importGeo = geo; 459 this.importGeo = geo;
454 this.importDialog = false; 460 this.importDialog = false;
455 }, 461 },
......
...@@ -125,11 +125,6 @@ ...@@ -125,11 +125,6 @@
125 </td> 125 </td>
126 </tr> 126 </tr>
127 <tr> 127 <tr>
128 <td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
129 <td colspan="4">
130 <input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
131 class="formInput" v-model="formData.zl"/>
132 </td>
133 <td colspan="2" class="tdright">项目名称</td> 128 <td colspan="2" class="tdright">项目名称</td>
134 <td colspan="4" class="psr"> 129 <td colspan="4" class="psr">
135 <input :disabled="disabled" 130 <input :disabled="disabled"
...@@ -138,6 +133,14 @@ ...@@ -138,6 +133,14 @@
138 v-model="formData.xmmc" 133 v-model="formData.xmmc"
139 /> 134 />
140 </td> 135 </td>
136 <td colspan="2" class="tdright">预编宗地代码</td>
137 <td colspan="4" class="psr">
138 <input :disabled="disabled"
139 type="text"
140 class="formInput "
141 v-model="formData.ybzddm"
142 />
143 </td>
141 </tr> 144 </tr>
142 <tr> 145 <tr>
143 <td colspan="2" class="tdright">国民经济行业分类</td> 146 <td colspan="2" class="tdright">国民经济行业分类</td>
...@@ -281,6 +284,14 @@ ...@@ -281,6 +284,14 @@
281 </tr> 284 </tr>
282 285
283 <tr> 286 <tr>
287 <td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
288 <td colspan="10">
289 <input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
290 class="formInput" v-model="formData.zl"/>
291 </td>
292 </tr>
293
294 <tr>
284 <td colspan="2" rowspan="4" class="tdright">宗地四至</td> 295 <td colspan="2" rowspan="4" class="tdright">宗地四至</td>
285 <td colspan="2" class="tdright"><i class="requisite">*</i>北至</td> 296 <td colspan="2" class="tdright"><i class="requisite">*</i>北至</td>
286 <td colspan="8" class="psr"> 297 <td colspan="8" class="psr">
......
...@@ -678,6 +678,10 @@ export default { ...@@ -678,6 +678,10 @@ export default {
678 } else if(res.code === 206){ 678 } else if(res.code === 206){
679 let hasGenerateCount = res.result.hasGenerateCount; 679 let hasGenerateCount = res.result.hasGenerateCount;
680 let unGenerateCount = res.result.unGenerateCount; 680 let unGenerateCount = res.result.unGenerateCount;
681 if(+unGenerateCount === 0){
682 this.$message.warning("不存在未生成不动产单元号的户，无需生成不动产单元号！")
683 return
684 }
681 this.open(hasGenerateCount,unGenerateCount); 685 this.open(hasGenerateCount,unGenerateCount);
682 }else { 686 }else {
683 this.$message.warning(res.message) 687 this.$message.warning(res.message)
......