Browse Source

修改 bug

xsh 1 year ago
parent
commit
31265849e6

+ 11 - 4
src/views/biz/ai/attention/index.vue

@@ -13,10 +13,13 @@
 					</a-form-item>
 				</a-col>
 				<a-col :span="4">
-					<a-button type="primary" @click="table.refresh(true)">
-						<template #icon><SearchOutlined /></template>
-						查询
-					</a-button>
+					<a-space>
+						<a-button type="primary" @click="table.refresh(true)">
+							<template #icon><SearchOutlined /></template>
+							查询
+						</a-button>
+						<a-button @click="reset">重置</a-button>
+					</a-space>
 				</a-col>
 			</a-row>
 		</a-form>
@@ -65,6 +68,10 @@
 	import bizAiPollingApi from "@/api/biz/ai/bizAiPollingApi";
 	import {message} from "ant-design-vue";
 
+	const reset = () => {
+		searchFormRef.value.resetFields()
+		table.value.refresh(true)
+	}
 	const table = ref()
 	const formRef = ref()
 	const giveRef = ref()

+ 13 - 4
src/views/biz/ai/device/index.vue

@@ -54,10 +54,13 @@
 					</a-form-item>
 				</a-col>
 				<a-col :span="4">
-					<a-button type="primary" @click="table.refresh(true)">
-						<template #icon><SearchOutlined /></template>
-						查询
-					</a-button>
+					<a-space>
+						<a-button type="primary" @click="table.refresh(true)">
+							<template #icon><SearchOutlined /></template>
+							查询
+						</a-button>
+						<a-button @click="reset">重置</a-button>
+					</a-space>
 				</a-col>
 			</a-row>
 		</a-form>
@@ -130,6 +133,12 @@
 			treeData.value = res
 		})
 	}
+
+	const reset = () => {
+		searchFormRef.value.resetFields()
+		table.value.refresh(true)
+	}
+
 	const table = ref()
 	const formRef = ref()
 	const giveRef = ref()

+ 6 - 2
src/views/biz/ai/polling/components/car.vue

@@ -33,7 +33,10 @@
 				</a-col>
 				<a-col :span="4">
 					<a-form-item>
-						<a-button type="primary" @click="table.refresh(true)">查询</a-button>
+						<a-space>
+							<a-button type="primary" @click="table.refresh(true)">查询</a-button>
+							<a-button @click="reset">重置</a-button>
+						</a-space>
 					</a-form-item>
 				</a-col>
 			</a-row>
@@ -78,7 +81,7 @@
 					<a-divider type="vertical"/>
 					<a @click="formRef.onOpen(record, searchFormState)">纠错</a>
 					<a-divider type="vertical"/>
-					<a-popconfirm title="删除这个员工吗?" @confirm="deleteCar(record)">
+					<a-popconfirm title="确定删除这条数据吗?" @confirm="deleteCar(record)">
 						<a-button type="link" danger size="small">删除</a-button>
 					</a-popconfirm>
 				</template>
@@ -180,6 +183,7 @@
 
 	const reset = () => {
 		searchFormRef.value.resetFields()
+		date.value = []
 		table.value.refresh(true)
 	}
 

+ 6 - 2
src/views/biz/ai/polling/components/dirty.vue

@@ -19,7 +19,10 @@
 				</a-col>
 				<a-col :span="4">
 					<a-form-item>
-						<a-button type="primary" @click="table.refresh(true)">查询</a-button>
+						<a-space>
+							<a-button type="primary" @click="table.refresh(true)">查询</a-button>
+							<a-button @click="reset">重置</a-button>
+						</a-space>
 					</a-form-item>
 				</a-col>
 			</a-row>
@@ -62,7 +65,7 @@
 						<a-button class="a_div" type="link" danger size="small" @click="follow(record, 0)">取消关注</a-button>
 					</template>
 					<a-divider type="vertical"/>
-					<a-popconfirm title="删除这条数据吗?" @confirm="deleteDirty(record)">
+					<a-popconfirm title="确定删除这条数据吗?" @confirm="deleteDirty(record)">
 						<a-button type="link" danger size="small">删除</a-button>
 					</a-popconfirm>
 				</template>
