-
{{ item.name }}
+
{{ props.title }}
{{ `${t('messages.NormalValue')}0-${value.quota}${value.unit}` }}
diff --git a/src/views/PaintShopView/finishView/top.vue b/src/views/PaintShopView/finishView/top.vue
index 02dac30..ea913a8 100644
--- a/src/views/PaintShopView/finishView/top.vue
+++ b/src/views/PaintShopView/finishView/top.vue
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/src/views/PaintShopView/machiningView/top.vue b/src/views/PaintShopView/machiningView/top.vue
index d579b4c..9056166 100644
--- a/src/views/PaintShopView/machiningView/top.vue
+++ b/src/views/PaintShopView/machiningView/top.vue
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/src/views/PaintShopView/stuffView/top.vue b/src/views/PaintShopView/stuffView/top.vue
index 04054da..2b87281 100644
--- a/src/views/PaintShopView/stuffView/top.vue
+++ b/src/views/PaintShopView/stuffView/top.vue
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/src/views/PaintShopView/weldView/top.vue b/src/views/PaintShopView/weldView/top.vue
index 4206eed..968ed99 100644
--- a/src/views/PaintShopView/weldView/top.vue
+++ b/src/views/PaintShopView/weldView/top.vue
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/src/views/environment/content/left.vue b/src/views/environment/content/left.vue
index e178f30..a47bf2f 100644
--- a/src/views/environment/content/left.vue
+++ b/src/views/environment/content/left.vue
@@ -14,7 +14,7 @@
-
+
diff --git a/src/views/pmData/index.vue b/src/views/pmData/index.vue
index 4641c16..4997a46 100644
--- a/src/views/pmData/index.vue
+++ b/src/views/pmData/index.vue
@@ -35,6 +35,7 @@ let pmtest = ref({
title: 'PM测试',
value: { two: '44', ten: '51' }
})
+document.title = t('messages.environment_dust')
type pmData = {
title: string,
devId:string,
@@ -62,7 +63,12 @@ async function getData() {
ten: '0'
}
}
- pmData.push(temp)
+ if (title[0] == "厂区") {
+ pmData.unshift(temp)
+ } else {
+ pmData.push(temp)
+ }
+
})
}
diff --git a/src/views/realtimeSecurity/content/content.vue b/src/views/realtimeSecurity/content/content.vue
index 258f0b7..67e3a13 100644
--- a/src/views/realtimeSecurity/content/content.vue
+++ b/src/views/realtimeSecurity/content/content.vue
@@ -119,6 +119,9 @@ async function getSafeWarningDatafun(){
let datetime = new Date().getTime();
let handle_vertical = result.data.map((item:any)=>{
item.value.forEach(element => {
+ if (element.name.includes("TVOC")) {
+ element.name = element.name.split('TVOC')[0] + verticalType[item.type].title
+ }
if (element.val>item.limit) {
element.date = gettime(element.ts),
diff --git a/src/views/realtimeSecurityJixiefenchang/content/content.vue b/src/views/realtimeSecurityJixiefenchang/content/content.vue
index 9c87577..fc6c6ab 100644
--- a/src/views/realtimeSecurityJixiefenchang/content/content.vue
+++ b/src/views/realtimeSecurityJixiefenchang/content/content.vue
@@ -9,7 +9,7 @@
-
+
@@ -138,6 +138,9 @@ async function getSafeWarningDatafun() {
let handle_vertical = result.data.map((item: any) => {
item.value.forEach(element => {
+ if (element.name.includes("TVOC")) {
+ element.name = element.name.split('TVOC')[0] + verticalType[item.type].title
+ }
if (element.val > item.limit) {
element.date = gettime(element.ts),
element.time = element.ts || datetime