diff --git a/src/locales/lang/Spanish.ts b/src/locales/lang/Spanish.ts index 85f006d..970af81 100644 --- a/src/locales/lang/Spanish.ts +++ b/src/locales/lang/Spanish.ts @@ -46,7 +46,7 @@ export default { 'powerhi_du':'Electricity Consumption(°)', 'Production_yuan':'Production(CNY)', 'Production':'Production', - 'powerhistory':'2018-2022 Electricity Consumption(°)', + 'powerhistory':'2019-2023 Electricity Consumption(°)', 'waterhistory':'Water Consumption(m³)', 'gashistory':'Air Consumption(m³)', 'waterTip':'Water Consumption', diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 7a3aad4..91024e5 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -55,7 +55,7 @@ export default { 'powerhi_du':'Electricity Consumption(°)', 'Production_yuan':'Production(CNY)', 'Production':'Production', - 'powerhistory':'2018-2022 Electricity Consumption(°)', + 'powerhistory':'2019-2023 Electricity Consumption(°)', 'waterhistory':'Water Consumption(m³)', 'gashistory':'Air Consumption(m³)', 'waterTip':'Water Consumption', diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index 77e32c6..b63acb2 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -55,7 +55,7 @@ export default { 'powerhi_du':'用电量(度)', 'Production_yuan':'生产额(元)', 'Production':'生产额', - 'powerhistory':'2018-2022用电量(度)', + 'powerhistory':'2019-2023用电量(度)', 'waterhistory':'用水量(立方)', 'gashistory':'用气量(立方)', 'waterTip':'用水量', diff --git a/src/router/index.ts b/src/router/index.ts index df2527a..7e6a84e 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -311,7 +311,7 @@ const routes: Array = [ }, // 机械分厂单页面工位屏 { - path: "/Station", + path: "/Station_:id", name: "Station", component: () => import("../views/Mechanics/child/station/index.vue"), }, diff --git a/src/views/Mechanics/child/station/img/device.png b/src/views/Mechanics/child/station/img/device.png deleted file mode 100644 index 361d824..0000000 Binary files a/src/views/Mechanics/child/station/img/device.png and /dev/null differ diff --git a/src/views/Mechanics/child/station/img/车床.png b/src/views/Mechanics/child/station/img/车床.png deleted file mode 100644 index 8e2ab9e..0000000 Binary files a/src/views/Mechanics/child/station/img/车床.png and /dev/null differ diff --git a/src/views/Mechanics/child/station/index.vue b/src/views/Mechanics/child/station/index.vue index 22bafa6..609c005 100644 --- a/src/views/Mechanics/child/station/index.vue +++ b/src/views/Mechanics/child/station/index.vue @@ -23,10 +23,13 @@ +} + diff --git a/src/views/energyConsume/content/chart/power2023.vue b/src/views/energyConsume/content/chart/power2023.vue index 27fba0b..16e97b2 100644 --- a/src/views/energyConsume/content/chart/power2023.vue +++ b/src/views/energyConsume/content/chart/power2023.vue @@ -29,7 +29,7 @@ let props=defineProps<{ let power=ref() let refborder4=ref() - +let year = new Date().getFullYear(); const echartsData = reactive({ power:{ div:null, @@ -43,7 +43,7 @@ const setData=(value:any)=>{ let series=[] value.listData.forEach(res=>{ - if(res.years==2023){ + if(res.years==year){ for(let key in res.month){ series.push({ name: key+'月', diff --git a/src/views/energyConsume/content/left.vue b/src/views/energyConsume/content/left.vue index e4a40cf..0afd28a 100644 --- a/src/views/energyConsume/content/left.vue +++ b/src/views/energyConsume/content/left.vue @@ -47,6 +47,7 @@ const router = useRouter(); let power1 = ref(); let yields = ref(); let ratio = ref(); +let year = new Date().getFullYear(); let props = defineProps<{ width: number; @@ -277,7 +278,7 @@ watch( if (option1.list[key]) { series.push({ name: key + "月", - stack: "2023", + stack: year, data: option1.list[key], type: "bar", showBackground: true, @@ -294,7 +295,7 @@ watch( } else { series.push({ name: key + "月", - stack: "2023", + stack: year, data: noData, type: "bar", showBackground: true, @@ -313,7 +314,7 @@ watch( if (option2.list[key]) { series2.push({ name: "", - stack: "2023", + stack: year, data: option2.list[key], type: "bar", showBackground: true, @@ -332,7 +333,7 @@ watch( } else { series2.push({ name: "", - stack: "2023", + stack: year, data: noData, type: "bar", showBackground: true, diff --git a/src/views/generalEnvironmentMechanical/components/power2023.vue b/src/views/generalEnvironmentMechanical/components/power2023.vue index fb064c7..49991ae 100644 --- a/src/views/generalEnvironmentMechanical/components/power2023.vue +++ b/src/views/generalEnvironmentMechanical/components/power2023.vue @@ -34,13 +34,13 @@ const echartsData = reactive({ box: null, }, }); - +let year = new Date().getFullYear() const initEchart = () => { if (props.httpValue.listData) { let series = []; props.httpValue.listData.forEach((res) => { - if (res.years == 2024) { + if (res.years == year) { for (let key in res.month) { series.push({ name: key + "月", diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue index 23eb0b0..bb4d039 100644 --- a/src/views/generalEnvironmentMechanical/index.vue +++ b/src/views/generalEnvironmentMechanical/index.vue @@ -256,6 +256,7 @@ async function getPmData() { }) } +let year = new Date().getFullYear() //获取用电量数据 async function getPower_data() { let result: any = await getPowerData({ time: 1 }); @@ -263,7 +264,7 @@ async function getPower_data() { if (result.code == 200) { let series = []; result.data.listData.forEach((res) => { - if (res.years == 2024) { + if (res.years == year) { for (let key in res.month) { series.push({ name: key + "月",