微调
This commit is contained in:
@@ -207,10 +207,12 @@ const devIds = ref<string[]>()
|
||||
const standardDevIds = ref<string[]>()
|
||||
|
||||
const open = async () => {
|
||||
console.log('开始打开通道配对')
|
||||
edges.value = []
|
||||
devIds.value = prop.devIdList.map(d => d.id)
|
||||
standardDevIds.value = prop.pqStandardDevList.map(d => d.id)
|
||||
planId.value = prop.planIdKey
|
||||
|
||||
nodes.value = createNodes(prop.devIdList, prop.pqStandardDevList, prop.deviceMonitor)
|
||||
dialogVisible.value = true
|
||||
onPaneReady()
|
||||
|
||||
@@ -482,16 +482,20 @@ watch(webMsgSend, function (newValue, oldValue) {
|
||||
watch(activeIndex, function (newValue, oldValue) {
|
||||
if(props.onlyWave === true)
|
||||
{
|
||||
if (Number(collapseActiveName.value) < activeTotalNum.value - 2) {
|
||||
if(newValue == 2){
|
||||
collapseActiveName.value = '4'
|
||||
}else{
|
||||
collapseActiveName.value = (newValue + 1).toString()
|
||||
}
|
||||
console.log("onlyWave2222",collapseActiveName.value)
|
||||
}
|
||||
} else
|
||||
{
|
||||
if (Number(collapseActiveName.value) < activeTotalNum.value) {
|
||||
collapseActiveName.value = (newValue + 1).toString()
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
//监听goods_sn的变化
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
<SelectTestItemPopup ref="selectTestItemPopupRef" @openTestDialog="openTestDialog"></SelectTestItemPopup>
|
||||
<CompareTestPopup
|
||||
ref="testPopup"
|
||||
:key="compareTestKey"
|
||||
v-if="CompareTestVisible"
|
||||
:devIdList="devIdList"
|
||||
:pqStandardDevList="pqStandardDevList"
|
||||
@@ -70,7 +71,7 @@ const dialogVisible = ref(false)
|
||||
const selectTestItemPopupRef = ref<InstanceType<typeof SelectTestItemPopup>>()
|
||||
const testPopup = ref()
|
||||
const dialogTitle = ref('手动检测')
|
||||
|
||||
const compareTestKey = ref(0)
|
||||
// 计算对话框高度
|
||||
const dialogHeight = ref(600)
|
||||
const CompareTestVisible = ref(false)
|
||||
@@ -266,6 +267,7 @@ const handleNext = async () => {
|
||||
}
|
||||
|
||||
const openTestDialog = async () => {
|
||||
compareTestKey.value++ // 每次调用时更新key
|
||||
CompareTestVisible.value = true
|
||||
// 转换连接信息,只保留设备ID和通道号
|
||||
const connections = edges.value.reduce(
|
||||
|
||||
@@ -636,11 +636,9 @@ function tableHeaderInit(val: number) {
|
||||
case 2: // 设备复检模式
|
||||
break
|
||||
case 3: // 报告生成模式
|
||||
if(modeStore.currentMode === '比对式'){
|
||||
checkStateTable.value = [1,2, 3] // 显示检测中,检测完成和归档状态
|
||||
}else{
|
||||
|
||||
checkStateTable.value = [2, 3] // 显示检测完成和归档状态
|
||||
}
|
||||
|
||||
columns[columns.length - 1].minWidth = 180
|
||||
tableKey.value += 1
|
||||
operationShow.value = true // 显示操作列
|
||||
@@ -697,7 +695,6 @@ function refreshStatusList() {
|
||||
* 校验选中设备的一致性,然后打开通道配对弹窗
|
||||
*/
|
||||
const handleTest2 = async (val: string) => {
|
||||
|
||||
// 检查是否选择了设备
|
||||
if (devNum == 0) {
|
||||
ElMessageBox.confirm('请先选择被检设备', '提示', {
|
||||
@@ -828,7 +825,6 @@ const handleTest2 = async (val: string) => {
|
||||
}
|
||||
|
||||
// 只传递有监测点的设备
|
||||
|
||||
const targetPlan = props.planTable.data.find((item: any) => item.id === props.plan.id);
|
||||
// 检查数组长度是否为1且唯一元素是'wave_data'
|
||||
const isOnlyWave = targetPlan.datasourceIds.length === 1 && targetPlan.datasourceIds[0] === 'wave_data';
|
||||
|
||||
Reference in New Issue
Block a user