diff --git a/index.html b/index.html
index 5228cb0..577b901 100644
--- a/index.html
+++ b/index.html
@@ -93,6 +93,10 @@
是否复归:
+
@@ -104,10 +108,10 @@
- {{pdTypeOps.find(item=>item.value==text).label}}
+ {{pdTypeOps?.find(item=>item.value==text)?.label||'-'}}
- {{ cancelOps.find(item=>item.value==text).label}}
+ {{ cancelOps?.find(item=>item.value==text)?.label||'-'}}
@@ -285,12 +289,7 @@
]">
-
+
@@ -1763,6 +1762,12 @@
{ label: '是', value: '0' },
{ label: '否', value: '1' },
]
+ // 查询模式
+ const searchModelOps = [
+ { label: '站点', value: 'station' },
+ { label: '监测点', value: 'monitor' },
+ ]
+ const searchModel = ref('station')
const pdTypeOps = [
{
value: '1',
@@ -1804,8 +1809,8 @@
startTime: alarmFilters.times?.[0] || '',
endTime: alarmFilters.times?.[1] || '',
isCancel: alarmFilters.isCancel,
- pdType: alarmFilters.pdTypes,
- monitorKey: unref(selectedKey),
+ pdTypes: alarmFilters.pdTypes,
+ monitorKey: unref(searchModel) === 'station' ? '' : unref(selectedKey),
stationName: findParentByKey(unref(fullTreeData), unref(selectedKey))
}
const { data: { result } } = await axios.post(`/ldpdtools/alarm/queryAlarmList`, params)
@@ -2205,6 +2210,8 @@
handleTableChange,
selectedKey,
cancelOps,
+ searchModelOps,
+ searchModel,
alarmFilters,
pdTypeOps,
deleteAlarmTimes,