fix: 类型结构优化

src/apis/system.ts

@@ -1,9 +1,3 @@
 import http from 'libs/http'
 
-export interface Params<T> {
-  commandId: string
-  command: string
-  params: T
-}
-export const debugControl = <T>(params: Params<T>): Promise<any> => http.post('/debug/cmd', params)
-export const control = <T>(params: Params<T>): Promise<any> => http.post('/cmd', params)
+export const debugControl = <T>(params: System.CmdControlParams<T>): Promise<any> => http.post('/debug/cmd', params)

src/components/common/FTStream/index.vue

@@ -20,7 +20,7 @@ const maskRef = ref<HTMLElement | null>(null)
 const maskHeaderRef = ref<HTMLElement | null>(null)
 
 const statusMap = {
-  info: 'default',
+  info: 'info',
   error: 'danger',
   warn: 'warning',
   success: 'success',

src/libs/utils.ts

@@ -1,21 +1,3 @@
-import { control, debugControl } from 'apis/system'
-import { FtMessage } from 'libs/message'
-import { useSystemStore } from 'stores/systemStore'
-
-export const sendControl = async (params: any, type: 'debug' | 'control' = 'control') => {
-  if (!params.commandId) {
-    params.commandId = Date.now().toString()
-  }
-  const systemStore = useSystemStore()
-
-  systemStore.systemList = []
-  const cmdName = cmdNameMap[params.command as keyof typeof cmdNameMap] || params.command
-
-  await (type === 'debug' ? debugControl<any>(params) : control(params))
-  systemStore.updateStreamVisible(true)
-  FtMessage.success(`[${cmdName}]已发送`)
-}
-
 export const cmdNameMap = {
   debug_door_open: '开门',
   debug_door_close: '关门',

src/stores/debugStore.ts

@@ -1,4 +1,8 @@
+import { debugControl } from 'apis/system'
+import { FtMessage } from 'libs/message'
+import { cmdNameMap } from 'libs/utils'
 import { defineStore } from 'pinia'
+import { useSystemStore } from 'stores/systemStore'
 
 export const useDebugStore = defineStore('debug', {
   state: (): Debug.DebugStore => ({
@@ -60,6 +64,19 @@ export const useDebugStore = defineStore('debug', {
     },
   }),
   actions: {
+    async sendControl(params: System.CmdControlParams<{ [key: string]: any }>) {
+      if (!params.commandId) {
+        params.commandId = Date.now().toString()
+      }
+      const systemStore = useSystemStore()
+
+      systemStore.systemList = []
+      const cmdName = cmdNameMap[params.command as keyof typeof cmdNameMap] || params.command
+
+      await debugControl(params)
+      systemStore.updateStreamVisible(true)
+      FtMessage.success(`[${cmdName}]已发送`)
+    },
   },
   persist: true,
 })

src/types/System.d.ts

@@ -7,6 +7,11 @@ declare namespace System {
     menuExpand: boolean
     systemUser: SystemUser
   }
+  interface CmdControlParams<T> {
+    commandId: string
+    command: string
+    params: T
+  }
   interface SystemUser {
     username: string
   }

src/views/debug/index.vue

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { socket } from 'libs/socket'
-import { sendControl } from 'libs/utils'
 import { useDebugStore } from 'stores/debugStore'
 import { useSystemStore } from 'stores/systemStore'
 import { onMounted, onUnmounted } from 'vue'
@@ -23,301 +22,332 @@ const receiveMessage = (data: Socket.NotificationData) => {
 
 const pallet_elevator_lift_up = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_pallet_elevator_lift_up',
     params: {
       index: debugStore.formData.heatArea.index,
       ...debugStore.formData.heatArea.heatMotorData,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const pallet_elevator_lift_down = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_pallet_elevator_lift_down',
     params: {
       index: debugStore.formData.heatArea.index,
       ...debugStore.formData.heatArea.heatMotorData,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const pallet_elevator_stop = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_pallet_elevator_stop',
     params: {
       index: debugStore.formData.heatArea.index,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const heater_start = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_heater_start',
     params: {
       index: debugStore.formData.heatArea.index,
       ...debugStore.formData.heatArea.heatTemperature,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 const heater_stop = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_heater_stop',
     params: {
       index: debugStore.formData.heatArea.index,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_heater_start_heat_maintaining = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_heater_start_heat_maintaining',
     params: {
       index: debugStore.formData.heatArea.index,
       ...debugStore.formData.heatArea.heatTemperature,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_heater_stop_heat_maintaining = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_heater_stop_heat_maintaining',
     params: {
       index: debugStore.formData.heatArea.index,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_fan_start = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_fan_start',
     params: {
       index: debugStore.formData.heatArea.index,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_fan_stop = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_fan_stop',
     params: {
       index: debugStore.formData.heatArea.index,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_cover_elvator_lift_up = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_cover_elvator_lift_up',
     params: {
       ...debugStore.formData.lidData,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_cover_elvator_lift_down = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_cover_elvator_lift_down',
     params: {
       ...debugStore.formData.lidData,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_cover_elvator_reset = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_cover_elvator_reset',
     params: {},
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_cover_elvator_stop = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_cover_elvator_stop',
     params: {},
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const liquid_arm_reset = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_liquid_arm_reset',
     params: {
       target: ['largeArm', 'smallArm'],
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const liquid_arm_rotation = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_liquid_arm_rotation',
     params: {
       ...debugStore.formData.liquidArmData,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const liquid_arm_stop = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_liquid_arm_stop',
     params: {
       target: ['largeArm', 'smallArm'],
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const liquid_pump_pre_filling = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_liquid_pump_pre_filling',
     params: {
       index: debugStore.formData.liquidPumpData.index,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const liquid_pump_pre_evacuation = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_liquid_pump_pre_evacuation',
     params: {
       index: debugStore.formData.liquidPumpData.index,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const liquid_pump_start = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_liquid_pump_start',
     params: {
       ...debugStore.formData.liquidPumpData,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const liquid_pump_stop = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_liquid_pump_stop',
     params: {
       index: debugStore.formData.liquidPumpData.index,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const shaker_start = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_shaker_start',
     params: {
       ...debugStore.formData.shakeSpeed,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const shaker_stop = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_shaker_stop',
     params: {},
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_transportation_arm_reset = async (motor: 'x' | 'y' | 'z') => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_transportation_arm_reset',
     params: {
       dim: [motor],
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_transportation_arm_move = async (motor: 'x' | 'y' | 'z') => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_transportation_arm_move',
     params: {
       ...debugStore.formData.transferModule[`${motor}MotorData`],
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_transportation_arm_stop = async (motor: 'x' | 'y' | 'z') => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_transportation_arm_stop',
     params: {
       dim: [motor],
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_holding_jaw_open = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_holding_jaw_open',
     params: {
       ...debugStore.formData.transferModule.JawData,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_holding_jaw_close = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_holding_jaw_close',
     params: {
       ...debugStore.formData.transferModule.JawData,
     },
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const debug_holding_jaw_pause = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_holding_jaw_pause',
     params: {},
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const door_open = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_door_open',
     params: {},
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const door_close = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_door_close',
     params: {},
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 
 const door_stop = async () => {
   const params = {
+    commandId: Date.now().toString(),
     command: 'debug_door_stop',
     params: {},
   }
-  await sendControl(params, 'debug')
+  await debugStore.sendControl(params)
 }
 </script>