diff --git a/src/tool/flexible.js b/src/tool/flexible.js index 7ae60bbe..d1b11ccf 100644 --- a/src/tool/flexible.js +++ b/src/tool/flexible.js @@ -1,4 +1,5 @@ import { getUniversalZoomLevel } from "@/tool/util"; +import MyEvent from "@/tool/myEvents"; let flexible = (designWidth, maxWidth,minWidth) =>{ var doc = document, win = window, docEl = doc.documentElement, remStyle = document.createElement("style"), tid; @@ -33,6 +34,7 @@ let flexible = (designWidth, maxWidth,minWidth) =>{ var rem = Math.round(width * 10 / designWidth); docEl.style.fontSize = rem+'px' remStyle.innerHTML = 'html{font-size:' + rem + 'px;}'; + MyEvent.emit('remChange',rem) } // if (docEl.firstElementChild) { // docEl.firstElementChild.appendChild(remStyle); diff --git a/src/views/HomeView/history.vue b/src/views/HomeView/history.vue index ea833faf..70b624b4 100644 --- a/src/views/HomeView/history.vue +++ b/src/views/HomeView/history.vue @@ -91,7 +91,7 @@ import TableSearchBar from '@/component/common/TableSearchBar.vue' import projectSetting from '@/component/home/newProject/setting.vue' import { useStore } from 'vuex' import router from '@/router' - +import MyEvent from "@/tool/myEvents"; export default defineComponent({ components: { @@ -250,6 +250,8 @@ export default defineComponent({ } }, async mounted() { + MyEvent.add('remChange',this.setPageSize) + this.setPageSize(); await this.getHistoryList() this.$nextTick(() => { this.calcScrollHeight() @@ -258,12 +260,24 @@ export default defineComponent({ this.getClass() }, beforeUnmount() { + MyEvent.remove('remChange',this.setPageSize) if (this.resizeObserver) { this.resizeObserver.disconnect() this.resizeObserver = null } }, methods: { + setPageSize(rem){ + const historyTable = this.$refs.historyTable + const height = historyTable.offsetHeight - 176; + const size = Math.trunc(height / 54); + this.pageSize = size + if(rem){ + this.currentPage = 1 + this.getHistoryList() + } + console.log("==========",size,rem) + }, getClass() { let data = { classificationIdList: [],