名称统一修改

snowy-admin-web/src/views/biz/alarmuser/index.vue

@@ -94,13 +94,6 @@
 			ellipsis: true,
 			resizable: true
 		},
-		{
-			title: '用户唯一标识',
-			dataIndex: 'openid',
-			align: 'center',
-			ellipsis: true,
-			resizable: true
-		},
 		{
 			title: 'AccessToken',
 			dataIndex: 'accessToken',
@@ -133,21 +126,6 @@
 			align: 'center',
 			ellipsis: true,
 			resizable: true
-		},
-		{
-			title: '特权信息',
-			dataIndex: 'privilege',
-			align: 'center',
-			ellipsis: true,
-			resizable: true
-		},
-
-		{
-			title: '扩展信息',
-			dataIndex: 'extJson',
-			align: 'center',
-			ellipsis: true,
-			resizable: true
 		}
 	]
 	// 操作栏通过权限判断是否显示

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

@@ -15,12 +15,12 @@
 		>
 			<a-row :gutter="10">
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-					<a-form-item label="设备型号" name="modelName">
+					<a-form-item label="冷链设备型号" name="modelName">
 						<a-select
 							ref="select"
 							v-model:value="formData.modelName"
 							:options="modeOptions"
-							placeholder="请选择设备型号"
+							placeholder="请选择冷链设备型号"
 							@change="modelNameChange"
 							:disabled="formData.id"
 						/>
@@ -34,10 +34,10 @@
 					</a-form-item>
 				</a-col>
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-					<a-form-item label="设备编号" name="deviceCode">
+					<a-form-item label="冷链设备编号" name="deviceCode">
 						<a-input
 							v-model:value="formData.deviceCode"
-							placeholder="请输入设备编号"
+							placeholder="请输入冷链设备编号"
 							allow-clear
 							:maxlength="10"
 							@change="deviceCodeChange(formData.deviceCode)"
@@ -46,11 +46,11 @@
 					</a-form-item>
 				</a-col>
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-					<a-form-item label="设备名称" name="deviceName">
+					<a-form-item label="冷链设备名称" name="deviceName">
 						<a-input
 							:value="formData.deviceName"
 							:disabled="!formData.deviceCode"
-							placeholder="请输入设备名称"
+							placeholder="请输入冷链设备名称"
 							allow-clear
 							@input="deviceNameInput"
 						/>
@@ -72,8 +72,8 @@
 					</a-form-item>
 				</a-col>
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-					<a-form-item label="设备状态" name="status">
-						<a-select ref="select" v-model:value="formData.status" placeholder="请选择设备状态">
+					<a-form-item label="冷链设备状态" name="status">
+						<a-select ref="select" v-model:value="formData.status" placeholder="请选择冷链设备状态">
 							<a-select-option value="1">正常</a-select-option>
 							<a-select-option value="2">闲置</a-select-option>
 						</a-select>
@@ -191,10 +191,10 @@
 
 	// 默认要校验的
 	const formRules = {
-		deviceName: [required('请输入设备名称')],
-		deviceCode: [required('请输入设备编号'), rules.number, { validator: maxCode, trigger: ['change', 'blur'] }],
+		deviceName: [required('请输入冷链设备名称')],
+		deviceCode: [required('请输入冷链设备编号'), rules.number, { validator: maxCode, trigger: ['change', 'blur'] }],
 		modelName: [required('请选择设备型号')],
-		status: [required('请选择设备状态')],
+		status: [required('请选择冷链设备状态')],
 		sensorCount: [required('请输入传感器总路数')]
 	}
 
@@ -203,7 +203,7 @@
 		const maxValue = 2147483647
 
 		if (isNaN(value) || Number(value) > maxValue) {
-			callback(new Error(`设备编码不能超过最大值 ${maxValue}`))
+			callback(new Error(`冷链设备编号不能超过最大值 ${maxValue}`))
 		} else {
 			callback() // 校验通过
 		}
