首页 发现 帮助
注册 登录
yf_nkx
/
agmp_iot_jetlinks_ui
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

feat: merge

xieyonghong 3 年之前
父节点
9d10652234 ba744d1daf
当前提交
599526d222
共有 9 个文件被更改，包括 84 次插入 和 11 次删除
合并视图 显示文件统计
  1. 二进制
      public/images/iot-card/iotcard-home.png
  2. 2 0
      src/pages/device/Instance/Detail/Diagnose/Status/index.tsx
  3. 5 1
      src/pages/iot-card/Home/index.tsx
  4. 2 1
      src/pages/iot-card/Platform/Detail/index.tsx
  5. 1 1
      src/pages/iot-card/Platform/index.tsx
  6. 12 7
      src/pages/iot-card/Recharge/detail.tsx
  7. 1 0
      src/pages/iot-card/Recharge/topUp.tsx
  8. 1 1
      src/pages/system/DataSource/Save/index.tsx
  9. 60 0
      src/pages/system/Menu/Setting/baseMenu.ts

二进制
public/images/iot-card/iotcard-home.png
查看文件


+ 2 - 0
src/pages/device/Instance/Detail/Diagnose/Status/index.tsx
查看文件 

@@ -247,6 +247,8 @@ const Status = observer((props: Props) => {
 
           } else {
 
           } else {
 
             resolve({});
 
             resolve({});
 
           }
 
           }
 
+        } else {
 
+          console.error('设备不含accessId');
 
         }
 
         }
 
       }
 
       }
 
     });
 
     });

+ 5 - 1
src/pages/iot-card/Home/index.tsx
查看文件 

@@ -210,7 +210,11 @@ export default () => {
 
           />
 
           />
 
         </Col>
 
         </Col>
 
         <Col span={24}>
 
         <Col span={24}>
 
-          <Body title={'平台架构图'} english={'PLATFORM ARCHITECTURE DIAGRAM'} />
 
+          <Body
 
+            title={'平台架构图'}
 
+            english={'PLATFORM ARCHITECTURE DIAGRAM'}
 
+            url={require('/public/images/iot-card/iotcard-home.png')}
 
+          />
 
         </Col>
 
         </Col>
 
       </Row>
 
       </Row>
 
     </PageContainer>
 
     </PageContainer>

+ 2 - 1
src/pages/iot-card/Platform/Detail/index.tsx
查看文件 

@@ -367,8 +367,9 @@ const Detail = observer(() => {
 
     const res: any = params.id === ':id' ? await service.save(data) : await service.update(data);
 
     const res: any = params.id === ':id' ? await service.save(data) : await service.update(data);
 
     if (res.status === 200) {
 
     if (res.status === 200) {
 
       onlyMessage('保存成功');
 
       onlyMessage('保存成功');
 
+      history.back();
 
     }
 
     }
 
-    console.log(data);
 
+    // console.log(data);
 
   };
 
   };
 
 
 
   useEffect(() => {
 
   useEffect(() => {

+ 1 - 1
src/pages/iot-card/Platform/index.tsx
查看文件 

@@ -137,7 +137,7 @@ const Platform = () => {
 
             },
 
             },
 
           }}
 
           }}
 
         >
 
         >
 
-          {record.state === 'enabled' ? <StopOutlined /> : <PlayCircleOutlined />}
 
+          {record.state.value === 'enabled' ? <StopOutlined /> : <PlayCircleOutlined />}
 
         </PermissionButton>,
 
         </PermissionButton>,
 
         <PermissionButton
 
         <PermissionButton
 
           isPermission={permission.delete}
 
           isPermission={permission.delete}

+ 12 - 7
src/pages/iot-card/Recharge/detail.tsx
查看文件 

@@ -1,4 +1,3 @@
 
-import { Ellipsis } from '@/components';
 
 import { Modal, Descriptions } from 'antd';
 
 import { Modal, Descriptions } from 'antd';
 
 import moment from 'moment';
 
 import moment from 'moment';
 
 
 
