From 9b960344d8c6ab3bbffff697ccb265b92d92e20e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com>
Date: Fri, 26 Dec 2025 16:21:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:exa=E5=8E=86=E5=8F=B2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=B4=E9=9A=94=E9=80=89=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/exa/config/index.vue        |   5 +-
 src/views/exa/exa.data.ts             |   3 +
 src/views/exa/history/index.vue       | 132 +++++++++--------
 src/views/run/instant/detail1.vue     | 200 --------------------------
 src/views/run/instant/instant.data.ts | 127 +---------------
 5 files changed, 80 insertions(+), 387 deletions(-)
 delete mode 100644 src/views/run/instant/detail1.vue

diff --git a/src/views/exa/config/index.vue b/src/views/exa/config/index.vue
index c2dfe1c..037cf23 100644
--- a/src/views/exa/config/index.vue
+++ b/src/views/exa/config/index.vue
@@ -112,10 +112,10 @@ async function handleDelete(record: Recordable) {
     <BasicTable @register="registerTable">
       <template #form-advanceAfter>
         <Space >
-          <a-button v-auth="['system:role:create']" type="primary" :pre-icon="IconEnum.ADD" @click="handleCreate">
+          <a-button  type="primary" :pre-icon="IconEnum.ADD" @click="handleCreate">
             {{ t('action.create') }}
           </a-button>
-          <a-button v-auth="['system:role:create']" type="primary" :pre-icon="IconEnum.ADDS" @click="handleCreateBatch">
+          <a-button  type="primary" :pre-icon="IconEnum.ADDS" @click="handleCreateBatch">
             {{ t('action.createBatch') }}
           </a-button>
         </Space>
@@ -145,7 +145,6 @@ async function handleDelete(record: Recordable) {
               icon: IconEnum.DELETE,
               danger: true,
               label: t('action.delete'),
-              auth: 'alert:exa:delete',
               popConfirm: {
                 title: t('common.delMessage'),
                 placement: 'left',
diff --git a/src/views/exa/exa.data.ts b/src/views/exa/exa.data.ts
index ac2f938..b3b90c8 100644
--- a/src/views/exa/exa.data.ts
+++ b/src/views/exa/exa.data.ts
@@ -126,6 +126,9 @@ export const formHistory: FormSchema[] = [
         console.log(e)
       },
     },
+    colProps: {
+      span: 10,
+    },
   },
   {
     label: '时间间隔',
diff --git a/src/views/exa/history/index.vue b/src/views/exa/history/index.vue
index 9d71e43..b77ebf6 100644
--- a/src/views/exa/history/index.vue
+++ b/src/views/exa/history/index.vue
@@ -1,46 +1,53 @@
 <script lang="ts" setup>
-import { onMounted, reactive, ref } from 'vue'
-import type { Dayjs } from 'dayjs'
+import {reactive, ref, nextTick} from 'vue'
 import moment from 'moment'
-import { Button, Card, Empty, Form, FormItem, RangePicker, Space, message } from 'ant-design-vue'
+import {BasicForm, useForm} from '@/components/Form'
+import {Card, message, Space} from 'ant-design-vue'
 import HistoryLine from '../HistoryLine.vue'
 import PointModal from './PointModal.vue'
-import { getExaHistorys } from '@/api/alert/exa'
-import { useModal } from '@/components/Modal'
-import {useForm} from "@/components/Form";
+import {getExaHistorys} from '@/api/alert/exa'
+import {useModal} from '@/components/Modal'
 import {calcFormSchemas} from "@/views/run/calc/calc.data";
+import {formHistory} from "@/views/exa/exa.data";
+import {EXAHistoryReqVO} from "@/api/alert/warn";
 
+const [registerForm, {getFieldsValue}] = useForm({
+  labelWidth: 100,
+  schemas: formHistory,
+  showSubmitButton: false,
+  showResetButton: false,
+  layout: 'horizontal',
+  model: {time: [moment().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), moment().format('YYYY-MM-DD HH:mm:ss')]},
+  fieldMapToTime: [
+    // data为时间组件在表单内的字段，startTime，endTime为转化后的开始时间于结束时间
+    ['time', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss'],
+  ],
 
-interface FormState {
-  publishTime: any[]
-}
-const searchForm = reactive<FormState>({
-  publishTime: [],
 })
-const loading = ref(true)
-
-function onRangeChange(value: [Dayjs, Dayjs], dateString: [string, string]) {
-  console.log('Selected Time: ', value)
-  console.log('Formatted Selected Time: ', dateString)
-}
-
-function onRangeOk(value: [Dayjs, Dayjs]) {
-  console.log('onOk: ', value)
-  console.log(searchForm.publishTime)
-  searchForm.publishTime = value
+// ⭐ 确保表单渲染完成后
+const handleRegisterForm = (instance) => {
+  // ⭐ 真正完成注册
+  registerForm(instance)
+  // ⭐ 等一帧，确保 model + fieldMapToTime 生效
+  nextTick(() => {
+    getHistoryChart()
+  })
 }
 
+const loading = ref(false)
 const selectedData = ref<Recordable[]>([])
+
 interface RowKeys {
   selectedRowKeys: number[]
 }
+
 const state = reactive<RowKeys>({
   selectedRowKeys: [],
 })
-onMounted(() => {
-  searchForm.publishTime = [moment().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), moment().format('YYYY-MM-DD HH:mm:ss')]
-  getHistoryChart()
-})
+//这种写法不正确，会在表单加载前执行，所以不正确
+// onMounted(() => {
+//   getHistoryChart()
+// })
 
 const historyData = ref()
 const legendName = ref<any[]>([])
@@ -56,20 +63,18 @@ async function getHistoryChart() {
     message.info('暂无测点')
 
   const pointCode = selectedData.value.map(item => (item.itemName)).join(',')
-  const pointDesc: any[] = selectedData.value.map(item => (item.descriptor+'('+item.itemName+')'))
+  const pointDesc: any[] = selectedData.value.map(item => (item.descriptor + '(' + item.itemName + ')'))
 
-  const exaHistoryReqVO = {
-    startTime: searchForm.publishTime[0],
-    endTime: searchForm.publishTime[1],
-    itemName: pointCode,
-    interval: 100,
-  }
+  const exaHistoryReqVO = getFieldsValue() as EXAHistoryReqVO
+  exaHistoryReqVO.itemName = pointCode;
+  console.log(exaHistoryReqVO)
   historyData.value = await getExaHistorys(exaHistoryReqVO)
   legendName.value = pointDesc;
   loading.value = false
 }
 
-const [registerPointModal, { openModal: openPointModal }] = useModal()
+const [registerPointModal, {openModal: openPointModal}] = useModal()
+
 function handlePointModal() {
   openPointModal(true)
 }
@@ -78,32 +83,43 @@ function handlePointModal() {
 <template>
   <div>
     <Card>
-      <Form layout="inline" :model="searchForm">
-        <FormItem label="时间范围">
-          <RangePicker
-            :model="searchForm.publishTime"
-            :show-time="{ format: 'HH:mm:ss' }"
-            :placeholder="['开始时间', '结束时间']" :default-value="[moment().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), moment().format('YYYY-MM-DD HH:mm:ss')]"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            @change="onRangeChange"
-            @ok="onRangeOk"
-          />
-        </FormItem>
-        <FormItem>
-          <Space wrap>
-            <Button type="primary" @click="getHistoryChart">
-              查看趋势
-            </Button>
-            <Button @click="handlePointModal">
-              测点配置
-            </Button>
-          </Space>
-        </FormItem>
-      </Form>
+      <BasicForm @register="handleRegisterForm" :actionColOptions="{ span: 0 }">
+        <template #formFooter>
+          <div style="margin-left: 10px">
+            <Space>
+              <a-button type="primary" @click="getHistoryChart">查看趋势</a-button>
+              <a-button @click="handlePointModal">测点配置</a-button>
+            </Space>
+          </div>
+        </template>
+      </BasicForm>
+      <!--      <Form layout="inline" :model="searchForm">-->
+      <!--        <FormItem label="时间范围">-->
+      <!--          <RangePicker-->
+      <!--            :model="searchForm.publishTime"-->
+      <!--            :show-time="{ format: 'HH:mm:ss' }"-->
+      <!--            :placeholder="['开始时间', '结束时间']" :default-value="[moment().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), moment().format('YYYY-MM-DD HH:mm:ss')]"-->
+      <!--            value-format="YYYY-MM-DD HH:mm:ss"-->
+      <!--            @change="onRangeChange"-->
+      <!--            @ok="onRangeOk"-->
+      <!--          />-->
+      <!--        </FormItem>-->
+      <!--        <FormItem>-->
+      <!--          <Space wrap>-->
+      <!--            <Button type="primary" @click="getHistoryChart">-->
+      <!--              查看趋势-->
+      <!--            </Button>-->
+      <!--            <Button @click="handlePointModal">-->
+      <!--              测点配置-->
+      <!--            </Button>-->
+      <!--          </Space>-->
+      <!--        </FormItem>-->
+      <!--      </Form>-->
     </Card>
     <Card style="margin:5px" :loading="loading">
-      <HistoryLine :data="historyData" :name="legendName" height="70vh" />
+      <HistoryLine :data="historyData" :name="legendName" height="70vh"/>
     </Card>
-    <PointModal :selected-row-keys="state.selectedRowKeys" :selected-data="selectedData" @register="registerPointModal" @success="getHistoryChart" />
+    <PointModal :selected-row-keys="state.selectedRowKeys" :selected-data="selectedData"
+                @register="registerPointModal" @success="getHistoryChart"/>
   </div>
 </template>
diff --git a/src/views/run/instant/detail1.vue b/src/views/run/instant/detail1.vue
deleted file mode 100644
index a6f4521..0000000
--- a/src/views/run/instant/detail1.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<script lang="ts" setup>
-import { onMounted, reactive, ref } from 'vue'
-import type { Dayjs } from 'dayjs'
-import moment from 'moment'
-import { Card, Descriptions, DescriptionsItem, Form, FormItem, RangePicker, Space, Switch, message } from 'ant-design-vue'
-import { mount } from 'sortablejs'
-import { number } from 'vue-types'
-import { useRoute } from 'vue-router'
-import HistoryLine from '../../exa/HistoryLine.vue'
-import { detailColumns, instantForm } from './instant.data'
-import { getExaHistorys } from '@/api/alert/exa'
-import { useModal } from '@/components/Modal'
-import { BasicTable, TableAction, useTable } from '@/components/Table'
-import { getInstant, getInstantChart, getInstantPage, getInstantPoint } from '@/api/alert/run/instant'
-import { useI18n } from '@/hooks/web/useI18n'
-import { router } from '@/router'
-import { BasicForm, useForm } from '@/components/Form'
-import PropsPanel from '@/components/FormDesign/src/components/VFormDesign/modules/PropsPanel.vue'
-import echarts from '@/utils/lib/echarts'
-
-defineOptions({ name: 'InstantDetail' })
-
-const route = useRoute()
-
-// const props = defineProps({
-//   id: {
-//     type: Number,
-//     default: null,
-//   },
-// })
-const { t } = useI18n()
-const loadingBasic = ref<boolean>(false)
-const loadingChart = ref<boolean>(false)
-
-const basicInfo = ref<any>({})
-const modelInfo = ref<any>({})
-const pointInfo = ref<any>({})
-const pointList = ref<any>([])
-const historyList = ref<any>([])
-const [registerForm, { getFieldsValue, setProps }] = useForm({
-  labelWidth: 100,
-  // baseColProps: { span: 24 },
-  schemas: instantForm,
-  showResetButton: false,
-  layout: 'horizontal',
-  // model: { time: [moment().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'), moment().format('YYYY-MM-DD HH:mm:ss')] },
-  fieldMapToTime: [
-    // data为时间组件在表单内的字段，startTime，endTime为转化后的开始时间于结束时间
-    ['time', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss'],
-  ],
-  actionColOptions: {
-    span: 2,
-  style:{
-    marginLeft:'5px'
-  }},
-})
-
-const instantId = ref<any>(route.query.mpId) // 获取URL中的query参数
-
-onMounted(async () => {
-  loadingBasic.value = true
-  basicInfo.value = await getInstant(instantId.value)
-  loadingBasic.value = false
-
-  modelInfo.value = JSON.parse(basicInfo.value.modelInfo)
-  pointInfo.value = modelInfo.value.pointInfo
-  console.log(modelInfo.value)
-  pointList.value = await getInstantPoint(instantId.value)
-  getChartsData()
-})
-
-function handleSubmitR() {
-  getChartsData()
-}
-async function getChartsData() {
-  setProps({
-    submitButtonOptions: {
-      loading: true,
-    },
-  })
-
-  loadingChart.value = true
-  console.log(getFieldsValue())
-  const instantForm = getFieldsValue()
-
-  historyList.value = await getInstantChart({ ...{ id: instantId.value }, ...instantForm })
-  echarts.connect('async')
-
-  loadingChart.value = false
-  setProps({
-    submitButtonOptions: {
-      loading: false,
-    },
-  })
-}
-
-const [registerTable] = useTable({
-  title: '测点列表',
-  size: 'small',
-  dataSource: pointList,
-  columns: detailColumns,
-  useSearchForm: false,
-  showTableSetting: true,
-  showIndexColumn: false,
-  actionColumn: {
-    width: 140,
-    title: t('common.action'),
-    dataIndex: 'action',
-    fixed: 'right',
-  },
-})
-
-function handleDetail(record) {
-  console.log(record)
-  router.push('/run/instant/detail')
-}
-
-
-function handleFaultConfig(field) {
-  console.log(field)
-}
-</script>
-
-<template>
-  <div>
-    <Card :loading="loadingBasic">
-      <Descriptions size="small" title="模型基本信息" bordered :column="{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }">
-        <DescriptionsItem label="实例名称" :span="4">
-          {{ basicInfo.mpName }}
-        </DescriptionsItem>
-        <DescriptionsItem label="创建人">
-          {{ basicInfo.createName }}
-        </DescriptionsItem>
-        <DescriptionsItem label="创建时间">
-          {{ moment(basicInfo.createTime).format("YYYY-MM-DD HH:mm:ss") }}
-        </DescriptionsItem>
-        <DescriptionsItem label="最近修改人">
-          {{ basicInfo.updateName }}
-        </DescriptionsItem>
-        <DescriptionsItem label="最近修改时间">
-          {{ moment(basicInfo.updateTime).format("YYYY-MM-DD HH:mm:ss") }}
-        </DescriptionsItem>
-        <DescriptionsItem label="算法">
-          {{ basicInfo.algorithmShortname }}
-        </DescriptionsItem>
-        <DescriptionsItem label="训练采样间隔">
-          {{ modelInfo.sampling }}
-        </DescriptionsItem>
-        <DescriptionsItem label="参数个数">
-          {{ pointInfo.length }}
-        </DescriptionsItem>
-        <DescriptionsItem label="最小主元贡献率">
-          {{ modelInfo.rate }}
-        </DescriptionsItem>
-        <DescriptionsItem label="主元个数">
-          {{ modelInfo.principal }}
-        </DescriptionsItem>
-        <DescriptionsItem label="模型精度">
-          {{ modelInfo.precision }}
-        </DescriptionsItem>
-      </Descriptions>
-    </Card>
-    <Card>
-      <BasicTable @register="registerTable">
-        <template #detail="{ record }">
-          <a class="click-status" @click="handleDetail(record)">
-            {{ record.mpName }}
-          </a>
-        <!-- <SlidersOutlined class="click-status" /> -->
-        </template>
-      </BasicTable>
-    </Card>
-    <Card>
-      <BasicForm @register="registerForm" @submit="handleSubmitR">
-        <!--  添加button的插槽  -->
-        <template #configButton="{ field }">
-          <a-button @click="handleFaultConfig(field)">
-            故障配置
-          </a-button>
-        </template>
-      </BasicForm>
-    </Card>
-    <Card :loading="loadingChart">
-      <div>
-        <div v-for="(item, index) in historyList" :key="index">
-          <div style="border:1px solid #ccc">
-            <HistoryLine :is-async="index !== 0" :title="item.title" :data="item.seriesData" :name="item.name" height="250px" />
-          </div>
-        </div>
-      </div>
-    </Card>
-  </div>
-</template>
-
-<style lang="less" scoped>
-:deep(.ant-table-body){
-  height:100% !important;
-  max-height:100% !important
-}
-</style>
diff --git a/src/views/run/instant/instant.data.ts b/src/views/run/instant/instant.data.ts
index 1d38423..c794316 100644
--- a/src/views/run/instant/instant.data.ts
+++ b/src/views/run/instant/instant.data.ts
@@ -82,143 +82,17 @@ export const columns: BasicColumn[] = [
     slots: { customRender: 'status' },
     fixed: 'right',
   },
-
   // {
   //   title: '实时值',
   //   dataIndex: 'value',
   //   width: 90,
   //   className: 'value',
   //   slots: { customRender: 'value' },
-
   // }
-
 ]
 
 const optionList = await optionListApi()
-
 const systemOptions = ref<any>([])
-// systemOptions.value = optionList.systems
-// export const searchFormSchema: FormSchema[] = [
-//   {
-//     label: '机组',
-//     field: 'unit',
-//     component: 'Select',
-//     // defaultValue: optionList.units[0].id || null,
-//     defaultValue: null,
-//
-//     colProps: { span: 4 },
-//
-//     componentProps: ({ schema, tableAction, formActionType, formModel }) => {
-//       return {
-//       // xxxx props
-//         placeholder: '全部机组',
-//         options: optionList.units.map(unit => ({ value: unit.id, label: unit.name })),
-//         onChange: async (e: any) => {
-//           // const { reload } = tableAction
-//           // reload()
-//           // or
-//           console.log(e)
-//           const param: systemSelectParams = {
-//             unitId: e,
-//             typeId: formModel.type,
-//           }
-//           //如果typeId是空，则不设置system'Options
-//           if (!param.typeId || !param.unitId) {
-//             systemOptions.value = []
-//             return
-//           }
-//           systemOptions.value = await subSystemListApi(param)
-//           // formModel.system = systemOptions.value[0].id
-//         },
-//       }
-//     },
-//   },
-//   {
-//     label: '系统',
-//     field: 'type',
-//     component: 'Select',
-//     // defaultValue: optionList.types[0].id || null,
-//     defaultValue:  null,
-//
-//     colProps: { span: 4 },
-//     componentProps: ({ formModel }) => {
-//       return {
-//         placeholder: '全部系统',
-//         options: optionList.types.map(type => ({ value: type.id, label: type.name })),
-//         onChange: async (e: any) => {
-//           // const { reload } = tableAction
-//           // reload()
-//           // or
-//           console.log(e)
-//           const param: systemSelectParams = {
-//             unitId: formModel.unit,
-//             typeId: e,
-//           }
-//           //如果typeId是空，则不设置system'Options
-//           if (!param.typeId || !param.unitId) {
-//             systemOptions.value = []
-//             return
-//           }
-//           systemOptions.value = await subSystemListApi(param)
-//         },
-//       }
-//     },
-//   },
-//   {
-//     label: '子系统',
-//     field: 'system',
-//     component: 'Select',
-//     // defaultValue: systemOptions.value[0].id || null,
-//     defaultValue:  null,
-//     colProps: { span: 4 },
-//     componentProps: () => {
-//       return {
-//         placeholder: '全部子系统',
-//         options: systemOptions.value.map(system => ({ value: system.id, label: system.name })),
-//       }
-//     },
-//   },
-//
-//   {
-//     label: '模型实例名称',
-//     field: 'mpName',
-//     component: 'Input',
-//     labelWidth: 100,
-//
-//     defaultValue: '',
-//     colProps: { span: 5 },
-//   },  {
-//     label: '算法',
-//     field: 'algorithmId',
-//     component: 'Select',
-//     labelWidth: 40,
-//     componentProps: {
-//       placeholder: '全部算法',
-//       options: [{ value: 1, label: "主成分分析(PCA)" }, { value: 2, label: "神经网络(ANN)" }],
-//     },
-//     defaultValue: null,
-//     colProps: { span: 3 },
-//     show:true
-//   },
-//   {
-//     label: '状态1',
-//     field: 'running',
-//     component: 'Input',
-//     show: false,
-//   },
-//   {
-//     label: '状态2',
-//     field: 'runningLog',
-//     component: 'Input',
-//     show: false,
-//   },
-//   {
-//     label: '状态3',
-//     field: 'isUpdate',
-//     component: 'Input',
-//     show: false,
-//   },
-// ]
 /**
  * 获取搜索表单 schema
  * @param showAlgorithm 是否显示算法字段
@@ -233,6 +107,7 @@ export function getSearchFormSchema(showAlgorithm = true): FormSchema[] {
       colProps: { span: 4 },
       componentProps: ({ formModel }) => ({
         placeholder: '全部机组',
+        style: { 'color': 'green', fontSize: '14px' },
         options: optionList.units.map(unit => ({ value: unit.id, label: unit.name })),
         onChange: async (e: any) => {
           const param: systemSelectParams = { unitId: e, typeId: formModel.type }