From 09d62b413f4472fb8afd27dafddb8ff6652b1c16 Mon Sep 17 00:00:00 2001
From: Zhunianya <2698076424@qq.com>
Date: Thu, 2 Apr 2026 14:41:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=85=8D=E7=BD=AE):=20=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/layout/components/Navbar.vue    |   2 +-
 vue/src/settings.js                     |  93 ++++++++++----------
 vue/src/views/index.vue                 |   2 +-
 vue/src/views/iot/group/device-list.vue | 111 +++++++++++-------------
 vue/src/views/system/user/index.vue     |  18 ++--
 5 files changed, 106 insertions(+), 120 deletions(-)

diff --git a/vue/src/layout/components/Navbar.vue b/vue/src/layout/components/Navbar.vue
index f1efe920..8e88d9b5 100644
--- a/vue/src/layout/components/Navbar.vue
+++ b/vue/src/layout/components/Navbar.vue
@@ -20,9 +20,9 @@
                 <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
                 <el-tooltip :content="$t('navbar.layoutSize')" effect="dark" placement="bottom">
-                    <langSelect id="lang-select" class="right-menu-item hover-effect" />
                     <size-select id="size-select" class="right-menu-item hover-effect" />
                 </el-tooltip>
+                <langSelect id="lang-select" class="right-menu-item hover-effect" style="font-size: 26px" />
             </template>
 
             <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
diff --git a/vue/src/settings.js b/vue/src/settings.js
index cfea5788..cee7e0ce 100644
--- a/vue/src/settings.js
+++ b/vue/src/settings.js
@@ -1,49 +1,50 @@
 import Cookies from 'js-cookie';
-module.exports = {
-  /**
-   * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
-   */
-  sideTheme: 'theme-dark',
 
-  /**
-   * 是否系统布局配置
-   */
-  showSettings: false,
-
-  /**
-   * 是否显示顶部导航
-   */
-  topNav: false,
-
-  /**
-   * 是否显示 tagsView
-   */
-  tagsView: false,
-
-  /**
-   * 是否固定头部
-   */
-  fixedHeader: false,
-
-  /**
-   * 是否显示logo
-   */
-  sidebarLogo: true,
-
-  /**
-   * 是否显示动态标题
-   */
-  dynamicTitle: false,
-
-  /**
-   * @type {string | array} 'production' | ['production', 'development']
-   * @description Need show err logs component.
-   * The default is only used in the production env
-   * If you want to also use it in dev, you can pass ['production', 'development']
-   */
-  errorLog: 'production',
+export default {
     /**
-   * 默认语言 先從cookies拿，沒有從瀏覽器語言拿，最後用'zh-CN'
-   */
-  language: Cookies.get('language') || navigator.language || navigator.browserLanguage || 'zh-CN',
-}
+     * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
+     */
+    sideTheme: 'theme-dark',
+
+    /**
+     * 是否系统布局配置
+     */
+    showSettings: false,
+
+    /**
+     * 是否显示顶部导航
+     */
+    topNav: false,
+
+    /**
+     * 是否显示 tagsView
+     */
+    tagsView: false,
+
+    /**
+     * 是否固定头部
+     */
+    fixedHeader: false,
+
+    /**
+     * 是否显示logo
+     */
+    sidebarLogo: true,
+
+    /**
+     * 是否显示动态标题
+     */
+    dynamicTitle: false,
+
+    /**
+     * @type {string | array} 'production' | ['production', 'development']
+     * @description Need show err logs component.
+     * The default is only used in the production env
+     * If you want to also use it in dev, you can pass ['production', 'development']
+     */
+    errorLog: 'production',
+    /**
+     * 默认语言 先從cookies拿，沒有從
+     */
+    language: Cookies.get('language') || navigator.language || navigator.browserLanguage || 'zh-CN',
+};
diff --git a/vue/src/views/index.vue b/vue/src/views/index.vue
index 8cf94fe6..d4046f67 100644
--- a/vue/src/views/index.vue
+++ b/vue/src/views/index.vue
@@ -220,7 +220,7 @@
 
         <div style="width: 100%; text-align: center; font-size: 14px; color: #666; line-height: 32px; margin-top: 50px">
             <span>
