100011797 3 лет назад
Родитель
Сommit
2b10af541a

+ 1 - 0
src/components/DashBoard/header.tsx

@@ -62,6 +62,7 @@ export default forwardRef((props: HeaderProps, ref) => {
           preserve={false}
           initialValues={props.initialValues}
           onValuesChange={(_, allValue) => {
+            console.log(allValue, 'allValue');
             if (props.closeInitialParams && !isCloseInitial.current) {
               isCloseInitial.current = true;
             } else {

+ 1 - 1
src/pages/link/DataCollect/Dashboard/index.tsx

@@ -122,7 +122,7 @@ const DeviceBoard = () => {
           };
         } else {
           return {
-            limit: Math.abs(Math.ceil(dt / days)) + 1,
+            limit: Math.abs(Math.ceil(time / days)) + 1,
             interval: '1d',
             format: 'MM-dd',
           };

+ 22 - 4
src/pages/link/DataCollect/components/Channel/Save/index.tsx

@@ -227,10 +227,28 @@ export default (props: Props) => {
                 required: true,
                 message: '请输入端点url',
               },
-              // {
-              //   format: 'url',
-              //   message: '请输入正确的端点url',
-              // },
+              {
+                triggerType: 'onBlur',
+                validator: (value: string) => {
+                  return new Promise((resolve) => {
+                    service
+                      .validateField(value)
+                      .then((resp) => {
+                        if (resp.status === 200) {
+                          if (resp.result.passed) {
+                            resolve('');
+                          } else {
+                            resolve(resp.result.reason);
+                          }
+                        }
+                        resolve('');
+                      })
+                      .catch(() => {
+                        return '验证失败!';
+                      });
+                  });
+                },
+              },
             ],
             'x-reactions': {
               dependencies: ['..provider'],

+ 1 - 0
src/pages/link/DataCollect/components/Channel/index.tsx

@@ -190,6 +190,7 @@ export default observer((props: Props) => {
                               title: '该操作将会删除下属采集器与点位,确定删除?',
                               onConfirm: async () => {
                                 await service.removeChannel(record.id);
+                                handleSearch(param);
                                 onlyMessage(
                                   intl.formatMessage({
                                     id: 'pages.data.option.success',

+ 1 - 1
src/pages/link/DataCollect/components/Point/CollectorCard/index.tsx

@@ -220,7 +220,7 @@ const CollectorCard = (props: PointCardProps) => {
                     {(item?.accessModes || []).map((i) => i?.text).join(',')}
                   </div>
                   <div className={'card-item-content-item-tag'}>
-                    采集频率{item?.configuration?.interval}s
+                    采集频率{item?.configuration?.interval}ms
                   </div>
                 </div>
               </div>

+ 6 - 0
src/pages/link/DataCollect/service.ts

@@ -158,6 +158,12 @@ class Service {
       method: 'POST',
       data,
     });
+
+  public validateField = (data?: any) =>
+    request(`/${SystemConst.API_BASE}/data-collect/opc/endpoint/_validate`, {
+      method: 'POST',
+      data,
+    });
 }
 
 const service = new Service();