Răsfoiți Sursa

数据采集分类修改

duy 8 luni în urmă
părinte
comite
ea2d39f7eb
1 a modificat fișierele cu 18 adăugiri și 9 ștergeri
  1. 18 9
      src/views/tentative/acquisition/data.vue

+ 18 - 9
src/views/tentative/acquisition/data.vue

@@ -182,9 +182,9 @@ const menuSelect = (parent, item) => {
     //压力机
     if (parent.dictKey === '1') {
         tableColumn.value = [
-            { key: 'engineInfo', name: '工程部位' },
-            { key: 'deviceName', name: '设备名称' },
-            { key: 'equipmentAcquisitionNumber', name: '设备采集编号', width: 180, align: 'center' },
+            // { key: 'engineInfo', name: '工程部位' },
+            // { key: 'deviceName', name: '设备名称' },
+            // { key: 'equipmentAcquisitionNumber', name: '设备采集编号', width: 180, align: 'center' },
             { key: 'testDate', name: '试验日期', width: 160, align: 'center' },
             { key: 'specificationNumber', name: '样品编号', width: 180, align: 'center' },
             { key: 'testTypeName', name: '试验类型', width: 100, align: 'center' },
@@ -209,13 +209,16 @@ const menuSelect = (parent, item) => {
             },
             //{ key: 'dataQualified', name: '试验结果是否合格', width: 100, align: 'center' },
             { key: 'dataStatus', name: '数据状态', width: 100, align: 'center' },
+            { key: 'engineInfo', name: '工程部位' },
+            { key: 'deviceName', name: '设备名称' },
+            { key: 'equipmentAcquisitionNumber', name: '设备采集编号', width: 180, align: 'center' },
         ]
     } else if (parent.dictKey === '2') {
         //万能机
         tableColumn.value = [
-            { key: 'engineInfo', name: '工程部位' },
-            { key: 'deviceName', name: '设备名称' },
-            { key: 'equipmentAcquisitionNumber', name: '设备采集编号', width: 180, align: 'center' },
+            // { key: 'engineInfo', name: '工程部位' },
+            // { key: 'deviceName', name: '设备名称' },
+            // { key: 'equipmentAcquisitionNumber', name: '设备采集编号', width: 180, align: 'center' },
             { key: 'testDate', name: '试验日期', width: 160, align: 'center' },
             { key: 'specificationNumber', name: '样品编号', width: 180, align: 'center' },
             { key: 'testTypeName', name: '试验类型', width: 100, align: 'center' },
@@ -289,6 +292,9 @@ const menuSelect = (parent, item) => {
                 ],
             },
             { key: 'dataStatus', name: '数据状态', width: 100, align: 'center' },
+            { key: 'engineInfo', name: '工程部位' },
+            { key: 'deviceName', name: '设备名称' },
+            { key: 'equipmentAcquisitionNumber', name: '设备采集编号', width: 180, align: 'center' },
         ]
     }
     //获取表格数据
@@ -347,9 +353,9 @@ const pageChange = ({ current, size }) => {
 
 //表格数据
 const tableColumn = ref([
-    { key: 'engineInfo', name: '工程部位' },
-    { key: 'deviceName', name: '设备名称' },
-    { key: 'equipmentAcquisitionNumber', name: '设备采集编号', width: 180, align: 'center' },
+    // { key: 'engineInfo', name: '工程部位' },
+    // { key: 'deviceName', name: '设备名称' },
+    // { key: 'equipmentAcquisitionNumber', name: '设备采集编号', width: 180, align: 'center' },
     { key: 'testDate', name: '试验日期', width: 160, align: 'center' },
     { key: 'specificationNumber', name: '样品编号', width: 180, align: 'center' },
     { key: 'testTypeName', name: '试验类型', width: 100, align: 'center' },
@@ -374,6 +380,9 @@ const tableColumn = ref([
     },
     //{ key: 'dataQualified', name: '试验结果是否合格', width: 100, align: 'center' },
     { key: 'dataStatus', name: '数据状态', width: 100, align: 'center' },
+    { key: 'engineInfo', name: '工程部位' },
+    { key: 'deviceName', name: '设备名称' },
+    { key: 'equipmentAcquisitionNumber', name: '设备采集编号', width: 180, align: 'center' },
 ])
 const tableData = ref([])