From 5cccdf2e29ab0bc6da27e01bc7d6c87bc875a678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=93=AE=E9=93=AE?= <123456> Date: Fri, 12 May 2023 16:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E7=99=BB=E5=A4=A7=E5=B1=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/iconfont.css | 10 +++++--- src/views/Temp/GetonAgain/index.vue | 36 +++++++++++++++++++++++------ src/views/Temp/GetonAgain/right.vue | 6 +++-- src/views/Temp/GetonAgain/top.vue | 6 +++-- src/views/index.vue | 23 ++++++++++++++---- 5 files changed, 63 insertions(+), 18 deletions(-) diff --git a/src/assets/css/iconfont.css b/src/assets/css/iconfont.css index 5e13b0c..c774f27 100644 --- a/src/assets/css/iconfont.css +++ b/src/assets/css/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3879194 */ - src: url('//at.alicdn.com/t/c/font_3879194_295z5us9seh.woff2?t=1679810021855') format('woff2'), - url('//at.alicdn.com/t/c/font_3879194_295z5us9seh.woff?t=1679810021855') format('woff'), - url('//at.alicdn.com/t/c/font_3879194_295z5us9seh.ttf?t=1679810021855') format('truetype'); + src: url('//at.alicdn.com/t/c/font_3879194_0vtcz1yxgvk.woff2?t=1683879014134') format('woff2'), + url('//at.alicdn.com/t/c/font_3879194_0vtcz1yxgvk.woff?t=1683879014134') format('woff'), + url('//at.alicdn.com/t/c/font_3879194_0vtcz1yxgvk.ttf?t=1683879014134') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-zhongyingwen:before { + content: "\e607"; +} + .icon-baojingxinxi:before { content: "\e636"; } diff --git a/src/views/Temp/GetonAgain/index.vue b/src/views/Temp/GetonAgain/index.vue index a032201..a0724ca 100644 --- a/src/views/Temp/GetonAgain/index.vue +++ b/src/views/Temp/GetonAgain/index.vue @@ -14,9 +14,9 @@ @@ -67,8 +67,22 @@ import { getSensorByDept } from "@/http/PaintShopView/index"; import bottom from "./bottom.vue"; import right from "./right.vue"; import top from "./top.vue"; -import { useI18n } from 'vue-i18n' -let {t} = useI18n(); +import { useI18n } from "vue-i18n"; +let { t } = useI18n(); +let titleTip = [ + { + color: "#E43961", + name: t("messages.abnormal"), + }, + { + color: "#20AEC5", + name: t("messages.NoAbnormal"), + }, + { + color: "#A7A6BD", + name: t("messages.disconnection"), + }, +]; const store = Offsite(); let Acontent = ref(); let time = ref(null); @@ -89,7 +103,9 @@ async function getSensorByDeptfun() { if (result.code == 200) { topref.value.setcontentData(result.data); - bottomref.value.setcontentData({power: {"5月": 445, "4月":1102 , "3月": 1861, "2月": 1754, "1月": 1344}}); + bottomref.value.setcontentData({ + power: { "5月": 445, "4月": 1102, "3月": 1861, "2月": 1754, "1月": 1344 }, + }); // bottomref.value.setcontentData(result.data); rightref.value.setcontentData(result.data); } @@ -100,11 +116,17 @@ function getWebsocket(val) { let data = JSON.parse(val); if (data.type == "electronicView") { // store.changenoise(data.msg); - topref.value.setcontentData(data.msg); bottomref.value.setcontentData(data.msg); rightref.value.setcontentData(data.msg); } + if (data.type == "dust") { + if (data.msg.devId == "ae578cd0-efd1-11ed-b2ee-2d727e0cafab") { + rightref.value.setcontentData({ + dust: { pm25: data.msg.pm25, pm10: data.msg.pm10 }, + }); + } + } } catch (err) {} } function errWebsocket(val) { @@ -166,7 +188,7 @@ onUnmounted(() => { .content { display: flex; width: 100%; - --header: 100px; + --header: 150px; height: calc(1080px - var(--header)); } diff --git a/src/views/Temp/GetonAgain/right.vue b/src/views/Temp/GetonAgain/right.vue index 7b6a42e..7ca648c 100644 --- a/src/views/Temp/GetonAgain/right.vue +++ b/src/views/Temp/GetonAgain/right.vue @@ -198,8 +198,10 @@ let {t} = useI18n(); // Productionref.value.changeData(ProductionOption.option) // pmref.value.setData({two:10,ten:10}) - pm25ref.value.setData(10) - pm10ref.value.setData(10) + console.log(val); + + pm25ref.value.setData(val.dust.pm25) + pm10ref.value.setData(val.dust.pm10) // pmref.value.setData({two:val.dust.pm25,ten:val.dust.pm10}) } onMounted(() => { diff --git a/src/views/Temp/GetonAgain/top.vue b/src/views/Temp/GetonAgain/top.vue index d56cfa1..1174b92 100644 --- a/src/views/Temp/GetonAgain/top.vue +++ b/src/views/Temp/GetonAgain/top.vue @@ -260,8 +260,10 @@ const powerBox = (width: any, height: any) => { // } function setcontentData(val){ // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"") - verticalNum4.value.setData(val.noise,'icon-shengyin',120,"dB") - verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"") + // verticalNum4.value.setData(val.noise,'icon-shengyin',120,"dB") + // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"ppm") + verticalNum4.value.setData(52,'icon-shengyin',120,"dB") + verticalNum5.value.setData(100,'icon-yanwubaojingqi',200,"ppm") // verticalNum6.value.setData(val.TVOC_CH2O.CH2O,'icon-app_icons--',5,"mg/m3") // verticalNum7.value.setData(val.TVOC_CH2O.TVOC,'icon-TVOC-Outlined',5,"PPM") // console.log(pmref.value); diff --git a/src/views/index.vue b/src/views/index.vue index 9c03f11..5a5cf38 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -11,14 +11,15 @@