ZaiZai 1 год назад
Родитель
Сommit
dad9853ec6
2 измененных файлов с 85 добавлено и 85 удалено
  1. 2 2
      src/config/index.json
  2. 83 83
      src/views/tentative/acquisition/data.vue

+ 2 - 2
src/config/index.json

@@ -1,7 +1,7 @@
 {
     "version": "20230607160059",
-    "target": "http://192.168.0.102:8090",
-    "target1": "http://39.108.216.210:8090",
+    "target1": "http://192.168.0.102:8090",
+    "target": "http://39.108.216.210:8090",
     "smsPhone": "",
     "vite": {
         "port": 5174,

+ 83 - 83
src/views/tentative/acquisition/data.vue

@@ -178,31 +178,31 @@ const menuSelect = (parent, item) => {
         tableColumn.value = [
             { 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: '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)' },
-            { key: 'key18', name: '其余荷载(KN)' },
-            { key: 'key19', name: '强度代表值(MPa)' },
+            { 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' },
+            { key: 'beArea', name: '承压面积(mm2)', width: 100, align: 'center' },
+            { key: 'specimenSize', name: '试件尺寸(mm)', width: 100, align: 'center' },
+            { key: 'desStrength', name: '设计强度(MPa)', width: 100, align: 'center' },
+            { key: 'key10', name: '龄期(d)', width: 100, align: 'center' },
+            { key: 'load1', name: '荷载1(KN)', width: 100, align: 'center' },
+            { key: 'load2', name: '荷载2(KN)', width: 100, align: 'center' },
+            { key: 'load3', name: '荷载3(KN)', width: 100, align: 'center' },
+            { key: 'key15', name: '荷载4(KN)', width: 100, align: 'center' },
+            { key: 'key16', name: '荷载5(KN)', width: 100, align: 'center' },
+            { key: 'key17', name: '荷载6(KN)', width: 100, align: 'center' },
+            { key: 'key18', name: '其余荷载(KN)', width: 100, align: 'center' },
+            { key: 'key19', name: '强度代表值(MPa)', width: 100, align: 'center' },
             {
                 name: '最大力总延伸(%)',
                 children: [
-                    { key: 'maxConceal1', name: '1' },
-                    { key: 'maxConceal2', name: '2' },
-                    { key: 'maxConceal3', name: '3' },
+                    { key: 'maxConceal1', name: '1', width: 100, align: 'center' },
+                    { key: 'maxConceal2', name: '2', width: 100, align: 'center' },
+                    { key: 'maxConceal3', name: '3', width: 100, align: 'center' },
                 ],
             },
-            { key: 'dataQualified', name: '试验结果是否合格', width: 100, align: 'center' },
+            //{ key: 'dataQualified', name: '试验结果是否合格', width: 100, align: 'center' },
             { key: 'dataStatus', name: '数据状态', width: 100, align: 'center' },
         ]
     } else if (parent.dictKey === '2') {
@@ -210,77 +210,77 @@ const menuSelect = (parent, item) => {
         tableColumn.value = [
             { key: 'engineInfo', name: '工程部位' },
             { key: 'deviceName', name: '设备名称' },
-            { key: 'equipmentAcquisitionNumber', name: '设备采集编号' },
-            { key: 'testDate', name: '试验日期' },
-            { key: 'specificationNumber', name: '样品编号' },
-            { key: 'testTypeName', name: '试验类型' },
-            { key: 'key1', name: '牌号' },
-            { key: 'key2', name: '公称直径(mm)' },
-            { key: 'key3', 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' },
+            { key: 'key1', name: '牌号', width: 100, align: 'center' },
+            { key: 'key2', name: '公称直径(mm)', width: 100, align: 'center' },
+            { key: 'key3', name: '规格', width: 100, align: 'center' },
             {
                 name: '最大力/荷载(KN)',
                 children: [
-                    { key: 'key4', name: '1' },
-                    { key: 'key5', name: '2' },
-                    { key: 'key6', name: '3' },
-                    { key: 'key7', name: '4' },
-                    { key: 'key8', name: '5' },
-                    { key: 'key9', name: '6' },
+                    { key: 'key4', name: '1', width: 100, align: 'center' },
+                    { key: 'key5', name: '2', width: 100, align: 'center' },
+                    { key: 'key6', name: '3', width: 100, align: 'center' },
+                    { key: 'key7', name: '4', width: 100, align: 'center' },
+                    { key: 'key8', name: '5', width: 100, align: 'center' },
+                    { key: 'key9', name: '6', width: 100, align: 'center' },
                 ],
             },
             {
                 name: '抗拉强度/强度代表值(MPa)',
                 children: [
-                    { key: 'key10', name: '1' },
-                    { key: 'key11', name: '2' },
-                    { key: 'key12', name: '3' },
-                    { key: 'key13', name: '4' },
-                    { key: 'key14', name: '5' },
-                    { key: 'key15', name: '6' },
+                    { key: 'key10', name: '1', width: 100, align: 'center' },
+                    { key: 'key11', name: '2', width: 100, align: 'center' },
+                    { key: 'key12', name: '3', width: 100, align: 'center' },
+                    { key: 'key13', name: '4', width: 100, align: 'center' },
+                    { key: 'key14', name: '5', width: 100, align: 'center' },
+                    { key: 'key15', name: '6', width: 100, align: 'center' },
                 ],
             },
             {
                 name: '上屈服力(KN)',
                 children: [
-                    { key: 'key16', name: '1' },
-                    { key: 'key17', name: '2' },
-                    { key: 'key18', name: '3' },
-                    { key: 'key19', name: '4' },
-                    { key: 'key20', name: '5' },
-                    { key: 'key21', name: '6' },
+                    { key: 'key16', name: '1', width: 100, align: 'center' },
+                    { key: 'key17', name: '2', width: 100, align: 'center' },
+                    { key: 'key18', name: '3', width: 100, align: 'center' },
+                    { key: 'key19', name: '4', width: 100, align: 'center' },
+                    { key: 'key20', name: '5', width: 100, align: 'center' },
+                    { key: 'key21', name: '6', width: 100, align: 'center' },
                 ],
             },
             {
                 name: '下屈服力(KN)',
                 children: [
-                    { key: 'key22', name: '1' },
-                    { key: 'key23', name: '2' },
-                    { key: 'key24', name: '3' },
-                    { key: 'key25', name: '4' },
-                    { key: 'key26', name: '5' },
-                    { key: 'key27', name: '6' },
+                    { key: 'key22', name: '1', width: 100, align: 'center' },
+                    { key: 'key23', name: '2', width: 100, align: 'center' },
+                    { key: 'key24', name: '3', width: 100, align: 'center' },
+                    { key: 'key25', name: '4', width: 100, align: 'center' },
+                    { key: 'key26', name: '5', width: 100, align: 'center' },
+                    { key: 'key27', name: '6', width: 100, align: 'center' },
                 ],
             },
             {
                 name: '上屈服强度(MPa)',
                 children: [
-                    { key: 'key28', name: '1' },
-                    { key: 'key29', name: '2' },
-                    { key: 'key30', name: '3' },
-                    { key: 'key31', name: '4' },
-                    { key: 'key32', name: '5' },
-                    { key: 'key33', name: '6' },
+                    { key: 'key28', name: '1', width: 100, align: 'center' },
+                    { key: 'key29', name: '2', width: 100, align: 'center' },
+                    { key: 'key30', name: '3', width: 100, align: 'center' },
+                    { key: 'key31', name: '4', width: 100, align: 'center' },
+                    { key: 'key32', name: '5', width: 100, align: 'center' },
+                    { key: 'key33', name: '6', width: 100, align: 'center' },
                 ],
             },
             {
                 name: '下屈服强度(MPa)',
                 children: [
-                    { key: 'key34', name: '1' },
-                    { key: 'key35', name: '2' },
-                    { key: 'key36', name: '3' },
-                    { key: 'key37', name: '4' },
-                    { key: 'key38', name: '5' },
-                    { key: 'key39', name: '6' },
+                    { key: 'key34', name: '1', width: 100, align: 'center' },
+                    { key: 'key35', name: '2', width: 100, align: 'center' },
+                    { key: 'key36', name: '3', width: 100, align: 'center' },
+                    { key: 'key37', name: '4', width: 100, align: 'center' },
+                    { key: 'key38', name: '5', width: 100, align: 'center' },
+                    { key: 'key39', name: '6', width: 100, align: 'center' },
                 ],
             },
             { key: 'dataStatus', name: '数据状态', width: 100, align: 'center' },
@@ -344,31 +344,31 @@ const pageChange = ({ current, size }) => {
 const tableColumn = ref([
     { 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: '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)' },
-    { key: 'key18', name: '其余荷载(KN)' },
-    { key: 'key19', name: '强度代表值(MPa)' },
+    { 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' },
+    { key: 'beArea', name: '承压面积(mm2)', width: 100, align: 'center' },
+    { key: 'specimenSize', name: '试件尺寸(mm)', width: 100, align: 'center' },
+    { key: 'desStrength', name: '设计强度(MPa)', width: 100, align: 'center' },
+    { key: 'key10', name: '龄期(d)', width: 100, align: 'center' },
+    { key: 'load1', name: '荷载1(KN)', width: 100, align: 'center' },
+    { key: 'load2', name: '荷载2(KN)', width: 100, align: 'center' },
+    { key: 'load3', name: '荷载3(KN)', width: 100, align: 'center' },
+    { key: 'key15', name: '荷载4(KN)', width: 100, align: 'center' },
+    { key: 'key16', name: '荷载5(KN)', width: 100, align: 'center' },
+    { key: 'key17', name: '荷载6(KN)', width: 100, align: 'center' },
+    { key: 'key18', name: '其余荷载(KN)', width: 100, align: 'center' },
+    { key: 'key19', name: '强度代表值(MPa)', width: 100, align: 'center' },
     {
         name: '最大力总延伸(%)',
         children: [
-            { key: 'maxConceal1', name: '1' },
-            { key: 'maxConceal2', name: '2' },
-            { key: 'maxConceal3', name: '3' },
+            { key: 'maxConceal1', name: '1', width: 100, align: 'center' },
+            { key: 'maxConceal2', name: '2', width: 100, align: 'center' },
+            { key: 'maxConceal3', name: '3', width: 100, align: 'center' },
         ],
     },
-    { key: 'dataQualified', name: '试验结果是否合格', width: 100, align: 'center' },
+    //{ key: 'dataQualified', name: '试验结果是否合格', width: 100, align: 'center' },
     { key: 'dataStatus', name: '数据状态', width: 100, align: 'center' },
 ])
 const tableData = ref([])