update
This commit is contained in:
parent
1cb094d9e4
commit
8219400e8f
@ -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',
|
||||
|
@ -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',
|
||||
|
@ -55,7 +55,7 @@ export default {
|
||||
'powerhi_du':'用电量(度)',
|
||||
'Production_yuan':'生产额(元)',
|
||||
'Production':'生产额',
|
||||
'powerhistory':'2018-2022用电量(度)',
|
||||
'powerhistory':'2019-2023用电量(度)',
|
||||
'waterhistory':'用水量(立方)',
|
||||
'gashistory':'用气量(立方)',
|
||||
'waterTip':'用水量',
|
||||
|
@ -311,7 +311,7 @@ const routes: Array<RouteRecordRaw> = [
|
||||
},
|
||||
// 机械分厂单页面工位屏
|
||||
{
|
||||
path: "/Station",
|
||||
path: "/Station_:id",
|
||||
name: "Station",
|
||||
component: () => import("../views/Mechanics/child/station/index.vue"),
|
||||
},
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 163 KiB |
Binary file not shown.
Before Width: | Height: | Size: 238 KiB |
@ -23,10 +23,13 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, getCurrentInstance, reactive, onMounted } from "vue";
|
||||
import { useRoute } from "vue-router";
|
||||
import Sum from "./components/sum.vue";
|
||||
import Float from "./components/float.vue";
|
||||
import useNowTime from "@/hook/nowTime";
|
||||
let { timeHtml } = useNowTime();
|
||||
let route = useRoute();
|
||||
console.log(route.params.id);
|
||||
|
||||
let allData = reactive({
|
||||
header: "炮塔铣床",
|
||||
@ -54,7 +57,7 @@ let sumData = reactive({
|
||||
title3: "设备状态",
|
||||
title4: "平台y轴距原点位置",
|
||||
title5: "平台z轴距原点位置",
|
||||
image: "./../img/device.png",
|
||||
image: "/dev-api/profile/upload/2023/12/17/cc3940d1e85e4861845e797213802975.png",
|
||||
});
|
||||
</script>
|
||||
<style scoped>
|
||||
@ -96,4 +99,5 @@ let sumData = reactive({
|
||||
|
||||
.date-time {
|
||||
margin-right: 125px;
|
||||
}</style>
|
||||
}
|
||||
</style>
|
||||
|
@ -29,7 +29,7 @@ let props=defineProps<{
|
||||
let power=ref()
|
||||
|
||||
let refborder4=ref()
|
||||
|
||||
let year = new Date().getFullYear();
|
||||
const echartsData = reactive<EDataPerson>({
|
||||
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+'月',
|
||||
|
@ -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,
|
||||
|
@ -34,13 +34,13 @@ const echartsData = reactive<EDataPerson>({
|
||||
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 + "月",
|
||||
|
@ -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 + "月",
|
||||
|
Loading…
Reference in New Issue
Block a user