- ),
- text: "",
- }}
- footer={
-
- 
-
-
- 
-
-
- }
- >
-
-
- }
- />
-
- );
+
+
+
+
+ {user && user.userName}
+
+
+ }
+ >
+
+
+ }
+ />
+
+ );
};
function mapStateToProps (state) {
- const { global, auth, } = state;
- return {
- actions: global.actions,
- user: auth.user,
+ const { global, auth, } = state;
+ return {
+ actions: global.actions,
+ user: auth.user,
// socket: webSocket.socket,
- };
+ };
}
export default connect(mapStateToProps)(Header);
diff --git a/code/web/client/src/layout/components/sider/index.jsx b/code/web/client/src/layout/components/sider/index.jsx
index 9120fcb..491f015 100644
--- a/code/web/client/src/layout/components/sider/index.jsx
+++ b/code/web/client/src/layout/components/sider/index.jsx
@@ -14,7 +14,6 @@ const Sider = props => {
useEffect(() => {
const { sections, dispatch, user } = props;
let nextItems = []
- console.log(sections);
for (let c of sections) {
if (typeof c.getNavItem == 'function') {
let item = c.getNavItem(user, dispatch);
@@ -23,7 +22,6 @@ const Sider = props => {
}
}
}
- console.log(nextItems);
setItems(nextItems)
const lastSelectedKeys = localStorage.getItem('fs_iot_auth_selected_sider')
diff --git a/code/web/client/src/sections/edition/actions/index.js b/code/web/client/src/sections/edition/actions/index.js
index e4febb7..a71e70b 100644
--- a/code/web/client/src/sections/edition/actions/index.js
+++ b/code/web/client/src/sections/edition/actions/index.js
@@ -1,6 +1,19 @@
'use strict';
+import { ApiTable,basicAction } from "$utils";
+
+export function getVersions() {
+ return (dispatch) =>
+ basicAction({
+ type: "get",
+ dispatch: dispatch,
+ actionType: "GET_CAMREA",
+ url: `${ApiTable.getVersions}`,
+ msg: { option: "查询网关版本信息" },
+ reducer: { name: "", params: { noClear: true } },
+ });
+ }
export default {
-
+ getVersions,
};
\ No newline at end of file
diff --git a/code/web/client/src/sections/edition/containers/administer.jsx b/code/web/client/src/sections/edition/containers/administer.jsx
index d4e05e7..c6805e1 100644
--- a/code/web/client/src/sections/edition/containers/administer.jsx
+++ b/code/web/client/src/sections/edition/containers/administer.jsx
@@ -2,28 +2,182 @@
import React, { useEffect, useRef } from 'react';
import { connect } from 'react-redux';
import { push } from 'react-router-redux';
-import { Form, Button, Toast } from '@douyinfe/semi-ui';
+import { Form, Button, Table, Pagination } from '@douyinfe/semi-ui';
import { IconLock, IconUser } from '@douyinfe/semi-icons';
const EditionManage = props => {
const { dispatch, user, error, actions, apiRoot, isRequesting } = props
-
+ const { edition } = actions
useEffect(() => {
-
+ dispatch(edition.getVersions()).then(res => {
+ console.log(res);
+ })
}, [])
+ const columns = [
+ {
+ title: "序列号",
+ render: (_, record, index) => {
+ return index + 1;
+ },
+ }, {
+ title: "Major",
+ dataIndex: "Major",
+ render: (_, record, index) => {
+ return index + 1;
+ },
+ }, {
+ title: "Minor",
+ dataIndex: "Minor",
+ render: (_, record, index) => {
+ return index + 1;
+ },
+ }, {
+ title: "Patch",
+ dataIndex: "naPatchme",
+ render: (_, record, index) => {
+ return index + 1;
+ },
+ }, {
+ title: "Build",
+ dataIndex: "Build",
+ render: (_, record, index) => {
+ return index + 1;
+ },
+ }, {
+ title: "Type",
+ dataIndex: "Type",
+ render: (_, record, index) => {
+ return index + 1;
+ },
+ }, {
+ title: "Desc",
+ dataIndex: "Desc",
+ render: (_, record, index) => {
+ return index + 1;
+ },
+ }, {
+ title: "ImageBase",
+ dataIndex: "ImageBase",
+ render: (_, record, index) => {
+ return index + 1;
+ },
+ }, {
+ title: "ImageVersion",
+ dataIndex: "ImageVersion",
+ render: (_, record, index) => {
+ return index + 1;
+ },
+ }, {
+ title: "CreatedAt",
+ dataIndex: "CreatedAt",
+ render: (_, record, index) => {
+ return index + 1;
+ },
+ }, {
+ title: "操作",
+ dataIndex: "operation",
+ render: (_, record, index) => {
+ return