diff --git a/src/views/BI/components/dialog/alarm_dialog.vue b/src/views/BI/components/dialog/alarm_dialog.vue
index ba6088a..75943e2 100644
--- a/src/views/BI/components/dialog/alarm_dialog.vue
+++ b/src/views/BI/components/dialog/alarm_dialog.vue
@@ -1,80 +1,82 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
-
- 重置
-
-
-
-
-
-
-
-
-
-
-
- {{ serialNumber(pagination, $index) }}
-
-
-
-
- {{ row.status === 0 ? "未处理" : "已处理" }}
-
-
-
-
- {{ typeList[row.eleType] }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+ {{ row.status === 0 ? "未处理" : "已处理" }}
+
+
+
+
+ {{ typeList[row.eleType] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
关闭
@@ -86,7 +88,6 @@ import { useVModels } from "@vueuse/core";
import useListData from "@/assets/js/useListData.js";
import { getAlArmDataList } from "@/request/bi/mapApi.js";
import { serialNumber } from "@/assets/js/utils.js";
-
const typeList = {
1: "滞留报警",
2: "串岗报警",
@@ -97,20 +98,29 @@ const typeList = {
7: "越界报警",
8: "聚集告警",
};
-const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
- useListData(getAlArmDataList);
const props = defineProps({
visible: {
type: Boolean,
required: true,
default: false,
},
+ eleTypeNum: {
+ type: Number,
+ required: true,
+ },
pd: {
type: Object,
required: false,
default: () => ({}),
},
});
+const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
+ useListData(getAlArmDataList, {
+ defaultSearchForm: {
+ eleType: props.eleTypeNum,
+ status: 0,
+ },
+ });
const statusList = [
{
label: "未处理",
@@ -136,4 +146,11 @@ const fnClose = () => {
};
-
+
diff --git a/src/views/BI/components/personnel.vue b/src/views/BI/components/personnel.vue
index fa8c5c2..e6461e5 100644
--- a/src/views/BI/components/personnel.vue
+++ b/src/views/BI/components/personnel.vue
@@ -50,7 +50,12 @@
-
+