From 62533e5ae3b90b17ad6a102a3ba4bd7a758c005a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 20 Dec 2023 18:25:27 +0800
Subject: [PATCH] 顶部top栏调整，小区管理，房屋管理，住户管理，场所管理显示内容调整
---
src/styles/top.scss | 2
src/views/userHouse/houseList.vue | 9 ++++
src/page/index/top/index.vue | 9 ++--
src/views/place/index.vue | 9 ++++
src/views/userHouse/houseHoldList.vue | 9 ++++
src/views/district/index.vue | 42 +++++++++++++++------
6 files changed, 63 insertions(+), 17 deletions(-)
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 817bcb2..bf7e3e5 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -10,10 +10,6 @@
<top-menu ref="topMenu"></top-menu>
</div>
<span class="top-bar__item" v-if="showSearch">
- <span class="top-bar-item-search">
- <i class="el-icon-search" @click="searchShow = !searchShow"></i>
- </span>
-
<top-search v-show="searchShow"></top-search>
</span>
</div>
@@ -42,6 +38,11 @@
<top-lock></top-lock>
</div>
</el-tooltip> -->
+ <el-tooltip v-if="showTheme" effect="dark" content="搜索" placement="bottom">
+ <div class="top-bar__item top-bar__item--show">
+ <i style="font-size: 18px;" class="el-icon-search" @click="searchShow = !searchShow"></i>
+ </div>
+ </el-tooltip>
<el-tooltip v-if="showTheme" effect="dark" :content="$t('navbar.theme')" placement="bottom">
<div class="top-bar__item top-bar__item--show">
<top-theme></top-theme>
diff --git a/src/styles/top.scss b/src/styles/top.scss
index 5b8bc19..0224522 100644
--- a/src/styles/top.scss
+++ b/src/styles/top.scss
@@ -49,7 +49,7 @@
.top-search {
line-height: $height;
position: absolute !important;
- left: 40px;
+ left: 20px;
top: 0;
width: 400px !important;
diff --git a/src/views/district/index.vue b/src/views/district/index.vue
index c5bab6f..e813a13 100644
--- a/src/views/district/index.vue
+++ b/src/views/district/index.vue
@@ -47,18 +47,12 @@
dialogClickModal: false,
column: [
{
- label: "小区名称",
- prop: "name",
- searchSpan: 4,
- search: true,
- width: 260,
- rules: [
- {
- required: true,
- message: "请输入小区名称",
- trigger: "blur",
- },
- ],
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ width: 96,
+ label: "所属街道",
+ prop: "townStreetName",
},
{
label: "所属社区",
@@ -81,6 +75,30 @@
],
},
{
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ width: 96,
+ label: "所属网格",
+ prop: "gridName",
+ },
+
+ {
+ label: "小区名称",
+ prop: "name",
+ searchSpan: 4,
+ search: true,
+ width: 260,
+ rules: [
+ {
+ required: true,
+ message: "请输入小区名称",
+ trigger: "blur",
+ },
+ ],
+ },
+
+ {
label: "小区图片",
prop: "picUrl",
width: 80,
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index ef6ece0..6dda8b7 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -149,16 +149,25 @@
dialogClickModal: false,
column: [
{
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
width: 96,
label: "所属街道",
prop: "townStreetName",
},
{
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
width: 160,
label: "所属社区",
prop: "neiName",
},
{
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
width: 96,
label: "所属网格",
prop: "gridName",
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index e1cf008..3660203 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -182,16 +182,25 @@
menuFixed: 'right',
column: [
{
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
width: 96,
label: "所属街道",
prop: "townStreetName",
},
{
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
width: 160,
label: "所属社区",
prop: "neiName",
},
{
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
width: 96,
label: "所属网格",
prop: "gridName",
diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index df8ddf2..09fe5a8 100644
--- a/src/views/userHouse/houseList.vue
+++ b/src/views/userHouse/houseList.vue
@@ -206,16 +206,25 @@
menuWidth: 340,
column: [
{
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
width: 96,
label: "所属街道",
prop: "townStreetName",
},
{
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
width: 160,
label: "所属社区",
prop: "neiName",
},
{
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
width: 96,
label: "所属网格",
prop: "gridName",
--
Gitblit v1.9.3