ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2024-12-25 13:22:54 +08:00
parent af12dc8d0a
commit e4025e39cb
5 changed files with 277 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/api/check/interface/index.ts
View File

@@ -1,6 +1,6 @@
export namespace CheckData { export namespace CheckData {
export interface DataCheck { export interface DataCheck {
testScriptName: string, scriptName: string,
errorSysName: string, errorSysName: string,
dataRule: string, dataRule: string,
deviceName: string, deviceName: string,

405
frontend/src/api/plan/autoTest.json
View File

@@ -1,227 +1,194 @@
{ {
"code": "A0000", "code": "A0000",
"data": [ "data": [
{
"id": "1",
"pid": "0",
"name": "频率准确度检测",
"children": [
{ {
"id": "0", "id": "1-1",
"name": "频率准确度检测", "pid": "1",
"children": [ "name": "额定工作条件下的检测",
{ "children": [
"pid": 0, {
"id": "0-1", "id": "1-1-1",
"name": "额定工作条件下的检测", "pid": "1-1",
"children": [ "name": "输入：频率 42.5Hz..."
{ },
"scriptIdx":1, {
"isChildNode":true, "id": "1-1-2",
"pid": "0-1", "pid": "1-1",
"id": "0-1-1", "name": "输入：频率 50.0Hz..."
"name": "输入：频率 42.5Hz..." },
}, {
{ "id": "1-1-3",
"scriptIdx":2, "pid": "1-1",
"isChildNode":true, "name": "输入：频率 50.05Hz...."
"pid": "0-1", }
"id": "0-1-2", ]
"name": "输入：频率 50.0Hz..."
},
{
"scriptIdx":3,
"isChildNode":true,
"pid": "0-1",
"id": "0-1-3",
"name": "输入：频率 50.05Hz...."
}
]
},
{
"pid": 0,
"id": "0-2",
"name": "电压对频率测量的影响",
"children": [
{
"scriptIdx":4,
"isChildNode":true,
"pid": "0-2",
"id": "0-2-1",
"name": "输入：频率 50.05Hz Ua =10%Un..."
},
{
"scriptIdx":5,
"isChildNode":true,
"pid": "0-2",
"id": "0-2-1",
"name": "输入：频率 51.05Hz Ua =10%Un..."
},
{
"scriptIdx":6,
"isChildNode":true,
"pid": "0-2",
"id": "0-2-2",
"name": "输入：频率 52.05Hz Ua =10%Un..."
}
]
},
{
"pid": 0,
"id": "0-3",
"name": "谐波对频率测量的影响",
"children": [
{
"scriptIdx":7,
"isChildNode":true,
"pid": "0-3",
"id": "0-3-1",
"name": "输入：频率 50.05Hz Ua =100%Un..."
}
]
}
]
}, },
{ {
"id": "1", "id": "1-2",
"name": "电压准确度检测", "pid": "1",
"children": [ "name": "电压对频率测量的影响",
{ "children": [
"pid": 1, {
"id": "1-1", "id": "1-2-1",
"name": "额定工作条件下的检测", "pid": "1-2",
"children": [ "name": "输入：频率 50.05Hz Ua =10%Un..."
{ },
"scriptIdx":8, {
"isChildNode":true, "id": "1-2-1",
"pid": "1-1", "pid": "1-2",
"id": "1-1-1", "name": "输入：频率 51.05Hz Ua =10%Un..."
"name": "输入：频率 42.5Hz..." },
}, {
{ "id": "1-2-2",
"scriptIdx":9, "pid": "1-2",
"isChildNode":true, "name": "输入：频率 52.05Hz Ua =10%Un..."
"pid": "1-1", }
"id": "1-1-2", ]
"name": "输入：频率 50.0Hz..."
},
{
"scriptIdx":10,
"isChildNode":true,
"pid": "1-1",
"id": "1-1-3",
"name": "输入：频率 50.05Hz..."
}
]
},
{
"pid": 0,
"id": "1-2",
"name": "电压对频率测量的影响",
"children": [
{
"scriptIdx":11,
"isChildNode":true,
"pid": "1-2",
"id": "1-2-1",
"name": "输入：频率 50.05Hz Ua =10%Un..."
},
{
"scriptIdx":12,
"isChildNode":true,
"pid": "1-2",
"id": "1-2-1",
"name": "输入：频率 51.05Hz Ua =10%Un..."
},
{
"scriptIdx":13,
"isChildNode":true,
"pid": "1-2",
"id": "1-2-2",
"name": "输入：频率 52.05Hz Ua =10%Un..."
}
]
},
{
"pid": 0,
"id": "0-3",
"name": "谐波对频率测量的影响",
"children": [
{
"scriptIdx":14,
"isChildNode":true,
"pid": "0-3",
"id": "0-3-1",
"name": "输入：频率 50.05Hz Ua =100%Un..."
}
]
}
]
}, },
{ {
"id": "2", "id": "1-3",
"name": "谐波准确度检测", "pid": "1",
"children": [ "name": "谐波对频率测量的影响",
{ "children": [
"pid": 2, {
"id": "2-1", "id": "1-3-1",
"name": "额定工作条件下的检测", "pid": "1-3",
"children": [ "name": "输入：频率 50.05Hz Ua =100%Un..."
{ }
"scriptIdx":15, ]
"pid": "2-1",
"id": "2-1-1",
"name": "输入：频率 42.5Hz..."
},
{
"scriptIdx":16,
"pid": "2-1",
"id": "2-1-2",
"name": "输入：频率 50.0Hz..."
},
{
"scriptIdx":17,
"pid": "2-1",
"id": "2-1-3",
"name": "输入：频率 50.05Hz..."
}
]
},
{
"pid": 2,
"id": "2-2",
"name": "电压对频率测量的影响",
"children": [
{
"scriptIdx":18,
"pid": "2-2",
"id": "2-2-1",
"name": "输入：频率 50.05Hz Ua =10%Un..."
},
{
"scriptIdx":19,
"pid": "2-2",
"id": "2-2-1",
"name": "输入：频率 51.05Hz Ua =10%Un..."
},
{
"scriptIdx":20,
"pid": "2-2",
"id": "2-2-2",
"name": "输入：频率 52.05Hz Ua =10%Un..."
}
]
},
{
"pid": 2,
"id": "2-3",
"name": "谐波对频率测量的影响",
"children": [
{
"scriptIdx":21,
"pid": "2-3",
"id": "2-3-1",
"name": "输入：频率 50.05Hz Ua =100%Un..."
}
]
}
]
} }
] ]
},
{
"id": "2",
"pid": "0",
"name": "电压准确度检测",
"children": [
{
"pid": "2",
"id": "2-1",
"name": "额定工作条件下的检测",
"children": [
{
"id": "2-1-1",
"pid": "2-1",
"name": "输入：频率 42.5Hz..."
},
{
"id": "2-1-2",
"pid": "2-1",
"name": "输入：频率 50.0Hz..."
},
{
"id": "2-1-3",
"pid": "2-1",
"name": "输入：频率 50.05Hz..."
}
]
},
{
"pid": "2",
"id": "2-2",
"name": "电压对频率测量的影响",
"children": [
{
"id": "2-2-1",
"pid": "2-2",
"name": "输入：频率 50.05Hz Ua =10%Un..."
},
{
"id": "2-2-1",
"pid": "2-2",
"name": "输入：频率 51.05Hz Ua =10%Un..."
},
{
"id": "2-2-2",
"pid": "2-2",
"name": "输入：频率 52.05Hz Ua =10%Un..."
}
]
},
{
"pid": "2",
"id": "2-3",
"name": "谐波对频率测量的影响",
"children": [
{
"id": "2-3-1",
"pid": "2-3",
"name": "输入：频率 50.05Hz Ua =100%Un..."
}
]
}
]
},
{
"id": "3",
"pid": "0",
"name": "谐波准确度检测",
"children": [
{
"id": "3-1",
"pid": "3",
"name": "额定工作条件下的检测",
"children": [
{
"id": "3-1-1",
"pid": "3-1",
"name": "输入：频率 42.5Hz..."
},
{
"id": "3-1-2",
"pid": "3-1",
"name": "输入：频率 50.0Hz..."
},
{
"id": "3-1-3",
"pid": "3-1",
"name": "输入：频率 50.05Hz..."
}
]
},
{
"id": "3-2",
"pid": "3",
"name": "电压对频率测量的影响",
"children": [
{
"id": "3-2-1",
"pid": "3-2",
"name": "输入：频率 50.05Hz Ua =10%Un..."
},
{
"id": "3-2-1",
"pid": "3-2",
"name": "输入：频率 51.05Hz Ua =10%Un..."
},
{
"id": "3-2-2",
"pid": "3-2",
"name": "输入：频率 52.05Hz Ua =10%Un..."
}
]
},
{
"id": "3-3",
"pid": "3",
"name": "谐波对频率测量的影响",
"children": [
{
"id": "3-3-1",
"pid": "3-3",
"name": "输入：频率 50.05Hz Ua =100%Un..."
}
]
}
]
} }
]
}

135
frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
View File

@@ -5,7 +5,7 @@
<div class="data-check-head"> <div class="data-check-head">
<el-form :model='formContent' label-width="auto" class="form-three "> <el-form :model='formContent' label-width="auto" class="form-three ">
<el-form-item label="检测脚本"> <el-form-item label="检测脚本">
<el-input v-model='formContent.testScriptName' :disabled="true"/> <el-input v-model='formContent.scriptName' :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="误差体系"> <el-form-item label="误差体系">
<el-input v-model='formContent.errorSysName' :disabled="true"/> <el-input v-model='formContent.errorSysName' :disabled="true"/>
@@ -29,12 +29,12 @@
<div class="content-left-tree"> <div class="content-left-tree">
<div> <div>
<el-radio-group v-model="checkItemSwitch" @change="handleCheckItemSwitch"> <el-radio-group v-model="checkItemSwitch" @change="handleCheckItemSwitch">
<el-radio-button label="不合格测试项" :value="0"/> <el-radio-button label="不符合测试项" :value="0"/>
<el-radio-button label="全部测试项" :value="1"/> <el-radio-button label="全部测试项" :value="1"/>
</el-radio-group> </el-radio-group>
</div> </div>
<div class="content-tree"> <div class="content-tree">
<el-tree :default-expanded-keys="['0', '0-2']" node-key="id" :data="treeData" <el-tree :default-expanded-keys="['1-1-1']" node-key="id" :data="treeData"
:props="defaultProps" @node-click="handleNodeClick"/> :props="defaultProps" @node-click="handleNodeClick"/>
</div> </div>
</div> </div>
@@ -67,68 +67,36 @@ import DataCheckResultTable from './dataCheckResultTable.vue'
import DataCheckRawDataTable from './dataCheckRawDataTable.vue' import DataCheckRawDataTable from './dataCheckRawDataTable.vue'
import {CheckData} from "@/api/check/interface"; import {CheckData} from "@/api/check/interface";
import {data as treeData} from "@/api/plan/autoTest.json"; import {data as treeData} from "@/api/plan/autoTest.json";
import {getCheckItemDetail} from "@/api/check/test";
const {appendToBody} = withDefaults(defineProps<{ const {appendToBody} = withDefaults(defineProps<{
appendToBody: boolean appendToBody: boolean
}>(), {appendToBody: false}) }>(), {appendToBody: false})
const formContent = reactive<CheckData.DataCheck>({ const formContent = reactive<CheckData.DataCheck>({
testScriptName: 'Q/GDW 10650.4-2021 模拟式', scriptName: '',
errorSysName: 'Q/GDW 10650.2-2021', errorSysName: '',
dataRule: '所有值', dataRule: '',
deviceName: '被检设备1', deviceName: '',
monitorIdx: '1', monitorIdx: '',
}) })
const activeName = ref('resultTab') const activeName = ref('resultTab')
// 左侧树被选中的叶子节点id
const checkedScriptId = ref('')
const checkItemSwitch = ref(0) const checkItemSwitch = ref(0)
const currentScriptDsc = ref('电压准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°'); const currentScriptDsc = ref('电压准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
const defaultProps = { const defaultProps = {
children: "children", children: "children",
label: "name", label: "name",
pid: "pid", pid: "pid",
}; };
const monitorIdxList = [ let monitorIdxList: any[] = []
{ // 检测结果表格数据
value: '1',
},
{
value: '2 （不合格）',
},
{
value: '3',
},
{
value: '4 （不合格）',
},
]
// 改变通道号下拉框触发事件
const handleChnNumChange = (data: any) => {
console.log(data);
}
// 切换不合格测试项、全部测试项 触发事件
const handleCheckItemSwitch = (data: any) => {
// 0 不合格测试项、1 全部测试项
if (data === 0) {
} else {
}
}
// 点击左侧树节点触发事件
const handleNodeClick = (data: any) => {
console.log(data);
};
const checkResultTableData = reactive<CheckData.CheckResult[]>([ const checkResultTableData = reactive<CheckData.CheckResult[]>([
{ {
chnNum: '1', chnNum: '1',
@@ -143,7 +111,7 @@ const checkResultTableData = reactive<CheckData.CheckResult[]>([
result: '合格', result: '合格',
} }
]) ])
// 原始数据表格数据
const rawTableData = reactive<CheckData.RawDataItem[]>([ const rawTableData = reactive<CheckData.RawDataItem[]>([
{ {
updateTime: "2024-10-10 09:30:00", updateTime: "2024-10-10 09:30:00",
@@ -267,6 +235,44 @@ const rawTableData = reactive<CheckData.RawDataItem[]>([
} }
]) ])
const defaultExpandedKeys = computed(() => {
})
// 切换不合格测试项、全部测试项 触发事件
const handleCheckItemSwitch = (data: any) => {
// 0 不合格测试项、1 全部测试项
if (data === 0) {
} else {
}
}
// 改变通道号下拉框触发事件
const handleChnNumChange = (data: any) => {
formContent.monitorIdx = data.value
}
watch(() => formContent.monitorIdx, (newVal, oldVal) => {
if (newVal) {
console.log("通道号下拉框", newVal, oldVal);
}
})
// 点击左侧树节点触发事件
const handleNodeClick = (data: any) => {
if (!data.children) {
checkedScriptId.value = data.id
}
};
watch(checkedScriptId, (newVal, oldVal) => {
if (newVal) {
console.log("左侧树被选中的叶子节点id", newVal, oldVal);
// checkResultTableData
}
})
const resultTableRef = ref() const resultTableRef = ref()
const rawDataTableRef = ref() const rawDataTableRef = ref()
@@ -274,7 +280,14 @@ const visible = ref(false)
const close = () => { const close = () => {
//数据清空 //数据清空
Object.assign(formContent, {
scriptName: '',
errorSysName: '',
dataRule: '',
deviceName: '',
monitorIdx: '',
})
checkedScriptId.value = ''
activeName.value = 'rawDataTab' activeName.value = 'rawDataTab'
visible.value = false; visible.value = false;
@@ -290,12 +303,38 @@ const open = async (deviceId: string, chnNum: number, checkItemId?: string) => {
// 数据处理 // 数据处理
monitorIdxList = [
{value: '1',},
{
value: '2 （不合格）',
},
{
value: '3',
},
{
value: '4 （不合格）',
},]
Object.assign(formContent, {
scriptName: 'Q/GDW 10650.4-2021 模拟式',
errorSysName: 'Q/GDW 10650.2-2021',
dataRule: '所有值',
deviceName: '被检设备1',
monitorIdx: monitorIdxList[0].value,
})
checkedScriptId.value = treeData[0].children[0].children[0].id
// checkResultTableData=[]; // checkResultTableData=[];
//formContent.value = ...
visible.value = true; visible.value = true;
} }
const getDefaultLeafNodeId = (treeData: any[]): string => {
let leafNodeId = ''
if (treeData.length > 0) {
const firstNode = treeData[0]
}
return leafNodeId
}
defineExpose({ defineExpose({
open open
}) })

2
frontend/src/views/home/components/test.vue
View File

@@ -248,9 +248,9 @@ watch(testStatus, function (newValue, oldValue) {
watch(webMsgSend, function (newValue, oldValue) { watch(webMsgSend, function (newValue, oldValue) {
if (activeIndex.value <= checkTotal.value) { if (activeIndex.value <= checkTotal.value) {
console.log('检测开始')
switch (newValue.requestId) { switch (newValue.requestId) {
case 'Test_Freq': case 'Test_Freq':
console.log('检测开始')
updateCheckResultView("Freq") updateCheckResultView("Freq")
break; break;
case 'Test_VOL': case 'Test_VOL':

2
frontend/src/views/system/dictionary/dictTree/components/treePopup.vue
View File

@@ -43,7 +43,7 @@
pid: '', pid: '',
pids: '', pids: '',
name: '', name: '',
code: ' ', code: '',
sort: 100, sort: 100,
remark: '', remark: '',
state: 0, state: 0,