From 5f694550ed7bf0f6147c66feaa4406034ae62e54 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 11 Aug 2026 19:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/index.vue | 56 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/index.vue b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
index e3008db..8fd28ee 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
@@ -1,9 +1,9 @@
<template>
<basic-container>
<div class="chart">
- <DeviceChart1 />
- <DeviceChart2 />
- <DeviceChart3 />
+ <DeviceChart1 :key="updateKey" />
+ <DeviceChart2 :key="updateKey" />
+ <DeviceChart3 :key="updateKey" />
</div>
<el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
@@ -63,15 +63,15 @@
<div class="command-table-content command-table-content-bg">
<el-table class="command-table" :data="list" @selection-change="handleSelectionChange">
<el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
- <el-table-column prop="deviceName" show-overflow-tooltip width="130" label="设备名称" />
- <el-table-column prop="deviceType" show-overflow-tooltip width="130" label="设备类型">
+ <el-table-column prop="deviceName" show-overflow-tooltip label="设备名称" />
+ <el-table-column prop="deviceType" show-overflow-tooltip width="100" label="设备类型">
<template v-slot="{ row }">
{{ getDictLabel(row.deviceType, dictObj.deviceType) }}
</template>
</el-table-column>
- <el-table-column prop="deviceModel" show-overflow-tooltip width="98" label="型号" />
- <el-table-column prop="deviceSpecification" show-overflow-tooltip width="112" label="规格" />
- <el-table-column prop="manufacturer" show-overflow-tooltip width="130" label="生产厂商" />
+ <el-table-column prop="deviceModel" show-overflow-tooltip width="110" label="型号" />
+ <el-table-column prop="deviceSpecification" show-overflow-tooltip width="142" label="规格" />
+ <el-table-column prop="manufacturer" show-overflow-tooltip width="140" label="生产厂商" />
<el-table-column prop="createTime" show-overflow-tooltip width="96" label="入库时间">
<template v-slot="{ row }">
{{ dayjs(row.createTime).format('YYYY-MM-DD') }}
@@ -79,19 +79,26 @@
</el-table-column>
<el-table-column prop="source" show-overflow-tooltip width="120" label="来源" />
<el-table-column prop="purpose" show-overflow-tooltip width="130" label="用途" />
- <el-table-column prop="belongDeptName" show-overflow-tooltip width="160" label="所属部门" />
- <el-table-column prop="charger" show-overflow-tooltip width="100" label="负责人" />
- <el-table-column prop="yxzt" show-overflow-tooltip width="116" label="运行状态">
+ <el-table-column prop="belongDeptName" show-overflow-tooltip width="130" label="所属部门" />
+ <el-table-column prop="charger" show-overflow-tooltip width="130" label="负责人" />
+ <el-table-column prop="yxzt" show-overflow-tooltip width="96" label="运行状态">
<template v-slot="{ row }">
{{ getDictLabel(row.status, dictObj.deviceStatus) }}
</template>
</el-table-column>
- <el-table-column prop="yxzt" show-overflow-tooltip width="116" label="出库状态">
+ <el-table-column prop="yxzt" show-overflow-tooltip width="96" label="出库状态">
<template v-slot="{ row }">
{{ getDictLabel(row.trackStatus, trackStatusOptions) }}
</template>
</el-table-column>
- <el-table-column label="操作" class-name="operation-btns" width="140">
+ <el-table-column prop="maintenanceStatus" show-overflow-tooltip width="96" label="报废预警">
+ <template v-slot="{ row }">
+ <span :style="{ color: row.maintenanceStatus === 0 ? 'inherit' : 'red' }">
+ {{ row.maintenanceStatus === 0 ? '正常' : '临近报废' }}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" class-name="operation-btns" width="196" fixed="right">
<template v-slot="{ row }">
<el-link @click="handleView(row)">查看</el-link>
<el-link @click="handleEdit(row)">编辑</el-link>
@@ -116,9 +123,9 @@
</div>
</div>
- <FormDiaLog ref="dialogRef" @success="getList" />
- <DeviceTrackDiaLog ref="outboundDialogRef" @success="getList" />
- <DeviceScrapDiaLog ref="scrapDialogRef" @success="getList" />
+ <FormDiaLog ref="dialogRef" @success="successFun" />
+ <DeviceTrackDiaLog ref="outboundDialogRef" @success="successFun" />
+ <DeviceScrapDiaLog ref="scrapDialogRef" @success="successFun" />
</basic-container>
</template>
@@ -172,8 +179,14 @@
// 出库状态
const trackStatusOptions = ref([
{ dictKey: 0, dictValue: '未出库' },
- { dictKey: 1, dictValue: '已出库' }
+ { dictKey: 1, dictValue: '已出库' },
])
+
+const updateKey = ref(0)
+function successFun() {
+ updateKey.value = updateKey.value + 1
+ getList()
+}
// 获取列表
async function getList() {
@@ -219,14 +232,14 @@
// 归还
async function returnDevice(row) {
- await ElMessageBox.confirm(`确认归还吗？`, '提示', {
+ await ElMessageBox.confirm(`确认归还吗？`, '提示', {
type: 'warning',
customClass: 'command-page-view-message-box',
confirmButtonClass: 'command-message-box-confirm',
cancelButtonClass: 'command-message-box-cancel',
})
const payload = {
- deviceId: row.id
+ deviceId: row.id,
}
await fwDeviceUpdateTrackStatusApi(payload)
ElMessage.success('归还成功')
@@ -240,7 +253,7 @@
// 删除
async function handleDelete(row) {
const tips = row ? '该条' : '选中的项'
- await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', {
+ await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', {
type: 'warning',
customClass: 'command-page-view-message-box',
confirmButtonClass: 'command-message-box-confirm',
@@ -335,4 +348,7 @@
}
}
}
+.danger-text {
+ color: red; /* 或者直接用 red */
+}
</style>
--
Gitblit v1.9.3