From 40c2702c3da24d9d9fda6bd63894c3206779f812 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 17 Jan 2026 16:46:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/FormDiaLog.vue | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/FormDiaLog.vue b/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/FormDiaLog.vue
index aaff6ae..70708ac 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/deviceAppConfig/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]"
:close-on-click-modal="false"
@@ -45,12 +45,13 @@
</el-row>
</div>
- <el-form v-else ref="formRef" :model="formData" :rules="rules" label-width="120px" class="dialog-form">
+ <el-form v-else ref="formRef" :model="formData" :rules="rules" label-width="120" class="dialog-form">
<el-row>
+ <el-col :span="24"><h3 style="color: #ffffff">工作模式</h3></el-col>
<el-col :span="12">
<el-form-item label="起始扇区" prop="startSector">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-data-cockpit-search-input"
v-model="formData.startSector"
maxlength="50"
placeholder="请输入"
@@ -61,7 +62,7 @@
<el-col :span="12">
<el-form-item label="终止扇区" prop="endSector">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-data-cockpit-search-input"
v-model="formData.endSector"
maxlength="50"
placeholder="请输入"
@@ -72,8 +73,8 @@
<el-col :span="12">
<el-form-item label="搜索模式" prop="searchMode">
<el-select
- class="ztzf-data-cockpit-select"
- popper-class="ztzf-data-cockpit-select-popper"
+ class="command-data-cockpit-select"
+ popper-class="command-data-cockpit-select-popper"
v-model="formData.searchMode"
placeholder="请选择"
clearable
@@ -85,7 +86,7 @@
<el-col :span="12">
<el-form-item label="雷达频点" prop="radarFreq">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-data-cockpit-search-input"
v-model="formData.radarFreq"
maxlength="50"
placeholder="请输入"
@@ -93,11 +94,12 @@
/>
</el-form-item>
</el-col>
+ <el-col :span="24"><h3 style="color: #ffffff">工作模式</h3></el-col>
<el-col :span="12">
<el-form-item label="伺服模式" prop="servoMode">
<el-select
- class="ztzf-data-cockpit-select"
- popper-class="ztzf-data-cockpit-select-popper"
+ class="command-data-cockpit-select"
+ popper-class="command-data-cockpit-select-popper"
v-model="formData.servoMode"
placeholder="请选择"
clearable
@@ -109,8 +111,8 @@
<el-col :span="12">
<el-form-item label="伺服数据模式" prop="servoDataMode">
<el-select
- class="ztzf-data-cockpit-select"
- popper-class="ztzf-data-cockpit-select-popper"
+ class="command-data-cockpit-select"
+ popper-class="command-data-cockpit-select-popper"
v-model="formData.servoDataMode"
placeholder="请选择"
clearable
@@ -127,8 +129,8 @@
<el-col :span="12">
<el-form-item label="轴选择" prop="axisSelect">
<el-select
- class="ztzf-data-cockpit-select"
- popper-class="ztzf-data-cockpit-select-popper"
+ class="command-data-cockpit-select"
+ popper-class="command-data-cockpit-select-popper"
v-model="formData.axisSelect"
placeholder="请选择"
clearable
@@ -140,7 +142,7 @@
<el-col :span="12">
<el-form-item label="伺服转速度" prop="servoTurnSpeed">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-data-cockpit-search-input"
v-model="formData.servoTurnSpeed"
maxlength="50"
placeholder="请输入"
@@ -169,7 +171,7 @@
<script setup>
import { computed, ref } from 'vue'
import { ElMessage } from 'element-plus'
-import { fwDeviceConfigSubmitApi } from './deviceAppConfigApi'
+import { fwDeviceConfigDetailApi, fwDeviceConfigSubmitApi } from './deviceAppConfigApi'
import { fieldRules } from '@ztzf/utils'
const configKeys = [
@@ -204,7 +206,7 @@
const dialogMode = ref('view') // 弹框模式
const submitting = ref(false) // 提交中
const readonly = computed(() => dialogMode.value === 'view')
-const titleEnum = ref({ edit: '编辑', view: '查看' })
+const titleEnum = ref({ edit: '配置接口', view: '查看' })
const searchModeOptions = [
{ label: '0', value: '0' },
@@ -267,10 +269,18 @@
}
}
+function loadingDetails() {
+ fwDeviceConfigDetailApi({ deviceId: formData.value.deviceId }).then(res => {
+ const configJson = res.data.data ? JSON.parse(res.data.data.configJson) : {}
+ formData.value = { ...formData.value, ...configJson }
+ })
+}
+
// 打开弹框
async function open({ mode, row } = {}) {
dialogMode.value = mode || 'view'
formData.value = { ...initForm(), deviceId: row.id }
+ loadingDetails()
}
defineExpose({ open })
--
Gitblit v1.9.3