修改环境大屏和机械分厂环境大屏 粉尘显示效果 固定 焊接，精饰 大件粉尘传感器devId
This commit is contained in:
hzz
parent
d669e39c55
commit
873baee839
@ -172,17 +172,36 @@ export const useSocketStore = defineStore(Names.socket, {
|
||||
* @函数备注:
|
||||
*/
|
||||
changePM(val) {
|
||||
if (val.enName == 'welding') {
|
||||
let arr = ['083e3900-3435-11ed-a7e1-fd42bca6c8c6', 'bcbfb530-88b2-11ed-a926-570995ad0254', '01336fd0-1fa0-11ed-9223-7db1174970a8']
|
||||
|
||||
// if (arr.indexOf(val.devId) > -1) {
|
||||
// console.log(val,'这三个设备');
|
||||
|
||||
// }
|
||||
|
||||
if (val.devId == '083e3900-3435-11ed-a7e1-fd42bca6c8c6') {
|
||||
this.pm.welding.two = val.pm25
|
||||
this.pm.welding.ten = val.pm10
|
||||
} else if (val.enName == 'stuff') {
|
||||
this.pm.stuff.two = val.pm25
|
||||
this.pm.stuff.ten = val.pm10
|
||||
} else if (val.enName == 'ornaments') {
|
||||
} else if (val.devId == 'bcbfb530-88b2-11ed-a926-570995ad0254') {
|
||||
this.pm.ornaments.two = val.pm25
|
||||
this.pm.ornaments.ten = val.pm10
|
||||
} else if (val.devId == '01336fd0-1fa0-11ed-9223-7db1174970a8') {
|
||||
this.pm.stuff.two = val.pm25
|
||||
this.pm.stuff.ten = val.pm10
|
||||
}
|
||||
|
||||
|
||||
// if (val.enName == 'welding') {
|
||||
// this.pm.welding.two = val.pm25
|
||||
// this.pm.welding.ten = val.pm10
|
||||
// } else if (val.enName == 'stuff') {
|
||||
// this.pm.stuff.two = val.pm25
|
||||
// this.pm.stuff.ten = val.pm10
|
||||
// } else if (val.enName == 'ornaments') {
|
||||
// this.pm.ornaments.two = val.pm25
|
||||
// this.pm.ornaments.ten = val.pm10
|
||||
// }
|
||||
|
||||
},
|
||||
/**
|
||||
* @函数功能:
|
||||
|
||||
@ -172,15 +172,15 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{
|
||||
* @函数备注:
|
||||
*/
|
||||
changePM(val){
|
||||
if(val.enName=='welding'){
|
||||
if (val.devId == '083e3900-3435-11ed-a7e1-fd42bca6c8c6') {
|
||||
this.pm.welding.two = val.pm25
|
||||
this.pm.welding.ten = val.pm10
|
||||
}else if(val.enName=='stuff'){
|
||||
this.pm.stuff.two=val.pm25
|
||||
this.pm.stuff.ten=val.pm10
|
||||
}else if(val.enName=='ornaments'){
|
||||
} else if (val.devId == 'bcbfb530-88b2-11ed-a926-570995ad0254') {
|
||||
this.pm.ornaments.two = val.pm25
|
||||
this.pm.ornaments.ten = val.pm10
|
||||
} else if (val.devId == '01336fd0-1fa0-11ed-9223-7db1174970a8') {
|
||||
this.pm.stuff.two = val.pm25
|
||||
this.pm.stuff.ten = val.pm10
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="content-right">
|
||||
<el-row >
|
||||
<el-row @click="toPmData">
|
||||
<el-col :span="8">
|
||||
<border2 ref="borderElectriccontrol">
|
||||
<template v-slot>
|
||||
@ -44,9 +44,11 @@
|
||||
// import { getHumitureData,getPmtenData, getPmtwoData } from "@/http/environment";
|
||||
import { onMounted, reactive, ref, watch } from "vue"
|
||||
import { useSocketStore } from "@/store/moduleSocket"
|
||||
import { useRouter } from "vue-router";
|
||||
import { useI18n } from 'vue-i18n'
|
||||
let { t } = useI18n();
|
||||
const store = useSocketStore()
|
||||
const router = useRouter()
|
||||
let props = defineProps<{
|
||||
width: number,
|
||||
height: number,
|
||||
@ -155,20 +157,47 @@ async function getPmtenDatafun(){
|
||||
async function getPmData() {
|
||||
// let resulttwo:any = await getPmtwoData()
|
||||
// let resultten:any = await getPmtenData()
|
||||
|
||||
//焊接车间 083e3900-3435-11ed-a7e1-fd42bca6c8c6
|
||||
//精饰车间 bcbfb530-88b2-11ed-a926-570995ad0254
|
||||
//大件车间 01336fd0-1fa0-11ed-9223-7db1174970a8
|
||||
let arr = ['01336fd0-1fa0-11ed-9223-7db1174970a8', '083e3900-3435-11ed-a7e1-fd42bca6c8c6', 'bcbfb530-88b2-11ed-a926-570995ad0254']
|
||||
let data = reactive({ welding: { two: null, ten: null }, stuff: { two: null, ten: null }, ornaments: { two: null, ten: null } })
|
||||
Promise.all([getPmtwoDatafun(), getPmtenDatafun()]).then((res) => {
|
||||
if (res) {
|
||||
res[0].data.forEach(ele => {
|
||||
if(data[ele.enName]){
|
||||
data[ele.enName].two=ele.value
|
||||
|
||||
switch (ele.devId) {
|
||||
case '083e3900-3435-11ed-a7e1-fd42bca6c8c6':
|
||||
data.welding.two = ele.value
|
||||
break;
|
||||
case 'bcbfb530-88b2-11ed-a926-570995ad0254':
|
||||
data.ornaments.two = ele.value
|
||||
break;
|
||||
case '01336fd0-1fa0-11ed-9223-7db1174970a8':
|
||||
data.stuff.two = ele.value
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
if (res) {
|
||||
res[1].data.forEach(ele => {
|
||||
if(data[ele.enName]){
|
||||
data[ele.enName].ten=ele.value
|
||||
|
||||
switch (ele.devId) {
|
||||
case '083e3900-3435-11ed-a7e1-fd42bca6c8c6':
|
||||
data.welding.ten = ele.value
|
||||
break;
|
||||
case 'bcbfb530-88b2-11ed-a926-570995ad0254':
|
||||
data.ornaments.ten = ele.value
|
||||
break;
|
||||
case '01336fd0-1fa0-11ed-9223-7db1174970a8':
|
||||
data.stuff.ten = ele.value
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
})
|
||||
}
|
||||
@ -201,6 +230,10 @@ async function getPmData(){
|
||||
|
||||
}
|
||||
|
||||
function toPmData() {
|
||||
router.push({ path: '/pmData' })
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
gethumitureData()
|
||||
getPmData()
|
||||
@ -211,6 +244,5 @@ onMounted(()=>{
|
||||
.content-right {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="content-right">
|
||||
<el-row >
|
||||
<el-row @click="toPmData">
|
||||
<el-col :span="8">
|
||||
<border2 ref="borderElectriccontrol">
|
||||
<template v-slot>
|
||||
@ -43,9 +43,12 @@
|
||||
import { getHumitureData, getPmtenData, getPmtwoData } from "@/http/generalEnvironment";
|
||||
// import { getHumitureData,getPmtenData, getPmtwoData } from "@/http/environment";
|
||||
import { onMounted, ref, watch } from "vue"
|
||||
import { useRouter } from "vue-router";
|
||||
import { useSocketStore } from "@/store/moduleSocketjixie";
|
||||
import { useI18n } from 'vue-i18n'
|
||||
let { t } = useI18n();
|
||||
|
||||
const router = useRouter()
|
||||
const store = useSocketStore()
|
||||
let props = defineProps<{
|
||||
width: number,
|
||||
@ -142,18 +145,40 @@ async function getPmData(){
|
||||
let resulttwo: any = await getPmtwoData()
|
||||
let resultten: any = await getPmtenData()
|
||||
let data = { welding: { two: null, ten: null }, stuff: { two: null, ten: null }, ornaments: { two: null, ten: null } }
|
||||
if(resulttwo.code==200){
|
||||
resulttwo.data.forEach(res=>{
|
||||
if(data[res.enName]){
|
||||
data[res.enName].two=res.value
|
||||
}
|
||||
if (resulttwo) {
|
||||
resulttwo.data.forEach(ele => {
|
||||
|
||||
switch (ele.devId) {
|
||||
case '083e3900-3435-11ed-a7e1-fd42bca6c8c6':
|
||||
data.welding.two = ele.value
|
||||
break;
|
||||
case 'bcbfb530-88b2-11ed-a926-570995ad0254':
|
||||
data.ornaments.two = ele.value
|
||||
break;
|
||||
case '01336fd0-1fa0-11ed-9223-7db1174970a8':
|
||||
data.stuff.two = ele.value
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
})
|
||||
}
|
||||
if(resultten.code==200){
|
||||
resultten.data.forEach(res=>{
|
||||
if(data[res.enName]){
|
||||
data[res.enName].ten=res.value
|
||||
|
||||
if (resultten) {
|
||||
resultten.data.forEach(ele => {
|
||||
|
||||
switch (ele.devId) {
|
||||
case '083e3900-3435-11ed-a7e1-fd42bca6c8c6':
|
||||
data.welding.ten = ele.value
|
||||
break;
|
||||
case 'bcbfb530-88b2-11ed-a926-570995ad0254':
|
||||
data.ornaments.ten = ele.value
|
||||
break;
|
||||
case '01336fd0-1fa0-11ed-9223-7db1174970a8':
|
||||
data.stuff.ten = ele.value
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
})
|
||||
}
|
||||
@ -168,6 +193,10 @@ async function getPmData(){
|
||||
})
|
||||
}
|
||||
|
||||
function toPmData() {
|
||||
router.push({ path: '/pmData' })
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
gethumitureData()
|
||||
getPmData()
|
||||
@ -178,6 +207,5 @@ onMounted(()=>{
|
||||
.content-right {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user