|
@@ -91,7 +91,10 @@
|
|
|
</a-col>
|
|
|
<a-col :span="4">
|
|
|
<a-form-item>
|
|
|
- <a-button type="primary" @click="searchWater">查询</a-button>
|
|
|
+ <a-space>
|
|
|
+ <a-button type="primary" @click="searchWater">查询</a-button>
|
|
|
+ <a-button @click="searchFormState.pigpenId = ''">重置</a-button>
|
|
|
+ </a-space>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
@@ -167,7 +170,10 @@
|
|
|
</a-col>
|
|
|
<a-col :span="4">
|
|
|
<a-form-item>
|
|
|
- <a-button type="primary" @click="searchEle">查询</a-button>
|
|
|
+ <a-space>
|
|
|
+ <a-button type="primary" @click="searchEle">查询</a-button>
|
|
|
+ <a-button @click="searchFormEle.pigpenId = ''">重置</a-button>
|
|
|
+ </a-space>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
@@ -261,6 +267,9 @@
|
|
|
return
|
|
|
} else {
|
|
|
activeWater.value = val
|
|
|
+ if(activeWater.value < 3) {
|
|
|
+ date.value = []
|
|
|
+ }
|
|
|
searchWater()
|
|
|
}
|
|
|
}
|
|
@@ -269,6 +278,9 @@
|
|
|
return
|
|
|
} else {
|
|
|
activeEle.value = val
|
|
|
+ if(activeEle.value < 3) {
|
|
|
+ time.value = []
|
|
|
+ }
|
|
|
searchEle()
|
|
|
}
|
|
|
}
|
|
@@ -309,7 +321,7 @@
|
|
|
waterData.value.name = res.location
|
|
|
if (res.list.length > 0) {
|
|
|
res.list.forEach((item) => {
|
|
|
- if (active.value === 0) {
|
|
|
+ if (activeWater.value == 0) {
|
|
|
item.time = dayjs(item.createTime).format('HH:mm')
|
|
|
} else {
|
|
|
item.time = dayjs(item.createTime).format('MM-DD')
|
|
@@ -331,7 +343,7 @@
|
|
|
eleData.value.name = res.location
|
|
|
if (res.list.length > 0) {
|
|
|
res.list.forEach((item) => {
|
|
|
- if (active.value === 0) {
|
|
|
+ if (activeEle.value == 0) {
|
|
|
item.time = dayjs(item.createTime).format('HH:mm')
|
|
|
} else {
|
|
|
item.time = dayjs(item.createTime).format('MM-DD')
|