Merge branch 'main' into LJH

main/manager-web/src/views/DeviceManagement.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="welcome">
-    <HeaderBar/>
+    <HeaderBar />
 
     <div class="operation-bar">
       <h2 class="page-title">{{ $t('device.management') }}</h2>
       <div class="right-operations">
         <el-input :placeholder="$t('device.searchPlaceholder')" v-model="searchKeyword" class="search-input"
-                  @keyup.enter.native="handleSearch" clearable/>
+          @keyup.enter.native="handleSearch" clearable />
         <el-button class="btn-search" @click="handleSearch">{{ $t('device.search') }}</el-button>
       </div>
     </div>
@@ -16,9 +16,9 @@
         <div class="content-area">
           <el-card class="device-card" shadow="never">
             <el-table ref="deviceTable" :data="paginatedDeviceList" class="transparent-table"
-                      :header-cell-class-name="headerCellClassName" v-loading="loading"
-                      :element-loading-text="$t('deviceManagement.loading')"
-                      element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.7)">
+              :header-cell-class-name="headerCellClassName" v-loading="loading"
+              :element-loading-text="$t('deviceManagement.loading')" element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(255, 255, 255, 0.7)">
               <el-table-column :label="$t('modelConfig.select')" align="center" width="120">
                 <template slot-scope="scope">
                   <el-checkbox v-model="scope.row.selected"></el-checkbox>
@@ -29,74 +29,83 @@
                   {{ getFirmwareTypeName(scope.row.model) }}
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('device.firmwareVersion')" prop="firmwareVersion" align="center"></el-table-column>
+              <el-table-column :label="$t('device.firmwareVersion')" prop="firmwareVersion"
+                align="center"></el-table-column>
               <el-table-column :label="$t('device.macAddress')" prop="macAddress" align="center"></el-table-column>
               <el-table-column :label="$t('device.bindTime')" prop="bindTime" align="center"></el-table-column>
-              <el-table-column :label="$t('device.lastConversation')" prop="lastConversation" align="center"></el-table-column>
+              <el-table-column :label="$t('device.lastConversation')" prop="lastConversation"
+                align="center"></el-table-column>
+              <el-table-column :label="$t('device.deviceStatus')" prop="deviceStatus" align="center">
+                <template slot-scope="scope">
+                  <el-tag v-if="scope.row.deviceStatus === 'online'" type="success">{{ $t('device.online') }}</el-tag>
+                  <el-tag v-else type="danger">{{ $t('device.offline') }}</el-tag>
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('device.remark')" align="center">
                 <template #default="{ row }">
-                  <el-input
-                      v-show="row.isEdit"
-                      v-model="row.remark"
-                      size="mini"
-                      maxlength="64"
-                      show-word-limit
-                      @blur="onRemarkBlur(row)"
-                      @keyup.enter.native="onRemarkEnter(row)"
-                  />
+                  <el-input v-show="row.isEdit" v-model="row.remark" size="mini" maxlength="64" show-word-limit
+                    @blur="onRemarkBlur(row)" @keyup.enter.native="onRemarkEnter(row)" />
                   <span v-show="!row.isEdit" class="remark-view">
-                  <i
-                      class="el-icon-edit"
-                      @click="row.isEdit = true"
-                      style="cursor: pointer;"
-                  ></i>
-                  <span @click="row.isEdit = true">
-                    {{ row.remark || '-' }}
+                    <i class="el-icon-edit" @click="row.isEdit = true" style="cursor: pointer;"></i>
+                    <span @click="row.isEdit = true">
+                      {{ row.remark || '-' }}
+                    </span>
                   </span>
-                </span>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('device.autoUpdate')" align="center">
                 <template slot-scope="scope">
                   <el-switch v-model="scope.row.otaSwitch" size="mini" active-color="#13ce66" inactive-color="#ff4949"
-                             @change="handleOtaSwitchChange(scope.row)"></el-switch>
+                    @change="handleOtaSwitchChange(scope.row)"></el-switch>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('device.operation')" align="center">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" @click="handleUnbind(scope.row.device_id)">
-                  {{ $t('device.unbind') }}
-                </el-button>
+                    {{ $t('device.unbind') }}
+                  </el-button>
+                  <el-button v-if="scope.row.deviceStatus === 'online'" size="mini" type="text" @click="handleMcpToolCall(scope.row.device_id)">
+                    {{ $t('device.toolCall') }}
+                  </el-button>
                 </template>
               </el-table-column>
             </el-table>
 
             <div class="table_bottom">
               <div class="ctrl_btn">