-                Copyright © 2021-2022
+                Copyright © 2021-2026
                 <a href="https://fastbee.cn/" target="_blank">FastBee</a>
                 |
                 <a href="https://fastbee.cn/" target="_blank">{{ $t('home.fengxinIoT') }}</a>
diff --git a/vue/src/views/iot/group/device-list.vue b/vue/src/views/iot/group/device-list.vue
index 3caae9f5..b63a3a65 100644
--- a/vue/src/views/iot/group/device-list.vue
+++ b/vue/src/views/iot/group/device-list.vue
@@ -1,57 +1,52 @@
 <template>
-<el-dialog :title="$t('iot.group.device-list.849593-0')" :visible.sync="openDeviceList" width="800px" append-to-body>
-    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-        <el-form-item :label="$t('iot.group.device-list.849593-1')" prop="deviceName">
-            <el-input v-model="queryParams.deviceName" :placeholder="$t('iot.group.device-list.849593-2')" clearable size="small" @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('iot.group.device-list.849593-3') }}</el-button>
-        </el-form-item>
-    </el-form>
+    <el-dialog :title="$t('iot.group.device-list.849593-0')" :visible.sync="openDeviceList" width="800px" append-to-body>
+        <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+            <el-form-item :label="$t('iot.group.device-list.849593-1')" prop="deviceName">
+                <el-input v-model="queryParams.deviceName" :placeholder="$t('iot.group.device-list.849593-2')" clearable size="small" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('iot.group.device-list.849593-3') }}</el-button>
+            </el-form-item>
+        </el-form>
 
-    <el-table v-loading="loading" :data="deviceList" @select="handleSelectionChange" @select-all="handleSelectionAll" ref="multipleTable" size="mini" border>
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column :label="$t('iot.group.device-list.849593-4')" align="center" prop="deviceName" />
-        <el-table-column :label="$t('iot.group.device-list.849593-5')" align="center" prop="serialNumber" />
-        <el-table-column :label="$t('iot.group.device-list.849593-6')" align="center" prop="productName" />
-        <el-table-column :label="$t('iot.group.device-list.849593-7')" align="center">
-            <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.isOwner==0">{{ $t('iot.group.device-list.849593-8') }}</el-tag>
-                <el-tag type="primary" v-else>{{ $t('iot.group.device-list.849593-9') }}</el-tag>
-            </template>
-        </el-table-column>
-        <el-table-column :label="$t('iot.group.device-list.849593-10')" align="center" prop="status">
-            <template slot-scope="scope">
-                <dict-tag :options="dict.type.iot_device_status" :value="scope.row.status" />
-            </template>
-        </el-table-column>
-    </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+        <el-table v-loading="loading" :data="deviceList" @select="handleSelectionChange" @select-all="handleSelectionAll" ref="multipleTable" size="mini" :border="false">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column :label="$t('iot.group.device-list.849593-4')" align="center" prop="deviceName" />
+            <el-table-column :label="$t('iot.group.device-list.849593-5')" align="center" prop="serialNumber" />
+            <el-table-column :label="$t('iot.group.device-list.849593-6')" align="center" prop="productName" />
+            <el-table-column :label="$t('iot.group.device-list.849593-7')" align="center">
+                <template slot-scope="scope">
+                    <el-tag type="success" v-if="scope.row.isOwner == 0">{{ $t('iot.group.device-list.849593-8') }}</el-tag>
+                    <el-tag type="primary" v-else>{{ $t('iot.group.device-list.849593-9') }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('iot.group.device-list.849593-10')" align="center" prop="status">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.iot_device_status" :value="scope.row.status" />
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
-    <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handleDeviceSelected">{{ $t('iot.group.device-list.849593-11') }}</el-button>
-        <el-button @click="closeSelectDeviceList">{{ $t('iot.group.device-list.849593-12') }}</el-button>
-    </div>
-</el-dialog>
+        <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="handleDeviceSelected">{{ $t('iot.group.device-list.849593-11') }}</el-button>
+            <el-button @click="closeSelectDeviceList">{{ $t('iot.group.device-list.849593-12') }}</el-button>
+        </div>
+    </el-dialog>
 </template>
 
 <script>
-import {
-    getDeviceIds,
-    updateDeviceGroups
-} from "@/api/iot/group"
-import {
-    listDeviceByGroup,
-} from "@/api/iot/device";
+import { getDeviceIds, updateDeviceGroups } from '@/api/iot/group';
+import { listDeviceByGroup } from '@/api/iot/device';
 
 export default {
-    name: "device-list",
+    name: 'device-list',
     dicts: ['iot_device_status'],
     props: {
         group: {
             type: Object,
-            default: null
-        }
+            default: null,
+        },
     },
     data() {
         return {
@@ -97,16 +92,14 @@ export default {
                     this.getDeviceIdsByGroupId(this.deviceGroup.groupId);
                 }
             },
-            immediate: true
-        }
-    },
-    created() {
-
+            immediate: true,
+        },
     },
