Skip to content

任超 / js.CadastralSystem

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

Merge remote-tracking branch 'origin/master' into master 

# Conflicts:
#	src/assets/iconfont/demo_index.html
#	src/assets/iconfont/iconfont.css
#	src/assets/iconfont/iconfont.eot
#	src/assets/iconfont/iconfont.js
#	src/assets/iconfont/iconfont.json
#	src/assets/iconfont/iconfont.svg
#	src/assets/iconfont/iconfont.ttf
#	src/assets/iconfont/iconfont.woff
#	src/assets/iconfont/iconfont.woff2
2 parents caed718b 898dbff4
Inline Side-by-side
Showing 42 changed files with 331 additions and 335 deletions
......@@ -60,7 +60,7 @@ export default {
position: absolute;
top: 0;
left: 0;
z-index: 1;
z-index: 1000;
.content{
width: 240px;
height: 160px;
......
......@@ -126,3 +126,13 @@ export function cxlzZrzList(data) {
})
}
/**
* 查询权籍_建筑物区分所有权业主共有部分调查表
*/
export function getHCountByZrzbsm(id) {
return request({
url: '/fw/qjZrz/getHCountByZrzbsm',
method: 'get',
params: {id}
})
}
......
<?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 t="1610702907780" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3703" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M471.3472 826.368a51.2 51.2 0 0 0 65.3312 5.9392l7.168-5.9392 409.6-409.6a51.2 51.2 0 0 0-65.4336-78.336l-7.0656 5.9392-373.3504 373.3504L134.144 344.3712a51.2 51.2 0 0 0-65.3312-5.9392l-7.0656 5.9392A51.2 51.2 0 0 0 55.808 409.6l5.9392 7.0656 409.6 409.6z" fill="#6D7278" p-id="3704"></path></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="M384 512L731.733333 202.666667c17.066667-14.933333 19.2-42.666667 4.266667-59.733334-14.933333-17.066667-42.666667-19.2-59.733333-4.266666l-384 341.333333c-10.666667 8.533333-14.933333 19.2-14.933334 32s4.266667 23.466667 14.933334 32l384 341.333333c8.533333 6.4 19.2 10.666667 27.733333 10.666667 12.8 0 23.466667-4.266667 32-14.933333 14.933333-17.066667 14.933333-44.8-4.266667-59.733334L384 512z" /></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 t="1610702898690" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3569" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M211.1488 471.6544a51.2 51.2 0 0 0-5.9392 65.3312l5.9392 7.168 409.6 409.6a51.2 51.2 0 0 0 78.336-65.3312l-5.9392-7.168L319.7952 507.904l373.3504-373.3504a51.2 51.2 0 0 0 5.9392-65.3312L693.248 62.0544A51.2 51.2 0 0 0 627.8144 56.32l-7.0656 5.8368-409.6 409.6z" fill="#4A4A4A" p-id="3570"></path></svg>
\ No newline at end of file
......

22.1 KB | W: | H:

314 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

9.82 KB | W: | H:

14.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

10.7 KB | W: | H:

16.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

6.83 KB | W: | H:

11.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

45.6 KB | W: | H:

73.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.87 KB | W: | H:

10.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

7.36 KB | W: | H:

16.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

7.02 KB | W: | H:

13.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

10 KB | W: | H:

15.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -101,6 +101,7 @@ ol, ul { list-style:none; }
/deep/ .el-tabs--border-card{
border: 0;
}
//二级菜单样式
.tabs{
>.el-tabs__content{
......@@ -110,33 +111,29 @@ ol, ul { list-style:none; }
>.is-top{
position: -webkit-fixed;
position: fixed;
top: 66px;
top: 70px;
z-index: 999;
width: 100%;
margin-bottom: 0;
border-top: 1px solid #F4F9FF;
// >.is-top>.el-tabs__nav-scroll{
// height: 50px;
// background-color: #ffffff;
// box-sizing: border-box;
// padding-left: 20px;
// .el-tabs__active-bar{
// display: none;
// }
// >.el-tabs__nav{
// >.el-tabs__item{
// border: 1px solid #DEDEDE;
// height: 30px;
// line-height: 28px;
// padding: 0 20px;
// margin: 9px 10px 9px 0;
// }
// .is-active{
// color: #006CFF;
// background-color: #ffffff;
// }
// }
// }
}
}
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
position: unset;
/deep/.el-tab-pane{
height: 100%;
}
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
.el-tabs__item{
......@@ -156,7 +153,7 @@ ol, ul { list-style:none; }
}
.el-dialog__header{
border-bottom: 1px solid #F1F1F1;
background: #3FA2E1;
background: #0091FF;
}
.el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{
color: #fff;
......@@ -308,16 +305,16 @@ ol, ul { list-style:none; }
}
//实预测转换按钮样式
/deep/.el-radio-button__inner {
border: 1px solid #3fa2e1!important;
color: #3fa2e1;
border: 1px solid #00cacd!important;
color: #00cacd;
}
/deep/.el-radio-button__inner:hover {
color: #3fa2e1;
color: #00cacd;
}
/deep/.is-active .el-radio-button__inner {
color: #fff;
}
/deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
background-color: #3fa2e1;
border-color: #3fa2e1;
background-color: #00cacd;
border-color: #00cacd;
}
\ No newline at end of file
......
......@@ -495,8 +495,10 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
vm.loadingShow('业务办理中');
fwsxbgbl(params)
.then((res) => {
vm.loadingHide();
if (res.success) {
// this.$message({
// message: res.message,
......@@ -538,6 +540,7 @@
}
})
.catch((error) => {
vm.loadingHide();
this.$message({
message: res.message,
type: "error",
......
......@@ -36,7 +36,7 @@
:data-zdbsm="item.zdbsm"
:title=item.mc
>
<i v-show="!item.qszt" class="iconfont iconshumulu" style="margin-right:6px"></i>
<i v-show="!item.qszt" class="iconfont iconguoyou" style="margin-right:6px"></i>
<span class="qsztImg" v-if="item.bblx == 1 || (item.bhqkbsm != ''&& item.bhqkbsm != null)">
<!-- <span class="qsztFont" style="color: #9e9b9b">变</span> -->
<i :class="$route.query.bsm && $route.query.bsm==item.bsm ? 'iconfont iconbianing':'iconfont iconbian'"></i>
......@@ -65,8 +65,8 @@
v-if="item.children"
class="reTree_icon"
:style="{
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
height: 12 + 'px',
width: 12 + 'px',
}"
:class="{
reTree_default_icon: item.children.length === 0,
......@@ -84,8 +84,8 @@
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',
height: 12 + 'px',
width: 12 + 'px',
}"
></div>
</div>
......
......@@ -17,11 +17,11 @@
@click="itemClick(item)"
>
<div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)"><i class="iconfont iconshumulu"></i> {{ item.mc }}</div><div
<div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)"><i class="iconfont iconguoyou"></i> {{ item.mc }}</div><div
class="reTree_icon"
:style="{
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
height: 12 + 'px',
width: 12 + 'px',
}"
:class="{
reTree_default_icon: item.children.length === 0,
......@@ -119,7 +119,7 @@
<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%">
<el-dialog v-dialogDrag :close-on-click-modal="false" title="新建" :modal="false" :visible.sync="dialogVisible" width="48%">
<Create @closeDialog="closeDialog" :auth="true" :createZrz="createZrz" ></Create>
</el-dialog>
<sxdr :sxdr-visible="sxdrVisible" @close="sxdrClose" :dylx="zdData.type" :bsm="zdData.bsm"></sxdr>
......
......@@ -10,24 +10,25 @@
<div>
<table border="1">
<tr>
<td>室号前缀</td>
<td>幢单元号</td>
<td>分割符A</td>
<td>层号前自动补0</td>
<td>层</td>
<td>分割符B</td>
<td>户号</td>
<td>室号后缀</td>
<th>室号前缀</th>
<th>幢单元号</th>
<th>分割符A</th>
<th>层号前自动补0</th>
<th>层号</th>
<th>分割符B</th>
<th>户号前自动补零</th>
<th>户号</th>
<th>室号后缀</th>
</tr>
<tr>
<td>
<input type="text" class="inputtitle" v-model="plshData.shqz"/>
<el-input v-model="plshData.shqz"></el-input>
</td>
<td>
<el-checkbox v-model="plshData.selectDyh"></el-checkbox>
</td>
<td>
<input type="text" class="inputtitle" v-model="plshData.fgfA"/>
<el-input v-model="plshData.fgfA"></el-input>
</td>
<td>
<el-checkbox v-model="plshData.chqbl"></el-checkbox>
......@@ -43,13 +44,15 @@
</el-select>
</td>
<td>
<input type="text" class="inputtitle" v-model="plshData.fgfB"/>
<el-input v-model="plshData.fgfB"></el-input>
</td>
<td>
<el-checkbox v-model="plshData.hhqbl"></el-checkbox>
</td>
<td>
</td>
<td>
<input type="text" class="inputtitle" v-model="plshData.shhz"/>
<el-input v-model="plshData.shhz"></el-input>
</td>
</tr>
</table>
......@@ -60,15 +63,15 @@
<span>
样例1：1011 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
<br/>
样例2：1131室<span>（1单元13层01室）</span>([单元号][层号][后缀])
样例2：1131室<span>（1单元13层01室）</span>([单元号][层号][后缀],后缀填写'室')
<br/>
样例3：11<span>(1层01室)</span>([层号])
样例3：101<span>(1层01室)</span>([层号],勾选“户号自动补0”)
<br/>
样例4：1-101<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”)
样例4：1-011<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号自动补0”)
<br/>
样例5：1-13-1<span>(1单元13层01室)</span>([单元号][分隔符A][层号][分隔符B])
样例5：1-12-1<span>(1单元12层01室)</span>([单元号][分隔符A][层号][分隔符B])
<br/>
样例6：1-1<span>(1单元13层01室)</span>([单元号][分隔符]，勾选“室号之前增加分隔符”)
样例6：1-12<span>(1层12室)</span>([层号][分隔符B])
</span>
</div>
</div>
......@@ -106,6 +109,7 @@
chqbl: false,
c: '',
fgfB: '',
hhqbl:false,
shhz: ''
},
cs: [
......@@ -128,8 +132,6 @@
methods: {
test: function () {
for (let key in this.plshData) {
console.log(key)
console.log(this.plshData[key])
if (key === 'chqbl') {
continue;
}
......@@ -153,6 +155,7 @@
selectDyh: false,
fgfA: '',
chqbl: false,
hhqbl:false,
c: '',
fgfB: '',
shhz: ''
......@@ -223,7 +226,9 @@
cursor: pointer;
}
}
th{
height: 36px;
}
td {
text-align: center;
height: 36px;
......
......@@ -9,21 +9,26 @@ const errorPage = [
{ path: "*", redirect: "/404", hidden: true },
];
const frameOut = [
/*const frameOut = [
{
path: "/",
name: "login",
component: login,
},
];
];*/
const constantRoutes = [
{
path: "/panel",
code: "panel",
path: "/",
component: () => import("@/views/Home"),
redirect: "/panel",
redirect: "/",
children: [
{
path: "/",
name: "首页",
code: "0-1",
component: () => import("@/views/panel/index"),
},
{
path: "/panel",
name: "首页",
code: "0-1",
......@@ -105,4 +110,4 @@ const constantRoutes = [
];
// 在这里面动态引入路由文件 达成权限处理得问题
// 重新组织后导出
export default [...errorPage, ...frameOut, ...constantRoutes];
export default [...errorPage, ...constantRoutes];
......
......@@ -9,7 +9,8 @@
alt=""
@click="toHome"
/>
<span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span>
<img class="logo-word" src="@/assets/images/logo-word.png" alt="">
<!-- <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span> -->
</div>
<div class="wrap">
......@@ -54,6 +55,10 @@
<i class="iconfont icondiqiu" title="图形管理" v-if="!isMap" @click="goMap"></i>
<i class="iconfont iconxinxi" title="属性管理" v-else @click="goBack"></i>
</div>
<div class="user-info">
<span>admin</span>
<img src="https://himg.bdimg.com/sys/portraitn/item/a1b5badad3b61739" alt="">
</div>
</div>
<!-- <div class="header-bottom">
<Navigation ref="navigation"></Navigation>
......@@ -271,7 +276,7 @@ export default {
})
}
this.$nextTick(()=>{
this.treeHeight = this.$el.clientHeight - 132;
this.treeHeight = this.$el.clientHeight - 136;
});
},
methods: {
......@@ -470,14 +475,16 @@ export default {
.el-header {
background-color: #fff;
padding: 0 !important;
height: 66px!important;
height: 70px!important;
position: relative;
.header-top {
height: 66px;
height: 70px;
// border-bottom: 1px solid#EAEAEA;
box-sizing: border-box;
// background-image: url('../assets/images/banner.png');
background-color: #006CFF;
background: url('../assets/images/banner.png') no-repeat center center;
background-size: cover;
// background-color: #006CFF;
// background: linear-gradient(270deg, #0091FF 5%, #006CFF 86%) ;
display: flex;
flex-grow: 1;
border-left: 1px solid #3E9FFF;
......@@ -485,10 +492,10 @@ export default {
// align-items: center;
.top-items {
cursor: pointer;
height: 66px;
height: 70px;
padding: 0 30px;
font-size: 18px;
line-height: 66px;
line-height: 70px;
float: left;
position: relative;
color: #ffffff;
......@@ -525,10 +532,38 @@ export default {
right: 18px;
top: 20px;
.tuOrShu{
float: left;
.iconfont{
cursor: pointer;
color:#ffffff;
font-size:30px
font-size:26px;
position: relative;
top: 2px;
}
}
.user-info{
float: left;
margin-left: 20px;
cursor: pointer;
span{
line-height: 30px;
vertical-align: middle;
color: #fff;
font-size: 14px;
}
img{
// padding: 2px;
width: 24px;
height: 24px;
margin-left: 6px;
border-radius: 50%;
border: 1px solid #fff;
vertical-align: middle;
}
}
.user-info:hover{
span{
color: #006CFF;
}
}
}
......@@ -546,25 +581,31 @@ export default {
z-index: 1000;
.logo-box {
width: 100%;
height: 66px;
height: 70px;
border-bottom: 1px solid rgba(255, 255, 255, 0.2);
box-sizing: border-box;
padding: 10px 20px;
padding: 10px 18px;
transition: width 0.3s;
background-color: #006CFF;
.logo-img {
width: 44px;
width: 30px;
padding-top: 10px;
float: left;
}
.logo-text {
padding-left: 10px;
color: #ffffff;
line-height: 44px;
font-size: 20px;
.logo-word{
padding-left: 8px;
padding-top: 15px;
height: 20px;
}
// .logo-text {
// padding-left: 10px;
// color: #ffffff;
// line-height: 44px;
// font-size: 20px;
// }
}
.wrap{
height: calc(100% - 66px);
height: calc(100% - 70px);
overflow-x: hidden;
.search-box{
height: 65px;
......@@ -589,6 +630,9 @@ export default {
}
.logo-box-show {
width: 64px;
.logo-word{
width: 0;
}
}
.el-menu {
border-right: 0;
......
......@@ -189,33 +189,15 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
margin: 0;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
......@@ -247,6 +229,5 @@
margin: 20px auto 0;
width: 230px;
}
}
}
}
</style>
......
......@@ -72,33 +72,13 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
margin: 0;
border-top: 1px solid #E4E7ED;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
......@@ -131,6 +111,5 @@
margin: 20px auto 0;
width: 230px;
}
}
}
}
</style>
......
......@@ -507,7 +507,9 @@
this.$nextTick(()=> {
if (flag && this.$refs.qlxzModule.getRulesResult()) {
vm.loadingShow('请求发送中');
saveDzInfo(this.form).then((res)=>{
vm.loadingHide();
if(res.code===200){
this.$message.success("保存完成！")
}else {
......@@ -517,6 +519,10 @@
});
}
})
.catch((error) => {
vm.loadingHide();
console.log(error);
});
}else {
this.$message({
// message: item.name+'不能为空',
......
......@@ -63,22 +63,4 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -237,11 +237,17 @@
this.bsm=this.$route.query.bsm;
this.form.bsm=this.bsm;
this.form.jgsj=this.form.jgrq;
vm.loadingShow('请求发送中');
updateGzwjbxx(this.form).then((res)=>{
vm.loadingHide();
if(res.code === 200){
this.$message.success("保存完成!");
}
})
.catch((error) => {
vm.loadingHide();
console.log(error);
});
}
})
......
......@@ -64,7 +64,7 @@
></i>
<span class="remake_txt" @click="selectRemeber">记住账号密码</span>
</div>
<div class="login-btn" @click="goHome">登录</div>
<div id="loginBtn" class="login-btn" @click="goHome">登录</div>
</div>
<div class="reserved-con">
<div class="reserved-words">版权所有：2020©某某市自然资源和规划</div>
......
......@@ -30,19 +30,4 @@
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
}
/deep/ .el-tabs__item {
height: 48px;
}
}
</style>
\ No newline at end of file
......
......@@ -162,25 +162,7 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
......@@ -211,6 +193,5 @@
padding: 18px 0;
}
}
}
}
</style>
......
......@@ -642,7 +642,9 @@
Message.info("请选择需要分割的多幢或者填写分割后多幢的基本信息！")
return
}
vm.loadingShow('正在保存中');
saveDzFg(this.dzFghData).then(res => {
vm.loadingHide()
if (res.success) {
this.getRightTree(res.result,'0,1,2');
this.$router.push({
......@@ -655,6 +657,9 @@
} else {
Message.error("保存失败")
}
}).catch((error)=>{
vm.loadingHide();
console.log(error);
})
},
saveH() {
......@@ -912,7 +917,7 @@
/deep/ .el-tabs__header {
position: -webkit-fixed;
position: fixed;
top: 114px;
top: 117px;
z-index: 999;
width: 100%;
margin-bottom: 0;
......
......@@ -80,7 +80,7 @@ export default {
/deep/ .el-tabs__header {
position: -webkit-fixed;
position: fixed;
top: 114px;
top: 117px;
z-index: 999;
width: 100%;
margin-bottom: 0;
......
......@@ -305,8 +305,9 @@
newzdzdtzmbsm: this.zdhbhData.zdtzmbsm,
oldzdbsms: oldBsm
}
console.log(data, '宗地合并数据')
vm.loadingShow('请求发送中');
ZdHb(data).then(res => {
vm.loadingHide();
if (res.success) {
this.$message.success("合并成功");
//更新目录树
......@@ -322,6 +323,9 @@
} else {
this.$message.error("合并失败")
}
}).catch((error)=>{
vm.loadingHide();
console.log(error);
})
},
dzHb() {
......@@ -330,8 +334,9 @@
newdzxmmc: this.$refs.dzhb.dzhbhData.xmmc,
zdbsm: this.$refs.dzhb.zdbsm
}
vm.loadingShow('请求发送中');
DzHb(data).then(res => {
vm.loadingHide();
if (res.success) {
console.log(res)
this.$message.success("多幢合并成功")
......@@ -343,7 +348,12 @@
bsm: res.result
}
})
}else{
this.$message.error(res.message);
}
}).catch((error)=>{
vm.loadingHide();
console.log(error);
})
},
hHb() {
......@@ -584,7 +594,7 @@
/deep/ .el-tabs__header {
position: -webkit-fixed;
position: fixed;
top: 114px;
top: 117px;
z-index: 999;
width: 100%;
margin-bottom: 0;
......
......@@ -69,23 +69,4 @@ export default {
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
position: unset;
/deep/.el-tab-pane{
height: calc(100% - 40px);
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -493,11 +493,14 @@ export default {
</script>
<style lang="less">
.eltabs {
height: 366px;
height: 366px!important;
width: 100%;
position: relative;
margin-left: 20px;
margin-top: 20px;
/deep/.el-tabs__content{
position: relative!important;
}
.eltabspane {
height: 100%;
width: 100%;
......
......@@ -3,7 +3,7 @@
<div class="panel content_box">
<el-card class="panel_left">
<div slot="header" class="clearfix">
<span>工作箱</span>
<span><i class="iconfont icongongzuoxiang"></i>工作箱</span>
</div>
<div class="enter_box">
<div
......@@ -21,7 +21,7 @@
</el-card>
<el-card class="panel_right">
<div slot="header" class="clearfix">
<span>快捷入口</span>
<span><i class="iconfont iconkuaijierukou"></i>快捷入口</span>
<span class="edit" @click="isEdit = true" v-show="!isEdit">编辑</span>
<span class="edit" @click="isEdit = false" v-show="isEdit">完成</span>
</div>
......@@ -44,7 +44,7 @@
<div class="notice" ref="notice">
<el-card class="news">
<div slot="header" class="clearfix">
<span>通知公告</span>
<span><i class="iconfont icontongzhigonggao"></i>通知公告</span>
<span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span>
</div>
<el-table
......@@ -64,7 +64,7 @@
</el-card>
<el-card class="download">
<div slot="header" class="clearfix">
<span>相关下载</span>
<span><i class="iconfont iconxiazai1"></i>相关下载</span>
<span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span>
</div>
<el-table
......@@ -86,7 +86,7 @@
<div class="tj">
<el-card class="panel_right">
<div slot="header" class="clearfix">
<span>成果类别占比</span>
<span><i class="iconfont iconbingtu"></i>成果类别占比</span>
</div>
<div class="enter_box" ref="enterBox">
<img src="../../assets/images/cglbzb.png" :style="{'height':imgHeight + 'px'}" alt="">
......@@ -94,7 +94,7 @@
</el-card>
<el-card class="cghj">
<div slot="header" class="clearfix">
<span>成果汇交数量</span>
<span><i class="iconfont icontizhuangshuju"></i>成果汇交数量</span>
<img src="../../assets/images/cghjsllegend.png" style="float: right;" alt="">
</div>
<div class="enter_box">
......@@ -103,7 +103,7 @@
</el-card>
<el-card class="cghj-pie">
<div slot="header" class="clearfix">
<span>成果汇交数量</span>
<span><i class="iconfont iconhuijiaochengguo"></i>成果汇交数量</span>
</div>
<div class="enter_box">
<img src="../../assets/images/cghjsl-pie.png" :style="{'height':imgHeight + 'px'}" alt="">
......@@ -251,12 +251,17 @@ export default {
.main {
display: flex;
flex-direction: column;
overflow: scroll;
// overflow: scroll;
height: 100%;
.clearfix {
span {
color: #6d7278;
float: left;
i{
padding-right: 6px;
position: relative;
top: 1px;
}
}
.edit {
color: #9b9b9b;
......@@ -288,8 +293,8 @@ export default {
cursor: pointer;
flex: 1;
img {
width: 68px;
height: 68px;
width: 84px;
height: 84px;
display: block;
margin: 0 auto;
}
......@@ -303,38 +308,38 @@ export default {
color: #fa6400;
font-size: 24px;
position: absolute;
top: -4px;
right: -10px;
top: 3px;
right: -2px;
background: #fff;
border-radius: 10px;
box-sizing: border-box;
padding: 1px;
}
.el-badge{
width: 68px;
height: 68px;
width: 84px;
height: 84px;
display: block;
margin: 0 auto;
/deep/.el-badge__content{
top: 10px;
right: 14px;
top: 18px;
right: 22px;
background-color: #fa6400;
}
}
}
.psr {
width: 68px;
height: 68px;
width: 84px;
height: 84px;
display: block;
margin: 0 auto;
img {
width: 68px;
height: 68px;
width: 84px;
height: 84px;
}
}
}
/deep/ .el-card__body {
padding: 30px 20px;
padding: 14px 20px 22px 20px;
}
}
.notice {
......
......@@ -243,24 +243,7 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
......@@ -291,6 +274,5 @@
padding: 18px 0;
}
}
}
}
</style>
......
......@@ -193,24 +193,7 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
......@@ -250,6 +233,5 @@
margin: 20px auto 0;
width: 230px;
}
}
}
</style>
......
......@@ -103,23 +103,4 @@ export default {
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -72,41 +72,5 @@ export default {
<style scoped lang="less">
.content_box{
padding: 0 0 6px;
// padding: 0 20px;
// .el-tabs{
// width: 100%;
// height: 100%;
// display: flex;
// flex-direction: column;
// }
// /deep/.el-tabs__content{
// width: 100%;
// height: 100%;
// flex:1;
// position: unset;
// }
// .el-tab-pane{
// width: 100%;
// height: 100%;
// }
.el-tabs{
height: calc(100% - 50px);
/deep/ .el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
}
</style>
......
......@@ -441,6 +441,10 @@
type: String,
default: "1",
},
lpbParent:{
type: String,
default: "",
},
},
data () {
return {
......@@ -588,6 +592,9 @@
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
if(this.lpbParent === 'isLpb'){
this.$parent.$parent.loadingData(this.form.zrzbsm,this.form.scyclx);
}
this.getTreeByBsm(this.$store.state.zdbsm,'h','0,1,2')
}
})
......@@ -897,13 +904,20 @@
this.form.qtjzmj=this.form.scqtjzmj;
this.form.ftxs=this.form.scftxs;
}
vm.loadingShow('请求发送中');
updateQjH(this.form).then((res)=>{
vm.loadingHide();
if(res.code===200){
this.$message.success("保存成功！")
console.log(this,"this")
}else {
this.$message.warning(res.message)
}
})
.catch((error) => {
vm.loadingHide();
console.log(error);
});
}else {
this.$message({
// message: item.name+'不能为空',
......@@ -923,6 +937,10 @@
submit(data).then((res)=>{
if(res.code===200){
this.$message.success("提交完成！");
console.log(this.lpbParent,"this.lpbparent")
if(this.lpbParent === 'isLpb'){
this.$parent.$parent.loadingData(this.form.zrzbsm,this.form.scyclx);
}
}else {
this.$message.warning(res.message)
}
......
......@@ -377,7 +377,7 @@
></move-h>
<!-- 双击户的弹出框 -->
<el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="80%" >
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx" :lpbParent="lpbParent"></hbj>
</el-dialog>
<!-- 户重新落宗 -->
<h-cxlz
......@@ -659,6 +659,8 @@ export default {
} else {
//选中→未选中
e.className = "";
this.hbsmList = this.hbsmList.filter(i=>i!=bsm);
this.hqsztList = this.hqsztList.filter(i=>i!=hs.qszt);
switch (this.lpbParent) {
case 'isHbfg':
self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs)
......@@ -891,6 +893,7 @@ export default {
//户合并
handleHb(type){
let olbBsms = '';
console.log(this.fghbChoosedList,'fghbChoosedList');
this.hbsmList.forEach((item,index)=>{
olbBsms+= index<this.hbsmList.length-1? item+',':item
})
......@@ -910,8 +913,9 @@ export default {
"zdybsm": this.fghbChoosedList[0].zdybsm,
"zrzbsm": this.fghbChoosedList[0].zrzbsm
}
// console.log(params,'params');
vm.loadingShow('请求发送中');
hhb(params).then((res) => {
vm.loadingHide();
if(res.code == 200){
Message.success('合并成功');
// 清除选中户
......@@ -923,7 +927,10 @@ export default {
Message.error(res.message);
}
})
.catch(() => {});
.catch((error) => {
vm.loadingHide();
console.log(error);
});
})
.catch(() => {});
}else{
......@@ -936,7 +943,9 @@ export default {
},
//户分割保存
savefgData(){
vm.loadingShow('请求发送中');
hfg(this.fgData).then((res) => {
vm.loadingHide();
if(res.code == 200){
Message.success('分割成功');
// 清除选中户
......@@ -949,7 +958,10 @@ export default {
Message.error(res.message);
}
})
.catch(() => {});
.catch((error) => {
vm.loadingHide();
console.log(error);
});
},
//范围属性变更
handleFwsxbg(){
......@@ -1071,6 +1083,7 @@ export default {
},
watch: {
scyclx(n) {
this.hqsztList = [];
// this.getLpb(this.$store.state.zrzbsm, n);
if(n == '0'){
this.lpbData = this.yclpbData;
......
......@@ -14,7 +14,7 @@
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>自然幢号</td>
<td colspan="4" class="psr">
<input class="formInput percent80" ref="zrzh" @blur="inputBlur($event)" :disabled="disabled" maxlength="24" v-model="form.zrzh">
<input class="formInput percent80" ref="zrzh" @blur="inputBlurZrzh($event)" :disabled="disabled" maxlength="24" v-model="form.zrzh">
<el-button @click.prevent="generatorCode" type="warning" :disabled="disabled" class="createBtn" size="mini">生成</el-button>
</td>
</tr>
......@@ -25,7 +25,7 @@
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td>
<td colspan="4">
<input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" :disabled="disabled" maxlength="28" v-model="form.bdcdyh">
<input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" disabled maxlength="28" v-model="form.bdcdyh">
</td>
</tr>
......@@ -285,7 +285,7 @@
<script>
import Qlr from "@components/formMenu/qlr";
import Qlxz from "@components/formMenu/qlxz";
import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "@api/zrz"
import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm,getHCountByZrzbsm} from "@api/zrz"
import {getQjZdjbxxDetailById} from "@api/zd"
import {submit,registerCall} from "@api/common"
import geoUtils from "@components/lineTree/tx/js/geoUtils";
......@@ -315,6 +315,12 @@
lx:"zrz",
bsm:'',
initZrzh:'',
finishZrzh:'',
hcount:0,
booleanUpdateH:false,
form:{
zrzbsm:'', //自然幢标识码
zdbsm:'', //宗地标识码
......@@ -360,6 +366,7 @@
glbsm:'', //关联标识码
sx:'', //顺序
}],
booleanUpdateH:false,
},
value: '',
ytTitleRowspan:1, //用途的单元格垂直合并数量
......@@ -467,6 +474,10 @@
}
},
onSave(){
//保存之前的自然幢号，用于判断该自然幢的不动产单元号是否更改，是否更改其下户的不动产单元号
this.finishZrzh = this.form.zrzh;
this.form.booleanUpdateH =this.booleanUpdateH;
//判断自然幢号和不动产单元号是否手动修改过（自然幢号和不动产单元号的前19位是否和宗地代码一致）
console.log(this.form,'this.form');
//给校验项赋值
......@@ -554,7 +565,9 @@
type: "warning",
});
}else{
vm.loadingShow('请求发送中');
saveZrzInfo(this.form).then((res)=>{
vm.loadingHide();
if(res.code===200){
this.$message.success("保存完成！")
this.getZrzDetailByBsm(this.$route.query.bsm)
......@@ -566,6 +579,10 @@
}
this.loading=false;
})
.catch((error) => {
vm.loadingHide();
console.log(error);
});
this.loading=false;
this.saveGraphicAttributes(); }
}else{
......@@ -614,6 +631,7 @@
})
},
open() {
const self = this;
this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -623,6 +641,16 @@
.then((res)=>{
this.form.zrzh=res.result.substring(0,24);
this.form.bdcdyh=res.result;
console.log(self.initZrzh,self.hcount,"self")
if(self.initZrzh != null && self.initZrzh !== '' && self.hcount>0){
self.booleanUpdateH =true;
self.$notify({
title: '提示',
message: '修改自然幢号，可能会影响该自然幢下户的不动产单元号的重新生成！',
duration: 0,
type: 'warning'
});
}
});
this.$message({
type: 'success',
......@@ -636,6 +664,7 @@
});
},
generatorCode(){
const self = this;
console.log(this.form,'this.form');
if((this.form.zrzh!=null&&this.form.zrzh!=='')||(this.form.bdcdyh!=null&&this.form.bdcdyh!=='')){
this.open();
......@@ -643,8 +672,18 @@
}
getBdcdyh(this.form.zddm,"zrz")
.then((res)=>{
this.form.zrzh=res.result.substring(0,24);
this.form.bdcdyh=res.result;
self.form.zrzh=res.result.substring(0,24);
self.form.bdcdyh=res.result;
console.log(self.initZrzh,self.hcount,"self")
if(self.initZrzh != null && self.initZrzh !== '' && self.hcount>0){
self.booleanUpdateH =true;
self.$notify({
title: '提示',
message: '修改自然幢号，可能会影响该自然幢下户的不动产单元号的重新生成！',
duration: 0,
type: 'warning'
});
}
})
},
......@@ -681,6 +720,8 @@
}else {
this.disabled = true
}
//初始化的自然幢号，用于判断该自然幢的不动产单元号是否更改，是否更改其下户的不动产单元号
this.initZrzh = res.result.zrzh;
this.$store.state.zrzh = res.result.zrzh;
if(this.form.fwjgList.length===0){
this.form.fwjgList.push({
......@@ -734,6 +775,27 @@
e.target.style.boxSizing = 'border-box';
}
},
inputBlurZrzh(e){
if(this.initZrzh != null && this.initZrzh !== ''&& e.target.value !==''&& this.hcount>0){
if(this.initZrzh !== e.target.value){
this.booleanUpdateH =true;
this.$notify({
title: '提示',
message: '修改自然幢号，可能会影响该自然幢下户的不动产单元号的重新生成！',
duration: 0,
type: 'warning'
});
}else {
this.booleanUpdateH =false;
}
}
if(e.target.value!=''){
e.target.style.border=""
}else{
e.target.style.border="1px solid red";
e.target.style.boxSizing = 'border-box';
}
}
},
created(){
//todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来；
......@@ -753,6 +815,11 @@
}
},
mounted() {
getHCountByZrzbsm(this.$route.query.bsm).then((res)=>{
if(res.code === 200){
this.hcount = res.result;
}
});
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
......@@ -773,8 +840,9 @@
}
},
"form.zrzh":function (val) {
if (val != '') {
if (val != ''&&val != null) {
this.$refs.zrzh.style.border = '';
this.form.bdcdyh = val+"0000";
}
},
"form.fwxzbsm":{
......