@@ -145,6 +148,7 @@
 
 	const reset = () => {
 		searchFormRef.value.resetFields()
+		date.value = []
 		table.value.refresh(true)
 	}
 

+ 5 - 2
src/views/biz/ai/polling/components/foreign.vue

@@ -9,7 +9,10 @@
 				</a-col>
 				<a-col :span="4">
 					<a-form-item>
-						<a-button type="primary" @click="table.refresh(true)">查询</a-button>
+						<a-space>
+							<a-button type="primary" @click="table.refresh(true)">查询</a-button>
+							<a-button @click="date = []">重置</a-button>
+						</a-space>
 					</a-form-item>
 				</a-col>
 			</a-row>
@@ -55,7 +58,7 @@
 					<a-divider type="vertical"/>
 					<a @click="formRef.onOpen(record, searchFormState)">纠错</a>
 					<a-divider type="vertical"/>
-					<a-popconfirm title="删除这个员工吗?" @confirm="deleteForeign(record)">
+					<a-popconfirm title="确定删除这条数据吗?" @confirm="deleteForeign(record)">
 						<a-button type="link" danger size="small">删除</a-button>
 					</a-popconfirm>
 				</template>

+ 11 - 6
src/views/biz/ai/polling/components/person.vue

@@ -34,7 +34,10 @@
 				</a-col>
 				<a-col :span="4">
 					<a-form-item>
-						<a-button type="primary" @click="table.refresh(true)">查询</a-button>
+						<a-space>
+							<a-button type="primary" @click="table.refresh(true)">查询</a-button>
+							<a-button @click="reset">重置</a-button>
+						</a-space>
 					</a-form-item>
 				</a-col>
 			</a-row>
@@ -79,7 +82,7 @@
 					<a-divider type="vertical"/>
 					<a @click="formRef.onOpen(record, searchFormState)">纠错</a>
 					<a-divider type="vertical"/>
-					<a-popconfirm title="删除这个员工吗?" @confirm="deletePerson(record)">
+					<a-popconfirm title="确定删除这条数据吗?" @confirm="deletePerson(record)">
 						<a-button type="link" danger size="small">删除</a-button>
 					</a-popconfirm>
 				</template>
@@ -99,6 +102,12 @@
 	const searchFormState = ref({})
 	const date = ref([])
 
+	const reset = () => {
+		searchFormRef.value.resetFields()
+		date.value = []
+		table.value.refresh(true)
+	}
+
 	const formRef = ref()
 	const table = ref()
 	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
@@ -179,10 +188,6 @@
 		}
 	}
 
-	const reset = () => {
-		searchFormRef.value.resetFields()
-		table.value.refresh(true)
-	}
 
 	const loadData = async (parameter) => {
 		let params = {}

+ 1 - 1
src/views/biz/config/index.vue

@@ -42,7 +42,7 @@
 						<template v-if="column.dataIndex === 'action'">
 							<a v-if="hasPerm('bizHouseEdit')" @click="formRef.onOpen(record, searchFormState)">编辑</a>
 							<a-divider type="vertical" v-if="hasPerm(['bizHouseEdit', 'bizHouseDelete'], 'and')" />
-							<a-popconfirm title="删除此栋舍吗?" @confirm="deleteConfig(record)">
+							<a-popconfirm title="确定删除吗?" @confirm="deleteConfig(record)">
 								<a-button type="link" v-if="hasPerm('bizHouseDelete')" danger size="small">删除</a-button>
 							</a-popconfirm>
 						</template>

+ 14 - 4
src/views/biz/device/index.vue

@@ -53,10 +53,14 @@
 					</a-form-item>
 				</a-col>
 				<a-col :span="4">
-					<a-button type="primary" @click="table.refresh(true)">
-						<template #icon><SearchOutlined /></template>
-						查询
-					</a-button>
+					<a-space>
+						<a-button type="primary" @click="table.refresh(true)">
+							<template #icon><SearchOutlined /></template>
+							查询
+						</a-button>
+						<a-button @click="reset">重置</a-button>
+					</a-space>
+
 				</a-col>
 			</a-row>
 		</a-form>
@@ -129,6 +133,12 @@
 			treeData.value = res
 		})
 	}
+
+	const reset = () => {
+		searchFormRef.value.resetFields()
+		table.value.refresh(true)
+	}
+
 	const table = ref()
 	const formRef = ref()
 	const giveRef = ref()

