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/maintainRecord/FormDiaLog.vue | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/drone-command/src/views/basicManage/maintainRecord/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/maintainRecord/FormDiaLog.vue index 3bcb218..71171cf 100644 --- a/applications/drone-command/src/views/basicManage/maintainRecord/FormDiaLog.vue +++ b/applications/drone-command/src/views/basicManage/maintainRecord/FormDiaLog.vue @@ -49,7 +49,7 @@ <div class="detail-title">维护详情</div> <div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)"> <div class="command-table-content"> - <el-table class="command-data-cockpit-table" :data="list"> + <el-table class="command-table" :data="list"> <el-table-column type="index" width="60" label="序号" /> <el-table-column prop="maintainTime" label="维护时间" /> <el-table-column prop="maintainContent" label="维护内容" /> @@ -58,7 +58,7 @@ </div> <div class="command-table-pagination"> - <el-pagination popper-class="command-data-cockpit-select-popper" + <el-pagination popper-class="command-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> @@ -70,7 +70,7 @@ <el-row> <el-col :span="12"> <el-form-item label="选择设备" prop="deviceId"> - <el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper" + <el-select class="command-select" popper-class="command-select-popper" v-model="formData.deviceId" placeholder="请选择" filterable clearable> <el-option v-for="item in deviceList" :key="item.id" :label="item.deviceName" :value="item.id" /> @@ -79,7 +79,7 @@ </el-col> <el-col :span="12"> <el-form-item label="维护计划周期" prop="planCycleType"> - <el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper" + <el-select class="command-select" popper-class="command-select-popper" v-model="formData.planCycleType" placeholder="请选择" clearable @change="formData.planCycleValue = []"> <el-option v-for="item in planCycleOptions" :key="item.value" :label="item.label" @@ -89,7 +89,7 @@ </el-col> <el-col :span="12"> <el-form-item label="维护计划时间" prop="planCycleValue"> - <el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper" + <el-select class="command-select" popper-class="command-select-popper" v-model="formData.planCycleValue" placeholder="请选择" clearable multiple :disabled="!formData.planCycleType"> <el-option v-for="item in planCycleValueOptions" :key="item.value" :label="item.value" -- Gitblit v1.9.3