Browse Source

fix: 设备输出

Wzyyy98 3 years ago
parent
commit
51102b96a0

+ 1 - 0
src/pages/rule-engine/Scene/Save/action/DeviceOutput/device/index.tsx

@@ -364,6 +364,7 @@ export default observer((props: Props) => {
                     if (selectedRows.length) {
                       const item = selectedRows?.[0];
                       DeviceModel.deviceId = item.id;
+                      DeviceModel.deviceDetail = item;
                       DeviceModel.selectorValues = [
                         { value: DeviceModel.deviceId, name: item.name },
                       ];

+ 6 - 3
src/pages/rule-engine/Scene/Save/action/DeviceOutput/index.tsx

@@ -75,10 +75,10 @@ export default observer((props: Props) => {
       productId: DeviceModel.productId,
       message: value.device.message,
     };
-    console.log(item, value);
+    // console.log(item, value);
 
     const _options: any = {
-      name: '', //设备名称
+      name: '-', //设备名称
       type: '', //类型
       properties: '', //属性功能
       selector: DeviceModel.selector, //选择器标识
@@ -95,10 +95,12 @@ export default observer((props: Props) => {
     if (_type === 'READ_PROPERTY') {
       _options.type = '读取';
       _options.properties = value.device.message.properties?.[0];
+      // _options.name = DeviceModel.selectorValues[0].name;
     }
     if (_type === 'WRITE_PROPERTY') {
       _options.type = '设置';
       _options.properties = Object.keys(value.device.message.properties)?.[0];
+      // _options.name = DeviceModel.selectorValues[0].name;
     }
     if (_options.selector === 'tag') {
       _options.taglist = DeviceModel.selectorValues?.[0]?.value.map((it: any) => ({
@@ -108,7 +110,8 @@ export default observer((props: Props) => {
       }));
       // console.log(_options.taglist, 'taglist')
     }
-    // console.log(_options);
+    console.log(_options);
+    console.log(DeviceModel.deviceDetail.name);
     // console.log('device', item);
     props.save(item, _options);
     // FormModel.actions[props.name].options = _options;

+ 1 - 1
src/pages/rule-engine/Scene/Save/action/ListItem/List.tsx

@@ -66,7 +66,7 @@ export default (props: ListProps) => {
             console.log(data);
 
             const { type, ...extra } = data;
-            console.log('list', data);
+            console.log('list', options);
             const item: ActionsType = {
               ...extra,
               executor: data.type === 'trigger' || data.type === 'relieve' ? 'alarm' : data.type,