检测弹窗关闭后页面刷新

# Conflicts:
#	frontend/src/views/machine/freqConverter/components/freqConverterDipChart.vue

build/extraResources/java/application.yml.template

@@ -115,4 +115,10 @@ activate:
   private-key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcUyYhVqczGxblL+o/xZzF/8nf+LjrfUE/dS1aRHM7uMDD0cgCArhjtfneFePrMxt+Z7W8yNBzSarub8qsfhaVNikV7Es7oaeTygfjQXTi2n4AFkir3fM07J08RpWhl5M8f8uWTCuvFUYAw00gq55typqmnbkmJa2VIUy/iQf+cMCP7abz4/jNhUzUR3qA7TV4oMRgTdIEDUp63YF8dOC+JH8XxYrCVeHXV6fLCwmesdMzl0lB2VTEKMfLbXhOmF5g7P9y/16VCcN8UBuZlbyYfn+GAxJOSbeHi5HshOKfoSuD7Jz+3WQZpNavOWjIFExKIU38/CvnJCOP7XBCqpSTAgMBAAECggEAYeWokWRE3TpvwiOZnUpR/aVMdVi75a3ROL5XIpqPV61B+t/bU3cEpl0GF9C5pUeiRi0IoStZb3mI9D1KPW/REKyUWkhabQO1gFYbTnRlkNOn6MILzKX4cwJjDaZeeo4EBPU7N+qHyOOXrU6hdH5FfxhMdV983ajm5eeuupxER1C2kAcIklTeVpTX6EKOgZb5LBp5ssOVm2P42pOauvcRozRcvZmqnErXmukv0H4l3EVNt4rHpTn9riHUC63e8JfiYzVaF6zuNUxv6nHEft0/SRMw11XSTnNfDzcKqgjz6ksFBS/6eQQYKESk+ONC53HUuYHFAknkwsPupDCT2W8FIQKBgQDLHT/xCU3nxGr4vFKBDNaO2D5oK20ECbBO4oDvLWWmQG7f+6TsMy8PgVdMnoL4RfqGlwFAKEpS6KVFHnBVqnNEhcdy9uCI7x7Xx8UnyUtxj1EDTm76uta9Ki9OrlqB6tImDM9+Ya3vGktW37ht4WOx2OsJRhG1dbf6RLwFlH7DWwKBgQDFBxvi5I1BR6hg6Tj7xd2SqOT2Y+BED3xuSYENhWbmMhLJDResaB7mjztbxlYaY2mOE0holWm2uDmVFFhMh4jYXik4hYH8nmDzq9mDpZCZ9pyjYqnAP8THoAa8EbgrUWB8A6BPH4iL3KbMnBfBKY0pIr2xrvnjQjNBAgta7KDRKQKBgCe6oe4wxrdF2TKsC2tIqpMoQxS3Icy/ZGgZr+SYuaBKTCWtoDW/UT40K3JGMxIDBhzbXphBCUCsVt9tM8Xd4EwP6tJW7dZ7B0pnve2pVwNwaAVAiz6p2yUHIle+jN+Koe5lZRSwYIg7WW81tWpwwsJfzqFyvjYDP6hJV4mz4ROvAoGAaRcdnKvjXApomShMqJ4lTPChD3q+SA8qg3jZSOj6tZXHx00gb2kp8jg7pPvpOTIFPy6x1Ha9aCRjMk0ju84fA6lVuzwa1S907wOehUVuF3Eeo1cgy9Y3k3KbpPyeixxgpkUY4JslLdSHc2NemD0dee951qhJyRmqVOZOQDUuoeECgYEAqBw2cAFk3vM97WY06TSldGA8ajVHx3BYRjj+zl62NTQthy8fw3tqxb3c5e8toOmZWKjZvDhg2TRLhsDDQWEYg3LZG87REqVIjgEPcpjNLidjygGX8n3JF2o0O5I/EMvl0s/+LVQONfduOBvhwDqr8QNisbLsyneiAq7umewMolo="
   public-key: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnFMmIVanMxsW5S/qP8Wcxf/J3/i4631BP3UtWkRzO7jAw9HIAgK4Y7X53hXj6zMbfme1vMjQc0mq7m/KrH4WlTYpFexLO6Gnk8oH40F04tp+ABZIq93zNOydPEaVoZeTPH/LlkwrrxVGAMNNIKuebcqapp25JiWtlSFMv4kH/nDAj+2m8+P4zYVM1Ed6gO01eKDEYE3SBA1Ket2BfHTgviR/F8WKwlXh11enywsJnrHTM5dJQdlUxCjHy214TpheYOz/cv9elQnDfFAbmZW8mH5/hgMSTkm3h4uR7ITin6Erg+yc/t1kGaTWrzloyBRMSiFN/Pwr5yQjj+1wQqqUkwIDAQAB"
 
