Skip to content

任超 / js.CadastralSystem

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

Merge remote-tracking branch 'origin/master'

2 parents 3e6b5f15 ed87cd67
Expand all
Inline Side-by-side
Showing 15 changed files with 118 additions and 5 deletions
......@@ -32,3 +32,37 @@ export default {
},
};
</script>
<style lang="less">
.popper-zxx{
padding: 0!important;
/deep/ .el-tabs__header{
margin-bottom: 10px;
}
ul{
margin-bottom: 10px;
li{
cursor: pointer;
padding: 8px 16px;
position: relative;
i{
position: absolute;
right: 20px;
top: 11px;
color: #4EB2FF;
display: none;
}
}
li:hover{
background: #eee;
}
.choosed{
color: #4EB2FF;
background-color: #F0F9FF!important;
i{
display: inline-block;
}
}
}
}
</style>
\ No newline at end of file
......
......@@ -31,6 +31,18 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe779;</span>
<div class="name">多幢</div>
<div class="code-name">&amp;#xe779;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe77a;</span>
<div class="name">自然幢</div>
<div class="code-name">&amp;#xe77a;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe778;</span>
<div class="name">户重新落宗</div>
<div class="code-name">&amp;#xe778;</div>
......@@ -285,6 +297,24 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont iconduochuang"></span>
<div class="name">
多幢
</div>
<div class="code-name">.iconduochuang
</div>
</li>
<li class="dib">
<span class="icon iconfont iconziranchuang"></span>
<div class="name">
自然幢
</div>
<div class="code-name">.iconziranchuang
</div>
</li>
<li class="dib">
<span class="icon iconfont iconhuzhongxinlazong"></span>
<div class="name">
户重新落宗
......@@ -621,6 +651,22 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconduochuang"></use>
</svg>
<div class="name">多幢</div>
<div class="code-name">#iconduochuang</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconziranchuang"></use>
</svg>
<div class="name">自然幢</div>
<div class="code-name">#iconziranchuang</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconhuzhongxinlazong"></use>
</svg>
<div class="name">户重新落宗</div>
......
......@@ -6,6 +6,20 @@
"description": "",
"glyphs": [
{
"icon_id": "18727148",
"name": "多幢",
"font_class": "duochuang",
"unicode": "e779",
"unicode_decimal": 59257
},
{
"icon_id": "18727149",
"name": "自然幢",
"font_class": "ziranchuang",
"unicode": "e77a",
"unicode_decimal": 59258
},
{
"icon_id": "18623953",
"name": "户重新落宗",
"font_class": "huzhongxinlazong",
......
......@@ -20,6 +20,12 @@ Created by iconfont
/>
<missing-glyph />
<glyph glyph-name="duochuang" unicode="&#59257;" d="M68.266667 793.6h546.133333v-819.2H68.266667v819.2z m68.266666-68.266667v-682.666666h409.6v682.666666H136.533333zM238.933333 622.933333h68.266667v-68.266666h-68.266667V622.933333z m136.533334 0h68.266666v-68.266666h-68.266666V622.933333zM238.933333 486.4h68.266667v-68.266667h-68.266667V486.4z m136.533334 0h68.266666v-68.266667h-68.266666V486.4zM238.933333 349.866667h68.266667v-68.266667h-68.266667V349.866667z m136.533334 0h68.266666v-68.266667h-68.266666V349.866667zM238.933333 213.333333h68.266667v-68.266666h-68.266667v68.266666z m136.533334 0h68.266666v-68.266666h-68.266666v68.266666zM546.133333 588.8h409.6v-614.4H546.133333v614.4z m68.266667-68.266667v-477.866666h273.066667v477.866666H614.4zM716.8 486.4h68.266667v-68.266667h-68.266667zM716.8 349.866667h68.266667v-68.266667h-68.266667zM716.8 213.333333h68.266667v-68.266666h-68.266667z" horiz-adv-x="1024" />
<glyph glyph-name="ziranchuang" unicode="&#59258;" d="M170.666667 793.6h682.666666v-819.2h-682.666666v819.2z m68.266666-68.266667v-682.666666h546.133334v682.666666h-546.133334zM341.333333 622.933333h68.266667v-68.266666H341.333333V622.933333z m136.533334 0h68.266666v-68.266666H477.866667V622.933333z m136.533333 0h68.266667v-68.266666H614.4V622.933333zM341.333333 486.4h68.266667v-68.266667H341.333333V486.4z m136.533334 0h68.266666v-68.266667H477.866667V486.4z m136.533333 0h68.266667v-68.266667H614.4V486.4zM341.333333 349.866667h68.266667v-68.266667H341.333333V349.866667z m136.533334 0h68.266666v-68.266667H477.866667V349.866667z m136.533333 0h68.266667v-68.266667H614.4V349.866667zM341.333333 213.333333h68.266667v-68.266666H341.333333v68.266666z m136.533334 0h68.266666v-68.266666H477.866667v68.266666z m136.533333 0h68.266667v-68.266666H614.4v68.266666z" horiz-adv-x="1024" />
<glyph glyph-name="huzhongxinlazong" unicode="&#59256;" d="M146.285714 896h731.428572a146.285714 146.285714 0 0 0 146.285714-146.285714v-731.428572a146.285714 146.285714 0 0 0-146.285714-146.285714H146.285714a146.285714 146.285714 0 0 0-146.285714 146.285714V749.714286a146.285714 146.285714 0 0 0 146.285714 146.285714z m0-73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857v-731.428572a73.142857 73.142857 0 0 1 73.142857-73.142857h731.428572a73.142857 73.142857 0 0 1 73.142857 73.142857V749.714286a73.142857 73.142857 0 0 1-73.142857 73.142857H146.285714zM512 214.674286l-152.137143-98.084572a36.571429 36.571429 0 0 0-55.222857 40.082286l46.299429 175.030857L210.651429 446.098286a36.571429 36.571429 0 0 0 21.065142 64.804571l180.736 10.093714 65.462858 168.813715a36.571429 36.571429 0 0 0 68.169142 0l65.462858-168.813715 180.736-10.093714a36.571429 36.571429 0 0 0 21.065142-64.804571L673.060571 331.702857l46.299429-175.030857a36.571429 36.571429 0 0 0-55.222857-40.082286L512 214.674286zM492.178286 288.914286a36.571429 36.571429 0 0 0 39.643428 0l92.672-59.757715-28.233143 106.642286a36.571429 36.571429 0 0 0 12.288 37.668572l85.430858 69.705142-110.08 6.070858a36.571429 36.571429 0 0 0-32.036572 23.332571L512 575.341714l-39.862857-102.765714a36.571429 36.571429 0 0 0-32.036572-23.332571l-110.08-6.070858 85.430858-69.705142a36.571429 36.571429 0 0 0 12.288-37.668572l-28.233143-106.642286L492.251429 288.914286z" horiz-adv-x="1024" />
......
......@@ -102,7 +102,7 @@
</ul>
<el-dialog title="导入图形" :visible.sync="improtDialog">
<import-geo :property-info="zdData" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
<import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
</el-dialog>
<!-- 添加定着物弹框 -->
<el-dialog title="新建" :visible.sync="dialogVisible" width="48%">
......
......@@ -138,6 +138,10 @@ export default {
geoInfo:{
type:Object,
default:null
},
timeLine:{
type:Number,
default:null
}
},
mixins:[geoUtils,featureUpdate],
......@@ -156,6 +160,15 @@ export default {
}
}
},
mounted(){
},
watch:{
timeLine(newValue,oldValue){
this.resultDialog = false;
this.txtResultDialog = false;
}
},
methods:{
txtFileChange(file, fileList){
var self = this;
......
......@@ -76,7 +76,7 @@ export default {
},
mixins:[mapLayerManager,findTask],
mounted(){
var query = self.$route.query;
var query = this.$route.query;
if(query && JSON.stringify(query) != "{}"){
//self.addGeoByBsm(query.bsm,query.type,self.viewId);
if(query.type == 'zd'){
......@@ -202,7 +202,7 @@ export default {
delete feature.attributes[key]
}
}
layerResult.features.push(feature);
layerResult[0].features.push(feature);
}else{
if(layer){
this.resultLayers.push({
......
......@@ -10,7 +10,6 @@
:on-error="uploadError"
:show-file-list="false"
multiple
:limit="3"
:on-exceed="handleExceed"
>
<el-button size="small" type="primary">上传</el-button>
......@@ -157,7 +156,8 @@
},
handleExceed(files, fileList) {
console.log(fileList)
this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
// this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
this.$message.warning("上传失败")
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${ file.name }？`);
......