瀏覽代碼

监控对象的区域配置按钮改名字,改成监测点配置
监测点管理弹框内,监控设备根据传感器类型来获取,加传一个String sensorType可为空

like 6 月之前
父節點
當前提交
c77eda7898

+ 1 - 1
snowy-admin-web/src/views/basicset/monitor/setup.vue

@@ -66,7 +66,7 @@
 					<a-popconfirm title="确定要删除吗?" @confirm="deleteData(record)">
 						<a-button type="link" danger size="small">删除</a-button>
 					</a-popconfirm>
-					<a-button type="link" size="small" @click="configformRef.onOpen(record)">区域配置</a-button>
+					<a-button type="link" size="small" @click="configformRef.onOpen(record)">监测点配置</a-button>
 				</template>
 			</template>
 			<!-- <template #expandedRowRender="{ record }">

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

@@ -14,19 +14,29 @@
 			:label-col="{ style: { width: '110px', justifyContent: 'end' } }"
 		>
 			<a-row :gutter="10">
+				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+					<a-form-item label="监控对象" name="monitorTargetId">
+						<a-select
+							ref="select"
+							v-model:value="formData.monitorTargetId"
+							:options="monitorTargetOptions"
+							placeholder="请选择监控对象"
+						/>
+					</a-form-item>
+				</a-col>
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 					<a-form-item label="点位名称" name="name">
 						<a-input v-model:value="formData.name" placeholder="请输入点位名称" allow-clear />
 					</a-form-item>
 				</a-col>
-
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-					<a-form-item label="监控对象" name="monitorTargetId">
+					<a-form-item label="传感器类型" name="sensorType">
 						<a-select
 							ref="select"
-							v-model:value="formData.monitorTargetId"
-							:options="monitorTargetOptions"
-							placeholder="请选择监控对象"
+							v-model:value="formData.sensorType"
+							:options="sensorOptions"
+							placeholder="请选择传感器类型"
+							@change="sensorTypeChange"
 						/>
 					</a-form-item>
 				</a-col>
@@ -49,16 +59,6 @@
 					</a-form-item>
 				</a-col>
 
-				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-					<a-form-item label="传感器类型" name="sensorType">
-						<a-select
-							ref="select"
-							v-model:value="formData.sensorType"
-							:options="sensorOptions"
-							placeholder="请选择传感器类型"
-						/>
-					</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
@@ -71,8 +71,10 @@
 					</a-form-item>
 				</a-col>
 
-				<!-- 温湿度传感器就显示温度上限、温度下限,湿度上限、湿度下限.CO2传感器就显示CO2上限、CO2下限,若监控设备没有设置上下限,则表单禁用状态 -->
-				<div v-if="formData.sensorType && formData.sensorType !== 'CO2传感器'" class="form_item">
+				<div
+					class="form_item"
+					v-if="formData.sensorType == 'W' || formData.sensorType == 'WS' || formData.sensorType == 'WSC'"
+				>
 					<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<a-form-item label="温度上限" name="temperatureUp">
 							<a-input-number
@@ -101,6 +103,9 @@
 							/>
 						</a-form-item>
 					</a-col>
+				</div>
+
+				<div class="form_item" v-if="formData.sensorType == 'WS' || formData.sensorType == 'WSC'">
 					<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<a-form-item label="湿度上限" name="humidityUp">
 							<a-input-number
@@ -131,7 +136,7 @@
 					</a-col>
 				</div>
 
-				<div v-if="formData.sensorType && formData.sensorType == 'CO2传感器'" class="form_item">
+				<div class="form_item" v-if="formData.sensorType == 'WSC'">
 					<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<a-form-item label="CO2上限" name="co2Up">
 							<a-input-number
@@ -255,17 +260,19 @@
 
 	// 打开抽屉
 	const onOpen = (record) => {
-		loadData()
+		setupListData()
 		visible.value = true
 		if (record) {
 			formData.value = Object.assign({}, record)
+			sensorType.value = formData.value.sensorType
+			memListData(sensorType.value)
 		} else {
 			formData.value = {}
+			memListData()
 		}
 	}
-
-	const loadData = () => {
-		// 获取监控对象
+	// 获取监控对象
+	const setupListData = () => {
 		setupApi.setupList({ isAll: false }).then((res) => {
 			monitorTargetOptions.value = (res || []).map((item) => {
 				return {
@@ -275,8 +282,11 @@
 				}
 			})
 		})
-		// 获取监控设备
-		memApi.memList({ isAll: false }).then((res) => {
+	}
+	const sensorType = ref() //选中的传感器类型
+	// 监控设备通过传感器类型来获取, sensorType可为空
+	const memListData = (value) => {
+		memApi.memList({ isAll: false, sensorType: value }).then((res) => {
 			memListOptions.value = (res || []).map((item) => {
 				return {
 					...item,
@@ -290,10 +300,20 @@
 		})
 	}
 
+	// 选中传感器类型
+	const sensorTypeChange = (value) => {
+		if (value) {
+			sensorType.value = value
+			memListData(value)
+		}
+	}
+
 	// 选中监控设备
 	const monitorDeviceIdChange = (value) => {
 		if (value) {
 			const data = memListOptions.value.find((item) => item.value === value)
+			modeData.value = data
+
 			formData.value.sensorCode = data.deviceCode //传感器编号
 			formData.value.modelName = data.modelName //监控设备型号
 			formData.value.deviceCode = data.deviceCode //冷链编号
@@ -317,8 +337,6 @@
 				upMax: data.co2Up,
 				downMax: data.co2Down
 			}
-
-			console.log(humidityMax.value, 'xxxx')
 		}
 	}