From f8289ea4c1f2babf561a314c48f1eca494c83551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=A1=E5=A4=8D=E4=B9=A0?= <2353956224@qq.com>
Date: Wed, 10 Sep 2025 16:01:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=9F=E6=88=B7=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MobilePagination.vue      | 61 +++++++++++++++++++++---
 src/locales/en.ts                        |  6 ++-
 src/locales/zh-CN.ts                     |  5 +-
 src/views/Home/Index.vue                 |  1 +
 src/views/server/employeehosts/index.vue | 13 ++---
 src/views/system/tenant/TenantForm.vue   |  4 ++
 src/views/system/tenant/index.vue        |  7 +++
 7 files changed, 80 insertions(+), 17 deletions(-)

diff --git a/src/components/MobilePagination.vue b/src/components/MobilePagination.vue
index 1db9ed6..3073877 100644
--- a/src/components/MobilePagination.vue
+++ b/src/components/MobilePagination.vue
@@ -1,11 +1,21 @@
 <template>
   <div class="mobile-pagination">
+    <!-- 每页条数选择 -->
+    <div class="per-page">
+      <span class="label">{{ $t('common.perPage') || '每页' }}</span>
+      <el-select class="limit-select" :model-value="props.limit" size="small" @change="onLimitChange">
+        <el-option v-for="s in props.pageSizes" :key="s" :label="`${s} / 页`" :value="s" />
+      </el-select>
+    </div>
+
     <el-button type="primary" size="small" :disabled="currentPage <= 1" @click="loadPreviousPage">
       {{ $t('employee.previous') || '上一页' }}
     </el-button>
+
     <span class="page-info">
       {{ currentPage }} / {{ totalPages }}
     </span>
+
     <el-button type="primary" size="small" :disabled="currentPage >= totalPages" @click="loadNextPage">
       {{ $t('employee.loadNext') || '下一页' }}
     </el-button>
@@ -14,32 +24,55 @@
 
 <script setup>
 import { computed, defineProps, defineEmits } from 'vue'
-const { t } = useI18n() // 国际化
+import { useI18n } from 'vue-i18n' // 如你项目已做自动导入可去掉
+const { t } = useI18n()
 
 const props = defineProps({
   page: { type: Number, required: true },
   limit: { type: Number, required: true },
-  total: { type: Number, required: true }
+  total: { type: Number, required: true },
+  // 新增：可配置每页条数选项
+  pageSizes: {
+    type: Array,
+    default: () => [10, 20, 50, 100]
+  }
 })
 
-const emits = defineEmits(['update:page', 'load', 'loadPre'])
+const emits = defineEmits([
+  'update:page',
+  'update:limit',   // 新增：v-model:limit
+  'size-change',    // 新增：告知父组件条数变化
+  'load',
+  'loadPre'
+])
 
-const totalPages = computed(() => Math.ceil(props.total / props.limit))
+const totalPages = computed(() => Math.max(1, Math.ceil(props.total / props.limit)))
 const currentPage = computed(() => props.page)
 
 const loadNextPage = () => {
   if (currentPage.value < totalPages.value) {
-    emits('update:page', currentPage.value)
+    emits('update:page', currentPage.value + 1) // 修复：改为 +1
     emits('load') // 触发外部方法加载下一页数据
   }
 }
 
 const loadPreviousPage = () => {
   if (currentPage.value > 1) {
-    emits('update:page', currentPage.value)
+    emits('update:page', currentPage.value - 1) // 修复：改为 -1
     emits('loadPre')
   }
 }
+
+// 新增：每页条数变化
+const onLimitChange = (val) => {
+  if (val !== props.limit) {
+    emits('update:limit', val)
+    // 通常切换每页条数后回到第一页避免越界
+    if (currentPage.value !== 1) emits('update:page', 1)
+    emits('size-change', val)
+    emits('load') // 重新加载数据
+  }
+}
 </script>
 
 <style scoped>
