ptw

.env.local

@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径  http://192.168.188.200:48080  https://iot.deepoil.cc:5443  http://172.26.0.56:48080
-VITE_BASE_URL='http://172.26.0.56:48080'
+VITE_BASE_URL='https://iot.deepoil.cc:5443'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server

src/views/pms/qhse/ptw/index.vue

@@ -463,7 +463,7 @@
           <template #default="scope">
             <el-radio
               :model-value="selectedJSA"
-              :label="scope.row.jsaNo"
+              :label="getJsaSelectionKey(scope.row)"
               @change="handleRadioChange2(scope.row)">
               &nbsp;
             </el-radio>
@@ -972,6 +972,9 @@ const getJSAList = async () => {
 // 选择JSA序号
 const selectJSA = () => {
   dialogJSA.value = true
+  selectedJSA.value = undefined
+  selectedJSARow.value = undefined
+  jsaId.value = 0
   getJSAList()
 }
 
@@ -989,6 +992,8 @@ const resetQuery3 = () => {
 }
 
 let selectedJSA = ref<string | undefined>(undefined)
+let selectedJSARow = ref<any>()
+const getJsaSelectionKey = (row: any) => `${row?.jsaXh || ''}__${row?.jsaNo || ''}`
 const confirmSelectJSA = () => {
   if (!selectedJSA.value) {
     ElMessage.warning('请先选择一个JSA')
@@ -996,17 +1001,20 @@ const confirmSelectJSA = () => {
   }
 
   // 将选中的仪器信息填入表单
-  formData.value.ptwNo = selectedJSA.value
+  formData.value.ptwNo = selectedJSARow.value?.jsaNo || ''
   formData.value.jsaId = jsaId.value
 
   // 关闭选择仪器对话框
   dialogJSA.value = false
   selectedJSA.value = undefined
+  selectedJSARow.value = undefined
+  jsaId.value = 0
 }
 let jsaId = ref(0)
 const handleRadioChange2 = (row: any) => {
   console.log('row', row)
-  selectedJSA.value = row.jsaNo
+  selectedJSA.value = getJsaSelectionKey(row)
+  selectedJSARow.value = row
   jsaId.value = row.id
 }
 </script>