Преглед на файлове

feat: 设备(命令下发)

lvkun преди 3 години
родител
ревизия
0ff81be7ea
променени са 1 файла, в които са добавени 7 реда и са изтрити 27 реда
  1. 7 27
      src/pages/Iot/device/components/cloudview.vue

+ 7 - 27
src/pages/Iot/device/components/cloudview.vue

@@ -96,10 +96,9 @@
     <a-form-item
       label="设置命令参数"
       v-bind="validateInfos.validateInfosCmd"
-      v-if="cmdDetail?.cmdParams || cmdDetail?.cmdResponses"
+      v-if="cmdDetail?.cmdParams"
     >
       <a-row>
-        <a-col>下发参数</a-col>
         <a-col v-for="(item, index) in cmdDetail?.cmdParams" :key="index" style="margin: 10px 0px;"  >
           <a-input-group  size="large"  >
             <a-row :gutter="8" align="middle" >
@@ -113,21 +112,6 @@
           </a-input-group>
         </a-col>
       </a-row>
-      <a-row>
-        <a-col>下发参数</a-col>
-        <a-col style="margin: 10px 0px;" v-for="(item, index) in cmdDetail?.cmdResponses" :key="index" >
-          <a-input-group  size="large"  >
-            <a-row :gutter="8" align="middle" >
-              <a-col :span="8">
-                <a-input placeholder="key" v-model:value="item.paramLabel" disabled />
-              </a-col>
-              <a-col :span="8">
-                <a-input placeholder="value" v-model:value="item.dataUnit" />
-              </a-col>
-            </a-row>
-          </a-input-group>
-        </a-col>
-      </a-row>
     </a-form-item>
     <a-form-item  label="设置命令参数" >
       产品尚未配置命令,请先去 <a @click="pushProductDetail" >产品详情</a> 定义命令。
@@ -162,7 +146,7 @@
       >
       <a-descriptions-item :span="24" label="状态">{{ DeviceContriller.deviceMag.get(state.cmdDetail!.status! )?.name }}</a-descriptions-item>
       <a-descriptions-item :span="24" label="命令名称">{{state.cmdDetail.cmdLabel}}</a-descriptions-item>
-      <a-descriptions-item :span="24" label="上传参数">{{state.cmdDetail.cmdPayload}}</a-descriptions-item>
+      <a-descriptions-item :span="24" label="参数">{{state.cmdDetail.cmdPayload}}</a-descriptions-item>
       <!-- <a-descriptions-item :span="24" label="下发参数">{{state.cmdDetail.msgLabel}}</a-descriptions-item> -->
       <a-descriptions-item :span="24" label="消息创建时间">
         {{dayjs(state.cmdDetail.createAt).format('YYYY-MM-DD HH:mm:ss')}}
@@ -337,19 +321,15 @@ const ok = () => {
   } else {
     validateCmd().then(async () => {
       const _cmdParameters: Record<string, string> = {}
-      cmdState.cmdParameters.forEach(item => {
-        _cmdParameters[item.key] = item.value
+
+      cmdDetail.value?.cmdParams.forEach(item => {
+        _cmdParameters[item.paramLabel] = item.dataUnit
       })
-      // cmd的cmdParams有可能是多个
-      // Object.keys(cmdDetail.value.cmdParams).forEach(item => {
-      //   _cmdParameters[cmdDetail.value.cmdParams[item.key]] = cmdDetail.value.cmdParams[]
-      // })
+
       const $params = {
         ...cmdState,
-        cmdLabel: cmdDetail.value?.cmdLabel,
+        cmdLabel: cmdDetail.value!.cmdLabel,
         cmdParameters: _cmdParameters
-
-        { ...cmdDetail.value?.cmdParams, ...cmdDetail.value?.cmdResponses }
       }
       await DeviceContriller.addDeviceCmd($params)
       state.visible = false