更换favicon图标 修改能耗大屏图表按月筛选时页面显示不正确问题
hzz
BIN
public/bt_favicon.ico
Normal file
|
After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 799 B |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 4.2 KiB |
@ -1,3 +0,0 @@
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M8.00251 14.9297L0 1.07422H6.14651L8.00251 4.27503L9.84583 1.07422H16L8.00251 14.9297Z" fill="black"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 215 B |
@ -4,7 +4,7 @@
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
||||
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
|
||||
<link rel="shortcut icon" href="/bt_favicon.ico">
|
||||
<title><%= htmlWebpackPlugin.options.title %></title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@ -8,9 +8,10 @@
|
||||
* 版权信息 : 2023 by ${再登软件}, All Rights Reserved.
|
||||
-->
|
||||
<template>
|
||||
<div :style="{ width: boxWH.width, height: boxWH.height }">
|
||||
<div :style="{ width: boxWH.width, height: boxWH.height }" style="position: relative;">
|
||||
<border6 ref="refborder6">
|
||||
<template v-slot>
|
||||
<el-button type="success" class="linkPowerChart" @click="clickPowerChart">历史数据</el-button>
|
||||
<div ref="inpie" class="ddd"></div>
|
||||
<div ref="inpie2" class="ddd"></div>
|
||||
</template>
|
||||
@ -29,6 +30,8 @@ import {
|
||||
} from "vue";
|
||||
import { EDataPerson, EDataPersonItem } from "@/type/environment";
|
||||
import border6 from "@/components/borderBox/border6.vue";
|
||||
import { useRoute, useRouter } from "vue-router";
|
||||
const router = useRouter();
|
||||
const { proxy } = getCurrentInstance() as any;
|
||||
let props = defineProps<{
|
||||
title: string;
|
||||
@ -116,6 +119,11 @@ function setchartWH(width: any, height: any) {
|
||||
})
|
||||
}
|
||||
}
|
||||
const clickPowerChart = () => {
|
||||
router.push({
|
||||
path: "/energyConsume/historyData",
|
||||
});
|
||||
};
|
||||
onMounted(() => {
|
||||
setData(props.option,props.option);
|
||||
});
|
||||
@ -127,4 +135,17 @@ defineExpose({
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped></style>
|
||||
<style scoped>
|
||||
.linkPowerChart {
|
||||
position: absolute;
|
||||
right: 25px;
|
||||
top: 21px;
|
||||
z-index: 999;
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
padding: 10px;
|
||||
color: white;
|
||||
background-color: #3B498B;
|
||||
border: #3B498B;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -201,7 +201,7 @@ const setData = (value: any) => {
|
||||
);
|
||||
|
||||
echartsData.power!.div = powerjixie.value;
|
||||
echartsData.power!.title =props.title;;
|
||||
echartsData.power!.title = props.title;
|
||||
echartsData.power!.data = {
|
||||
title: {
|
||||
text: echartsData.power!.title,
|
||||
@ -320,6 +320,8 @@ const setData = (value: any) => {
|
||||
series: series2,
|
||||
};
|
||||
change(echartsData.power, value);
|
||||
console.log(echartsData.power);
|
||||
|
||||
change(echartsData2.power, value)
|
||||
};
|
||||
|
||||
@ -328,7 +330,10 @@ const change = (item: EDataPersonItem, value: any) => {
|
||||
clacChartsSum(item.data, value);
|
||||
Ebox.setOption(item.data);
|
||||
item.box = Ebox;
|
||||
if (item.title == props.title) {
|
||||
changeecharts(item.data, value);
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<div style="display: flex">
|
||||
<chart :title="gasOption.title" :option="gasOption.option" ref="ratio" @click="clickPowerChart"></chart>
|
||||
<chart :title="gasOption.title" :option="gasOption.option" ref="ratio"></chart>
|
||||
|
||||
<!-- <power
|
||||
ref="yields"
|
||||
@ -163,11 +163,7 @@ const powerBox = (width: any, height: any) => {
|
||||
yields.value.setchartWH(a.oWidth + 120, a.oHeight * 2 - 20);
|
||||
ratio.value.setchartWH(a.oWidth - 120, a.oHeight * 5);
|
||||
};
|
||||
const clickPowerChart = () => {
|
||||
router.push({
|
||||
path: "/energyConsume/historyData",
|
||||
});
|
||||
};
|
||||
|
||||
async function getpower() {
|
||||
let result: any = await getPowerData({ time: 1 });
|
||||
|
||||
|
||||