From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/basicManage/deviceStock/index.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/index.vue b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
index 2b49523..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 :key="updateKey"/>
- <DeviceChart2 :key="updateKey"/>
- <DeviceChart3 :key="updateKey"/>
+ <DeviceChart1 :key="updateKey" />
+ <DeviceChart2 :key="updateKey" />
+ <DeviceChart3 :key="updateKey" />
</div>
<el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
@@ -91,7 +91,14 @@
{{ getDictLabel(row.trackStatus, trackStatusOptions) }}
</template>
</el-table-column>
- <el-table-column label="操作" class-name="operation-btns" width="196">
+ <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>
@@ -172,7 +179,7 @@
// 出库状态
const trackStatusOptions = ref([
{ dictKey: 0, dictValue: '未出库' },
- { dictKey: 1, dictValue: '已出库' }
+ { dictKey: 1, dictValue: '已出库' },
])
const updateKey = ref(0)
@@ -232,7 +239,7 @@
cancelButtonClass: 'command-message-box-cancel',
})
const payload = {
- deviceId: row.id
+ deviceId: row.id,
}
await fwDeviceUpdateTrackStatusApi(payload)
ElMessage.success('归还成功')
@@ -341,4 +348,7 @@
}
}
}
+.danger-text {
+ color: red; /* 或者直接用 red */
+}
</style>
--
Gitblit v1.9.3