@@ -16,21 +15,27 @@ const Detail = (props: Props) => {
 
       visible
 
       visible
 
       onCancel={props.close}
 
       onCancel={props.close}
 
       onOk={props.close}
 
       onOk={props.close}
 
-      width="600px"
 
+      width="1000px"
 
     >
 
     >
 
-      <Descriptions bordered column={2}>
 
+      <Descriptions
 
+        bordered
 
+        column={2}
 
+        contentStyle={{ minWidth: 300 }}
 
+        labelStyle={{ minWidth: 120 }}
 
+      >
 
         <Descriptions.Item label="充值金额">{data.chargeMoney}</Descriptions.Item>
 
         <Descriptions.Item label="充值金额">{data.chargeMoney}</Descriptions.Item>
 
         <Descriptions.Item label="账户id">{data?.rechargeId}</Descriptions.Item>
 
         <Descriptions.Item label="账户id">{data?.rechargeId}</Descriptions.Item>
 
         <Descriptions.Item label="平台对接">{data.configName}</Descriptions.Item>
 
         <Descriptions.Item label="平台对接">{data.configName}</Descriptions.Item>
 
         <Descriptions.Item label="订单号">{data.orderNumber}</Descriptions.Item>
 
         <Descriptions.Item label="订单号">{data.orderNumber}</Descriptions.Item>
 
         <Descriptions.Item label="支付方式">{data.paymentType}</Descriptions.Item>
 
         <Descriptions.Item label="支付方式">{data.paymentType}</Descriptions.Item>
 
         <Descriptions.Item label="支付URL">
 
         <Descriptions.Item label="支付URL">
 
-          {/* {data.url ? data.url : ''} */}
 
-          <Ellipsis
 
+          <div style={{ height: 100, overflow: 'auto' }}>{data.url ? data.url : ''}</div>
 
+
 
+          {/* <Ellipsis
 
             title={data.url ? data.url : ''}
 
             title={data.url ? data.url : ''}
 
             tooltip={{ placement: 'topLeft' }}
 
             tooltip={{ placement: 'topLeft' }}
 
-            maxWidth={'90%'}
 
-          />
 
+            maxWidth={'100%'}
 
+          /> */}
 
         </Descriptions.Item>
 
         </Descriptions.Item>
 
         <Descriptions.Item label="订单时间">
 
         <Descriptions.Item label="订单时间">
 
           {data.createTime ? moment(data.createTime).format('YYYY-MM-DD HH:mm:ss') : '-'}
 
           {data.createTime ? moment(data.createTime).format('YYYY-MM-DD HH:mm:ss') : '-'}

+ 1 - 0
src/pages/iot-card/Recharge/topUp.tsx
查看文件 

@@ -127,6 +127,7 @@ const TopUp = (props: Props) => {
 
             },
 
             },
 
             'x-component-props': {
 
             'x-component-props': {
 
               placeholder: '请输入充值金额',
 
               placeholder: '请输入充值金额',
 
+              precision: 2,
 
             },
 
             },
 
 
 
             'x-validator': [
 
             'x-validator': [

+ 1 - 1
src/pages/system/DataSource/Save/index.tsx
查看文件 

@@ -360,7 +360,7 @@ const Save = (props: Props) => {
 
         props.close();
 
         props.close();
 
       }}
 
       }}
 
       onOk={() => {
 
       onOk={() => {
 
-        if (props.data.id && props.data.typeId === 'rdb') {
 
+        if ((props.data.id && props.data.typeId === 'rdb') || !props.data.id) {
 
           handleSave();
 
           handleSave();
 
         } else {
 
         } else {
 
           onlyMessage('该类型数据库不可以编辑', 'warning');
 
           onlyMessage('该类型数据库不可以编辑', 'warning');

+ 60 - 0
src/pages/system/Menu/Setting/baseMenu.ts
查看文件 

@@ -1362,6 +1362,66 @@ export default [
 
               },
 
               },
 
             ],
 
             ],
 
           },
 
           },
 
+          {
 
+            code: 'link/DataCollect',
 
+            name: '数据采集',
 
+            owner: 'iot',
 
+            sortIndex: 10,
 
+            url: '/iot/link/DataCollect',
 
+            icon: 'icon-shuxingpeizhi',
 
+            showPage: [],
 
+            permissions: [],
 
+            children: [
 
+              {
 
+                code: 'link/DataCollect/Dashboard',
 
+                name: '仪表盘',
 
+                owner: 'iot',
 
+                sortIndex: 1,
 
+                url: '/iot/link/DataCollect/Dashboard',
 
+                icon: 'icon-shujumoni',
 
+                showPage: [
 
+                  'data-collect-channel',
 
+                  'data-collect-opc',
 
+                  'data-collector',
 
+                  'things-collector',
 
+                ],
 
+                permissions: [],
 
+                buttons: [],
 
+              },
 
+              {
 
+                code: 'link/DataCollect/DataGathering',
 
+                name: '数据采集',
 
+                owner: 'iot',
 
+                sortIndex: 2,
 
+                url: '/iot/link/DataCollect/DataGathering',
 
+                icon: 'icon-rizhifuwu',
 
+                showPage: [
 
+                  'data-collect-channel',
 
+                  'data-collect-opc',
 
+                  'data-collector',
 
+                  'things-collector',
 
+                ],
 
+                permissions: [],
 
+                buttons: [],
 
+              },
 
+              {
 
+                code: 'link/DataCollect/IntegratedQuery',
 
+                name: '综合查询',
 
+                owner: 'iot',
 
+                sortIndex: 3,
 
+                url: '/iot/link/DataCollect/IntegratedQuery',
 
+                icon: 'icon-zhilianshebei',
 
+                showPage: [
 
+                  'data-collect-channel',
 
+                  'data-collect-opc',
 
+                  'data-collector',
 
+                  'things-collector',
 
+                ],
 
+                permissions: [],
 
+                buttons: [],
 
+              },
 
+            ],
 
+          },
 
         ],
 
         ],
 
       },
 
       },
 
       {
 
       {