diff --git a/public/bt_favicon.ico b/public/bt_favicon.ico
new file mode 100644
index 0000000..780be18
Binary files /dev/null and b/public/bt_favicon.ico differ
diff --git a/public/favicon.ico b/public/favicon.ico
index df36fcf..b7b5f3c 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/img/icons/android-chrome-192x192.png b/public/img/icons/android-chrome-192x192.png
deleted file mode 100644
index b02aa64..0000000
Binary files a/public/img/icons/android-chrome-192x192.png and /dev/null differ
diff --git a/public/img/icons/android-chrome-512x512.png b/public/img/icons/android-chrome-512x512.png
deleted file mode 100644
index 06088b0..0000000
Binary files a/public/img/icons/android-chrome-512x512.png and /dev/null differ
diff --git a/public/img/icons/android-chrome-maskable-192x192.png b/public/img/icons/android-chrome-maskable-192x192.png
deleted file mode 100644
index 791e9c8..0000000
Binary files a/public/img/icons/android-chrome-maskable-192x192.png and /dev/null differ
diff --git a/public/img/icons/android-chrome-maskable-512x512.png b/public/img/icons/android-chrome-maskable-512x512.png
deleted file mode 100644
index 5f2098e..0000000
Binary files a/public/img/icons/android-chrome-maskable-512x512.png and /dev/null differ
diff --git a/public/img/icons/apple-touch-icon-120x120.png b/public/img/icons/apple-touch-icon-120x120.png
deleted file mode 100644
index 1427cf6..0000000
Binary files a/public/img/icons/apple-touch-icon-120x120.png and /dev/null differ
diff --git a/public/img/icons/apple-touch-icon-152x152.png b/public/img/icons/apple-touch-icon-152x152.png
deleted file mode 100644
index f24d454..0000000
Binary files a/public/img/icons/apple-touch-icon-152x152.png and /dev/null differ
diff --git a/public/img/icons/apple-touch-icon-180x180.png b/public/img/icons/apple-touch-icon-180x180.png
deleted file mode 100644
index 404e192..0000000
Binary files a/public/img/icons/apple-touch-icon-180x180.png and /dev/null differ
diff --git a/public/img/icons/apple-touch-icon-60x60.png b/public/img/icons/apple-touch-icon-60x60.png
deleted file mode 100644
index cf10a56..0000000
Binary files a/public/img/icons/apple-touch-icon-60x60.png and /dev/null differ
diff --git a/public/img/icons/apple-touch-icon-76x76.png b/public/img/icons/apple-touch-icon-76x76.png
deleted file mode 100644
index c500769..0000000
Binary files a/public/img/icons/apple-touch-icon-76x76.png and /dev/null differ
diff --git a/public/img/icons/apple-touch-icon.png b/public/img/icons/apple-touch-icon.png
deleted file mode 100644
index 03c0c5d..0000000
Binary files a/public/img/icons/apple-touch-icon.png and /dev/null differ
diff --git a/public/img/icons/favicon-16x16.png b/public/img/icons/favicon-16x16.png
deleted file mode 100644
index 42af009..0000000
Binary files a/public/img/icons/favicon-16x16.png and /dev/null differ
diff --git a/public/img/icons/favicon-32x32.png b/public/img/icons/favicon-32x32.png
deleted file mode 100644
index 46ca04d..0000000
Binary files a/public/img/icons/favicon-32x32.png and /dev/null differ
diff --git a/public/img/icons/msapplication-icon-144x144.png b/public/img/icons/msapplication-icon-144x144.png
deleted file mode 100644
index 7808237..0000000
Binary files a/public/img/icons/msapplication-icon-144x144.png and /dev/null differ
diff --git a/public/img/icons/mstile-150x150.png b/public/img/icons/mstile-150x150.png
deleted file mode 100644
index 3b37a43..0000000
Binary files a/public/img/icons/mstile-150x150.png and /dev/null differ
diff --git a/public/img/icons/safari-pinned-tab.svg b/public/img/icons/safari-pinned-tab.svg
deleted file mode 100644
index e44c0d5..0000000
--- a/public/img/icons/safari-pinned-tab.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/public/index.html b/public/index.html
index 3e5a139..401cd52 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,7 @@
-
+
<%= htmlWebpackPlugin.options.title %>
diff --git a/src/views/energyConsume/content/chart/chartRatio.vue b/src/views/energyConsume/content/chart/chartRatio.vue
index 14d4999..1905569 100644
--- a/src/views/energyConsume/content/chart/chartRatio.vue
+++ b/src/views/energyConsume/content/chart/chartRatio.vue
@@ -8,9 +8,10 @@
* 版权信息 : 2023 by ${再登软件}, All Rights Reserved.
-->
-
+
+ 历史数据
@@ -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({
});
-
+
diff --git a/src/views/energyConsume/content/chart/power.vue b/src/views/energyConsume/content/chart/power.vue
index e2f7d9a..122921c 100644
--- a/src/views/energyConsume/content/chart/power.vue
+++ b/src/views/energyConsume/content/chart/power.vue
@@ -28,7 +28,7 @@ import { EDataPerson, EDataPersonItem } from "@/type/energyConsume";
import { accAdd } from "@/utils/precision";
import border4 from "@/components/borderBox/border6.vue";
import { useI18n } from 'vue-i18n'
-let {t} = useI18n();
+let { t } = useI18n();
const { proxy } = getCurrentInstance() as any;
let props = defineProps<{
title: string;
@@ -60,8 +60,8 @@ const setData = (value: any) => {
let series2 = [];
let name = [];
let name2 = [];
- let shuju = [{month: {}, type: '生产额'},{month: {}, type: '用电量'}];
- let shuju2 = [{month: {}, type: '生产额'},{month: {}, type: '用电量'}];
+ let shuju = [{ month: {}, type: '生产额' }, { month: {}, type: '用电量' }];
+ let shuju2 = [{ month: {}, type: '生产额' }, { month: {}, type: '用电量' }];
let nameIndex = null;
value.name.forEach((ele, index) => {
if (ele == "机械分厂") {
@@ -71,18 +71,18 @@ const setData = (value: any) => {
name.push(ele);
}
});
- value.listData.forEach((res,listDataindex) => {
+ value.listData.forEach((res, listDataindex) => {
for (let key in res.month) {
- res.month[key].forEach((ele,index)=>{
- if(!shuju2[listDataindex].month[key]){
- shuju2[listDataindex].month[key]=[]
+ res.month[key].forEach((ele, index) => {
+ if (!shuju2[listDataindex].month[key]) {
+ shuju2[listDataindex].month[key] = []
}
- if(!shuju[listDataindex].month[key]){
- shuju[listDataindex].month[key]=[]
+ if (!shuju[listDataindex].month[key]) {
+ shuju[listDataindex].month[key] = []
}
- if(index==nameIndex){
+ if (index == nameIndex) {
shuju2[listDataindex].month[key].push(ele)
- }else{
+ } else {
shuju[listDataindex].month[key].push(ele)
}
})
@@ -114,7 +114,7 @@ const setData = (value: any) => {
name: key + "月",
type: "bar",
stack: res.type,
- barWidth:'20%',
+ barWidth: '20%',
emphasis: {
focus: "coordinateSystem",
label: {
@@ -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,
@@ -210,7 +210,7 @@ const setData = (value: any) => {
color: "#fff",
fontSize: 20,
},
- top:"2%"
+ top: "2%"
},
tooltip: {
trigger: "item",
@@ -239,17 +239,17 @@ const setData = (value: any) => {
{
type: "value",
name: t('messages.Production_yuan'),
- show:false,
- splitLine:{
- show:false
- }
+ show: false,
+ splitLine: {
+ show: false
+ }
},
{
type: "value",
name: t('messages.powerhi_du'),
- splitLine:{
- show:false
- }
+ splitLine: {
+ show: false
+ }
// show:false
},
],
@@ -261,7 +261,7 @@ const setData = (value: any) => {
};
echartsData2.power!.div = power.value;
- echartsData2.power!.title ='';
+ echartsData2.power!.title = '';
echartsData2.power!.data = {
title: {
text: '',
@@ -298,19 +298,19 @@ const setData = (value: any) => {
{
type: "value",
name: t('messages.Production_yuan'),
- splitLine:{
- show:false
- },
- max:10000000
+ splitLine: {
+ show: false
+ },
+ max: 10000000
// show:false
},
{
type: "value",
name: t('messages.powerhi_du'),
- splitLine:{
- show:false
- },
- show:false
+ splitLine: {
+ show: false
+ },
+ show: false
},
],
yAxis: {
@@ -320,7 +320,9 @@ const setData = (value: any) => {
series: series2,
};
change(echartsData.power, value);
- change(echartsData2.power,value)
+ console.log(echartsData.power);
+
+ change(echartsData2.power, value)
};
const change = (item: EDataPersonItem, value: any) => {
@@ -328,7 +330,10 @@ const change = (item: EDataPersonItem, value: any) => {
clacChartsSum(item.data, value);
Ebox.setOption(item.data);
item.box = Ebox;
- changeecharts(item.data, value);
+ if (item.title == props.title) {
+ changeecharts(item.data, value);
+ }
+
};
/**
@@ -349,10 +354,10 @@ const clacChartsSum = (option: any, value: any) => {
datavalue = accAdd(datavalue, series[i].data[params.dataIndex]);
}
}
- if(stack=='生产额'){
- stack=t('messages.Production')
- }else if(stack=='用电量'){
- stack=t('messages.powerTip')
+ if (stack == '生产额') {
+ stack = t('messages.Production')
+ } else if (stack == '用电量') {
+ stack = t('messages.powerTip')
}
return datavalue ? stack + ":" + datavalue.toLocaleString() : null;
@@ -366,10 +371,10 @@ const clacChartsSum = (option: any, value: any) => {
datavalue = accAdd(datavalue, series[i].data[params.dataIndex]);
}
}
- if(stack=='生产额'){
- stack=t('messages.Production')
- }else if(stack=='用电量'){
- stack=t('messages.powerTip')
+ if (stack == '生产额') {
+ stack = t('messages.Production')
+ } else if (stack == '用电量') {
+ stack = t('messages.powerTip')
}
return datavalue ? stack + ":" + datavalue.toLocaleString() : null;
@@ -401,11 +406,11 @@ const changeecharts = (option: any, value: any) => {
}
}
}
- if(stack=='生产额'){
- stack=t('messages.Production')
- }else if(stack=='用电量'){
- stack=t('messages.powerTip')
- }
+ if (stack == '生产额') {
+ stack = t('messages.Production')
+ } else if (stack == '用电量') {
+ stack = t('messages.powerTip')
+ }
return datavalue ? stack + ":" + datavalue.toLocaleString() : null;
}
@@ -421,11 +426,11 @@ const changeecharts = (option: any, value: any) => {
}
}
}
- if(stack=='生产额'){
- stack=t('messages.Production')
- }else if(stack=='用电量'){
- stack=t('messages.powerTip')
- }
+ if (stack == '生产额') {
+ stack = t('messages.Production')
+ } else if (stack == '用电量') {
+ stack = t('messages.powerTip')
+ }
return datavalue ? stack + ":" + datavalue.toLocaleString() + "" : null;
}
@@ -443,10 +448,10 @@ const changeecharts = (option: any, value: any) => {
datavalue = accAdd(datavalue, series[i].data[params.dataIndex]);
}
}
- if(stack=='生产额'){
- stack=t('messages.Production')
- }else if(stack=='用电量'){
- stack=t('messages.powerTip')
+ if (stack == '生产额') {
+ stack = t('messages.Production')
+ } else if (stack == '用电量') {
+ stack = t('messages.powerTip')
}
return datavalue ? stack + ":" + datavalue.toLocaleString() : null;
@@ -460,10 +465,10 @@ const changeecharts = (option: any, value: any) => {
datavalue = accAdd(datavalue, series[i].data[params.dataIndex]);
}
}
- if(stack=='生产额'){
- stack=t('messages.Production')
- }else if(stack=='用电量'){
- stack=t('messages.powerTip')
+ if (stack == '生产额') {
+ stack = t('messages.Production')
+ } else if (stack == '用电量') {
+ stack = t('messages.powerTip')
}
return datavalue ? stack + ":" + datavalue.toLocaleString() : null;
@@ -474,10 +479,10 @@ const changeecharts = (option: any, value: any) => {
function setchartWH(width: any, height: any) {
echartsData.power!.div = power.value;
- power.value.style.height = height/20*5 + "px";
+ power.value.style.height = height / 20 * 5 + "px";
power.value.style.width = width + "px";
-
- powerjixie.value.style.height = height/20*15 + "px";
+
+ powerjixie.value.style.height = height / 20 * 15 + "px";
powerjixie.value.style.width = width + "px";
refborder4.value.resetWH();
if (echartsData.power.box) {
@@ -485,7 +490,7 @@ function setchartWH(width: any, height: any) {
echartsData2.power.box.resize();
}
}
-onMounted(() => {});
+onMounted(() => { });
// return{setchartWH}
defineExpose({
diff --git a/src/views/energyConsume/content/left.vue b/src/views/energyConsume/content/left.vue
index ee3a64b..e4a40cf 100644
--- a/src/views/energyConsume/content/left.vue
+++ b/src/views/energyConsume/content/left.vue
@@ -12,7 +12,7 @@
-
+