This commit is contained in:
home孙 2025-09-12 16:43:59 +08:00
parent 0961e9182b
commit 4f2cd3e459
5 changed files with 122 additions and 55 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -1181,6 +1181,7 @@ module.exports = {
"e": "E", "e": "E",
"f": "F", "f": "F",
"g": "G", "g": "G",
"h": "H",
"acid": "Acid", "acid": "Acid",
"acidFertilizer": "Acid" "acidFertilizer": "Acid"
}, },

View File

@ -1179,7 +1179,7 @@ module.exports = {
"executingGroup": "执行灌溉组号", "executingGroup": "执行灌溉组号",
"fertilizerPump": "配肥泵", "fertilizerPump": "配肥泵",
"fertilizerIntensity": "配肥强度", "fertilizerIntensity": "配肥",
"targetPH": "目标PH", "targetPH": "目标PH",
"measuredPH": "实测PH", "measuredPH": "实测PH",
"measuredEC": "实测EC", "measuredEC": "实测EC",
@ -1191,7 +1191,7 @@ module.exports = {
"value": "数值", "value": "数值",
"adValue": "AD值", "adValue": "AD值",
"fertilizationSpeed": "配肥速度", "fertilizationSpeed": "搅拌",
"fertilizerTypes": { "fertilizerTypes": {
"a": "A肥", "a": "A肥",
"b": "B肥", "b": "B肥",
@ -1200,6 +1200,7 @@ module.exports = {
"e": "E肥", "e": "E肥",
"f": "F肥", "f": "F肥",
"g": "G肥", "g": "G肥",
"h": "H肥",
"acid": "酸", "acid": "酸",
"acidFertilizer": "酸肥" "acidFertilizer": "酸肥"
}, },

View File

@ -33,6 +33,12 @@
<div class="input-title">{{$t('status.executingGroup')}}</div> <div class="input-title">{{$t('status.executingGroup')}}</div>
<div class="input">{{ countData(inputData['38']) }}</div> <div class="input">{{ countData(inputData['38']) }}</div>
</div> </div>
</div>
<div>
<div class="input-50">
<div class="input-title">什么方式启动搅拌</div>
<div class="input green">{{ openTypeStir }}</div>
</div>
</div> </div>
<div class="left-btn"> <div class="left-btn">
<div :class="left1Act[1]==1 ? 'active' : ''">{{$t('status.inletPump')}}</div> <div :class="left1Act[1]==1 ? 'active' : ''">{{$t('status.inletPump')}}</div>
@ -48,7 +54,11 @@
<div class="left" :style="item.img ? `background: url(${item.img}) no-repeat center;` : ''"><span>{{ <div class="left" :style="item.img ? `background: url(${item.img}) no-repeat center;` : ''"><span>{{
item.title }}</span></div> item.title }}</span></div>
<div class="name">{{ item.name }}</div> <div class="name">{{ item.name }}</div>
<div class="right">
<div class="number">{{ item.number }}</div> <div class="number">{{ item.number }}</div>
<div class="line"></div>
<div class="number">{{ item.speed }}<span>(L/h)</span></div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -125,9 +135,10 @@
<div class="right-view3"> <div class="right-view3">
<div class="main-title"><span>{{$t('status.fertilizationSpeed')}} (L/h) </span></div> <div class="main-title"><span>{{$t('status.fertilizationSpeed')}} (L/h) </span></div>
<div class="view-content"> <div class="view-content">
<div v-for="item, index in rightList3" :key="index"> <div class="grid" :class="rightList3Show[index]==1?'active':''" v-for="item, index in rightList3" :key="index">
<div>
<div class="name">{{ item.name }}</div> <div class="name">{{ item.name }}</div>
<div class="number">{{ item.number }}</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -142,8 +153,10 @@ export default {
pageTimer: null, pageTimer: null,
left1Act: [0,0], left1Act: [0,0],
openType: '', openType: '',
openTypeStir:'',
centerAct: 0, centerAct: 0,
right2Index: [], right2Index: [],
rightList3Show:[],
inputData: [], inputData: [],
deviceDetail: null, deviceDetail: null,
centerBottom: [], centerBottom: [],
@ -172,41 +185,55 @@ export default {
title: 'A', title: 'A',
name: this.$t('status.fertilizerTypes.a'), name: this.$t('status.fertilizerTypes.a'),
number: '26%', number: '26%',
speed:0,
img: '' img: ''
}, { }, {
title: 'B', title: 'B',
name: this.$t('status.fertilizerTypes.b'), name: this.$t('status.fertilizerTypes.b'),
number: '26%', number: '26%',
speed:0,
img: '' img: ''
}, { }, {
title: 'C', title: 'C',
name: this.$t('status.fertilizerTypes.c'), name: this.$t('status.fertilizerTypes.c'),
number: '26%', number: '26%',
speed:0,
img: '' img: ''
}, { }, {
title: 'D', title: 'D',
name: this.$t('status.fertilizerTypes.d'), name: this.$t('status.fertilizerTypes.d'),
number: '26%', number: '26%',
speed:0,
img: '' img: ''
}, { }, {
title: 'E', title: 'E',
name: this.$t('status.fertilizerTypes.e'), name: this.$t('status.fertilizerTypes.e'),
number: '26%', number: '26%',
speed:0,
img: '' img: ''
}, { }, {
title: 'F', title: 'F',
name: this.$t('status.fertilizerTypes.f'), name: this.$t('status.fertilizerTypes.f'),
number: '26%', number: '26%',
speed:0,
img: '' img: ''
}, { }, {
title: 'G', title: 'G',
name: this.$t('status.fertilizerTypes.g'), name: this.$t('status.fertilizerTypes.g'),
number: '26%', number: '26%',
speed:0,
img: ''
}, {
title: 'H',
name: this.$t('status.fertilizerTypes.h'),
number: '26%',
speed:0,
img: '' img: ''
},{ },{
title: '', title: '',
name: this.$t('status.fertilizerTypes.acid'), name: this.$t('status.fertilizerTypes.acid'),
number: '26%', number: '26%',
speed:0,
img: require('../../assets/image/left2-icon1.png') img: require('../../assets/image/left2-icon1.png')
}, },
] ]
@ -216,28 +243,22 @@ export default {
var data=[ var data=[
{ {
name: this.$t('status.fertilizerTypes.a'), name: this.$t('status.fertilizerTypes.a'),
number: '0',
}, { }, {
name: this.$t('status.fertilizerTypes.b'), name: this.$t('status.fertilizerTypes.b'),
number: '0',
}, { }, {
name: this.$t('status.fertilizerTypes.c'), name: this.$t('status.fertilizerTypes.c'),
number: '0',
}, { }, {
name: this.$t('status.fertilizerTypes.d'), name: this.$t('status.fertilizerTypes.d'),
number: '0',
}, { }, {
name: this.$t('status.fertilizerTypes.e'), name: this.$t('status.fertilizerTypes.e'),
number: '0',
}, { }, {
name: this.$t('status.fertilizerTypes.f'), name: this.$t('status.fertilizerTypes.f'),
number: '0',
}, { }, {
name: this.$t('status.fertilizerTypes.g'), name: this.$t('status.fertilizerTypes.g'),
number: '0', }, {
name: this.$t('status.fertilizerTypes.h'),
}, { }, {
name: this.$t('status.fertilizerTypes.acidFertilizer'), name: this.$t('status.fertilizerTypes.acidFertilizer'),
number: '0',
}, },
] ]
return data return data
@ -458,16 +479,23 @@ export default {
} }
}, },
getrightList3() { getrightList3() {
var list = [19, 20, 21, 22, 23, 24, 25, 27] // var num = this.inputData['82']
list.forEach((el, index) => { var num = this.inputData['82']
this.rightList3[index].number = this.inputData[el]
}) var num1 = this.padString(num.toString(2), 8)
var openListNew = []
openListNew = num1.split("")
this.rightList3Show = openListNew.reverse();
}, },
getleft2List() { getleft2List() {
var list = [10, 11, 12, 13, 14, 15, 16, 18] var list = [10, 11, 12, 13, 14, 15, 16,17, 18]
list.forEach((el, index) => { list.forEach((el, index) => {
this.left2List[index].number = this.inputData[el] + '%' this.left2List[index].number = this.inputData[el] + '%'
}) })
var list1 = [19, 20, 21, 22, 23, 24, 25,26, 27]
list1.forEach((el, index) => {
this.left2List[index].speed = this.inputData[el]
})
}, },
countData(data) { countData(data) {
if (data) { if (data) {
@ -485,6 +513,17 @@ export default {
} else { } else {
return 0 return 0
} }
},
getType81(list) {
if(list[0]==1){
return '间隔启动'
}else if(list[1]==1){
return '定时启动'
}else if(list[2]==1){
return '联动启动'
}else if(list[3]==1){
return '手动启动'
}
}, },
getType29(index) { getType29(index) {
if (index == 5) { if (index == 5) {
@ -519,22 +558,15 @@ export default {
} }
} }
this.openType = this.getType29(typeNumber) this.openType = this.getType29(typeNumber)
},
//
getData81() {
var number = this.padString(this.inputData['81'].toString(2), 4)
// var statusIndex = 8 var openListNew = []
// var list=[] openListNew = number.split("")
var stirList = openListNew.reverse();
// for (var j = 0; j < statusIndex; j++) { this.openTypeStir = this.getType81(stirList)
// if (Number(number[number.length - 1 - j])) {
// if (j == 0) {
// list.push('1')
// } else if (j == 1) {
// list.push('0')
// } else {
// list.push(j)
// }
// }
// }
// this.right2Index=list
}, },
// //
getData30() { getData30() {
@ -559,7 +591,7 @@ export default {
var data = { var data = {
"equipmentId": deviceDetail.deviceId, "equipmentId": deviceDetail.deviceId,
"pattern": 0,// //6ph- "pattern": 0,// //6ph-
"regNum": 72 "regNum": 81
} }
var week = [ var week = [
"星期日", "星期日",
@ -575,7 +607,7 @@ export default {
this.inputData = res.data.data; this.inputData = res.data.data;
this.getData30() //30/ this.getData30() //30/
this.getData29()//29 / this.getData29()//29 /
this.getData81()
this.getleft2List()// this.getleft2List()//
this.getrightList3()// this.getrightList3()//
@ -703,17 +735,17 @@ export default {
height: 321px; height: 321px;
display: grid; display: grid;
grid-template-columns: repeat(2, 1fr); grid-template-columns: repeat(2, 1fr);
grid-row-gap: 10px; // grid-row-gap: 5px; //
grid-column-gap: auto; // grid-column-gap: 5px; //
padding: 20px 20px 0; padding: 5px 20px 0;
>div { >div {
display: flex; display: flex;
align-items: center; align-items: center;
.left { .left {
width: 65px; width: 50px;
height: 65px; height: 50px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -722,7 +754,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
span { span {
font-size: 34px; font-size: 30px;
font-family: Oswald; font-family: Oswald;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
@ -741,16 +773,29 @@ export default {
width: 49px; width: 49px;
padding-left: 5px; padding-left: 5px;
} }
.line{
width: 100%;
height: 1px;
background: #34AFF6;
}
.right{
width: calc(100% - 100px);
}
.number { .number {
font-size: 32px; width: 100%;
font-size: 24px;
font-family: Oswald; font-family: Oswald;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
line-height: 26px;
background: linear-gradient(180deg, #34AFF6 0%, #EDFDFF 100%); background: linear-gradient(180deg, #34AFF6 0%, #EDFDFF 100%);
-webkit-background-clip: text; -webkit-background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
span{
font-size: 12px;
font-family: Oswald;
}
} }
} }
} }
@ -772,22 +817,40 @@ export default {
width: 100%; width: 100%;
.view-content { .view-content {
padding: 20px 20px 0; padding: 0 20px 0;
display: grid; display: grid;
grid-template-columns: repeat(4, 1fr); grid-template-columns: repeat(3, 1fr);
grid-row-gap: 30px; // grid-row-gap: 0px; //
grid-column-gap: auto; // grid-column-gap: 10px; //
.grid{
display: flex;
align-items: center;
justify-content: center;
&.active{
>div{ >div{
width: 86px; background: url(../../assets/image/right-view3new2.png) no-repeat center;
height: 117px;
background: url(../../assets/image/right-view3.png) no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
padding-top: 20px;
.name {
background: linear-gradient(0deg, #F9FBFF 0%, #77ff89 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
}
}
>div {
width: 86px;
height: 86px;
background: url(../../assets/image/right-view3new.png) no-repeat center;
background-size: 100% 100%;
// padding-top: 20px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: space-between; justify-content: center;
.name { .name {
font-size: 20px; font-size: 20px;
@ -813,6 +876,8 @@ export default {
} }
} }
} }
}
} }
.right-view2 { .right-view2 {