Merge branch 'report' into dev

src/views/model/report/deleted.vue

@@ -72,7 +72,8 @@ export default {
       view: '',
     }
   },
-  mounted() { },
+  mounted() {
+  },
   created() {
     this.equipComDelList = decodeURIComponent(this.$route.query.equipComDelList);
     this.queryToBelDelEquip();
@@ -168,7 +169,6 @@ export default {
         Filters: `ModelId in ${this.equipComDelList}`
       }
       toBeDelEquipPage(params, res => {
-        console.log(res.Content, 123)
         this.pageData = res.Content;
         this.pageData.forEach(item => {
           if (item.BIMLocation) {

src/views/model/report/supplement.vue

@@ -100,6 +100,7 @@ export default {
     }
   },
   mounted() {
+    // document.addEventListener('scroll', this.onmousewheel, false);
     this.getToBeSuppement();
   },
   created() {
@@ -109,6 +110,14 @@ export default {
     ...mapGetters('layout', ['projectId'])
   },
   methods: {
+    // onmousewheel() {
+    //   let scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
+    //   let clientHeight = document.documentElement.clientHeight;
+    //   let contentTop = document.body.scrollHeight;
+    //   if (scrollTop + clientHeight + 100 >= contentTop) {
+    //     console.log(1);
+    //   }
+    // },
     copyContent(element) {
       // 双击复制
       let content = element.target.innerText;
@@ -230,6 +239,9 @@ export default {
 
 
 <style lang="less" scoped>
+html {
+  height: auto;
+}
 // 取消打印功能默认的左右边距
 @media print {
   @page {
@@ -353,4 +365,9 @@ export default {
 canvas {
   position: static !important;
 }
+</style>
+<style>
+html {
+  height: auto;
+}
 </style>