Skip to content

任超 / js.CadastralSystem

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

新增导入图标和地图右下角功能

1 parent f2021751
Expand all
Inline Side-by-side
Showing 13 changed files with 90 additions and 11 deletions
......@@ -31,6 +31,12 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe786;</span>
<div class="name">上传</div>
<div class="code-name">&amp;#xe786;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6d7;</span>
<div class="name">绘制方式1</div>
<div class="code-name">&amp;#xe6d7;</div>
......@@ -477,6 +483,15 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont iconshangchuan"></span>
<div class="name">
上传
</div>
<div class="code-name">.iconshangchuan
</div>
</li>
<li class="dib">
<span class="icon iconfont iconhuizhifangshi1"></span>
<div class="name">
绘制方式1
......@@ -1101,6 +1116,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconshangchuan"></use>
</svg>
<div class="name">上传</div>
<div class="code-name">#iconshangchuan</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconhuizhifangshi1"></use>
</svg>
<div class="name">绘制方式1</div>
......
This diff could not be displayed because it is too large.
......@@ -6,6 +6,13 @@
"description": "",
"glyphs": [
{
"icon_id": "19243689",
"name": "上传",
"font_class": "shangchuan",
"unicode": "e786",
"unicode_decimal": 59270
},
{
"icon_id": "15148386",
"name": "绘制方式1",
"font_class": "huizhifangshi1",
......
......@@ -20,6 +20,9 @@ Created by iconfont
/>
<missing-glyph />
<glyph glyph-name="shangchuan" unicode="&#59270;" d="M523.776 781.568l155.392-155.3408a25.6 25.6 0 1 1 36.1984 36.1984L519.8848 857.9584a25.6 25.6 0 0 1-36.2496 0L288.1536 662.4256a25.6 25.6 0 0 1 36.1984-36.1984l148.2752 148.2752V174.08a25.6 25.6 0 1 1 51.2 0V781.568z m182.4768-409.088H875.52a25.6 25.6 0 0 0 25.6-25.6v-364.5952a25.6 25.6 0 0 0-25.6-25.6H128a25.6 25.6 0 0 0-25.6 25.6v364.6464a25.6 25.6 0 0 0 25.6 25.6h145.7664a25.6 25.6 0 1 1 0 51.2H128a76.8 76.8 0 0 1-76.8-76.8v-364.6464a76.8 76.8 0 0 1 76.8-76.8h747.52a76.8 76.8 0 0 1 76.8 76.8v364.6464a76.8 76.8 0 0 1-76.8 76.8h-169.2672a25.6 25.6 0 1 1 0-51.2z" horiz-adv-x="1024" />
<glyph glyph-name="huizhifangshi1" unicode="&#59095;" d="M153.6 742.4h716.8a102.4 102.4 0 0 0 102.4-102.4v-512a102.4 102.4 0 0 0-102.4-102.4H153.6a102.4 102.4 0 0 0-102.4 102.4V640a102.4 102.4 0 0 0 102.4 102.4z m0-51.2a51.2 51.2 0 0 1-51.2-51.2v-512a51.2 51.2 0 0 1 51.2-51.2h716.8a51.2 51.2 0 0 1 51.2 51.2V640a51.2 51.2 0 0 1-51.2 51.2H153.6z" horiz-adv-x="1024" />
......
......@@ -2,6 +2,14 @@
<div class="map">
<div :id="viewId" class="viewDiv">
</div>
<div class="mapViewPoint">
<span class="key">比例尺:</span>
<span class="value">{{ mapInfo.scale }}km</span>
<span class="key">经度:</span>
<span class="value">{{ mapInfo.x }}</span>
<span class="key">纬度:</span>
<span class="value">{{ mapInfo.y }}</span>
</div>
</div>
</template>
<script>
......@@ -20,8 +28,12 @@
},
data(){
return{
}
mapInfo:{
scale:"",
x:"",
y:''
}
}
},
mounted(){
......@@ -54,6 +66,13 @@
if(self.afterLoaderFunction && typeof self.afterLoaderFunction == 'function'){
self.afterLoaderFunction(view);
}
view.on("pointer-move", function(event){
var point = view.toMap({x: event.x, y: event.y});
self.mapInfo.x = point.longitude.toFixed(6);
self.mapInfo.y = point.latitude.toFixed(6);
self.mapInfo.scale = (view.scale/1000).toFixed(3);
});
}).catch(err => {
throw(err);
});
......@@ -70,5 +89,24 @@
height: 100%;
width: 100%;
}
.mapViewPoint{
position: absolute;
bottom: 10px;
left: 5px;
background-color: white;
line-height: 36px;
font-size: 12px;
border-radius: 4px;
box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
.key{
font-weight: 600;
}
.value{
margin-left: 0px;
}
span{
margin:0px 5px;
}
}
}
</style>
\ No newline at end of file
......
......@@ -167,6 +167,12 @@ export default {
this.$nextTick(()=>{
this.lineTreeVisible = true
})
var routePath = this.$route.path;
if(routePath == '/viewMap'){
this.isMap = true;
}else{
this.isMap = false;
}
},
created() {
if (this.$route.meta) {
......
......@@ -9,7 +9,7 @@
:auto-upload="false"
:on-change="txtFileChange"
>
<i class="el-icon-upload"></i>
<i class="iconfont iconshangchuan"></i>
<div class="title">TXT文本格式</div>
<div class="templateDowload">
<a href="#" @click.stop="downloadFile('./fileTemplate/txttemplet.txt','txttemplet.txt')">TXT模板下载</a>
......@@ -25,7 +25,7 @@
:show-file-list="false"
:on-success="shpFileSuccess"
>
<i class="el-icon-upload"></i>
<i class="iconfont iconshangchuan"></i>
<div class="title">ESRI Shape文件格式</div>
</el-upload>
</li>
......@@ -36,7 +36,7 @@
action="https://jsonplaceholder.typicode.com/posts/"
accept=".dwg,.dxf"
>
<i class="el-icon-upload"></i>
<i class="iconfont iconshangchuan"></i>
<div class="title">CAD文件</div>
</el-upload>
</li>
......@@ -48,7 +48,7 @@
:show-file-list="false"
:on-success="excelFileSuccess"
>
<i class="el-icon-upload"></i>
<i class="iconfont iconshangchuan"></i>
<div class="title">Excel文件格式</div>
<div class="templateDowload">
<a href="#" @click.stop="downloadFile('./fileTemplate/exceltemplet.xlsx','exceltemplet.xlsx')">Excel模板下载</a>
......@@ -334,7 +334,7 @@ export default {
align-content:center;
li{
margin: 5px;
width: 20%;
width: 50%;
.title{
line-height: 1;
margin-top: -57px;
......@@ -343,7 +343,9 @@ export default {
.templateDowload{
line-height: 1;
margin-top: 7px;
a{
color: #409eff;
}
}
}
}
......@@ -360,8 +362,8 @@ export default {
/deep/ .avatar-uploader .el-upload:hover {
border-color: #409EFF;
}
/deep/ .el-icon-upload {
font-size: 28px;
/deep/ .iconfont {
font-size: 20px;
color: #8c939d;
width:100%;
text-align: center;
......
......@@ -532,7 +532,7 @@
}
}
.towSelect{
margin-left: 100px;
margin-left: 80px;
}
}
.buttonDiv{
......