From f925f12d5263c94644bddf6fd2ac3d23b77791cf Mon Sep 17 00:00:00 2001 From: 张含笑 <zhx18749296735@163.com> Date: Mon, 19 Jan 2026 14:32:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- applications/drone-command/src/views/basicManage/deviceScrap/index.vue | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue index 8c17107..b1754c0 100644 --- a/applications/drone-command/src/views/basicManage/deviceScrap/index.vue +++ b/applications/drone-command/src/views/basicManage/deviceScrap/index.vue @@ -3,7 +3,7 @@ <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" + class="command-search-input" v-model="searchParams.deviceName" placeholder="请输入" clearable @@ -13,8 +13,8 @@ <el-form-item label="设备类型" prop="deviceType"> <el-select - class="command-data-cockpit-select" - popper-class="command-data-cockpit-select-popper" + class="command-select" + popper-class="command-select-popper" v-model="searchParams.deviceType" placeholder="请选择" clearable @@ -31,8 +31,8 @@ <el-form-item label="所属部门" prop="belongDept"> <el-tree-select - class="command-data-cockpit-select" - popper-class="command-data-cockpit-tree-select-popper" + class="command-select" + popper-class="command-tree-select-popper" v-model="searchParams.belongDept" :data="deptTree" :props="treeProps" @@ -51,7 +51,7 @@ <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"> + <el-table class="command-table" :data="list"> <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="设备类型"> @@ -82,7 +82,7 @@ <div class="command-table-pagination"> <el-pagination - popper-class="command-data-cockpit-select-popper" + popper-class="command-select-popper" v-model:current-page="searchParams.current" v-model:page-size="searchParams.size" layout="total, prev, pager, next, sizes" -- Gitblit v1.9.3