开始执行仪器可以配置 仪器资源

src/views/modules/runTest/components/configDataAndDevice.vue

@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import type { TabsPaneContext } from "element-plus";
 import SecondHeader from "@/views/modules/conmon/SecondHeader.vue";
+import { selectInstrumentResource } from "@/api/config";
 
 const activeName = ref("仪器配置");
 const handleClick = (tab: TabsPaneContext, event: Event) => {
@@ -13,6 +14,16 @@ const devicesData = defineModel<any[]>("devicesData");
 const dataList = defineModel<any[]>("dataList");
 
 // =======================
+const resourceList = ref<any[]>([]);
+const openDrawer = () => {
+  selectInstrumentResource({ instrumentProperty: "1" }).then((data) => {
+    resourceList.value = data.data;
+  });
+};
+
+defineExpose({
+  openDrawer,
+});
 </script>
 
 <template>
@@ -34,7 +45,20 @@ const dataList = defineModel<any[]>("dataList");
 
           <el-table-column label="配置地址" prop="configIp">
             <template #default="scope">
-              <el-input v-model="scope.row.configIp"></el-input>
+              <el-select
+                v-model="scope.row.configIp"
+                placeholder="请选择配置地址"
+                size="large"
+              >
+                <el-option
+                  v-for="item in resourceList.filter(
+                    (item) => item.instrumentType === scope.row.instrumentType
+                  )"
+                  :key="item.id"
+                  :label="item.ip"
+                  :value="item.ip"
+                />
+              </el-select>
             </template>
           </el-table-column>
           <el-table-column label="配置名称" prop="configName" />

src/views/modules/runTest/run-test.vue

@@ -123,7 +123,7 @@ const getExcutingMachines = () => {
 
 // 如果上面选择的项目改变了  要重新调这两个接口
 // todo
-
+const ConfigDataAndDeviceRef = ref();
 const testingMachines = ref<any[]>([]); // 所有routeData里面的测试仪器
 const getExcutingGlobalMachines = async () => {
   let res = await searchExcutingInstrumentConfig(
@@ -147,7 +147,12 @@ const getExcutingGlobalData = async () => {
 
 // 配置这次执行的工程相关的数据和仪器
 const configDrawerVisible = ref(false);
-
+const onClickGlobalConfig = () => {
+  configDrawerVisible.value = true;
+  nextTick(() => {
+    ConfigDataAndDeviceRef.value && ConfigDataAndDeviceRef.value.openDrawer();
+  });
+};
 // 开始测试相关
 const isTesting = ref(false);
 const currentTestingProject = ref<any>();
@@ -495,7 +500,7 @@ const checkStartEnable = (): boolean => {
 
     <div class="content-C">
       <div class="left">
-        <div class="test-btn progress" @click="configDrawerVisible = true">
+        <div class="test-btn progress" @click="onClickGlobalConfig">
           <svg-icon icon-class="project-config" />
           全局配置
         </div>
@@ -587,6 +592,7 @@ const checkStartEnable = (): boolean => {
       direction="ltr"
     >
       <ConfigDataAndDevice
+        ref="ConfigDataAndDeviceRef"
         v-model:devices-data="testingMachines"
         v-model:data-list="excutingGlobalData"
         @close="configDrawerVisible = false"