Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-15 04a859aa95b231c032c71d06518497a973c2f4e8

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

@@ -1,67 +1,120 @@
<template>
   <el-dialog v-model="visible" :title="titleEnum[dialogMode]" :close-on-click-modal="false">
      <div v-if="readonly">
<template>
   <el-dialog
      class="ztzf-page-view-dialog"
      v-model="visible"
      :title="titleEnum[dialogMode]"
      :close-on-click-modal="false"
      @closed="handleClosed"
      destroy-on-close
   >
      <div v-if="readonly" class="detail-container">
         <div class="detail-title">配置详情</div>
         <el-row>
            <el-col :span="12">
               <div>起始扇区: {{ formData.startSector }}</div>
               <div class="label">起始扇区</div>
               <div class="val">{{ formData.startSector }}</div>
            </el-col>
            <el-col :span="12">
               <div>终止扇区: {{ formData.endSector }}</div>
               <div class="label">终止扇区</div>
               <div class="val">{{ formData.endSector }}</div>
            </el-col>
            <el-col :span="12">
               <div>搜索模式: {{ formData.searchMode }}</div>
               <div class="label">搜索模式</div>
               <div class="val">{{ formData.searchMode }}</div>
            </el-col>
            <el-col :span="12">
               <div>雷达频点: {{ formData.radarFreq }}</div>
               <div class="label">雷达频点</div>
               <div class="val">{{ formData.radarFreq }}</div>
            </el-col>
            <el-col :span="12">
               <div>伺服模式: {{ formData.servoMode }}</div>
               <div class="label">伺服模式</div>
               <div class="val">{{ formData.servoMode }}</div>
            </el-col>
            <el-col :span="12">
               <div>伺服数据模式: {{ formData.servoDataMode }}</div>
               <div class="label">伺服数据模式</div>
               <div class="val">{{ formData.servoDataMode }}</div>
            </el-col>
            <el-col :span="12">
               <div>轴选择: {{ formData.axisSelect }}</div>
               <div class="label">轴选择</div>
               <div class="val">{{ formData.axisSelect }}</div>
            </el-col>
            <el-col :span="12">
               <div>伺服转速度: {{ formData.servoTurnSpeed }}</div>
               <div class="label">伺服转速度</div>
               <div class="val">{{ formData.servoTurnSpeed }}</div>
            </el-col>
         </el-row>
      </div>
      <el-form v-else ref="formRef" :model="formData" :rules="rules" :disabled="readonly" label-width="120px">

      <el-form v-else ref="formRef" :model="formData" :rules="rules" label-width="120px" class="dialog-form">
         <el-row>
            <el-col :span="12">
               <el-form-item label="起始扇区" prop="startSector">
                  <el-input v-model="formData.startSector" maxlength="50" placeholder="请输入" clearable />
                  <el-input
                     class="ztzf-data-cockpit-search-input"
                     v-model="formData.startSector"
                     maxlength="50"
                     placeholder="请输入"
                     clearable
                  />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="终止扇区" prop="endSector">
                  <el-input v-model="formData.endSector" maxlength="50" placeholder="请输入" clearable />
                  <el-input
                     class="ztzf-data-cockpit-search-input"
                     v-model="formData.endSector"
                     maxlength="50"
                     placeholder="请输入"
                     clearable
                  />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="搜索模式" prop="searchMode">
                  <el-select v-model="formData.searchMode" placeholder="请选择" clearable>
                  <el-select
                     class="ztzf-data-cockpit-select"
                     popper-class="ztzf-data-cockpit-select-popper"
                     v-model="formData.searchMode"
                     placeholder="请选择"
                     clearable
                  >
                     <el-option v-for="item in searchModeOptions" :key="item.value" :label="item.label" :value="item.value" />
                  </el-select>
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="雷达频点" prop="radarFreq">
                  <el-input v-model="formData.radarFreq" maxlength="50" placeholder="请输入" clearable />
                  <el-input
                     class="ztzf-data-cockpit-search-input"
                     v-model="formData.radarFreq"
                     maxlength="50"
                     placeholder="请输入"
                     clearable
                  />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="伺服模式" prop="servoMode">
                  <el-select v-model="formData.servoMode" placeholder="请选择" clearable>
                  <el-select
                     class="ztzf-data-cockpit-select"
                     popper-class="ztzf-data-cockpit-select-popper"
                     v-model="formData.servoMode"
                     placeholder="请选择"
                     clearable
                  >
                     <el-option v-for="item in servoModeOptions" :key="item.value" :label="item.label" :value="item.value" />
                  </el-select>
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="伺服数据模式" prop="servoDataMode">
                  <el-select v-model="formData.servoDataMode" placeholder="请选择" clearable>
                  <el-select
                     class="ztzf-data-cockpit-select"
                     popper-class="ztzf-data-cockpit-select-popper"
                     v-model="formData.servoDataMode"
                     placeholder="请选择"
                     clearable
                  >
                     <el-option
                        v-for="item in servoDataModeOptions"
                        :key="item.value"
@@ -73,22 +126,41 @@
            </el-col>
            <el-col :span="12">
               <el-form-item label="轴选择" prop="axisSelect">
                  <el-select v-model="formData.axisSelect" placeholder="请选择" clearable>
                  <el-select
                     class="ztzf-data-cockpit-select"
                     popper-class="ztzf-data-cockpit-select-popper"
                     v-model="formData.axisSelect"
                     placeholder="请选择"
                     clearable
                  >
                     <el-option v-for="item in axisSelectOptions" :key="item.value" :label="item.label" :value="item.value" />
                  </el-select>
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="伺服转速度" prop="servoTurnSpeed">
                  <el-input v-model="formData.servoTurnSpeed" maxlength="50" placeholder="请输入" clearable />
                  <el-input
                     class="ztzf-data-cockpit-search-input"
                     v-model="formData.servoTurnSpeed"
                     maxlength="50"
                     placeholder="请输入"
                     clearable
                  />
               </el-form-item>
            </el-col>
         </el-row>
      </el-form>
      <template #footer>
         <el-button @click="handleCancel">{{ readonly ? '关闭' : '取消' }}</el-button>
         <el-button v-if="!readonly" type="primary" :loading="submitting" :disabled="submitting" @click="handleSubmit">
            确定
         <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>
   </el-dialog>
@@ -97,7 +169,7 @@
<script setup>
import { computed, ref } from 'vue'
import { ElMessage } from 'element-plus'
import { fwDeviceConfigDetailApi, fwDeviceConfigSubmitApi } from './deviceAppConfigApi'
import { fwDeviceConfigSubmitApi } from './deviceAppConfigApi'
import { fieldRules } from '@ztzf/utils'

const configKeys = [
@@ -144,7 +216,7 @@
   { label: '扇区', value: '扇区' },
   { label: '定位', value: '定位' },
]
const servoDataModeOptions = [{ label: '编码器', value: '编码器' }]
const servoDataModeOptions = [{ label: '编码模式', value: '编码模式' }]
const axisSelectOptions = [{ label: '方位', value: '方位' }]

const rules = {
@@ -171,6 +243,10 @@
   visible.value = false
}

function handleClosed() {
   formData.value = initForm()
}

// 提交更新
async function handleSubmit() {
   const isValid = await formRef.value?.validate().catch(() => false)