+ 16 - 4
src/views/biz/energy/count/index.vue

@@ -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')

+ 11 - 4
src/views/biz/energy/device/index.vue

@@ -54,10 +54,13 @@
 					</a-form-item>
 				</a-col>
 				<a-col :span="4">
-					<a-button type="primary" @click="table.refresh(true)">
-						<template #icon><SearchOutlined /></template>
-						查询
-					</a-button>
+					<a-space>
+						<a-button type="primary" @click="table.refresh(true)">
+							<template #icon><SearchOutlined /></template>
+							查询
+						</a-button>
+						<a-button @click="reset">重置</a-button>
+					</a-space>
 				</a-col>
 			</a-row>
 		</a-form>
@@ -130,6 +133,10 @@
 			treeData.value = res
 		})
 	}
+	const reset = () => {
+		searchFormRef.value.resetFields()
+		table.value.refresh(true)
+	}
 	const table = ref()
 	const formRef = ref()
 	const giveRef = ref()

+ 13 - 4
src/views/biz/feed/device/index.vue

@@ -53,10 +53,13 @@
 					</a-form-item>
 				</a-col>
 				<a-col :span="4">
-					<a-button type="primary" @click="table.refresh(true)">
-						<template #icon><SearchOutlined /></template>
-						查询
-					</a-button>
+					<a-space>
+						<a-button type="primary" @click="table.refresh(true)">
+							<template #icon><SearchOutlined /></template>
+							查询
+						</a-button>
+						<a-button @click="reset">重置</a-button>
+					</a-space>
 				</a-col>
 			</a-row>
 		</a-form>
@@ -136,6 +139,12 @@
 		})
 		return str
 	}
+
+	const reset = () => {
+		searchFormRef.value.resetFields()
+		table.value.refresh(true)
+	}
+
 	const table = ref()
 	const formRef = ref()
 	const giveRef = ref()

+ 16 - 4
src/views/biz/feed/stark/index.vue

@@ -53,10 +53,13 @@
 					</a-form-item>
 				</a-col>
 				<a-col :span="2">
-					<a-button type="primary" @click="search">
-						<template #icon><SearchOutlined /></template>
-						查询
-					</a-button>
+					<a-space>
+						<a-button type="primary" @click="search">
+							<template #icon><SearchOutlined /></template>
+							查询
+						</a-button>
+						<a-button @click="reset">重置</a-button>
+					</a-space>
 				</a-col>
 			</a-row>
 		</a-form>
@@ -97,6 +100,9 @@
 			return
 		} else {
 			active.value = val
+			if(active.value < 4) {
+				date.value = []
+			}
 		}
 	}
 
@@ -114,6 +120,12 @@
 			active.value = 4
 		}
 	})
+
+	const reset = () => {
+		searchFormRef.value.resetFields()
+		table.value.refresh(true)
+	}
+
 	const search = async () => {
 		let params = {
 			type: active.value,

+ 4 - 1
src/views/biz/monitor/index.vue

@@ -162,7 +162,7 @@
 
 	const reset = () => {
 		active.value = 0
-		data.value = []
+		date.value = []
 		searchChart()
 	}
 
@@ -171,6 +171,9 @@
 			return
 		} else {
 			active.value = val
+			if(active.value < 3) {
+				date.value = []
+			}
 		}
 	}
 	watch(date, (newVal) => {

+ 1 - 1
src/views/biz/ware/index.vue

@@ -55,7 +55,7 @@
 					<a-divider type="vertical" />
 					<a v-if="hasPerm('bizHouseEdit')" @click="formRef.onOpen(record, searchFormState)">编辑</a>
 					<a-divider type="vertical" v-if="hasPerm(['bizHouseEdit', 'bizHouseDelete'], 'and')" />
-					<a-popconfirm title="删除此栋舍吗?" @confirm="deleteWare(record)">
+					<a-popconfirm title="确定删除吗?" @confirm="deleteWare(record)">
 						<a-button type="link" v-if="hasPerm('bizHouseDelete')" danger size="small">删除</a-button>
 					</a-popconfirm>
 				</template>

+ 2 - 2
src/views/biz/wash/account/index.vue

@@ -29,7 +29,7 @@
 					<a-space>
 						<a-button type="primary" @click="search">查询</a-button>
 						<a-button @click="reset">重置</a-button>
-						<a-button type="primary" @click="derive">导出</a-button>
+<!--						<a-button type="primary" @click="derive">导出</a-button>-->
 					</a-space>
 				</a-col>
 			</a-row>
@@ -64,7 +64,7 @@
 				<template v-if="column.dataIndex === 'action'">
 					<a @click="formRef.onOpen(record, searchFormState)">编辑</a>
 					<a-divider type="vertical" />
-					<a-popconfirm title="删除此设备吗?" @confirm="deleteAccount(record)">
+					<a-popconfirm title="确定删除吗?" @confirm="deleteAccount(record)">
 						<a-button type="link" danger size="small">删除</a-button>
 					</a-popconfirm>
 				</template>

+ 4 - 3
src/views/biz/wash/drying/index.vue

@@ -223,6 +223,7 @@
 
 	const reset = () => {
 		comeId.value = ''
+		destId.value = ''
 		dateTime.value = []
 	}
 
@@ -242,9 +243,9 @@
 		initLocation()
 	})
 
