jsyhsec/energy_storage
7
0
Fork 0
mirror of https://gitee.com/js-yhsec/energy_storage.git synced 2026-05-27 18:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
zhoumengru
2025-09-05 09:29:24 +08:00
parent b7e9768aae cc62bf61e4
commit c778e4a300
57 changed files with 3443 additions and 1920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
web/src/components/ComTable.vue
View File

@@ -53,8 +53,8 @@
<div class="pagination" v-if="data.newTableOpt.page">
<a-pagination
v-model:current="data.newPageOption.current"
:total="data.newPageOption.total"
v-model:current="data.newPageOption.page"
:total="data.newPageOption.count"
:page-size="data.newPageOption.pageSize"
@change="onChange"
show-size-changer
@@ -64,9 +64,9 @@
</a-pagination>
<div style="color: #7f8fa4; height: 30px; line-height: 30px; margin: 0 10px">
共<span style="color: aqua; font-size: 18px; margin: 0 2px">{{
data.newPageOption.total
data.newPageOption.count
}}</span
>页
>条
</div>
</div>
</div>
@@ -107,9 +107,9 @@ const props = defineProps({
type: Object,
default: () => {
return {
current: 1,
count: 1,
pageSize: 10,
total: 1
page: 1
}
}
},
@@ -206,7 +206,7 @@ function rowClassName(record, index) {
}
function expandIcon(props) {}
function onChange(page, pageSize) {
data.newPageOption.current = page
data.newPageOption.page = page
data.newPageOption.pageSize = pageSize
emit('handlePagesizeChange', data.newPageOption)
}