Skip to content

任超 / js.CadastralSystem

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

Merge remote-tracking branch 'origin/master'

2 parents 86190a7a e66b4045
Inline Side-by-side
Showing 9 changed files with 106 additions and 72 deletions
......@@ -767,7 +767,7 @@ export default {
}
}
.qlxzModule {
width: calc(100% - 101px);
width: calc(100% - 102px);
height: auto;
position: relative;
border-bottom: 1px solid #E6E6E6;
......
......@@ -39,10 +39,10 @@
<span class="qsztFont" style="color: red; ">临</span>
</span>
<span class="qsztImg" v-if="item.qszt=='1'" >
<span class="qsztFont" style="color: #00FF00; ">正</span>
<span class="qsztFont" style="color: #1AD6E1; ">正</span>
</span>
<span class="qsztImg" v-if="item.qszt=='2'" >
<span class="qsztFont" style="color: blue; ">现</span>
<span class="qsztFont" style="color: #45AEFD; ">现</span>
</span>
</template>
......@@ -77,7 +77,11 @@
></div>
<div
v-if="item.children==null"
class="reTree_icon reTree_expand_icon"
class="reTree_icon"
:class="{
reTree_default_icon: item.dm != 'G' && item.dm != 'J' && item.dm != 'Z',
reTree_expand_icon: item.dm == 'G' || item.dm == 'J' || item.dm == 'Z',
}"
:style="{
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
......
......@@ -47,7 +47,7 @@
@changeDzVisible="changeDzVisible"
@changeGzwVisible="changeGzwVisible"
:list="item.children"
:visible="visible"
:visible="zrzVisible"
:size="size"
:islpb="islpb"
:formatData="formatData"
......@@ -55,7 +55,7 @@
</div>
<ul
v-show="visible"
v-show="zrzVisible"
:style="{ left: left + 'px', top: top + 'px' }"
class="contextmenu"
>
......@@ -169,6 +169,8 @@ export default {
currentClickZdGeo:"",
improtDialog:false,
dialogVisible:false,
//控制自然幢右键菜单
zrzVisible:false,
//控制楼盘表
lpbvisible: false,
lpbtop: 0,
......@@ -210,6 +212,13 @@ export default {
document.body.removeEventListener("click", this.closeMenu);
}
},
zrzVisible(value) {
if (value) {
document.body.addEventListener("click", this.closeMenu);
} else {
document.body.removeEventListener("click", this.closeMenu);
}
},
// createVisible(value) {
// if (value) {
......@@ -270,7 +279,10 @@ export default {
},
// 改变菜单数据
changeVisible(data) {
this.visible = data;
this.zrzVisible = data;
this.lpbvisible = false;
this.dzVisible = false;
this.gzwVisible = false;
},
changeZdData(data) {
this.zdData = data;
......@@ -289,6 +301,9 @@ export default {
},
changeLpbVisible(data) {
this.lpbvisible = data;
this.zrzVisible = false;
this.dzVisible = false;
this.gzwVisible = false;
},
changeCreateVisible(data){
this.createVisible = true;
......@@ -296,10 +311,16 @@ export default {
//多幢
changeDzVisible(data){
this.dzVisible = data;
this.zrzVisible = false;
this.lpbvisible = false;
this.gzwVisible = false;
},
//构筑物
changeGzwVisible(data){
this.gzwVisible = data;
this.zrzVisible = false;
this.lpbvisible = false;
this.dzVisible = false;
},
//添加定着物
openCreateDialog(type){
......@@ -397,6 +418,7 @@ export default {
},
//关闭右键菜单
closeMenu(){
this.zrzVisible = false;
this.lpbvisible = false;
this.dzVisible = false;
this.gzwVisible = false;
......
......@@ -112,30 +112,30 @@
<td colspan="4"></td>
</tr>
<tr>
<td colspan="2" class="tdright">房屋结构</td>
<td colspan="5">
<el-select class="selectTitle" v-model="form.fwjgbsm">
<el-option
v-for="item in $store.state.jgOptions"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</td>
<td colspan="2" class="tdright">东墙体归属</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.dqtgs"/></td>
<td colspan="2" class="tdright">南墙体归属</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.nqtgs"/></td>
</tr>
<tr>
<td colspan="2" class="tdright">西墙体归属</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.xqtgs"/></td>
<td colspan="2" class="tdright">北墙体归属</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.bqtgs"/></td>
</tr>
<tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
<td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle" class="tdright">
<i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
<span>用途</span>
<i class="iconfont iconicon-test2" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
<span>房屋用途</span>
</td>
<td width="30" colspan="1" align="center" class="tdright">
<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i>
规划用途
</td>
<td width="30" colspan="4" align="center" >
<el-select-tree
<td width="30" colspan="3" align="center" >
<el-select-tree style="width:100%"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -148,10 +148,10 @@
v-model="item1.fwytzdbsm"
></el-select-tree>
</td>
<td width="30" colspan="1" align="center" class="tdright">用途</td>
<td width="30" colspan="2" align="center" class="tdright">用途</td>
<td width="30" colspan="4" align="center" >
<el-select-tree
v-if="show"
<el-select-tree style="width:100%"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
......@@ -167,15 +167,15 @@
<tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" class="tdright">
<i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i>
<i class="iconfont iconicon-test2" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i>
<span>房屋结构</span>
</td>
<td colspan="1" align="center" >
<i class="iconfont iconicon-test" style="margin-right: 10px;color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i>
<span>删除</span>
<i class="iconfont iconicon-test" style="margin-right: 8px;color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i>
<span>房屋结构</span>
</td>
<td colspan="9" >
<el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-select style="width:100%" v-model="item1.fwjgzdbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.jgOptions"
:key="item.bsm"
......@@ -192,18 +192,6 @@
</td>
</tr>
<tr>
<td colspan="2" class="tdright">东墙体归属</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.dqtgs"/></td>
<td colspan="2" class="tdright">南墙体归属</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.nqtgs"/></td>
</tr>
<tr>
<td colspan="2" class="tdright">西墙体归属</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.xqtgs"/></td>
<td colspan="2" class="tdright">北墙体归属</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.bqtgs"/></td>
</tr>
</table>
</div>
<div class="shop">
......
......@@ -58,17 +58,17 @@
</div>
<div class="xlgz">
<span>
样例1：10101 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
样例1：1011 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
<br/>
样例2：11301室<span>（1单元13层01室）</span>([单元号][层号][室号后缀])
样例2：1131室<span>（1单元13层01室）</span>([单元号][层号][后缀])
<br/>
样例3：101<span>(1层01室)</span>([层号])
样例3：11<span>(1层01室)</span>([层号])
<br/>
样例4：1-101<span>(1单元-01层01室)</span>([单元号][层号][分隔符]，勾选“层号之前增加分隔符”)
样例4：1-101<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”)
<br/>
样例5：1-13-01<span>(1单元13层01室)</span>([单元号][层号][分隔符])
样例5：1-13-1<span>(1单元13层01室)</span>([单元号][分隔符A][层号][分隔符B])
<br/>
样例6：1-01<span>(1单元13层01室)</span>([层号][分隔符]，勾选“室号之前增加分隔符”)
样例6：1-1<span>(1单元13层01室)</span>([单元号][分隔符]，勾选“室号之前增加分隔符”)
</span>
</div>
</div>
......
......@@ -5,25 +5,28 @@
:visible.sync="isVisible"
width="30%"
:before-close="close">
<div class="main-button">
<el-upload
class="upload-demo"
action="/api/tx/excelGeo/import"
:data="sxdrData"
:on-success="uploadSuccess"
:show-file-list="false"
multiple
>
<el-button type="primary" icon="iconfont iconshangchuan">上传</el-button>
</el-upload>
<el-button type="primary" @click="downloadTemplate">下载模板</el-button>
</div>
<div class="wrap">
<div class="main-button">
<el-upload
class="upload-demo"
action="/api/tx/excelGeo/import"
:data="sxdrData"
:on-success="uploadSuccess"
:on-error="uploadError"
:show-file-list="false"
multiple
>
<el-button type="primary" icon="iconfont iconshangchuan">上传</el-button>
</el-upload>
</div>
<el-button type="primary" class="download" @click="downloadTemplate">下载模板</el-button>
</div>
<ul>
<li v-for="(item,index) in errorData" :key="index">{{item}}</li>
</ul>
<span slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="confirm">确 定</el-button>
<!-- <el-button type="primary" @click="confirm">确 定</el-button> -->
</span>
</el-dialog>
</div>
......@@ -114,13 +117,27 @@
</script>
<style scoped lang="less">
.main-button {
display: -webkit-flex;
display: flex;
flex-direction: column-reverse;
flex-wrap: nowrap;
.wrap{
width: 100%;
height: 30px;
position: relative;
.main-button {
display: -webkit-flex;
display: flex;
flex-direction: column-reverse;
flex-wrap: nowrap;
position: absolute;
left: 165px;
top: 18px;
}
.download{
position: absolute;
left: 300px;
top: 18px;
}
}
ul {
margin-top: 20px;
li {
......
......@@ -343,5 +343,8 @@ export default {
.pagination {
padding: 18px;
}
.el-table{
border: 0!important;
}
}
</style>
......
......@@ -534,7 +534,7 @@
}
this.$nextTick(()=>{
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 300
this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 230
})
},
methods: {
......
......@@ -872,18 +872,18 @@ export default {
box-sizing: border-box;
padding: 0 20px;
/deep/.el-radio-button__inner {
border: 1px solid #00cacd;
color: #00cacd;
border: 1px solid #3fa2e1;
color: #3fa2e1;
}
/deep/.el-radio-button__inner:hover {
color: #00cacd;
color: #3fa2e1;
}
/deep/.is-active .el-radio-button__inner {
color: #fff;
}
/deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
background-color: #00cacd;
border-color: #00cacd;
background-color: #3fa2e1;
border-color: #3fa2e1;
}
.searchInput {
transition: 0.5s;
......