From 04a859aa95b231c032c71d06518497a973c2f4e8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 15 Jan 2026 17:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/basicManage/maintainRecord/index.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/maintainRecord/index.vue b/applications/drone-command/src/views/basicManage/maintainRecord/index.vue
index 2aaa9f8..f51cfbc 100644
--- a/applications/drone-command/src/views/basicManage/maintainRecord/index.vue
+++ b/applications/drone-command/src/views/basicManage/maintainRecord/index.vue
@@ -28,7 +28,7 @@
<div class="ztzf-table-toolbar">
<el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">维护计划</el-button>
- <el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
+ <el-button :icon="Delete" color="#1A2652" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
</div>
<div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
@@ -36,17 +36,17 @@
<el-table class="ztzf-data-cockpit-table" :data="list" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="46" />
<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 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="manufacturer" show-overflow-tooltip width="130" label="生产厂商" />
- <el-table-column prop="charger" show-overflow-tooltip width="100" label="负责人" />
- <el-table-column prop="maintainReminder" show-overflow-tooltip width="116" label="维护提醒" />
- <el-table-column prop="planCycleType" show-overflow-tooltip width="160" label="维护计划">
+ <el-table-column prop="deviceModel" show-overflow-tooltip label="型号" />
+ <el-table-column prop="manufacturer" show-overflow-tooltip label="生产厂商" />
+ <el-table-column prop="charger" show-overflow-tooltip label="负责人" />
+ <el-table-column prop="maintainReminder" show-overflow-tooltip label="维护提醒" />
+ <el-table-column prop="planCycleType" show-overflow-tooltip label="维护计划">
<template v-slot="{ row }">
{{ getPlanCycleLabel(row) }}
</template>
@@ -73,7 +73,7 @@
</basic-container>
</template>
<script setup>
-import { Search, RefreshRight, Plus } from '@element-plus/icons-vue'
+import { Search, RefreshRight, Plus, Delete } from '@element-plus/icons-vue'
import { onMounted, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictionaryByCode } from '@/api/system/dictbiz'
@@ -95,7 +95,7 @@
})
const searchParams = ref(initSearchParams()) // 查询参数
const total = ref(0) // 总条数
-const loading = ref(false) // 列表加载中
+const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
const selectedIds = ref([]) // 勾选的ID列表
const queryParamsRef = ref(null) // 查询表单实例
--
Gitblit v1.9.3