From 2cd372514154f6e1f5ae67b93fe0b7d1d22fd2c1 Mon Sep 17 00:00:00 2001 From: sunmeng <1162067978@qq.com> Date: Mon, 26 Aug 2024 16:47:07 +0800 Subject: [PATCH] 1 --- src/views/page/intrinsicParameter-soil.vue | 34 +++--- src/views/page/irrigateSet-soil.vue | 2 +- src/views/page/realTime.vue | 4 +- src/views/page/sensorSet-soil.vue | 10 +- src/views/page/upload-soil.vue | 117 ++++++++++++++++++++- 5 files changed, 144 insertions(+), 23 deletions(-) diff --git a/src/views/page/intrinsicParameter-soil.vue b/src/views/page/intrinsicParameter-soil.vue index 8b7d862..d72d2ae 100644 --- a/src/views/page/intrinsicParameter-soil.vue +++ b/src/views/page/intrinsicParameter-soil.vue @@ -74,23 +74,6 @@ export default { sensorType: '', typeList1: [ // { label: '平均1#土壤湿度', value: 0 }, - { label: '1#土壤湿度', value: 1 }, - { label: '2#土壤湿度', value: 2 }, - { label: '3#土壤湿度', value: 3 }, - { label: '4#土壤湿度', value: 4 }, - { label: '5#土壤湿度', value: 5 }, - { label: '6#土壤湿度', value: 6 }, - { label: '7#土壤湿度', value: 7 }, - { label: '8#土壤湿度', value: 8 }, - { label: '9#土壤湿度', value: 9 }, - { label: '10#土壤湿度', value: 10 }, - { label: '11#土壤湿度', value: 11 }, - { label: '12#土壤湿度', value: 12 }, - { label: '13#土壤湿度', value: 13 }, - { label: '14#土壤湿度', value: 14 },], - list1:40, - typeList2: [ - // { label: '平均1#土壤湿度', value: 0 }, { label: '1#土壤温度', value: 1 }, { label: '2#土壤温度', value: 2 }, { label: '3#土壤温度', value: 3 }, @@ -105,6 +88,23 @@ export default { { label: '12#土壤温度', value: 12 }, { label: '13#土壤温度', value: 13 }, { label: '14#土壤温度', value: 14 },], + list1:40, + typeList2: [ + // { label: '平均1#土壤湿度', value: 0 }, + { label: '1#土壤湿度', value: 1 }, + { label: '2#土壤湿度', value: 2 }, + { label: '3#土壤湿度', value: 3 }, + { label: '4#土壤湿度', value: 4 }, + { label: '5#土壤湿度', value: 5 }, + { label: '6#土壤湿度', value: 6 }, + { label: '7#土壤湿度', value: 7 }, + { label: '8#土壤湿度', value: 8 }, + { label: '9#土壤湿度', value: 9 }, + { label: '10#土壤湿度', value: 10 }, + { label: '11#土壤湿度', value: 11 }, + { label: '12#土壤湿度', value: 12 }, + { label: '13#土壤湿度', value: 13 }, + { label: '14#土壤湿度', value: 14 },], list2:40, typeList3: [ { label: '加热模式', value: 1 }, diff --git a/src/views/page/irrigateSet-soil.vue b/src/views/page/irrigateSet-soil.vue index b43eab8..964291f 100644 --- a/src/views/page/irrigateSet-soil.vue +++ b/src/views/page/irrigateSet-soil.vue @@ -825,7 +825,7 @@ export default { this.inputData = res.data.data; // this.getType(); // this.getType00(); - this.get53data(this.inputData['1' + (10 + (this.indexs - 1)) + "53"]); + this.get53data(this.inputData['1' + (10 + (this.indexs - 1)) + "51"]); this.inputData['1' + (10 + (indexs - 1)) + '01'] = this.countData10(this.inputData['1' + (10 + (indexs - 1)) + '01']) this.inputData['1' + (10 + (indexs - 1)) + '06'] = this.countData10(this.inputData['1' + (10 + (indexs - 1)) + '06']) this.inputData['1' + (10 + (indexs - 1)) + '17'] = this.countData10(this.inputData['1' + (10 + (indexs - 1)) + '17']) diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index 0f714a0..3404ed9 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -27,9 +27,9 @@ -