2023-5-30

src/HDrpManagement/workReport/modules/reportSet/components/addPeople.vue

@@ -86,18 +86,9 @@ export default {
       this.dialog = false
     },
     async allData () {
-      let res = await this.$api.requested({
-        "id": "20230522101302",
-        "content": {
-            "sys_workreportmodelid": this.data ? this.data.sys_workreportmodelid : 0,
-            "type": 1, //汇报人员,汇报对象
-            "pageNumber": 1,
-            "pageSize": 999999999,
-            "where": {
-                "condition": ""
-            }
-        },
-      })
+      let param = JSON.parse(JSON.stringify(this.params))
+      param.content.pageSize = 9999999
+      let res = await this.$api.requested(param)
       this.$confirm(`总共有${res.total}位员工,是否选中`,'提示',{
         confirmButtonText:'确定',
         cancelButtonText:'取消',

src/components/newLayout/index.vue

@@ -5,7 +5,7 @@
       <div style="flex:100" class="body__panel">
         <headeTemp></headeTemp>
         <div>
-          <menuTemp class="sticky normal-margin" ref="menu"></menuTemp>
+          <menuTemp class="sticky normal-margin" :style="marginTrue ? 'margin-bottom:70px !important' : 'margin-bottom:16px'" ref="menu"></menuTemp>
           <div class="radius">
             <keep-alive :include="pageCache">
               <router-view></router-view>
@@ -43,14 +43,38 @@ export default {
   },
   data () {
     return {
-
+      timer:null,
+      marginTrue:false
     }
   },
   methods:{
     getModules (mod,type) {
       // this.$refs['menu'].setModules(mod,type)
+    },
+    debouned () {
+      if (this.timer) {
+        clearTimeout(this.timer)
+      }
+      this.timer = setTimeout(() => {
+        if (this.$refs.menu.$el.clientWidth < 1210) {
+          this.marginTrue = true
+        } else {
+          this.marginTrue = false
+        }
+      },200)
     }
-  }
+  },
+  created() {
+    window.addEventListener('resize',this.debouned)
+
+    this.$nextTick(() => {
+      if (this.$refs.menu.$el.clientWidth < 1210) {
+        this.marginTrue = true
+      } else {
+        this.marginTrue = false
+      }
+    })
+  },
 }
 
 </script>
@@ -77,7 +101,6 @@ export default {
 }
 .sticky {
   position: sticky;
-  min-width:1280px;
 }
 .radius{
   /* margin: 16px 0; */