From 0c973a2dd1f2d659a15a167e6b71ceb208b5ae98 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 05 Mar 2026 10:09:46 +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 38cb3d6..24e2170 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
@@ -64,7 +64,7 @@
<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="deviceType" show-overflow-tooltip width="80" label="设备类型">
<template v-slot="{ row }">
{{ getDictLabel(row.deviceType, dictObj.deviceType) }}
</template>
@@ -79,7 +79,7 @@
</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="belongDeptName" show-overflow-tooltip label="所属部门" />
<el-table-column prop="charger" show-overflow-tooltip width="100" label="负责人" />
<el-table-column prop="yxzt" show-overflow-tooltip width="96" label="运行状态">
<template v-slot="{ row }">
@@ -91,7 +91,7 @@
{{ getDictLabel(row.trackStatus, trackStatusOptions) }}
</template>
</el-table-column>
- <el-table-column label="操作" class-name="operation-btns">
+ <el-table-column label="操作" class-name="operation-btns" width="150">
<template v-slot="{ row }">
<el-link @click="handleView(row)">查看</el-link>
<el-link @click="handleEdit(row)">编辑</el-link>
--
Gitblit v1.9.3