样式调整

snowy-admin-web/src/style/index.less

@@ -552,9 +552,10 @@ body,
 // 其他操作区域
 .table-head {
 	display: flex;
-	justify-content: space-between;
+	flex-direction: row-reverse;
 	align-items: center;
-	padding: 10px 22px;
+	justify-content: space-between;
+	padding: 10px 0;
 	background-color: #e6f7ff;
 	border: 1px solid #91d5ff;
 	border-radius: 2px;

snowy-admin-web/src/views/motoring/analyse/curve.vue

@@ -2,42 +2,70 @@
 	<div class="table_item">
 		<s-table ref="tableRef" :columns="columns" :data="loadData" :row-key="(record) => record.code">
 			<template #operator>
-				<div class="table-head">
-					<div class="head-left">
-						<a-form
-							ref="searchFormRef"
-							name="advanced_search"
-							layout="inline"
-							:model="searchFormState"
-							class="ant-advanced-search-form"
-						>
-							<a-form-item label="" name="searchKey">
-								<a-range-picker v-model:value="searchFormState.searchKey" value-format="YYYY/MM/DD" />
-							</a-form-item>
-
-							<a-form-item label="报警类型" name="type">
-								<a-select v-model:value="searchFormState.type" placeholder="请选择报警类型">
-									<a-select-option value="qst">趋势图</a-select-option>
-								</a-select>
-							</a-form-item>
-
-							<a-form-item label="是否展示全部区间" name="isshow">
-								<a-select v-model:value="searchFormState.isshow" placeholder="请选择是否展示全部区间">
-									<a-select-option value="1">是</a-select-option>
-									<a-select-option value="1">否</a-select-option>
-								</a-select>
-							</a-form-item>
-						</a-form>
+				<!-- 搜索区域 -->
+				<div class="table-search">
+					<div class="table-search-form">
+						<a-row :gutter="10">
+							<a-form
+								ref="searchFormRef"
+								name="advanced_search"
+								layout="inline"
+								:label-col="{ style: { width: '70px', justifyContent: 'end' } }"
+								:model="searchFormState"
+								class="ant-advanced-search-form"
+							>
+								<a-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+									<a-form-item label="开始时间" name="searchKey">
+										<a-date-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: 100%"
+										/>
+									</a-form-item>
+								</a-col>
+								<a-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+									<a-form-item label="结束时间" name="jssj">
+										<a-date-picker
+											v-model:value="searchFormState.jssj"
+											show-time
+											format="YYYY-MM-DD HH:mm:ss"
+											value-format="YYYY-MM-DD HH:mm:ss"
+											style="width: 100%"
+										/>
+									</a-form-item>
+								</a-col>
+
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="12">
+									<a-form-item label="报表类型" name="type">
+										<a-select v-model:value="searchFormState.type" placeholder="请选择报警类型">
+											<a-select-option value="qst">趋势图</a-select-option>
+										</a-select>
+									</a-form-item></a-col
+								>
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="12">
+									<a-form-item
+										label="是否展示全部区间"
+										name="isshow"
+										:label-col="{ style: { width: '120px', justifyContent: 'end' } }"
+									>
+										<a-select v-model:value="searchFormState.isshow" placeholder="请选择是否展示全部区间">
+											<a-select-option value="1">是</a-select-option>
+											<a-select-option value="1">否</a-select-option>
+										</a-select>
+									</a-form-item>
+								</a-col>
+							</a-form>
+						</a-row>
+					</div>
+					<div class="table-search-buttons">
 						<a-button type="primary" @click="tableRef.refresh(true)">查询</a-button>
 						<a-button class="xn-mg08" @click="reset">重置</a-button>
 					</div>
-					<div class="head-right">
-						<a-button>
-							<template #icon><setting-outlined /></template>设置
-						</a-button>
-					</div>
 				</div>
 			</template>
+
 			<template #headerCell="{ title, column }">
 				<template v-if="column.dataIndex === 'type'">
 					<text>{{ title }}</text>

snowy-admin-web/src/views/motoring/analyse/daily.vue

@@ -2,38 +2,57 @@
 	<div class="table_item">
 		<s-table ref="tableRef" :columns="columns" :data="loadData" :row-key="(record) => record.code">
 			<template #operator>
-				<div class="table-head">
-					<div class="head-left">
-						<a-form
-							ref="searchFormRef"
-							name="advanced_search"
-							layout="inline"
-							:model="searchFormState"
-							class="ant-advanced-search-form"
-						>
-							<a-form-item label="" name="searchKey">
-								<a-range-picker v-model:value="searchFormState.searchKey" value-format="YYYY/MM/DD" />
-							</a-form-item>
-
-							<a-form-item label="采集类型" name="type">
-								<a-select v-model:value="searchFormState.type" placeholder="请选择报警类型">
-									<a-select-option value="wd">温度</a-select-option>
-								</a-select>
-							</a-form-item>
-						</a-form>
+				<!-- 搜索区域 -->
+				<div class="table-search">
+					<div class="table-search-form">
+						<a-row :gutter="10">
+							<a-form
+								ref="searchFormRef"
+								name="advanced_search"
+								layout="inline"
+								:label-col="{ style: { width: '70px', justifyContent: 'end' } }"
+								:model="searchFormState"
+								class="ant-advanced-search-form"
+							>
+								<a-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+									<a-form-item label="生成时间" name="searchKey">
+										<a-range-picker
+											v-model:value="searchFormState.searchKey"
+											value-format="YYYY/MM/DD"
+											style="width: 100%"
+										/>
+									</a-form-item>
+								</a-col>
+
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="12">
+									<a-form-item label="采集类型" name="type">
+										<a-select v-model:value="searchFormState.type" placeholder="请选择采集类型">
+											<a-select-option value="wd">温度</a-select-option>
+											<a-select-option value="2">湿度</a-select-option>
+											<a-select-option value="3">氧气浓度</a-select-option>
+											<a-select-option value="4">二氧化碳浓度</a-select-option>
+											<a-select-option value="5">液味</a-select-option>
+										</a-select>
+									</a-form-item></a-col
+								>
+							</a-form>
+						</a-row>
+					</div>
+					<div class="table-search-buttons">
 						<a-button type="primary" @click="tableRef.refresh(true)">查询</a-button>
 						<a-button class="xn-mg08" @click="reset">重置</a-button>
 					</div>
-					<div class="head-right">
+				</div>
+
+				<!-- 其他操作区域 -->
+				<div class="table-head">
+					<div>
 						<a-button>
 							<template #icon><download-outlined /></template>导出
 						</a-button>
-						<a-button>
+						<a-button class="xn-mg08">
 							<template #icon><printer-outlined /></template>打印
 						</a-button>
-						<a-button>
-							<template #icon><setting-outlined /></template>设置
-						</a-button>
 					</div>
 				</div>
 			</template>
@@ -186,31 +205,6 @@
 		// 表格区域
 		.table-wrapper {
 			width: 75%;
-
-			// 搜索及操作按钮区域
-			.table-head {
-				width: 100%;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-
-				.head-left {
-					width: 70%;
-					display: flex;
-
-					.ant-form-inline {
-						width: 100%;
-
-						.ant-form-item {
-							flex: 1;
-						}
-					}
-				}
-
-				.ant-btn {
-					margin-left: 10px;
-				}
-			}
 		}
 
 		// 右边的搜索区域

snowy-admin-web/src/views/motoring/analyse/evaluate.vue

@@ -2,27 +2,43 @@
 	<div class="table_item">
 		<s-table ref="tableRef" bordered :columns="columns" :data="loadData" :row-key="(record) => record.code">
 			<template #operator>
-				<div class="table-head">
-					<div class="head-left">
-						<a-form
-							ref="searchFormRef"
-							name="advanced_search"
-							layout="inline"
-							:model="searchFormState"
-							class="ant-advanced-search-form"
-						>
-							<a-form-item label="" name="searchKey">
-								<a-range-picker v-model:value="searchFormState.searchKey" value-format="YYYY/MM/DD" />
-							</a-form-item>
-						</a-form>
+				<!-- 搜索区域 -->
+				<div class="table-search">
+					<div class="table-search-form">
+						<a-row :gutter="10">
+							<a-form
+								ref="searchFormRef"
+								name="advanced_search"
+								layout="inline"
+								:label-col="{ style: { width: '70px', justifyContent: 'end' } }"
+								:model="searchFormState"
+								class="ant-advanced-search-form"
+							>
+								<a-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
+									<a-form-item label="报警时间" name="searchKey">
+										<a-range-picker
+											v-model:value="searchFormState.searchKey"
+											value-format="YYYY/MM/DD"
+											style="width: 100%"
+										/>
+									</a-form-item>
+								</a-col>
+							</a-form>
+						</a-row>
+					</div>
+					<div class="table-search-buttons">
 						<a-button type="primary" @click="tableRef.refresh(true)">查询</a-button>
 						<a-button class="xn-mg08" @click="reset">重置</a-button>
 					</div>
-					<div class="head-right">
+				</div>
+
+				<!-- 其他操作区域 -->
+				<div class="table-head">
+					<div>
 						<a-button>
 							<template #icon><download-outlined /></template>导出
 						</a-button>
-						<a-button>
+						<a-button class="xn-mg08">
 							<template #icon><printer-outlined /></template>打印预览
 						</a-button>
 					</div>

snowy-admin-web/src/views/motoring/query/history.vue

@@ -14,11 +14,22 @@
 								:model="searchFormState"
 								class="ant-advanced-search-form"
 							>
-								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6"
+								<a-col :xs="24" :sm="24" :md="24" :lg="12" :xl="9">
+									<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: 100%"
+										/>
+									</a-form-item>
+								</a-col>
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="7"
 									><a-form-item label="冷链编号" name="code">
 										<a-input v-model:value="searchFormState.code" placeholder="请输入冷链编号" /> </a-form-item
 								></a-col>
-								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6"
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
 									><a-form-item label="对象状态" name="syzt">
 										<a-select v-model:value="searchFormState.syzt" placeholder="请选择对象状态">
 											<a-select-option value="1">正常</a-select-option>
@@ -30,7 +41,7 @@
 										</a-select>
 									</a-form-item></a-col
 								>
-								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
 									<a-form-item label="监控点" name="jkdmc">
 										<a-select v-model:value="searchFormState.jkdmc" placeholder="请选择监控点名称">
 											<a-select-option value="1">监控点1</a-select-option>
@@ -38,7 +49,7 @@
 									</a-form-item></a-col
 								>
 
-								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
 									<a-form-item label="报警状态" name="bjzt">
 										<a-select v-model:value="searchFormState.jkdmc" placeholder="请选择报警状态">
 											<a-select-option value="1">正常</a-select-option>
@@ -47,7 +58,7 @@
 										</a-select>
 									</a-form-item></a-col
 								>
-								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6"
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
 									><a-form-item label="运行状态" name="yxzt">
 										<a-select v-model:value="searchFormState.yxzt" placeholder="请选择运行状态">
 											<a-select-option value="1">正常</a-select-option>
@@ -57,7 +68,7 @@
 										</a-select>
 									</a-form-item></a-col
 								>
-								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6"
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
 									><a-form-item label="对象名称" name="dxmc">
 										<a-select v-model:value="searchFormState.dxmc" placeholder="请选择对象名称">
 											<a-select-option value="1">-20度冰箱</a-select-option>
@@ -72,16 +83,6 @@
 										</a-select>
 									</a-form-item></a-col
 								>
-								<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-									<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"
-										/>
-									</a-form-item>
-								</a-col>
 							</a-form>
 						</a-row>
 					</div>
@@ -93,9 +94,6 @@
 
 				<!-- 其他操作区域 -->
 				<div class="table-head">
-					<div>
-						剩余刷新时间：<text style="color: #1c8fff">{{ 33 }}</text>
-					</div>
 					<div>
 						<a-button>
 							<template #icon><download-outlined /></template>导出

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

@@ -6,7 +6,6 @@
 				<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>
-			<a-button type="link" @click="leaveFor('/motoring/report')">更多</a-button>
 		</div>
 
 		<div class="query-body">

snowy-admin-web/src/views/motoring/query/realtime.vue

@@ -14,11 +14,11 @@
 								:model="searchFormState"
 								class="ant-advanced-search-form"
 							>
-								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6"
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
 									><a-form-item label="冷链编号" name="code">
 										<a-input v-model:value="searchFormState.code" placeholder="请输入冷链编号" /> </a-form-item
 								></a-col>
-								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6"
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
 									><a-form-item label="使用状态" name="syzt">
 										<a-select v-model:value="searchFormState.syzt" placeholder="请选择使用状态">
 											<a-select-option value="1">正常</a-select-option>
@@ -31,7 +31,7 @@
 									</a-form-item></a-col
 								>
 
-								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6"
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
 									><a-form-item label="运行状态" name="yxzt">
 										<a-select v-model:value="searchFormState.yxzt" placeholder="请选择运行状态">
 											<a-select-option value="1">正常</a-select-option>
@@ -41,7 +41,7 @@
 										</a-select>
 									</a-form-item></a-col
 								>
-								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6"
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
 									><a-form-item label="对象名称" name="dxmc">
 										<a-select v-model:value="searchFormState.dxmc" placeholder="请选择对象名称">
 											<a-select-option value="1">-20度冰箱</a-select-option>
@@ -56,7 +56,7 @@
 										</a-select>
 									</a-form-item></a-col
 								>
-								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
 									<a-form-item label="监控点" name="jkdmc">
 										<a-select v-model:value="searchFormState.jkdmc" placeholder="请选择监控点名称">
 											<a-select-option value="1">监控点1</a-select-option>
@@ -74,9 +74,6 @@
 
 				<!-- 其他操作区域 -->
 				<div class="table-head">
-					<div>
-						剩余刷新时间：<text style="color: #1c8fff">{{ 33 }}</text>
-					</div>
 					<div>
 						<a-button>
 							<template #icon><download-outlined /></template>导出
@@ -85,6 +82,9 @@
 							<template #icon><printer-outlined /></template>打印
 						</a-button>
 					</div>
+					<div>
+						剩余刷新时间：<text style="color: #1c8fff">{{ 33 }}</text>
+					</div>
 				</div>
 			</template>
 			<template #bodyCell="{ column, record }">

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

@@ -6,7 +6,6 @@
 				<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>
-			<a-button type="link" @click="leaveFor('/motoring/report')">更多</a-button>
 		</div>
 
 		<div class="query-body">

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

@@ -2,34 +2,91 @@
 	<div class="table_item">
 		<s-table ref="tableRef" :columns="columns" :data="loadData" :row-key="(record) => record.dxbh">
 			<template #operator>
-				<div class="table-head">
-					<div class="head-left">
-						<a-form
-							ref="searchFormRef"
-							name="advanced_search"
-							:model="searchFormState"
-							class="ant-advanced-search-form"
-						>
-							<a-form-item label="报警时间" name="searchKey">
-								<a-range-picker v-model:value="searchFormState.searchKey" value-format="YYYY/MM/DD" />
-							</a-form-item>
-						</a-form>
+				<!-- 搜索区域 -->
+				<div class="table-search">
+					<div class="table-search-form">
+						<a-row :gutter="10">
+							<a-form
+								ref="searchFormRef"
+								name="advanced_search"
+								layout="inline"
+								:label-col="{ style: { width: '70px', justifyContent: 'end' } }"
+								:model="searchFormState"
+								class="ant-advanced-search-form"
+							>
+								<a-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
+									<a-form-item label="报警时间" name="searchKey">
+										<a-range-picker
+											v-model:value="searchFormState.searchKey"
+											value-format="YYYY/MM/DD"
+											style="width: 100%"
+										/>
+									</a-form-item>
+								</a-col>
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+									<a-form-item label="报警状态" name="jkdmc">
+										<a-select v-model:value="searchFormState.jkdmc" placeholder="请选择报警状态">
+											<a-select-option value="1">已处理</a-select-option>
+											<a-select-option value="2">未处理</a-select-option>
+											<a-select-option value="3">处理中</a-select-option>
+										</a-select>
+									</a-form-item></a-col
+								>
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
+									><a-form-item label="对象编码" name="code">
+										<a-input v-model:value="searchFormState.code" placeholder="请输入对象编码" /> </a-form-item
+								></a-col>
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
+									><a-form-item label="对象名称" name="code">
+										<a-input v-model:value="searchFormState.code" placeholder="请输入对象名称" /> </a-form-item
+								></a-col>
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
+									><a-form-item label="发生时间" name="syzt">
+										<a-select v-model:value="searchFormState.syzt" placeholder="请选择发生时间">
+											<a-select-option value="1">>10分钟</a-select-option>
+											<a-select-option value="2">>30分钟</a-select-option>
+											<a-select-option value="3">>1小时</a-select-option>
+											<a-select-option value="4">>5小时</a-select-option>
+										</a-select>
+									</a-form-item></a-col
+								>
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+									<a-form-item label="报警类型" name="jkdmc">
+										<a-select v-model:value="searchFormState.jkdmc" placeholder="请选择报警类型">
+											<a-select-option value="1">超限报警</a-select-option>
+											<a-select-option value="2">传感器故障</a-select-option>
+											<a-select-option value="3">电池报警</a-select-option>
+											<a-select-option value="4">断线报警</a-select-option>
+											<a-select-option value="5">其他报警</a-select-option>
+											<a-select-option value="6">外部电源断开</a-select-option>
+										</a-select>
+									</a-form-item></a-col
+								>
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
+									><a-form-item label="报警原因" name="bjyy">
+										<a-input v-model:value="searchFormState.bjyy" placeholder="请输入报警原因" /> </a-form-item
+								></a-col>
+							</a-form>
+						</a-row>
+					</div>
+					<div class="table-search-buttons">
 						<a-button type="primary" @click="tableRef.refresh(true)">查询</a-button>
 						<a-button class="xn-mg08" @click="reset">重置</a-button>
 					</div>
-					<div class="head-right">
+				</div>
+
+				<!-- 其他操作区域 -->
+				<div class="table-head">
+					<div>
 						<a-button>
 							<template #icon><logout-outlined /></template>处理
 						</a-button>
-						<a-button>
+						<a-button class="xn-mg08">
 							<template #icon><logout-outlined /></template>全部处理
 						</a-button>
-						<a-button>
+						<a-button class="xn-mg08">
 							<template #icon><download-outlined /></template>导出
 						</a-button>
-						<a-button>
-							<template #icon><search-outlined /></template>搜索模式
-						</a-button>
 					</div>
 				</div>
 			</template>
@@ -385,20 +442,6 @@
 <style lang="less" scoped>
 	.table_item {
 		padding: 15px 20px;
-		.table-head {
-			width: 100%;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			.head-left {
-				display: flex;
-			}
-
-			.ant-btn {
-				margin-left: 10px;
-			}
-		}
 	}
 	:deep(.ant-table-pagination-right) {
 		justify-content: center !important;

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

@@ -2,28 +2,78 @@
 	<div class="table_item">
 		<s-table ref="tableRef" :columns="columns" :data="loadData" :row-key="(record) => record.sctime">
 			<template #operator>
-				<div class="table-head">
-					<div class="head-left">
-						<a-form
-							ref="searchFormRef"
-							name="advanced_search"
-							:model="searchFormState"
-							class="ant-advanced-search-form"
-						>
-							<a-form-item label="报警时间" name="searchKey">
-								<a-range-picker v-model:value="searchFormState.searchKey" value-format="YYYY/MM/DD" />
-							</a-form-item>
-						</a-form>
+				<!-- 搜索区域 -->
+				<div class="table-search">
+					<div class="table-search-form">
+						<a-row :gutter="10">
+							<a-form
+								ref="searchFormRef"
+								name="advanced_search"
+								layout="inline"
+								:label-col="{ style: { width: '70px', justifyContent: 'end' } }"
+								:model="searchFormState"
+								class="ant-advanced-search-form"
+							>
+								<a-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
+									<a-form-item label="生成时间" name="searchKey">
+										<a-range-picker
+											v-model:value="searchFormState.searchKey"
+											value-format="YYYY/MM/DD"
+											style="width: 100%"
+										/>
+									</a-form-item>
+								</a-col>
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
+									><a-form-item label="接收人" name="code">
+										<a-input v-model:value="searchFormState.code" placeholder="请输入接收人" /> </a-form-item
+								></a-col>
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+									<a-form-item label="通知类型" name="jkdmc">
+										<a-select v-model:value="searchFormState.jkdmc" placeholder="请选择通知类型">
+											<a-select-option value="1">短信报警</a-select-option>
+											<a-select-option value="2">电话报警</a-select-option>
+											<a-select-option value="3">微信报警</a-select-option>
+											<a-select-option value="4">邮件报警</a-select-option>
+											<a-select-option value="5">弹出报警</a-select-option>
+											<a-select-option value="6">音乐报警</a-select-option>
+										</a-select>
+									</a-form-item></a-col
+								>
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+									<a-form-item label="状态" name="jkdmc">
+										<a-select v-model:value="searchFormState.jkdmc" placeholder="请选择状态">
+											<a-select-option value="1">发送成功</a-select-option>
+											<a-select-option value="2">未发送</a-select-option>
+											<a-select-option value="3">发送失败</a-select-option>
+											<a-select-option value="4">非报警时间记录</a-select-option>
+										</a-select>
+									</a-form-item></a-col
+								>
+
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
+									><a-form-item label="对象编码" name="code">
+										<a-input v-model:value="searchFormState.code" placeholder="请输入对象编码" /> </a-form-item
+								></a-col>
+
+								<a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
+									><a-form-item label="对象名称" name="bjyy">
+										<a-input v-model:value="searchFormState.bjyy" placeholder="请输入对象名称" /> </a-form-item
+								></a-col>
+							</a-form>
+						</a-row>
+					</div>
+					<div class="table-search-buttons">
 						<a-button type="primary" @click="tableRef.refresh(true)">查询</a-button>
 						<a-button class="xn-mg08" @click="reset">重置</a-button>
 					</div>
-					<div class="head-right">
+				</div>
+
+				<!-- 其他操作区域 -->
+				<div class="table-head">
+					<div>
 						<a-button>
 							<template #icon><download-outlined /></template>导出
 						</a-button>
-						<a-button>
-							<template #icon><search-outlined /></template>搜索模式
-						</a-button>
 					</div>
 				</div>
 			</template>
@@ -249,20 +299,6 @@
 <style lang="less" scoped>
 	.table_item {
 		padding: 15px 20px;
-		.table-head {
-			width: 100%;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			.head-left {
-				display: flex;
-			}
-
-			.ant-btn {
-				margin-left: 10px;
-			}
-		}
 	}
 	:deep(.ant-table-pagination-right) {
 		justify-content: center !important;