@@ -274,7 +274,7 @@
 		if (!val.startsWith(formData.value.deviceCode)) {
 			formData.value.deviceName = formData.value.deviceCode
 			message.warning({
-				content: `设备名称必须以设备编号：${formData.value.deviceCode} 开头`,
+				content: `冷链设备名称必须以设备编号：${formData.value.deviceCode} 开头`,
 				key: 'deviceName'
 			})
 		} else {

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

@@ -22,12 +22,12 @@
 								class="ant-advanced-search-form"
 							>
 								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
-									><a-form-item label="设备名称" name="deviceName">
-										<a-input v-model:value="searchFormState.deviceName" placeholder="请输入设备名称" /> </a-form-item
+									><a-form-item label="冷链设备名称" name="deviceName">
+										<a-input v-model:value="searchFormState.deviceName" placeholder="请输入冷链设备名称" /> </a-form-item
 								></a-col>
 								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
-									<a-form-item label="设备编号" name="deviceCode">
-										<a-input v-model:value="searchFormState.deviceCode" placeholder="请输入设备编号" /> </a-form-item
+									<a-form-item label="冷链设备编号" name="deviceCode">
+										<a-input v-model:value="searchFormState.deviceCode" placeholder="请输入冷链设备编号" /> </a-form-item
 								></a-col>
 							</a-form>
 						</a-row>
@@ -89,21 +89,21 @@
 			width: 50
 		},
 		{
-			title: '设备名称',
+			title: '冷链设备名称',
 			dataIndex: 'deviceName',
 			align: 'center',
 			ellipsis: true,
 			resizable: true
 		},
 		{
-			title: '设备编号',
+			title: '冷链设备编号',
 			dataIndex: 'deviceCode',
 			align: 'center',
 			ellipsis: true,
 			resizable: true
 		},
 		{
-			title: '设备型号',
+			title: '冷链设备型号',
 			dataIndex: 'typeName',
 			align: 'center',
 			ellipsis: true,
@@ -117,7 +117,7 @@
 			resizable: true
 		},
 		{
-			title: '设备状态',
+			title: '冷链设备状态',
 			dataIndex: 'status',
 			align: 'center',
 			ellipsis: true,

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

@@ -56,7 +56,7 @@
 				</a-col>
 
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-					<a-form-item label="冷链设备" name="monitorDeviceId">
+					<a-form-item label="冷链设备名称" name="monitorDeviceId">
 						<a-select
 							ref="select"
 							v-model:value="formData.monitorDeviceId"
@@ -69,8 +69,8 @@
 				</a-col>
 
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" v-if="formData.monitorDeviceId">
-					<a-form-item label="传感器编号" name="sensorCode">
-						<a-input v-model:value="formData.sensorCode" disabled placeholder="请输入传感器编号" allow-clear />
+					<a-form-item label="冷链设备编号" name="sensorCode">
+						<a-input v-model:value="formData.sensorCode" disabled placeholder="请输入冷链设备编号" allow-clear />
 					</a-form-item>
 				</a-col>
 
@@ -423,7 +423,7 @@
 			currentMonitorDevice.value = data //选中的冷链设备
 			formData.value = {
 				...formData.value,
-				sensorCode: data.deviceCode, //传感器编号
+				sensorCode: data.deviceCode, //冷链设备编号
 				modelName: data.modelName, //冷链设备型号
 				deviceCode: data.deviceCode, //冷链编号
 				temperatureUp: data.temperatureUp, //温度上限
@@ -444,7 +444,7 @@
 				...formData.value,
 				monitorDeviceId: null, //冷链设备
 				sensorRoute: null, //传感器路数
-				sensorCode: null, //传感器编号
+				sensorCode: null, //冷链设备编号
 				modelName: null, //冷链设备型号
 				deviceCode: null, //冷链编号
 				temperatureUp: null, //温度上限

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

@@ -90,7 +90,7 @@
 			width: 50
 		},
 		{
-			title: '区域名称',
+			title: '点位名称',
 			dataIndex: 'name',
 			align: 'center',
 			ellipsis: true,

snowy-admin-web/src/views/motoring/report/components/form.vue

@@ -1,97 +0,0 @@
-<template>
-	<xn-form-container
-		:title="formData.id ? '报警处理' : '报警确定'"
-		:width="550"
-		:visible="visible"
-		:destroy-on-close="true"
-		@close="onClose"
-	>
-		<a-form ref="formRef" :model="formData" :rules="formRules" layout="Inline" :label-col="labelCol">
-			<a-form-item label="发生时间" name="fssj">
-				<a-date-picker show-time placeholder="请选择发生时间" @change="onChange" style="width: 100%" />
-			</a-form-item>
-
-			<a-form-item label="设备" name="sb">
-				<a-input v-model:value="formData.sb" placeholder="请输入设备" allow-clear />
-			</a-form-item>
-			<a-form-item label="报警原因" name="bjyy">
-				<a-input v-model:value="formData.bjyy" placeholder="请输入报警原因" allow-clear />
-			</a-form-item>
-			<a-form-item label="故障类型:" name="gzlx">
-				<a-select ref="select" v-model:value="formData.gzlx" style="width: 100%">
-					<a-select-option value="1">超限报警</a-select-option>
-				</a-select>
-			</a-form-item>
-		</a-form>
-		<template #footer>
-			<a-button class="xn-mr8" @click="onClose">取消</a-button>
-			<a-button type="primary" @click="onSubmit">报警确定</a-button>
-		</template>
-		<Icon-selector ref="iconSelectorRef" @iconCallBack="iconCallBack" />
-	</xn-form-container>
-</template>
-
-<script setup>
-	import ColorPicker from '@/components/ColorPicker/index.vue'
-	import { required } from '@/utils/formRules'
-	import moduleApi from '@/api/sys/resource/moduleApi'
-	import IconSelector from '@/components/Selector/iconSelector.vue'
-	// 默认是关闭状态
-	const visible = ref(false)
-	const emit = defineEmits({ successful: null })
-	const formRef = ref()
-	const labelCol = { style: { width: '80px' } }
-	const treeData = ref([])
-	const iconSelectorRef = ref()
-	// 表单数据
-	const formData = ref({})
-
-	// 打开抽屉
-	const onOpen = (record) => {
-		visible.value = true
-
-		if (record) {
-			formData.value = Object.assign({}, record)
-		} else {
-			formData.value = {}
-		}
-	}
-	// 关闭抽屉
-	const onClose = () => {
-		formRef.value.resetFields()
-		visible.value = false
-	}
-	// 报警时间
-	const onChange = (value, dateString) => {
-		formData.value.bjkssj = dateString
-		console.log('报警时间', dateString)
-	}
-
-	// 默认要校验的
-	const formRules = {
-		fssj: [required('请选择发生时间')],
-		sb: [required('请输入设备')],
-		bjyy: [required('请输入报警原因')],
-		gzlx: [required('请选择故障类型')]
-	}
-
-	// 验证并提交数据
-	const onSubmit = () => {
-		formRef.value
-			.validate()
-			.then(() => {
-				console.log(formData.value, '提交数据')
-
-				// moduleApi.submitForm(formData.value, formData.value.id).then(() => {
-				// 	onClose()
-				// 	emit('successful')
-				// })
-			})
-			.catch(() => {})
-	}
-
-	// 调用这个函数将子组件的一些数据和方法暴露出去
-	defineExpose({
-		onOpen
-	})
-</script>

snowy-admin-web/src/views/motoring/report/index.vue

@@ -3,8 +3,8 @@
 		<div class="query-head">
 			<div class="query-tbas">
 				<div class="tbas-title" :class="activeKey == '1' ? 'active' : ''" @click="activeclick('1')">报警列表</div>
-				<a-divider type="vertical" style="height: 15px; background-color: #f4f5f7; margin: 8px 20px" />
-				<div class="tbas-title" :class="activeKey == '2' ? 'active' : ''" @click="activeclick('2')">报警通知列表</div>
+				<!-- <a-divider type="vertical" style="height: 15px; background-color: #f4f5f7; margin: 8px 20px" />
+				<div class="tbas-title" :class="activeKey == '2' ? 'active' : ''" @click="activeclick('2')">报警通知列表</div> -->
 			</div>
 		</div>
 

snowy-admin-web/src/views/motoring/report/list.vue

@@ -27,6 +27,17 @@
 										<a-input v-model:value="searchFormState.keyword" placeholder="请输入关键字" allowClear />
 									</a-form-item>
 								</a-col>
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+									<a-form-item label="时间范围" name="searchKey">
+										<a-range-picker
+											v-model:value="searchFormState.searchKey"
+											show-time
+											format="YYYY-MM-DD HH:mm:ss"
+											value-format="YYYY-MM-DD HH:mm:ss"
+											style="width: 250px"
+										/>
+									</a-form-item>
+								</a-col>
 							</a-form>
 						</a-row>
 					</div>
@@ -82,7 +93,6 @@
 			</template>
 		</s-table>
 
-		<!-- <Form ref="formRef" @successful="tableRef.refresh(true)" /> -->
 		<DetailModal ref="detailModalRef" @successful="tableRef.refresh(true)" />
 	</div>
 </template>
@@ -90,13 +100,11 @@
 <script setup>
 	import { message } from 'ant-design-vue'
 	import { debounce, cloneDeep } from 'lodash-es'
-	import Form from './components/form.vue'
 	import DetailModal from './components/DetailModal.vue'
 	import { getPage, deleteMonitornotice } from '@/api/coldchain/monitornotice'
 	import { initColumns } from './initData'
 
 	const loading = ref(false)
-	const formRef = ref()
 	const detailModalRef = ref()
 	const searchFormRef = ref()
 	const searchFormState = ref({})
@@ -112,6 +120,12 @@
 
 	const tableData = ref([]) // 用来存储表格数据
 	const loadData = (parameter) => {
+		if (searchFormState.value.searchKey) {
+			searchFormState.value.startTime = searchFormState.value.searchKey[0]
+			searchFormState.value.endTime = searchFormState.value.searchKey[1]
+			delete searchFormState.value.searchKey
+		}
+
 		return getPage({ ...parameter, ...cloneDeep(searchFormState.value) }).then((res) => {
 			tableData.value = res.records || []
 			return res