This commit is contained in:
sjl
2025-09-25 08:51:40 +08:00
parent 5ccd1709a5
commit 21c859c8f1
4 changed files with 19 additions and 15 deletions

View File

@@ -207,10 +207,12 @@ const devIds = ref<string[]>()
const standardDevIds = ref<string[]>() const standardDevIds = ref<string[]>()
const open = async () => { const open = async () => {
console.log('开始打开通道配对')
edges.value = [] edges.value = []
devIds.value = prop.devIdList.map(d => d.id) devIds.value = prop.devIdList.map(d => d.id)
standardDevIds.value = prop.pqStandardDevList.map(d => d.id) standardDevIds.value = prop.pqStandardDevList.map(d => d.id)
planId.value = prop.planIdKey planId.value = prop.planIdKey
nodes.value = createNodes(prop.devIdList, prop.pqStandardDevList, prop.deviceMonitor) nodes.value = createNodes(prop.devIdList, prop.pqStandardDevList, prop.deviceMonitor)
dialogVisible.value = true dialogVisible.value = true
onPaneReady() onPaneReady()

View File

@@ -482,15 +482,19 @@ watch(webMsgSend, function (newValue, oldValue) {
watch(activeIndex, function (newValue, oldValue) { watch(activeIndex, function (newValue, oldValue) {
if(props.onlyWave === true) if(props.onlyWave === true)
{ {
if(newValue == 2){ if (Number(collapseActiveName.value) < activeTotalNum.value - 2) {
collapseActiveName.value = '4' if(newValue == 2){
}else{ collapseActiveName.value = '4'
}else{
collapseActiveName.value = (newValue + 1).toString()
}
}
} else
{
if (Number(collapseActiveName.value) < activeTotalNum.value) {
collapseActiveName.value = (newValue + 1).toString() collapseActiveName.value = (newValue + 1).toString()
} }
console.log("onlyWave2222",collapseActiveName.value)
} else
{
collapseActiveName.value = (newValue + 1).toString()
} }
}) })

View File

@@ -42,6 +42,7 @@
<SelectTestItemPopup ref="selectTestItemPopupRef" @openTestDialog="openTestDialog"></SelectTestItemPopup> <SelectTestItemPopup ref="selectTestItemPopupRef" @openTestDialog="openTestDialog"></SelectTestItemPopup>
<CompareTestPopup <CompareTestPopup
ref="testPopup" ref="testPopup"
:key="compareTestKey"
v-if="CompareTestVisible" v-if="CompareTestVisible"
:devIdList="devIdList" :devIdList="devIdList"
:pqStandardDevList="pqStandardDevList" :pqStandardDevList="pqStandardDevList"
@@ -70,7 +71,7 @@ const dialogVisible = ref(false)
const selectTestItemPopupRef = ref<InstanceType<typeof SelectTestItemPopup>>() const selectTestItemPopupRef = ref<InstanceType<typeof SelectTestItemPopup>>()
const testPopup = ref() const testPopup = ref()
const dialogTitle = ref('手动检测') const dialogTitle = ref('手动检测')
const compareTestKey = ref(0)
// 计算对话框高度 // 计算对话框高度
const dialogHeight = ref(600) const dialogHeight = ref(600)
const CompareTestVisible = ref(false) const CompareTestVisible = ref(false)
@@ -266,6 +267,7 @@ const handleNext = async () => {
} }
const openTestDialog = async () => { const openTestDialog = async () => {
compareTestKey.value++ // 每次调用时更新key
CompareTestVisible.value = true CompareTestVisible.value = true
// 转换连接信息只保留设备ID和通道号 // 转换连接信息只保留设备ID和通道号
const connections = edges.value.reduce( const connections = edges.value.reduce(

View File

@@ -636,11 +636,9 @@ function tableHeaderInit(val: number) {
case 2: // 设备复检模式 case 2: // 设备复检模式
break break
case 3: // 报告生成模式 case 3: // 报告生成模式
if(modeStore.currentMode === '比对式'){
checkStateTable.value = [1,2, 3] // 显示检测中,检测完成和归档状态 checkStateTable.value = [2, 3] // 显示检测完成和归档状态
}else{
checkStateTable.value = [2, 3] // 显示检测完成和归档状态
}
columns[columns.length - 1].minWidth = 180 columns[columns.length - 1].minWidth = 180
tableKey.value += 1 tableKey.value += 1
operationShow.value = true // 显示操作列 operationShow.value = true // 显示操作列
@@ -697,7 +695,6 @@ function refreshStatusList() {
* 校验选中设备的一致性,然后打开通道配对弹窗 * 校验选中设备的一致性,然后打开通道配对弹窗
*/ */
const handleTest2 = async (val: string) => { const handleTest2 = async (val: string) => {
// 检查是否选择了设备 // 检查是否选择了设备
if (devNum == 0) { if (devNum == 0) {
ElMessageBox.confirm('请先选择被检设备', '提示', { ElMessageBox.confirm('请先选择被检设备', '提示', {
@@ -828,7 +825,6 @@ const handleTest2 = async (val: string) => {
} }
// 只传递有监测点的设备 // 只传递有监测点的设备
const targetPlan = props.planTable.data.find((item: any) => item.id === props.plan.id); const targetPlan = props.planTable.data.find((item: any) => item.id === props.plan.id);
// 检查数组长度是否为1且唯一元素是'wave_data' // 检查数组长度是否为1且唯一元素是'wave_data'
const isOnlyWave = targetPlan.datasourceIds.length === 1 && targetPlan.datasourceIds[0] === 'wave_data'; const isOnlyWave = targetPlan.datasourceIds.length === 1 && targetPlan.datasourceIds[0] === 'wave_data';