板块修改

code/web/client/src/sections/edition/actions/index.js

@@ -41,16 +41,41 @@ export function getVersions () {
       basicAction({
          type: "get",
          dispatch: dispatch,
-         actionType: "GET_CAMREA",
+         actionType: "GET_VERSIONS",
          url: `${ApiTable.getVersions}`,
          msg: { option: "查询网关版本信息" },
          reducer: { name: "", params: { noClear: true } },
       });
 }
 
+export function deleteVersion (id) {
+   return dispatch => basicAction({
+      type: 'delete',
+      dispatch: dispatch,
+      actionType: 'DELETE_VERSION',
+      url: ApiTable.deleteVersion.replace('{versionId}', id),
+      msg: { option: '删除网关版本' },
+      reducer: { name: '' }
+   });
+}
+
+export function postVersion (data) {
+   return (dispatch) =>
+      basicAction({
+         type: "post",
+         dispatch: dispatch,
+         data,
+         actionType: "POST_VERSION",
+         url: `${ApiTable.postVersion}`,
+         msg: { option: "新增网关版本" },
+      });
+}
+
 export default {
    getVersions,
    getGateways,
    getGatewayStatus,
-   ableGateway
+   ableGateway,
+   deleteVersion,
+   postVersion,
 };

code/web/client/src/sections/edition/containers/administer.jsx

@@ -2,21 +2,29 @@
 import React, { useEffect, useRef } from 'react';
 import { connect } from 'react-redux';
 import { push } from 'react-router-redux';
-import { Form, Button, Table, Pagination } from '@douyinfe/semi-ui';
+import { Form, Button, Table, Pagination, Modal } from '@douyinfe/semi-ui';
 import { IconLock, IconUser } from '@douyinfe/semi-icons';
