diff --git a/src/api/alert/warn/index.ts b/src/api/alert/warn/index.ts
index 4ca8de8..0d93c67 100644
--- a/src/api/alert/warn/index.ts
+++ b/src/api/alert/warn/index.ts
@@ -35,3 +35,8 @@ export function updateWarn(data: WarnVO) {
export function getWarn(id: number) {
return defHttp.get({ url: `/alert/warn/get?id=${id}` })
}
+
+// 查询预警等级列表-不分页
+export function getAlarmLevelList() {
+ return defHttp.get({ url: '/alert/warn/alarmlevel/list'})
+}
diff --git a/src/views/run/calc/index.vue b/src/views/run/calc/index.vue
index a44a829..a52e371 100644
--- a/src/views/run/calc/index.vue
+++ b/src/views/run/calc/index.vue
@@ -44,9 +44,8 @@ const [registerTable, {getForm, reload, getDataSource, updateTableDataRecord}] =
style: {
textAlign: 'left',
marginLeft: '10px',
- },
- },
-
+ }
+ }
},
useSearchForm: true,
showTableSetting: true,
diff --git a/src/views/run/instant/warnConfig/index.vue b/src/views/run/instant/warnConfig/index.vue
index 7326844..98612d2 100644
--- a/src/views/run/instant/warnConfig/index.vue
+++ b/src/views/run/instant/warnConfig/index.vue
@@ -23,7 +23,7 @@ const [registerUpdateModal, { openModal: openUpdateModal }] = useModal()
const [registerTable, { getForm, reload, getDataSource, updateTableDataRecord }] = useTable({
title: '预警测点列表',
api: getWarnPage,
- rowKey: 'id',
+ rowKey: 'warnId',
immediate: true,
columns,
formConfig: {
@@ -37,9 +37,9 @@ const [registerTable, { getForm, reload, getDataSource, updateTableDataRecord }]
},
beforeFetch: (params) => {
- // 方式二：通过查询前的事件增加默认值，然后设置到表单值中
+ // 查询前的事件增加默认值，然后设置到表单值中
params.mpId = route.query.mpId
- getForm().setFieldsValue(params)
+ // getForm().setFieldsValue(params)
return params
},
useSearchForm: !route.query.mpId,
diff --git a/src/views/run/instant/warnConfig/warn.data.ts b/src/views/run/instant/warnConfig/warn.data.ts
index 6ba6429..e9be076 100644
--- a/src/views/run/instant/warnConfig/warn.data.ts
+++ b/src/views/run/instant/warnConfig/warn.data.ts
@@ -1,5 +1,7 @@
import type { BasicColumn, FormSchema } from '@/components/Table'
-
+import {getAlarmLevelList} from "@/api/alert/warn";
+const alarmLevelList = await getAlarmLevelList();
+console.log(alarmLevelList)
export const columns: BasicColumn[] = [
{
title: '编号',
@@ -68,12 +70,6 @@ export const columns: BasicColumn[] = [
dataIndex: 'warnConstraintName',
width: 120,
- },
- {
- title: '报警类型',
- dataIndex: 'alarmModelRuleName',
- width: 120,
-
},
{
title: '告警延时',
@@ -191,7 +187,11 @@ export const updateWarnForm: FormSchema[] = [
field: 'alarmLevel',
component: 'Select',
componentProps: {
- options: [],
+ options: alarmLevelList,
+ fieldNames: {
+ label: 'alarmLevelName',
+ value: 'alarmLevel',
+ },
},
required: true,
colProps: {
@@ -204,7 +204,7 @@ export const updateWarnForm: FormSchema[] = [
component: 'Input',
required: true,
colProps: {
- span: 12,
+ span: 24,
},
},
{
@@ -264,7 +264,7 @@ export const updateWarnForm: FormSchema[] = [
component: 'Input',
required: true,
colProps: {
- span: 12,
+ span: 24,
},
},
]
diff --git a/src/views/warn/alarm/alarm.data.ts b/src/views/warn/alarm/alarm.data.ts
index d301db2..5272436 100644
--- a/src/views/warn/alarm/alarm.data.ts
+++ b/src/views/warn/alarm/alarm.data.ts
@@ -14,7 +14,7 @@ export const searchFormSchema: FormSchema[] = [
field: 'unit',
component: 'Select',
defaultValue: optionList.units[0].id || null,
- colProps: { span: 4 },
+ colProps: { span: 5 },
componentProps: ({ schema, tableAction, formActionType, formModel }) => {
return {
@@ -42,7 +42,7 @@ export const searchFormSchema: FormSchema[] = [
field: 'type',
component: 'Select',
defaultValue: optionList.types[0].id || null,
- colProps: { span: 4 },
+ colProps: { span: 5 },
componentProps: ({ formModel }) => {
return {
allowClear: false,
@@ -67,7 +67,7 @@ export const searchFormSchema: FormSchema[] = [
field: 'system',
component: 'Select',
defaultValue: systemOptions.value[0].id || null,
- colProps: { span: 4 },
+ colProps: { span: 5 },
componentProps: () => {
return {
allowClear: false,
@@ -83,7 +83,7 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input',
labelWidth: 120,
defaultValue: '',
- colProps: { span: 7 },
+ colProps: { span: 6 },
}
]
diff --git a/src/views/warn/alarm/index.vue b/src/views/warn/alarm/index.vue
index 10dd894..5c6248d 100644
--- a/src/views/warn/alarm/index.vue
+++ b/src/views/warn/alarm/index.vue
@@ -4,7 +4,7 @@ import { onMounted } from 'vue'
import { useRoute } from 'vue-router'
import { columns, searchFormSchema } from './alarm.data'
-// import UpdateModal from './UpdateModal.vue'
+import UpdateModal from '../../run/instant/warnConfig/UpdateModal.vue'
import { BasicTable, TableAction, useTable } from '@/components/Table'
import { getWarnPageReal, updateWarn } from '@/api/alert/warn'
@@ -32,11 +32,15 @@ const [registerTable, { getForm, reload, getDataSource, updateTableDataRecord }]
labelWidth: 80,
schemas: searchFormSchema,
showResetButton: false,
+ submitButtonOptions:{
+ preIcon: IconEnum.SEARCH,
+ },
actionColOptions: {
- span: 4,
+ span: 2,
style: {
- marginLeft: '10px'
- }
+ textAlign: 'left',
+ marginLeft: '10px',
+ },
},
},
showTableSetting: true,
@@ -55,7 +59,7 @@ async function updateStatus(record) {
console.log(record)
reload()
}
-function handleWarnConfig(record: Recordable) {
+function handleUpdate(record: Recordable) {
openUpdateModal(true, { record, isUpdate: true })
}
@@ -73,16 +77,16 @@ onMounted(async () => {
-
+