From b95cac2e7093e686cee4313c9287501329728a69 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 9 Mar 2025 18:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E3=80=91IoT:=20=E6=95=B0=E6=8D=AE=E6=A1=A5=E6=A2=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/app.ts                      |  2 +-
 .../iot/rule/databridge/IoTDataBridgeForm.vue | 44 +++++++++----------
 .../rule/databridge/config/HttpConfigForm.vue |  2 +-
 .../databridge/config/KafkaMQConfigForm.vue   |  2 +-
 .../rule/databridge/config/MqttConfigForm.vue |  2 +-
 .../databridge/config/RabbitMQConfigForm.vue  |  2 +-
 .../config/RedisStreamMQConfigForm.vue        |  2 +-
 .../databridge/config/RocketMQConfigForm.vue  |  4 +-
 8 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index e3d6a56f..a6eee78f 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -61,7 +61,7 @@ export const useAppStore = defineStore('app', {
       tagsView: true, // 标签页
       tagsViewImmerse: false, // 标签页沉浸
       tagsViewIcon: true, // 是否显示标签图标
-      logo: true, // logo
+      logo: false, // logo
       fixedHeader: true, // 固定toolheader
       footer: true, // 显示页脚
       greyMode: false, // 是否开始灰色模式，用于特殊悼念日
diff --git a/src/views/iot/rule/databridge/IoTDataBridgeForm.vue b/src/views/iot/rule/databridge/IoTDataBridgeForm.vue
index e81eb799..bb38d6be 100644
--- a/src/views/iot/rule/databridge/IoTDataBridgeForm.vue
+++ b/src/views/iot/rule/databridge/IoTDataBridgeForm.vue
@@ -32,29 +32,24 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="桥梁配置" prop="config">
-        <HttpConfigForm v-if="showConfig(IoTDataBridgeConfigType.HTTP)" v-model="formData.config" />
-        <MqttConfigForm v-if="showConfig(IoTDataBridgeConfigType.MQTT)" v-model="formData.config" />
-        <RocketMQConfigForm
-          v-if="showConfig(IoTDataBridgeConfigType.ROCKETMQ)"
-          v-model="formData.config"
-        />
-        <KafkaMQConfigForm
-          v-if="showConfig(IoTDataBridgeConfigType.KAFKA)"
-          v-model="formData.config"
-        />
-        <RabbitMQConfigForm
-          v-if="showConfig(IoTDataBridgeConfigType.RABBITMQ)"
-          v-model="formData.config"
-        />
-        <RedisStreamMQConfigForm
-          v-if="showConfig(IoTDataBridgeConfigType.REDIS_STREAM)"
-          v-model="formData.config"
-        />
-      </el-form-item>
-      <el-form-item label="桥梁描述" prop="description">
-        <el-input v-model="formData.description" height="150px" type="textarea" />
-      </el-form-item>
+      <HttpConfigForm v-if="showConfig(IoTDataBridgeConfigType.HTTP)" v-model="formData.config" />
+      <MqttConfigForm v-if="showConfig(IoTDataBridgeConfigType.MQTT)" v-model="formData.config" />
+      <RocketMQConfigForm
+        v-if="showConfig(IoTDataBridgeConfigType.ROCKETMQ)"
+        v-model="formData.config"
+      />
+      <KafkaMQConfigForm
+        v-if="showConfig(IoTDataBridgeConfigType.KAFKA)"
+        v-model="formData.config!"
+      />
+      <RabbitMQConfigForm
+        v-if="showConfig(IoTDataBridgeConfigType.RABBITMQ)"
+        v-model="formData.config!"
+      />
+      <RedisStreamMQConfigForm
+        v-if="showConfig(IoTDataBridgeConfigType.REDIS_STREAM)"
+        v-model="formData.config!"
+      />
       <el-form-item label="桥梁状态" prop="status">
         <el-radio-group v-model="formData.status">
           <el-radio
@@ -66,6 +61,9 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="桥梁描述" prop="description">
+        <el-input v-model="formData.description" height="150px" type="textarea" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
diff --git a/src/views/iot/rule/databridge/config/HttpConfigForm.vue b/src/views/iot/rule/databridge/config/HttpConfigForm.vue
index 8d2b18a1..ecca1df8 100644
--- a/src/views/iot/rule/databridge/config/HttpConfigForm.vue
+++ b/src/views/iot/rule/databridge/config/HttpConfigForm.vue
@@ -37,7 +37,7 @@ import { useVModel } from '@vueuse/core'
 defineOptions({ name: 'HttpConfigForm' })
 
 const props = defineProps<{
-  modelValue: HttpConfig
+  modelValue: any
 }>()
 const emit = defineEmits(['update:modelValue'])
 const config = useVModel(props, 'modelValue', emit) as Ref<HttpConfig>
diff --git a/src/views/iot/rule/databridge/config/KafkaMQConfigForm.vue b/src/views/iot/rule/databridge/config/KafkaMQConfigForm.vue
index cc5f07a4..07df012c 100644
--- a/src/views/iot/rule/databridge/config/KafkaMQConfigForm.vue
+++ b/src/views/iot/rule/databridge/config/KafkaMQConfigForm.vue
@@ -22,7 +22,7 @@ import { useVModel } from '@vueuse/core'
 defineOptions({ name: 'KafkaMQConfigForm' })
 
 const props = defineProps<{
-  modelValue: KafkaMQConfig
+  modelValue: any
 }>()
 const emit = defineEmits(['update:modelValue'])
 const config = useVModel(props, 'modelValue', emit) as Ref<KafkaMQConfig>
diff --git a/src/views/iot/rule/databridge/config/MqttConfigForm.vue b/src/views/iot/rule/databridge/config/MqttConfigForm.vue
index 881c83fa..af2578b1 100644
--- a/src/views/iot/rule/databridge/config/MqttConfigForm.vue
+++ b/src/views/iot/rule/databridge/config/MqttConfigForm.vue
@@ -22,7 +22,7 @@ import { useVModel } from '@vueuse/core'
 defineOptions({ name: 'MqttConfigForm' })
 
 const props = defineProps<{
-  modelValue: MqttConfig
+  modelValue: any
 }>()
 const emit = defineEmits(['update:modelValue'])
 const config = useVModel(props, 'modelValue', emit) as Ref<MqttConfig>
diff --git a/src/views/iot/rule/databridge/config/RabbitMQConfigForm.vue b/src/views/iot/rule/databridge/config/RabbitMQConfigForm.vue
index 6983e396..bd889b1a 100644
--- a/src/views/iot/rule/databridge/config/RabbitMQConfigForm.vue
+++ b/src/views/iot/rule/databridge/config/RabbitMQConfigForm.vue
@@ -31,7 +31,7 @@ import { useVModel } from '@vueuse/core'
 defineOptions({ name: 'RabbitMQConfigForm' })
 
 const props = defineProps<{
-  modelValue: RabbitMQConfig
+  modelValue: any
 }>()
 const emit = defineEmits(['update:modelValue'])
 const config = useVModel(props, 'modelValue', emit) as Ref<RabbitMQConfig>
diff --git a/src/views/iot/rule/databridge/config/RedisStreamMQConfigForm.vue b/src/views/iot/rule/databridge/config/RedisStreamMQConfigForm.vue
index 24f39664..9b1cc455 100644
--- a/src/views/iot/rule/databridge/config/RedisStreamMQConfigForm.vue
+++ b/src/views/iot/rule/databridge/config/RedisStreamMQConfigForm.vue
@@ -22,7 +22,7 @@ import { useVModel } from '@vueuse/core'
 defineOptions({ name: 'RedisStreamMQConfigForm' })
 
 const props = defineProps<{
-  modelValue: RedisStreamMQConfig
+  modelValue: any
 }>()
 const emit = defineEmits(['update:modelValue'])
 const config = useVModel(props, 'modelValue', emit) as Ref<RedisStreamMQConfig>
diff --git a/src/views/iot/rule/databridge/config/RocketMQConfigForm.vue b/src/views/iot/rule/databridge/config/RocketMQConfigForm.vue
index 22d2093b..75a90483 100644
--- a/src/views/iot/rule/databridge/config/RocketMQConfigForm.vue
+++ b/src/views/iot/rule/databridge/config/RocketMQConfigForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-form-item label="命名服务地址" prop="config.nameServer">
+  <el-form-item label="名称服务地址" prop="config.nameServer">
     <el-input v-model="config.nameServer" placeholder="请输入命名服务地址，如：127.0.0.1:9876" />
   </el-form-item>
   <el-form-item label="Access Key" prop="config.accessKey">
@@ -30,7 +30,7 @@ import { useVModel } from '@vueuse/core'
 defineOptions({ name: 'RocketMQConfigForm' })
 
 const props = defineProps<{
-  modelValue: RocketMQConfig
+  modelValue: any
 }>()
 const emit = defineEmits(['update:modelValue'])
 const config = useVModel(props, 'modelValue', emit) as Ref<RocketMQConfig>