-
+freq-converter:
+  schedule-period: 200 #定时器运行间隔
+  tolerant: 1 #耐受状态
+  dt: 200 #延迟时间ms
+  direction: 0 #0为横向1为纵向
+  allow-error-duration: 6 #暂态持续时间允许最大误差ms
+  allow-error-residual-voltage: 2.0 #暂态幅值允许最多误差%

build/extraResources/mysql/data/DESKTOP-GBBSNH7.pid

@@ -1 +1 @@
-11900
+42428

build/extraResources/mysql/data/binlog.index

@@ -1,13 +1,3 @@
-.\binlog.000023
-.\binlog.000024
-.\binlog.000025
-.\binlog.000026
-.\binlog.000027
-.\binlog.000028
-.\binlog.000029
-.\binlog.000030
-.\binlog.000031
-.\binlog.000032
-.\binlog.000033
 .\binlog.000034
 .\binlog.000035
+.\binlog.000036

frontend/src/layouts/components/Header/components/Avatar.vue

@@ -22,14 +22,6 @@
                     <el-icon><Edit /></el-icon>
                     {{ t('header.changePassword') }}
                 </el-dropdown-item>
-                <el-dropdown-item @click="changeMode" v-if="authStore.showMenuFlag">
-                    <el-icon><Switch /></el-icon>
-                    {{ t('header.changeMode') }}
-                </el-dropdown-item>
-                <el-dropdown-item @click="openDialog('versionRegisterRef')">
-                    <el-icon><SetUp /></el-icon>
-                    {{ t('header.versionRegister') }}
-                </el-dropdown-item>
                 <el-dropdown trigger="hover" placement="left-start" v-if="userStore.userInfo.loginName == 'root'">
                     <div class="custom-dropdown-trigger">
                         <el-icon><Tools /></el-icon>
@@ -62,24 +54,20 @@
     <InfoDialog ref="infoRef"></InfoDialog>
     <!-- passwordDialog -->
     <PasswordDialog ref="passwordRef"></PasswordDialog>
-    <!-- versionRegisterDialog -->
-    <VersionDialog ref="versionRegisterRef"></VersionDialog>
     <!-- ThemeDialog -->
     <ThemeDialog ref="themeRef"></ThemeDialog>
 </template>
 
 <script setup lang="ts">
 import { computed, ref } from 'vue'
-import { HOME_URL, LOGIN_URL } from '@/config'
+import { LOGIN_URL } from '@/config'
 import { useRouter } from 'vue-router'
 import { useUserStore } from '@/stores/modules/user'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import InfoDialog from './InfoDialog.vue'
 import PasswordDialog from './PasswordDialog.vue'
 import ThemeDialog from './ThemeDialog.vue'
-import VersionDialog from '@/views/system/versionRegister/index.vue'
-import { Avatar, Sunny, Switch, Tools } from '@element-plus/icons-vue'
-import { useAuthStore } from '@/stores/modules/auth'
+import { Avatar, Sunny, Tools } from '@element-plus/icons-vue'
 import { useDictStore } from '@/stores/modules/dict'
 import { useAppSceneStore } from '@/stores/modules/mode'
 import { useI18n } from 'vue-i18n'
