diff --git a/src/views/PaintShopView/View1/bottom.vue b/src/views/PaintShopView/View1/bottom.vue index 7a54e48..c187085 100644 --- a/src/views/PaintShopView/View1/bottom.vue +++ b/src/views/PaintShopView/View1/bottom.vue @@ -42,7 +42,7 @@ import { calcWH } from "@/components/ts/selfAdaption"; 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 pm from "./../components/pm.vue"; import power from "./chart/power2023.vue"; import chart from "@/components/assembly/chart2.vue"; import { useRoute, useRouter } from "vue-router"; diff --git a/src/views/PaintShopView/View1/top.vue b/src/views/PaintShopView/View1/top.vue index 3e155af..86535cf 100644 --- a/src/views/PaintShopView/View1/top.vue +++ b/src/views/PaintShopView/View1/top.vue @@ -38,7 +38,7 @@ import border3 from "@/components/borderBox/border3.vue"; import { calcWH } from "@/components/ts/selfAdaption"; // import {getPowerData} from '@/http/environment' import { getSensorByDept } from "@/http/PaintShopView/index"; -import humidity from "./chart/humidity.vue"; +import humidity from "./../components/humidity.vue"; import chart from "@/components/assembly/chart2.vue"; import verticalNum from "./../components/verticalNum.vue"; import { useRoute, useRouter } from "vue-router"; @@ -82,13 +82,13 @@ function reset(val: any) { const powerBox = (width: any, height: any) => { let a = calcWH(height, width, 1, 24, 0); //修改高度 - verticalNum3.value.setchartWH(a.oWidth * 3 - 20, a.oHeight - 20) - verticalNum4.value.setchartWH(a.oWidth * 3 - 20, a.oHeight - 20) - verticalNum5.value.setchartWH(a.oWidth * 3 - 20, a.oHeight - 20) - verticalNum6.value.setchartWH(a.oWidth * 3 - 20, a.oHeight - 20) - verticalNum7.value.setchartWH(a.oWidth * 3 - 20, a.oHeight - 20) - humidityref.value.setchartWH(a.oWidth * 5 - 40, a.oHeight - 40) - ductref.value.setchartWH(a.oWidth * 4 - 20, a.oHeight - 20); + verticalNum3.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20) + verticalNum4.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20) + verticalNum5.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20) + verticalNum6.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20) + verticalNum7.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20) + humidityref.value.setchartWH(a.oWidth * 3.42 - 40, a.oHeight - 40) + ductref.value.setchartWH(a.oWidth * 3.48 - 20, a.oHeight - 20); }; let ductOption = reactive({ title: "", @@ -270,10 +270,10 @@ function setcontentData(val) { verticalNum6.value.setData(CH2O, 'icon-app_icons--', 0.08, "mg/m3") verticalNum7.value.setData(TVOC, 'icon-TVOC-Outlined', 0.5, "mg/m3") // console.log(pmref.value); - humidityref.value.setData({ h: val.temp_humi[temp_humi_index].huim, c: val.temp_humi[temp_humi_index].temp }) + humidityref.value.setData({ h: val.temp_humi[temp_humi_index].huim, c: val.temp_humi[temp_humi_index].temp, title: val.temp_humi[temp_humi_index].name }) if (val.temp_humi.length > 1) { temp_humi_timer = setInterval(() => { - humidityref.value.setData({ h: val.temp_humi[temp_humi_index].huim, c: val.temp_humi[temp_humi_index].temp }) + humidityref.value.setData({ h: val.temp_humi[temp_humi_index].huim, c: val.temp_humi[temp_humi_index].temp, title: val.temp_humi[temp_humi_index].name }) temp_humi_index++ if (temp_humi_index >= val.temp_humi.length) { temp_humi_index = 0 diff --git a/src/views/PaintShopView/components/humidity.vue b/src/views/PaintShopView/components/humidity.vue index 294cae7..1b92a86 100644 --- a/src/views/PaintShopView/components/humidity.vue +++ b/src/views/PaintShopView/components/humidity.vue @@ -1,5 +1,5 @@