Showing
3 changed files
with
12 additions
and
5 deletions
| @@ -102,9 +102,9 @@ | @@ -102,9 +102,9 @@ | ||
| 102 | jsonData.value.params = field.commandText; | 102 | jsonData.value.params = field.commandText; |
| 103 | } | 103 | } |
| 104 | jsonData.value.persistent = true; | 104 | jsonData.value.persistent = true; |
| 105 | - jsonData.value.additionalInfo = { | ||
| 106 | - cmdType: 'API', | ||
| 107 | - }; | 105 | + // jsonData.value.additionalInfo = { |
| 106 | + // cmdType: 'API', | ||
| 107 | + // }; | ||
| 108 | jsonData.value.method = 'methodThingskit'; | 108 | jsonData.value.method = 'methodThingskit'; |
| 109 | commandIssuanceApi(field.commandType, props.deviceDetail.tbDeviceId, jsonData.value) | 109 | commandIssuanceApi(field.commandType, props.deviceDetail.tbDeviceId, jsonData.value) |
| 110 | .then((res) => { | 110 | .then((res) => { |
| @@ -399,7 +399,9 @@ | @@ -399,7 +399,9 @@ | ||
| 399 | }); | 399 | }); |
| 400 | // 如果是设备输出设置脚本值 | 400 | // 如果是设备输出设置脚本值 |
| 401 | if (action.outTarget === 'DEVICE_OUT') { | 401 | if (action.outTarget === 'DEVICE_OUT') { |
| 402 | - unref(skipUnwrap.actionItemRefs)[index].setJsonValue(action.doContext.params); | 402 | + if (action.commandType.toString() === '0') { |
| 403 | + unref(skipUnwrap.actionItemRefs)[index].setJsonValue(action.doContext.params); | ||
| 404 | + } | ||
| 403 | } | 405 | } |
| 404 | // 清除告警有值?{数组} | 406 | // 清除告警有值?{数组} |
| 405 | if (action?.doContext?.clearRule?.length) { | 407 | if (action?.doContext?.clearRule?.length) { |
| @@ -44,7 +44,12 @@ | @@ -44,7 +44,12 @@ | ||
| 44 | <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div> | 44 | <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div> |
| 45 | <a-button style="margin: -5px 0" type="text" @click="handlePremitter">格式化</a-button> | 45 | <a-button style="margin: -5px 0" type="text" @click="handlePremitter">格式化</a-button> |
| 46 | <Tooltip | 46 | <Tooltip |
| 47 | - title='{"method":"setDOValue","params":{"devID":"492S211218028819","data":{"DO1":1}}}' | 47 | + :title=" |
| 48 | + JSON.stringify({ | ||
| 49 | + method: 'setDOValue', | ||
| 50 | + params: { devID: '492S211218028819', data: { DO1: 1 } }, | ||
| 51 | + }) | ||
| 52 | + " | ||
| 48 | class="ml-2" | 53 | class="ml-2" |
| 49 | > | 54 | > |
| 50 | <QuestionCircleOutlined style="font-size: 1rem" /> | 55 | <QuestionCircleOutlined style="font-size: 1rem" /> |