@@ -49,6 +82,22 @@ const loadPreviousPage = () => {
   align-items: center;
   margin: 16px 0;
   gap: 16px;
+  flex-wrap: wrap;
+}
+
+.per-page {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.per-page .label {
+  font-size: 14px;
+  color: #666;
+}
+
+.limit-select {
+  width: 110px;
 }
 
 .page-info {
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 4daec70..7e67347 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -54,7 +54,8 @@ export default {
     updateTime: 'Update Time',
     copy: 'Copy',
     copySuccess: 'Copy Success',
-    copyError: 'Copy Error'
+    copyError: 'Copy Error',
+    perPage: 'Number page',
   },
   lock: {
     lockScreen: 'Lock screen',
@@ -549,7 +550,8 @@ export default {
     remark: 'Remark',
     flag:'Flag',
     loadNext:'Next',
-    previous:'上一页',
+    previous: 'Previous',
+    updateTime: 'Update Time',
 
   },
   country: {
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 7a65b96..a04e39a 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -58,7 +58,9 @@ export default {
     updateTime: '更新时间',
     copy: '复制',
     copySuccess: '复制成功',
-    copyError: '复制失败'
+    copyError: '复制失败',
+    perPage: '每页',
+
   },
   lock: {
     lockScreen: '锁定屏幕',
@@ -528,6 +530,7 @@ export default {
     createTime: '创建时间',
     updataTime: '更新时间',
     userId: '用户 Id',
+    updateTime: '更新时间',
     placeAllocationUser: '请选择分配的员工',
     invitationType: '邀请类型',
     placeInvitationType: '请选择邀请类型',
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index 2947db1..362dbb5 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -197,6 +197,7 @@ onMounted(async () => {
 // 每次页面“再次显示”时都会触发（前提：该路由组件被 keep-alive 缓存）
 onActivated(async () => {
   await fetchDailyHostsCount()
+  await fetchAllHostsCount()
 })
 // import { useGlobalWebSocket } from '@/components/useGlobalWebSocket'
 // let messageList = useGlobalWebSocket().messageList
diff --git a/src/views/server/employeehosts/index.vue b/src/views/server/employeehosts/index.vue
index 0dbf3b8..9bea0be 100644
--- a/src/views/server/employeehosts/index.vue
+++ b/src/views/server/employeehosts/index.vue
@@ -220,12 +220,12 @@
         <div class="card-row"><b>{{ $t('employee.updateTime') }}：</b>{{ formatTimestamp(item.updateTime) }}</div>
         <div class="card-row action-row">
           <el-button link type="primary" @click="openForm('update', item.id, index)">{{ $t('employee.edit')
-          }}</el-button>
+            }}</el-button>
         </div>
       </div>
     </div>
-    <MobilePagination v-if="isMobile" :page="queryParams.pageNo" :limit="queryParams.pageSize" :total="total"
-      @update:page="val => queryParams.pageNo = val" @load="loadList" @loadPre="loadpreviousList" />
+    <MobilePagination v-if="isMobile" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      :total="total" :page-sizes="[10, 20, 30, 50]" @size-change="getList()" @load="getList()" @loadPre="getList()" />
 
     <!-- ✅ PC 显示分页，移动端隐藏 -->
     <Pagination v-if="!isMobile" :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@@ -413,15 +413,12 @@ function openHtml(item, id) {
 
 }
 const loadList = () => {
-  if (queryParams.pageNo < Math.ceil(total.value / queryParams.pageSize)) {
-    queryParams.pageNo++
-    getList()
-  }
+
+
 }
 
 const loadpreviousList = () => {
   if (queryParams.pageNo > 1) {
-    queryParams.pageNo--
     getList()
   }
 }
diff --git a/src/views/system/tenant/TenantForm.vue b/src/views/system/tenant/TenantForm.vue
index 6f0c06c..de9921c 100644
--- a/src/views/system/tenant/TenantForm.vue
+++ b/src/views/system/tenant/TenantForm.vue
@@ -30,6 +30,9 @@
       <el-form-item label="绑定域名" prop="website">
         <el-input v-model="formData.website" placeholder="请输入绑定域名" />
       </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
       <el-form-item label="租户状态" prop="status">
         <el-radio-group v-model="formData.status">
           <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :value="dict.value">
@@ -96,6 +99,7 @@ const formData = ref({
   // 新增专属
   username: undefined,
   password: undefined,
+  remark: undefined
 
 })
 const userData = ref({} as userApi.UserVO)
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index c2c3b2f..9000b94 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -16,6 +16,10 @@
         <el-input v-model="queryParams.contactMobile" placeholder="请输入联系手机" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
       </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
       <el-form-item label="租户状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择租户状态" clearable class="!w-240px">
           <el-option v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
@@ -85,6 +89,7 @@
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
       <el-table-column label="操作" align="center" min-width="110" fixed="right">
         <template #default="scope">
@@ -129,6 +134,8 @@ const queryParams = reactive({
   contactName: undefined,
   contactMobile: undefined,
   status: undefined,
+  remark: undefined,
+
   createTime: []
 })
 const queryFormRef = ref() // 搜索的表单