+
+
+ }
+ }
+ ]
+return <>
+
+
+}
+
+function mapStateToProps (state) {
+ const { auth, global, getPush } = state;
+ return {
+ loading: getPush.isRequesting,
+ user: auth.user,
+ actions: global.actions,
+ pepProjectId:global.pepProjectId
+ };
+ }
+
+ export default connect(mapStateToProps)(DeviceManagement);
\ No newline at end of file
diff --git a/web/client/src/sections/firmwareUpgrade/containers/firmwareLibrary.jsx b/web/client/src/sections/firmwareUpgrade/containers/firmwareLibrary.jsx
new file mode 100644
index 0000000..564eb48
--- /dev/null
+++ b/web/client/src/sections/firmwareUpgrade/containers/firmwareLibrary.jsx
@@ -0,0 +1,137 @@
+import React, { useEffect, useState } from 'react';
+import { connect } from 'react-redux';
+import { Button, Table, Popconfirm, Pagination,Input,Toast } from '@douyinfe/semi-ui';
+import moment from 'moment'
+import AddFirmwareModal from '../components/addFirmwareModal'
+
+
+
+const FirmwareLibrary = (props) => {
+ const {actions,dispatch}=props
+ const [modalVis,setModalVis]=useState(false)//添加固件弹框的显示与隐藏
+ const [recordRow,setRecordRow]=useState()
+ const [data,setData]=useState([])//列表数据
+ const [searchVal,setSearchVal]=useState('')//存储搜索框的值
+ const [users,setUsers]=useState([])//所有用户信息
+ const {service,firmwareUpgrade}=actions
+ // console.log(data,'data1111')
+ const getData=(query)=>{
+ dispatch(firmwareUpgrade.getFirmware(query)).then(res=>{
+ if(res.success)setData(res.payload.data)
+ })
+ }
+ useEffect(()=>{
+
+ //获得已上传的固件列表
+ getData()
+ //用户信息
+ dispatch(service.getOrganizationUsers()).then(res=>{
+ if(res.success) setUsers(res.payload.data)
+
+ })
+ },[])
+
+ const searchHandler=()=>{
+ const query={version:searchVal,device_meta_name:searchVal}
+ getData(query)
+
+ }
+ const onConfirm = (record) => {
+ const query={version:record?.versionNo,device_meta_id:record?.device_meta_id,tokenup:'22767e1f-db8d-4a1d-87d4-56347cf21247'}
+ dispatch(firmwareUpgrade.deleteFirmware(query)).then(res=>{
+ if(res.success) {
+ getData()
+ // Toast.success('删除成功');
+
+ }
+
+ })
+ };
+
+ const onCancel = () => {
+ Toast.warning('取消删除');
+ };
+let columns=[{
+ title: '序号',
+ render: (t, r, i) => {
+ return i + 1;
+ }
+},{
+ title: '固件名称',
+ dataIndex: 'firmwareName'
+},{
+ title: '设备型号',
+ dataIndex: 'deviceMetaName'
+},
+{
+ title: '版本号',
+ dataIndex: 'versionNo'
+},
+{
+ title: '上传时间',
+ dataIndex: 'uploadTime'
+},
+{
+ title: '上传人',
+ render:(_,record)=>{
+ return {users?.find(item=>item.id==record.uploader)?.name||''}
+}
+},
+{
+ title: '备注',
+ dataIndex: 'comment'
+},
+{
+ title: '操作',
+ render:(_,record)=>{
+ return
+
+
+
+
+
+
+
+ {setSearchVal(e)}}>
+
+
+ 设备管理
+ Device Management
+
+
+ {setFirmwareModalVis(false);setRecordRow(null)}}>
+
+
+
+
+
+
+}
+
+function mapStateToProps (state) {
+ const { auth, global, getPush } = state;
+ // console.log('state1',state)
+ return {
+ loading: getPush.isRequesting,
+ user: auth.user,
+ actions: global.actions,
+ };
+ }
+
+ export default connect(mapStateToProps)(FirmwareLibrary);
\ No newline at end of file
diff --git a/web/client/src/sections/firmwareUpgrade/containers/index.js b/web/client/src/sections/firmwareUpgrade/containers/index.js
new file mode 100644
index 0000000..c83a49d
--- /dev/null
+++ b/web/client/src/sections/firmwareUpgrade/containers/index.js
@@ -0,0 +1,5 @@
+'use strict';
+
+import FirmwareLibrary from './firmwareLibrary'
+import DeviceManagement from './deviceManagement';
+export { DeviceManagement,FirmwareLibrary };
\ No newline at end of file
diff --git a/web/client/src/sections/firmwareUpgrade/index.js b/web/client/src/sections/firmwareUpgrade/index.js
new file mode 100644
index 0000000..4acbd06
--- /dev/null
+++ b/web/client/src/sections/firmwareUpgrade/index.js
@@ -0,0 +1,15 @@
+'use strict';
+
+import reducers from './reducers';
+import routes from './routes';
+import actions from './actions';
+import { getNavItem } from './nav-item';
+
+export default {
+ key: 'firmwareUpgrade',
+ name: '固件升级',
+ reducers: reducers,
+ routes: routes,
+ actions: actions,
+ getNavItem: getNavItem
+};
\ No newline at end of file
diff --git a/web/client/src/sections/firmwareUpgrade/nav-item.jsx b/web/client/src/sections/firmwareUpgrade/nav-item.jsx
new file mode 100644
index 0000000..5d2f255
--- /dev/null
+++ b/web/client/src/sections/firmwareUpgrade/nav-item.jsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { IconCode } from '@douyinfe/semi-icons';
+
+export function getNavItem (user, dispatch) {
+ return (
+ [
+ {
+ itemKey: 'device',
+ text: '设备',
+ icon:
+
+
+
+
+ {setSearchVal(e)}}>
+
+
+ 固件库
+ Firmware Library
+
+
+ {getData({version:searchVal});setModalVis(false);setRecordRow(null)}}>
+
+
+ 固件升级
+
+ 
+
+
+ ),
+ render: (_, row) => {
+ let rolearr = row.role
+ return (
+
+
+ {
+ rolearr.indexOf('firmware_upgrade') != -1 ? (
+
+ );
+ }
+ },
{
title: "管理",
width: "20%",
@@ -527,6 +561,7 @@ const Roles = (props) => {
+
+ ) : (
+
+ 
+
+
+ 有权限
+
+
+ )
+ }
+
+ 
+
+
+ 无权限
+
diff --git a/web/client/src/sections/service/nav-item.jsx b/web/client/src/sections/service/nav-item.jsx
index d891eb5..94abaf4 100644
--- a/web/client/src/sections/service/nav-item.jsx
+++ b/web/client/src/sections/service/nav-item.jsx
@@ -58,15 +58,15 @@ export function getNavItem (user, dispatch) {
to: '/service/serviceRecord/MaintenanceRecords',
items: [{ itemKey:'MaintenanceRecords',to:'/service/serviceRecord/MaintenanceRecords',text:'维修记录'}]
},
- {
- itemKey: 'firmwareUpgrade',
- text: '固件升级',
- icon: