Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
2b0e39e4 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 68439839 f5b39578
Inline Side-by-side
Showing 14 changed files with 205 additions and 40 deletions
......@@ -303,3 +303,18 @@ ol, ul { list-style:none; }
.iconbanli,.icondingwei{
font-size: 18px;
}
//实预测转换按钮样式
/deep/.el-radio-button__inner {
border: 1px solid #3fa2e1!important;
color: #3fa2e1;
}
/deep/.el-radio-button__inner:hover {
color: #3fa2e1;
}
/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;
}
\ No newline at end of file
......
......@@ -716,7 +716,7 @@
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
this.$nextTick(()=>{
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 54;
this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
this.$refs.lpbContent.hbsmList.push(this.hbsm)
})
......@@ -745,7 +745,6 @@
padding:20px;
//background-color: #eaedf5;
background-color: rgb(245, 250, 254);
.box{
background-color: white;
padding: 10px 0;
......@@ -787,7 +786,7 @@
margin-top: 20px;
background-color: #ffffff;
display: flex;
overflow-y: scroll;
border: 1px solid #E6E6E6;
.lp-overview {
transition: 0.5s;
flex: 1;
......@@ -824,6 +823,7 @@
.fwyt {
cursor: pointer;
border-bottom: 1px solid #e6e6e6;
border-left: 1px solid #e6e6e6;
span {
text-align: center;
height: 100%;
......
......@@ -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>
......
......@@ -19,7 +19,16 @@
export default {
name:"",
components:{},
props:{},
props:{
bsm: {
type: String,
default: "",
},
type: {
type: String,
default: "",
},
},
data(){
insertCss(`
.g6-tooltip {
......@@ -189,8 +198,8 @@ export default {
getLshsData(){
let _this = this;
const data = {
"bsm": this.$store.state.zdbsm,
"type": "zd"
"bsm": this.bsm,
"type": this.type
};
getLshs(data).then((res)=>{
if(res.code===200){
......
......@@ -3,7 +3,7 @@
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
</el-tabs>
......@@ -27,6 +27,8 @@
isDisabled:false,
activeName: "dzxx",
dzJbxxVisble:true,
lshsVisible:false,
type:'dz',
fjclVisible:false
};
},
......
<template>
<div class="lshs-content">
<Lshs></Lshs>
<Lshs :type="type" :bsm="bsm"></Lshs>
</div>
</template>
......@@ -11,7 +11,16 @@
export default {
name:"",
components:{Lshs},
props:{},
props:{
bsm: {
type: String,
default: "",
},
type: {
type: String,
default: "",
},
},
data(){
return {
data : {}
......
......@@ -346,6 +346,8 @@ export default {
(document.documentElement.clientHeight ||
document.body.clientHeight) - 332;
this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 220;
console.log((document.documentElement.clientWidth || document.body.clientWidth) ,'(document.documentElement.clientWidth || document.body.clientWidth) ');
this.lpbContentwidth = (document.documentElement.clientWidth || document.body.clientWidth) - 380;
});
},
methods: {
......@@ -540,7 +542,7 @@ export default {
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
this.$nextTick(()=>{
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 54;
})
}
},
......@@ -551,6 +553,9 @@ export default {
selectedZt(n){
this.legendToggleFlag = true;
},
lpbContentwidth(n){
console.log(n,'lpbContentwidth');
}
},
};
</script>
......@@ -677,7 +682,7 @@ table:hover {
margin-top: 20px;
background-color: #ffffff;
display: flex;
overflow-y: scroll;
border: 1px solid #E6E6E6;
.lp-overview {
transition: 0.5s;
flex: 1;
......@@ -714,6 +719,7 @@ table:hover {
.fwyt {
cursor: pointer;
border-bottom: 1px solid #e6e6e6;
border-left: 1px solid #e6e6e6;
span {
text-align: center;
height: 100%;
......
<template>
<div class="main">
<div class="main1">
<el-row v-show="isSearch">
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
......@@ -531,6 +531,7 @@ export default {
if (!n) {
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 54;
// console.log(this.$refs.lpbContentWrap.clientWidth,'lpbContentWrap');
// this.$nextTick(()=>{
// this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
......@@ -548,7 +549,12 @@ export default {
}
</script>
<style scoped lang="less">
.main{
.main1{
width: 100%;
height: 100%;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: 20px;
.el-row{
box-sizing: border-box;
padding-left: 2px;
......@@ -560,6 +566,7 @@ export default {
.lpb{
box-sizing: border-box;
padding-left: 2px;
.searchInput {
transition: 0.5s;
margin-left: 20px;
......@@ -569,7 +576,7 @@ export default {
margin-top: 20px;
background-color: #ffffff;
display: flex;
overflow-y: scroll;
border: 1px solid #E6E6E6;
.lp-overview {
transition: 0.5s;
flex: 1;
......@@ -606,6 +613,7 @@ export default {
.fwyt {
cursor: pointer;
border-bottom: 1px solid #e6e6e6;
border-left: 1px solid #e6e6e6;
span {
text-align: center;
height: 100%;
......
......@@ -10,7 +10,7 @@
<jzx v-if="jzxVisible" :is-disabled="isDisabled"></jzx>
</el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl">
<fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
</el-tabs>
......@@ -42,6 +42,7 @@ export default {
djbVisible:false,
lshsVisible:false,
fjclVisible:false,
type:'zd'
};
},
methods: {
......
<template>
<div class="lshs-content">
<Lshs></Lshs>
<Lshs :type="type" :bsm="bsm"></Lshs>
</div>
</template>
......@@ -11,7 +11,16 @@
export default {
name:"",
components:{Lshs},
props:{},
props:{
bsm: {
type: String,
default: "",
},
type: {
type: String,
default: "",
},
},
data(){
return {
data : {}
......
......@@ -5,7 +5,7 @@
<el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
<el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
</el-tabs>
</div>
......@@ -31,6 +31,8 @@ export default {
activeName: "zrzxx",
lpbLoad:false, //默认不加载楼盘表组件
yzgyLoad:false,
lshsVisible:false,
type:'zrz',
};
},
methods: {
......@@ -52,6 +54,9 @@ export default {
if(!this.yzgyLoad){
this.yzgyLoad = tab.name == 'yzgy' ? true : false
}
if(tab.name === 'lshs'){
this.lshsVisible = true;
}
},
},
created() {},
......
......@@ -871,20 +871,6 @@ export default {
margin-left: 62px;
box-sizing: border-box;
padding: 0 20px;
/deep/.el-radio-button__inner {
border: 1px solid #00cacd;
color: #00cacd;
}
/deep/.el-radio-button__inner:hover {
color: #00cacd;
}
/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;
}
.searchInput {
transition: 0.5s;
margin-left: 20px;
......@@ -979,6 +965,7 @@ export default {
.fwyt {
cursor: pointer;
border-bottom: 1px solid #e6e6e6;
border-left: 1px solid #e6e6e6;
span {
text-align: center;
height: 100%;
......
......@@ -17,7 +17,7 @@
<tr height="30">
<td colspan="2" align="center">逻辑幢号</td>
<td colspan="4">
<el-input v-model="form.ljzh"></el-input>
<input class="formInput" ref="ljzh" @blur="inputBlur($event)" v-model="form.ljzh" />
</td>
<td colspan="2" align="center">自然幢号</td>
<td colspan="4">
......@@ -27,7 +27,7 @@
<tr height="30">
<td colspan="2" align="center">逻辑幢名称</td>
<td colspan="4">
<el-input v-model="form.ljzmc"></el-input>
<input class="formInput" ref="ljzmc" @blur="inputBlur($event)" v-model="form.ljzmc" />
</td>
<td colspan="2" align="center">建筑物状态</td>
<td colspan="4">
......@@ -137,7 +137,7 @@
</td>
<td colspan="9">
<el-select-tree style="width:100%"
ref="yt"
ref="fwjg"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -214,6 +214,8 @@ export default {
label: 'mc'
},
rules:[],
form: {
zrzbsm: "",
ljzh: "", //逻辑幢号
......@@ -253,6 +255,16 @@ export default {
};
},
methods: {
inputBlur(e){
if(e.target.value!=''){
e.target.style.border=""
}else{
e.target.style.border="1px solid red";
e.target.style.boxSizing = 'border-box';
}
},
addYtInfo() {
this.form.ytList.push({
glbsm: "",
......@@ -330,8 +342,60 @@ export default {
}
},
onSave(data, bsm) {
this.rules=[
{
data:this.form.ljzh,
name:'自然幢号',
dom:this.$refs.ljzh,
rule: /^\s*$/g, //非空
},
{
data:this.form.ljzmc,
name:'不动产单元号',
dom:this.$refs.ljzmc,
rule: /^\s*$/g, //非空
},
];
this.form.ytList.forEach((item,index)=>{
this.rules.push(
{
data:item.fwytzdbsm,
name:'用途',
dom:this.$refs.yt[index],
rule: /^\s*$/g, //非空
},
)
});
this.form.fwjgList.forEach((item,index)=>{
this.rules.push(
{
data:item.fwjgzdbsm,
name:'房屋结构',
dom:this.$refs.fwjg[index],
rule: /^\s*$/g, //非空
},
)
});
//自然幢标识码
this.form.zrzbsm = bsm;
let flag = true;
this.rules.forEach(item=>{
if(item.rule.test(item.data) || item.data == null){
if(item.dom.$el){
item.dom.$el.style.border = '1px solid red';
item.dom.$el.style.boxSizing = 'border-box';
}else{
item.dom.style.border = '1px solid red';
item.dom.style.boxSizing = 'border-box';
}
flag = false;
return false
}
})
this.$nextTick(()=>{
if (flag && this.$refs.qlxzModule.getRulesResult()) {
if(this.ljzbsm == ''){
insertLjzInfo(this.form).then((res) => {
if (res.code === 200) {
......@@ -354,6 +418,9 @@ export default {
}
})
}
}
})
},
onSubmit() {
// console.log(this.form);
......@@ -411,6 +478,40 @@ export default {
this.form.zrzh = this.$store.state.zrzh;
},
watch:{
"form.ljzh":function (val) {
if (val != '') {
this.$refs.ljzh.style.border = '';
}
},
"form.ljzmc":function (val) {
if (val != '') {
this.$refs.ljzmc.style.border = '';
}
},
"form.ytList": {
handler : function (newVal, oldVal) {
newVal.forEach((item,ind)=>{
if(item.fwytzdbsm != ''){
this.$refs.yt[ind].$el.style.border=""
}
})
},
deep:true
},
"form.fwjgList": {
handler : function (newVal, oldVal) {
newVal.forEach((item,ind)=>{
if(item.fwjgzdbsm != ''){
this.$refs.fwjg[ind].$el.style.border=""
}
})
},
deep:true
},
ljzbsm: {
handler: function (item) {
console.log(item,'item');
......@@ -453,6 +554,7 @@ export default {
//bgcolor:#F1F4FC;
background-color: #fff;
width: 8.33%;
height: 36px
}
.el-select {
......
<template>
<div class="">历史回溯</div>
<div class="">
<Lshs :type="type" :bsm="bsm"></Lshs>
</div>
</template>
<script>
import Lshs from '@components/lshs/index';
export default {
name:"",
components:{},
props:{},
components:{Lshs},
props:{
bsm: {
type: String,
default: "",
},
type: {
type: String,
default: "",
},
},
data(){
return {
}
......