Sfoglia il codice sorgente

fix: 修改数据采集

100011797 3 anni fa
parent
commit
45c7aafcde

+ 6 - 0
src/pages/link/DataCollect/IntegratedQuery/index.tsx

@@ -4,6 +4,7 @@ import { model } from '@formily/reactive';
 import Point from '../components/Point';
 import Device from '../components/Device';
 import Channel from '../components/Channel';
+import { useEffect } from 'react';
 
 const dataModel = model<{
   tab: string;
@@ -29,6 +30,11 @@ export default observer(() => {
       component: <Point type={true} />,
     },
   ];
+
+  useEffect(() => {
+    dataModel.tab = 'channel';
+  }, []);
+
   return (
     <PageContainer
       tabList={list}

+ 20 - 2
src/pages/link/DataCollect/components/Point/Save/BatchUpdate.tsx

@@ -27,6 +27,17 @@ export default (props: Props) => {
 
   const form = createForm({
     initialValues: { array: [] },
+    effects: () => {
+      // onFieldValueChange('array.*.accessModes', (field, form1) => {
+      //   if (field.modified) {
+      //     const value = field.value;
+      //     console.log(value)
+      //     // form1.setFieldState('description', (state) => {
+      //     //   state.value = '';
+      //     // });
+      //   }
+      // });
+    },
   });
 
   registerValidateRules({
@@ -180,11 +191,18 @@ export default (props: Props) => {
   };
 
   useEffect(() => {
+    const one = (props?.data || [])[0];
     form.setValues({
       array: (props?.data || []).map((item) => {
         return {
-          ...item,
-          features: item.features.includes('changedOnly'),
+          ...one,
+          features: one.features.includes('changedOnly'),
+          id: item.id,
+          name: item.name,
+          configuration: {
+            ...one.configuration,
+            nodeId: item.configuration.nodeId,
+          },
         };
       }),
     });

+ 32 - 0
src/pages/system/Menu/Setting/baseMenu.ts

@@ -1420,6 +1420,10 @@ export default [
                         permission: 'data-collect-opc',
                         actions: ['save'],
                       },
+                      {
+                        permission: 'things-collector',
+                        actions: ['save'],
+                      },
                     ],
                   },
                   {
@@ -1438,6 +1442,10 @@ export default [
                         permission: 'data-collect-opc',
                         actions: ['save', 'query'],
                       },
+                      {
+                        permission: 'things-collector',
+                        actions: ['save', 'query'],
+                      },
                     ],
                   },
                   {
@@ -1456,6 +1464,10 @@ export default [
                         permission: 'data-collect-opc',
                         actions: ['save', 'query'],
                       },
+                      {
+                        permission: 'things-collector',
+                        actions: ['save', 'query'],
+                      },
                     ],
                   },
                   {
@@ -1474,6 +1486,10 @@ export default [
                         permission: 'data-collect-opc',
                         actions: ['delete'],
                       },
+                      {
+                        permission: 'things-collector',
+                        actions: ['delete'],
+                      },
                     ],
                   },
                 ],
@@ -1509,6 +1525,10 @@ export default [
                         permission: 'data-collect-opc',
                         actions: ['save'],
                       },
+                      {
+                        permission: 'things-collector',
+                        actions: ['save'],
+                      },
                     ],
                   },
                   {
@@ -1527,6 +1547,10 @@ export default [
                         permission: 'data-collect-opc',
                         actions: ['save', 'query'],
                       },
+                      {
+                        permission: 'things-collector',
+                        actions: ['save', 'query'],
+                      },
                     ],
                   },
                   {
@@ -1545,6 +1569,10 @@ export default [
                         permission: 'data-collect-opc',
                         actions: ['save', 'query'],
                       },
+                      {
+                        permission: 'things-collector',
+                        actions: ['save', 'query'],
+                      },
                     ],
                   },
                   {
@@ -1563,6 +1591,10 @@ export default [
                         permission: 'data-collect-opc',
                         actions: ['delete'],
                       },
+                      {
+                        permission: 'things-collector',
+                        actions: ['delete'],
+                      },
                     ],
                   },
                 ],