Merge branch 'master' of http://git.nzklabs.com:3000/huangyuanhao/jfcloud-coldchain

snowy-admin-web/src/views/biz/monitor/point/form.vue

@@ -86,7 +86,13 @@
 
 				<a-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
 					<a-form-item label="勿扰设置">
-						<a-time-range-picker v-model:value="formData.time" value-format="HH:mm:ss" style="width: 100%" show-time />
+						<a-time-picker v-model:value="formData.ignoreStartTime" value-format="HH:mm:ss" placeholder="开始时间">
+							<template #suffixIcon></template>
+						</a-time-picker>
+						<SwapRightOutlined style="color: #bfbfbf" />
+						<a-time-picker v-model:value="formData.ignoreEndTime" value-format="HH:mm:ss" placeholder="结束时间">
+							<template #suffixIcon></template>
+						</a-time-picker>
 					</a-form-item>
 				</a-col>
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
@@ -265,7 +271,7 @@
 	const emit = defineEmits({ successful: null })
 	const visible = ref(false) // 默认是关闭状态
 	const formRef = ref()
-	const formData = ref({ deviceOfflineAlarm: true, alarmUsers: [], time: [] }) // 表单数据
+	const formData = ref({ deviceOfflineAlarm: true, alarmUsers: [] }) // 表单数据
 	const pointOptions = tool.dictList('MONITORPOINT') // 点位名称
 	const pointName = ref('上层')
 	const currentMonitorObj = ref({}) //当前的监测冰箱
@@ -351,7 +357,7 @@
 		isFridgeDisabled()
 		visible.value = true
 		if (!record) {
-			formData.value = ref({ deviceOfflineAlarm: true, alarmUsers: [], time: [] })
+			formData.value = ref({ deviceOfflineAlarm: true, alarmUsers: [] })
 			memListData()
 		}
 	}
@@ -395,10 +401,6 @@
 					formData.value.deviceOfflineAlarm = true
 				} else {
 					pointName.value = '' // 编辑取消回显
-					formData.value.time = [
-						formData.value.ignoreStartTime ? formData.value.ignoreStartTime : null,
-						formData.value.ignoreEndTime ? formData.value.ignoreEndTime : null
-					]
 
 					if (formData.value.alarmUsers && formData.value.alarmUsers.length > 0) {
 						formData.value.alarmUsers = formData.value.alarmUsers.map((item) => item.openId)
@@ -546,12 +548,9 @@
 			.then(() => {
 				const parameter = {
 					...formData.value,
-					alarmUsers: alarmUsersOptions.value.filter((user) => formData.value.alarmUsers.includes(user.openId)),
-					ignoreStartTime: formData.value.time && formData.value.time.length ? formData.value.time[0] : null,
-					ignoreEndTime: formData.value.time && formData.value.time.length ? formData.value.time[1] : null
+					alarmUsers: alarmUsersOptions.value.filter((user) => formData.value.alarmUsers.includes(user.openId))
 				}
 
-				delete parameter.time
 				locationApi.submitForm(parameter, formData.value.id).then(() => {
 					onClose()
 					emit('successful')

snowy-admin-web/src/views/biz/monitor/point/index.vue

@@ -134,6 +134,16 @@
 			ellipsis: true,
 			resizable: true
 		},
+		{
+			title: '离线预警',
+			dataIndex: 'deviceOfflineAlarm',
+			align: 'center',
+			ellipsis: true,
+			resizable: true,
+			customRender({ value }) {
+				return value ? '是' : '否'
+			}
+		},
 		{
 			title: '创建时间',
 			dataIndex: 'createTime',