瀏覽代碼

显示问题

Shannon_mu 3 年之前
父節點
當前提交
00b0cd46e1

+ 7 - 3
operationSupport/src/assets/css/main.scss

@@ -477,14 +477,18 @@ a {
 .el-submenu .el-menu-item,
 .el-submenu__title {
     height: 50px;
-    line-height: 50px;
-    padding: 0 10px;
+    line-height: 50px !important;
+    padding: 0 10px !important;
     margin: 0 10px;
     background: #2c354a;
     border-radius: 32px 0px 0px 32px !important;
     color: $mainTextColor;
 }
-
+.el-menu--collapse .el-menu-item{
+    .el-tooltip{
+        padding-left: 10px !important;
+    }
+}
 // 折叠菜单栏时出现箭头图标
 .sidebar-el-menu {
     .el-submenu > .el-submenu__title > .el-submenu__icon-arrow {

+ 16 - 4
operationSupport/src/components/common/Sidebar.vue

@@ -1,15 +1,16 @@
 <template>
-    <div class="sidebar" :style="collapse ? 'width:85px' : ''">
+    <div class="sidebar" :style="collapse ? 'width:85px' : 'width:220px'">
         <div class="logo" v-if="!collapse">
-            <img src="@/assets/img/img_logo2.png" />
-            <div class="title"><span class="point"></span>{{ $store.getters['getThisDetai'].name }}</div>
+            <img style="width: 90px; height: 24px" src="@/assets/img/img_logo2.png" />
+            <div class="title"><span class="point"></span>{{ $store.getters['getThisDetai'].name || sessSetThisDetai }}</div>
         </div>
         <div class="logo shrink" v-else>
-            <div class="text">{{ $store.getters['getThisDetai'].name }}</div>
+            <div class="text">{{ $store.getters['getThisDetai'].name || sessSetThisDetai }}</div>
         </div>
         <div class="menu-wrap no-scrollbar">
             <el-menu
                 class="sidebar-el-menu"
+                ref="sidebarelmenu"
                 :default-active="onRoutes"
                 :collapse="collapse"
                 background-color="#171F32"
@@ -59,6 +60,13 @@ export default {
         },
         openArray() {
             return this.openList;
+        },
+        sessSetThisDetai() {
+            let text = '';
+            if (!!window.sessionStorage.getItem('setThisDetai')) {
+                text = JSON.parse(window.sessionStorage.getItem('setThisDetai')).name;
+            }
+            return text;
         }
     },
     methods: {
@@ -91,6 +99,10 @@ export default {
     },
     created() {
         this.openList = this.thisfindMen(this.$store.getters['getMenuList'], this.$route.path);
+    },
+    mounted() {
+        // this.$refs.sidebarelmenu.$children[0].$children[0].$el.style.paddingLeft = 0;
+        // console.log((this.$refs.sidebarelmenu.$children[0].$children[0].$el.style.paddingLeft = 0));
     }
 };
 </script>

+ 3 - 1
operationSupport/src/main.js

@@ -117,12 +117,15 @@ Vue.prototype.routerLoad = {
 router.beforeEach((to, from, next) => {
     if (localStorage.getItem("SC_token")) {
         let menuList = window.sessionStorage.getItem("SC_listMuen")
+        JSON.parse
         let newAr = [];
         if (menuList == null || menuList == undefined) {
             http.get('/sc-user-center/user/findUserMenu', { appId: '1002' }).then(({ status, data, msg }) => {
                 if (0 == status) {
                     let datas = data[0].children
                     window.sessionStorage.setItem('SC_listMuen', JSON.stringify(datas))
+                    window.sessionStorage.setItem('setThisDetai', JSON.stringify(data[0]))
+                    store.commit('setThisDetai', data[0]);
                     funcRouter(newAr, datas, router)
                     next({ ...to, replace: true })
                 } else {
@@ -134,7 +137,6 @@ router.beforeEach((to, from, next) => {
                 funcRouter(newAr, JSON.parse(menuList), router)
                 next({ ...to, replace: true })
             } else {
-                debugger;
                 let thisAll = JSON.parse(menuList)[0];
                 if (to.path == '/') {
                     if (!!thisAll.children) {

+ 1 - 0
operationSupport/src/store/store.js

@@ -253,6 +253,7 @@ const store = new Vuex.Store({
                         ctx.commit('setMenuList', data[0].children);
                         ctx.commit('setThisDetai', data[0]);
                         window.localStorage.setItem('SC_listMuen', JSON.stringify(data[0].children))
+                        window.sessionStorage.setItem('setThisDetai', JSON.stringify(data[0]))
                     } else {
                         this.$message.error(msg)
                     }

+ 3 - 2
operationSupport/src/views/deviceManagement/index.vue

@@ -174,7 +174,8 @@ export default {
                 {
                     label: '操作',
                     prop: 'id',
-                    slot: 'opt'
+                    slot: 'opt',
+                    width: 150
                 }
             ],
             mixins_post: 'post',
@@ -352,7 +353,7 @@ export default {
 };
 </script>
 <style scoped lang='scss'>
-.QRImg>div{
+.QRImg > div {
     position: absolute;
     width: 100%;
     bottom: 0;

+ 2 - 1
operationSupport/src/views/deviceManagement/indexFacilities.vue

@@ -160,7 +160,8 @@ export default {
                 {
                     label: '操作',
                     prop: 'id',
-                    slot: 'opt'
+                    slot: 'opt',
+                    width: 150
                 }
             ],
             mixins_post: 'post',

+ 2 - 1
operationSupport/src/views/facilityInspections/index.vue

@@ -76,7 +76,8 @@ export default {
                 {
                     label: '操作',
                     prop: 'id',
-                    slot: 'opt'
+                    slot: 'opt',
+                    width: 130
                 }
             ],
             findUser: [],

+ 2 - 1
operationSupport/src/views/ownerManagement/index.vue

@@ -189,12 +189,13 @@ export default {
                     label: '入住时间',
                     prop: 'checkInDate',
                     slot: 'checkInDate',
-                    width: '100'
+                    width: '80'
                 },
                 {
                     label: '操作',
                     prop: 'id',
                     slot: 'opt',
+                    width: 130
                 }
             ],
             householdType: [