0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#10559

This commit is contained in:
xieyonghong 2023-03-24 14:34:19 +08:00
parent 17510b998f
commit 4112313953
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/device/DashBoard/index.vue
View File

@ -84,6 +84,7 @@ import TopCard from '@/views/device/DashBoard/components/TopCard.vue';
import { useMenuStore } from '@/store/menu'; import { useMenuStore } from '@/store/menu';
import Amap from './components/Amap.vue'; import Amap from './components/Amap.vue';
import { useSystem } from '@/store/system'; import { useSystem } from '@/store/system';
import dayjs from 'dayjs'
const system = useSystem(); const system = useSystem();
const AmapKey = system.$state.configInfo.amap?.apiKey; const AmapKey = system.$state.configInfo.amap?.apiKey;
let productTotal = ref(0); let productTotal = ref(0);
@ -206,6 +207,9 @@ getDeviceData();
* 获取在线数量 * 获取在线数量
*/ */
const getOnline = () => { const getOnline = () => {
const startTime = dayjs().subtract(0, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss');
const endTime = dayjs().subtract(0, 'days').endOf('day').format('YYYY-MM-DD HH:mm:ss');
dashboard([ dashboard([
{ {
dashboard: 'device', dashboard: 'device',
@ -215,26 +219,34 @@ const getOnline = () => {
group: 'aggOnline', group: 'aggOnline',
params: { params: {
state: 'online', state: 'online',
limit: 15, limit: 24,
from: 'now-15d', from: startTime,
time: '1d', to: endTime,
format: 'yyyy-MM-dd', time: '1h',
format: 'yyyy-MM-dd HH:mm:ss',
}, },
}, },
]).then((res) => { ]).then((res) => {
if (res.status == 200) { if (res.status == 200) {
const x = res.result // const x = res.result
.map((item: any) => item.data.timeString) // .map((item: any) => item.data.timeString)
.reverse(); // .reverse();
const y = res.result.map((item: any) => item.data.value); // const y = res.result.map((item: any) => item.data.value);
const x: string[] = [];
const y: number[] = [];
(res.result as any)?.forEach((item: any) => {
x.push(item.data.timeString)
y.push(item.data.value)
})
x.reverse()
const onlineYdata = y; const onlineYdata = y;
onlineYdata.reverse(); onlineYdata.reverse();
setOnlineChartOpition(x, onlineYdata); setOnlineChartOption(x, onlineYdata);
onlineFooter.value[0].value = y?.[1]; onlineFooter.value[0].value = y?.[1];
} }
}); });
}; };
const setOnlineChartOpition = (x: Array<any>, y: Array<number>): void => { const setOnlineChartOption = (x: Array<any>, y: Array<number>): void => {
onlineOptions.value = { onlineOptions.value = {
xAxis: { xAxis: {
type: 'category', type: 'category',