+import { useState } from 'react';
 
 const EditionManage = props => {
    const { dispatch, user, error, actions, apiRoot, isRequesting } = props
    const { edition } = actions
+   const [versionList, setVersionList] = useState([])
+   const [addVersion, setaddVersion] = useState(false)
+   const api = useRef()
 
    useEffect(() => {
+      requestData()
+   }, [])
 
+   const requestData = () => {
       dispatch(edition.getVersions()).then(res => {
          console.log(res);
+         if (res.success) {
+            setVersionList(res.payload.data)
+         }
       })
-
+   }
-
-   }, [])
 
    const columns = [
       {
@@ -25,64 +33,58 @@ const EditionManage = props => {
             return index + 1;
          },
       }, {
-         title: "Major",
+         title: "主版本号",
-         dataIndex: "Major",
+         dataIndex: "major",
-         render: (_, record, index) => {
+         key: "major",
-            return index + 1;
-         },
       }, {
-         title: "Minor",
+         title: "次版本号",
-         dataIndex: "Minor",
+         dataIndex: "minor",
-         render: (_, record, index) => {
+         key: "minor",
-            return index + 1;
-         },
       }, {
-         title: "Patch",
+         title: "补丁版本号",
-         dataIndex: "naPatchme",
+         dataIndex: "patch",
-         render: (_, record, index) => {
+         key: "patch",
-            return index + 1;
-         },
       }, {
-         title: "Build",
+         title: "构建号",
-         dataIndex: "Build",
+         dataIndex: "build",
-         render: (_, record, index) => {
+         key: "build",
-            return index + 1;
-         },
       }, {
-         title: "Type",
+         title: "类型",
-         dataIndex: "Type",
+         dataIndex: "type",
-         render: (_, record, index) => {
+         key: "type",
-            return index + 1;
-         },
       }, {
-         title: "Desc",
+         title: "描述",
-         dataIndex: "Desc",
+         dataIndex: "desc",
-         render: (_, record, index) => {
+         key: "desc",
-            return index + 1;
-         },
       }, {
-         title: "ImageBase",
+         title: "基础镜像地址",
-         dataIndex: "ImageBase",
+         dataIndex: "imageBase",
-         render: (_, record, index) => {
+         key: "imageBase",
-            return index + 1;
-         },
       }, {
-         title: "ImageVersion",
+         title: "镜像版本",
-         dataIndex: "ImageVersion",
+         dataIndex: "imageVersion",
-         render: (_, record, index) => {
+         key: "imageVersion",
-            return index + 1;
+         render: (_, r, index) => {
+            return <div style={{ width: 80 }}>{r.imageVersion}</div>
          },
       }, {
-         title: "CreatedAt",
+         title: "创建时间",
-         dataIndex: "CreatedAt",
+         dataIndex: "createdAt",
-         render: (_, record, index) => {
+         key: "createdAt",
-            return index + 1;
+         render: (_, r, index) => {
+            return <div style={{ width: 130 }}>{r.createdAt}</div>
          },
       }, {
          title: "操作",
          dataIndex: "operation",
-         render: (_, record, index) => {
+         render: (_, r, index) => {
-            return <Button>删除</Button>
+            return <Button onClick={() => {
+               dispatch(edition.deleteVersion(r.id)).then(res => {
+                  if (res.success) {
+                     requestData()
+                  }
+               })
+            }}>删除</Button>
          },
       },
    ]
@@ -132,17 +134,21 @@ const EditionManage = props => {
                      cursor: "pointer",
                   }}
                   onClick={() => {
-
+                     setaddVersion(true)
                   }}
                >
                   添加版本
                </div>
             </div>
          </div>
-         <div style={{ background: "#FFFFFF", marginTop: 5 }}>
+         <div style={{ width: "100%",
+               background: "#FFFFFF",
+               borderRadius: 3,
+               padding: "8px 20px",
+               marginTop: 20, }}>
             <Table
                columns={columns}
-               dataSource={[]}
+               dataSource={versionList}
                bordered={false}
                empty="暂无数据"
                style={{
@@ -150,7 +156,7 @@ const EditionManage = props => {
                }}
                pagination={false}
             />
-            <div
+            {versionList.length > 0 ? <div
                style={{
                   display: "flex",
                   justifyContent: "flex-end",
@@ -158,10 +164,10 @@ const EditionManage = props => {
                }}
             >
                <span style={{ lineHeight: "30px" }}>
-                  共{100}个设备
+                  共{versionList.length}个设备
                </span>
                <Pagination
-                  total={100}
+                  total={versionList.length}
                   showSizeChanger
                   currentPage={1}
                   pageSizeOpts={[10, 20, 30, 40]}
@@ -170,9 +176,58 @@ const EditionManage = props => {
                      // page.current = currentPage - 1
                   }}
                />
-            </div>
+            </div> : ""}
          </div>
+         <Modal
+            title='新增网关版本'
+            // okText={okText}
+            visible={addVersion}
+            onOk={() => {
+               api.current.validate().then(r => {
+                  console.log(r);
+                  dispatch(edition.postVersion({ build: 0,
+                  createdAt: "2022-12-12 10:00:00",
+                  desc: "fix温度修正",
+                  // id: 1,
+                  imageBase: "registry.cn-hangzhou.aliyuncs.com/fs-cloud/fs-edge",
+                  imageVersion: "3.22-12-30",
+                  major: 0,
+                  minor: 2,
+                  patch: 1,
+                  type: "beta"})).then(res => {
+                     if (res.success) {
+                  //       requestData()
+                  //       setaddVersion(false)
+                     }
+                  })
+               })
+            }}
+            width={610}
+            onCancel={() => setaddVersion(false)}
+         >
+            <Form
+               getFormApi={(formApi) => (api.current = formApi)}
+               layout="horizontal"
+               labelAlign="right"
+               labelWidth="90px"
+               style={{ display: 'flex', flexDirection: 'column' }}
+            >
+               <Form.Input field='major' label='主版本号:' labelPosition="left" placeholder='请输入主版本号' style={{ width: 200, marginBottom: 10 }} />
+               <Form.Input field='minor' label='次版本号:' labelPosition="left" placeholder='请输入次版本号' style={{ width: 200, marginBottom: 10 }} />
+               <Form.Input field='patch' label='补丁版本号:' labelPosition="left" placeholder='请输入补丁版本号' style={{ width: 200, marginBottom: 10 }} />
+               <Form.Input field='build' label='构建号:' labelPosition="left" placeholder='请输入构建号' style={{ width: 200, marginBottom: 10 }} />
+               <Form.Select field="type" label='Type:' labelPosition="left" placeholder='请选择类型' style={{ width: 200, marginBottom: 10 }}>
+                  <Form.Select.Option value="beta">beta</Form.Select.Option>
+                  <Form.Select.Option value="alpha">alpha</Form.Select.Option>
+                  <Form.Select.Option value="release">release</Form.Select.Option>
+                  <Form.Select.Option value="LTS">LTS</Form.Select.Option>
+               </Form.Select>
+               <Form.Input field='imageBase' label='基础镜像地址:' labelPosition="left" placeholder='请输入基础镜像地址' style={{ width: 460, marginBottom: 10 }} />
+               <Form.Input field='tmageVersion' label='镜像版本:' labelPosition="left" placeholder='请输入镜像版本' style={{ width: 200, marginBottom: 10 }} />
+               <Form.TextArea field='desc' label='描述:' labelPosition="left" placeholder='请输入描述' style={{ width: 460 }} />
 
+            </Form>
+         </Modal>
       </>
    );
 }

code/web/client/src/sections/edition/containers/gateway.jsx

@@ -115,7 +115,62 @@ const GatewayManage = props => {
         }
     ];
     return (
-        <div style={{}}>
+      <>
+       <div>
+            <video
+               id="gatewayBanner"
+               autoPlay
+               loop
+               muted
+               style={{ width: "100%", objectFit: "cover", height: 171 }}
+               src="/assets/videos/gateway_banner.mp4"
+               type="video/mp4"
+            />
+            <div style={{ position: "absolute", top: 12 }}>
+               <div
+                  style={{
+                     fontSize: 22,
+                     paddingTop: 15,
+                     marginLeft: 21,
+                  }}
+               >
+                  设备管理
+               </div>
+               <div
+                  style={{
+                     fontSize: 14,
+                     paddingTop: 18,
+                     marginLeft: 20,
+                  }}
+               >
+                  对NVR（网络硬盘录像机）设备节点的管理
+               </div>
+               <div
+                  style={{
+                     fontSize: 14,
+                     marginTop: 28,
+                     marginLeft: 21,
+                     width: 89,
+                     height: 32,
+                     lineHeight: "32px",
+                     textAlign: "center",
+                     backgroundColor: "#D9EAFF",
+                     color: "#1859C1",
+                     cursor: "pointer",
+                  }}
+                  onClick={() => {
+                     
+                  }}
+               >
+                新增设备
+               </div>
+            </div>
+         </div>
+       <div style={{ width: "100%",
+               background: "#FFFFFF",
+               borderRadius: 3,
+               padding: "8px 20px",
+               marginTop: 20,}}>
             <Skeleton
                 loading={false}
                 active={true}
@@ -155,6 +210,8 @@ const GatewayManage = props => {
                     dataToModal={dataToModal} /> : ''
             }
         </div>
+      </>
+        
     );
 }
 

code/web/client/src/utils/webapi.js

@@ -4,12 +4,14 @@ export const ApiTable = {
    login: 'v1/login',
    logout: 'v1/logout',
 
-    crossCheck: 'cross_token/check',
+   crossCheck: 'cross_token/check',
-    getGateways: 'v1/edges',
+   getGateways: 'v1/edges',
-    ableGateway: 'v1/edge/{id}/enable',
+   ableGateway: 'v1/edge/{id}/enable',
-    getGatewayStatus: 'v1/edge/{id}/metrics',
+   getGatewayStatus: 'v1/edge/{id}/metrics',
 
-    getVersions: 'v1/versions',    //查询网关版本信息
+   getVersions: 'v1/versions',    //查询网关版本信息
+   deleteVersion: 'v1/version/{versionId}',  //删除网关版本
+   postVersion: 'v1/version',   //新增网关版本
 };
 
 export const RouteTable = {