传感器类型

snowy-admin-web/src/views/basicset/devicetype/form.vue

@@ -130,12 +130,7 @@
 	const formRules = {
 		name: [required('请输入型号名称')],
 		code: [required('请输入型号编号')],
-		temperatureUp: [required('请输入温度上限')],
-		temperatureDown: [required('请输入温度下限')],
-		humidityUp: [required('请输入湿度上限')],
-		humidityDown: [required('请输入湿度下限')],
-		co2Up: [required('请输入CO2上限')],
-		co2Down: [required('请输入CO2下限')],
+
 		sensorCount: [required('请输入传感器路数')]
 	}
 

snowy-admin-web/src/views/basicset/mem/index.vue

@@ -38,12 +38,6 @@
 							<template #icon><plus-outlined /></template>新增
 						</a-button>
 					</div>
-
-					<div class="btn-right">
-						<a-button>
-							<template #icon><download-outlined /></template>导出
-						</a-button>
-					</div>
 				</div>
 			</template>
 			<template #bodyCell="{ column, record }">
@@ -55,7 +49,7 @@
 					</span>
 				</template>
 				<template v-if="column.dataIndex === 'action'">
-					<!-- <a-button type="link" size="small" @click="formRef.onOpen(record)">编辑</a-button> -->
+					<a-button type="link" size="small" @click="formRef.onOpen(record)">编辑</a-button>
 					<a-button type="link" size="small" @click="configformRef.onOpen(record)">配置</a-button>
 					<a-popconfirm title="确定要删除吗？" @confirm="deleteData(record)">
 						<a-button type="link" danger size="small">删除</a-button>

snowy-admin-web/src/views/motoring/location/form.vue

@@ -60,7 +60,6 @@
 						/>
 					</a-form-item>
 				</a-col>
-
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 					<a-form-item label="传感器路数" name="sensorRoute">
 						<a-input-number
@@ -73,6 +72,79 @@
 					</a-form-item>
 				</a-col>
 
+				<!-- 温湿度传感器就显示温度上限、温度下限，湿度上限、湿度下限.CO2传感器就显示CO2上限、CO2下限 -->
+				<div v-if="formData.sensorType && formData.sensorType !== 'CO2传感器'" class="form_item">
+					<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+						<a-form-item label="温度上限" name="temperatureUp">
+							<a-input-number
+								id="inputNumber"
+								v-model:value="formData.temperatureUp"
+								placeholder="请输入温度上限"
+								allow-clear
+								style="width: 100%"
+							/>
+						</a-form-item>
+					</a-col>
+					<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+						<a-form-item label="温度下限" name="temperatureDown">
+							<a-input-number
+								id="inputNumber"
+								v-model:value="formData.temperatureDown"
+								placeholder="请输入温度下限"
+								allow-clear
+								style="width: 100%"
+							/>
+						</a-form-item>
+					</a-col>
+					<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+						<a-form-item label="湿度上限" name="humidityUp">
+							<a-input-number
+								id="inputNumber"
+								v-model:value="formData.humidityUp"
+								placeholder="请输入湿度上限"
+								allow-clear
+								style="width: 100%"
+							/>
+						</a-form-item>
+					</a-col>
+					<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+						<a-form-item label="湿度下限" name="humidityDown">
+							<a-input-number
+								id="inputNumber"
+								v-model:value="formData.humidityDown"
+								placeholder="请输入湿度下限"
+								allow-clear
+								style="width: 100%"
+							/>
+						</a-form-item>
+					</a-col>
+				</div>
+
+				<div v-if="formData.sensorType && formData.sensorType == 'CO2传感器'" class="form_item">
+					<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+						<a-form-item label="CO2上限" name="co2Up">
+							<a-input-number
+								id="inputNumber"
+								v-model:value="formData.co2Up"
+								placeholder="请输入CO2上限"
+								allow-clear
+								style="width: 100%"
+							/>
+						</a-form-item>
+					</a-col>
+					<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+						<a-form-item label="CO2下限" name="co2Down">
+							<a-input-number
+								id="inputNumber"
+								v-model:value="formData.co2Down"
+								placeholder="请输入CO2下限"
+								allow-clear
+								style="width: 100%"
+							/>
+						</a-form-item>
+					</a-col>
+				</div>
+
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 					<a-form-item label="报警上限" name="limitUp">
 						<a-input-number
@@ -221,4 +293,12 @@
 		width: 100%;
 		margin-bottom: 10px;
 	}
+
+	.form_item {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-wrap: wrap;
+	}
 </style>

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

@@ -34,11 +34,6 @@
 							<template #icon><plus-outlined /></template>新增
 						</a-button>
 					</div>
-					<div class="btn-right">
-						<a-button>
-							<template #icon><download-outlined /></template>导出
-						</a-button>
-					</div>
 				</div>
 			</template>
 			<template #bodyCell="{ column, record }">