From a3ab719744f51c9331603381e445b083ebeb8550 Mon Sep 17 00:00:00 2001
From: xjf <378266566@qq.com>
Date: Sun, 7 Dec 2025 22:52:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E6=9F=90=E4=BA=9B=E5=AD=97=E6=AE=B5,=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/run/instant/CreateModal.vue            | 8 ++++----
 src/views/run/instant/UpdateModal.vue            | 2 +-
 src/views/run/instant/index.vue                  | 2 +-
 src/views/run/instant/instant.data.ts            | 2 +-
 src/views/run/instant/warnConfig/UpdateModal.vue | 2 +-
 src/views/run/instant/warnConfig/warn.data.ts    | 4 ++--
 src/views/run/model/ModelTable.vue               | 3 ++-
 src/views/run/model/model.data.ts                | 2 +-
 src/views/run/model/point.data.ts                | 6 +++---
 9 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/views/run/instant/CreateModal.vue b/src/views/run/instant/CreateModal.vue
index 578e1f6..a0b280d 100644
--- a/src/views/run/instant/CreateModal.vue
+++ b/src/views/run/instant/CreateModal.vue
@@ -119,16 +119,16 @@ async function updatempName(selectedRowKeys, selectedRows) {
   else
     setProps({disabled: false})
 
-  instantForm.modelId = selectedRows.length !== 0 ? `${selectedRows[0].id}` : ``
+  instantForm.modelId = selectedRows.length !== 0 ? `${selectedRows[0].modelId}` : ``
 
   instantForm.mpName = selectedRows.length !== 0 ? `${selectedRows[0].modelName}-实例` : ``
   setFieldsValue(instantForm)
 
-  const versionData = selectedRows.length !== 0 ? await getModelVersionList({modelId: selectedRows[0].id}) : []
+  const versionData = selectedRows.length !== 0 ? await getModelVersionList({modelId: selectedRows[0].modelId}) : []
   const versionList = [] as any
   // // 组名下拉框问题
   versionData.forEach((item) => {
-    versionList.push({label: `${item.version} (${item.conditionName})`, value: item.id})
+    versionList.push({label: `${item.version} (${item.conditionName})`, value: item.versionId})
   })
   const calcGroupData = selectedRows.length !== 0 ? await getCalcGroupList({unitId: selectedRows[0].unitId}) : []
   const calcGroupList = [] as any
@@ -195,7 +195,7 @@ async function CompleteCreate() {
 </script>
 
 <template>
-  <BasicModal v-bind="$attrs" title="新增模型实例" width="80%" @cancel="onCanel"
+  <BasicModal v-bind="$attrs" title="新增模型实例" width="60%" height="500px"  @cancel="onCanel"
               @register="registerCreateModal">
     <Card title="实例信息">
       <BasicForm @register="registerForm" ref="instantFormRef"/>
diff --git a/src/views/run/instant/UpdateModal.vue b/src/views/run/instant/UpdateModal.vue
index 9f45939..aa53be8 100644
--- a/src/views/run/instant/UpdateModal.vue
+++ b/src/views/run/instant/UpdateModal.vue
@@ -39,7 +39,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   const versionList = [] as any
   // // 组名下拉框问题
   versionData.forEach((item) => {
-    versionList.push({ label: item.version, value: item.id })
+    versionList.push({ label: item.version, value: item.versionId })
   })
   const calcGroupData = await getCalcGroupList({ unitId: data?.record.unitId })
   const calcGroupList = [] as any
diff --git a/src/views/run/instant/index.vue b/src/views/run/instant/index.vue
index 3d6126d..51a7518 100644
--- a/src/views/run/instant/index.vue
+++ b/src/views/run/instant/index.vue
@@ -35,7 +35,7 @@ const [registerTable, { getForm, reload, getDataSource, updateTableDataRecord }]
     schemas: searchFormSchema,
     showResetButton: false,
     actionColOptions: {
-      span: 3,
+      span: 5
     },
 
   },
diff --git a/src/views/run/instant/instant.data.ts b/src/views/run/instant/instant.data.ts
index c65ec3b..d61ed67 100644
--- a/src/views/run/instant/instant.data.ts
+++ b/src/views/run/instant/instant.data.ts
@@ -173,7 +173,7 @@ export const searchFormSchema: FormSchema[] = [
     labelWidth: 120,
 
     defaultValue: '',
-    colProps: { span: 5 },
+    colProps: { span: 7 },
   },
   {
     label: '状态1',
diff --git a/src/views/run/instant/warnConfig/UpdateModal.vue b/src/views/run/instant/warnConfig/UpdateModal.vue
index c6f23a1..6df4ce9 100644
--- a/src/views/run/instant/warnConfig/UpdateModal.vue
+++ b/src/views/run/instant/warnConfig/UpdateModal.vue
@@ -29,7 +29,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   // 如果是修改modal，则赋值给表单
   isUpdate.value = !!data?.isUpdate
   if (unref(isUpdate)) {
-    const res = await getWarn(data.record.id)
+    const res = await getWarn(data.record.warnId)
     setFieldsValue({ ...res })
   }
   // // 获取下拉框的数据
diff --git a/src/views/run/instant/warnConfig/warn.data.ts b/src/views/run/instant/warnConfig/warn.data.ts
index b684dfd..6ba6429 100644
--- a/src/views/run/instant/warnConfig/warn.data.ts
+++ b/src/views/run/instant/warnConfig/warn.data.ts
@@ -3,7 +3,7 @@ import type { BasicColumn, FormSchema } from '@/components/Table'
 export const columns: BasicColumn[] = [
   {
     title: '编号',
-    dataIndex: 'id',
+    dataIndex: 'warnId',
     width: 80,
     fixed: 'left',
   },
@@ -141,7 +141,7 @@ export const searchFormSchema: FormSchema[] = [
 export const updateWarnForm: FormSchema[] = [
   {
     label: '编号',
-    field: 'id',
+    field: 'warnId',
     component: 'Input',
     required: true,
     show: false,
diff --git a/src/views/run/model/ModelTable.vue b/src/views/run/model/ModelTable.vue
index cf06085..6805308 100644
--- a/src/views/run/model/ModelTable.vue
+++ b/src/views/run/model/ModelTable.vue
@@ -39,13 +39,14 @@ const [registerTable, { getSelectRows,setSelectedRowKeys,setSelectedRows }] = us
   title: '模型列表(已下装)',
   api: getModelPage,
   searchInfo: {status:1},
-  rowKey: 'id',
+  rowKey: 'modelId',
   rowSelection: {
     type: 'radio', async onChange(selectedRowKeys, selectedRows) {
       console.log(selectedRowKeys, selectedRows)
       emit('success', selectedRowKeys, selectedRows)
     },
   },
+
   size: 'small',
   immediate: true,
   columns,
diff --git a/src/views/run/model/model.data.ts b/src/views/run/model/model.data.ts
index 92af4a2..f5bdcd8 100644
--- a/src/views/run/model/model.data.ts
+++ b/src/views/run/model/model.data.ts
@@ -6,7 +6,7 @@ import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 export const columns: BasicColumn[] = [
   {
     title: '编号',
-    dataIndex: 'id',
+    dataIndex: 'modelId',
     width: 80,
     fixed: 'left',
   },
diff --git a/src/views/run/model/point.data.ts b/src/views/run/model/point.data.ts
index 46864bd..4d4206a 100644
--- a/src/views/run/model/point.data.ts
+++ b/src/views/run/model/point.data.ts
@@ -6,17 +6,17 @@ import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 export const columns: BasicColumn[] = [
   {
     title: '点号',
-    dataIndex: 'pointId',
+    dataIndex: 'PointId',
     width: 150,
   },
   {
     title: '描述',
-    dataIndex: 'description',
+    dataIndex: 'Description',
     width: 200,
   },
   {
     title: '单位',
-    dataIndex: 'unit',
+    dataIndex: 'Unit',
     width: 80,
   },