From 40c2702c3da24d9d9fda6bd63894c3206779f812 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 17 Jan 2026 16:46:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/basicManage/maintainRecord/index.vue |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/applications/drone-command/src/views/basicManage/maintainRecord/index.vue b/applications/drone-command/src/views/basicManage/maintainRecord/index.vue
index f51cfbc..9010791 100644
--- a/applications/drone-command/src/views/basicManage/maintainRecord/index.vue
+++ b/applications/drone-command/src/views/basicManage/maintainRecord/index.vue
@@ -1,21 +1,21 @@
 <template>
 	<basic-container>
-		<el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
-			<el-form-item label="名称" prop="deviceName">
-				<el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.deviceName" placeholder="请输入"
+		<el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
+			<el-form-item label="设备名称" prop="deviceName">
+				<el-input class="command-data-cockpit-search-input" v-model="searchParams.deviceName" placeholder="请输入"
 					clearable @clear="handleSearch" />
 			</el-form-item>
 
-			<el-form-item label="类型" prop="deviceType">
-				<el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
+			<el-form-item label="设备类型" prop="deviceType">
+				<el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper"
 					v-model="searchParams.deviceType" placeholder="请选择" clearable @change="handleSearch">
 					<el-option v-for="item in dictObj.deviceType" :key="item.dictKey" :label="item.dictValue"
 						:value="item.dictKey" />
 				</el-select>
 			</el-form-item>
 
-			<el-form-item label="部门" prop="belongDept">
-				<el-tree-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-tree-select-popper"
+			<el-form-item label="所属部门" prop="belongDept">
+				<el-tree-select class="command-data-cockpit-select" popper-class="command-data-cockpit-tree-select-popper"
 					v-model="searchParams.belongDept" :data="deptTree" :props="treeProps" node-key="id" check-strictly
 					clearable @change="handleSearch" />
 			</el-form-item>
@@ -26,16 +26,15 @@
 			</el-form-item>
 		</el-form>
 
-		<div class="ztzf-table-toolbar">
+		<div class="command-table-toolbar">
 			<el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">维护计划</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)">
-			<div class="ztzf-table-content ztzf-table-content-bg">
-				<el-table class="ztzf-data-cockpit-table" :data="list" @selection-change="handleSelectionChange">
+		<div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+			<div class="command-table-content command-table-content-bg">
+				<el-table class="command-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 label="设备名称" />
 					<el-table-column prop="deviceType" show-overflow-tooltip label="设备类型">
 						<template v-slot="{ row }">
@@ -44,6 +43,7 @@
 					</el-table-column>
 					<el-table-column prop="deviceModel" show-overflow-tooltip label="型号" />
 					<el-table-column prop="manufacturer" show-overflow-tooltip label="生产厂商" />
+					<el-table-column prop="belongDeptName" 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="维护计划">
@@ -61,8 +61,8 @@
 				</el-table>
 			</div>
 
-			<div class="ztzf-table-pagination">
-				<el-pagination popper-class="ztzf-data-cockpit-select-popper"
+			<div class="command-table-pagination">
+				<el-pagination popper-class="command-data-cockpit-select-popper"
 					v-model:current-page="searchParams.current" v-model:page-size="searchParams.size"
 					layout="total, prev, pager, next, sizes" :total="total" @change="getList" />
 			</div>
@@ -158,9 +158,9 @@
 	const tips = row ? '该条' : '选中的项'
 	await ElMessageBox.confirm(`确认删除${tips}吗?`, '提示', {
 		type: 'warning',
-		customClass: 'ztzf-page-view-message-box',
-		confirmButtonClass: 'ztzf-message-box-confirm',
-		cancelButtonClass: 'ztzf-message-box-cancel',
+		customClass: 'command-page-view-message-box',
+		confirmButtonClass: 'command-message-box-confirm',
+		cancelButtonClass: 'command-message-box-cancel',
 	})
 	const ids = row ? row.id : selectedIds.value.join(',')
 	await fwDeviceMaintainPlanRemoveApi({ ids })

--
Gitblit v1.9.3