From 4668421061734b6cac8457d681000ece4dad15dc Mon Sep 17 00:00:00 2001 From: xjf <378266566@qq.com> Date: Sat, 6 Dec 2025 21:54:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=9B=A0=E6=95=B0=E6=8D=AE=E5=BA=93instant?= =?UTF-8?q?=5Fcfg=E6=9B=B4=E6=94=B9=E5=AD=97=E6=AE=B5=EF=BC=8Cgroup=5Fview?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=A1=A8=E5=90=8D=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/alert/run/instant/index.ts | 8 ++++---- src/views/run/instant/UpdateModal.vue | 4 ++-- src/views/run/instant/detail.vue | 2 +- src/views/run/instant/index.vue | 10 +++++----- src/views/run/instant/instant.data.ts | 6 +++--- src/views/run/instant/warnConfig/index.vue | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/api/alert/run/instant/index.ts b/src/api/alert/run/instant/index.ts index 79c3d35..a4747ce 100644 --- a/src/api/alert/run/instant/index.ts +++ b/src/api/alert/run/instant/index.ts @@ -73,8 +73,8 @@ export function updateInstant(data: InstantVO) { } // 删除模型实例 -export function deleteInstant(id: number) { - return defHttp.delete({ url: `/alert/instant/delete?id=${id}` }) +export function deleteInstant(mpId: number) { + return defHttp.delete({ url: `/alert/instant/delete?id=${mpId}` }) } @@ -85,8 +85,8 @@ export function getInstantCount() { } // 查询模型实例测点列表 -export function getInstantPoint(id: number) { - return defHttp.get({ url: `/alert/instant/getPoint?id=${id}` }) +export function getInstantPoint(mpId: number) { + return defHttp.get({ url: `/alert/instant/getPoint?id=${mpId}` }) } // 查询模型实例测点曲线 export function getInstantChart(data: InstantChartReqVO) { diff --git a/src/views/run/instant/UpdateModal.vue b/src/views/run/instant/UpdateModal.vue index 7acf4c3..9f45939 100644 --- a/src/views/run/instant/UpdateModal.vue +++ b/src/views/run/instant/UpdateModal.vue @@ -31,7 +31,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data // 如果是修改modal，则赋值给表单 isUpdate.value = !!data?.isUpdate if (unref(isUpdate)) { - const res = await getInstant(data.record.id) + const res = await getInstant(data.record.mpId) setFieldsValue({ ...res }) } // 获取下拉框的数据 @@ -45,7 +45,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data const calcGroupList = [] as any // // 组名下拉框问题 calcGroupData.forEach((item) => { - calcGroupList.push({ label: item.groupName, value: item.id }) + calcGroupList.push({ label: item.groupName, value: item.groupId }) }) // 将数据放入下拉框中 diff --git a/src/views/run/instant/detail.vue b/src/views/run/instant/detail.vue index e9094d0..da44c97 100644 --- a/src/views/run/instant/detail.vue +++ b/src/views/run/instant/detail.vue @@ -51,7 +51,7 @@ const [registerForm, { getFieldsValue, setProps }] = useForm({ actionColOptions: { span: 2 }, }) -const instantId = ref(route.query.id) // 获取URL中的query参数 +const instantId = ref(route.query.mpId) // 获取URL中的query参数 onMounted(async () => { loadingBasic.value = true diff --git a/src/views/run/instant/index.vue b/src/views/run/instant/index.vue index 2a698cb..3d6126d 100644 --- a/src/views/run/instant/index.vue +++ b/src/views/run/instant/index.vue @@ -27,7 +27,7 @@ const [registerUpdateModal, { openModal: openUpdateModal }] = useModal() const [registerTable, { getForm, reload, getDataSource, updateTableDataRecord }] = useTable({ title: '实例列表', api: getInstantPage, - rowKey: 'id', + rowKey: 'mpId', immediate: true, columns, formConfig: { @@ -52,7 +52,7 @@ const [registerTable, { getForm, reload, getDataSource, updateTableDataRecord }] function handleDetail(record) { console.log(record) - router.push(`/run/instant/detail?id=${record.id}`) + router.push(`/run/instant/detail?mpId=${record.mpId}`) } async function updateStatus(record) { @@ -72,7 +72,7 @@ function handleEdit(record: Recordable) { openUpdateModal(true, { record, isUpdate: true }) } async function handleDelete(record: Recordable) { - await deleteInstant(record.id) + await deleteInstant(record.mpId) createMessage.success(t('common.delSuccessText')) reload() } @@ -140,7 +140,7 @@ async function getNow() { } function handleWarnConfig(record: Recordable) { - router.push(`/run/instant/warn/config?id=${record.id}`) + router.push(`/run/instant/warn/config?mpId=${record.mpId}`) } @@ -217,7 +217,7 @@ function handleWarnConfig(record: Recordable) { diff --git a/src/views/run/instant/instant.data.ts b/src/views/run/instant/instant.data.ts index 321dbb0..c65ec3b 100644 --- a/src/views/run/instant/instant.data.ts +++ b/src/views/run/instant/instant.data.ts @@ -10,7 +10,7 @@ import type { systemSelectParams } from '@/api/alert/model/model/optionsModel' export const columns: BasicColumn[] = [ { title: '编号', - dataIndex: 'id', + dataIndex: 'mpId', width: 80, fixed: 'left', }, @@ -76,7 +76,7 @@ export const columns: BasicColumn[] = [ }, { title: '投切', - dataIndex: 'status', + dataIndex: 'instantStatus', width: 100, slots: { customRender: 'status' }, fixed: 'right', @@ -422,7 +422,7 @@ export const updateInstantForm: FormSchema[] = [ { label: '编号', - field: 'id', + field: 'mpId', component: 'Input', required: true, show: false, diff --git a/src/views/run/instant/warnConfig/index.vue b/src/views/run/instant/warnConfig/index.vue index 8e490c6..7326844 100644 --- a/src/views/run/instant/warnConfig/index.vue +++ b/src/views/run/instant/warnConfig/index.vue @@ -38,11 +38,11 @@ const [registerTable, { getForm, reload, getDataSource, updateTableDataRecord }] }, beforeFetch: (params) => { // 方式二：通过查询前的事件增加默认值，然后设置到表单值中 - params.mpId = route.query.id + params.mpId = route.query.mpId getForm().setFieldsValue(params) return params }, - useSearchForm: !route.query.id, + useSearchForm: !route.query.mpId, showTableSetting: true, showIndexColumn: false, actionColumn: {