refactor(client):优化设备管理与登录逻辑
- 移除冗余的日志记录器声明 - 简化设备心跳接口,合并注册与更新逻辑 - 调整设备数量限制检查逻辑,提高代码可读性 - 修改默认设备数量限制从3台调整为1台- 更新客户端登出提示文案- 固定启动窗口尺寸并移除延迟启动逻辑 - 调整设备移除时的消息提示内容
This commit is contained in:
@@ -96,8 +96,8 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="过期时间" align="center" prop="expireTime" width="130">
|
||||
<template slot-scope="scope">
|
||||
<el-tag
|
||||
:type="getRemainingDays(scope.row.expireTime).type"
|
||||
<el-tag
|
||||
:type="getRemainingDays(scope.row.expireTime).type"
|
||||
size="small"
|
||||
>
|
||||
{{ getRemainingDays(scope.row.expireTime).text }}
|
||||
@@ -186,14 +186,14 @@
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备数量限制" prop="deviceLimit">
|
||||
<el-input-number
|
||||
v-model="form.deviceLimit"
|
||||
:min="1"
|
||||
:max="20"
|
||||
<el-input-number
|
||||
v-model="form.deviceLimit"
|
||||
:min="1"
|
||||
:max="20"
|
||||
placeholder="请输入设备数量限制"
|
||||
style="width: 100%;"
|
||||
></el-input-number>
|
||||
<span style="color: #909399; font-size: 12px;">允许同时登录的设备数量,默认3台</span>
|
||||
<span style="color: #909399; font-size: 12px;">允许同时登录的设备数量,默认1台</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="功能权限" prop="permissions">
|
||||
<div class="permission-config">
|
||||
@@ -232,8 +232,8 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="设备试用期" prop="trialExpireTime" width="130" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tag
|
||||
:type="getRemainingDays(scope.row.trialExpireTime).type"
|
||||
<el-tag
|
||||
:type="getRemainingDays(scope.row.trialExpireTime).type"
|
||||
size="small"
|
||||
>
|
||||
{{ getRemainingDays(scope.row.trialExpireTime).text }}
|
||||
@@ -472,7 +472,7 @@ export default {
|
||||
}
|
||||
// 执行更新
|
||||
promises.push(updateAccount(this.form));
|
||||
|
||||
|
||||
Promise.all(promises).then(() => {
|
||||
const msg = this.form.renewDays ? "修改并续费成功" : "修改成功";
|
||||
this.$modal.msgSuccess(msg);
|
||||
@@ -635,7 +635,7 @@ export default {
|
||||
/** 计算续费后的新到期时间 */
|
||||
calculateNewExpireTime() {
|
||||
if (!this.form.renewDays) return '';
|
||||
|
||||
|
||||
let baseDate;
|
||||
if (this.form.expireTime && new Date(this.form.expireTime) > new Date()) {
|
||||
// 未过期,从到期时间延长
|
||||
@@ -644,7 +644,7 @@ export default {
|
||||
// 已过期或无到期时间,从当前时间开始
|
||||
baseDate = new Date();
|
||||
}
|
||||
|
||||
|
||||
baseDate.setDate(baseDate.getDate() + this.form.renewDays);
|
||||
return baseDate.toLocaleString('zh-CN', {
|
||||
year: 'numeric',
|
||||
@@ -660,12 +660,12 @@ export default {
|
||||
if (!expireTime) {
|
||||
return { text: '未设置', type: 'info' };
|
||||
}
|
||||
|
||||
|
||||
const now = new Date();
|
||||
const expireDate = new Date(expireTime);
|
||||
const diffTime = expireDate - now;
|
||||
const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
|
||||
|
||||
|
||||
if (diffDays < 0) {
|
||||
return { text: '已过期', type: 'danger' };
|
||||
} else if (diffDays <= 3) {
|
||||
|
||||
Reference in New Issue
Block a user