From c27ee881820a71044e3933c4716d8292b74cd700 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Mon, 10 Mar 2025 20:14:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/views/machine/controlSource/index.vue | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/frontend/src/views/machine/controlSource/index.vue b/frontend/src/views/machine/controlSource/index.vue
index 44be661..6fab329 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 @@
- 通讯校验
+ 通讯校验
+ 源未连接
+ 源连接成功
@@ -316,13 +318,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;
From d5eed13f3854ba17db103bf6f912da61098a1c5e Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Tue, 11 Mar 2025 11:04:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A1=B9=E4=B8=BA1?=
=?UTF-8?q?=E6=9D=A1=E6=97=B6=E4=B9=9F=E5=B1=95=E7=A4=BA=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/dataCheckSingleChannelSingleTestPopup.vue | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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) {
From c058b99a0ddec26d56a2bcbca7a61270ff34051a Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Tue, 11 Mar 2025 11:30:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controlSource/components/controlSourceDetail.vue | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue
index 3b62e1d..4bb4e18 100644
--- a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue
+++ b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue
@@ -271,6 +271,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: '',