按lingzong需求修改部分。

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

@@ -28,13 +28,13 @@
           <el-input v-model="formLabelAlign.configName" />
         </el-form-item>
 
-        <el-form-item
-          label="仪器编码	"
-          :label-position="itemLabelPosition"
-          prop="instrumentCode"
-        >
-          <el-input v-model="formLabelAlign.instrumentCode" />
-        </el-form-item>
+        <!--        <el-form-item-->
+        <!--          label="仪器编码	"-->
+        <!--          :label-position="itemLabelPosition"-->
+        <!--          prop="instrumentCode"-->
+        <!--        >-->
+        <!--          <el-input v-model="formLabelAlign.instrumentCode" />-->
+        <!--        </el-form-item>-->
 
         <el-form-item
           label="仪器类型		"
@@ -82,7 +82,7 @@ interface VersionItem {
   configName: string;
   configIp: string;
   instrumentProperty: number;
-  instrumentCode: string;
+  // instrumentCode: string;
 }
 //configIp	配置地址		true
 //configName	配置名称		true
@@ -96,13 +96,17 @@ const formLabelAlign = ref<VersionItem>({
   configName: "",
   configIp: "",
   instrumentProperty: 1,
-  instrumentCode: "",
+  // instrumentCode: "",
 });
 
 const emit = defineEmits(["save"]);
-
+const route = useRoute();
 const saveFun = () => {
-  emit("save", formLabelAlign.value, flag.value);
+  emit(
+    "save",
+    { ...formLabelAlign.value, engineeringId: route.params.engineerId },
+    flag.value
+  );
 };
 
 const props = defineProps(["tabName"]);

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

@@ -87,9 +87,9 @@ onMounted?.(() => {
       <el-table :data="globalDataList" style="width: 100%">
         <el-table-column label="序号" type="index" width="80" />
 
-        <el-table-column label="数据项编码" prop="dataItemCode" />
+        <!--        <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">

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

@@ -119,7 +119,7 @@ const configHandleDelete = (index: number, row: any) => {
         <el-table-column label="序号" type="index" width="80" />
         <el-table-column label="配置地址" prop="configIp" />
         <el-table-column label="配置名称" prop="configName" />
-        <el-table-column label="仪器编码" prop="instrumentCode" />
+        <!--        <el-table-column label="仪器编码" prop="instrumentCode" />-->
         <el-table-column label="仪器类型" prop="typeLabel" />
         <el-table-column label="操作" prop="操作" fixed="right">
           <template #default="scope">

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

@@ -12,13 +12,13 @@
         style="max-width: 600px"
         ref="ruleFormRef"
       >
-        <el-form-item
-          label="数据项编码	"
-          :label-position="itemLabelPosition"
-          prop="dataItemCode"
-        >
-          <el-input v-model="formLabelAlign.dataItemCode" />
-        </el-form-item>
+        <!--        <el-form-item-->
+        <!--          label="数据项编码	"-->
+        <!--          :label-position="itemLabelPosition"-->
+        <!--          prop="dataItemCode"-->
+        <!--        >-->
+        <!--          <el-input v-model="formLabelAlign.dataItemCode" />-->
+        <!--        </el-form-item>-->
 
         <el-form-item
           label="数据项名称	"
@@ -69,7 +69,7 @@ const itemLabelPosition = ref<FormItemProps["labelPosition"]>("");
 interface VersionItem {
   dataItemName: string;
   setValue: string;
-  dataItemCode: string;
+  // dataItemCode: string;
   engineeringId: number;
 }
 
@@ -80,7 +80,7 @@ interface VersionItem {
 const formLabelAlign = ref<VersionItem>({
   dataItemName: "",
   setValue: "",
-  dataItemCode: "",
+  // dataItemCode: "",
   engineeringId: 0,
 });
 

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

@@ -25,11 +25,11 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
       <el-tab-pane label="全局数据" name="全局数据">
         <engrGlobalData />
       </el-tab-pane>
-      <el-tab-pane label="执行终端" name="执行终端">
-        <engrInstrumentConfig :property="2" tabName="执行终端" />
-        <!-- 跟仪器配置一样只是 instrumentProperty 仪器属性(1工程仪器 2执行仪器)
-        仪器类型是字典要选择 -->
-      </el-tab-pane>
+      <!--      <el-tab-pane label="执行终端" name="执行终端">-->
+      <!--        <engrInstrumentConfig :property="2" tabName="执行终端" />-->
+      <!--        &lt;!&ndash; 跟仪器配置一样只是 instrumentProperty 仪器属性(1工程仪器 2执行仪器)-->
+      <!--        仪器类型是字典要选择 &ndash;&gt;-->
+      <!--      </el-tab-pane>-->
     </el-tabs>
 
     <!-- <configAddVue ref="configChildRef" @save="configSaveFun"></configAddVue> -->

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

@@ -38,7 +38,7 @@ const dataList = defineModel<any[]>("dataList");
             </template>
           </el-table-column>
           <el-table-column label="配置名称" prop="configName" />
-          <el-table-column label="仪器编码" prop="instrumentCode" />
+          <!--          <el-table-column label="仪器编码" prop="instrumentCode" />-->
           <el-table-column label="仪器类型" prop="typeLabel" />
         </el-table>
       </el-tab-pane>
@@ -46,10 +46,14 @@ const dataList = defineModel<any[]>("dataList");
         <el-table :data="dataList" style="width: 100%">
           <el-table-column label="序号" type="index" width="80" />
 
-          <el-table-column label="数据项编码" prop="dataItemCode" />
+          <!--          <el-table-column label="数据项编码" prop="dataItemCode" />-->
           <el-table-column label="数据项名称" prop="dataItemName" />
           <!--        <el-table-column label="测试工程id" prop="engineeringId" />-->
-          <el-table-column label="设定值" prop="setValue" />
+          <el-table-column label="设定值" prop="setValue">
+            <template #default="scope">
+              <el-input v-model="scope.row.setValue"></el-input>
+            </template>
+          </el-table-column>
         </el-table>
       </el-tab-pane>
     </el-tabs>