luo/one-pipe-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

倒计时没有覆盖复机停机的问题

Browse Source
This commit is contained in:
break
2026-06-25 10:30:49 +08:00
parent cfb6b52cc2
commit f604791c69
6 changed files with 144 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/modules/asset.ts
View File

@@ -165,9 +165,8 @@ export class AssetService extends BaseService {
* @param identifier 资产标识符（ICCID 或 VirtualNo）
*/
static stopAsset(identifier: string): Promise<BaseResponse<DeviceStopResponse | void>> {
return this.post<BaseResponse<DeviceStopResponse | void>>(
`/api/admin/assets/${identifier}/stop`,
{}
return runRateLimitedAssetAction('stop', identifier, () =>
this.post<BaseResponse<DeviceStopResponse | void>>(`/api/admin/assets/${identifier}/stop`, {})
)
}

2
src/utils/business/apiRateLimit.ts
View File

@@ -1,7 +1,7 @@
const FIVE_MINUTES_MS = 5 * 60 * 1000
const STORAGE_KEY_PREFIX = 'asset-action-rate-limit'
export type AssetRateLimitedAction = 'refresh' | 'start'
export type AssetRateLimitedAction = 'refresh' | 'start' | 'stop'
export class FrontendRateLimitError extends Error {
readonly remainingMs: number

56
src/views/asset-management/asset-information/components/BasicInfoCard.vue
View File

@@ -184,7 +184,7 @@
<el-icon
class="copy-icon"
@click="handleCopyICCID(scope.row.iccid)"
style=" color: var(--el-color-primary);cursor: pointer"
style="color: var(--el-color-primary); cursor: pointer"
>
<CopyDocument />
</el-icon>
@@ -239,20 +239,22 @@
type="success"
size="small"
link
:disabled="isBindingStartDisabled(scope.row)"
@click="handleEnableBindingCard(scope.row)"
v-permission="'iot_info:start'"
>
启用此卡
{{ getBindingStartButtonText(scope.row) }}
</ElButton>
<ElButton
v-if="scope.row.network_status === 1"
type="warning"
size="small"
link
:disabled="isBindingStopDisabled(scope.row)"
@click="handleDisableBindingCard(scope.row)"
v-permission="'iot_info:stop'"
>
停用此卡
{{ getBindingStopButtonText(scope.row) }}
</ElButton>
<ElButton
type="primary"
@@ -397,17 +399,19 @@
v-if="cardInfo?.network_status === 0"
v-permission="'iot_info:start'"
type="success"
:disabled="startDisabled"
@click="handleEnableCard"
>
启用此卡
{{ startRemainingText ? `启用此卡(${startRemainingText})` : '启用此卡' }}
</ElButton>
<ElButton
v-if="cardInfo?.network_status === 1"
v-permission="'iot_info:stop'"
type="warning"
:disabled="stopDisabled"
@click="handleDisableCard"
>
停用此卡
{{ stopRemainingText ? `停用此卡(${stopRemainingText})` : '停用此卡' }}
</ElButton>
<!--<ElButton type="danger" v-permission="'iot_info:handler_stop'" @click="handleManualDeactivate"> 手动停用 </ElButton>-->
<!-- 手动停用暂时不开放 -->
@@ -580,10 +584,22 @@
deviceRealtime: DeviceRealtimeInfo | null
pollingEnabled: boolean
realtimeLoading?: boolean
startDisabled?: boolean
stopDisabled?: boolean
startRemainingText?: string
stopRemainingText?: string
getStartRemainingText?: (identifier: string) => string
getStopRemainingText?: (identifier: string) => string
isStartDisabled?: (identifier: string) => boolean
isStopDisabled?: (identifier: string) => boolean
}
const props = withDefaults(defineProps<Props>(), {
realtimeLoading: false
realtimeLoading: false,
startDisabled: false,
stopDisabled: false,
startRemainingText: '',
stopRemainingText: ''
})
const { hasAuth } = useAuth()
@@ -717,17 +733,15 @@
// 卡操作
const handleEnableCard = () => {
if (props.startDisabled) return
emit('enableCard')
}
const handleDisableCard = () => {
if (props.stopDisabled) return
emit('disableCard')
}
const handleManualDeactivate = () => {
emit('manualDeactivate')
}
// 设备操作
const handleRebootDevice = () => {
emit('rebootDevice')
@@ -758,7 +772,28 @@
}
// 绑定卡操作
const getBindingStartRemainingText = (card: BindingCard) =>
props.getStartRemainingText?.(card.iccid) || ''
const getBindingStopRemainingText = (card: BindingCard) =>
props.getStopRemainingText?.(card.iccid) || ''
const isBindingStartDisabled = (card: BindingCard) => props.isStartDisabled?.(card.iccid) || false
const isBindingStopDisabled = (card: BindingCard) => props.isStopDisabled?.(card.iccid) || false
const getBindingStartButtonText = (card: BindingCard) => {
const remainingText = getBindingStartRemainingText(card)
return remainingText ? `启用此卡(${remainingText})` : '启用此卡'
}
const getBindingStopButtonText = (card: BindingCard) => {
const remainingText = getBindingStopRemainingText(card)
return remainingText ? `停用此卡(${remainingText})` : '停用此卡'
}
const handleEnableBindingCard = (card: BindingCard) => {
if (isBindingStartDisabled(card)) return
ElMessageBox.confirm(`确定要启用此卡（${card.iccid}）吗？`, '启用确认', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -771,6 +806,7 @@
}
const handleDisableBindingCard = (card: BindingCard) => {
if (isBindingStopDisabled(card)) return
ElMessageBox.confirm(`确定要停用此卡（${card.iccid}）吗？`, '停用确认', {
confirmButtonText: '确定',
cancelButtonText: '取消',

4
src/views/asset-management/asset-information/composables/useAssetOperations.ts
View File

@@ -69,6 +69,10 @@ export function useAssetOperations(cardInfo: Ref<any>, refreshAssetFn?: () => Pr
}
} catch (error: any) {
if (error !== 'cancel') {
if (error instanceof FrontendRateLimitError) {
ElMessage.warning(`操作过于频繁，请${formatRemainingTime(error.remainingMs)}后再试`)
return
}
console.error('停用失败:', error)
}
} finally {

90
src/views/asset-management/asset-information/index.vue
View File

@@ -20,6 +20,14 @@
:device-realtime="deviceRealtime"
v-model:polling-enabled="pollingEnabled"
:realtime-loading="realtimeLoading"
:start-disabled="startDisabled"
:stop-disabled="stopDisabled"
:start-remaining-text="startRemainingText"
:stop-remaining-text="stopRemainingText"
:get-start-remaining-text="getStartRemainingText"
:get-stop-remaining-text="getStopRemainingText"
:is-start-disabled="isStartActionDisabled"
:is-stop-disabled="isStopActionDisabled"
@enable-card="handleEnableCard"
@disable-card="handleDisableCard"
@manual-deactivate="handleManualDeactivate"
@@ -176,7 +184,8 @@
import {
formatRemainingTime,
FrontendRateLimitError,
getAssetActionRateLimitState
getAssetActionRateLimitState,
type AssetRateLimitedAction
} from '@/utils/business/apiRateLimit'
// 引入子组件
@@ -248,6 +257,8 @@
// ========== 资产操作方法（使用 composable） ==========
const {
enableCardLoading,
disableCardLoading,
enableCard: enableCardOp,
disableCard: disableCardOp,
manualDeactivateCard: manualDeactivateCardOp,
@@ -342,6 +353,59 @@
: ''
)
const startRateLimitState = computed(() => {
const identifier = cardInfo.value?.iccid || cardInfo.value?.identifier
if (!identifier) {
return {
limited: false,
remainingMs: 0,
retryAt: 0
}
}
return getAssetActionRateLimitState('start', identifier, rateLimitNow.value)
})
const stopRateLimitState = computed(() => {
const identifier = cardInfo.value?.iccid || cardInfo.value?.identifier
if (!identifier) {
return {
limited: false,
remainingMs: 0,
retryAt: 0
}
}
return getAssetActionRateLimitState('stop', identifier, rateLimitNow.value)
})
const startDisabled = computed(() => enableCardLoading.value || startRateLimitState.value.limited)
const stopDisabled = computed(() => disableCardLoading.value || stopRateLimitState.value.limited)
const startRemainingText = computed(() =>
startRateLimitState.value.limited
? formatRemainingTime(startRateLimitState.value.remainingMs)
: ''
)
const stopRemainingText = computed(() =>
stopRateLimitState.value.limited
? formatRemainingTime(stopRateLimitState.value.remainingMs)
: ''
)
const getActionRemainingText = (action: AssetRateLimitedAction, identifier?: string) => {
if (!identifier) return ''
const state = getAssetActionRateLimitState(action, identifier, rateLimitNow.value)
return state.limited ? formatRemainingTime(state.remainingMs) : ''
}
const isActionDisabled = (action: AssetRateLimitedAction, identifier?: string) => {
if (!identifier) return false
return getAssetActionRateLimitState(action, identifier, rateLimitNow.value).limited
}
const getStartRemainingText = (identifier: string) => getActionRemainingText('start', identifier)
const getStopRemainingText = (identifier: string) => getActionRemainingText('stop', identifier)
const isStartActionDisabled = (identifier: string) => isActionDisabled('start', identifier)
const isStopActionDisabled = (identifier: string) => isActionDisabled('stop', identifier)
const updateRateLimitNow = () => {
rateLimitNow.value = Date.now()
}
@@ -399,14 +463,24 @@
* IoT卡操作 - 启用卡
*/
const handleEnableCard = async () => {
await enableCardOp()
if (startDisabled.value) return
try {
await enableCardOp()
} finally {
updateRateLimitNow()
}
}
/**
* IoT卡操作 - 停用卡
*/
const handleDisableCard = async () => {
await disableCardOp()
if (stopDisabled.value) return
try {
await disableCardOp()
} finally {
updateRateLimitNow()
}
}
/**
@@ -550,6 +624,7 @@
*/
const handleEnableBindingCard = async (payload: { card: any }) => {
const { card } = payload
if (isStartActionDisabled(card.iccid)) return
try {
const { AssetService } = await import('@/api/modules')
await AssetService.startAsset(card.iccid)
@@ -562,6 +637,8 @@
return
}
console.error('启用绑定卡失败:', error)
} finally {
updateRateLimitNow()
}
}
@@ -570,6 +647,7 @@
*/
const handleDisableBindingCard = async (payload: { card: any }) => {
const { card } = payload
if (isStopActionDisabled(card.iccid)) return
try {
const { AssetService } = await import('@/api/modules')
await AssetService.stopAsset(card.iccid)
@@ -577,7 +655,13 @@
if (cardInfo.value)
await loadRealtimeStatus(cardInfo.value.identifier, cardInfo.value.asset_type)
} catch (error: any) {
if (error instanceof FrontendRateLimitError) {
ElMessage.warning(`操作过于频繁，请${formatRemainingTime(error.remainingMs)}后再试`)
return
}
console.error('停用绑定卡失败:', error)
} finally {
updateRateLimitNow()
}
}

4
src/views/asset-management/iot-card-management/index.vue
View File

@@ -2920,6 +2920,10 @@
await getTableData()
}
} catch (error: any) {
if (error instanceof FrontendRateLimitError) {
ElMessage.warning(`操作过于频繁，请${formatRemainingTime(error.remainingMs)}后再试`)
return
}
console.error('停用此卡失败:', error)
}
})