瀏覽代碼

feat: 联调测试环境MQTT新地址;

liujia 1 月之前
父節點
當前提交
16faf5efe6

+ 2 - 2
.env.test

@@ -9,8 +9,8 @@ VITE_APP_HOST=https://radar-power.cn
 VITE_API_BASE_URL=/portal-service-server/web 
 # mqtt配置
 VITE_MQTT_HOST=wss://radar-power.cn:8084/mqtt
-VITE_MQTT_HOST_ALARM=wss://radar-power.cn:8084/mqtt
-VITE_MQTT_HOST_POINT=wss://radar-power.cn:8084/mqtt
+VITE_MQTT_HOST_ALARM=wss://cmd.radar-power.cn/mqtt/
+VITE_MQTT_HOST_POINT=wss://data.radar-power.cn/mqtt/
 # VITE_MQTT_HOST_ALARM=ws://cmd.radar-power.cn:8084/mqtt # 告警MQTT地址
 # VITE_MQTT_HOST_POINT=ws://data.radar-power.cn:8084/mqtt # 点位数据MQTT地址
 VITE_MQTT_USERNAME=admin

+ 3 - 3
src/layout/index.vue

@@ -128,7 +128,7 @@ const initMqttManager = async () => {
       host: import.meta.env.VITE_MQTT_HOST_ALARM,
       username: import.meta.env.VITE_MQTT_USERNAME,
       password: import.meta.env.VITE_MQTT_PASSWORD,
-      clientId: `mqtt_client_${Math.random().toString(16).slice(2, 8)}`,
+      clientId: `web_mqtt_cmd1`,
     }
     mqttClient = mqtt.connect(mqttConfig.host, {
       clientId: mqttConfig.clientId,
@@ -159,14 +159,14 @@ const initMqttManager = async () => {
         else console.log('✅ 已发送参数:', messageData)
       })
       // 订阅所有主题
-      mqttClient?.subscribe(`/mps/client/connect/`, (err) => {
+      mqttClient?.subscribe(`/mps/client/connect/`, { qos: 2 }, (err) => {
         if (err) {
           console.error('MQTT订阅失败', err)
         } else {
           console.log(`🔥已订阅主题 /mps/client/connect`)
         }
       })
-      mqttClient?.subscribe(`/mps/wb_${userStore.userInfo?.userId}/notice`, (err) => {
+      mqttClient?.subscribe(`/mps/wb_${userStore.userInfo?.userId}/notice`, { qos: 2 }, (err) => {
         if (err) {
           console.error('MQTT订阅失败', err)
         } else {

+ 2 - 1
src/views/device/detail/components/alarmPlanModal/index.vue

@@ -526,7 +526,7 @@ const formState = reactive<FormState>({
   timeThreshold: 300,
 })
 
-const planTemplateId = ref<number>()
+const planTemplateId = ref<number | null>()
 const planTemplate = ref<AlarmPlan>()
 
 const planTemplateOptions = ref<SelectProps['options']>([])
@@ -859,6 +859,7 @@ const cancel = () => {
   formState.count = 3
   formState.timeThreshold = 300
   formState.remark = ''
+  planTemplateId.value = null
 }
 
 const eventTypeList = ref<{ label: string; value: string }[]>([])

+ 1 - 1
src/views/device/detail/index.vue

@@ -557,7 +557,7 @@ onMounted(() => {
     host: import.meta.env.VITE_MQTT_HOST_POINT,
     username: import.meta.env.VITE_MQTT_USERNAME,
     password: import.meta.env.VITE_MQTT_PASSWORD,
-    clientId: `mqtt_client_${Math.random().toString(16).slice(2, 8)}`,
+    clientId: `web_mqtt_data1`,
   }
   mqttClient = mqtt.connect(mqttConfig.host, {
     clientId: mqttConfig.clientId,