Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-20 de1b2a2d4e856fd4769f3d96d8c4f048fe5f9004

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

@@ -1,6 +1,6 @@
<template>
   <el-dialog
      class="ztzf-page-view-dialog"
      class="command-page-view-dialog"
      v-model="visible"
      :title="titleEnum[dialogMode]"
      destroy-on-close
@@ -8,7 +8,6 @@
      @closed="handleClosed"
   >
      <div v-if="readonly" class="detail-container">
         <div class="detail-title">调度详情</div>
         <el-row>
            <el-col :span="12">
               <div class="label">设备名称</div>
@@ -65,8 +64,8 @@
            <el-col :span="12">
               <el-form-item label="设备" prop="deviceId">
                  <el-select
                     class="ztzf-data-cockpit-select"
                     popper-class="ztzf-data-cockpit-select-popper"
                     class="command-select"
                     popper-class="command-select-popper"
                     v-model="formData.deviceId"
                     placeholder="请选择"
                     clearable
@@ -79,7 +78,7 @@
            <el-col :span="12">
               <el-form-item label="设备编码" prop="deviceSn">
                  <el-input
                     class="ztzf-data-cockpit-search-input"
                     class="command-input"
                     v-model="formData.deviceSn"
                     disabled
                     placeholder="选择设备后自动带出"
@@ -89,8 +88,8 @@
            <el-col :span="12">
               <el-form-item label="场景" prop="defenseSceneId">
                  <el-select
                     class="ztzf-data-cockpit-select"
                     popper-class="ztzf-data-cockpit-select-popper"
                     class="command-select"
                     popper-class="command-select-popper"
                     v-model="formData.defenseSceneId"
                     placeholder="请选择"
                     clearable
@@ -103,8 +102,8 @@
            <el-col :span="12">
               <el-form-item label="区域" prop="areaDivideId">
                  <el-select
                     class="ztzf-data-cockpit-select"
                     popper-class="ztzf-data-cockpit-select-popper"
                     class="command-select"
                     popper-class="command-select-popper"
                     v-model="formData.areaDivideId"
                     placeholder="请先选择场景"
                     clearable
@@ -118,7 +117,7 @@
            <el-col :span="12">
               <el-form-item label="调度人员" prop="dispatchUser">
                  <el-input
                     class="ztzf-data-cockpit-search-input"
                     class="command-input"
                     v-model="formData.dispatchUser"
                     maxlength="50"
                     placeholder="请输入"
@@ -129,8 +128,8 @@
            <el-col :span="12">
               <el-form-item label="调度日期" prop="dispatchDateRange">
                  <el-date-picker
                     class="ztzf-data-cockpit-date-picker"
                     popper-class="ztzf-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 +152,7 @@
            <el-col :span="24">
               <el-form-item label="调度内容" prop="dispatchContent">
                  <el-input
                     class="ztzf-data-cockpit-search-input"
                     class="command-input"
                     v-model="formData.dispatchContent"
                     type="textarea"
                     :rows="3"
@@ -166,7 +165,7 @@
            <el-col :span="24">
               <el-form-item label="调度结果" prop="dispatchResult">
                  <el-input
                     class="ztzf-data-cockpit-search-input"
                     class="command-input"
                     v-model="formData.dispatchResult"
                     type="textarea"
                     :rows="3"
@@ -179,7 +178,7 @@
            <el-col :span="24">
               <el-form-item label="处理措施" prop="disposeMeasure">
                  <el-input
                     class="ztzf-data-cockpit-search-input"
                     class="command-input"
                     v-model="formData.disposeMeasure"
                     type="textarea"
                     :rows="3"
@@ -207,7 +206,7 @@
      </template>

      <el-dialog v-model="visible1" title="选择位置" destroy-on-close @closed="positionClosed">
         <div class="ztzf-cesium" id="mapContainer"></div>
         <div class="command-cesium" id="mapContainer"></div>
         <template #footer>
            <el-button @click="handleMapCancel">取消</el-button>
            <el-button type="primary" @click="handleMapConfirm">确定</el-button>