Commit b027663bf2346b6b73b091b96d3e38411fa9401f

Authored by fengwotao
2 parents 5053cd3b 0461f377

Merge branch 'main' into local_dev_ft

... ... @@ -102,9 +102,9 @@
102 102 jsonData.value.params = field.commandText;
103 103 }
104 104 jsonData.value.persistent = true;
105   - jsonData.value.additionalInfo = {
106   - cmdType: 'API',
107   - };
  105 + // jsonData.value.additionalInfo = {
  106 + // cmdType: 'API',
  107 + // };
108 108 jsonData.value.method = 'methodThingskit';
109 109 commandIssuanceApi(field.commandType, props.deviceDetail.tbDeviceId, jsonData.value)
110 110 .then((res) => {
... ...
... ... @@ -399,7 +399,9 @@
399 399 });
400 400 // 如果是设备输出设置脚本值
401 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 407 if (action?.doContext?.clearRule?.length) {
... ...
... ... @@ -44,7 +44,12 @@
44 44 <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
45 45 <a-button style="margin: -5px 0" type="text" @click="handlePremitter">格式化</a-button>
46 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 53 class="ml-2"
49 54 >
50 55 <QuestionCircleOutlined style="font-size: 1rem" />
... ...