-	const derive = () => {
-
-	}
+	// const derive = () => {
+	//
+	// }
 
 	const table = ref()
 

+ 5 - 2
src/views/biz/wash/entrance/index.vue

@@ -69,7 +69,7 @@
 							查询
 						</a-button>
 						<a-button @click="reset">重置</a-button>
-						<a-button type="primary" @click="derive">导出</a-button>
+<!--						<a-button type="primary" @click="derive">导出</a-button>-->
 					</a-space>
 				</a-col>
 			</a-row>
@@ -218,7 +218,10 @@
 	const dateTime = ref([])
 
 
-	const reset = () => {}
+	const reset = () => {
+		searchFormState.value = {}
+		dateTime.value = []
+	}
 
 	const derive = () => {
 		if(selectedRowKeys.value.length > 0) {

+ 4 - 0
src/views/biz/wash/good/index.vue

@@ -99,6 +99,10 @@
 
 
 	const dateTime = ref([])
+
+	const reset = () => {
+		dateTime.value = []
+	}
 	const table = ref()
 
 	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }

+ 2 - 2
src/views/biz/wash/isolation/index.vue

@@ -56,7 +56,7 @@
 					<a-space>
 						<a-button type="primary" @click="search">查询</a-button>
 						<a-button @click="reset">重置</a-button>
-						<a-button type="primary" @click="derive">导出</a-button>
+<!--						<a-button type="primary" @click="derive">导出</a-button>-->
 					</a-space>
 				</a-col>
 			</a-row>
@@ -180,7 +180,7 @@
 		dateTime.value = []
 	}
 
-	const derive = () => {}
+	// const derive = () => {}
 
 
 	const table = ref()

+ 1 - 1
src/views/biz/wash/luggage/index.vue

@@ -27,7 +27,7 @@
 					<a-space>
 						<a-button type="primary" @click="search">查询</a-button>
 						<a-button @click="reset">重置</a-button>
-						<a-button type="primary" @click="derive">导出</a-button>
+<!--						<a-button type="primary" @click="derive">导出</a-button>-->
 					</a-space>
 				</a-col>
 			</a-row>

+ 7 - 2
src/views/biz/wash/pcr/index.vue

@@ -112,7 +112,7 @@
 						<a-space>
 							<a-button type="primary" @click="search">查询</a-button>
 							<a-button @click="reset">重置</a-button>
-							<a-button type="primary" @click="derive">导出</a-button>
+<!--							<a-button type="primary" @click="derive">导出</a-button>-->
 						</a-space>
 					</a-col>
 				</a-row>
@@ -286,7 +286,12 @@
 		initLocation()
 	})
 
-	const reset = () => {}
+	const reset = () => {
+		comeId.value = ''
+		destId.value = ''
+		destList.value = []
+		dateTime.value = []
+	}
 
 	const derive = () => {}
 

+ 1 - 0
src/views/biz/wash/washing/index.vue

@@ -242,6 +242,7 @@
 
 	const reset = () => {
 		comeId.value = ''
+		destId.value = ''
 		dateTime.value = []
 	}