Merge remote-tracking branch 'origin/master'

张含笑

2026-01-19 f925f12d5263c94644bddf6fd2ac3d23b77791cf

 applications/drone-command/src/views/detectionCountermeasure/taskSchedule/FormDiaLog.vue

@@ -65,8 +65,8 @@
            <el-col :span="12">
               <el-form-item label="设备" prop="deviceId">
                  <el-select
                     class="command-data-cockpit-select"
                     popper-class="command-data-cockpit-select-popper"
                     class="command-select"
                     popper-class="command-select-popper"
                     v-model="formData.deviceId"
                     placeholder="请选择"
                     clearable
@@ -79,7 +79,7 @@
            <el-col :span="12">
               <el-form-item label="设备编码" prop="deviceSn">
                  <el-input
                     class="command-data-cockpit-search-input"
                     class="command-search-input"
                     v-model="formData.deviceSn"
                     disabled
                     placeholder="选择设备后自动带出"
@@ -89,8 +89,8 @@
            <el-col :span="12">
               <el-form-item label="场景" prop="defenseSceneId">
                  <el-select
                     class="command-data-cockpit-select"
                     popper-class="command-data-cockpit-select-popper"
                     class="command-select"
                     popper-class="command-select-popper"
                     v-model="formData.defenseSceneId"
                     placeholder="请选择"
                     clearable
@@ -103,8 +103,8 @@
            <el-col :span="12">
               <el-form-item label="区域" prop="areaDivideId">
                  <el-select
                     class="command-data-cockpit-select"
                     popper-class="command-data-cockpit-select-popper"
                     class="command-select"
                     popper-class="command-select-popper"
                     v-model="formData.areaDivideId"
                     placeholder="请先选择场景"
                     clearable
@@ -118,7 +118,7 @@
            <el-col :span="12">
               <el-form-item label="调度人员" prop="dispatchUser">
                  <el-input
                     class="command-data-cockpit-search-input"
                     class="command-search-input"
                     v-model="formData.dispatchUser"
                     maxlength="50"
                     placeholder="请输入"
@@ -129,8 +129,8 @@
            <el-col :span="12">
               <el-form-item label="调度日期" prop="dispatchDateRange">
                  <el-date-picker
                     class="command-data-cockpit-date-picker"
                     popper-class="command-data-cockpit-date-picker-popper"
                     class="command-date-picker"
                     popper-class="command-date-picker-popper"
                     v-model="formData.dispatchDateRange"
                     type="datetimerange"
                     range-separator="至"
@@ -153,7 +153,7 @@
            <el-col :span="24">
               <el-form-item label="调度内容" prop="dispatchContent">
                  <el-input
                     class="command-data-cockpit-search-input"
                     class="command-search-input"
                     v-model="formData.dispatchContent"
                     type="textarea"
                     :rows="3"
@@ -166,7 +166,7 @@
            <el-col :span="24">
               <el-form-item label="调度结果" prop="dispatchResult">
                  <el-input
                     class="command-data-cockpit-search-input"
                     class="command-search-input"
                     v-model="formData.dispatchResult"
                     type="textarea"
                     :rows="3"
@@ -179,7 +179,7 @@
            <el-col :span="24">
               <el-form-item label="处理措施" prop="disposeMeasure">
                  <el-input
                     class="command-data-cockpit-search-input"
                     class="command-search-input"
                     v-model="formData.disposeMeasure"
                     type="textarea"
                     :rows="3"