ZaiZai 1 gadu atpakaļ
vecāks
revīzija
5c816830bd
1 mainītis faili ar 23 papildinājumiem un 26 dzēšanām
  1. 23 26
      src/views/tentative/acquisition/data.vue

+ 23 - 26
src/views/tentative/acquisition/data.vue

@@ -71,12 +71,12 @@
                 :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
                 :index-style="{ width: 60 }" :check-style="{ width: 29 }" @selection-change="tableSelection"
             >
-                <template #key23="{ row }">
-                    <span v-if="row.key23 === 1" class="text-green">合格</span>
+                <!-- template #dataQualified="{ row }">
+                    <span v-if="row.dataQualified === 1" class="text-green">合格</span>
                     <span v-else class="text-red">不合格</span>
-                </template>
-                <template #key24="{ row }">
-                    <el-tag v-if="row.key24 === 1" type="success" effect="dark">已引用</el-tag>
+                </template -->
+                <template #dataStatus="{ row }">
+                    <el-tag v-if="row.dataStatus === 2" type="success" effect="dark">已引用</el-tag>
                     <el-tag v-else type="info" effect="dark">未引用</el-tag>
                 </template>
             </hc-table>
@@ -221,20 +221,19 @@ const pageChange = ({ current, size }) => {
 
 //表格数据
 const tableColumn = ref([
-    { key: 'key1', name: '工程部位' },
-    { key: 'key2', name: '设备名称' },
-    { key: 'key3', name: '设备采集编号' },
-    { key: 'key4', name: '试验日期' },
-    { key: 'key5', name: '样品编号' },
-    { key: 'key6', name: '试验类型' },
-    { key: 'key7', name: '承压面积(mm2)' },
-    { key: 'key8', name: '试件尺寸(mm)' },
-    { key: 'key9', name: '设计强度(MPa)' },
+    { key: 'engineInfo', name: '工程部位' },
+    { key: 'deviceName', name: '设备名称' },
+    { key: 'equipmentAcquisitionNumber', name: '设备采集编号' },
+    { key: 'testDate', name: '试验日期' },
+    { key: 'specificationNumber', name: '样品编号' },
+    { key: 'testTypeName', name: '试验类型' },
+    { key: 'beArea', name: '承压面积(mm2)' },
+    { key: 'specimenSize', name: '试件尺寸(mm)' },
+    { key: 'desStrength', name: '设计强度(MPa)' },
     { key: 'key10', name: '龄期(d)' },
-    { key: 'key11', name: '荷载1(KN)' },
-    { key: 'key12', name: '荷载1(KN)' },
-    { key: 'key13', name: '荷载2(KN)' },
-    { key: 'key14', name: '荷载3(KN)' },
+    { key: 'load1', name: '荷载1(KN)' },
+    { key: 'load2', name: '荷载2(KN)' },
+    { key: 'load3', name: '荷载3(KN)' },
     { key: 'key15', name: '荷载4(KN)' },
     { key: 'key16', name: '荷载5(KN)' },
     { key: 'key17', name: '荷载6(KN)' },
@@ -243,17 +242,15 @@ const tableColumn = ref([
     {
         name: '最大力总延伸(%)',
         children: [
-            { key: 'key20', name: '1' },
-            { key: 'key21', name: '2' },
-            { key: 'key22', name: '3' },
+            { key: 'maxConceal1', name: '1' },
+            { key: 'maxConceal2', name: '2' },
+            { key: 'maxConceal3', name: '3' },
         ],
     },
-    { key: 'key23', name: '试验结果是否合格', width: 100, align: 'center' },
-    { key: 'key24', name: '数据状态', width: 100, align: 'center' },
-])
-const tableData = ref([
-    { key23: 1, key24:1 }, { key23: 2, key24:2 },
+    { key: 'dataQualified', name: '试验结果是否合格', width: 100, align: 'center' },
+    { key: 'dataStatus', name: '数据状态', width: 100, align: 'center' },
 ])
+const tableData = ref([])
 
 //获取表格数据
 const tableLoading = ref(false)