-                  <el-button size="mini" type="primary" class="select-all-btn" @click="handleSelectAll">
-                    {{ isCurrentPageAllSelected ? $t('common.deselectAll') : $t('common.selectAll') }}
-                  </el-button>
-                  <el-button type="success" size="mini" class="add-device-btn" @click="handleAddDevice">
-                    {{ $t('device.bindWithCode') }}
-                  </el-button>
-                  <el-button type="success" size="mini" class="add-device-btn" @click="handleManualAddDevice">
-                    {{ $t('device.manualAdd') }}
-                  </el-button>
-                  <el-button size="mini" type="danger" icon="el-icon-delete" @click="deleteSelected">{{ $t('device.unbind') }}</el-button>
-                </div>
+                <el-button size="mini" type="primary" class="select-all-btn" @click="handleSelectAll">
+                  {{ isCurrentPageAllSelected ? $t('common.deselectAll') : $t('common.selectAll') }}
+                </el-button>
+                <el-button type="success" size="mini" class="add-device-btn" @click="handleAddDevice">
+                  {{ $t('device.bindWithCode') }}
+                </el-button>
+                <el-button type="success" size="mini" class="add-device-btn" @click="handleManualAddDevice">
+                  {{ $t('device.manualAdd') }}
+                </el-button>
+                <el-button size="mini" type="danger" icon="el-icon-delete" @click="deleteSelected">{{
+                  $t('device.unbind')
+                }}</el-button>
+              </div>
               <div class="custom-pagination">
                 <el-select v-model="pageSize" @change="handlePageSizeChange" class="page-size-select">
-                    <el-option v-for="item in pageSizeOptions" :key="item" :label="$t('dictManagement.itemsPerPage').replace('{items}', item)" :value="item">
-                    </el-option>
-                  </el-select>
-                <button class="pagination-btn" :disabled="currentPage === 1" @click="goFirst">{{ $t('dictManagement.firstPage') }}</button>
-                  <button class="pagination-btn" :disabled="currentPage === 1" @click="goPrev">{{ $t('dictManagement.prevPage') }}</button>
+                  <el-option v-for="item in pageSizeOptions" :key="item"
+                    :label="$t('dictManagement.itemsPerPage').replace('{items}', item)" :value="item">
+                  </el-option>
+                </el-select>
+                <button class="pagination-btn" :disabled="currentPage === 1" @click="goFirst">{{
+                  $t('dictManagement.firstPage')
+                }}</button>
+                <button class="pagination-btn" :disabled="currentPage === 1" @click="goPrev">{{
+                  $t('dictManagement.prevPage')
+                }}</button>
                 <button v-for="page in visiblePages" :key="page" class="pagination-btn"
-                        :class="{ active: page === currentPage }" @click="goToPage(page)">
+                  :class="{ active: page === currentPage }" @click="goToPage(page)">
                   {{ page }}
                 </button>
-                <button class="pagination-btn" :disabled="currentPage === pageCount" @click="goNext">{{ $t('dictManagement.nextPage') }}</button>
-                <span class="total-text">{{ $t('dictManagement.totalRecords').replace('{total}', deviceList.length) }}</span>
+                <button class="pagination-btn" :disabled="currentPage === pageCount" @click="goNext">{{
+                  $t('dictManagement.nextPage') }}</button>
+                <span class="total-text">{{ $t('dictManagement.totalRecords').replace('{total}', deviceList.length)
+                }}</span>
               </div>
             </div>
           </el-card>
@@ -105,9 +114,10 @@
     </div>
 
     <AddDeviceDialog :visible.sync="addDeviceDialogVisible" :agent-id="currentAgentId"
-                     @refresh="fetchBindDevices(currentAgentId)"/>
+      @refresh="fetchBindDevices(currentAgentId)" />
     <ManualAddDeviceDialog :visible.sync="manualAddDeviceDialogVisible" :agent-id="currentAgentId"
-                     @refresh="fetchBindDevices(currentAgentId)"/>
+      @refresh="fetchBindDevices(currentAgentId)" />
+    <McpToolCallDialog :visible.sync="mcpToolCallDialogVisible" :device-id="selectedDeviceId" />
 
   </div>
 </template>
@@ -115,19 +125,23 @@
 <script>
 import Api from '@/apis/api';
 import AddDeviceDialog from "@/components/AddDeviceDialog.vue";
