仪器资源

src/views/modules/global-config/components/ConfigAdd.vue

@@ -12,13 +12,13 @@
         style="max-width: 600px"
         ref="ruleFormRef"
       >
-        <el-form-item
-          label="配置地址"
-          :label-position="itemLabelPosition"
-          prop="configIp"
-        >
-          <el-input v-model="formLabelAlign.configIp" />
-        </el-form-item>
+        <!--        <el-form-item-->
+        <!--          label="配置地址"-->
+        <!--          :label-position="itemLabelPosition"-->
+        <!--          prop="configIp"-->
+        <!--        >-->
+        <!--          <el-input v-model="formLabelAlign.configIp" />-->
+        <!--        </el-form-item>-->
 
         <el-form-item
           label="配置名称"
@@ -80,7 +80,7 @@ const itemLabelPosition = ref<FormItemProps["labelPosition"]>("");
 interface VersionItem {
   instrumentType: string;
   configName: string;
-  configIp: string;
+  // configIp: string;
   instrumentProperty: number;
   // instrumentCode: string;
 }
@@ -94,7 +94,7 @@ interface VersionItem {
 const formLabelAlign = ref<VersionItem>({
   instrumentType: "",
   configName: "",
-  configIp: "",
+  // configIp: "",
   instrumentProperty: 1,
   // instrumentCode: "",
 });

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

@@ -43,11 +43,11 @@ defineExpose({
         <el-table :data="devicesData" style="width: 100%">
           <el-table-column label="序号" type="index" width="80" />
 
-          <el-table-column label="配置地址" prop="configIp">
+          <el-table-column label="执行仪器" prop="instrumentId">
             <template #default="scope">
               <el-select
-                v-model="scope.row.configIp"
-                placeholder="请选择配置地址"
+                v-model="scope.row.instrumentId"
+                placeholder="请选择执行仪器名称"
                 size="large"
               >
                 <el-option
@@ -55,8 +55,8 @@ defineExpose({
                     (item) => item.instrumentType === scope.row.instrumentType
                   )"
                   :key="item.id"
-                  :label="item.ip"
-                  :value="item.ip"
+                  :label="item.instrumentName"
+                  :value="item.id"
                 />
               </el-select>
             </template>