Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
aa763fa0 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents b674603f ce37300c
Inline Side-by-side
Showing 4 changed files with 117 additions and 57 deletions
......@@ -2,6 +2,7 @@ import store from '../../store/index'
import axios from 'axios'
import router from '../../router'
import {Message, MessageBox} from 'element-ui'
import { Loading } from 'element-ui';
import {httpStatus} from '@/api/config'
// 创建一个 axios 实例
......@@ -16,11 +17,17 @@ const service = axios.create({
})
function errorLog() {
//请求完成关闭loading
// this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
// });
MessageBox.alert('报错了请联系管理员', '消息提示', {
confirmButtonText: '确定',
type: 'warning'
})
}
//定义loading
let loadingInstance = null
// 请求拦截器
service.interceptors.request.use(
......@@ -29,6 +36,13 @@ service.interceptors.request.use(
// const token = util.cookies.get('token')
// 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
// config.headers['authkey'] = token
//请求发送成功显示loading
loadingInstance = Loading.service({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.5)'
});
return config
},
error => {
......@@ -43,6 +57,10 @@ service.interceptors.response.use(
// dataAxios 是 axios 返回数据中的 data
const dataAxios = response.data
const {code} = dataAxios
//请求完成关闭loading
// this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
// });
// 根据 code 进行判断
if (code === undefined) {
// 如果没有 code 代表这不是项目后端开发的接口 比如可能是 D2Admin 请求最新版本
......
......@@ -37,7 +37,7 @@ export default {
},
created() {},
mounted() {
this.$store.state.contentWidth = this.$refs.lpb.offsetWidth - 40;
this.$store.state.contentWidth = this.$refs.lpb.offsetWidth - 37;
},
computed: {},
watch: {},
......
......@@ -22,7 +22,7 @@
<!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
<td colspan="4" >
<el-input v-model="form.bdcdyh" style="width: 70%" disabled></el-input>
<el-button @click.prevent="" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
<el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
</td>
<td colspan="2" align="center" >原不动产单元</td>
<td colspan="4" >
......@@ -376,7 +376,8 @@
<script>
import Qlr from "./../../../../../components/formMenu/qlr";
import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h"
import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
import {getBdcdyh} from "./../../../../../api/zrz"
export default {
name:'zrz',
components:{
......@@ -519,32 +520,35 @@
if(res.code===200){
this.form = res.result;
if(this.form.scyclx==='0'){
this.form.ycjzmj = this.form.jzmj;
this.form.yctnjzmj=this.form.tnjzmj;
this.form.ycftjzmj=this.form.ftjzmj;
this.form.ycdxbfjzmj=this.form.dxbfjzmj;
this.form.ycqtjzmj=this.form.qtjzmj;
this.form.ycftxs=this.form.ftxs;
this.form.scjzmj = this.form.gljzmj;
this.form.sctnjzmj=this.form.gltnjzmj;
this.form.scftjzmj=this.form.glftjzmj;
this.form.scdxbfjzmj=this.form.gldxbfjzmj;
this.form.scqtjzmj=this.form.glqtjzmj;
this.form.scftxs=this.form.glftxs;
this.$set(this.form,"ycjzmj", this.form.jzmj)
this.$set(this.form,"yctnjzmj", this.form.tnjzmj)
this.$set(this.form,"ycftjzmj", this.form.ftjzmj)
this.$set(this.form,"ycdxbfjzmj", this.form.dxbfjzmj)
this.$set(this.form,"ycqtjzmj", this.form.qtjzmj)
this.$set(this.form,"ycftxs", this.form.ftxs)
this.$set(this.form,"scjzmj", this.form.gljzmj)
this.$set(this.form,"sctnjzmj", this.form.gltnjzmj)
this.$set(this.form,"scftjzmj", this.form.glftjzmj)
this.$set(this.form,"scdxbfjzmj", this.form.gldxbfjzmj)
this.$set(this.form,"scqtjzmj", this.form.gltjzmj)
this.$set(this.form,"scftxs", this.form.glftxs)
}else if(this.form.scyclx==='1'){
this.form.scjzmj = this.form.jzmj;
this.form.sctnjzmj=this.form.tnjzmj;
this.form.scftjzmj=this.form.ftjzmj;
this.form.scdxbfjzmj=this.form.dxbfjzmj;
this.form.scqtjzmj=this.form.qtjzmj;
this.form.scftxs=this.form.ftxs;
this.form.ycjzmj = this.form.gljzmj;
this.form.yctnjzmj=this.form.gltnjzmj;
this.form.ycftjzmj=this.form.glftjzmj;
this.form.ycdxbfjzmj=this.form.gldxbfjzmj;
this.form.ycqtjzmj=this.form.glqtjzmj;
this.form.ycftxs=this.form.glftxs;
this.$set(this.form,"scjzmj", this.form.jzmj)
this.$set(this.form,"sctnjzmj", this.form.tnjzmj)
this.$set(this.form,"scftjzmj", this.form.ftjzmj)
this.$set(this.form,"scdxbfjzmj", this.form.dxbfjzmj)
this.$set(this.form,"scqtjzmj", this.form.qtjzmj)
this.$set(this.form,"scftxs", this.form.ftxs)
this.$set(this.form,"ycjzmj", this.form.gljzmj)
this.$set(this.form,"yctnjzmj", this.form.gltnjzmj)
this.$set(this.form,"ycftjzmj", this.form.glftjzmj)
this.$set(this.form,"ycdxbfjzmj", this.form.gldxbfjzmj)
this.$set(this.form,"ycqtjzmj", this.form.gltjzmj)
this.$set(this.form,"ycftxs", this.form.glftxs)
}
console.log("=============")
console.log(this.form)
if(res.result.fwytList.length===0){
this.form.fwytList.push({
glbsm:'', //关联标识码
......@@ -649,6 +653,13 @@
onReset(){
},
generatorCode(){
getBdcdyh(this.form.zrzh,"h")
.then((res)=>{
this.form.zrzh=res.result.substring(0,24);
this.form.bdcdyh=res.result;
})
},
}
}
</script>
......
......@@ -4,26 +4,28 @@
<div :class="(lpbData.cs.length == 0 && lpbData.zdys.length == 0) ? 'bottom40 ljz-wrap':'ljz-wrap'" :style="{'width':ljzWidth+'px'}" v-show="lpbData.ljzs.length>0">
<!-- 循环逻辑幢数据 -->
<div class="ljz" ref="ljz" v-for="(ljzs,ljzIndex) in lpbData.ljzs" :key="ljzIndex">
<div class="ljz-zdy-wrap" >
<div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}">
<!-- 循环逻辑幢下的幢单元 -->
<div class="ljz-zdy" v-show="ljzs.zdys.length>0" v-for="(zdys,zdyIndex) in ljzs.zdys" :key="zdyIndex">
<div class="ljz-zdy" :style="{'min-height':ljzzdyHeight+40+'px'}" ref="ljzzdy" v-show="ljzs.zdys.length>0" v-for="(zdys,zdyIndex) in ljzs.zdys" :key="zdyIndex" >
<!-- 循环幢单元下的层户 -->
<table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
<tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}层</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td>
</tr>
</table>
<!-- <div class="chTable-wrap"> -->
<table class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
<tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}层</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.hh}}</td>
</tr>
</table>
<!-- </div> -->
<!-- 幢单元名称 -->
<div class="zdy-name name">
{{zdys.zdymc}}
</div>
</div>
<!-- 循环逻辑幢下的层户 -->
<div class="ljz-ch" v-if="ljzs.cs.length>0">
<table class="chTable" border="1" cellspacing="0" cellpadding="0">
<div class="ljz-ch" :style="{'min-height':ljzzdyHeight+40+'px'}" v-if="ljzs.cs.length>0">
<table class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0">
<tr v-for="(cs) in ljzs.cs" :key="cs.bsm">
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}层</td>
......@@ -98,8 +100,10 @@ export default {
lpbContentWidth: "",
ljzWidth:10000,
zdyWidth:1000,
cHeight:0,
zdyHeight:0,
cHeight:0, //独立层户的div高度
zdyHeight:0, //独立幢单元的div高度
ljzcHeight:0, //逻辑幢下层户的div高度
ljzzdyHeight:0, //逻辑幢下幢单元的div高度
loading:true,
hbsmList:[],
time:null, //区分单双击事件的定时器
......@@ -108,13 +112,13 @@ export default {
created() {
},
mounted() {
this.getLpb(this.$store.state.zrzbsm);
setTimeout(() => {
//lp-overview宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
this.lpbContentWidth = this.$store.state.contentWidth - 34 - 1 - 20;
//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
//让滚动条滚动至最下面 -6是横向滚动条的高度
this.$refs.lpbContent.scrollTop = this.$refs.lpbContent.scrollHeight - this.$refs.lpbContent.clientHeight -6;
}, 100);
this.getLpb(this.$store.state.zrzbsm);
this.$refs.lpbContent.scrollTop = this.$refs.lpbContent.scrollHeight - this.$refs.lpbContent.clientHeight - 6;
}, 200);
},
methods: {
//获取楼盘表数据
......@@ -167,12 +171,33 @@ export default {
this.zdyHeight = higher ? highest : this.$refs.ch.offsetHeight
this.zdyWidth += this.$refs.ch.offsetWidth;
}else{
higher = highest;
this.zdyHeight = highest;
}
}else{
// this.zdyWidth = 124;
}
//计算逻辑幢下的幢单元和层户的高度
if(this.$refs.ljzzdy != undefined && this.$refs.ljzzdy.length > 0){
//判断自然幢下有没有比层户高的幢单元
let higher = true;
//记录最高的幢单元高度 默认为第一个幢单元高度
let highest = this.$refs.ljzzdy[0].offsetHeight;
this.$refs.ljzzdy.forEach(item=>{
this.ljzcHeight = item.offsetHeight > this.ljzcHeight ? item.offsetHeight : this.ljzcHeight;
highest = highest > item.offsetHeight ? highest:item.offsetHeight;
})
//判断有无独立层户
if(this.$refs.ljzch != undefined){
//计算自然幢下的幢单元高度，如果有比层户高的幢单元，则幢单元高度设为最高的幢单元高度，如果没有，则设为层户高度
higher = highest > this.$refs.ljzch.offsetHeight ? true:false;
this.ljzzdyHeight = higher ? highest : this.$refs.ljzch.offsetHeight
}else{
this.ljzzdyHeight = highest;
}
}else{
// this.zdyWidth = 124;
}
},
//户单击事件
handleTdClick(e,bsm){
......@@ -258,18 +283,30 @@ export default {
.ljz-zdy{
height: auto;
margin-right: 20px;
display: inline-table;
float: left;
position: relative;
.zdy-name{
width: 100%;
bottom: 0;
position: absolute;
height: 40px;
background-color: rosybrown;
}
// .chTable-wrap{
// position: absolute;
// bottom: 40px;
// }
}
.ljz-ch{
display: inline-table;
float: left;
}
.ljz-zdy:last-child{
margin-right: 0;
}
.column-reverse{
display:flex;
flex-direction: column-reverse;
}
}
.ljz-name{
width: 100%;
......@@ -299,7 +336,7 @@ export default {
margin-right: 20px;
display: inline-table;
.zdy-name{
height: 40px;
bottom: 0;
background-color: blanchedalmond;
}
}
......@@ -318,15 +355,10 @@ export default {
flex-direction: column-reverse;
}
}
// .ch-wrap {
// width: 800px;
// height: 200px;
// margin-bottom: 60px;
// background-color: rgb(165, 136, 62);
// }
// 公共部分样式 start
.chTable{
position: relative;
tr{
.floor{
background-color: blanchedalmond;
......@@ -337,7 +369,6 @@ export default {
line-height: 64px;
text-align: center;
cursor: pointer;
}
.tdSelect{
border: 1px solid #0091FF!important;
......