仪器类型

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

@@ -48,9 +48,9 @@
           >
             <el-option
               v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.id"
+              :label="item.dictLabel"
+              :value="item.dictValue"
             />
           </el-select>
         </el-form-item>
@@ -130,24 +130,7 @@ const options = ref([{}]);
 onMounted?.(() => {
   //查询仪器类型,可以初始化查询，也可以在 showDialog 弹框显示的时候查询
   selectInstrumentType({}).then((res) => {
-    options.value = [
-      {
-        value: "Option1",
-        label: "Option1",
-      },
-      {
-        value: "Option2",
-        label: "Option2",
-      },
-      {
-        value: "Option3",
-        label: "Option3",
-      },
-      {
-        value: "Option4",
-        label: "Option4",
-      },
-    ];
+    options.value = res.data;
   });
 });
 </script>

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

@@ -89,7 +89,7 @@ onMounted?.(() => {
 
         <el-table-column label="数据项编码" prop="dataItemCode" />
         <el-table-column label="数据项名称" prop="dataItemName" />
-        <el-table-column label="测试工程id" prop="engineeringId" />
+<!--        <el-table-column label="测试工程id" prop="engineeringId" />-->
         <el-table-column label="设定值" prop="setValue" />
         <el-table-column label="操作" prop="操作" fixed="right">
           <template #default="scope">