From 54cd189dcd8b41952717c59dc71a73b5d61f03bb Mon Sep 17 00:00:00 2001 From: wuqun Date: Fri, 15 Dec 2023 10:39:09 +0800 Subject: [PATCH] =?UTF-8?q?(*)=E6=95=B0=E6=8D=AE=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E7=8E=87=E6=97=B6=E9=97=B4=E4=BC=98=E5=8C=96=E4=B8=BA=E6=97=B6?= =?UTF-8?q?=E5=88=86=E7=A7=92=E6=A0=BC=E5=BC=8F;=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=92=8C=E6=95=B0=E6=8D=AE=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E9=80=89=E6=8B=A9=E4=BC=98=E5=8C=96;=20?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=BF=A1=E6=81=AF=E8=BF=90=E7=BB=B4?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E7=BD=91=E7=AB=99=E4=BF=AE=E6=94=B9;=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BA=E4=BB=B6=E5=8D=87=E7=BA=A7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/firmwareUpgrade/index.js | 3 ++- web/client/src/sections/data/containers/dataDetail.jsx | 3 ++- .../sections/firmwareUpgrade/containers/deviceManagement.jsx | 2 +- .../sections/firmwareUpgrade/containers/firmwareLibrary.jsx | 2 +- web/client/src/sections/install/containers/cacl.jsx | 4 ++-- web/client/src/sections/projectGroup/containers/bigscreen.jsx | 4 ++-- web/package.json | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/api/app/lib/controllers/firmwareUpgrade/index.js b/api/app/lib/controllers/firmwareUpgrade/index.js index 8f7de9b..0b7dca5 100644 --- a/api/app/lib/controllers/firmwareUpgrade/index.js +++ b/api/app/lib/controllers/firmwareUpgrade/index.js @@ -88,7 +88,8 @@ async function getFirmwares (ctx) { const query = ctx.query // console.log('query1',query) try{ - const res=await ctx.app.fs.craw.get(ApiTable.getFirmwares,{query}) + const { tokenup } = ctx.query + const res = await ctx.app.fs.craw.get(ApiTable.getFirmwares,{query:{ ...query, token: tokenup} }) // console.log('666x1111',res) let rslt=[] if(res){ diff --git a/web/client/src/sections/data/containers/dataDetail.jsx b/web/client/src/sections/data/containers/dataDetail.jsx index 165441a..ed4ac01 100644 --- a/web/client/src/sections/data/containers/dataDetail.jsx +++ b/web/client/src/sections/data/containers/dataDetail.jsx @@ -221,8 +221,9 @@ const DataDetail = (props) => { field="point" placeholder="点位" multiple + maxTagCount={2} optionList={sensorList} - style={{ width: 260, marginLeft: 12, marginRight: 12 }} + style={{ width: 280, marginLeft: 12, marginRight: 12 }} showClear onChange={pointChange} > diff --git a/web/client/src/sections/firmwareUpgrade/containers/deviceManagement.jsx b/web/client/src/sections/firmwareUpgrade/containers/deviceManagement.jsx index 05fcd9a..9fcb8df 100644 --- a/web/client/src/sections/firmwareUpgrade/containers/deviceManagement.jsx +++ b/web/client/src/sections/firmwareUpgrade/containers/deviceManagement.jsx @@ -45,7 +45,7 @@ const DeviceManagement = (props) => { }) // console.log('xxxx111',user) - dispatch(firmwareUpgrade.getFirmware()).then(res=>{ + dispatch(firmwareUpgrade.getFirmware({tokenup: '22767e1f-db8d-4a1d-87d4-56347cf21247'})).then(res=>{ if(res.success) setVData(res.payload.data) }) },[pepProjectId]) diff --git a/web/client/src/sections/firmwareUpgrade/containers/firmwareLibrary.jsx b/web/client/src/sections/firmwareUpgrade/containers/firmwareLibrary.jsx index 5a5af28..2b87287 100644 --- a/web/client/src/sections/firmwareUpgrade/containers/firmwareLibrary.jsx +++ b/web/client/src/sections/firmwareUpgrade/containers/firmwareLibrary.jsx @@ -16,7 +16,7 @@ const FirmwareLibrary = (props) => { const {service,firmwareUpgrade}=actions // console.log(data,'data1111') const getData=(query)=>{ - dispatch(firmwareUpgrade.getFirmware(query)).then(res=>{ + dispatch(firmwareUpgrade.getFirmware({tokenup: '22767e1f-db8d-4a1d-87d4-56347cf21247',...query})).then(res=>{ if(res.success)setData(res.payload.data) }) } diff --git a/web/client/src/sections/install/containers/cacl.jsx b/web/client/src/sections/install/containers/cacl.jsx index d8bd404..78e8270 100644 --- a/web/client/src/sections/install/containers/cacl.jsx +++ b/web/client/src/sections/install/containers/cacl.jsx @@ -451,8 +451,8 @@ const Calc = (props) => { - + diff --git a/web/client/src/sections/projectGroup/containers/bigscreen.jsx b/web/client/src/sections/projectGroup/containers/bigscreen.jsx index 212bb7a..71afb50 100644 --- a/web/client/src/sections/projectGroup/containers/bigscreen.jsx +++ b/web/client/src/sections/projectGroup/containers/bigscreen.jsx @@ -318,7 +318,7 @@ const Bigscreen = (props) => { // console.log(params); let title = params[0].data[0] + '
' + '
' params.forEach(v => { - let find = online?.find(s => s.name == v.seriesName)?.online?.find(d => moment(d.collect_time).format('YYYY-MM-DD HH') == v.data[0]) || {} + let find = online?.find(s => s.name == v.seriesName)?.online?.find(d => moment(d.collect_time).format('YYYY-MM-DD HH:mm:ss') == v.data[0]) || {} title = title + v.seriesName + "：" + " " + " " + v.data[1] + "%" + "（" + find?.online + "/" + find?.total + "）" + '
' }) return title @@ -358,7 +358,7 @@ const Bigscreen = (props) => { areaStyle: { color: '#0e9cff26', }, - data: v.online.sort((a,b)=>new Date(b.collect_time)-new Date(a.collect_time))?.map(f => [moment(f.collect_time).format('YYYY-MM-DD HH'), f.rate.toFixed(1)]) || [] + data: v.online.sort((a,b)=>new Date(b.collect_time)-new Date(a.collect_time))?.map(f => [moment(f.collect_time).format('YYYY-MM-DD HH:mm:ss'), f.rate.toFixed(1)]) || [] })) || [] }} notMerge={true} diff --git a/web/package.json b/web/package.json index cfa45b4..84c90f5 100644 --- a/web/package.json +++ b/web/package.json @@ -7,7 +7,7 @@ "test": "mocha", "start-vite": "cross-env NODE_ENV=developmentVite npm run start-params", "start": "cross-env NODE_ENV=development npm run start-params", - "start-params": "node server -p 5600 -u http://localhost:4600 --networkWeb http://localhost:5000 --apiPomsUrl http://localhost:4600 --apiAnxinyunUrl http://10.8.30.112:4100 --apiEmisUrl http://localhost:14000 --webEmisUrl http://localhost:5000 --webOaUrl http://10.8.30.161:8668 --qnak 5XrM4wEB9YU6RQwT64sPzzE6cYFKZgssdP5Kj3uu --qnsk w6j2ixR_i-aelc6I7S3HotKIX-ukMzcKmDfH6-M5 --qnbkt anxinyun-test --qndmn http://test.resources.anxinyun.cn --iotVcmpWeb https://mediaconsole.ngaiot.com --pomsMonitor http://monitor.anxinyun.cn/goto/PaEDLE84z?orgId=1 --pomsKubesphere https://k8sadmin.anxinyun.cn/ --pomsAmbari https://ambari.anxinyun.cn/ --pomsKowl https://kafka.anxinyun.cn/ --pomsPghero https://pghero.anxinyun.cn/ --pomsEs https://esc.anxinyun.cn/ --pomsNotebook https://inotebook.anxinyun.cn/ --crawapi http://218.3.126.49:30555/v1 --dcWeb https://fsiot-oamss.anxinyun.cn", + "start-params": "node server -p 5600 -u http://localhost:4600 --networkWeb http://localhost:5000 --apiPomsUrl http://localhost:4600 --apiAnxinyunUrl http://10.8.30.112:4100 --apiEmisUrl http://localhost:14000 --webEmisUrl http://localhost:5000 --webOaUrl http://10.8.30.161:8668 --qnak 5XrM4wEB9YU6RQwT64sPzzE6cYFKZgssdP5Kj3uu --qnsk w6j2ixR_i-aelc6I7S3HotKIX-ukMzcKmDfH6-M5 --qnbkt anxinyun-test --qndmn http://test.resources.anxinyun.cn --iotVcmpWeb https://mediaconsole.ngaiot.com --pomsMonitor http://monitor.anxinyun.cn/goto/PaEDLE84z?orgId=1 --pomsKubesphere https://ksboard.ngaiot.com/ --pomsAmbari https://ambari.anxinyun.cn/ --pomsKowl https://kafka.anxinyun.cn/ --pomsPghero https://pghero.anxinyun.cn/ --pomsEs https://esc.anxinyun.cn/ --pomsNotebook https://inotebook.anxinyun.cn/ --crawapi http://218.3.126.49:30555/v1 --dcWeb https://fsiot-oamss.anxinyun.cn", "deploy": "export NODE_ENV=production&& npm run build && node server", "build-dev": "cross-env NODE_ENV=development&&webpack --config webpack.config.js", "build": "cross-env NODE_ENV=production&&webpack --config webpack.config.prod.js"