Преглед на файлове

电量下限表单,不超过100,不小于0

like преди 5 месеца
родител
ревизия
5a03ade78c
променени са 2 файла, в които са добавени 19 реда и са изтрити 13 реда
  1. 1 12
      snowy-admin-web/src/views/biz/monitor/mem/index.vue
  2. 18 1
      snowy-admin-web/src/views/biz/monitor/point/form.vue

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

@@ -139,7 +139,7 @@
 		},
 		{
 			title: '已使用路数',
-			dataIndex: 'sensorRoute',
+			dataIndex: 'sensorRouteDesc',
 			align: 'center',
 			ellipsis: true,
 			resizable: true
@@ -175,17 +175,6 @@
 
 	const loadData = (parameter) => {
 		return memApi.memPage(Object.assign(parameter, searchFormState.value)).then((res) => {
-			if (res.records.length) {
-				const promises = res.records.map((element) => {
-					return memApi.getRegionByDeviceIdData({ deviceId: element.id }).then((response) => {
-						const list = response.map((ele) => ele.sensorRoute + '路').join(',')
-						element.sensorRoute = list
-					})
-				})
-
-				// 等待所有异步操作完成后再返回结果
-				return Promise.all(promises).then(() => res)
-			}
 			return res
 		})
 	}

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

@@ -214,6 +214,22 @@
 					</a-col>
 				</div>
 
+				<!-- 供电类型为电池供电的情况下,显示电量下限 -->
+				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" v-if="formData.powerType == 'DC'">
+					<a-form-item label="电量下限" name="batteryDown">
+						<a-input-number
+							id="inputNumber"
+							v-model:value="formData.batteryDown"
+							placeholder="请输入电量下限"
+							allow-clear
+							:max="100"
+							:min="0"
+							:precision="0"
+							style="width: 100%"
+						/>
+					</a-form-item>
+				</a-col>
+
 				<a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 					<a-form-item label="勿扰设置">
 						<a-time-range-picker v-model:value="formData.time" value-format="HH:mm:ss" style="width: 80%" show-time />
@@ -431,7 +447,8 @@
 				humidityUp: data.humidityUp, //湿度上限
 				humidityDown: data.humidityDown, //湿度下限
 				co2Up: data.co2Up, //CO2上限
-				co2Down: data.co2Down //CO2下限
+				co2Down: data.co2Down, //CO2下限
+				powerType: data.powerType //供电类型
 			}
 
 			sensorRouteMax.value = data.sensorCount //传感器路数的最大值