@@ -90,7 +78,6 @@ const dictStore = useDictStore()
 const username = computed(() => userStore.userInfo.name)
 
 const router = useRouter()
-const authStore = useAuthStore()
 
 // 初始化 i18n
 const { t } = useI18n() // 使用 t 方法替代 $t
@@ -111,12 +98,10 @@ const logout = () => {
 // 打开修改密码和个人信息弹窗
 const infoRef = ref<InstanceType<typeof InfoDialog> | null>(null)
 const passwordRef = ref<InstanceType<typeof PasswordDialog> | null>(null)
-const versionRegisterRef = ref<InstanceType<typeof VersionDialog> | null>(null)
 const themeRef = ref<InstanceType<typeof ThemeDialog> | null>(null)
 const openDialog = (ref: string) => {
     if (ref == 'infoRef') infoRef.value?.openDialog()
     if (ref == 'passwordRef') passwordRef.value?.openDialog()
-    if (ref == 'versionRegisterRef') versionRegisterRef.value?.openDialog()
     if (ref == 'themeRef') themeRef.value?.openDialog()
 }
 
@@ -130,10 +115,6 @@ const changeScene = async (value: string) => {
 }
 
 //模式切换
-const changeMode = async () => {
-    authStore.changeModel()
-    await router.push(HOME_URL)
-}
 </script>
 
 <style scoped lang="scss">

frontend/src/stores/modules/mode.ts

@@ -1,9 +1,11 @@
 // src/stores/modules/mode.ts
 import { defineStore } from 'pinia'
 
+export const DEFAULT_MODE = '模拟式'
+
 export const useModeStore = defineStore('mode', {
     state: () => ({
-        currentMode: localStorage.getItem('currentMode') || ('' as string)
+        currentMode: localStorage.getItem('currentMode') || DEFAULT_MODE
     }),
     actions: {
         setCurrentMode(modeName: string) {

frontend/src/stores/modules/user.ts

@@ -4,7 +4,7 @@ import piniaPersistConfig from '@/stores/helper/persist'
 import { USER_STORE_KEY } from '@/stores/constant'
 import { logoutApi } from '@/api/user/login'
 import { useAuthStore } from '@/stores/modules/auth'
-import { useAppSceneStore, useModeStore } from '@/stores/modules/mode'
+import { DEFAULT_MODE, useAppSceneStore, useModeStore } from '@/stores/modules/mode'
 import { useDictStore } from '@/stores/modules/dict'
 
 export const useUserStore = defineStore(USER_STORE_KEY, {
@@ -48,7 +48,7 @@ export const useUserStore = defineStore(USER_STORE_KEY, {
             this.setUserInfo({ id: '', name: '', loginName: '' })
             this.setIsRefreshToken(false)
             dictStore.setDictData([])
-            modeStore.setCurrentMode('')
+            modeStore.setCurrentMode(DEFAULT_MODE)
             appSceneStore.setCurrentMode('')
             await authStore.resetAuthStore()
         }

frontend/src/views/machine/freqConverter/components/freqConverterDipChart.vue

@@ -82,7 +82,6 @@ const CHARACTERISTIC_POINT_COLOR = '#ff4d4f'
 
 const chartPoints = ref<ChartPoint[]>([])
 const characteristicCurveData = ref<CharacteristicCurvePoint[]>([])
-const drawnCharacteristicCurveData = ref<CharacteristicCurvePoint[]>([])
 const characteristicCurveVisible = ref(false)
 const chartRef = ref<any>(null)
 
@@ -127,8 +126,8 @@ const sortedChartPoints = computed(() => {
 const sortedCharacteristicCurveData = computed(() => {
   return [...characteristicCurveData.value].sort((a, b) => {
     // 保留1位小数
-    let aResidualVoltage = Math.floor(a.residualVoltage * 10) / 10
-    let bResidualVoltage = Math.floor(b.residualVoltage * 10) / 10
+    let aResidualVoltage = Math.floor(a.residualVoltage)
+    let bResidualVoltage = Math.floor(b.residualVoltage)
     if (aResidualVoltage != bResidualVoltage) {
       return a.residualVoltage - b.residualVoltage;
     } else {
@@ -152,35 +151,12 @@ const sortedCharacteristicCurveData = computed(() => {
   })
 })
 
-const sortedDrawnCharacteristicCurveData = computed(() => {
-  return [...drawnCharacteristicCurveData.value].sort((a, b) => {
-    if (a.timeMs !== null && b.timeMs !== null && a.timeMs !== b.timeMs) {
-      return a.timeMs - b.timeMs
-    }
-
-    if (a.timeMs !== null && b.timeMs === null) {
-      return -1
-    }
-
-    if (a.timeMs === null && b.timeMs !== null) {
-      return 1
-    }
-
-    if (a.duration !== b.duration) {
-      return a.duration - b.duration
-    }
-
-    return a.residualVoltage - b.residualVoltage
-  })
-})
-
 const solidCharacteristicCurveSeriesData = computed(() => {
   if (!characteristicCurveVisible.value) {
     return [] as Array<[number, number, string]>
   }
 
-  const curveSource = props.autoDrawCurve ? sortedCharacteristicCurveData.value : sortedDrawnCharacteristicCurveData.value
-  return curveSource.map(item => [item.duration, item.residualVoltage, '特性曲线'])
+  return sortedCharacteristicCurveData.value.map(item => [item.duration, item.residualVoltage, '特性曲线'])
 })
 
 const characteristicCurvePointSeriesData = computed(() => {
@@ -517,13 +493,11 @@ const updateCharacteristicCurveVisibility = () => {
 
 const drawCharacteristicCurve = () => {
   if (!sortedCharacteristicCurveData.value.length) {
-    drawnCharacteristicCurveData.value = []
     characteristicCurveVisible.value = false
     ElMessage.warning('暂无特性曲线点')
     return
   }
 
-  drawnCharacteristicCurveData.value = [...sortedCharacteristicCurveData.value]
   characteristicCurveVisible.value = true
 }
 
@@ -741,9 +715,8 @@ watch(
   () => props.autoDrawCurve,
   newValue => {
     characteristicCurveVisible.value = newValue ? characteristicCurveData.value.length > 0 : false
-      drawnCharacteristicCurveData.value = newValue ? [...characteristicCurveData.value] : []
   },
-    {immediate: true}
+  { immediate: true }
 )
 
 watch(
@@ -792,7 +765,6 @@ watch(
   () => {
     chartPoints.value = []
     characteristicCurveData.value = []
-      drawnCharacteristicCurveData.value = []
     characteristicCurveVisible.value = false
   }
 )

frontend/src/views/machine/freqConverter/components/freqConverterPopup.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 基础信息弹出框 -->
-  <el-dialog :model-value="dialogVisible" :title="dialogTitle" v-bind="dialogMiddle" @close="close" align-center>
+  <el-dialog :model-value="dialogVisible" :title="dialogTitle" v-bind="dialogMiddle" @close="close" @closed="handleClosed" align-center>
     <div>
       <el-form :model="formContent" ref='dialogFormRef' :rules='baseRules' class="form-two">
         <el-form-item label="名称" prop="name">
@@ -161,6 +161,10 @@ const close = () => {
   dialogFormRef.value?.resetFields()
 }
 
+const handleClosed = async () => {
+  await props.refreshTable?.()
+}
+
 // 保存数据
 const save = () => {
   try {
@@ -173,8 +177,6 @@ const save = () => {
         }
         ElMessage.success({message: `${dialogTitle.value}成功！`})
         close()
-        // 刷新表格
-        await props.refreshTable!()
       }
     })
   } catch (err) {
@@ -199,7 +201,7 @@ const open = async (sign: string, data: Partial<FreqConverter.ResFreqConverter>
 // 对外映射
 defineExpose({open})
 const props = defineProps<{
-  refreshTable: (() => Promise<void>) | undefined;
+  refreshTable?: (() => Promise<void>) | (() => void);
 }>()
 
 </script>

frontend/src/views/machine/freqConverter/components/freqConverterResultPopup.vue

@@ -7,6 +7,7 @@
     destroy-on-close
     align-center
     @close="handleClose"
+    @closed="handleClosed"
   >
     <div v-loading="loading" class="freq-converter-result-popup">
       <FreqConverterDipChart
@@ -35,6 +36,10 @@ import {getFreqConverterResult} from '@/api/device/freqConverter'
 import {type FreqConverter} from '@/api/device/interface/freqConverter'
 import FreqConverterDipChart from '@/views/machine/freqConverter/components/freqConverterDipChart.vue'
 
+const props = defineProps<{
+  refreshTable?: (() => Promise<void>) | (() => void);
+}>()
+
 const dialogVisible = ref(false)
 const loading = ref(false)
 const resultPayload = ref<any[]>([])
@@ -84,6 +89,10 @@ const handleClose = () => {
   resetState()
 }
 
+const handleClosed = async () => {
+  await props.refreshTable?.()
+}
+
 const open = async (row: FreqConverter.ResFreqConverter) => {
   if (!row.id) {
     ElMessage.warning('未获取到变频器ID')

frontend/src/views/machine/freqConverter/components/freqConverterTestPopup.vue

@@ -10,6 +10,7 @@
     :show-close="true"
     :close-on-press-escape="false"
     :before-close="handleBeforeClose"
+    @closed="handleClosed"
     destroy-on-close
     align-center
   >
@@ -123,6 +124,30 @@ const normalizeFormalRealPayload = (payload: any) => {
   }
 }
 
+const extractResultArray = (payload: any) => {
+  if (Array.isArray(payload)) {
+    return payload
+  }
+
+  if (Array.isArray(payload?.data)) {
+    return payload.data
+  }
+
+  if (Array.isArray(payload?.data?.records)) {
+    return payload.data.records
+  }
+
+  if (Array.isArray(payload?.records)) {
+    return payload.records
+  }
+
+  if (Array.isArray(payload?.list)) {
+    return payload.list
+  }
+
+  return [] as any[]
+}
+
 const handleSocketMessage = (payload: any) => {
   const requestId = `${payload?.requestId ?? ''}`
   const normalizedRequestId = requestId.trim().toLowerCase()
@@ -193,6 +218,10 @@ const closeDialog = () => {
   resetState()
 }
 
+const handleClosed = async () => {
+  await props.refreshTable?.()
+}
+
 const stopDetect = async () => {
   if (!startDetectSuccess.value) {
     return
@@ -253,7 +282,6 @@ const handleBeforeClose = async (done: () => void) => {
   if (hasSocketError.value) {
     await stopDetect()
     closeDialog()
-    await props.refreshTable?.()
     done()
     return
   }
@@ -262,7 +290,6 @@ const handleBeforeClose = async (done: () => void) => {
     await confirmExit()
     await stopDetect()
     closeDialog()
-    await props.refreshTable?.()
     done()
   } catch {
     // 用户取消关闭
@@ -289,7 +316,7 @@ const handleStart = async () => {
         const historyResult = await getFreqConverterResult({
           converterId: mapping.freqConverterId
         })
-        historyResultData.value = historyResult?.data ?? historyResult
+        historyResultData.value = extractResultArray(historyResult?.data ?? historyResult)
       } else {
         historyResultData.value = null
       }
@@ -329,7 +356,6 @@ const handleExit = async () => {
 
   await stopDetect()
   closeDialog()
-  await props.refreshTable?.()
 }
 
 const open = (row: FreqConverter.ResFreqConverter) => {

frontend/src/views/machine/freqConverter/index.vue

@@ -66,7 +66,7 @@
 
   <FreqConverterPopup :refresh-table="proTable?.getTableList" ref="freqConverterPopup" />
   <FreqConverterTestPopup :refresh-table="proTable?.getTableList" ref="freqConverterTestPopup" />
-  <FreqConverterResultPopup ref="freqConverterResultPopup" />
+  <FreqConverterResultPopup :refresh-table="proTable?.getTableList" ref="freqConverterResultPopup" />
 </template>
 
 <script setup lang="tsx" name="freqConverter">