diff --git a/web/client/src/sections/analysis/containers/tableShow.jsx b/web/client/src/sections/analysis/containers/tableShow.jsx
index dcc1fc1..06c9728 100644
--- a/web/client/src/sections/analysis/containers/tableShow.jsx
+++ b/web/client/src/sections/analysis/containers/tableShow.jsx
@@ -171,7 +171,7 @@ const Network = props => {
? deviceListAlarms?.find(v => v.deviceId == p.sensorId)
? '异常'
: '正常'
- : '正常',
+ : '--',
option: objRslt ? objRslt.option : p.option,
}
})
@@ -190,22 +190,24 @@ const Network = props => {
// const lastDataCopy=useMemo(()=>{
// return lastData
// },[thingId])
- // const scroll = useMemo(() => ({ y: 400 }), [])
+ const scroll = useMemo(() => ({ y:clientHeight-600+175 }), [])
//名称回调事件
const inputChange = e => {
setSearchName(e)
}
//选择设备类型下拉框回调
const selectChange = e => {
- setSearchType(typeList.find(f => f.value == e)?.label)
+ let rslt=typeList.find(f => f.value == e)
+ setSearchType(rslt?rslt.label:undefined)
}
//查询事件回调
const searchHandler = () => {
setLastData(
- searchName || searchType
- ? lastDataCopy.filter(f => f.sensorName.includes(searchName) && f.deviceType.includes(searchType))
- : lastDataCopy
+ lastDataCopy.filter(f =>
+ (searchName === undefined || f.sensorName.includes(searchName)) &&
+ (searchType === undefined || f.deviceType===searchType)
+ )
)
}
@@ -213,7 +215,7 @@ const Network = props => {
{
title: '设备名称',
dataIndex: 'sensorName',
- width: 200,
+ width: '20%',
key: 'sensorName',
render: (_, r) => {
return (
@@ -228,19 +230,19 @@ const Network = props => {
{
title: '设备类型',
dataIndex: 'deviceType',
- width: 200,
+ width: '15%',
key: 'deviceType',
},
{
title: '最后采集时间',
dataIndex: 'collectTime',
- width: 200,
+ width: '15%',
key: 'collectTime',
},
{
title: '数据',
dataIndex: 'data',
- width: 200,
+ width: '20%',
key: 'data',
render: (_, r) => {
return (
@@ -254,19 +256,19 @@ const Network = props => {
},
{
title: '物联网卡状态',
- width: 200,
+ width: '15%',
dataIndex: 'iotCardStatus',
key: 'iotCardStatus',
},
{
title: '状态',
- width: 200,
+ width: '10%',
dataIndex: 'status',
key: 'status',
},
{
title: '操作',
- width: 200,
+ width: '10%',
dataIndex: 'option',
key: 'option',
},
@@ -318,7 +320,7 @@ const Network = props => {
diff --git a/web/client/src/sections/analysis/nav-item.jsx b/web/client/src/sections/analysis/nav-item.jsx
index 76213e6..38b3fa0 100644
--- a/web/client/src/sections/analysis/nav-item.jsx
+++ b/web/client/src/sections/analysis/nav-item.jsx
@@ -24,9 +24,11 @@ export function getNavItem (user, dispatch) {
to: '/analysis/operationAnalysis/operationData',
items: [{
itemKey: 'operationData', to: '/analysis/operationAnalysis/operationData', text: '运维数据'
- },{
- itemKey: 'network', to: '/analysis/operationAnalysis/network', text: '一图统揽'
- }]
+ },
+ // {
+ // itemKey: 'network', to: '/analysis/operationAnalysis/network', text: '一图统揽'
+ // }
+ ]
},
// {
// itemKey: 'workorderAnalysis',
diff --git a/web/client/src/sections/firmwareUpgrade/components/addFirmwareModal.jsx b/web/client/src/sections/firmwareUpgrade/components/addFirmwareModal.jsx
index 20de846..2d63471 100644
--- a/web/client/src/sections/firmwareUpgrade/components/addFirmwareModal.jsx
+++ b/web/client/src/sections/firmwareUpgrade/components/addFirmwareModal.jsx
@@ -6,7 +6,7 @@ import { IconUpload,IconVigoLogo } from '@douyinfe/semi-icons';
import request from 'superagent';
const AddFirmwareModal = (props) => {
- const {modalVis,onCancel,crawapi,recordRow,actions,dispatch,qiniu,apiRoot} =props
+ const {modalVis,onCancel,crawapi,recordRow,actions,dispatch,qiniu,apiRoot,user} =props
const api = useRef();
const {domain}=qiniu //七牛服务器地址
const {firmwareUpgrade}=actions
@@ -29,7 +29,7 @@ const AddFirmwareModal = (props) => {
},[])
// console.log('xxxx1111',recordRow)
// console.log('xxxx11112',fileUrl)
-
+
const okHandler= ()=>{
// console.log('fileObj',fileObj)
api.current.validate().then(async (res)=>{
@@ -50,35 +50,36 @@ const AddFirmwareModal = (props) => {
// }
// dispatch(firmwareUpgrade.upgradeFirmware(query,body)).then(res=>{
// })
- const responseData=await request.get(qiniu+'/'+fileUrl).responseType('blob')
- const blobData = responseData.body;
- request.post(crawapi+'/firmwareupgrade')
- // .set('Content-Type','application/octet-stream')
- .attach('file',blobData,removeFlag?fileObj.name:recordRow?recordRow.firmwareName:fileObj.name)
- .field('filePath',removeFlag?fileUrl:recordRow?recordRow.filepath:fileUrl)
- .field('userId', userId||'')
- .field('firmwareName', res?.firmwareName||'')
- .field('comment',res?.remark||'')
- .field('device_meta_name', options?.find(item=>item.value===res?.deviceName)?.label||'')
- .query({ version:res?.versionNo,device_meta_id: res?.deviceName,token:'22767e1f-db8d-4a1d-87d4-56347cf21247'})
- .end((err, response) => {
- if(response?.ok){
- Notification.success({ title: recordRow?'编辑固件包':'新增固件包',
- content: recordRow?'编辑成功':'新增成功',
- duration: 3,
- })
- setRemoveFlag(false)
- onCancel()
- }else{
- console.error('Superagent request failed:');
- Notification.error({ title: recordRow?'编辑固件包':'新增固件包',
- content: recordRow?'编辑失败':'新增失败',
- duration: 3,
- })
- }
- })
+ request.post(crawapi+'/firmwareupgrade')
+ // .set('Content-Type','application/octet-stream')
+ // .attach('file',blobData,removeFlag?fileObj.name:recordRow?recordRow.firmwareName:fileObj.name)
+ .field('filePath',removeFlag?`${domain}/`+fileUrl:recordRow?`${domain}/`+recordRow.filepath:`${domain}/`+fileUrl)
+ .field('userId', userId||'')
+ .field('firmwareName', res?.firmwareName||'')
+ .field('comment',res?.remark||'')
+ .field('device_meta_name', options?.find(item=>item.value===res?.deviceName)?.label||'')
+ .query({ version:res?.versionNo,device_meta_id: res?.deviceName,token:'22767e1f-db8d-4a1d-87d4-56347cf21247'})
+ .end((err, response) => {
+ if(response?.ok){
+ Notification.success({ title: recordRow?'编辑固件包':'新增固件包',
+ content: recordRow?'编辑成功':'新增成功',
+ duration: 3,
+ })
+ setRemoveFlag(false)
+ onCancel()
+ }else{
+ console.error('Superagent request failed:');
+ Notification.error({ title: recordRow?'编辑固件包':'新增固件包',
+ content: recordRow?'编辑失败':'新增失败',
+ duration: 3,
+ })
+ }
+ })
+
+
+
})
}
@@ -113,8 +114,10 @@ const AddFirmwareModal = (props) => {
{
setUploadData({})