更新

src/views/process-inspection/components/detail-table.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-01-06 14:30:12
+ * @LastEditTime: 2023-06-21 13:31:02
  * @Description:
 -->
 <template>
@@ -143,24 +143,25 @@ export default {
         //   label: "批次号",
         // },
       ];
-      this.featuresList.forEach((item) => {
+      this.featuresList.forEach((item,index) => {
         let obj = {
-          prop: item.name,
+          prop: item.name + index,
           label: item.name,
           fType: item.type,
           lsl: item.lsl,
           usl: item.usl,
+
         };
         this.tableProps.push(obj);
-        this.dataList[0][item.name] = this.workingProcedureName
+        this.dataList[0][item.name + index] = this.workingProcedureName
           ? this.workingProcedureName
           : item.workingProcedureName;
-        this.dataList[1][item.name] = { 1: "计量型", 2: "计数型" }[item.type];
-        this.dataList[2][item.name] = item.lsl;
-        this.dataList[3][item.name] = item.usl;
-        this.dataList[4][item.name] = item.sampleSize;
-        this.dataList[5][item.name] = item.specifications;
-        this.dataList[6][item.name] = item.samplingFrequency;
+        this.dataList[1][item.name + index] = { 1: "计量型", 2: "计数型" }[item.type];
+        this.dataList[2][item.name + index] = item.lsl;
+        this.dataList[3][item.name + index] = item.usl;
+        this.dataList[4][item.name + index] = item.sampleSize;
+        this.dataList[5][item.name + index] = item.specifications;
+        this.dataList[6][item.name + index] = item.samplingFrequency;
       });
       this.getInfluxdb();
       this.dataListLoading = false;

src/views/process-inspection/generalOperation.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-09-15 10:44:29
  * @LastEditors: zwq
- * @LastEditTime: 2023-04-20 10:58:45
+ * @LastEditTime: 2023-06-21 16:27:24
  * @Description: 
 -->
 <template>
@@ -148,7 +148,7 @@
           v-if="tableBtn.length"
           slot="handleBtn"
           :width="150"
-          label="操作"
+          :label="$t('handle')"
           :method-list="tableBtn"
           @clickBtn="handleClick"
         />
@@ -172,6 +172,7 @@
 import basicPage from "@/mixins/basic-page";
 import AddOrUpdate from './components/generalOperation-add'
 import basicFilter from "@/filters/basic-filter";
+import i18n from "@/i18n";
 
 const tableProps = [
   {
@@ -193,7 +194,7 @@ const tableProps = [
   },
   {
     prop: "machineName",
-    label: "机台",
+    label: i18n.t("module.basicData.machine"),
   },
   {
     prop: "workingProcedureName",
@@ -221,17 +222,17 @@ const tableProps = [
   },
   {
     prop: "remark",
-    label: "备注",
+    label: i18n.t("schedule.remark"),
   },
 ];
 const tableBtn = [
   {
     type: "edit",
-    btnName: "编辑",
+    btnName: i18n.t("edit"),
   },
   {
     type: "delete",
-    btnName: "删除",
+    btnName: i18n.t("delete"),
   },
 ];
 export default {