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-05-17 08:46:07 +08:00
commit 4e856d6abb
8 changed files with 110 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/locales/lang/en.ts
View File

@ -1,5 +1,5 @@
/*
* @FilePath: \wwwd:\code\screenFront\src\locales\lang\en.ts
* @FilePath: \gitscreenFront\src\locales\lang\en.ts
* @Author: 王路平
* @文件版本: V1.0.0
* @Date: 2023-05-04 16:36:13
@ -196,9 +196,9 @@ export default {
'gasDetection':'Gas Test',
'CH2ODetection':'Alcohol Test',
'flameDetection':'Fire Test',
'EastPumpPressure_Mpa':'East Pump Room Air Pressure(Mpa)',
'WestPumpPressure_Mpa':'West Pump Room Air Pressure(Mpa)',
'PipelinePressure_Mpa':'Pipeline Pressure(Mpa)',
'EastPumpPressure_Mpa':'East Pump Room Air Pressure',
'WestPumpPressure_Mpa':'West Pump Room Air Pressure',
'PipelinePressure_Mpa':'Pipeline Pressure',
'normal_Tip':'Normal',
'abnormal_Tip':'Abnormal',
'abnormal_Tip_yishang':'Above',

8
src/locales/lang/zh.ts
View File

@ -1,5 +1,5 @@
/*
* @FilePath: \wwwd:\code\screenFront\src\locales\lang\zh.ts
* @FilePath: \gitscreenFront\src\locales\lang\zh.ts
* @Author: 王路平
* @文件版本: V1.0.0
* @Date: 2023-05-04 16:36:13
@ -196,9 +196,9 @@ export default {
'gasDetection':'燃气检测',
'CH2ODetection':'甲醛检测',
'flameDetection':'明火检测',
'EastPumpPressure_Mpa':'东泵房气压Mpa',
'WestPumpPressure_Mpa':'西泵房气压Mpa',
'PipelinePressure_Mpa':'管道压力(Mpa)',
'EastPumpPressure_Mpa':'东泵房气压',
'WestPumpPressure_Mpa':'西泵房气压',
'PipelinePressure_Mpa':'管道压力',
'normal_Tip':'正常',
'abnormal_Tip':'异常',
'abnormal_Tip_yishang':'以上',

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

@ -1,5 +1,5 @@
<!--
* @FilePath: \screenFront\src\views\PaintShopView\View1\top.vue
* @FilePath: \gitscreenFront\src\views\PaintShopView\View1\top.vue
* @Author: 王路平
* @文件版本: V1.0.0
* @Date: 2023-02-13 14:43:28
@ -266,7 +266,7 @@ function setcontentData(val) {
});
verticalNum3.value.setData(val.FIRE, 'icon-ranqi', 0, "")
verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB")
verticalNum5.value.setData(Smoke, 'icon-yanwubaojingqi', 100, "")
verticalNum5.value.setData(Smoke, 'icon-yanwubaojingqi', 100, "PPM")
verticalNum6.value.setData(CH2O, 'icon-app_icons--', 0.08, "mg/m3")
verticalNum7.value.setData(TVOC, 'icon-TVOC-Outlined', 0.5, "mg/m3")
// console.log(pmref.value);

4
src/views/PaintShopView/components/pm.vue
View File

@ -1,5 +1,5 @@
<!--
* @FilePath: \screenFront\src\views\PaintShopView\components\pm.vue
* @FilePath: \gitscreenFront\src\views\PaintShopView\components\pm.vue
* @Author: 王路平
* @文件版本: V1.0.0
* @Date: 2023-02-10 13:27:36
@ -121,7 +121,7 @@ const setData = (value: any) => {
color: "inherit",
},
title: {
show: false,
// show: false,
offsetCenter: [0, "-20%"],
},
data: [

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

@ -1,5 +1,5 @@
<!--
* @FilePath: \screenFront\src\views\PaintShopView\components\verticalNum.vue
* @FilePath: \gitscreenFront\src\views\PaintShopView\components\verticalNum.vue
* @Author: 王路平
* @文件版本: V1.0.0
* @Date: 2023-02-13 08:22:35
@ -117,23 +117,24 @@ defineExpose({
<style scoped>
@import "@/assets/css/iconfont.css";
.box {
height: 50%;
width: 100%;
box-sizing: border-box;
display: flex;
flex-direction: column;
justify-content: space-evenly;
align-items: center;
}
height: 50%;
width: 100%;
box-sizing: border-box;
display: flex;
flex-direction: column;
justify-content: space-evenly;
align-items: center;
}
.box>h5 {
font-size: 15px;
/* margin-bottom: 20px; */
margin-top: 20px;
}
.box>h5 {
font-size: 15px;
/* margin-bottom: 20px; */
margin-top: 20px;
}
/* .contentbox{
/* .contentbox{
height: 100%;
width: 100%;
display: flex;
@ -141,77 +142,80 @@ defineExpose({
justify-content: space-around;
align-items: center;
} */
h2 {
color: #fff;
}
h2 {
color: #fff;
}
p {
color: #fff;
}
p {
color: #fff;
}
.icon-red {
font-size: 100px;
color: #E43961;
animation: redstart 2s infinite;
/* position: relative; */
/* top: -15px; */
}
.icon-red {
font-size: 100px;
color: #E43961;
animation: redstart 2s infinite;
/* position: relative; */
/* top: -15px; */
}
.icon-blue {
font-size: 100px;
color: #20AEC5;
/* position: relative; */
/* top: -15px; */
}
.icon-blue {
font-size: 100px;
color: #20AEC5;
/* position: relative; */
/* top: -15px; */
}
.iconsmall-size {
font-size: 20px;
}
.iconsmall-size {
font-size: 20px;
}
.num {
font-size: 24px;
}
.num {
font-size: 16px;
}
.unit {
display: flex;
justify-content: center;
align-items: center;
vertical-align: top;
font-size: 20px;
height: 5;
width: 100px;
}
.unit {
display: flex;
justify-content: center;
align-items: center;
vertical-align: top;
font-size: 16px;
height: 5;
width: 100px;
}
.box>h2 {
font-size: 20px;
}
.box>h2 {
font-size: 20px;
position: absolute;
top: 15px;
left:20px;
}
.icontip {
display: flex;
margin-top: -60px;
width: 100px;
flex-wrap: wrap;
align-items: center;
justify-content: center;
height: 60px;
}
.icontip {
display: flex;
margin-top: -60px;
width: 100px;
flex-wrap: wrap;
align-items: center;
justify-content: center;
height: 60px;
}
.icontipBox li {
display: flex;
align-items: center;
justify-content: flex-start;
margin-bottom: 5px;
}
.icontipBox li {
display: flex;
align-items: center;
justify-content: flex-start;
margin-bottom: 5px;
}
.icontipBox li p:nth-child(1) {
width: 40%;
text-align: left;
}
.icontipBox li p:nth-child(1) {
width: 40%;
text-align: left;
}
.icontipBox li p:nth-child(2) {
flex: 1;
}
.icontipBox li p:nth-child(2) {
flex: 1;
}
@keyframes redstart {
0% {}

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

@ -286,7 +286,7 @@ let temp_humi_index = 0
verticalNum4.value.setData(noise,'icon-shengyin',120,"dB")
// verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"")
verticalNum6.value.setData(CH2O,'icon-app_icons--',0.08,"mg/m3")
verticalNum7.value.setData(TVOC,'icon-TVOC-Outlined',0.5,"PPM")
verticalNum7.value.setData(TVOC,'icon-TVOC-Outlined',0.5,"mg/m3")
// console.log(pmref.value);
humidityref.value.setData({ h: val.temp_humi[temp_humi_index].huim, c: val.temp_humi[temp_humi_index].temp })
if (val.temp_humi.length > 1) {

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

@ -284,7 +284,7 @@ let temp_humi_index = 0
verticalNum4.value.setData(noise,'icon-shengyin',120,"dB")
// verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"")
verticalNum6.value.setData(CH2O,'icon-app_icons--',0.08,"mg/m3")
verticalNum7.value.setData(TVOC,'icon-TVOC-Outlined',0.5,"PPM")
verticalNum7.value.setData(TVOC,'icon-TVOC-Outlined',0.5,"mg/m3")
// console.log(pmref.value);
humidityref.value.setData({ h: val.temp_humi[temp_humi_index].huim, c: val.temp_humi[temp_humi_index].temp })
if (val.temp_humi.length > 1) {

8
src/views/generalEnvironmentjixiefenchang/content/right.vue
View File

@ -144,16 +144,16 @@ async function getPmData(){
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.name]){
data[res.name].two=res.value
if(data[res.enName]){
data[res.enName].two=res.value
}
})
}
if(resultten.code==200){
resultten.data.forEach(res=>{
if(data[res.name]){
data[res.name].ten=res.value
if(data[res.enName]){
data[res.enName].ten=res.value
}
})
}