diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue index 7394290..e166f87 100644 --- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue @@ -341,7 +341,12 @@ const updateTableData = async () => { setCheckResultData(resCheckResult) setRawData(resRawData) checkList.length = 0 - currentCheckItem.value = '' + checkList.push({value: keys1[0], label: resCheckResult.isData === 1? `${keys1[0]}`:resCheckResult.isData === 4? `${keys1[0]}(/)` :`${keys1[0]}(不符合)`}) + if (currentCheckItem.value == checkList[0].value) { + doCurrentCheckItemUpdate(checkList[0].value) + } else { + currentCheckItem.value = checkList[0].value + } } else if (keys1.length != 0) { let tempCheckList = [] for (let [key, value] of resTableData.resultData) { diff --git a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue index de816bb..1df930e 100644 --- a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue +++ b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue @@ -284,6 +284,12 @@ const minute = ref(0) const second = ref(0) const emit = defineEmits(['update:activeName','update:activeIndex','update:startDisabeld','update:pauseDisabled']) + +watch(()=>props.formControl.scriptId,()=>{ + if(props.formControl.scriptId!=''){ + getTree() + } +}) const controlContent = ref({ userPageId: '', scriptId: '', diff --git a/frontend/src/views/machine/controlSource/index.vue b/frontend/src/views/machine/controlSource/index.vue index 376c4eb..943332e 100644 --- a/frontend/src/views/machine/controlSource/index.vue +++ b/frontend/src/views/machine/controlSource/index.vue @@ -5,7 +5,7 @@ :inline="true" label-width="auto" ref="dialogFormRef" - class="form-five" + class="form-four" > @@ -29,7 +29,9 @@ - 通讯校验 + 通讯校验 + 源未连接 + 源连接成功 @@ -327,13 +329,13 @@ defineExpose({ open }) // display: flex; // justify-content: end; //} -.form-five { +.form-four { display: flex; flex-wrap: wrap; // justify-content: space-between; .el-form-item { display: flex; - width: 22.8%; + width: 24.0%; .el-form-item__content { flex: 1;