Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
1688935d by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 22f172be fbd9ef23
Inline Side-by-side
Showing 11 changed files with 67 additions and 59 deletions
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#666666" d="M904.533333 311.466667c-17.066667-17.066667-42.666667-17.066667-59.733333 0L512 644.266667 179.2 311.466667c-17.066667-17.066667-42.666667-17.066667-59.733333 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l362.666666 362.666667c8.533333 8.533333 19.2 12.8 29.866667 12.8s21.333333-4.266667 29.866667-12.8l362.666666-362.666667c17.066667-17.066667 17.066667-42.666667 0-59.733333z" /></svg>
\ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#666666" d="M904.533333 674.133333l-362.666666-362.666666c-17.066667-17.066667-42.666667-17.066667-59.733334 0l-362.666666 362.666666c-17.066667 17.066667-17.066667 42.666667 0 59.733334 17.066667 17.066667 42.666667 17.066667 59.733333 0L512 401.066667l332.8 332.8c8.533333 8.533333 19.2 12.8 29.866667 12.8s21.333333-4.266667 29.866666-12.8c17.066667-17.066667 17.066667-42.666667 0-59.733334z" /></svg>
\ No newline at end of file
......@@ -103,7 +103,7 @@ ol, ul { list-style:none; }
>.is-top{
position: -webkit-fixed;
position: fixed;
top: 72px;
top: 66px;
z-index: 999;
width: 100%;
margin-bottom: 0;
......@@ -149,7 +149,7 @@ ol, ul { list-style:none; }
}
.el-dialog__header{
border-bottom: 1px solid #F1F1F1;
background: #6f94f5;
background: #3FA2E1;
}
.el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{
color: #fff;
......
......@@ -21,29 +21,6 @@
}"
>
<div
v-if="item.children"
class="reTree_icon"
:style="{
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
}"
:class="{
reTree_default_icon: item.children.length === 0,
reTree_collapse_icon: !islpb && item.expand && item.children.length > 0,
reTree_expand_icon: !islpb && !item.expand && item.children.length > 0,
lpbTree_collapse_icon: islpb && item.expand && item.children.length > 0,
lpbTree_expand_icon: islpb && !item.expand && item.children.length > 0,
}"
></div>
<div
v-if="item.children==null"
class="reTree_icon reTree_expand_icon"
:style="{
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
}"
></div>
<div
class="layer_text nowrap"
@contextmenu.prevent="openMenu($event, item,list)"
:class="{
......@@ -54,8 +31,8 @@
:data-zdbsm="item.zdbsm"
:title=item.mc
>
<span class="qsztImg" v-if="item.bblx == 1 || (item.bhqkbsm != ''&& item.bhqkbsm != null)" style="background: #9e9b9b">
<span class="qsztFont">变</span>
<span class="qsztImg" v-if="item.bblx == 1 || (item.bhqkbsm != ''&& item.bhqkbsm != null)">
<span class="qsztFont" style="color: #9e9b9b">变</span>
</span>
<template v-else>
<span class="qsztImg" v-if="item.qszt=='0'" >
......@@ -80,9 +57,32 @@
</span>
{{ item.mc }}
<span class="project-name">{{ item.mc }}</span>
</div>
<div
v-if="item.children"
class="reTree_icon"
:style="{
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
}"
:class="{
reTree_default_icon: item.children.length === 0,
reTree_collapse_icon: !islpb && item.expand && item.children.length > 0,
reTree_expand_icon: !islpb && !item.expand && item.children.length > 0,
lpbTree_collapse_icon: islpb && item.expand && item.children.length > 0,
lpbTree_expand_icon: islpb && !item.expand && item.children.length > 0,
}"
></div>
<div
v-if="item.children==null"
class="reTree_icon reTree_expand_icon"
:style="{
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
}"
></div>
</div>
<line-item
:list="item.children"
......@@ -331,6 +331,7 @@ export default {
cursor: pointer;
.layer_text {
flex: 1;
line-height: 16px;
}
}
.first_vertical_line {
......@@ -348,15 +349,15 @@ export default {
}
.second_layer {
position: relative;
width: 100%;
width: calc(100% - 20px);
cursor: pointer;
padding-left: 25px;
padding-left: 20px;
}
.third_layer {
position: relative;
// padding-bottom: 15px;
width: 100%;
padding-left: 25px;
width: calc(100% - 20px);
cursor: pointer;
padding-left: 20px;
}
.white_layer {
color: black!important;
......@@ -441,13 +442,13 @@ export default {
.reTree_collapse_icon {
// opacity: .5;
background: url("../../assets/images/reTree_collapse_.svg") no-repeat center
background: url("../../assets/images/arrow-up-bold.svg") no-repeat center
center;
background-size: contain;
}
.reTree_expand_icon {
// opacity: .5;
background: url("../../assets/images/reTree_expand_.svg") no-repeat center
background: url("../../assets/images/arrow-down-bold.svg") no-repeat center
center;
background-size: contain;
}
......@@ -474,9 +475,11 @@ export default {
}
.qsztImg{
width: 16px;
border-radius: 50%; height: 20px; width: 20px; display: inline-block;
}
.project-name{
position: relative;
top: 1px;
border-radius: 50%; height: 20px; width: 20px; display: inline-block;
}
.curPage{
color: orange;
......
<template>
<div
class="content column-start-center reTree_box"
:style="{ fontSize: (size || 16) + 'px', lineHeight: (size || 16) + 'px', width: (islpb ? '200':'374') + 'px' }"
:style="{ fontSize: (size || 16) + 'px', lineHeight: (size || 16) + 'px', width: (islpb ? '200':'270') + 'px' }"
>
<div
class="column-start-center basic_layer"
......@@ -16,7 +16,8 @@
}"
@click="itemClick(item)"
>
<div
<div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)">{{ item.mc }}</div><div
class="reTree_icon"
:style="{
height: (size || 16 * 1.2) + 'px',
......@@ -30,7 +31,6 @@
lpbTree_expand_icon: islpb && !item.expand && item.children.length > 0,
}"
></div>
<div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)">{{ item.mc }}</div>
</div>
<lineItem
......@@ -115,9 +115,9 @@
</ul>
<!--@close="closeImportDialog"-->
<el-dialog v-dialogDrag :close-on-click-modal="false" title="导入图形" :modal="false" custom-class="importDialog" :visible.sync="improtDialog" width="30%" @close="closeImportDialog">
<import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
</el-dialog>
<el-dialog v-dialogDrag :close-on-click-modal="false" title="导入图形" :modal="false" custom-class="importDialog" :visible.sync="improtDialog" width="30%" @close="closeImportDialog">
<import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
</el-dialog>
<!-- 添加定着物弹框 -->
<el-dialog v-dialogDrag :close-on-click-modal="false" title="新建" :visible.sync="dialogVisible" width="48%">
<Create @closeDialog="closeDialog" :auth="true" :createZrz="createZrz" ></Create>
......@@ -801,7 +801,7 @@ export default {
background: #c3c5c8;
}
.reTree_collapse_icon {
background: url("../../assets/images/reTree_collapse_.svg") no-repeat center
background: url("../../assets/images/arrow-up-bold.svg") no-repeat center
center;
background-size: contain;
}
......@@ -813,7 +813,7 @@ export default {
}
.reTree_expand_icon {
background: url("../../assets/images/reTree_expand_.svg") no-repeat center
background: url("../../assets/images/arrow-down-bold.svg") no-repeat center
center;
background-size: contain;
}
......@@ -836,8 +836,8 @@ export default {
center;
background-size: contain;
}
/deep/ .importDialog{
margin-top: 120px!important;
margin-left: 291px;
}
/deep/ .importDialog{
margin-top: 120px!important;
margin-left: 291px;
}
</style>
......
......@@ -66,7 +66,7 @@
</el-main>
</el-container>
</el-container>
<div class="treeModule-show" :class="{ 'w0': isActive }"></div>
<!-- <div class="treeModule-show" :class="{ 'w0': isActive }"></div> -->
</div>
</template>
<script>
......@@ -576,6 +576,7 @@ export default {
.treeModule {
box-sizing: border-box;
padding: 20px 20px;
border-right: 1px solid #dedede;
}
.logo-box-show {
width: 64px;
......
......@@ -896,6 +896,7 @@
width: 100%;
margin-bottom: 0;
border: 0;
border-bottom: 1px solid #E4E7ED;
/deep/ .el-tabs__nav-scroll {
height: 50px;
box-sizing: border-box;
......
......@@ -85,6 +85,7 @@ export default {
width: 100%;
margin-bottom: 0;
border: 0;
border-bottom: 1px solid #E4E7ED;
/deep/ .el-tabs__nav-scroll {
height: 50px;
box-sizing: border-box;
......
......@@ -589,6 +589,7 @@
width: 100%;
margin-bottom: 0;
border: 0;
border-bottom: 1px solid #E4E7ED;
/deep/ .el-tabs__nav-scroll {
height: 50px;
box-sizing: border-box;
......
......@@ -174,6 +174,14 @@
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
<td colspan="10">
<input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
class="formInput" v-model="formData.zl"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">容积率</td>
<td colspan="2">
<el-select class="formSelect" :disabled="disabled" v-model="formData.jyrjl">
......@@ -282,15 +290,6 @@
<input type="text" :disabled="disabled" class="formInput" v-model="formData.tfh"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
<td colspan="10">
<input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
class="formInput" v-model="formData.zl"/>
</td>
</tr>
<tr>
<td colspan="2" rowspan="4" class="tdright">宗地四至</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>北至</td>
......
......@@ -835,7 +835,6 @@ export default {
background-color: rgb(245, 250, 254);
.tab-header {
border: 1px solid #dedede;
border-top: 0;
box-sizing: border-box;
padding: 20px 0;
background-color: #ffffff;
......@@ -897,6 +896,7 @@ export default {
}
}
.tab-content {
border: 1px solid #dedede;
background-color: #ffffff;
display: flex;
overflow-y: scroll;
......