From 028f35b0da10e194c8db1c95b17e156914f30cce Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 27 Apr 2023 09:19:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A6=E4=BE=A7=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E8=8F=9C=E5=8D=95=E5=AE=BD=E5=BA=A6=E4=B8=8E=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92,=E9=83=A8=E5=88=86=E5=BC=B9=E7=AA=97=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/form-main.scss    |  5 ++--
 src/assets/scss/variables.scss                |  2 +-
 src/js/store/index.js                         |  1 +
 src/views/main-sidebar-sub-menu.vue           | 26 +++++++++++++++----
 src/views/main-sidebar.vue                    |  1 +
 .../modules/base/community/community.vue      |  6 ++---
 src/views/modules/base/resi.vue               |  2 +-
 src/views/modules/base/roomForm.vue           |  1 -
 .../modules/communityService/gxxq/index.vue   |  2 +-
 .../communityService/policy/policyList.vue    |  2 +-
 10 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/assets/scss/modules/management/form-main.scss b/src/assets/scss/modules/management/form-main.scss
index 2bf505636..13b0c858c 100644
--- a/src/assets/scss/modules/management/form-main.scss
+++ b/src/assets/scss/modules/management/form-main.scss
@@ -82,10 +82,11 @@ width:50%;
   -webkit-line-clamp: 2;
   overflow: hidden;
 }
-
+// 
 .div_btn {
   margin-top: 20px;
-  text-align: center;
+  text-align: right;
+  padding-right:16px;
 }
 
 .d-h3{
diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss
index dc0787204..fb0ccdd7d 100644
--- a/src/assets/scss/variables.scss
+++ b/src/assets/scss/variables.scss
@@ -5,7 +5,7 @@ $base--line-height: 1.15;
 $navbar--height: 64px;
 
 // Sidebar
-$sidebar--width: 251px;
+$sidebar--width: 200px;
 $sidebar--width-fold: 64px;
 $sidebar--background-color-dark: #263238;
 $sidebar--text-color-dark: #8a979e;
diff --git a/src/js/store/index.js b/src/js/store/index.js
index e133b95f7..8ade517b2 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -23,6 +23,7 @@ export default new Vuex.Store({
     sidebarMenuList: [],
     sidebarMenuActiveName: "",
     LevelOneMenuActiveName: "",
+    LevelTowMenuActiveName:"",
     sidebarActiveSubMenuList: [],
     // 内容, 是否需要刷新
     contentIsNeedRefresh: false,
diff --git a/src/views/main-sidebar-sub-menu.vue b/src/views/main-sidebar-sub-menu.vue
index 7177401af..e1faa612a 100644
--- a/src/views/main-sidebar-sub-menu.vue
+++ b/src/views/main-sidebar-sub-menu.vue
@@ -8,10 +8,7 @@
       popper-append-to-body
     >
       <template slot="title">
-        <svg
-          class="icon-svg aui-sidebar__menu-icon"
-          aria-hidden="true"
-        >
+        <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
           <use :xlink:href="`#${menu.icon}`" />
         </svg>
         <span :title="menu.name">{{ menu.name }}</span>
@@ -24,7 +21,12 @@
         :menu="item"
       ></sub-menu>
     </el-submenu>
-    <el-menu-item v-else :index="menu.id" @click="gotoRouteHandle(menu.id)">
+    <el-menu-item
+      :class="{ 'activeTow': menu.id == $store.state.LevelTowMenuActiveName }"
+      v-else
+      :index="menu.id"
+      @click="gotoRouteHandle(menu.id)"
+    >
       <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
         <use :xlink:href="`#${menu.icon}`" />
       </svg>
@@ -64,6 +66,7 @@ export default {
           this.$router.push({ name: route.name });
         }
       }
+      this.$store.state.LevelTowMenuActiveName = menuId
     },
   },
 };
@@ -75,4 +78,17 @@ export default {
 /deep/ .el-menu-item {
   @include toe;
 }
+.activeTow{
+  background-color: #ecf4fe;
+}
+.activeTow::after{
+  display: inline-block;
+  content: '';
+  background-color: #0056d6;
+  width: 2px;
+  height: 48px;
+  position: absolute;
+  right: 3px;
+  top: 0;
+}
 </style>
diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue
index 6ff5e8ce1..60c5960c3 100644
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -251,4 +251,5 @@ export default {
     }
   }
 }
+
 </style>
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 7b27b2301..6034a7cb8 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -599,11 +599,9 @@ export default {
 
     async getBuildList() {
       const url = "/actual/base/communityBuilding/buildingoption";
-
       let params = {
         quartersId: this.neighborHoodId,
       };
-
       const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
@@ -800,6 +798,7 @@ export default {
     },
 
     async handleNodeClick(obj) {
+      // 
       this.ownerName = "";
       this.ownerPhone = "";
       this.rentFlag = "";
@@ -814,7 +813,8 @@ export default {
       this.vDisabled = false;
       this.bDisabled = false;
       if (obj.level === "building") {
-        //点击楼栋
+        //点击楼栋 
+        console.log(this.selTreeObj,'传给子组件');
           this.$refs["ref_buildingTable"].loadTable("tree", this.selTreeObj);
         this.selAgencyId = "";
         this.selGridId = "";
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index d9e126924..013c39839 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -547,7 +547,7 @@
 			:close-on-click-modal="false"
 			:close-on-press-escape="false"
 			:title="'迁出登记'"
-			width="620px"
+			width="562px"
 			top="5vh"
 			class="dialog-h"
 			@closed="diaClose"
diff --git a/src/views/modules/base/roomForm.vue b/src/views/modules/base/roomForm.vue
index 88692f1a6..49b20c108 100644
--- a/src/views/modules/base/roomForm.vue
+++ b/src/views/modules/base/roomForm.vue
@@ -13,7 +13,6 @@
                       style="display: block">
           <span>{{ dataForm.neighborHoodName }}-{{dataForm.label}}</span>
         </el-form-item>
-
         <el-form-item label="单元号"
                       prop="buildingUnitId"
                       label-width="150px"
diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue
index 07a674837..daddbdabf 100644
--- a/src/views/modules/communityService/gxxq/index.vue
+++ b/src/views/modules/communityService/gxxq/index.vue
@@ -226,7 +226,7 @@
       :close-on-press-escape="false"
       :title="formTitle"
       destroy-on-close
-      width="900px"
+      width="720px"
       top="5vh"
       class="dialog-h"
       @closed="diaClose"
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index 685f9dca0..a873996fd 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -233,7 +233,7 @@
       :close-on-press-escape="false"
       :title="addDiaTitle"
       :modal-append-to-body="false"
-      width="1050px"
+      width="1020px"
       top="5vh"
       class="dialog-h"
       @closed="showAdd = false"