From 83dc074670ad65a4932e7268b92ed37783e2f3e0 Mon Sep 17 00:00:00 2001
From: bibi <541660090@qq.com>
Date: Wed, 12 Jan 2022 15:23:57 +0800
Subject: [PATCH] =?UTF-8?q?1.12=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 +-
.env.production | 4 +-
src/components/drawer/index.vue | 3 -
src/components/table/index.vue | 15 +-
src/router/basic.js | 88 ++--
src/styles/index.less | 3 +
src/views/Basic/Authority/index.vue | 46 +-
src/views/Basic/Employee/index.vue | 29 +-
.../EstateInfo/_buildingManage/index.vue | 179 ++++++--
.../Basic/EstateInfo/_houseHoldInfo/index.vue | 333 ++++++++++++++
.../Basic/EstateInfo/_houseManage/index.vue | 421 ++++++++++++++++--
11 files changed, 960 insertions(+), 165 deletions(-)
diff --git a/.env.development b/.env.development
index 821466f..576d3de 100644
--- a/.env.development
+++ b/.env.development
@@ -1,3 +1,3 @@
NODE_ENV = 'development'
-VUE_APP_URL = ''
-VUE_APP_CDN = ''
\ No newline at end of file
+VUE_APP_URL = 'http://121.41.26.225:8004/1'
+VUE_APP_CDN = 'http://121.41.26.225:8004/1'
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 3e595a6..7338b2f 100644
--- a/.env.production
+++ b/.env.production
@@ -1,3 +1,3 @@
NODE_ENV = 'production'
-VUE_APP_URL = ''
-VUE_APP_CDN = ''
\ No newline at end of file
+VUE_APP_URL = 'http://121.41.26.225:8004/1'
+VUE_APP_CDN = 'http://121.41.26.225:8004/1'
\ No newline at end of file
diff --git a/src/components/drawer/index.vue b/src/components/drawer/index.vue
index 4700ef4..5a1dfbc 100644
--- a/src/components/drawer/index.vue
+++ b/src/components/drawer/index.vue
@@ -1,8 +1,5 @@
-
- New account
-
-
-
+
+
+
+
+
+ {{ formatter(tag) }}
+
-
+
-
- + 新建分组
+
-
+
@@ -69,11 +69,10 @@
>
- 详情
- |
-
- |
- 重置密码
+
+ 详情
+ 重置密码
+
{{
scope === 1 ? "可" : ""
@@ -347,22 +346,22 @@ export default {
{
title: "真实名称",
dataIndex: "actualName",
- width: "200",
+ width: "20%",
},
{
title: "手机号",
dataIndex: "tel",
- width: "200",
+ width: "20%",
},
{
title: "所属部门",
dataIndex: "departmentName",
- width: "200",
+ width: "20%",
},
{
title: "岗位",
dataIndex: "positionName",
- width: "200",
+ width: "20%",
},
{
title: "备注",
@@ -379,7 +378,7 @@ export default {
},
],
// 数据
- tableData: [],
+ tableData: [{},],
// 分页
pagination: {
current: 1,
diff --git a/src/views/Basic/EstateInfo/_buildingManage/index.vue b/src/views/Basic/EstateInfo/_buildingManage/index.vue
index d6bef35..1f0255b 100644
--- a/src/views/Basic/EstateInfo/_buildingManage/index.vue
+++ b/src/views/Basic/EstateInfo/_buildingManage/index.vue
@@ -24,14 +24,15 @@
@selectionChoosed="selectionChoosed"
>
- 详情
- |
- 删除
+
+ 详情
+ 删除
+
提交
+
+
+
+
+
+
+ 楼栋信息
+
+
+
+ 1栋
+
+
+
+
+ 单元信息
+
+
+
+ 编辑
+ 删除
+
+
+
@@ -78,21 +143,21 @@ export default {
addShow:false,
detailShow:false,
title:'添加楼栋',
+ editNow:false,
},
+ addUnitShow:false,
form:{
name:''
},
rules:{
name:[{required:true,message:'请输入楼栋',trigger:'blur'}],
- fileList:[{required:true,message:'请上传文件'}]
+ fileList:[{required:true}]
},
fileList: [
{
uid: '-1',
name: 'xxx.png',
- status: 'done',
url: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
- thumbUrl: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
},
{
uid: '-2',
@@ -114,22 +179,22 @@ export default {
{
title: "楼栋名称",
dataIndex: "name",
- width: "200",
+ width: "20%",
},
{
title: "房屋总数",
dataIndex: "estateTotals",
- width: "200",
+ width: "20%",
},
{
title: "租赁房屋数",
dataIndex: "leaseEstateNums",
- width: "200"
+ width: "20%"
},
{
title: "租赁率",
dataIndex: "leaseRate",
- width: "200",
+ width: "20%",
customRender:function(leaseRate){
return leaseRate+'%'
}
@@ -137,7 +202,7 @@ export default {
{
title: "入住率",
dataIndex: "occupancyRate",
- width: "200",
+ width: "20%",
customRender:function(occupancyRate){
return occupancyRate+'%'
}
@@ -151,30 +216,50 @@ export default {
scopedSlots: { customRender: "action" },
},
],
+ unitData:[],
+ unitColumns: [
+ {
+ title: "单元名称",
+ dataIndex: "name",
+ width: "15%",
+ },
+ {
+ title: "楼层数",
+ dataIndex: "floor",
+ width: "15%",
+ },
+ {
+ title: "公共楼层数",
+ dataIndex: "publicFloor",
+ width: "18%",
+ },
+ {
+ title: "是否有电梯",
+ dataIndex: "elevator",
+ width: "18%",
+ customRender:function(elevator){
+ switch (elevator) {
+ case 1:
+ return '有'
+ case 0:
+ return '无'
+ default:
+ break;
+ }
+ }
+ },
+ {
+ title: "操作",
+ dataIndex: "action",
+ key: "action",
+ width: "180",
+ fixed: "right",
+ scopedSlots: { customRender: "action" },
+ },
+ ],
// 数据
tableData: [
{ name: 1, roleNameList: ['点点3','212','点点'] },
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
- {},
],
ActionsList: [
{
@@ -192,9 +277,27 @@ export default {
addBuilding(){
this.drawerConfig.addShow = true
},
+ addSubmit(){
+ this.$refs.ruleForm.validate(valid => {
+ if (valid) {
+ alert('submit!');
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
addClose(){
this.drawerConfig.addShow = false
},
+ detail(data){
+ console.log(data);
+ this.drawerConfig.detailShow = true;
+ },
+ detailClose(){
+ this.drawerConfig.detailShow = false;
+ this.drawerConfig.editNow = false;
+ },
handleTableChange(pagination) {
console.log(pagination);
const pager = { ...this.pagination };
@@ -203,7 +306,15 @@ export default {
this.pagination = pager;
},
del(data) {
- console.log(data);
+ this.$confirm({
+ title: "是否删除",
+ // okText:'删除',
+ // cancelText:'取消',
+ icon: "",
+ onOk: function () {
+ console.log(data);
+ },
+ });
},
Actions(data) {
console.log(data);
diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue
index e69de29..51d5fe8 100644
--- a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue
+++ b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue
@@ -0,0 +1,333 @@
+
+
+
住户信息
+
+
+
+
+
+ 男
+ 女
+ 保密
+
+
+ 查 询
+ 重 置
+
+
+
+ 添加住户
+
+
+
+
+
+
+
+ 批量
+
+ {{ item.label }}
+
+
+
+
+ {{ `已选择 ${selectedRowKeys.length} 条` }}
+
+
+
+
+
+
+
+
+ {{
+ item.manageBuildingName +
+ "栋/" +
+ item.manageUnitName +
+ "单元/" +
+ item.floorLocation +
+ "层-" +
+ item.manageEstateName +
+ "室"
+ }}
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+ {{ tag === 1 ? "业主" : tag === 2 ? "业主亲属" :tag === 3 ? "租户":'租户亲属' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查 询
+ 重 置
+
+
+
+ 添加房屋
+
+
+
+
+
+
-
- 分配角色
- |
- 删除
+ 批量
+
+ {{ item.label }}
+
+
+
+
+ {{ `已选择 ${selectedRowKeys.length} 条` }}
-
+
+
+
+
+
+ {{
+ row.manageBuildingName +
+ "栋/" +
+ row.manageUnitName +
+ "单元/" +
+ row.floorLocation +
+ "层-" +
+ row.name +
+ "室"
+ }}
+
+
+
+ 编辑
+ 删除
+
+
+
+
+ {{ tag === 1 ? "闲置" : tag === 2 ? "在住" : "在租" }}
+
+
+
+
+
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 房屋户型
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![example]()
+
+
+
+
+
+
+
+
+
+
+