Merge remote-tracking branch 'origin/master'

张含笑

2026-01-21 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e

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

@@ -14,10 +14,12 @@
         </div>
         <div class="right-container">
            <div class="header">
               {{ titleEnum[dialogMode] }}
               <span>{{ titleEnum[dialogMode] }}</span>
				
               <el-icon class="close-btn" @click.stop="visible = false"><Close /></el-icon>
            </div>

            <div class="dialog-container" v-if="readonly">
            <div class="content" v-if="readonly">
               <div class="detail-title">场景详情</div>
               <el-row>
                  <el-col :span="24">
@@ -30,7 +32,7 @@
                  </el-col>
                  <el-col :span="24">
                     <div class="label">场景类型</div>
                     <div class="val">{{ getDictLabel(formData.sceneType, dictObj.sceneType) }}</div>
                     <div class="val">{{ getDictLabel(formData.sceneType, dictObj.CommandSceneType) }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">负责人</div>
@@ -77,7 +79,7 @@
               <el-form-item label="场景类型" prop="sceneType">
                  <el-select class="command-select" popper-class="command-select-popper"
                     v-model="formData.sceneType" placeholder="请选择" clearable>
                     <el-option v-for="item in dictObj.sceneType" :key="item.dictKey" :label="item.dictValue"
                     <el-option v-for="item in dictObj.CommandSceneType" :key="item.dictKey" :label="item.dictValue"
                        :value="item.dictKey" />
                  </el-select>
               </el-form-item>
@@ -114,9 +116,9 @@
                     <el-table class="command-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="区域类型">
                        <el-table-column type="selection" width="55" />
                        <el-table-column prop="areaName" show-overflow-tooltip label="区域名称" />
                        <el-table-column prop="areaType" show-overflow-tooltip label="区域类型">
                           <template v-slot="{ row }">
                              {{ getDictLabel(row.areaType, dictObj.areaType) }}
                           </template>
@@ -139,6 +141,8 @@
</template>

<script setup>
import { Close } from '@element-plus/icons-vue'

import { computed, inject, nextTick, onMounted, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { fwDefenseSceneDetailApi, fwDefenseSceneSubmitApi } from './sceneConfigApi'