Merge branch 'master' of https://e.coding.net/jiaolongcloud/cloudlink/cloudlink-ui

src/pages/Iot/device/components/cloudview.vue

@@ -107,9 +107,9 @@
   >
     <a-form-item
       label="命令名称"
-      v-bind="validateInfosCmd.cmdId"
+      v-bind="validateInfosCmd.cmdCode"
     >
-      <a-select allowClear v-model:value="cmdState.cmdId" >
+      <a-select allowClear v-model:value="cmdState.cmdCode" >
         <a-select-option
           v-for="item in state.cmdList"
           :key="item.id"
@@ -323,9 +323,11 @@ const cmdState = reactive<{
   cmdId: string
   deviceId: string,
   cmdLabel: string,
+  cmdCode: string
   cmdParameters: {key: string, value: string}[]
 }>({
   cmdId: '',
+  cmdCode: '',
   deviceId: deviceId,
   cmdLabel: '',
   cmdParameters: []
@@ -337,7 +339,7 @@ const { resetFields, validate, validateInfos } = useForm(msgState, reactive({
 }))
 
 const { resetFields: resetFieldsCmd, validate: validateCmd, validateInfos: validateInfosCmd } = useForm(cmdState, reactive({
-  cmdId: [{ required: true, message: '请填写命令名称' }]
+  cmdCode: [{ required: true, message: '请填写命令code' }]
 }))
 
 const getModelCmdList = async () => {
@@ -366,7 +368,7 @@ const ok = () => {
 
       const $params = {
         ...cmdState,
-        cmdLabel: cmdDetail.value!.cmdLabel,
+        // cmdLabel: cmdDetail.value!.cmdLabel,
         cmdParameters: _cmdParameters
       }
       await DeviceContriller.addDeviceCmd($params)

src/pages/Iot/device/modal/cmdPush.vue

@@ -13,9 +13,9 @@
   >
     <a-form-item
       label="命令名称"
-      v-bind="validateInfosCmd.cmdId"
+      v-bind="validateInfosCmd.cmdCode"
     >
-      <a-select allowClear v-model:value="cmdState.cmdId" >
+      <a-select allowClear v-model:value="cmdState.cmdCode" >
         <a-select-option
           v-for="item in state.cmdList"
           :key="item?.id"
@@ -80,10 +80,12 @@ const state = reactive<{
 const cmdState = reactive<{
   cmdId: string
   deviceId: string,
+  cmdCode: string,
   cmdLabel: string,
   cmdParameters: {key: string, value: string}[]
 }>({
   cmdId: '',
+  cmdCode: '',
   deviceId: props.deviceId,
   cmdLabel: '',
   cmdParameters: []
@@ -92,7 +94,7 @@ const cmdState = reactive<{
 const cmdDetail = computed(() => state.cmdList.find(item => item.id === cmdState.cmdId))
 
 const { resetFields: resetFieldsCmd, validate: validateCmd, validateInfos: validateInfosCmd } = useForm(cmdState, reactive({
-  cmdId: [{ required: true, message: '请填写命令名称' }]
+  cmdCode: [{ required: true, message: '请填写命令code' }]
 }))
 
 const pushProductDetail = () => {

src/pages/Iot/rule/linkRules.vue

@@ -548,9 +548,9 @@
             </a-form-item>
             <a-form-item label="选择命令" >
               <a-select
-              allowClear
+                allowClear
                 style="width: 170px;"
-                v-model:value="initActionsData.cmdId"
+                v-model:value="initActionsData.cmdCode"
               >
                   <a-select-option
                     v-for="cmdItem in state.cmdList"
@@ -904,7 +904,8 @@ const _initActionsData = {
   warnSeverity: '',
   noticeLabel: '',
   noticeDescription: '',
-  userId: ''
+  userId: '',
+  cmdCode: ''
 }
 
 const initActionsData = reactive({ ..._initActionsData })
@@ -987,19 +988,17 @@ watch(
     initActionsData.cmdParameters = []
     initActionsData.cmdLabel = ''
     initActionsData.cmdId = ''
+    initActionsData.cmdCode = ''
     getCmdList()
   }
 )
 
 watch(
-  () => initActionsData.cmdId,
+  () => initActionsData.cmdCode,
   () => {
-    const cmdDetail = state.cmdList.find(item => item.id === initActionsData.cmdId)!
-    console.log('cmdDetail:', cmdDetail)
+    const cmdDetail = state.cmdList.find(item => item.cmdCode === initActionsData.cmdCode)!
 
     initActionsData.cmdParameters = cmdDetail.cmdParams
-    console.log(' initActionsData.cmdParameters:', initActionsData.cmdParameters, initActionsData.cmdId)
-
     initActionsData.cmdLabel = cmdDetail.cmdLabel
   }
 )