hanzhengzheng/screenFront
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/645deca397d94d909e439238/iotplatform_sourcecode/screenFront into dismap

Browse Source
This commit is contained in:
hzz 2023-06-01 09:09:32 +08:00
commit 5f31fe3996
10 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/PaintShopView/View1/top.vue
View File

@ -15,8 +15,8 @@
<verticalNum ref="verticalNum3" :title="t('messages.gasDetection')"></verticalNum>
<verticalNum ref="verticalNum5" :title="t('messages.smokeDetection')"></verticalNum>
<verticalNum ref="verticalNum4" :title="t('messages.noiseDetection')"></verticalNum>
<verticalNum ref="verticalNum6" :title="t('messages.CH2Ojiance')"></verticalNum>
<verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
<verticalNum ref="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
<verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
<div>
<border6 ref="borderref">
<template v-slot>

2
src/views/PaintShopView/components/verticalNum.vue
View File

@ -12,7 +12,7 @@
<border6 ref="refborder3">
<template v-slot>
<div class="box" ref="classBox1">
<h2>{{ item.name }}</h2>
<h2>{{ props.title }}</h2>
<h5 v-if="value.unit">{{ `${t('messages.NormalValue')}0-${value.quota}${value.unit}` }}</h5>
<h5 v-else>&nbsp; </h5>
<!-- <h2>{{ `${t(item.i18n[0])}${t(item.i18n[1])}`}}</h2> -->

4
src/views/PaintShopView/finishView/top.vue
View File

@ -15,8 +15,8 @@
<!-- <verticalNum ref="verticalNum3" :title="'燃气检测'"></verticalNum> -->
<!-- <verticalNum ref="verticalNum5" :title="'烟雾检测'"></verticalNum> -->
<verticalNum ref="verticalNum4" :title="t('messages.noiseDetection')"></verticalNum>
<verticalNum ref="verticalNum6" :title="'甲醛监测'"></verticalNum>
<verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
<verticalNum ref="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
<verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
<div>
<border6 ref="borderref">
<template v-slot>

4
src/views/PaintShopView/machiningView/top.vue
View File

@ -15,8 +15,8 @@
<!-- <verticalNum ref="verticalNum3" :title="'燃气检测'"></verticalNum>
<verticalNum ref="verticalNum5" :title="'烟雾检测'"></verticalNum> -->
<verticalNum ref="verticalNum4" :title="t('messages.noiseDetection')"></verticalNum>
<verticalNum ref="verticalNum6" :title="'甲醛监测'"></verticalNum>
<verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
<verticalNum ref="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
<verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
<div>
<border6 ref="borderref">
<template v-slot>

4
src/views/PaintShopView/stuffView/top.vue
View File

@ -15,8 +15,8 @@
<!-- <verticalNum ref="verticalNum3" :title="'燃气检测'"></verticalNum>
<verticalNum ref="verticalNum5" :title="'烟雾检测'"></verticalNum> -->
<verticalNum ref="verticalNum4" :title="t('messages.noiseDetection')"></verticalNum>
<verticalNum ref="verticalNum6" :title="'甲醛监测'"></verticalNum>
<verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
<verticalNum ref="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
<verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
<div>
<border6 ref="borderref">
<template v-slot>

4
src/views/PaintShopView/weldView/top.vue
View File

@ -15,8 +15,8 @@
<!-- <verticalNum ref="verticalNum3" :title="'燃气检测'"></verticalNum> -->
<!-- <verticalNum ref="verticalNum5" :title="'烟雾检测'"></verticalNum> -->
<verticalNum ref="verticalNum4" :title="t('messages.noiseDetection')"></verticalNum>
<verticalNum ref="verticalNum6" :title="'甲醛监测'"></verticalNum>
<verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
<verticalNum ref="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
<verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
<div>
<border6 ref="borderref">
<template v-slot>

2
src/views/environment/content/left.vue
View File

@ -14,7 +14,7 @@
<border2 ref="ReffinishArofene">
<template v-slot>
<div class="content-LR" ref="finishArofene">
<verticalNum :title="`${t('messages.JingShiRoom')}(${t('messages.CH2Ojiance')})`" :data="0.132" :unit="'mg/m3'" :quota="1" :iconname="'icon-app_icons--'"></verticalNum>
<verticalNum :title="`${t('messages.JingShiRoom')}(${t('messages.CH2ODetection')})`" :data="0.132" :unit="'mg/m3'" :quota="1" :iconname="'icon-app_icons--'"></verticalNum>
</div>
</template>
</border2>

8
src/views/pmData/index.vue
View File

@ -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)
}
})
}

3
src/views/realtimeSecurity/content/content.vue
View File

@ -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),

5
src/views/realtimeSecurityJixiefenchang/content/content.vue
View File

@ -9,7 +9,7 @@
<verticalNum ref="verticalNum3" :title="`喷漆${t('messages.gasDetection')}`"></verticalNum>
<verticalNum ref="verticalNum4" :title="t('messages.flameDetection')"></verticalNum>
<verticalNum ref="verticalNum5" :title="t('messages.smokeDetection')"></verticalNum>
<verticalNum ref="verticalNum6" :title="`${t('messages.JingShiRoom')}(${t('messages.CH2Ojiance')})`"></verticalNum>
<verticalNum ref="verticalNum6" :title="`${t('messages.JingShiRoom')}(${t('messages.CH2ODetection')})`"></verticalNum>
<verticalNum ref="verticalNum7" :title="`${t('messages.JingShiRoom')}TVOC`"></verticalNum>
</div>
<div>
@ -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