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/areaManage/partition/FormDiaLog.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
index e46084d..ac5e484 100644
--- a/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
@@ -63,7 +63,7 @@
<div class="detail-title">关联设备</div>
<div class="command-table-container">
<div class="command-table-content">
- <el-table class="command-data-cockpit-table" ref="deviceTableRef" :data="deviceOptions"
+ <el-table class="command-table" ref="deviceTableRef" :data="deviceOptions"
row-key="id">
<el-table-column prop="deviceName" label="设备名称" />
<el-table-column prop="deviceType" label="类型">
@@ -79,7 +79,7 @@
<el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" :disabled="readonly"
label-width="96px">
<el-form-item label="区域名称" prop="areaName">
- <el-input class="command-data-cockpit-search-input" v-model="formData.areaName" maxlength="50"
+ <el-input class="command-search-input" v-model="formData.areaName" maxlength="50"
placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="区域位置" prop="longitude">
@@ -89,35 +89,35 @@
<div class="val">{{ formData.areaSize || '-' }}k㎡</div>
</el-form-item>
<el-form-item label="区域类型" prop="areaType">
- <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.areaType" placeholder="请选择" clearable>
<el-option v-for="item in dictObj.areaType" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
</el-form-item>
<el-form-item label="响应机制" prop="responseMechanism">
- <el-input class="command-data-cockpit-search-input" v-model="formData.responseMechanism"
+ <el-input class="command-search-input" v-model="formData.responseMechanism"
maxlength="200" placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="触发条件" prop="triggerCondition">
- <el-input class="command-data-cockpit-search-input" v-model="formData.triggerCondition"
+ <el-input class="command-search-input" v-model="formData.triggerCondition"
maxlength="200" placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="管控级别" prop="controlLevel">
- <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.controlLevel" placeholder="请选择" clearable>
<el-option v-for="item in dictObj.controlLevel" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
</el-form-item>
<el-form-item label="可飞行时段" prop="flyDateStart">
- <el-date-picker class="command-data-cockpit-date-picker"
- popper-class="command-data-cockpit-date-picker-popper" v-model="flyDateRange"
+ <el-date-picker class="command-date-picker"
+ popper-class="command-date-picker-popper" v-model="flyDateRange"
type="datetimerange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"
value-format="YYYY-MM-DD HH:mm:ss" clearable />
</el-form-item>
<el-form-item label="关联派出所" prop="policeStationId">
- <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.policeStationId" placeholder="请选择" clearable>
<el-option v-for="item in policeStationOptions" :key="item.id" :label="item.stationName"
:value="item.id" />
@@ -130,12 +130,12 @@
关联设备
</div>
- <el-input class="command-data-cockpit-search-input" v-model="searchName" placeholder="请输入"
+ <el-input class="command-search-input" v-model="searchName" placeholder="请输入"
clearable></el-input>
</div>
<el-form-item prop="deviceIds" label-width="0">
- <el-table class="command-data-cockpit-table" ref="deviceTableRef"
+ <el-table class="command-table" ref="deviceTableRef"
:data="deviceOptions.filter(item => item.deviceName.includes(searchName))" row-key="id"
@selection-change="handleDeviceSelectionChange">
<el-table-column type="selection" width="55" :reserve-selection="true" />
--
Gitblit v1.9.3