Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
d2059be8 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 9e6d1ab4 7062b0b9
Inline Side-by-side
Showing 10 changed files with 62 additions and 30 deletions
...@@ -219,9 +219,9 @@ export function exportShp(data) { ...@@ -219,9 +219,9 @@ export function exportShp(data) {
219 219
220 export function exportExcel(data) { 220 export function exportExcel(data) {
221 return request({ 221 return request({
222 url:"/tx/excelGeo/exportExcelp", 222 url:"/tx/excelGeo/exportExcel",
223 method:"post", 223 method:"post",
224 params:data 224 data:data
225 }) 225 })
226 } 226 }
227 227
......
...@@ -52,7 +52,7 @@ table,tr,.el-col,.title{ ...@@ -52,7 +52,7 @@ table,tr,.el-col,.title{
52 color: #606764; 52 color: #606764;
53 overflow: visible; 53 overflow: visible;
54 text-align: left; 54 text-align: left;
55 text-indent: 20px; 55 text-indent: 15px;
56 padding: 0; 56 padding: 0;
57 } 57 }
58 input:disabled{ 58 input:disabled{
...@@ -265,3 +265,11 @@ ol, ul { list-style:none; } ...@@ -265,3 +265,11 @@ ol, ul { list-style:none; }
265 .iconfontEdit:hover{ 265 .iconfontEdit:hover{
266 color: rgb(0, 108, 255); 266 color: rgb(0, 108, 255);
267 } 267 }
268 .el-select,.el-select-tree,.el-date-editor{
269 /deep/ .el-input__inner{
270 text-align: left!important;
271 }
272 }
273 .el-input__prefix, .el-input__suffix{
274 top: -2px;
275 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <template v-for="(childItem, childIndex) in items.list"> 8 <template v-for="(childItem, childIndex) in items.list">
9 <el-col 9 <el-col
10 :span="2" 10 :span="2"
11 class="btnCol" 11 class="btnCol "
12 :key="childIndex + '1'" 12 :key="childIndex + '1'"
13 :class="childIndex > 0 ? 'childYT noTopBorder' : ''" 13 :class="childIndex > 0 ? 'childYT noTopBorder' : ''"
14 > 14 >
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 </el-col> 33 </el-col>
34 <el-col 34 <el-col
35 :span="2" 35 :span="2"
36 class="btnCol" 36 class="btnCol pr10"
37 :key="childIndex + '8'" 37 :key="childIndex + '8'"
38 :class="childIndex > 0 ? 'childYT' : ''" 38 :class="childIndex > 0 ? 'childYT' : ''"
39 > 39 >
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
54 </el-col> 54 </el-col>
55 <template v-if="hasSyqx"> 55 <template v-if="hasSyqx">
56 <el-col 56 <el-col
57 class="pr10"
57 :span="3" 58 :span="3"
58 :key="childIndex + '7'" 59 :key="childIndex + '7'"
59 :class="childIndex > 0 ? 'childYT' : ''" 60 :class="childIndex > 0 ? 'childYT' : ''"
...@@ -117,6 +118,7 @@ ...@@ -117,6 +118,7 @@
117 </ul> 118 </ul>
118 </el-col> 119 </el-col>
119 <el-col 120 <el-col
121 class="pr10"
120 :span="3" 122 :span="3"
121 :key="childIndex + '5'" 123 :key="childIndex + '5'"
122 :class="childIndex > 0 ? 'childYT' : ''" 124 :class="childIndex > 0 ? 'childYT' : ''"
...@@ -166,6 +168,7 @@ ...@@ -166,6 +168,7 @@
166 </ul> 168 </ul>
167 </el-col> 169 </el-col>
168 <el-col 170 <el-col
171 class="pr10"
169 :span="3" 172 :span="3"
170 :key="childIndex + '2'" 173 :key="childIndex + '2'"
171 :class="childIndex > 0 ? 'childYT' : ''" 174 :class="childIndex > 0 ? 'childYT' : ''"
...@@ -716,12 +719,14 @@ export default { ...@@ -716,12 +719,14 @@ export default {
716 height: auto; 719 height: auto;
717 position: relative; 720 position: relative;
718 border-bottom: 1px solid #E6E6E6; 721 border-bottom: 1px solid #E6E6E6;
722 .pr10{
723 padding-right: 10px;
724 }
719 .el-col { 725 .el-col {
720 // height: 100%; 726 // height: 100%;
721 border-right: 1px solid #E6E6E6; 727 border-right: 1px solid #E6E6E6;
722 position: relative; 728 position: relative;
723 text-align: right; 729 text-align: right;
724 padding-right: 10px;
725 .qlxz { 730 .qlxz {
726 line-height: 34px; 731 line-height: 34px;
727 } 732 }
......
...@@ -162,6 +162,7 @@ export default { ...@@ -162,6 +162,7 @@ export default {
162 dzVisible:false, 162 dzVisible:false,
163 //宗地权属状态 163 //宗地权属状态
164 zdQszt:null, 164 zdQszt:null,
165 wkt:"PROJCS[\"XADFZBX\",GEOGCS[\"GCS_WGS_1984\",DATUM[\"D_WGS_1984\",SPHEROID[\"WGS_1984\",6378137.0,298.257223563]],PRIMEM[\"Greenwich\",0.0],UNIT[\"Degree\",0.0174532925199433]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"False_Easting\",0.0],PARAMETER[\"False_Northing\",0.0],PARAMETER[\"Central_Meridian\",0.0],PARAMETER[\"Scale_Factor\",1.0],PARAMETER[\"Latitude_Of_Origin\",0.0],UNIT[\"Meter\",1.0]]"
165 }; 166 };
166 }, 167 },
167 watch: { 168 watch: {
...@@ -512,7 +513,7 @@ export default { ...@@ -512,7 +513,7 @@ export default {
512 var type = this.zdData.type; 513 var type = this.zdData.type;
513 var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm; 514 var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm;
514 this.queryGeoByBsm(BSM,type,function (features){ 515 this.queryGeoByBsm(BSM,type,function (features){
515 if(features && features.length > 0){ 516 if(features && features.length > 0 && features[0].geometry.rings.length > 0){
516 var data = features[0]; 517 var data = features[0];
517 var jzdInfo = self.craetJZPoint(data); 518 var jzdInfo = self.craetJZPoint(data);
518 var textCotent = ""; 519 var textCotent = "";
...@@ -533,7 +534,7 @@ export default { ...@@ -533,7 +534,7 @@ export default {
533 } 534 }
534 self.downloadTxt(textCotent,"outPut.txt"); 535 self.downloadTxt(textCotent,"outPut.txt");
535 } 536 }
536 }); 537 },{wkt:this.wkt});
537 }, 538 },
538 //导出shp文件 539 //导出shp文件
539 exportToShp(){ 540 exportToShp(){
...@@ -541,7 +542,7 @@ export default { ...@@ -541,7 +542,7 @@ export default {
541 var type = this.zdData.type; 542 var type = this.zdData.type;
542 var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm; 543 var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm;
543 this.queryGeoByBsm(BSM,type,function (features){ 544 this.queryGeoByBsm(BSM,type,function (features){
544 if(features && features.length > 0){ 545 if(features && features.length > 0 && features[0].geometry.rings.length > 0) {
545 var data = JSON.stringify(features[0]); 546 var data = JSON.stringify(features[0]);
546 window.location.href = "/api/tx/shpUtils/writeShp?strObj="+encodeURI(data) 547 window.location.href = "/api/tx/shpUtils/writeShp?strObj="+encodeURI(data)
547 /* exportShp({ 548 /* exportShp({
...@@ -552,7 +553,7 @@ export default { ...@@ -552,7 +553,7 @@ export default {
552 }else{ 553 }else{
553 self.$message.warning("暂无空间信息!!!!"); 554 self.$message.warning("暂无空间信息!!!!");
554 } 555 }
555 }); 556 },{wkt:this.wkt});
556 }, 557 },
557 //导出excel 558 //导出excel
558 exportExcel(){ 559 exportExcel(){
...@@ -560,7 +561,7 @@ export default { ...@@ -560,7 +561,7 @@ export default {
560 var type = this.zdData.type; 561 var type = this.zdData.type;
561 var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm; 562 var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm;
562 this.queryGeoByBsm(BSM,type,function (features) { 563 this.queryGeoByBsm(BSM,type,function (features) {
563 if (features && features.length > 0) { 564 if (features && features.length > 0 && features[0].geometry.rings.length > 0) {
564 var data = features[0]; 565 var data = features[0];
565 var jzdInfo = self.craetJZPoint(data); 566 var jzdInfo = self.craetJZPoint(data);
566 var submitData = []; 567 var submitData = [];
...@@ -574,15 +575,15 @@ export default { ...@@ -574,15 +575,15 @@ export default {
574 submitData.push(obj); 575 submitData.push(obj);
575 } 576 }
576 exportExcel(submitData).then((res) => { 577 exportExcel(submitData).then((res) => {
577 if (res.status == 200) { 578 if (res.code == 200) {
578 var path = res.data.result; 579 var path = res.result;
579 window.location.href = "/api/tx/excelGeo/download?filePath=" + encodeURI(path); 580 window.location.href = "/api/tx/excelGeo/download?filePath=" + encodeURI(path);
580 } 581 }
581 }); 582 });
582 }else { 583 }else {
583 self.$message.warning("还没有空间信息!!!!") 584 self.$message.warning("还没有空间信息!!!!")
584 } 585 }
585 }) 586 },{wkt:this.wkt})
586 }, 587 },
587 //导出CAD 588 //导出CAD
588 exportCad(){ 589 exportCad(){
......
...@@ -236,10 +236,10 @@ export default { ...@@ -236,10 +236,10 @@ export default {
236 return; 236 return;
237 } 237 }
238 //this.$emit("closeImportDialog"); 238 //this.$emit("closeImportDialog");
239 var features = [],attributes = {},points = []; 239 var features = [],attributes = {},points = [],j = 1;
240 for(var i =1;i < geoList.length;i++){ 240 for(var i =1;i < geoList.length;i++){
241 var rowData = geoList[i]; 241 var rowData = geoList[i];
242 if(rowData.indexOf("J") != -1 && rowData.indexOf("J") == 0){ 242 if((rowData.indexOf("J") != -1 && rowData.indexOf("J") == 0)||(rowData.indexOf("j") != -1 && rowData.indexOf("j") == 0)){
243 //解析坐标点信息 243 //解析坐标点信息
244 var pointInfo = rowData.split(","); 244 var pointInfo = rowData.split(",");
245 var point = [parseFloat(pointInfo[2]),parseFloat(pointInfo[3])]; 245 var point = [parseFloat(pointInfo[2]),parseFloat(pointInfo[3])];
...@@ -249,7 +249,7 @@ export default { ...@@ -249,7 +249,7 @@ export default {
249 var graphic = { 249 var graphic = {
250 attributes:JSON.parse(JSON.stringify(attributes)), 250 attributes:JSON.parse(JSON.stringify(attributes)),
251 geometry:{ 251 geometry:{
252 rings:[[points]] 252 rings:[points]
253 } 253 }
254 } 254 }
255 features.push(graphic); 255 features.push(graphic);
...@@ -258,9 +258,14 @@ export default { ...@@ -258,9 +258,14 @@ export default {
258 attributes = {}; 258 attributes = {};
259 points = [] 259 points = []
260 var info = rowData.split(","); 260 var info = rowData.split(",");
261 if(info[3] || info[3] == 'null'){
262 attributes.name = '地块'+j;
263 j++
264 }else {
261 attributes.name = info[3]; 265 attributes.name = info[3];
262 } 266 }
263 } 267 }
268 }
264 if(points.length > 0){ 269 if(points.length > 0){
265 var graphic = { 270 var graphic = {
266 attributes:JSON.parse(JSON.stringify(attributes)), 271 attributes:JSON.parse(JSON.stringify(attributes)),
...@@ -302,7 +307,7 @@ export default { ...@@ -302,7 +307,7 @@ export default {
302 } 307 }
303 var wkt = "PROJCS[\"XADFZBX\",GEOGCS[\"GCS_WGS_1984\",DATUM[\"D_WGS_1984\",SPHEROID[\"WGS_1984\",6378137.0,298.257223563]],PRIMEM[\"Greenwich\",0.0],UNIT[\"Degree\",0.0174532925199433]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"False_Easting\",0.0],PARAMETER[\"False_Northing\",0.0],PARAMETER[\"Central_Meridian\",0.0],PARAMETER[\"Scale_Factor\",1.0],PARAMETER[\"Latitude_Of_Origin\",0.0],UNIT[\"Meter\",1.0]]"; 308 var wkt = "PROJCS[\"XADFZBX\",GEOGCS[\"GCS_WGS_1984\",DATUM[\"D_WGS_1984\",SPHEROID[\"WGS_1984\",6378137.0,298.257223563]],PRIMEM[\"Greenwich\",0.0],UNIT[\"Degree\",0.0174532925199433]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"False_Easting\",0.0],PARAMETER[\"False_Northing\",0.0],PARAMETER[\"Central_Meridian\",0.0],PARAMETER[\"Scale_Factor\",1.0],PARAMETER[\"Latitude_Of_Origin\",0.0],UNIT[\"Meter\",1.0]]";
304 var geometry = { 309 var geometry = {
305 rings:[[points]], 310 rings:[points],
306 spatialReference:{ 311 spatialReference:{
307 wkt:wkt 312 wkt:wkt
308 }, 313 },
......
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
27 } 27 }
28 return null; 28 return null;
29 }, 29 },
30 queryGeoByBsm(bsm, type, callBackFunction) { 30 queryGeoByBsm(bsm, type, callBackFunction,outSpatialReference) {
31 var layer = null; 31 var layer = null;
32 if (type == 'zd') { 32 if (type == 'zd') {
33 layer = this.getLayerByName("ZDJBXX"); 33 layer = this.getLayerByName("ZDJBXX");
...@@ -41,7 +41,7 @@ export default { ...@@ -41,7 +41,7 @@ export default {
41 console.log("没有找到图层，不能查询"); 41 console.log("没有找到图层，不能查询");
42 return; 42 return;
43 } 43 }
44 queryUtils.methods.queryByWhere(layer.layerUrl+"/"+layer.id, {"BSM": bsm}, null, true, null, null, function (res) { 44 queryUtils.methods.queryByWhere(layer.layerUrl+"/"+layer.id, {"BSM": bsm}, null, true, null, outSpatialReference, function (res) {
45 var features = res.features; 45 var features = res.features;
46 if (callBackFunction && typeof callBackFunction == 'function') { 46 if (callBackFunction && typeof callBackFunction == 'function') {
47 callBackFunction(features); 47 callBackFunction(features);
...@@ -281,11 +281,13 @@ export default { ...@@ -281,11 +281,13 @@ export default {
281 var view = maps["testMap"]; 281 var view = maps["testMap"];
282 loadModules([ 282 loadModules([
283 "esri/Graphic", 283 "esri/Graphic",
284 "esri/geometry/Polygon",
284 "esri/layers/GraphicsLayer", 285 "esri/layers/GraphicsLayer",
285 "esri/geometry/geometryEngineAsync", 286 "esri/geometry/geometryEngineAsync",
286 "esri/geometry/Extent" 287 "esri/geometry/Extent"
287 ]).then(([ 288 ]).then(([
288 Graphic, 289 Graphic,
290 Polygon,
289 GraphicsLayer, 291 GraphicsLayer,
290 geometryEngineAsync, 292 geometryEngineAsync,
291 Extent 293 Extent
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
44 <td colspan="2" align="center" >竣工日期</td> 44 <td colspan="2" align="center" >竣工日期</td>
45 <td colspan="4" > 45 <td colspan="4" >
46 <el-date-picker 46 <el-date-picker
47 style="width:100%"
47 v-model="form.jgrq" 48 v-model="form.jgrq"
48 type="date" 49 type="date"
49 placeholder="选择日期"> 50 placeholder="选择日期">
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
7 <el-button type="primary" title="放大" icon="iconfont iconlakuangfangda" @click="zoomOut"></el-button> 7 <el-button type="primary" title="放大" icon="iconfont iconlakuangfangda" @click="zoomOut"></el-button>
8 <el-button type="primary" title="缩小" icon="iconfont iconlakuangsuoxiao" @click="zoomIn"></el-button> 8 <el-button type="primary" title="缩小" icon="iconfont iconlakuangsuoxiao" @click="zoomIn"></el-button>
9 <el-button type="primary" title="点选" icon="iconfont iconchaxunshuxing" @click="info"></el-button> 9 <el-button type="primary" title="点选" icon="iconfont iconchaxunshuxing" @click="info"></el-button>
10 <el-button type="primary" title="缓冲区分析" icon="iconfont iconqingchu" @click="bufferAnalysis"></el-button>
10 <el-button type="primary" title="清除" icon="iconfont iconqingchu" @click="clear"></el-button> 11 <el-button type="primary" title="清除" icon="iconfont iconqingchu" @click="clear"></el-button>
11 </el-button-group> 12 </el-button-group>
12 13
...@@ -96,6 +97,10 @@ export default { ...@@ -96,6 +97,10 @@ export default {
96 throw (err); 97 throw (err);
97 }) 98 })
98 }); 99 });
100 },
101 //缓冲区分析
102 bufferAnalysis(){
103
99 } 104 }
100 105
101 } 106 }
...@@ -104,5 +109,8 @@ export default { ...@@ -104,5 +109,8 @@ export default {
104 } 109 }
105 </script> 110 </script>
106 <style lang="less" scoped> 111 <style lang="less" scoped>
112 .tools{
113 position: relative;
114 }
107 115
108 </style> 116 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -326,25 +326,26 @@ ...@@ -326,25 +326,26 @@
326 </td> 326 </td>
327 </tr> 327 </tr>
328 <tr> 328 <tr>
329 <td colspan="2" rowspan="2" class="tdright">批准面积(㎡)</td> 329 <td colspan="2" class="tdright">批准面积(㎡)</td>
330 <td colspan="2" rowspan="2"> 330 <td colspan="4" >
331 <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')" 331 <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')"
332 class="formInput" v-model="formData.pzmj"/> 332 class="formInput" v-model="formData.pzmj"/>
333 </td> 333 </td>
334 <td colspan="2" rowspan="2" class="tdright">宗地面积(㎡)<i class="requisite">*</i></td> 334 <td colspan="2" class="tdright">宗地面积(㎡)<i class="requisite">*</i></td>
335 <td colspan="2" rowspan="2"> 335 <td colspan="4" >
336 <input type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zdmj" 336 <input type="text" :disabled="formData.qszt!='0'" @blur="inputBlur($event)" ref="zdmj"
337 onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.zdmj"/> 337 onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.zdmj"/>
338 </td> 338 </td>
339 <td colspan="2" class="tdright">建筑占地总面积</td> 339 </tr>
340 <td colspan="2"> 340 <tr>
341 <td colspan="2" class="tdright">建筑占地总面积(㎡)</td>
342 <td colspan="4">
341 <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')" 343 <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')"
342 class="formInput" v-model="formData.jzzdzmj"/> 344 class="formInput" v-model="formData.jzzdzmj"/>
343 </td> 345 </td>
344 </tr> 346
345 <tr> 347 <td colspan="2" class="tdright">建筑总面积(㎡)</td>
346 <td colspan="2" class="tdright">建筑面积(㎡)</td> 348 <td colspan="4">
347 <td colspan="2">
348 <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')" 349 <input type="text" :disabled="formData.qszt!='0'" onkeyup="value=value.replace(/[^\d\.]/g,'')"
349 class="formInput" v-model="formData.jzzmj"/> 350 class="formInput" v-model="formData.jzzmj"/>
350 </td> 351 </td>
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
55 <td colspan="2" class="tdright">竣工日期</td> 55 <td colspan="2" class="tdright">竣工日期</td>
56 <td colspan="4" > 56 <td colspan="4" >
57 <el-date-picker 57 <el-date-picker
58 style="width:100%"
58 :disabled="form.qszt!='0'" 59 :disabled="form.qszt!='0'"
59 v-model="form.jgrq" 60 v-model="form.jgrq"
60 type="date" 61 type="date"
......