Browse Source

导航栏屏幕自适应调整,bpm

qymljy 2 years ago
parent
commit
10f3413159

+ 1 - 1
src/HDrpManagement/projectChange/modules/modules/reportingProgress/index.vue

@@ -5,7 +5,7 @@
           v-for="(activity, index) in list"
           :key="index"
           :timestamp="activity.createDate">
-        {{activity.activityName + ':' + activity.actionName }}<br>
+        {{activity.activityName + '--' + activity.createUserName + ':' + activity.actionName }}<br>
         {{activity.msg?'留言:' + activity.msg:'留言:' + '-'}}
       </el-timeline-item>
     </el-timeline>

+ 2 - 6
src/components/newLayout/index.vue

@@ -6,7 +6,7 @@
         <headeTemp></headeTemp>
         <div>
 <!--          <menuTemp class="sticky normal-margin" :style="marginTrue ? 'margin-bottom:70px !important' : 'margin-bottom:16px'" ref="menu" style="background: red"></menuTemp>-->
-          <menuTemp class="sticky normal-margin"  ref="menu" ></menuTemp>
+          <menuTemp class="sticky normal-margin"  ref="menu" @switch="debouned"></menuTemp>
           <div class="radius" ref="divContent" :style="{'marginTop':divTop,'height':divHeight}">
             <keep-alive :include="pageCache">
               <router-view></router-view>
@@ -60,8 +60,6 @@ export default {
         clearTimeout(this.timer)
       }
       this.timer = setTimeout(() => {
-        console.log(this.$refs.menu.$refs.menuList.$el.clientHeight,'高度')
-        console.log(this.$refs.menu.$refs.menuList.$el.clientHeight / 60)
         let size = this.$refs.menu.$refs.menuList.$el.clientHeight / 60 -1
         if (this.$refs.menu.$refs.menuList.$el.clientHeight === 120){
           this.divTop =(this.$refs.menu.$refs.menuList.$el.clientHeight - (45 * size))  + 'px'
@@ -70,7 +68,6 @@ export default {
         }
 
        /* this.divHeight = (this.$refs.divContent.clientHeight - this.$refs.menu.$refs.menuList.$el.clientHeight + 10) + 'px'*/
-        console.log(this.divTop,this.divHeight)
        /* if (this.$refs.menu.$el.clientWidth < 1206 && Array.from(this.$refs.menu.$el.getElementsByTagName('li')).filter(item => item.className.indexOf('el-submenu') != -1).length > 8) {
           this.marginTrue = true
         } else {
@@ -91,10 +88,9 @@ export default {
     }*/
   },
   created() {
-
     window.addEventListener('resize',this.debouned)
     this.$nextTick(() => {
-
+      this.debouned()
     })
   },
 }

+ 2 - 1
src/components/newLayout/modules/menu.vue

@@ -56,7 +56,7 @@ export default {
     },
     handleSelect(key, keyPath) {
       this.activeIndex = key
-    }
+    },
   },
   mounted () {
     this.setDefaultData()
@@ -64,6 +64,7 @@ export default {
   watch:{
     activeApp (val) {
       this.show = false
+      this.$emit('switch')
       setTimeout(() => {
         this.show = true
         this.activeIndex = val.path

+ 4 - 4
src/components/newLayout/modules/navRight.vue

@@ -36,13 +36,13 @@ export default {
         }
       })
       this.system = res.data
-      
+
       this.modules = []
       res.data.map(e=>{
         this.modules = [...this.modules,...e.modules]
       })
       this.modules.map(e=>{
-        this.menuApp =[...this.menuApp,...e.apps] 
+        this.menuApp =[...this.menuApp,...e.apps]
       })
     },
     handelMenuAppClick (app,type) {
@@ -51,9 +51,9 @@ export default {
         if (e.systemmoduleid === app.systemmoduleid)
         return e
       })[0]
-      
+
       let at_app = app
-      
+
       sessionStorage.setItem('active_modules',JSON.stringify(at_modules))
       const link = ()=>{
         this.$router.push({path:app.path})