Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

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) {

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<controlSource.ResControl>({
         userPageId: '',
         scriptId: '',

frontend/src/views/machine/controlSource/index.vue

@@ -5,7 +5,7 @@
           :inline="true"
           label-width="auto"
           ref="dialogFormRef"
-          class="form-five"
+          class="form-four"
       >
         <el-form-item label='检测源' prop='sourceId' >
           <el-select  v-model="controlContent.sourceId" collapse-tags placeholder="请选择检测源">
@@ -29,7 +29,9 @@
         </el-form-item>
         <el-form-item>
 <!--          <div class="formBut">-->
-            <el-button type="primary" :icon="Select" @click="start()" :disabled="connectDisabeld">通讯校验</el-button>
+          <el-button type="primary" :icon="Select" @click="start()" :disabled="connectDisabeld">通讯校验</el-button>
+          <el-button v-if="!connectDisabeld" type="text" style="color: #303133" disabled>源未连接</el-button>
+          <el-button v-else type="text" style="color: #67c23a" disabled>源连接成功</el-button>
 <!--          </div>-->
         </el-form-item>
       </el-form>
@@ -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;