From 6191138f30dca009bbe714b6bb6ccb4b05d6a5b1 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 6 Dec 2022 10:10:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/management/list-main.scss | 46 +-- .../modules/base/community/buildTable.vue | 93 +++--- .../modules/base/community/community.vue | 290 +++++++++--------- .../modules/base/community/communityTable.vue | 122 ++++---- .../modules/base/community/roomTable.vue | 62 ++-- 5 files changed, 316 insertions(+), 297 deletions(-) diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index ff0c8ab48..3aa73bc79 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -18,7 +18,7 @@ } .search_form{ - + } .div_search_btn{ @@ -57,9 +57,11 @@ } .div_table{ - margin:15px 7px 7px; - // padding: 10px 20px; + margin:16px 7px 7px; + background: #FFFFFF; + box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12); position: relative; + padding:24px 16px 0; .div_btn { display: flex; @@ -72,6 +74,7 @@ .btn_upload { margin-left: 10px; display: flex; + text-align: center; } } @@ -83,7 +86,7 @@ } .div_table_item { - margin-top: 10px; + margin-top: 16px; position: relative; } } @@ -109,41 +112,6 @@ } } -// .div_table { -// // background: #ffffff; -// // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); -// // border-radius: 4px; -// margin-top: 15px; -// // padding: 10px 20px; -// position: relative; - - - -// .div_btn { -// margin-top: 10px; -// // margin-left: 10px; -// display: flex; - -// .btn_upload { -// margin-left: 10px; -// display: flex; -// } -// } -// .table { -// margin-top: 20px; - -// .img-voice{ -// width:30px; -// height:30px; -// } -// } - -// .div_notice { -// position: absolute; -// left: 15px; -// bottom: 0; -// } -// } .div-mult-form { margin-top: 20px; diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index e99e4dd48..61072b2f7 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -4,53 +4,68 @@
新增楼栋 - 导出 -
- - 导入楼栋数据 - - - - 导入房屋数据 - + + +
+ + + 导入楼栋数据 + +
- 批量删除 +
+ + 导入房屋数据 + -
+
+ 导入 + +
+ 导出 + 批量删除
@@ -96,7 +111,7 @@ 更多操作 + slot="reference">更多
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index aad16f3fe..32bec4824 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -37,150 +37,150 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
+
新增小区 - 导出 -
- - + +
+ + + +
+ + 导入小区数据 + +
+ +
+ + + 导入楼栋数据 + +
+ +
+ + 导入房屋数据 + +
导入小区数据 - - - - 导入楼栋数据 - - - - 导入房屋数据 - + style="float:right" + class="diy-button--white" + slot="reference">导入 +
+ 导出 批量删除 @@ -74,7 +94,7 @@ placement="bottom" style="margin-left: 10px" width="20" - trigger="hover"> + trigger="click">
更多操作 + slot="reference">更多
@@ -145,7 +165,6 @@ border :height="tableHeight" v-loading="tableLoading" - :header-cell-style="tableHeaderStyle" style="width: 100%" :show-overflow-tooltip="true" @select-all="selectAll" @@ -309,7 +328,6 @@ export default { pageSize: 20, pageNo: 0, tableLoading: true, - // tableHeaderStyle: { background: 'linear-gradient(0deg, #005EB3 0%, #0083F0 100%)', color: '#FFFFFF', padding: '6px' }, showImportBtn: false,//是否显示操作按钮,根据登录人所属组织判断 roleList: [],//角色列表 diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 51535f2f6..921b0b2b7 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -4,37 +4,55 @@
新增房屋 - 导出
- - 导入房屋数据 - + + +
+ + + 导入房屋数据 + +
+ + 导入 +
+
+ 导出 批量删除 @@ -78,7 +96,7 @@ 更多操作 + slot="reference">更多