Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
ffdc8e3b by 杨威
Options

修改bug 调整样式

1 parent d551061d
Inline Side-by-side
Showing 6 changed files with 79 additions and 69 deletions
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 <li @click="drsx" :class="zdQszt=='0'?'':'noEdit'">导入属性</li> 73 <li @click="drsx" :class="zdQszt=='0'?'':'noEdit'">导入属性</li>
74 <li @click="dcsx">导出属性</li> 74 <li @click="dcsx">导出属性</li>
75 <li v-show="!isZD">导入楼盘</li> 75 <li v-show="!isZD">导入楼盘</li>
76 <li>重叠分析</li> 76 <!-- <li>重叠分析</li> -->
77 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog('dzw')">添加定着物</li> 77 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog('dzw')">添加定着物</li>
78 <li v-show="isZD && (zdQszt != '1' && zdQszt != '2')" class="noEdit">添加定着物</li> 78 <li v-show="isZD && (zdQszt != '1' && zdQszt != '2')" class="noEdit">添加定着物</li>
79 <li @click="deleteByBsm()">删除</li> 79 <li @click="deleteByBsm()">删除</li>
...@@ -841,8 +841,8 @@ export default { ...@@ -841,8 +841,8 @@ export default {
841 center; 841 center;
842 background-size: contain; 842 background-size: contain;
843 } 843 }
844 /deep/ .importDialog{ 844 /* /deep/ .importDialog{
845 margin-top: 120px!important; 845 margin-top: 120px!important;
846 margin-left: 291px; 846 margin-left: 291px;
847 } 847 } */
848 </style> 848 </style>
......
1 <template> 1 <template>
2 <div > 2 <div >
3 <div v-if="!resultDialog && !txtResultDialog && !dealDialog" class="importDiv"> 3 <ul class="importDiv" v-if="!resultDialog && !txtResultDialog && !dealDialog">
4 <li>
4 <el-upload 5 <el-upload
5 class="upload-demo" 6 class="avatar-uploader"
6 action="#" 7 action="#"
7 accept=".txt" 8 accept=".txt"
8 :auto-upload="false" 9 :auto-upload="false"
...@@ -10,71 +11,56 @@ ...@@ -10,71 +11,56 @@
10 :on-change="txtFileChange" 11 :on-change="txtFileChange"
11 > 12 >
12 <!-- <el-button size="small" type="primary">点击上传</el-button>--> 13 <!-- <el-button size="small" type="primary">点击上传</el-button>-->
13 <div class="fileUpload"> 14 <i class="iconfont iconshangchuan"></i>
14 <div slot="trigger" class="uploadLeft"> 15 <div class="title">TXT文本格式</div>
15 <i class="iconfont icontxt"></i> 16 <div class="templateDowload">
16 </div> 17 <a href="#" @click.stop="downloadFile('./fileTemplate/txttemplet.txt','txttemplet.txt')">TXT模板下载</a>
17 <div solt="tip" class="uploadRight">
18 <div solt="tip" class="title">TXT文本格式</div>
19 <div class="el-upload__tip" slot="tip">支持TXT文本格式，点击查看详情<a class="down" href="#" @click.stop="downloadFile('./fileTemplate/txttemplet.txt','txttemplet.txt')" >文本详情</a></div>
20 </div>
21 </div> 18 </div>
22 </el-upload> 19 </el-upload>
20 </li>
21 <li>
23 <el-upload 22 <el-upload
24 class="upload-demo" 23 class="avatar-uploader"
25 action="/api/tx/shpUtils/readShp" 24 action="/api/tx/shpUtils/readShp"
26 accept=".zip" 25 accept=".zip"
27 :show-file-list="false" 26 :show-file-list="false"
28 :on-success="shpFileSuccess" 27 :on-success="shpFileSuccess"
29 > 28 >
30 <!--<el-button size="small" type="primary">点击上传</el-button>--> 29 <!--<el-button size="small" type="primary">点击上传</el-button>-->
31 <div class="fileUpload"> 30 <i class="iconfont iconshangchuan"></i>
32 <div slot="trigger" class="uploadLeft"> 31 <div class="title">ESRI Shape文件格式</div>
33 <i class="iconfont iconzip"></i>
34 </div>
35 <div solt="tip" class="uploadRight">
36 <div solt="tip" class="title">ESRI Shape文件格式</div>
37 <div slot="tip" class="el-upload__tip">文件包含.shp、.pdf、.shx、.prj等的压缩文件(.zip)</div>
38 </div>
39 </div>
40 </el-upload> 32 </el-upload>
33 </li>
34 <li>
41 <el-upload 35 <el-upload
42 class="upload-demo" 36 class="avatar-uploader"
43 action="https://jsonplaceholder.typicode.com/posts/" 37 action="https://jsonplaceholder.typicode.com/posts/"
44 accept=".dwg,.dxf" 38 accept=".dwg,.dxf"
45 :show-file-list="false" 39 :show-file-list="false"
46 :on-success="cadFileSuccess" 40 :on-success="cadFileSuccess"
47 > 41 >
48 <!-- <el-button size="small" type="primary">点击上传</el-button>--> 42 <!-- <el-button size="small" type="primary">点击上传</el-button>-->
49 <div solt="tip" class="fileUpload"> 43 <i class="iconfont iconshangchuan"></i>
50 <div slot="trigger" class="uploadLeft"> 44 <div class="title">CAD文件</div>
51 <i class="iconfont icondaoruCAD"></i>
52 </div>
53 <div solt="tip" class="uploadRight">
54 <div solt="tip" class="title">CAD文件</div>
55 <div slot="tip" class="el-upload__tip">支持.dwg、.dxf文件格式</div>
56 </div>
57 </div>
58 </el-upload> 45 </el-upload>
46 </li>
47 <li>
59 <el-upload 48 <el-upload
60 class="upload-demo" 49 class="avatar-uploader"
61 action="/api/tx/excelGeo/readExcel" 50 action="/api/tx/excelGeo/readExcel"
62 accept=".xls,.xlsx" 51 accept=".xls,.xlsx"
63 :show-file-list="false" 52 :show-file-list="false"
64 :on-success="excelFileSuccess" 53 :on-success="excelFileSuccess"
65 > 54 >
66 <!--<el-button size="small" type="primary">点击上传</el-button>--> 55 <!--<el-button size="small" type="primary">点击上传</el-button>-->
67 <div solt="tip" class="fileUpload"> 56 <i class="iconfont iconshangchuan"></i>
68 <div slot="trigger" class="uploadLeft"> 57 <div class="title">Excel文件格式</div>
69 <i class="iconfont iconexcel"></i> 58 <div class="templateDowload">
70 </div> 59 <a href="#" @click.stop="downloadFile('./fileTemplate/exceltemplet.xlsx','exceltemplet.xlsx')">Excel模板下载</a>
71 <div solt="tip" class="uploadRight">
72 <div slot="tip" class="title">Excel文件格式</div>
73 <div class="el-upload__tip" slot="tip">.xls、.xlsx版本,点击查看详情<a class="downloadFile" @click.stop="downloadFile('./fileTemplate/exceltemplet.xlsx','exceltemplet.xlsx')" href="#">Excel格式</a></div>
74 </div>
75 </div> 60 </div>
76 </el-upload> 61 </el-upload>
77 </div> 62 </li>
63 </ul>
78 <div v-if="resultDialog"> 64 <div v-if="resultDialog">
79 <el-form :model="zdForm" ref="zdCheckForm" label-width="100px" size="small" @submit.native.prevent class="demo-ruleForm"> 65 <el-form :model="zdForm" ref="zdCheckForm" label-width="100px" size="small" @submit.native.prevent class="demo-ruleForm">
80 <el-form-item 66 <el-form-item
...@@ -668,33 +654,45 @@ export default { ...@@ -668,33 +654,45 @@ export default {
668 } 654 }
669 </script> 655 </script>
670 <style scoped lang="less"> 656 <style scoped lang="less">
671 .upload-demo{ 657 .importDiv{
672 line-height: 34px; 658 display: flex;
673 } 659 justify-content:center;
674 .fileUpload{ 660 align-content:center;
675 height: 100%; 661 li{
676 width: 100%; 662 margin: 5px;
677 .uploadLeft{ 663 width: 50%;
678 float: left;
679 line-height: 61px;
680 .iconfont{
681 font-size: 42px;
682 }
683 }
684 .uploadRight{
685 float: right;
686 margin-left: 5px;
687 .title{ 664 .title{
688 text-align: initial; 665 line-height: 1;
689 font-weight: 600; 666 margin-top: -57px;
667 font-size: 14px;
690 } 668 }
691 .el-upload__tip{ 669 .templateDowload{
692 margin-top: 0px; 670 line-height: 1;
671 margin-top: 7px;
693 a{ 672 a{
694 color: cornflowerblue; 673 color: #409eff;
695 } 674 }
696 } 675 }
697 } 676 }
698 } 677 }
678 /deep/ .avatar-uploader .el-upload {
679 border: 1px dashed #d9d9d9;
680 border-radius: 6px;
681 cursor: pointer;
682 position: relative;
683 overflow: hidden;
684 width: 100%;
685 height: 178px;
686 line-height: 178px;
687 }
688 /deep/ .avatar-uploader .el-upload:hover {
689 border-color: #409EFF;
690 }
691 /deep/ .iconfont {
692 font-size: 20px;
693 color: #8c939d;
694 width:100%;
695 text-align: center;
696 }
699 697
700 </style> 698 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -170,7 +170,7 @@ export default { ...@@ -170,7 +170,7 @@ export default {
170 view.zoom = 15; 170 view.zoom = 15;
171 } 171 }
172 }else { 172 }else {
173 this.$message.warning("暂无图形信息！！！"); 173 this.$message.success("暂无图形信息！！！");
174 } 174 }
175 }, 175 },
176 //导入空间图形是 先判断数据是否跨界 176 //导入空间图形是 先判断数据是否跨界
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
74 </div> 74 </div>
75 <div class="contentItem"> 75 <div class="contentItem">
76 <span class="key">权利人：</span> 76 <span class="key">权利人：</span>
77 <span class="value" :title="item.attributes['权利人']">{{item.attributes['权利人'] == 'Null'?"":item.attributes['权利人']}}</span> 77 <span class="value" :title="item.attributes['QLR']">{{item.attributes['QLR'] == 'Null'?"":item.attributes['QLR']}}</span>
78 </div> 78 </div>
79 <div class="contentItem"> 79 <div class="contentItem">
80 <span class="key">坐落：</span> 80 <span class="key">坐落：</span>
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
137 <el-table-column 137 <el-table-column
138 label="权利人"> 138 label="权利人">
139 <template slot-scope="scope"> 139 <template slot-scope="scope">
140 <span>{{ scope.row.attributes['权利人'] == 'Null'?'':scope.row.attributes['权利人'] }}</span> 140 <span>{{ scope.row.attributes['QLR'] == 'Null'?'':scope.row.attributes['QLR'] }}</span>
141 </template> 141 </template>
142 </el-table-column> 142 </el-table-column>
143 <el-table-column 143 <el-table-column
...@@ -588,7 +588,7 @@ export default { ...@@ -588,7 +588,7 @@ export default {
588 /deep/ .el-tabs__header{ 588 /deep/ .el-tabs__header{
589 margin: 0 0 0px; 589 margin: 0 0 0px;
590 } 590 }
591 /deep/ .el-table td, .el-table th.is-leaf { 591 /deep/ .el-table td, .el-table th{
592 text-align: center; 592 text-align: center;
593 } 593 }
594 /deep/ .el-tabs__nav :first{ 594 /deep/ .el-tabs__nav :first{
......
...@@ -232,6 +232,7 @@ export default { ...@@ -232,6 +232,7 @@ export default {
232 type:"polygon" 232 type:"polygon"
233 } 233 }
234 //self.checkGeo(graphic); 234 //self.checkGeo(graphic);
235 this.addOverLayer(geometry);
235 self.$emit("setGeometry",geometry); 236 self.$emit("setGeometry",geometry);
236 }else{ 237 }else{
237 this.$message.warning(response.message); 238 this.$message.warning(response.message);
...@@ -319,7 +320,7 @@ export default { ...@@ -319,7 +320,7 @@ export default {
319 wkt:wkt 320 wkt:wkt
320 } 321 }
321 this.addOverLayer(graphic.geometry); 322 this.addOverLayer(graphic.geometry);
322 }, 323 }
323 } 324 }
324 } 325 }
325 </script> 326 </script>
......
...@@ -805,6 +805,17 @@ ...@@ -805,6 +805,17 @@
805 return item.bsm == value; 805 return item.bsm == value;
806 }) 806 })
807 self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : ""; 807 self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : "";
808 } else if(key == 'QLR'){
809 var qlrTableData = this.$refs.qlrxxModule.tableData;
810 if(qlrTableData.length > 0){
811 for(var i = 0;i < qlrTableData.length;i++){
812 if(i = 0){
813 self.geoAttributes[key] = qlrTableData[i].qlrmc;
814 }else{
815 self.geoAttributes[key] += ','+ qlrTableData[i].qlrmc;
816 }
817 }
818 }
808 } else { 819 } else {
809 var formKay = key.toLowerCase(); 820 var formKay = key.toLowerCase();
810 self.geoAttributes[key] = self.formData[formKay]; 821 self.geoAttributes[key] = self.formData[formKay];
......