-import ManualAddDeviceDialog from "@/components/ManualAddDeviceDialog.vue";
 import HeaderBar from "@/components/HeaderBar.vue";
+import ManualAddDeviceDialog from "@/components/ManualAddDeviceDialog.vue";
+import McpToolCallDialog from "@/components/McpToolCallDialog.vue";
 
 export default {
   components: {
-    HeaderBar, 
+    HeaderBar,
     AddDeviceDialog,
-    ManualAddDeviceDialog
+    ManualAddDeviceDialog,
+    McpToolCallDialog
   },
   data() {
     return {
       addDeviceDialogVisible: false,
       manualAddDeviceDialogVisible: false,
+      mcpToolCallDialogVisible: false,
+      selectedDeviceId: '',
       searchKeyword: "",
       activeSearchKeyword: "",
       currentAgentId: this.$route.query.agentId || '',
@@ -145,8 +159,8 @@ export default {
       const keyword = this.activeSearchKeyword.toLowerCase();
       if (!keyword) return this.deviceList;
       return this.deviceList.filter(device =>
-          (device.model && device.model.toLowerCase().includes(keyword)) ||
-          (device.macAddress && device.macAddress.toLowerCase().includes(keyword))
+        (device.model && device.model.toLowerCase().includes(keyword)) ||
+        (device.macAddress && device.macAddress.toLowerCase().includes(keyword))
       );
     },
 
@@ -160,8 +174,8 @@ export default {
     },
     // 计算当前页是否全选
     isCurrentPageAllSelected() {
-      return this.paginatedDeviceList.length > 0 && 
-             this.paginatedDeviceList.every(device => device.selected);
+      return this.paginatedDeviceList.length > 0 &&
+        this.paginatedDeviceList.every(device => device.selected);
     },
     visiblePages() {
       const pages = [];
@@ -236,7 +250,7 @@ export default {
     batchUnbindDevices(deviceIds) {
       const promises = deviceIds.map(id => {
         return new Promise((resolve, reject) => {
-          Api.device.unbindDevice(id, ({data}) => {
+          Api.device.unbindDevice(id, ({ data }) => {
             if (data.code === 0) {
               resolve();
             } else {
@@ -246,19 +260,19 @@ export default {
         });
       });
       Promise.all(promises)
-          .then(() => {
-            this.$message.success({
-              message: this.$t('device.batchUnbindSuccess').replace('{count}', deviceIds.length),
-              showClose: true
-            });
-            this.fetchBindDevices(this.currentAgentId);
-          })
-          .catch(error => {
-            this.$message.error({
-              message: error || this.$t('device.batchUnbindError'),
-              showClose: true
-            });
+        .then(() => {
+          this.$message.success({
+            message: this.$t('device.batchUnbindSuccess').replace('{count}', deviceIds.length),
+            showClose: true
           });
+          this.fetchBindDevices(this.currentAgentId);
+        })
+        .catch(error => {
+          this.$message.error({
+            message: error || this.$t('device.batchUnbindError'),
+            showClose: true
+          });
+        });
     },
     handleAddDevice() {
       this.addDeviceDialogVisible = true;
@@ -266,6 +280,11 @@ export default {
     handleManualAddDevice() {
       this.manualAddDeviceDialogVisible = true;
     },
+
+    handleMcpToolCall(deviceId) {
+      this.selectedDeviceId = deviceId;
+      this.mcpToolCallDialogVisible = true;
+    },
     submitRemark(row) {
       if (row._submitting) return;
 
@@ -308,18 +327,18 @@ export default {
         cancelButtonText: this.$t('button.cancel'),
         type: 'warning'
       }).then(() => {
-        Api.device.unbindDevice(device_id, ({data}) => {
+        Api.device.unbindDevice(device_id, ({ data }) => {
           if (data.code === 0) {
-              this.$message.success({
-                message: this.$t('device.unbindSuccess'),
-                showClose: true
-              });
+            this.$message.success({
+              message: this.$t('device.unbindSuccess'),
+              showClose: true
+            });
             this.fetchBindDevices(this.$route.query.agentId);
           } else {
-              this.$message.error({
-                message: data.msg || this.$t('device.unbindFailed'),
-                showClose: true
-              });
+            this.$message.error({
+              message: data.msg || this.$t('device.unbindFailed'),
+              showClose: true
+            });
           }
         });
       });
@@ -339,7 +358,7 @@ export default {
 
     fetchBindDevices(agentId) {
       this.loading = true;
-      Api.device.getAgentBindDevices(agentId, ({data}) => {
+      Api.device.getAgentBindDevices(agentId, ({ data }) => {
         this.loading = false;
         if (data.code === 0) {
           this.deviceList = data.data.map(device => {
@@ -356,18 +375,74 @@ export default {
               _submitting: false,
               otaSwitch: device.autoUpdate === 1,
               rawBindTime: new Date(device.createDate).getTime(),
-              selected: false
+              selected: false,
+              // 初始设置为离线状态
+              deviceStatus: 'offline'
             };
           })
-              .sort((a, b) => a.rawBindTime - b.rawBindTime);
+            .sort((a, b) => a.rawBindTime - b.rawBindTime);
           this.activeSearchKeyword = "";
           this.searchKeyword = "";
+          
+          // 获取设备列表后，立即获取设备状态
+          this.fetchDeviceStatus(agentId);
         } else {
           this.$message.error(data.msg || this.$t('device.getListFailed'));
         }
       });
     },
-    headerCellClassName({columnIndex}) {
+    
+    // 获取设备状态
+    fetchDeviceStatus(agentId) {
+      Api.device.getDeviceStatus(agentId, ({ data }) => {
+        if (data.code === 0) {
+          try {
+            // 解析后端返回的设备状态JSON
+            const statusData = JSON.parse(data.data);
+            
+            // 直接使用解析后的数据作为设备状态映射（不需要devices字段包装）
+            if (statusData && typeof statusData === 'object') {
+              // 更新设备状态
+              this.updateDeviceStatusFromResponse(statusData);
+            }
+          } catch (error) {
+            // JSON解析失败，忽略状态更新
+          }
+        }
+      });
+    },
+    
+    // 根据API响应更新设备状态
+    updateDeviceStatusFromResponse(deviceStatusMap) {
+      this.deviceList.forEach(device => {
+        // 构建设备的MQTT客户端ID
+        const macAddress = device.macAddress ? device.macAddress.replace(/:/g, '_') : 'unknown';
+        const groupId = device.model ? device.model.replace(/:/g, '_') : 'GID_default';
+        const mqttClientId = `${groupId}@@@${macAddress}@@@${macAddress}`;
+        
+        // 从状态映射中获取设备状态
+        if (deviceStatusMap[mqttClientId]) {
+          const statusInfo = deviceStatusMap[mqttClientId];
+          
+          let isOnline = false;
+          if (statusInfo.isAlive === true) {
+            isOnline = true;
+          } else if (statusInfo.isAlive === false) {
+            isOnline = false;
+          } else if (statusInfo.isAlive === null && statusInfo.exists === true) {
+            isOnline = true;
+          } else {
+            isOnline = false;
+          }
+          
+          device.deviceStatus = isOnline ? 'online' : 'offline';
+        } else {
+          // 如果没有找到对应的状态信息，默认为离线
+          device.deviceStatus = 'offline';
+        }
+      });
+    },
+    headerCellClassName({ columnIndex }) {
       if (columnIndex === 0) {
         return "custom-selection-header";
       }
@@ -378,12 +453,12 @@ export default {
       return firmwareType ? firmwareType.name : type
     },
     updateDeviceInfo(device_id, payload, callback) {
-      return Api.device.updateDeviceInfo(device_id, payload, ({data}) => {
+      return Api.device.updateDeviceInfo(device_id, payload, ({ data }) => {
         callback(data.code === 0, data);
       })
     },
     handleOtaSwitchChange(row) {
-      this.updateDeviceInfo(row.device_id, {autoUpdate: row.otaSwitch ? 1 : 0}, (result, {msg}) => {
+      this.updateDeviceInfo(row.device_id, { autoUpdate: row.otaSwitch ? 1 : 0 }, (result, { msg }) => {
         if (result) {
           this.$message.success(row.otaSwitch ? this.$t('device.autoUpdateEnabled') : this.$t('device.autoUpdateDisabled'));
           return;

main/manager-web/src/views/ServerSideManager.vue

@@ -72,7 +72,6 @@ export default {
     this.fetchParams();
   },
   mounted() {
-    this.getServerList();
     this.dialogTitle = this.$t('paramManagement.addParam');
   },
 

main/manager-web/src/views/UserManagement.vue

@@ -16,8 +16,8 @@
         <div class="content-area">
           <el-card class="user-card" shadow="never">
             <el-table ref="userTable" :data="userList" class="transparent-table" v-loading="loading"
-                :element-loading-text="$t('modelConfig.loading')" element-loading-spinner="el-icon-loading"
-                element-loading-background="rgba(255, 255, 255, 0.7)">
+              :element-loading-text="$t('modelConfig.loading')" element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(255, 255, 255, 0.7)">
               <el-table-column :label="$t('modelConfig.select')" align="center" width="120">
                 <template slot-scope="scope">
                   <el-checkbox v-model="scope.row.selected"></el-checkbox>
@@ -36,13 +36,13 @@
               <el-table-column :label="$t('modelConfig.action')" align="center" width="300px">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" @click="resetPassword(scope.row)">{{ $t('user.resetPassword')
-                  }}</el-button>
+                    }}</el-button>
                   <el-button size="mini" type="text" v-if="scope.row.status === 1"
                     @click="handleChangeStatus(scope.row, 0)">{{ $t('user.disableAccount') }}</el-button>
                   <el-button size="mini" type="text" v-if="scope.row.status === 0"
                     @click="handleChangeStatus(scope.row, 1)">{{ $t('user.enableAccount') }}</el-button>
                   <el-button size="mini" type="text" @click="deleteUser(scope.row)">{{ $t('user.deleteUser')
-                  }}</el-button>
+                    }}</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -54,19 +54,18 @@
                 </el-button>
                 <el-button size="mini" type="success" icon="el-icon-circle-check" @click="batchEnable">{{
                   $t('user.enable')
-                }}</el-button>
+                  }}</el-button>
                 <el-button size="mini" type="warning" @click="batchDisable"><i
                     class="el-icon-remove-outline rotated-icon"></i>{{
                       $t('user.disable') }}</el-button>
                 <el-button size="mini" type="danger" icon="el-icon-delete" @click="batchDelete">{{ $t('user.delete')
-                }}</el-button>
+                  }}</el-button>
               </div>
               <div class="custom-pagination">
                 <el-select v-model="pageSize" @change="handlePageSizeChange"
-                  :class="['page-size-select', { 'page-size-select-en': isEnglish }]">
+                  :class="['page-size-select', { 'page-size-select-en': $i18n.locale === 'en' }]">
                   <el-option v-for="item in pageSizeOptions" :key="item"
-                    :label="$t('modelConfig.itemsPerPage', { items: item })"
-                    :value="item">
+                    :label="$t('modelConfig.itemsPerPage', { items: item })" :value="item">
                   </el-option>
                 </el-select>
 
@@ -82,7 +81,7 @@
                 </button> <button class="pagination-btn" :disabled="currentPage === pageCount" @click="goNext">
                   {{ $t('modelConfig.nextPage') }}
                 </button>
-                <span class="total-text">{{ $t('modelConfig.totalRecords', { count: total }) }}</span>
+                <span class="total-text">{{ $t('modelConfig.totalRecords', { total: total }) }}</span>
               </div>
             </div>
           </el-card>
@@ -126,9 +125,6 @@ export default {
     pageCount() {
       return Math.ceil(this.total / this.pageSize);
     },
-    isEnglish() {
-      return i18n.locale === 'en';
-    },
     visiblePages() {
       const pages = [];
       const maxVisible = 3;
@@ -143,7 +139,7 @@ export default {
         pages.push(i);
       }
       return pages;
-    },
+    }
   },
   methods: {
     handlePageSizeChange(val) {
@@ -347,7 +343,7 @@ export default {
         this.$message.warning(this.$t('user.selectUsersFirst'));
         return;
       }
-      
+
       const userIds = this.selection.map(item => item.userId);
       this.$confirm(this.$t('user.confirmDeleteSelected', { count: this.selection.length }), this.$t('common.warning'), {
         confirmButtonText: this.$t('common.confirm'),
@@ -380,10 +376,10 @@ export default {
         this.$message.warning(this.$t('user.selectUsersFirst'));
         return;
       }
-      
+
       const actionText = status === 1 ? this.$t('user.enable') : this.$t('user.disable');
       const userIds = this.selection.map(item => item.userId);
-      
+
       this.$confirm(this.$t('user.confirmStatusChange', { action: actionText, count: this.selection.length }), this.$t('common.warning'), {
         confirmButtonText: this.$t('common.confirm'),
         cancelButtonText: this.$t('common.cancel'),

main/manager-web/src/views/login.vue

@@ -252,9 +252,9 @@ export default {
     },
 
     // 封装输入验证逻辑
-    validateInput(input, message) {
+    validateInput(input, messageKey) {
       if (!input.trim()) {
-        showDanger(message);
+        showDanger(this.$t(messageKey));
         return false;
       }
       return true;
@@ -264,24 +264,24 @@ export default {
       if (this.isMobileLogin) {
         // 手机号登录验证
         if (!validateMobile(this.form.mobile, this.form.areaCode)) {
-          showDanger("请输入正确的手机号码");
+          showDanger(this.$t('login.requiredMobile'));
           return;
         }
         // 拼接手机号作为用户名
         this.form.username = this.form.areaCode + this.form.mobile;
       } else {
         // 用户名登录验证
-        if (!this.validateInput(this.form.username, "用户名不能为空")) {
+        if (!this.validateInput(this.form.username, 'login.requiredUsername')) {
           return;
         }
       }
 
       // 验证密码
-      if (!this.validateInput(this.form.password, "密码不能为空")) {
+      if (!this.validateInput(this.form.password, 'login.requiredPassword')) {
         return;
       }
       // 验证验证码
-      if (!this.validateInput(this.form.captcha, "验证码不能为空")) {
+      if (!this.validateInput(this.form.captcha, 'login.requiredCaptcha')) {
         return;
       }
 
@@ -289,16 +289,19 @@ export default {
       Api.user.login(
         this.form,
         ({ data }) => {
-          showSuccess("登录成功！");
+          showSuccess(this.$t('login.loginSuccess'));
           this.$store.commit("setToken", JSON.stringify(data.data));
           goToPage("/home");
         },
         (err) => {
-          showDanger(err.data.msg || "登录失败");
+          // 直接使用后端返回的国际化消息
+          let errorMessage = err.data.msg || "登录失败";
+          
+          showDanger(errorMessage);
           if (
             err.data != null &&
             err.data.msg != null &&
-            err.data.msg.indexOf("图形验证码") > -1
+            err.data.msg.indexOf("图形验证码") > -1 || err.data.msg.indexOf("Captcha") > -1
           ) {
             this.fetchCaptcha();
           }

main/manager-web/src/views/register.vue

@@ -47,7 +47,7 @@
                     <img loading="lazy" alt="" class="input-icon" src="@/assets/login/shield.png" />
                     <el-input v-model="form.captcha" :placeholder="$t('register.captchaPlaceholder')" style="flex: 1;" />
                   </div>
-                  <img loading="lazy" v-if="captchaUrl" :src="captchaUrl" alt="验证码"
+                  <img loading="lazy" v-if="captchaUrl" :src="captchaUrl" alt="验证码" 
                     style="width: 150px; height: 40px; cursor: pointer;" @click="fetchCaptcha" />
                 </div>
 
@@ -61,7 +61,7 @@
                   <el-button type="primary" class="send-captcha-btn" :disabled="!canSendMobileCaptcha"
                     @click="sendMobileCaptcha">
                     <span>
-                      {{ countdown > 0 ? `${countdown}秒后重试` : $t('register.sendCaptcha') }}
+                      {{ countdown > 0 ? `${countdown}${$t('register.secondsLater')}` : $t('register.sendCaptcha') }}
                     </span>
                   </el-button>
                 </div>
@@ -248,18 +248,18 @@ export default {
           return;
         }
         if (!this.form.mobileCaptcha) {
-          showDanger('请输入手机验证码');
+          showDanger(this.$t('register.requiredMobileCaptcha'));
           return;
         }
       } else {
         // 用户名注册验证
-        if (!this.validateInput(this.form.username, '用户名不能为空')) {
+        if (!this.validateInput(this.form.username, this.$t('register.requiredUsername'))) {
           return;
         }
       }
 
       // 验证密码
-      if (!this.validateInput(this.form.password, '密码不能为空')) {
+      if (!this.validateInput(this.form.password, this.$t('register.requiredPassword'))) {
         return;
       }
       if (this.form.password !== this.form.confirmPassword) {
@@ -267,7 +267,7 @@ export default {
         return
       }
       // 验证验证码
-      if (!this.validateInput(this.form.captcha, '验证码不能为空')) {
+      if (!this.validateInput(this.form.captcha, this.$t('register.requiredCaptcha'))) {
         return;
       }