+    created() {},
     methods: {
         // 获取分组下关联的设备ID数组
         getDeviceIdsByGroupId(groupId) {
-            getDeviceIds(groupId).then(response => {
+            getDeviceIds(groupId).then((response) => {
                 this.ids = response.data;
                 this.getList();
             });
@@ -116,20 +109,20 @@ export default {
             this.loading = true;
             this.queryParams.params = {};
             if (null != this.daterangeActiveTime && '' != this.daterangeActiveTime) {
-                this.queryParams.params["beginActiveTime"] = this.daterangeActiveTime[0];
-                this.queryParams.params["endActiveTime"] = this.daterangeActiveTime[1];
+                this.queryParams.params['beginActiveTime'] = this.daterangeActiveTime[0];
+                this.queryParams.params['endActiveTime'] = this.daterangeActiveTime[1];
             }
-            listDeviceByGroup(this.queryParams).then(response => {
+            listDeviceByGroup(this.queryParams).then((response) => {
                 this.deviceList = response.rows;
                 this.total = response.total;
                 this.loading = false;
                 // 设置分组关联的设备选中
-                this.deviceList.forEach(row => {
+                this.deviceList.forEach((row) => {
                     this.$nextTick(() => {
-                        if (this.ids.some(x => x === row.deviceId)) {
+                        if (this.ids.some((x) => x === row.deviceId)) {
                             this.$refs.multipleTable.toggleRowSelection(row, true);
                         }
-                    })
+                    });
                 });
             });
         },
@@ -141,7 +134,7 @@ export default {
         /** 重置按钮操作 */
         resetQuery() {
             this.daterangeActiveTime = [];
-            this.resetForm("queryForm");
+            this.resetForm('queryForm');
             this.handleQuery();
         },
         // 多选框选中数据
@@ -181,11 +174,11 @@ export default {
         // 更新分组下的设备
         handleDeviceSelected() {
             this.group.deviceIds = this.ids;
-            updateDeviceGroups(this.group).then(response => {
+            updateDeviceGroups(this.group).then((response) => {
                 this.$modal.msgSuccess(this.$t('iot.group.device-list.849593-13'));
                 this.openDeviceList = false;
-            })
-        }
-    }
+            });
+        },
+    },
 };
 </script>
diff --git a/vue/src/views/system/user/index.vue b/vue/src/views/system/user/index.vue
index af1aee21..b19a3780 100644
--- a/vue/src/views/system/user/index.vue
+++ b/vue/src/views/system/user/index.vue
@@ -109,9 +109,9 @@
                         </el-table-column>
                     </el-table>
 
-                    <div class="pagination-container">
-                        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-                    </div>
+                    <!-- <div class="pagination-container"> -->
+                    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+                    <!-- </div> -->
                 </el-card>
             </el-col>
         </el-row>
@@ -586,7 +586,7 @@ export default {
 .dept-card {
     margin-bottom: 15px;
     border-radius: 8px;
-    height: 810px;
+    height: 700px;
 
     ::v-deep .el-card__body {
         padding: 18px;
@@ -604,6 +604,7 @@ export default {
 
 .table-card {
     border-radius: 8px;
+    height: 620px;
 
     ::v-deep .el-card__body {
         padding: 18px;
@@ -637,8 +638,6 @@ export default {
 .pagination-container {
     line-height: 40px;
     margin-bottom: 30px;
-    margin-top: 0;
-    padding: 0;
 }
 
 ::v-deep .el-pagination {
@@ -658,13 +657,6 @@ export default {
     }
 }
 
-.pagination-container {
-    line-height: 40px;
-    margin-bottom: 30px;
-    margin-top: 0;
-    padding: 0;
-}
-
 ::v-deep .el-pagination {
     padding: 20px 0 0 0;
     text-align: right;