Merge pull request 'dev-xjf' (#70) from dev-xjf into master

Reviewed-on: http://120.26.116.243:3000/root/alert-front/pulls/70

src/api/alert/run/instant/index.ts

@@ -73,8 +73,8 @@ export function updateInstant(data: InstantVO) {
 }
 
 // 删除模型实例
-export function deleteInstant(id: number) {
+export function deleteInstant(mpId: number) {
-  return defHttp.delete({ url: `/alert/instant/delete?id=${id}` })
+  return defHttp.delete({ url: `/alert/instant/delete?id=${mpId}` })
 }
 
 
@@ -85,8 +85,8 @@ export function getInstantCount() {
 }
 
 // 查询模型实例测点列表
-export function getInstantPoint(id: number) {
+export function getInstantPoint(mpId: number) {
-  return defHttp.get({ url: `/alert/instant/getPoint?id=${id}` })
+  return defHttp.get({ url: `/alert/instant/getPoint?id=${mpId}` })
 }
 // 查询模型实例测点曲线
 export function getInstantChart(data: InstantChartReqVO) {

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 })
   })
 
   // 将数据放入下拉框中

src/views/run/instant/detail.vue

@@ -51,7 +51,7 @@ const [registerForm, { getFieldsValue, setProps }] = useForm({
   actionColOptions: { span: 2 },
 })
 
-const instantId = ref<any>(route.query.id) // 获取URL中的query参数
+const instantId = ref<any>(route.query.mpId) // 获取URL中的query参数
 
 onMounted(async () => {
   loadingBasic.value = true

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}`)
 }
 </script>
 
@@ -217,7 +217,7 @@ function handleWarnConfig(record: Recordable) {
 <!--      </template>-->
       <template #status="{ record }">
         <Switch
-          v-model:checked="record.status" :checked-value="1" :un-checked-value="0" checked-children="开"
+          v-model:checked="record.instantStatus" :checked-value="1" :un-checked-value="0" checked-children="开"
           un-checked-children="关" @change="updateStatus(record)"
         />
       </template>

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,

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: {