From c8a416829d700542718fe5f1e5fa3c4036205828 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 31 Jan 2026 14:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/deviceStock/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/index.vue b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
index 561ce69..38cb3d6 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
@@ -81,17 +81,17 @@
<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="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 label="操作" class-name="operation-btns">
<template v-slot="{ row }">
<el-link @click="handleView(row)">查看</el-link>
<el-link @click="handleEdit(row)">编辑</el-link>
--
Gitblit v1.9.3