diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index dcc77b9b..2f3cdf55 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -143,6 +143,7 @@ show-size-changer show-less-items show-quick-jumper + :showTotal="total => `共 ${total} 项`" :total="resourceTotal" :page-size-options="pageSizeOptions" @change="pageChange" diff --git a/front/src/views/home/components/KnowledgeBase.vue b/front/src/views/home/components/KnowledgeBase.vue index 74842d04..0408b64e 100644 --- a/front/src/views/home/components/KnowledgeBase.vue +++ b/front/src/views/home/components/KnowledgeBase.vue @@ -40,6 +40,10 @@ :pageSize="5" :total="props.resourceTotal" show-less-items + show-size-changer + show-quick-jumper + :page-size-options="pageSizeOptions" + :showTotal="total => `共 ${total} 项`" @change="handleCurrentChange" :showSizeChanger="false" /> @@ -56,6 +60,7 @@ resourceList: { type: Array, default: null }, resourceTotal: { type: String, default: '' }, }) + const pageSizeOptions = ref(['5', '10', '20', '50']) console.log('props==========>', props) // 知识库 const zskState = reactive({ diff --git a/front/src/views/home/detailsPageInfrastructureTreeXha.vue b/front/src/views/home/detailsPageInfrastructureTreeXha.vue index 964cddf8..9387dcb6 100644 --- a/front/src/views/home/detailsPageInfrastructureTreeXha.vue +++ b/front/src/views/home/detailsPageInfrastructureTreeXha.vue @@ -191,7 +191,10 @@ export default defineComponent({ mybus.on('getDeptList', () => { init() }) - + mybus.on('clearChoose', () => { + selectId.value='' + chooseId.value='' + }) const onSelect = async (item, val, child) => { let res = {} if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) { @@ -270,7 +273,7 @@ export default defineComponent({ }, beforeUnmount() { mybus.off('getDeptList') - console.log('getDeptList销毁~~~~~~~~~~~~~~~~~~~') + mybus.off('clearChoose') }, components: { UpOutlined, diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index ea531868..a8d4616d 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -128,16 +128,21 @@ 预约 + + + /> +
{ + const onRoomChange = () => { roomPage.value = pageNumber searchData() } + const onOkChange = () => { + current.value = roomPage.value + searchData() + } const onShowSizeChange = (current, pageSize) => { roomLimit.value = pageSize searchData() @@ -2471,6 +2480,16 @@ })