Merge remote-tracking branch 'origin/master'

# Conflicts:
#	frontend/src/api/device/device/index.ts
This commit is contained in:
caozehui
2025-01-13 18:21:24 +08:00
15 changed files with 205 additions and 81 deletions

View File

@@ -240,7 +240,7 @@ watch(webMsgSend,function (newValue,oldValue){
item.desc === newValue.data.desc &&
item.devName === newValue.data.devName);
if (firstCoefficientVO) { // 检查 firstCoefficientVO 是否存在
firstCoefficientVO.aVuData = parseFloat(newValue.data.aVuData).toFixed(4);;
firstCoefficientVO.aVuData = parseFloat(newValue.data.aVuData).toFixed(4);
firstCoefficientVO.aVuXi = newValue.data.aVuXi;
firstCoefficientVO.bVuData = parseFloat(newValue.data.bVuData).toFixed(4);
firstCoefficientVO.bVuXi = newValue.data.bVuXi;
@@ -555,7 +555,7 @@ const handleSubmit = async () => {
tableLoading('big','系数下装')
await getCoefficientCheck({
userPageId: "cdf",
devIds: devIdArray.value,
devIds:devIdArray.value,
planId:planId.value,
errorSysId: select_Plan.value?.errorSysId,
     scriptId: select_Plan.value?.scriptId,

View File

@@ -21,6 +21,7 @@
<script lang="tsx" setup>
import {CheckData} from "@/api/check/interface";
import { computed } from "vue";
import {useDownload} from "@/hooks/useDownload";
import {exportRawData} from "@/api/check/test"

View File

@@ -928,7 +928,11 @@ const handleTest = async (val:string) => {
return
}
// 检查 socketClient.Instance 是否存在
if (!socketClient.Instance) {
console.error('WebSocket 客户端实例不存在');
return;
}
//开始创建webSocket客户端
const data = reactive({