From 6ac3ebb0a127193dfcf0a53944ee8176da261b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Mon, 22 Sep 2025 12:52:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?9/22=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/page/CO2.vue | 4 ++-- src/views/page/LED.vue | 18 +++++++++--------- src/views/page/air-conditioning.vue | 6 +++--- src/views/page/circulationCan.vue | 2 +- src/views/page/coercionMist.vue | 2 +- src/views/page/electromagneticControl.vue | 2 +- src/views/page/facadeInsulation.vue | 2 +- src/views/page/fan.vue | 2 +- src/views/page/forceOutput.vue | 2 +- src/views/page/formula.vue | 3 ++- src/views/page/heatFan.vue | 6 +++--- src/views/page/insizeSunshade.vue | 2 +- src/views/page/internalInsulation.vue | 2 +- src/views/page/largeScreen.vue | 2 +- src/views/page/largeScreen3.vue | 2 +- src/views/page/outsizeSunshade.vue | 2 +- src/views/page/stir.vue | 2 +- src/views/page/sunroofControl.vue | 2 +- src/views/page/synthesis-con.vue | 2 +- src/views/page/upload-con.vue | 12 ++++++------ src/views/page/upload-soil.vue | 16 ++++++++-------- src/views/page/upload.vue | 4 ++-- src/views/page/wetFan.vue | 10 +++++----- 23 files changed, 54 insertions(+), 53 deletions(-) diff --git a/src/views/page/CO2.vue b/src/views/page/CO2.vue index 143a69c5..32a6abe8 100644 --- a/src/views/page/CO2.vue +++ b/src/views/page/CO2.vue @@ -382,7 +382,7 @@ export default { }, getActive1() { this.actList1 = []; - var num = this.inputData[this.startList[this.indexs - 1]]; + var num = this.inputData[this.startList[this.indexs - 1]]?this.inputData[this.startList[this.indexs - 1]]:0 var num1 = this.padString(num.toString(2), 4); var openListNew = []; @@ -391,7 +391,7 @@ export default { }, getActive2() { this.actList2 = []; - var num = this.inputData[this.startList[this.indexs - 1] + 1]; + var num = this.inputData[this.startList[this.indexs - 1] + 1]?this.inputData[this.startList[this.indexs - 1] + 1]:0 var num1 = this.padString(num.toString(2), 2); var openListNew = []; diff --git a/src/views/page/LED.vue b/src/views/page/LED.vue index 31e0524a..3f2259dc 100644 --- a/src/views/page/LED.vue +++ b/src/views/page/LED.vue @@ -110,17 +110,17 @@ {{$t('LED.lightIntensityLow')}} - Klux{{$t('LED.turnOnLights')}} + {{$t('LED.turnOnLights')}}
{{$t('LED.lightIntensityHigh')}} - Klux{{$t('LED.turnOffLights')}} + {{$t('LED.turnOffLights')}}
-
+
@@ -632,7 +632,7 @@ export default { }, getActive1() { this.actList1 = [] - var num = this.inputData[this.startList[0]] + var num = this.inputData[this.startList[0]]?this.inputData[this.startList[0]]:0 var num1 = this.padString(num.toString(2), 8) var openListNew = [] @@ -641,7 +641,7 @@ export default { }, getActive12() { this.actList12 = [] - var num = this.inputData[this.startList[1]] + var num = this.inputData[this.startList[1]]?this.inputData[this.startList[1]]:0 var num1 = this.padString(num.toString(2), 8) var openListNew = [] @@ -650,7 +650,7 @@ export default { }, getActive13() { this.actList13 = [] - var num = this.inputData[this.startList[2]] + var num = this.inputData[this.startList[2]]?this.inputData[this.startList[2]]:0 var num1 = this.padString(num.toString(2), 8) var openListNew = [] @@ -659,7 +659,7 @@ export default { }, getActive14() { this.actList14 = [] - var num = this.inputData[this.startList[3]] + var num = this.inputData[this.startList[3]]?this.inputData[this.startList[3]]:0 var num1 = this.padString(num.toString(2), 8) var openListNew = [] @@ -668,7 +668,7 @@ export default { }, getActive2() { this.actList2 = [] - var num = this.inputData[21401] + var num = this.inputData[21401]?this.inputData[21401]:0 var num1 = this.padString(num.toString(2), 8) var openListNew = [] @@ -677,7 +677,7 @@ export default { }, getActive3() { this.actList3 = [] - var num = this.inputData[21402] + var num = this.inputData[21402]?this.inputData[21402]:0 var num1 = this.padString(num.toString(2), 9) var openListNew = [] diff --git a/src/views/page/air-conditioning.vue b/src/views/page/air-conditioning.vue index b1f4e64f..cc00ac1e 100644 --- a/src/views/page/air-conditioning.vue +++ b/src/views/page/air-conditioning.vue @@ -724,7 +724,7 @@ var data=[ { label: this.$t('air.modes.auto'), value: 0 }, }, getActive2() { this.actList2 = [] - var num = this.inputData[22063] + var num = this.inputData[22063]?this.inputData[22063]:0 var num1 = this.padString(num.toString(2), 16) var openListNew = [] @@ -733,7 +733,7 @@ var data=[ { label: this.$t('air.modes.auto'), value: 0 }, }, getActive3() { this.actList3 = [] - var num = this.inputData[22064] + var num = this.inputData[22064]?this.inputData[22064]:0 var num1 = this.padString(num.toString(2), 3) var openListNew = [] @@ -845,7 +845,7 @@ var data=[ { label: this.$t('air.modes.auto'), value: 0 }, }, getActive1() { this.actList1 = []; - var num = this.inputData[22057]; + var num = this.inputData[22057]?this.inputData[22057]:0 var num1 = this.padString(num.toString(2), 3); var openListNew = []; diff --git a/src/views/page/circulationCan.vue b/src/views/page/circulationCan.vue index 01d0723d..21232754 100644 --- a/src/views/page/circulationCan.vue +++ b/src/views/page/circulationCan.vue @@ -302,7 +302,7 @@ export default { }, getActive1() { this.actList1 = [] - var num = this.inputData[this.startList[this.indexs - 1] + 1] + var num = this.inputData[this.startList[this.indexs - 1] + 1]?this.inputData[this.startList[this.indexs - 1] + 1]:0 var num1 = this.padString(num.toString(2), 5) var openListNew = [] diff --git a/src/views/page/coercionMist.vue b/src/views/page/coercionMist.vue index ed85274d..8c83ba0b 100644 --- a/src/views/page/coercionMist.vue +++ b/src/views/page/coercionMist.vue @@ -212,7 +212,7 @@ export default { }, getActive1() { this.actList1 = [] - var num = this.inputData[this.startList[this.indexs - 1] + 1] + var num = this.inputData[this.startList[this.indexs - 1] + 1]?this.inputData[this.startList[this.indexs - 1] + 1]:0 var num1 = this.padString(num.toString(2), 2) var openListNew = [] diff --git a/src/views/page/electromagneticControl.vue b/src/views/page/electromagneticControl.vue index 928d1ca4..faf031ab 100644 --- a/src/views/page/electromagneticControl.vue +++ b/src/views/page/electromagneticControl.vue @@ -280,7 +280,7 @@ export default { }, getActive1() { this.actList1 = [] - var num = this.inputData[this.startList[this.indexs - 1] + 2] + var num = this.inputData[this.startList[this.indexs - 1] + 2]?this.inputData[this.startList[this.indexs - 1] + 2]:0 var num1 = this.padString(num.toString(2), 7) var openListNew = [] openListNew = num1.split("") diff --git a/src/views/page/facadeInsulation.vue b/src/views/page/facadeInsulation.vue index 6ed6953d..8efc5d08 100644 --- a/src/views/page/facadeInsulation.vue +++ b/src/views/page/facadeInsulation.vue @@ -201,7 +201,7 @@ export default { }, getActive1() { this.actList1 = [] - var num = this.inputData[this.startList[this.indexs - 1] + 1] + var num = this.inputData[this.startList[this.indexs - 1] + 1]?this.inputData[this.startList[this.indexs - 1] + 1]:0 var num1 = this.padString(num.toString(2), 1) var openListNew = [] diff --git a/src/views/page/fan.vue b/src/views/page/fan.vue index de647dcf..c785ed08 100644 --- a/src/views/page/fan.vue +++ b/src/views/page/fan.vue @@ -277,7 +277,7 @@ export default { }, getAct21601(){ this.actList1=[] - var num = this.inputData['21601'] + var num = this.inputData['21601']? this.inputData['21601']:0 var num1 = this.padString(num.toString(2), 5) var openListNew=[] openListNew = num1.split("") diff --git a/src/views/page/forceOutput.vue b/src/views/page/forceOutput.vue index 0e13ce29..9df60d3c 100644 --- a/src/views/page/forceOutput.vue +++ b/src/views/page/forceOutput.vue @@ -73,7 +73,7 @@ export default { return str.padStart(length, "0"); }, getList(data) { - var num = data; + var num = data?data:0; var num1 = this.padString(num.toString(2), 16); var openListNew = num1.split(""); var list = openListNew.reverse(); diff --git a/src/views/page/formula.vue b/src/views/page/formula.vue index 630d282b..d7c57d02 100644 --- a/src/views/page/formula.vue +++ b/src/views/page/formula.vue @@ -308,7 +308,8 @@ export default { } }, 100); }, - getSeldata3(num) { + getSeldata3(data) { + var num =data?data:0 var number = this.padString(num.toString(2), 16) this.numlist = number.split('') this.numlist.forEach((el, index) => { diff --git a/src/views/page/heatFan.vue b/src/views/page/heatFan.vue index 29bfe0b8..09b3b393 100644 --- a/src/views/page/heatFan.vue +++ b/src/views/page/heatFan.vue @@ -432,7 +432,7 @@ export default { }, getActive1() { this.actList1 = []; - var num = this.inputData[22260]; + var num = this.inputData[22260]?this.inputData[22260]:0 var num1 = this.padString(num.toString(2), 1); var openListNew = []; @@ -441,7 +441,7 @@ export default { }, getActive2() { this.actList2 = [] - var num = this.inputData[22251] + var num = this.inputData[22251]?this.inputData[22251]:0 var num1 = this.padString(num.toString(2), 4) var openListNew = [] @@ -450,7 +450,7 @@ export default { }, getActive3() { this.actList3 = [] - var num = this.inputData[22264] + var num = this.inputData[22264]?this.inputData[22264]:0 var num1 = this.padString(num.toString(2), 3) var openListNew = [] diff --git a/src/views/page/insizeSunshade.vue b/src/views/page/insizeSunshade.vue index 4cf4fc7e..aa6ea0c4 100644 --- a/src/views/page/insizeSunshade.vue +++ b/src/views/page/insizeSunshade.vue @@ -290,7 +290,7 @@ export default { }, getActive1() { this.actList1 = [] - var num = this.inputData[this.startList[this.indexs - 1] + 1] + var num = this.inputData[this.startList[this.indexs - 1] + 1]?this.inputData[this.startList[this.indexs - 1] + 1]:0 var num1 = this.padString(num.toString(2), 5) var openListNew = [] diff --git a/src/views/page/internalInsulation.vue b/src/views/page/internalInsulation.vue index ca605dd2..a35f6b11 100644 --- a/src/views/page/internalInsulation.vue +++ b/src/views/page/internalInsulation.vue @@ -234,7 +234,7 @@ export default { }, getActive1() { this.actList1 = [] - var num = this.inputData[this.startList[this.indexs - 1] + 1] + var num = this.inputData[this.startList[this.indexs - 1] + 1]? this.inputData[this.startList[this.indexs - 1] + 1]:0 var num1 = this.padString(num.toString(2), 3) var openListNew = [] diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue index 09c81555..7726845f 100644 --- a/src/views/page/largeScreen.vue +++ b/src/views/page/largeScreen.vue @@ -1197,7 +1197,7 @@ export default { if (res.data.code == 200) { this.fanStatus.open = res.data.data["1023"]; this.fanStatus.status = []; - var num = res.data.data["1024"]; + var num = res.data.data["1024"]?res.data.data["1024"]:0 var num1 = this.padString(num.toString(2), 5); var openListNew = []; openListNew = num1.split(""); diff --git a/src/views/page/largeScreen3.vue b/src/views/page/largeScreen3.vue index ac160812..e9fb9078 100644 --- a/src/views/page/largeScreen3.vue +++ b/src/views/page/largeScreen3.vue @@ -668,7 +668,7 @@ export default { if (res.data.code == 200) { this.fanStatus.open = res.data.data["1023"]; this.fanStatus.status = []; - var num = res.data.data["1024"]; + var num = res.data.data["1024"]? res.data.data["1024"]:0 var num1 = this.padString(num.toString(2), 5); var openListNew = []; openListNew = num1.split(""); diff --git a/src/views/page/outsizeSunshade.vue b/src/views/page/outsizeSunshade.vue index deb06bbc..2c3b6fa2 100644 --- a/src/views/page/outsizeSunshade.vue +++ b/src/views/page/outsizeSunshade.vue @@ -258,7 +258,7 @@ export default { }, getActive1() { this.actList1 = [] - var num = this.inputData[this.startList[this.indexs - 1] + 1] + var num = this.inputData[this.startList[this.indexs - 1] + 1]?this.inputData[this.startList[this.indexs - 1] + 1]:0 var num1 = this.padString(num.toString(2), 5) var openListNew = [] diff --git a/src/views/page/stir.vue b/src/views/page/stir.vue index bb6ca8ff..499d9997 100644 --- a/src/views/page/stir.vue +++ b/src/views/page/stir.vue @@ -683,7 +683,7 @@ export default { }, getActive1() { this.actList1 = []; - var num = this.inputData["602"]; + var num = this.inputData["602"]?this.inputData["602"]:0 var num1 = this.padString(num.toString(2), 8); var openListNew = []; diff --git a/src/views/page/sunroofControl.vue b/src/views/page/sunroofControl.vue index cd5c325f..93f06d71 100644 --- a/src/views/page/sunroofControl.vue +++ b/src/views/page/sunroofControl.vue @@ -326,7 +326,7 @@ export default { }, getActive1() { this.actList1 = [] - var num = this.inputData[this.startList[this.indexs - 1] + 1] + var num = this.inputData[this.startList[this.indexs - 1] + 1]?this.inputData[this.startList[this.indexs - 1] + 1]:0 var num1 = this.padString(num.toString(2), 6) var openListNew = [] diff --git a/src/views/page/synthesis-con.vue b/src/views/page/synthesis-con.vue index b603ce22..96cf3d8d 100644 --- a/src/views/page/synthesis-con.vue +++ b/src/views/page/synthesis-con.vue @@ -79,7 +79,7 @@ export default { return str.padStart(length, '0'); }, getList(data) { - var num = data + var num = data?data:0 var num1 = this.padString(num.toString(2), 16) var openListNew = num1.split("") var list = openListNew.reverse() diff --git a/src/views/page/upload-con.vue b/src/views/page/upload-con.vue index db245601..dd6d578f 100644 --- a/src/views/page/upload-con.vue +++ b/src/views/page/upload-con.vue @@ -182,7 +182,7 @@ export default { //由于bit0和页面内是相反的 所以要倒着来 getAct1() { this.actList1=[] - var num = this.inputData['21501'] + var num = this.inputData['21501']? this.inputData['21501']:0 var num2 = this.padString(num.toString(2), 16) this.actList1New=num2.split("") this.actList1New.forEach((el,index)=>{ @@ -193,7 +193,7 @@ export default { }, getAct2() { this.actList2=[] - var num = this.inputData['21503'] + var num = this.inputData['21503']?this.inputData['21503']:0 var num2 = this.padString(num.toString(2), 11) this.actList2New=num2.split("") this.actList2New.forEach((el,index)=>{ @@ -204,7 +204,7 @@ export default { }, getAct3() { this.actList3=[] - var num = this.inputData['21502'] + var num = this.inputData['21502']?this.inputData['21502']:0 var num3 = this.padString(num.toString(2), 5) this.actList3New=num3.split("") this.actList3New.forEach((el,index)=>{ @@ -215,7 +215,7 @@ export default { }, getAct4() { this.actList4=[] - var num = this.inputData['21504'] + var num = this.inputData['21504']?this.inputData['21504']:0 var num4 = this.padString(num.toString(2), 16) this.actList4New=num4.split("") this.actList4New.forEach((el,index)=>{ @@ -226,7 +226,7 @@ export default { }, getAct5() { this.actList5=[] - var num = this.inputData['21505'] + var num = this.inputData['21505']?this.inputData['21505']:0 var num5 = this.padString(num.toString(2), 16) this.actList5New=num5.split("") this.actList5New.forEach((el,index)=>{ @@ -237,7 +237,7 @@ export default { }, getAct6() { this.actList6=[] - var num = this.inputData['21506'] + var num = this.inputData['21506']?this.inputData['21506']:0 var num6 = this.padString(num.toString(2), 16) this.actList6New=num6.split("") this.actList6New.forEach((el,index)=>{ diff --git a/src/views/page/upload-soil.vue b/src/views/page/upload-soil.vue index be8f533a..47619e2e 100644 --- a/src/views/page/upload-soil.vue +++ b/src/views/page/upload-soil.vue @@ -204,7 +204,7 @@ export default { //由于bit0和页面内是相反的 所以要倒着来 getAct1() { this.actList1=[] - var num = this.inputData['10001'] + var num = this.inputData['10001']?this.inputData['10001']:0 var num2 = this.padString(num.toString(2), 16) this.actList1New=num2.split("") this.actList1New.forEach((el,index)=>{ @@ -215,7 +215,7 @@ export default { }, getAct2() { this.actList2=[] - var num = this.inputData['10002'] + var num = this.inputData['10002']?this.inputData['10002']:0 var num2 = this.padString(num.toString(2), 3) this.actList2New=num2.split("") this.actList2New.forEach((el,index)=>{ @@ -227,7 +227,7 @@ export default { getActList1() { this.actList3=[] - var num = this.inputData['10003'] + var num = this.inputData['10003']?this.inputData['10003']:0 var num3 = this.padString(num.toString(2), 16) this.actList3New=num3.split("") this.actList3New.forEach((el,index)=>{ @@ -238,7 +238,7 @@ export default { }, getActList2() { this.actList4=[] - var num = this.inputData['10004'] + var num = this.inputData['10004']? this.inputData['10004']:0 var num4 = this.padString(num.toString(2), 16) this.actList4New=num4.split("") this.actList4New.forEach((el,index)=>{ @@ -249,7 +249,7 @@ export default { }, getActList3() { this.actList5=[] - var num = this.inputData['10005'] + var num = this.inputData['10005']?this.inputData['10005']:0 var num5 = this.padString(num.toString(2), 16) this.actList5New=num5.split("") this.actList5New.forEach((el,index)=>{ @@ -260,7 +260,7 @@ export default { }, getActList4() { this.actList6=[] - var num = this.inputData['10006'] + var num = this.inputData['10006']?this.inputData['10006']:0 var num6 = this.padString(num.toString(2), 16) this.actList6New=num6.split("") this.actList6New.forEach((el,index)=>{ @@ -271,7 +271,7 @@ export default { }, getActList5() { this.actList7=[] - var num = this.inputData['10007'] + var num = this.inputData['10007']?this.inputData['10007']:0 var num7 = this.padString(num.toString(2), 16) this.actList7New=num7.split("") this.actList7New.forEach((el,index)=>{ @@ -282,7 +282,7 @@ export default { }, getActList6() { this.actList8=[] - var num = this.inputData['10008'] + var num = this.inputData['10008']?this.inputData['10008']:0 var num8 = this.padString(num.toString(2), 16) this.actList8New=num8.split("") this.actList8New.forEach((el,index)=>{ diff --git a/src/views/page/upload.vue b/src/views/page/upload.vue index 0b1a5649..1035b64d 100644 --- a/src/views/page/upload.vue +++ b/src/views/page/upload.vue @@ -123,7 +123,7 @@ export default { //由于bit0和页面内是相反的 所以要倒着来 getAct1() { this.actList1=[] - var num = this.inputData['500'] + var num = this.inputData['500']?this.inputData['500']:0 var num2 = this.padString(num.toString(2), 16) this.actList1New=num2.split("") this.actList1New.forEach((el,index)=>{ @@ -134,7 +134,7 @@ export default { }, getAct2() { this.actList2=[] - var num = this.inputData['501'] + var num = this.inputData['501']?this.inputData['501']:0 var num2 = this.padString(num.toString(2), 16) this.actList2New=num2.split("") this.actList2New.forEach((el,index)=>{ diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue index 6685e139..d478492e 100644 --- a/src/views/page/wetFan.vue +++ b/src/views/page/wetFan.vue @@ -610,7 +610,7 @@ export default { }, getActive1() { this.actList1 = [] - var num = this.inputData[21951] + var num = this.inputData[21951]?this.inputData[21951]:0 var num1 = this.padString(num.toString(2), 5) var openListNew = [] @@ -619,7 +619,7 @@ export default { }, getActive2() { this.actList2 = [] - var num = this.inputData[21957] + var num = this.inputData[21957]?this.inputData[21957]:0 var num1 = this.padString(num.toString(2), 4) var openListNew = [] @@ -628,7 +628,7 @@ export default { }, getActive3() { this.actList3 = [] - var num = this.inputData[21963] + var num = this.inputData[21963]?this.inputData[21963]:0 var num1 = this.padString(num.toString(2), 5) var openListNew = [] @@ -637,7 +637,7 @@ export default { }, getActive4() { this.actList4 = [] - var num = this.inputData[21975] + var num = this.inputData[21975]?this.inputData[21975]:0 var num1 = this.padString(num.toString(2), 2) var openListNew = [] @@ -646,7 +646,7 @@ export default { }, getActive5() { this.actList5 = [] - var num = this.inputData[21980] + var num = this.inputData[21980]?this.inputData[21980]:0 var num1 = this.padString(num.toString(2), 2) var openListNew = [] -- 2.47.2 From 0ae54e4de769025b698a07e507dd683a3926f28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Mon, 22 Sep 2025 15:18:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?9/22=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/page/irrigateSet-soil.vue | 12 ++++-------- src/views/page/irrigateSet.vue | 13 ++++--------- src/views/page/largeScreen4.vue | 3 ++- src/views/page/sensorSet-con.vue | 8 ++++---- src/views/page/sensorSet-soil.vue | 18 ++++++++++++------ src/views/page/sensorSet.vue | 6 ++++-- src/views/page/status-soil.vue | 22 ++++++++++++++-------- src/views/page/status.vue | 19 +++++++++++++------ src/views/page/stir.vue | 3 ++- src/views/wufang/rollByRoll.vue | 2 +- src/views/wufang/uptake.vue | 2 +- 11 files changed, 61 insertions(+), 47 deletions(-) diff --git a/src/views/page/irrigateSet-soil.vue b/src/views/page/irrigateSet-soil.vue index 534128a5..7d9744be 100644 --- a/src/views/page/irrigateSet-soil.vue +++ b/src/views/page/irrigateSet-soil.vue @@ -781,10 +781,8 @@ export default { return str.padStart(length, "0"); }, getType00() { - var number = this.padString( - this.inputData["1" + (10 + (this.indexs - 1)) + "00"].toString(2), - 3 - ); + var num =this.inputData["1" + (10 + (this.indexs - 1)) + "00"]?this.inputData["1" + (10 + (this.indexs - 1)) + "00"]:0 + var number = this.padString(num.toString(2),3); if (Number(number[0])) { this.topActive = 1; @@ -853,10 +851,8 @@ export default { this.changeBtn("1" + (10 + (this.indexs - 1)) + "62", dataNum); }, getType() { - var number = this.padString( - this.inputData["1" + (10 + (this.indexs - 1)) + "59"].toString(2), - 4 - ); + var num = this.inputData["1" + (10 + (this.indexs - 1)) + "59"]? this.inputData["1" + (10 + (this.indexs - 1)) + "59"]:0 + var number = this.padString(num.toString(2),4); console.log(number); if (Number(number[3])) { this.open1 = true; diff --git a/src/views/page/irrigateSet.vue b/src/views/page/irrigateSet.vue index 59a334ab..6d5d39ef 100644 --- a/src/views/page/irrigateSet.vue +++ b/src/views/page/irrigateSet.vue @@ -1161,10 +1161,8 @@ export default { return str.padStart(length, "0"); }, getType00() { - var number = this.padString( - this.inputData[10 + (this.indexs - 1) + "00"].toString(2), - 3 - ); + var num = this.inputData[10 + (this.indexs - 1) + "00"]?this.inputData[10 + (this.indexs - 1) + "00"]:0 + var number = this.padString(num.toString(2),3); if (Number(number[0])) { this.topActive = 1; @@ -1208,11 +1206,8 @@ export default { this.changeBtn(10 + (this.indexs - 1) + "59", dataNum); }, getType() { - var number = this.padString( - this.inputData[10 + (this.indexs - 1) + "59"].toString(2), - 4 - ); - console.log(number); + var num = this.inputData[10 + (this.indexs - 1) + "59"]?this.inputData[10 + (this.indexs - 1) + "59"]:0 + var number = this.padString(num.toString(2),4); if (Number(number[3])) { this.open1 = true; } else { diff --git a/src/views/page/largeScreen4.vue b/src/views/page/largeScreen4.vue index 454cf7dc..d57084c2 100644 --- a/src/views/page/largeScreen4.vue +++ b/src/views/page/largeScreen4.vue @@ -386,7 +386,8 @@ export default { //进水泵和出水泵状态 getData30() { - var number = this.padString(this.inputData['30'].toString(2), 2) + var num =this.inputData['30']?this.inputData['30']:0 + var number = this.padString(num.toString(2), 2) this.left1Act=number }, dataInit() { diff --git a/src/views/page/sensorSet-con.vue b/src/views/page/sensorSet-con.vue index 2919a350..e911c8c3 100644 --- a/src/views/page/sensorSet-con.vue +++ b/src/views/page/sensorSet-con.vue @@ -499,7 +499,7 @@ return num this.openList1 = [] this.openList2 = [] this.openList3 = [] - var num1 = this.inputData['20901'] + var num1 = this.inputData['20901']?this.inputData['20901']:0 var num11 = this.padString(num1.toString(2), 16) var openList1New openList1New = num11.split("") @@ -507,7 +507,7 @@ return num this.openList1.push(openList1New[openList1New.length - index - 1]) }) - var num2 = this.inputData['20902'] + var num2 = this.inputData['20902']?this.inputData['20902']:0 var num22 = this.padString(num2.toString(2), 16) var openList2New openList2New = num22.split("") @@ -515,7 +515,7 @@ return num this.openList2.push(openList2New[openList2New.length - index - 1]) }) - var num3 = this.inputData['20903'] + var num3 = this.inputData['20903']?this.inputData['20903']:0 var num33 = this.padString(num3.toString(2), 16) var openList3New openList3New = num33.split("") @@ -524,7 +524,7 @@ return num }) this.openTypeList = [] - var num4 = this.inputData['20900'] + var num4 = this.inputData['20900']?this.inputData['20900']:0 var num44 = this.padString(num4.toString(2), 8) var openList4New openList4New = num44.split("") diff --git a/src/views/page/sensorSet-soil.vue b/src/views/page/sensorSet-soil.vue index 2abe2249..97f6bb77 100644 --- a/src/views/page/sensorSet-soil.vue +++ b/src/views/page/sensorSet-soil.vue @@ -370,12 +370,18 @@ export default { var inputData = this.inputData // 96个传感器 this.openList = [] - this.list1 = this.padString(inputData['10200'].toString(2), 16) - this.list2 = this.padString(inputData['10201'].toString(2), 16) - this.list3 = this.padString(inputData['10202'].toString(2), 16) - this.list4 = this.padString(inputData['10203'].toString(2), 16) - this.list5 = this.padString(inputData['10204'].toString(2), 16) - this.list6 = this.padString(inputData['10205'].toString(2), 16) + var num1=inputData['10200']?inputData['10200']:0 + this.list1 = this.padString(num1.toString(2), 16) + var num2=inputData['10201']?inputData['10201']:0 + this.list2 = this.padString(num2.toString(2), 16) + var num3=inputData['10202']?inputData['10202']:0 + this.list3 = this.padString(num3.toString(2), 16) + var num4=inputData['10203']?inputData['10203']:0 + this.list4 = this.padString(num4.toString(2), 16) + var num5=inputData['10204']?inputData['10204']:0 + this.list5 = this.padString(num5.toString(2), 16) + var num6=inputData['10205']?inputData['10205']:0 + this.list6 = this.padString(num6.toString(2), 16) var number = 16 for (var i = 0; i < number; i++) { if (Number(this.list1[this.list1.length - 1 - i])) { diff --git a/src/views/page/sensorSet.vue b/src/views/page/sensorSet.vue index 64a072b5..565e24d3 100644 --- a/src/views/page/sensorSet.vue +++ b/src/views/page/sensorSet.vue @@ -258,7 +258,8 @@ return num }, changeOpen() { var inputData = this.inputData - var list1 = this.padString(inputData['272'].toString(2), 6) + var num =inputData['272']?inputData['272']:0 + var list1 = this.padString(num.toString(2), 6) var listData = list1.split('') if (Number(listData[listData.length - 1 - this.active])==1) { @@ -280,7 +281,8 @@ return num }, getData272() { var inputData = this.inputData - var list1 = this.padString(inputData['272'].toString(2), 6) + var num =inputData['272']?inputData['272']:0 + var list1 = this.padString(num.toString(2), 6) var number = 6 this.openList = [] diff --git a/src/views/page/status-soil.vue b/src/views/page/status-soil.vue index a7456725..6b27e90b 100644 --- a/src/views/page/status-soil.vue +++ b/src/views/page/status-soil.vue @@ -177,7 +177,8 @@ export default { }, //什么方式启动的灌溉 getData29() { - var number = this.padString(this.inputData['3011'].toString(2), 14) + var num =this.inputData['3011']?this.inputData['3011']:0 + var number = this.padString(num.toString(2), 14) var index = 6 var typeNumber = -1 for (var i = 0; i < index; i++) { @@ -202,7 +203,6 @@ export default { } } this.right2Index = list - console.log(this.right2Index); }, padString(str, length) { @@ -219,12 +219,18 @@ export default { // 96个电磁阀 this.centerBottom = [] var inputData = this.inputData - var list1 = this.padString(inputData['3016'].toString(2), 16) - var list2 = this.padString(inputData['3017'].toString(2), 16) - var list3 = this.padString(inputData['3018'].toString(2), 16) - var list4 = this.padString(inputData['3019'].toString(2), 16) - var list5 = this.padString(inputData['3020'].toString(2), 16) - var list6 = this.padString(inputData['3021'].toString(2), 16) + var num1=inputData['3016']?inputData['3016']:0 + var list1 = this.padString(num1.toString(2), 16) + var num2=inputData['3017']?inputData['3017']:0 + var list2 = this.padString(num2.toString(2), 16) + var num3=inputData['3017']?inputData['3017']:0 + var list3 = this.padString(num3.toString(2), 16) + var num4=inputData['3019']?inputData['3019']:0 + var list4 = this.padString(num4.toString(2), 16) + var num5=inputData['3020']?inputData['3020']:0 + var list5 = this.padString(num5.toString(2), 16) + var num6=inputData['3021']?inputData['3021']:0 + var list6 = this.padString(num6.toString(2), 16) var number = 16 for (var i = 0; i < number; i++) { if (Number(list1[list1.length - 1 - i])) { diff --git a/src/views/page/status.vue b/src/views/page/status.vue index c88b033a..8979c527 100644 --- a/src/views/page/status.vue +++ b/src/views/page/status.vue @@ -464,10 +464,15 @@ export default { getcenterBottom() { this.centerBottom = [] var inputData = this.inputData - var list1 = this.padString(inputData['32'].toString(2), 16) - var list2 = this.padString(inputData['33'].toString(2), 16) - var list3 = this.padString(inputData['34'].toString(2), 16) - var list4 = this.padString(inputData['35'].toString(2), 16) +var num1 =inputData['32']?inputData['32']:0 + var list1 = this.padString(num1.toString(2), 16) +var num2 =inputData['33']?inputData['33']:0 + var list2 = this.padString(num2.toString(2), 16) +var num3 =inputData['34']?inputData['34']:0 + var list3 = this.padString(num3.toString(2), 16) +var num4 =inputData['35']?inputData['35']:0 + var list4 = this.padString(num4.toString(2), 16) + var number = 16 for (var i = 0; i < number; i++) { if (Number(list1[list1.length - 1 - i])) { @@ -558,7 +563,8 @@ export default { }, //什么方式启动的灌溉 getData29() { - var number = this.padString(this.inputData['29'].toString(2), 14) + var num =this.inputData['29']?this.inputData['29']:0 + var number = this.padString(num.toString(2), 14) var openListNew = [] openListNew = number.split("") @@ -585,7 +591,8 @@ export default { }, //进水泵和出水泵状态 getData30() { - var number = this.padString(this.inputData['30'].toString(2), 2) + var num =this.inputData['30']?this.inputData['30']:0 + var number = this.padString(num.toString(2), 2) this.left1Act=number // if (Number(number[0])) { // this.left1Act = 1 diff --git a/src/views/page/stir.vue b/src/views/page/stir.vue index 499d9997..e376d01d 100644 --- a/src/views/page/stir.vue +++ b/src/views/page/stir.vue @@ -719,7 +719,8 @@ export default { this.changeBtn("600", dataNum); }, getType00() { - var number = this.padString(this.inputData["600"].toString(2), 3); + var num =this.inputData["600"]?this.inputData["600"]:0 + var number = this.padString(num.toString(2), 3); console.log(number); var openListNew = []; openListNew = number.split(""); diff --git a/src/views/wufang/rollByRoll.vue b/src/views/wufang/rollByRoll.vue index d82c16f4..edd0d7ca 100644 --- a/src/views/wufang/rollByRoll.vue +++ b/src/views/wufang/rollByRoll.vue @@ -325,7 +325,7 @@ export default { } }, get21549() { - var num1 = this.inputData["21549"]; + var num1 = this.inputData["21549"]?this.inputData["21549"]:0 var num11 = this.padString(num1.toString(2), 4); var openList1New; openList1New = num11.split(""); diff --git a/src/views/wufang/uptake.vue b/src/views/wufang/uptake.vue index 29c53b80..b796835b 100644 --- a/src/views/wufang/uptake.vue +++ b/src/views/wufang/uptake.vue @@ -270,7 +270,7 @@ export default { this.changeBtn("21531", dataNum); }, get21531() { - var num1 = this.inputData["21531"]; + var num1 = this.inputData["21531"]?this.inputData["21531"]:0 var num11 = this.padString(num1.toString(2), 4); var openList1New; openList1New = num11.split(""); -- 2.47.2 From 825f34d4726311f5cea6c1593cb55a2a64fc49ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Tue, 23 Sep 2025 14:20:37 +0800 Subject: [PATCH 3/3] 1 --- src/views/page/irrigateSet.vue | 25 +++++++++++++------------ src/views/page/wetFan.vue | 12 ++++++------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/views/page/irrigateSet.vue b/src/views/page/irrigateSet.vue index 6d5d39ef..5e0d76ed 100644 --- a/src/views/page/irrigateSet.vue +++ b/src/views/page/irrigateSet.vue @@ -219,7 +219,7 @@ 轮模式启用
-->
-
+
{{ $t("irrigateSet.activateFollowValve") }}
- +
{{ @@ -464,9 +464,9 @@
- +
- +
{{ @@ -630,9 +630,9 @@
- + - +
{{ @@ -745,9 +745,9 @@
- + - +
{{ @@ -834,9 +834,9 @@
- + - +
{{ @@ -1003,7 +1003,7 @@
- +