This commit is contained in:
hzz 2025-01-14 14:30:54 +08:00
parent 75bcc46bfd
commit b209a6aba0
3 changed files with 60 additions and 62 deletions

View File

@ -8,6 +8,9 @@
* 版权信息 : 2023 by ${}, All Rights Reserved.
*/
const currentDate = new Date();
const currentYear = currentDate.getFullYear();
export default {
messages: {
'energyConsume': '能耗 实时监测系统',
@ -255,7 +258,7 @@ export default {
'HanJie_generalEnvironment': '焊接-环境 实时监测系统',
'noiseDetection': '噪音监测',
'NormalValue': '正常值',
'PowerConsumption_2023': '2024年度用电量(度)',
'PowerConsumption_2023': currentYear + '年度用电量(度)',
'Production_2023': '2024年度生产额(元)',
'GasConsumption_2023JiXie': '2024年机械分厂用气量(立方)',
'DianKongGatewayDtatus': '电控分厂物联网关状态',

View File

@ -12,11 +12,7 @@
<el-row>
<el-col :span="24">
<div style="display: flex;justify-content: space-evenly; align-items: center; margin-bottom: 10px;">
<chart
:title="powerOption.title"
:option="powerOption.option"
ref="powerref"
></chart>
<chart :title="powerOption.title" :option="powerOption.option" ref="powerref"></chart>
<!-- <chart
:title="powerOption.title"
:option="powerOption.option"
@ -43,7 +39,6 @@ import { getPowerData, getconsumeDetail } from "@/http/energyConsume";
import border6 from "@/components/borderBox/border6.vue";
import border3 from "@/components/borderBox/border3.vue";
import pm from "./chart/pm.vue";
import power from "./chart/power2023.vue";
import chart from "@/components/assembly/chart2.vue";
import { useRoute, useRouter } from "vue-router";
import { useEnergyConsumeStore } from "@/store/module/energyConsume";

View File

@ -21,8 +21,8 @@ module.exports = defineConfig(
devServer: {
proxy: {
[process.env.VUE_APP_BASE_API]: {
target: 'http://192.168.10.98:9015', // 想要请求的url地址
// target: 'http://8.130.165.100:9015',
// target: 'http://192.168.10.98:9015', // 想要请求的url地址
target: 'http://8.141.87.86:9015',
// target: 'http://192.168.110.19:8080',
ws: true, // 是否要开启代理
changeOrigin: true,