Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-15 04a859aa95b231c032c71d06518497a973c2f4e8

 applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue

@@ -1,17 +1,51 @@
<template>
   <el-dialog v-model="visible" :title="titleEnum[dialogMode]" :close-on-click-modal="false" width="80%">
      <div class="bodyBox">
   <el-dialog class="ztzf-page-map-view-dialog" v-model="visible" :show-close="false" :close-on-click-modal="false">
      <div class="dialog-container">
         <div class="left-container">
         <div class="leftMap ztzf-cesium" id="mapContainer"></div>
         <div class="rightInfo">
            <div v-if="readonly">
               <div>场景名称: {{ formData.sceneName }}</div>
               <div>指挥点位置: {{ formatLocation(formData) }}</div>
               <div>场景类型: {{ getDictLabel(formData.sceneType, dictObj.sceneType) }}</div>
               <div>防控负责人: {{ formData.defenseLeader }}</div>
               <div>防控负责人电话: {{ formData.leaderPhone }}</div>
               <div>设备模式: {{ getDictLabel(formData.deviceMode, dictObj.deviceMode) }}</div>
               <div>防控面积: {{ formatDefenseArea(formData.defenseArea) }}</div>
               <el-table ref="areaTableRef" :data="areaList" row-key="id">
         </div>
         <div class="right-container">
            <div class="header">
               {{ titleEnum[dialogMode] }}
            </div>

            <div class="dialog-container" v-if="readonly">
               <div class="detail-title">场景详情</div>
               <el-row>
                  <el-col :span="24">
                     <div class="label">场景名称</div>
                     <div class="val">{{ formData.sceneName }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">指挥点位置</div>
                     <div class="val">{{ formatLocation(formData) }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">场景类型</div>
                     <div class="val">{{ getDictLabel(formData.sceneType, dictObj.sceneType) }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">负责人</div>
                     <div class="val">{{ formData.defenseLeader }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">负责人电话</div>
                     <div class="val">{{ formData.leaderPhone }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">设备模式</div>
                     <div class="val">{{ getDictLabel(formData.deviceMode, dictObj.deviceMode) }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">防控面积</div>
                     <div class="val">{{ formatDefenseArea(formData.defenseArea) }}</div>
                  </el-col>
               </el-row>

               <div class="detail-title">关联区域</div>
               <div class="ztzf-table-container">
                  <div class="ztzf-table-content">
                     <el-table class="ztzf-data-cockpit-table" ref="areaTableRef" :data="areaList" row-key="id">
                  <el-table-column prop="areaName" label="区域名称" />
                  <el-table-column prop="areaType" label="区域类型">
                     <template v-slot="{ row }">
@@ -20,71 +54,58 @@
                  </el-table-column>
               </el-table>
            </div>
            <el-form v-else ref="formRef" :model="formData" :rules="rules" :disabled="readonly" label-width="100px">
               <el-row>
                  <el-col :span="24">
               </div>
            </div>

            <el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" :disabled="readonly"
               label-width="96px">
                     <el-form-item label="场景名称" prop="sceneName">
                        <el-input v-model="formData.sceneName" maxlength="50" placeholder="请输入" clearable />
                  <el-input class="ztzf-data-cockpit-search-input" v-model="formData.sceneName" maxlength="50"
                     placeholder="请输入" clearable />
                     </el-form-item>
                  </el-col>
                  <el-col :span="24">
                     <el-form-item label="指挥点位置" prop="longitude">
                        <div>{{ formatLocation(formData) }}</div>
                  <div class="val">{{ formatLocation(formData) }}</div>
                     </el-form-item>
                  </el-col>
                  <el-col :span="24">
                     <el-form-item label="场景类型" prop="sceneType">
                        <el-select v-model="formData.sceneType" placeholder="请选择" clearable>
                           <el-option
                              v-for="item in dictObj.sceneType"
                              :key="item.dictKey"
                              :label="item.dictValue"
                              :value="item.dictKey"
                           />
                  <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
                     v-model="formData.sceneType" placeholder="请选择" clearable>
                     <el-option v-for="item in dictObj.sceneType" :key="item.dictKey" :label="item.dictValue"
                        :value="item.dictKey" />
                        </el-select>
                     </el-form-item>
                  </el-col>
                  <el-col :span="24">
                     <el-form-item label="防控负责人" prop="defenseLeader">
                        <el-input v-model="formData.defenseLeader" maxlength="50" placeholder="请输入" clearable />
               <el-form-item label="负责人" prop="defenseLeader">
                  <el-input class="ztzf-data-cockpit-search-input" v-model="formData.defenseLeader" maxlength="50"
                     placeholder="请输入" clearable />
                     </el-form-item>
                  </el-col>
                  <el-col :span="24">
                     <el-form-item label="防控负责人电话" prop="leaderPhone">
                        <el-input v-model="formData.leaderPhone" maxlength="50" placeholder="请输入" clearable />
               <el-form-item label="负责人电话" prop="leaderPhone">
                  <el-input class="ztzf-data-cockpit-search-input" v-model="formData.leaderPhone" maxlength="50"
                     placeholder="请输入" clearable />
                     </el-form-item>
                  </el-col>
                  <el-col :span="24">
                     <el-form-item label="设备模式" prop="deviceMode">
                        <el-select v-model="formData.deviceMode" placeholder="请选择" clearable>
                           <el-option
                              v-for="item in dictObj.deviceMode"
                              :key="item.dictKey"
                              :label="item.dictValue"
                              :value="item.dictKey"
                           />
                  <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
                     v-model="formData.deviceMode" placeholder="请选择" clearable>
                     <el-option v-for="item in dictObj.deviceMode" :key="item.dictKey" :label="item.dictValue"
                        :value="item.dictKey" />
                        </el-select>
                     </el-form-item>
                  </el-col>
                  <el-col :span="24">
                     <el-form-item label="防控面积" prop="defenseArea">
                        <div>{{ formatDefenseArea(formData.defenseArea) }}</div>
                  <div class="val">{{ formatDefenseArea(formData.defenseArea) }}</div>
                     </el-form-item>
                  </el-col>
                  <el-col :span="24">
                     <div>
                        <div>

               <div class="search-table-container">
                  <div class="search-box">
                     <div class="label">
                           关联区域
                           <el-input v-model="searchName" placeholder="请输入" clearable></el-input>
                     </div>

                     <el-input class="ztzf-data-cockpit-search-input" v-model="searchName" placeholder="请输入"
                        clearable></el-input>
                        </div>

                        <el-form-item prop="areaDivideIds" label-width="0">
                           <el-table
                              ref="areaTableRef"
                              :data="areaList.filter(item => item.areaName.includes(searchName))"
                              row-key="id"
                              @selection-change="handleAreaSelectionChange"
                           >
                     <el-table class="ztzf-data-cockpit-table" ref="areaTableRef"
                        :data="areaList.filter(item => item.areaName.includes(searchName))" row-key="id"
                        @selection-change="handleAreaSelectionChange">
                              <el-table-column type="selection" width="55" :reserve-selection="true" />
                              <el-table-column prop="areaName" label="区域名称" />
                              <el-table-column prop="areaType" label="区域类型">
@@ -95,22 +116,22 @@
                           </el-table>
                        </el-form-item>
                     </div>
                  </el-col>
               </el-row>
            </el-form>
         </div>
      </div>
      <template #footer>
         <el-button @click="handleCancel">{{ readonly ? '关闭' : '取消' }}</el-button>
         <el-button v-if="!readonly" type="primary" :loading="submitting" :disabled="submitting" @click="handleSubmit">

            <div class="footer">
               <el-button color="#2B2B4C" @click="handleCancel">{{ readonly ? '关闭' : '取消' }}</el-button>
               <el-button color="#284FE3" v-if="!readonly" type="primary" :loading="submitting"
                  :disabled="submitting" @click="handleSubmit">
            确定
         </el-button>
      </template>
            </div>
         </div>
      </div>
   </el-dialog>
</template>

<script setup>
import { computed, inject, nextTick, onMounted, ref } from 'vue'
import { computed, inject, nextTick, onMounted, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { fwDefenseSceneDetailApi, fwDefenseSceneSubmitApi } from './sceneConfigApi'
import { fieldRules, geomAnalysis, getDictLabel } from '@ztzf/utils'
@@ -122,8 +143,8 @@
const initForm = () => ({
   sceneName: '', // 场景名称
   sceneType: '', // 场景类型
   defenseLeader: '', // 防控负责人
   leaderPhone: '', // 防控负责人电话
   defenseLeader: '', // 负责人
   leaderPhone: '', // 负责人电话
   deviceMode: '', // 设备模式
   areaDivideIds: '', // 关联区域ID
   areaCount: 0, // 区域数量
@@ -303,17 +324,17 @@
         label: {
            text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
            font: '14px',
            fillColor: Cesium.Color.WHITE, // 文字颜色：白色
            backgroundColor: Cesium.Color.BLACK.withAlpha(0.45), //背景颜色
            backgroundPadding: new Cesium.Cartesian2(5, 5), // 水平/垂直内边距（像素）
            pixelOffset: new Cesium.Cartesian2(0, -20), // 可选：微调位置
            showBackground: true, // 确保背景显示（某些版本需要）
            fillColor: Cesium.Color.WHITE,
            backgroundColor: Cesium.Color.BLACK.withAlpha(0.45),
            backgroundPadding: new Cesium.Cartesian2(5, 5),
            pixelOffset: new Cesium.Cartesian2(0, -20),
            showBackground: true,
            style: Cesium.LabelStyle.FILL_AND_OUTLINE,
            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
            verticalOrigin: Cesium.VerticalOrigin.CENTER,
            outlineWidth: 1,
            outlineColor: Cesium.Color.WHITE,
            eyeOffset: new Cesium.Cartesian3(0, 0, -20), // 负值更靠近相机（显示在前）
            eyeOffset: new Cesium.Cartesian3(0, 0, -20),
         },
      })
   } else {
@@ -348,18 +369,4 @@
})
</script>

<style scoped lang="scss">
.bodyBox {
   display: flex;
   height: 600px;
   .leftMap {
      width: 70%;
      height: 100%;
   }
   .rightInfo {
      width: 30%;
      height: 100%;
      overflow: auto;
   }
}
</style>
<style scoped lang="scss"></style>