0aa8e66a by 杨威

修改获取楼盘表数据接口,实预测类型转换时改变楼盘表数据源

1 parent 537ea1cd
......@@ -44,13 +44,13 @@ export function insertChInfo (data) {
/**
* 查询楼盘表数据
*/
export function getLpb (data) {
export function getLpb (data,lx) {
return request({
url: 'fw/lpb/getLpb',
method: 'get',
params: {
zrzbsm:data,
syclx:0,
syclx:lx,
},
})
}
......
......@@ -3,7 +3,7 @@
<div class="tab-header">
<el-row class="searchContent">
<el-col :span="8">
<el-radio-group v-model="tabPosition">
<el-radio-group v-model="syclx">
<el-radio-button label="1">实测</el-radio-button>
<el-radio-button label="0">预测</el-radio-button>
</el-radio-group>
......@@ -299,7 +299,7 @@ export default {
plzlVisible: false,
hbjVisible: false,
hcxlzVisible:false,
tabPosition: "1", //1是实测 0是预测
syclx: "1", //1是实测 0是预测
radio1: "",
radio2: "",
createFlag: false,
......@@ -414,7 +414,7 @@ export default {
},
lodding(){
let zrzbsm=this.$store.state.zrzbsm;
this.$refs.lpbContent.getLpb(zrzbsm);
this.$refs.lpbContent.getLpb(zrzbsm,this.syclx);
},
hcxlzClose() {
this.hcxlzVisible = false;
......@@ -534,7 +534,7 @@ export default {
},
//户保存
hbjSaveInfo() {
this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.syclx);
},
//户编辑表单重置
hbjResetInfo() {
......@@ -542,7 +542,7 @@ export default {
},
//调用楼盘表信息查询接口
getlpbData() {
this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm);
this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm,this.syclx);
//改变楼盘表子组件的key值,重新渲染
this.time = new Date().getTime();
},
......
......@@ -132,7 +132,7 @@ export default {
},
created() {},
mounted() {
this.getLpb(this.$store.state.zrzbsm);
this.getLpb(this.$store.state.zrzbsm,this.$parent.syclx);
setTimeout(() => {
//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
......@@ -145,15 +145,15 @@ export default {
},
methods: {
//获取楼盘表数据
getLpb(zrzbsm) {
getLpb(zrzbsm).then((res) => {
getLpb(zrzbsm,syclx) {
getLpb(zrzbsm,syclx).then((res) => {
if (res.code == 200) {
this.loading = false;
this.lpbData = res.result == null ? this.lpbData : res.result;
setTimeout(() => {
this.$nextTick(()=>{
//渲染楼盘表
this.dataChange();
}, 200);
})
} else {
this.$message({
message: res.message,
......@@ -172,12 +172,13 @@ export default {
//自然幢下元素高度宽度计算
dataChange() {
//计算逻辑幢宽度 20为marginRight值
this.ljzWidth -= 9980;
this.ljzWidth = 20;
if (this.$refs.ljz != undefined) {
this.$refs.ljz.forEach((item) => {
this.ljzWidth += item.offsetWidth + 20;
});
} else {
}
//计算独立幢单元和独立层户宽度
//考虑this.$refs.zdy的length为0的情况,即自然幢下没有独立幢单元
......@@ -186,7 +187,7 @@ export default {
let higher = true;
//记录最高的幢单元高度 默认为第一个幢单元高度
let highest = this.$refs.zdy[0].offsetHeight;
this.zdyWidth -= 980;
this.zdyWidth = 20;
this.$refs.zdy.forEach((item) => {
this.zdyWidth += item.offsetWidth + 21;
this.cHeight =
......@@ -335,8 +336,14 @@ export default {
legendToggleFlagChange() {
return this.$parent.legendToggleFlag;
},
syclx(){
return this.$parent.syclx
}
},
watch: {
syclx(n){
this.getLpb(this.$store.state.zrzbsm,n)
},
createFlagChange: function(val) {
setTimeout(() => {
this.lpbContentWidth = this.$refs.lpbContent.offsetWidth - 6;
......