diff --git a/src/assets/image/right-view3new.png b/src/assets/image/right-view3new.png
new file mode 100644
index 00000000..ab4cb3db
Binary files /dev/null and b/src/assets/image/right-view3new.png differ
diff --git a/src/assets/image/right-view3new2.png b/src/assets/image/right-view3new2.png
new file mode 100644
index 00000000..d9e3846e
Binary files /dev/null and b/src/assets/image/right-view3new2.png differ
diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js
index 38bf9506..1958c71a 100644
--- a/src/i18n/lang/en.js
+++ b/src/i18n/lang/en.js
@@ -1181,6 +1181,7 @@ module.exports = {
"e": "E",
"f": "F",
"g": "G",
+ "h": "H",
"acid": "Acid",
"acidFertilizer": "Acid"
},
diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js
index a496d75f..14cbf411 100644
--- a/src/i18n/lang/zh.js
+++ b/src/i18n/lang/zh.js
@@ -1179,7 +1179,7 @@ module.exports = {
"executingGroup": "执行灌溉组号",
"fertilizerPump": "配肥泵",
- "fertilizerIntensity": "配肥强度",
+ "fertilizerIntensity": "配肥",
"targetPH": "目标PH",
"measuredPH": "实测PH",
"measuredEC": "实测EC",
@@ -1191,7 +1191,7 @@ module.exports = {
"value": "数值",
"adValue": "AD值",
- "fertilizationSpeed": "配肥速度",
+ "fertilizationSpeed": "搅拌",
"fertilizerTypes": {
"a": "A肥",
"b": "B肥",
@@ -1200,6 +1200,7 @@ module.exports = {
"e": "E肥",
"f": "F肥",
"g": "G肥",
+ "h": "H肥",
"acid": "酸",
"acidFertilizer": "酸肥"
},
diff --git a/src/views/page/status.vue b/src/views/page/status.vue
index 3db45080..b2a5ae6c 100644
--- a/src/views/page/status.vue
+++ b/src/views/page/status.vue
@@ -33,6 +33,12 @@
{{$t('status.fertilizationSpeed')}} (L/h)
-
+
+
{{ item.name }}
-
{{ item.number }}
+
@@ -142,8 +153,10 @@ export default {
pageTimer: null,
left1Act: [0,0],
openType: '',
+ openTypeStir:'',
centerAct: 0,
right2Index: [],
+ rightList3Show:[],
inputData: [],
deviceDetail: null,
centerBottom: [],
@@ -172,41 +185,55 @@ export default {
title: 'A',
name: this.$t('status.fertilizerTypes.a'),
number: '26%',
+ speed:0,
img: ''
}, {
title: 'B',
name: this.$t('status.fertilizerTypes.b'),
number: '26%',
+ speed:0,
img: ''
}, {
title: 'C',
name: this.$t('status.fertilizerTypes.c'),
number: '26%',
+ speed:0,
img: ''
}, {
title: 'D',
name: this.$t('status.fertilizerTypes.d'),
number: '26%',
+ speed:0,
img: ''
}, {
title: 'E',
name: this.$t('status.fertilizerTypes.e'),
number: '26%',
+ speed:0,
img: ''
}, {
title: 'F',
name: this.$t('status.fertilizerTypes.f'),
number: '26%',
+ speed:0,
img: ''
}, {
title: 'G',
name: this.$t('status.fertilizerTypes.g'),
number: '26%',
+ speed:0,
img: ''
}, {
+ title: 'H',
+ name: this.$t('status.fertilizerTypes.h'),
+ number: '26%',
+ speed:0,
+ img: ''
+ },{
title: '',
name: this.$t('status.fertilizerTypes.acid'),
number: '26%',
+ speed:0,
img: require('../../assets/image/left2-icon1.png')
},
]
@@ -216,28 +243,22 @@ export default {
var data=[
{
name: this.$t('status.fertilizerTypes.a'),
- number: '0',
}, {
name: this.$t('status.fertilizerTypes.b'),
- number: '0',
}, {
name: this.$t('status.fertilizerTypes.c'),
- number: '0',
}, {
name: this.$t('status.fertilizerTypes.d'),
- number: '0',
}, {
name: this.$t('status.fertilizerTypes.e'),
- number: '0',
}, {
name: this.$t('status.fertilizerTypes.f'),
- number: '0',
}, {
name: this.$t('status.fertilizerTypes.g'),
- number: '0',
+ }, {
+ name: this.$t('status.fertilizerTypes.h'),
}, {
name: this.$t('status.fertilizerTypes.acidFertilizer'),
- number: '0',
},
]
return data
@@ -458,16 +479,23 @@ export default {
}
},
getrightList3() {
- var list = [19, 20, 21, 22, 23, 24, 25, 27]
- list.forEach((el, index) => {
- this.rightList3[index].number = this.inputData[el]
- })
+ // var num = this.inputData['82']
+ var num = this.inputData['82']
+
+ var num1 = this.padString(num.toString(2), 8)
+ var openListNew = []
+ openListNew = num1.split("")
+ this.rightList3Show = openListNew.reverse();
},
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) => {
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) {
if (data) {
@@ -485,6 +513,17 @@ export default {
} else {
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) {
if (index == 5) {
@@ -519,22 +558,15 @@ export default {
}
}
this.openType = this.getType29(typeNumber)
+ },
+ //什么方式启动的搅拌
+ getData81() {
+ var number = this.padString(this.inputData['81'].toString(2), 4)
- // var statusIndex = 8
- // var list=[]
-
- // for (var j = 0; j < statusIndex; j++) {
- // 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
+ var openListNew = []
+ openListNew = number.split("")
+ var stirList = openListNew.reverse();
+ this.openTypeStir = this.getType81(stirList)
},
//进水泵和出水泵状态
getData30() {
@@ -559,7 +591,7 @@ export default {
var data = {
"equipmentId": deviceDetail.deviceId,
"pattern": 0,//需要根据文档填写 //6目标ph-数值
- "regNum": 72
+ "regNum": 81
}
var week = [
"星期日",
@@ -575,7 +607,7 @@ export default {
this.inputData = res.data.data;
this.getData30() //数据30/进水出水泵
this.getData29()//数据29 启动方式/信号
-
+ this.getData81()
this.getleft2List()//获取左下角数据
this.getrightList3()//获取又下角数据
@@ -703,17 +735,17 @@ export default {
height: 321px;
display: grid;
grid-template-columns: repeat(2, 1fr);
- grid-row-gap: 10px; //纵向间隔
- grid-column-gap: auto; //横向间隔
- padding: 20px 20px 0;
+ grid-row-gap: 5px; //纵向间隔
+ grid-column-gap: 5px; //横向间隔
+ padding: 5px 20px 0;
>div {
display: flex;
align-items: center;
.left {
- width: 65px;
- height: 65px;
+ width: 50px;
+ height: 50px;
display: flex;
align-items: center;
justify-content: center;
@@ -722,7 +754,7 @@ export default {
background-size: 100% 100%;
span {
- font-size: 34px;
+ font-size: 30px;
font-family: Oswald;
font-weight: 500;
color: #FFFFFF;
@@ -741,16 +773,29 @@ export default {
width: 49px;
padding-left: 5px;
}
+ .line{
+ width: 100%;
+ height: 1px;
+ background: #34AFF6;
+ }
+ .right{
+width: calc(100% - 100px);
+ }
.number {
- font-size: 32px;
+ width: 100%;
+ font-size: 24px;
font-family: Oswald;
font-weight: 500;
color: #FFFFFF;
-
+ line-height: 26px;
background: linear-gradient(180deg, #34AFF6 0%, #EDFDFF 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
+ span{
+ font-size: 12px;
+ font-family: Oswald;
+ }
}
}
}
@@ -772,23 +817,41 @@ export default {
width: 100%;
.view-content {
- padding: 20px 20px 0;
+ padding: 0 20px 0;
display: grid;
- grid-template-columns: repeat(4, 1fr);
- grid-row-gap: 30px; //纵向间隔
- grid-column-gap: auto; //横向间隔
-
- >div {
- width: 86px;
- height: 117px;
- background: url(../../assets/image/right-view3.png) no-repeat center;
+ grid-template-columns: repeat(3, 1fr);
+ grid-row-gap: 0px; //纵向间隔
+ grid-column-gap: 10px; //横向间隔
+ .grid{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ &.active{
+
+ >div{
+ background: url(../../assets/image/right-view3new2.png) no-repeat center;
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;
flex-direction: column;
align-items: center;
- justify-content: space-between;
-
+ justify-content: center;
+
.name {
font-size: 20px;
font-family: Alibaba PuHuiTi;
@@ -812,6 +875,8 @@ export default {
color: #FFFFFF;
}
}
+ }
+
}
}