Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
9c222fd6 by 任超
Options

style:楼盘表

1 parent 83f1fbe2
Expand all
Inline Side-by-side
Showing 21 changed files with 124 additions and 83 deletions
......@@ -13,10 +13,9 @@ export function getLpZrz (data) {
}
// 获取楼盘表
export function getLpb (params) {
export function getLpb (zrzbsm) {
return request({
url: SERVER.SERVERAPI + '/rest/zhcx/lpcx/getLpb/',
method: 'get',
params
url: SERVER.SERVERAPI + '/rest/zhcx/lpcx/getLpb?zrzbsm=' + zrzbsm,
method: 'get'
})
}
......
......@@ -65,8 +65,8 @@
<el-table-column prop="dh" label="联系电话" align="center">
</el-table-column>
</el-table>
<el-dialog v-dialogDrag :close-on-click-modal="false" title="权利人信息" :visible.sync="dialogVisible"
custom-class="insetDialog" append-to-body width="50%">
<el-dialog :close-on-click-modal="false" title="权利人信息" :visible.sync="dialogVisible" custom-class="insetDialog"
append-to-body width="50%">
<el-form :model="formData" class="qlrForm">
<table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
<tr>
......
<template>
<el-dialog v-dialogDrag :close-on-click-modal="false" title="户重新落宗" :visible.sync="isVisible" width="50%"
@close="close" :modal-append-to-body="false">
<el-dialog :close-on-click-modal="false" title="户重新落宗" :visible.sync="isVisible" width="50%" @close="close"
:modal-append-to-body="false">
<div class="content">
<table>
<tr>
......@@ -59,7 +59,7 @@
import { Message } from 'element-ui'
export default {
name: "hCxlz",
components: { zdQueryData },
// components: { zdQueryData },
data () {
return {
zd: {},
......
<template>
<div>
<el-dialog v-dialogDrag :close-on-click-modal="false" title="移动户" :visible.sync="isVisible" width="50%"
@close="close" :modal-append-to-body="false">
<el-dialog :close-on-click-modal="false" title="移动户" :visible.sync="isVisible" width="50%" @close="close"
:modal-append-to-body="false">
<div>
<div class="bottom-radio">
<el-radio-group v-model="moveHdata.sxzylx">
......
<template>
<div>
<el-dialog v-dialogDrag :close-on-click-modal="false" title="批量层" :visible.sync="isVisible" width="50%"
@close="close" :modal-append-to-body="false">
<el-dialog :close-on-click-modal="false" title="批量层" :visible.sync="isVisible" width="50%" @close="close"
:modal-append-to-body="false">
<div>
<table border="1">
<tr>
......
<template>
<div>
<el-dialog v-dialogDrag :close-on-click-modal="false" title="批量户" :visible.sync="isVisible" width="72%"
@close="close" :modal-append-to-body="false">
<el-dialog :close-on-click-modal="false" title="批量户" :visible.sync="isVisible" width="72%" @close="close"
:modal-append-to-body="false">
<div>
<table border="1">
<tr>
......
<template>
<div class="">
<el-dialog v-dialogDrag :close-on-click-modal="false" title="批量室号" :visible.sync="isVisible" width="50%"
@close="close" :modal-append-to-body="false">
<el-dialog :close-on-click-modal="false" title="批量室号" :visible.sync="isVisible" width="50%" @close="close"
:modal-append-to-body="false">
<div>
<table border="1">
<tr>
......
<template>
<div>
<el-dialog v-dialogDrag :close-on-click-modal="false" title="批量坐落" :visible.sync="isVisible" width="60%"
@close="close" :modal-append-to-body="false">
<el-dialog :close-on-click-modal="false" title="批量坐落" :visible.sync="isVisible" width="60%" @close="close"
:modal-append-to-body="false">
<div>
<table border="1">
<tr>
......
......@@ -18,11 +18,17 @@ router.beforeEach(async (to, from, next) => {
}
if (hasAddRoute) {
next()
// next({ ...to, replace: true })
} else {
const { result: getMenuData } = await getMenuInfo()
const accessRoutes = await store.dispatch('permission/generateRoutes', getMenuData)
router.addRoutes([...accessRoutes, { path: '*', redirect: '/404', hidden: true }])
next({ ...to, replace: true })
const routeTo = Cookies.get('routerTo')
if (routeTo) {
next(routeTo)
} else {
next('/home')
}
}
NProgress.done()
......
......@@ -21,13 +21,13 @@ export const constantRoutes = [
]
},
{
path: '/',
path: '/404',
component: Layout,
hidden: true,
redirect: '/404',
redirect: '/404/index',
children: [
{
path: '404',
path: '/index',
component: () => import('@/views/error-page/404'),
name: '404',
meta: { title: '404' }
......
const state = {
contentWidth: ''
}
const mutations = {
}
const actions = {
}
export default {
namespaced: true,
state,
mutations,
actions
}
import store from '../index'
import router, { resetRouter } from '@/router'
import { Message } from "element-ui";
import Cookies from 'js-cookie';
const state = {
name: Cookies.get('username'),
......
......@@ -21,7 +21,9 @@ import hbj from "../index"
export default {
name: "index",
components: {
hbj, djb, fjcl
hbj,
// djb,
// fjcl
},
props: {
bsm: String, //户标识码
......
......@@ -47,8 +47,7 @@
<i class="iconfont iconloupanbiaobianji" v-show="!bjztFlag" @click="bjztChange" title="编辑楼盘"></i>
</div>
</div> -->
<div class="tab-content" ref="tabContent" :style="{ height: lpbContentHight + 'px' }" v-loading="lpbloading"
v-show="bjztFlag">
<div class="tab-content" ref="tabContent" :style="{ height: lpbContentHight + 'px' }" v-show="bjztFlag">
<!-- 左侧树结构 -->
<!-- <div class="lp-tree" :class="createFlag ? 'w260' : 'w0'">
<LineTree :pd="pd" class="treeData" :islpb="islpb" @loading="loading"></LineTree>
......@@ -58,7 +57,7 @@
</div> -->
<!-- 楼盘表主体 -->
<div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
<lpbContent ref="lpbContent" :zrzbsm="$route.query.bsm" :key="time"></lpbContent>
<lpbContent ref="lpbContent" :zrzbsm="formData.bsm" :key="time"></lpbContent>
</div>
<!-- 右侧图例 -->
<div class="lp-legend">
......@@ -158,7 +157,7 @@
<!-- 详细信息 -->
<!-- <xxxx v-show="!bjztFlag"></xxxx> -->
<!-- 右键菜单弹出框 根据菜单类型（menuType）和右键点击的楼盘类型（treeData.type）来区分弹框内容 -->
<!-- <el-dialog v-dialogDrag :close-on-click-modal="false" :title="taskTitle" :visible.sync="dialogVisible" width="50%">
<!-- <el-dialog :close-on-click-modal="false" :title="taskTitle" :visible.sync="dialogVisible" width="50%">
<div class="addCh" v-if="menuType == 'ljz'">
<addLjz ref="ljz" :ljzbsm="curBsm"></addLjz>
</div>
......@@ -182,7 +181,7 @@
<pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl>
<pl-c :plc-visible="plcVisible" :bsms="cbsmList" @close="plcClose" @lodding="lodding"></pl-c>
<pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh>
<el-dialog v-dialogDrag :close-on-click-modal="false" title="批量上传" :visible.sync="uploadVisible" width="30%">
<el-dialog :close-on-click-modal="false" title="批量上传" :visible.sync="uploadVisible" width="30%">
<div class="wrap">
<div class="main-button">
<el-upload class="upload-demo" action="/api/file/uploadListByGlbsm" :data="fileData"
......@@ -217,7 +216,13 @@ import lpbContent from "./lpbContent/index";
// import xxxx from '../xxxx/index'
export default {
name: "",
name: "bjlp",
props: {
formData: {
type: Object,
default: {}
}
},
components: {
// LineTree,
addLjz,
......@@ -315,7 +320,6 @@ export default {
time: "",
dyztBsmList: {}, //单元状态bsmList
cbsmList: [], // 层bsmlist
lpbloading: true,
bjztFlag: true,
taskTitle: '添加',
curBsm: '',
......@@ -329,18 +333,18 @@ export default {
},
created () {
window.addEventListener("resize", this.getHeight);
// this.getHeight();
this.getHeight();
},
mounted () {
//获取楼盘表树结构
// this.getLpbMenuTree(this.$store.state.zrzbsm);
// this.getLpbMenuTree(formData.zrzbsm);
//获取各项单元状态的户bsm
// this.getDyztBsmList();
//获取房屋用途统计数据
// this.getLpbFwytAndQlxz();
// 楼盘表绘制区域宽度计算：楼盘表区域宽度-图例宽度34-滚动条宽度6
setTimeout(() => {
this.lpbContentwidth = this.$store.state.contentWidth - 34 - 6;
this.lpbContentwidth = ((document.documentElement.clientWidth || document.body.clientWidth) - 340) - 34 - 6;
}, 100);
},
methods: {
......@@ -429,7 +433,6 @@ export default {
console.log(file);
},
handleExceed (files, fileList) {
console.log(fileList)
// this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
this.$message.warning("上传失败")
},
......@@ -524,7 +527,7 @@ export default {
},
//获取高度计算lpb内容区高度
getHeight () {
this.lpbContentHight = window.innerHeight - 285;
this.lpbContentHight = window.innerHeight - 190;
},
//创建楼盘
create () {
......
......@@ -7,18 +7,18 @@
: '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"
:class="[{ 'mt30': ljzIndex == 0 }, { 'mt60': ljzIndex == 1 || lpbData.ljzs.length == 1 }]">
<div class="ljz" ref="ljz" v-for="(ljzs, ljzIndex) in lpbData.ljzs" :key="ljzIndex">
<!-- :class="[{ 'mt30': ljzIndex == 0 }, { 'mt60': ljzIndex == 1 || lpbData.ljzs.length == 1 }]" -->
<!-- :style="{'marginTop':ljzs.zdys.length>0?'0':'30px'}" -->
<!-- 循环逻辑幢下的幢单元 -->
<div class="ljz-zdy-wrap">
<div class="ljz-zdy-wrap" :style="{ 'marginTop': ljzs.zdys.length > 0 ? '0' : '30px' }">
<div class="ljz-zdy column-reverse"
:style="{ 'min-height': ljzzdyHeight + 'px', 'marginRight': zdyIndex < (ljzs.zdys.length - 1) || ljzs.cs.length > 1 ? '20px' : '0' }"
ref="ljzzdy" v-show="ljzs.zdys.length > 0" v-for="(zdys, zdyIndex) in ljzs.zdys" :key="zdyIndex">
<!-- 幢单元名称 -->
<div class="zdy-name name">
<p class="cp" @dblclick="openZxx(zdys.bsm, 'zdy')">
<!-- {{ zdys.zdymc }} -->
<el-checkbox @change='zdySelectAll($event, zdys.cs)'>{{ zdys.zdymc }}</el-checkbox>
</p>
</div>
......@@ -94,8 +94,6 @@
</tr>
</table>
</div>
<!-- </div> -->
<!-- 逻辑幢名称 -->
<div class="ljz-name name">
<p class="cp" @dblclick="openZxx(ljzs.bsm, 'ljz')">
......@@ -178,9 +176,8 @@
</tr>
</table>
</div>
<!-- </template> -->
</div>
<!-- <div class="ch-wrap">层户</div> -->
<!-- 层户 -->
<div class="zrz" :style="{ width: lpbContentWidth + 'px' }">
<el-checkbox v-model="zrzChecked" @change='lpbSelectAll'>{{ lpbData.xmmc }}</el-checkbox>
</div>
......@@ -188,7 +185,6 @@
<ul v-show="lpbChVisible" :style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }" class="contextmenu">
<li v-show="rightClickFlag == 'h'" @click="handleAddH">添加</li>
<li v-show="rightClickFlag == 'h'" @click="handleMoveH">移动</li>
<!-- <li v-show="rightClickFlag == 'h'" @click="handleDeleteH">删除</li> -->
<li v-show="rightClickFlag == 'h'" @click="handleSyczh">实预测转换</li>
<li v-show="rightClickFlag == 'c'" @click="handleAddC('up')">
向上添加层
......@@ -210,8 +206,7 @@
</ul>
<!-- 层操作弹框 -->
<el-dialog v-dialogDrag :close-on-click-modal="false" :title="addCData.title" :visible.sync="addCVisible"
width="50%">
<el-dialog :close-on-click-modal="false" :title="addCData.title" :visible.sync="addCVisible" width="50%">
<el-form :model="addCData">
<el-form-item label="层号" :label-width="formLabelWidth">
<el-input disabled v-model="addCData.sjc" autocomplete="off"></el-input>
......@@ -229,7 +224,7 @@
</div>
</el-dialog>
<!-- 户分割弹框 -->
<el-dialog v-dialogDrag :close-on-click-modal="false" title="户分割" :visible.sync="hfgDialogVisible" width="800px">
<el-dialog :close-on-click-modal="false" title="户分割" :visible.sync="hfgDialogVisible" width="800px">
<el-form :model="fgData">
<el-form-item label="分割户数" required="" :label-width="formLabelWidth">
<el-input :disabled="fgData.fgfx != 0" v-model="fgData.fghs" autocomplete="off"></el-input>
......@@ -243,8 +238,7 @@
<move-h :hbsm="chData.bsm" @close="moveHClose" :move-hvisible="moveHvisible" :type="scyclx"
@loading="loadingData($store.state.zrzbsm, $parent.scyclx)"></move-h>
<!-- 双击户的弹出框 -->
<el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible"
width="80%">
<el-dialog :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="80%">
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx" :lpbParent="lpbParent"></hbj>
</el-dialog>
<!-- 户重新落宗 -->
......@@ -254,6 +248,7 @@
<script>
import moveH from "@/components/moveH/moveH";
import HCxlz from "@/components/hCxlz/hCxlz";
import { getLpb } from '@/api/lpb'
// import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
// import { hhb, hfg } from "@api/h";
import { Message } from 'element-ui';
......@@ -332,10 +327,9 @@ export default {
zrzChecked: false, //自然幢全选
};
},
created () { },
mounted () {
// this.getLpb(this.zrzbsm, "0");
// this.getLpb(this.zrzbsm, "1");
this.getLpb('9434bdb243ba342cc6c043065fc9e480');
// this.getLpb(this.zrzbsm);
setTimeout(() => {
//让滚动条滚动至最下面 -6是横向滚动条的高度
this.$refs.lpbContent.scrollTop =
......@@ -353,24 +347,23 @@ export default {
getLpb (zrzbsm, scyclx, actual) {
getLpb(zrzbsm, scyclx).then((res) => {
if (res.code == 200) {
this.$parent.lpbloading = false;
res.result.ljzs = res.result.ljzs
.sort(this.compare("place"))
.reverse();
// this.lpbData = res.result == null ? this.lpbData : res.result;
this.lpbData = res.result == null ? this.lpbData : res.result;
//给实预测楼盘表对象赋值，默认加载预测楼盘表数据
if (scyclx == 0) {
this.yclpbData = res.result == null ? this.yclpbData : res.result;
this.lpbData = this.yclpbData;
} else {
this.sclpbData = res.result == null ? this.sclpbData : res.result;
}
if (actual) {
this.lpbData = res.result == null ? this.yclpbData : res.result;
}
if (this.lpbParent == 'isFwsxbg') {
this.lpbData = this.$parent.scyclx == '0' ? this.yclpbData : this.sclpbData;
}
// if (scyclx == 0) {
// this.yclpbData = res.result == null ? this.yclpbData : res.result;
// this.lpbData = this.yclpbData;
// } else {
// this.sclpbData = res.result == null ? this.sclpbData : res.result;
// }
// if (actual) {
// this.lpbData = res.result == null ? this.yclpbData : res.result;
// }
// if (this.lpbParent == 'isFwsxbg') {
// this.lpbData = this.$parent.scyclx == '0' ? this.yclpbData : this.sclpbData;
// }
this.$nextTick(() => {
//渲染楼盘表
this.dataChange();
......@@ -1028,11 +1021,9 @@ export default {
overflow: hidden;
.ljz {
// margin-bottom: 20px;
display: table;
margin-top: 30px;
// position: relative;
// margin-top: 30px;
.ljz-zdy-wrap {
width: auto;
display: table;
......
......@@ -113,7 +113,6 @@ export default {
}
},
handleTabClick () {
this.pageData.currentPage = 1;
this.fetchData();
},
......@@ -161,6 +160,17 @@ export default {
},
handleSelectionChange (val) {
this.bdcdysz = val
},
handleLpbClick (item) {
console.log(item, 'eeeeeeeeeeeeee');
this.$popup('楼盘表', 'components/bjlp/index', {
width: '85%',
formData: {
bsm: item.bsm
},
cancel: function () { }, //取消事件的回调
confirm: function () { }, //确认事件的回调
})
}
}
}
......
......@@ -73,7 +73,7 @@ class data extends filter {
render: (h, scope) => {
return (
<div>
{(scope.row.tdxzmc)+(' / ')+(scope.row.tdxzmc)}
{(scope.row.tdxzmc) + (' / ') + (scope.row.tdxzmc)}
</div>
)
}
......@@ -83,7 +83,7 @@ class data extends filter {
render: (h, scope) => {
return (
<div>
{(scope.row.zdmj)+(' / ')+(scope.row.scjzmj)}
{(scope.row.zdmj) + (' / ') + (scope.row.scjzmj)}
</div>
)
}
......@@ -106,6 +106,15 @@ class data extends filter {
prop: "zl",
label: "自然幢坐落",
},
{
label: '操作',
width: '80',
align: 'center',
fixed: 'right',
render: (h, scope) => {
return <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
}
}
]
}
......
......@@ -130,6 +130,7 @@ export default {
this.btnDisabled = false
Cookies.set("bsmSqyw", item.bsmSqyw)
this.djywbm = item.djywbm
console.log(this.djywbm, 'this.djywbm');
}
},
handleList (list, obj) {
......
......@@ -110,15 +110,10 @@ export default {
// 高级查询
moreQueryClick () { },
openDialog (scroll) {
this.$popup({
titleStyle: "left",
title: "登记簿详情", // 弹窗标题
editItem: "registerBook/djbFrame", // 弹窗内容
this.$popup('登记簿详情', 'registerBook/djbFrame', {
formData: scroll,
width: "1220px",
height: "790px",
// cancelText: '取消摆烂', // 右边按钮文本
// confirmText: '确定点击', //左边按钮文本
cancel: () => {
console.log("取消回调");
},
......@@ -127,8 +122,17 @@ export default {
},
});
},
},
};
handleLpbClick (item) {
this.$popup('楼盘表', 'components/bjlp/index', {
width: '90%',
height: "90%",
formData: {
bsm: ''
}
})
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
......
......@@ -102,7 +102,7 @@ class data extends filter {
return (
<div>
<el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope.row) }}>登记薄</el-button>
<el-button type="text" icon="el-icon-film" onClick={() => { vm.openDialog(scope.row) }}>楼盘表</el-button>
<el-button type="text" icon="el-icon-film" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
</div>
)
}
......