diff --git a/src/store/moduleSocket.ts b/src/store/moduleSocket.ts index 959d2b2..c141e07 100644 --- a/src/store/moduleSocket.ts +++ b/src/store/moduleSocket.ts @@ -1,5 +1,5 @@ /* - * @FilePath: \wwwd:\code\screenFront\src\store\moduleSocket.ts + * @FilePath: \screenFront\src\store\moduleSocket.ts * @Author: 王路平 * @文件版本: V1.0.0 * @Date: 2023-02-06 15:58:13 @@ -341,6 +341,7 @@ export const useSocketStore = defineStore(Names.socket, { this.newVerticalNum[pIndex].value[cIndex].time = null } this.newVerticalNum[pIndex].value[cIndex].val = val.data.val + this.newVerticalNum[pIndex].value[cIndex].status = true } } } diff --git a/src/views/PaintShopView/View1/top.vue b/src/views/PaintShopView/View1/top.vue index 662ee0c..82410a1 100644 --- a/src/views/PaintShopView/View1/top.vue +++ b/src/views/PaintShopView/View1/top.vue @@ -253,16 +253,16 @@ let ductOption = reactive({ let temp_humi_index = 0 function setcontentData(val) { let CH2O = val.TVOC_CH2O.map((item) => { - return { name: item.name, val: item.CH2O }; + return { name: item.name, val: item.CH2O,status:item.status }; }); let TVOC = val.TVOC_CH2O.map((item) => { - return { name: item.name, val: item.TVOC }; + return { name: item.name, val: item.TVOC,status:item.status }; }); let Smoke = val.Smoke.map((item) => { - return { name: item.name, val: item.data }; + return { name: item.name, val: item.data,status:item.status }; }); let noise = val.noise.map((item) => { - return { name: item.name, val: item.data }; + return { name: item.name, val: item.data,status:item.status }; }); verticalNum3.value.setData(val.FIRE, 'icon-ranqi', 0, "") verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB") diff --git a/src/views/PaintShopView/components/verticalNum.vue b/src/views/PaintShopView/components/verticalNum.vue index 56a330a..e513e5d 100644 --- a/src/views/PaintShopView/components/verticalNum.vue +++ b/src/views/PaintShopView/components/verticalNum.vue @@ -16,11 +16,12 @@
{{ `${t('messages.NormalValue')}0-${value.quota}${value.unit}` }}
 
- +value.quota ? 'iconfont ' + value.iconname + ' icon-red iconbig-size' : 'iconfont ' + value.iconname + ' icon-blue iconbig-size' - "> -

+ "> --> + +

{{ item.val }} 

{{ value.unit }}

@@ -48,8 +49,22 @@ let props = defineProps<{ }>(); let i = ref(0) let item = computed(() => { - - return value.data[i.value] || { "name": "", "val": "0", "type": "", "field": "", "ts": 0 }; + console.log(value.data[i.value]); + + return value.data[i.value] || { "name": "", "val": "0", "type": "", "field": "", "ts": 0,"status":false}; +}); +let icon = computed(() => { + return value.iconname +}); +let iconcolor = computed(() => { + console.log(value.data[i.value]); + //开始进入渲染是没有获取到该数据则需要判断 如果没有则返回空 + if(value.data[i.value]){ + return value.data[i.value].status? +value.data[i.value].val > +value.quota ? "icon-red" : "icon-blue":"icon-grey"; + }else{ + return "icon-grey" + } + }); let keynum = ref(0); const value = reactive({ @@ -91,6 +106,7 @@ const setData = ( return { name: item.name.split("车间")[1] || item.name, val: item.val, + status:item.status }; }); value.data = temp_data; @@ -164,7 +180,12 @@ defineExpose({ /* position: relative; */ /* top: -15px; */ } - + .icon-grey { + color: rgb(167, 166, 189); + font-size: 100px; + /* position: relative; */ + /* top: -15px; */ +} .iconsmall-size { font-size: 20px; } diff --git a/src/views/PaintShopView/finishView/top.vue b/src/views/PaintShopView/finishView/top.vue index 19d6dd1..58a056c 100644 --- a/src/views/PaintShopView/finishView/top.vue +++ b/src/views/PaintShopView/finishView/top.vue @@ -274,13 +274,13 @@ let temp_humi_index = 0 console.log(val); let CH2O = val.TVOC_CH2O.map((item) => { - return { name: item.name, val: item.CH2O }; + return { name: item.name, val: item.CH2O,status:item.status }; }); let TVOC = val.TVOC_CH2O.map((item) => { - return { name: item.name, val: item.TVOC }; + return { name: item.name, val: item.TVOC,status:item.status }; }); let noise = val.noise.map((item) => { - return { name: item.name, val: item.data }; + return { name: item.name, val: item.data,status:item.status }; }); // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"") verticalNum4.value.setData(noise,'icon-shengyin',120,"dB") diff --git a/src/views/PaintShopView/machiningView/top.vue b/src/views/PaintShopView/machiningView/top.vue index 3d62891..e0ffd35 100644 --- a/src/views/PaintShopView/machiningView/top.vue +++ b/src/views/PaintShopView/machiningView/top.vue @@ -272,13 +272,13 @@ let temp_humi_index = 0 function setcontentData(val){ let CH2O = val.TVOC_CH2O.map((item) => { - return { name: item.name, val: item.CH2O }; + return { name: item.name, val: item.CH2O,status:item.status }; }); let TVOC = val.TVOC_CH2O.map((item) => { - return { name: item.name, val: item.TVOC }; + return { name: item.name, val: item.TVOC,status:item.status }; }); let noise = val.noise.map((item) => { - return { name: item.name, val: item.data }; + return { name: item.name, val: item.data,status:item.status }; }); // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"") verticalNum4.value.setData(noise,'icon-shengyin',120,"dB") diff --git a/src/views/PaintShopView/stuffView/top.vue b/src/views/PaintShopView/stuffView/top.vue index 294495e..4c741ee 100644 --- a/src/views/PaintShopView/stuffView/top.vue +++ b/src/views/PaintShopView/stuffView/top.vue @@ -1,5 +1,5 @@ - -

+ +

{{ item.val }}

{{ value.unit }}

@@ -44,8 +41,11 @@ let props = defineProps<{ }>(); let i = ref(0) let item = computed(() => { + return value.data[i.value] || { "name": "", "val": "0", "type": "", "field": "", "ts": 0,status:false }; +}); - return value.data[i.value] || { "name": "", "val": "0", "type": "", "field": "", "ts": 0 }; +let iconColor = computed(() => { + return value.data[i.value]?.status?(value.data[i.value].val > value.quota ? "icon-red" : "icon-blue"):"icon-grey"; }); let keynum = ref(0); const value = reactive({ @@ -139,8 +139,11 @@ p { color: #fff; } -.icon-red { +.iconbig-size { font-size: 100px; +} + +.icon-red { color: #E43961; animation: redstart 2s infinite; /* position: relative; */ @@ -148,11 +151,15 @@ p { } .icon-blue { - font-size: 100px; color: #20AEC5; /* position: relative; */ /* top: -15px; */ } +.icon-grey { + color: rgb(167, 166, 189); + /* position: relative; */ + /* top: -15px; */ +} .iconsmall-size { font-size: 20px; diff --git a/src/views/electronicControlAmbient/index.vue b/src/views/electronicControlAmbient/index.vue index de1f5b9..ec28418 100644 --- a/src/views/electronicControlAmbient/index.vue +++ b/src/views/electronicControlAmbient/index.vue @@ -1,5 +1,5 @@