diff --git a/frontend/src/api/check/interface/index.ts b/frontend/src/api/check/interface/index.ts index 509dd70..2309b3a 100644 --- a/frontend/src/api/check/interface/index.ts +++ b/frontend/src/api/check/interface/index.ts @@ -7,13 +7,17 @@ export namespace CheckData { chnNum: string, } + export interface PhaseCheckResult { + standardValue: number, + + } /** * 用于定义 查看(设备)通道检测结果 类型 */ export interface CheckResult { chnNum: string, standardValue: number, - A?: number, + dataA?: number, A_errValue?: number, B?: number, B_errValue?: number, diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue index 0546cf3..4c6879b 100644 --- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue @@ -35,7 +35,8 @@
+ :data="treeDataUnqualified" :props="defaultProps" @node-click="handleNodeClick" + class="custom-tree"> @@ -51,10 +52,18 @@
- 当前检测项目 -
- {{ currentDesc ? currentDesc : "无" }} -
+ 当前检测项目: + + + + + + +
@@ -122,6 +131,9 @@ let treeDataAll: CheckData.TreeItem[] = [] // 左侧树被选中的叶子节点id const checkIndex = ref('') +// 当前检测项目名称 +const currentScriptTypeName = ref('') +// 当前检测项目描述 const currentDesc = ref(''); // 右侧Tab选中项 const activeTab = ref('resultTab') @@ -138,6 +150,7 @@ let defaultExpandedKeys: string[] = [] const handleNodeClick = async (data: any) => { if (!data.children) { checkIndex.value = data.index + currentScriptTypeName.value = data.scriptTypeName currentDesc.value = data.sourceDesc if (checkIndex.value) { @@ -281,10 +294,12 @@ const defaultOperate = () => { node = getDefaultNode(treeDataAll) } if (node) { + currentScriptTypeName.value = node.scriptTypeName currentDesc.value = node.sourceDesc checkIndex.value = node.index defaultExpandedKeys = [node.index] } else { + currentScriptTypeName.value = '' currentDesc.value = '' checkIndex.value = '' defaultExpandedKeys = [] @@ -310,6 +325,7 @@ const updateTableData = async () => { maxErrVaule: 0.05774, result: '合格', }]) + Object.assign(rawTableData, [ { updateTime: "2024-10-10 09:30:00", @@ -494,6 +510,7 @@ const close = () => { defaultExpandedKeys = [] checkIndex.value = '' activeTab.value = 'resultTab' + currentScriptTypeName.value = '' currentDesc.value = '' switchItem = 0 @@ -651,29 +668,44 @@ defineExpose({ flex: 1; .content-right-title { - .el-divider--horizontal { - //margin-top: 0px; - margin-bottom: 5px; - height: 20px; - } + margin-top: 10px; + line-height: 1.5; - .content-right-title-desc { + .content-right-title-text { font-size: 16px; - height: 48px; - max-height: 48px; - overflow-y: auto; + font-weight: bold; } } - .content-right-Tabs { - box-sizing: border-box; - margin-top: 20px; - margin-bottom: 10px; - max-height: 400px; - } + //.el-divider--horizontal { + // //margin-top: 0px; + // margin-bottom: 5px; + // height: 20px; + //} + + //.content-right-title-desc { + // font-size: 16px; + // height: 48px; + // max-height: 48px; + // overflow-y: auto; + //} + } + + .content-right-Tabs { + box-sizing: border-box; + margin-top: 10px; + margin-bottom: 10px; + max-height: 400px; } } } } - - \ No newline at end of file + + + + + + + + + \ No newline at end of file