acciai

src/App.vue

@@ -6,9 +6,11 @@
         <img src="/report_header.png" alt="Intestazione Unilab" class="report-header-image" />
       </header>
 
-      <h3 class="section-title">{{ intestazione.intest1 }}</h3>
+      <div class="header-row">
-
+        <h5 class="section-title">{{ intestazione.intest1 }}</h5>
-      <div>{{intestazione.modreport}}</div>
+        <div class="modreport">{{ intestazione.modreport }}</div>
+      </div>
+      
 
       <h3 class="section-title">{{ intestazione.intest2 }}</h3>
 
@@ -82,11 +84,14 @@ import { ref, onMounted, watch } from 'vue'
 import html2pdf from 'html2pdf.js'
 import A_CUB from './components/risultati/A_CUB.vue'
 import A_CIL from './components/risultati/A_CIL.vue'
+import B_BAR from './components/risultati/B_BAR.vue'
+import B_RET from './components/risultati/B_RET.vue'
 
 const componentMap = {
   'A_CUB': A_CUB,
   'A_CIL': A_CIL,
-  'B_BAR':B_BAR
+  'B_BAR':B_BAR,
+  'B_RET':B_BAR
 }
 
 const printable = ref(null)
@@ -257,6 +262,25 @@ body {
   padding: 2px;
 }
 
+.header-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px; /* opzionale, spazio sotto la riga */
+}
+
+.header-row .section-title {
+  margin: 0;
+  text-align: left;
+}
+
+.modreport {
+  font-weight: normal;
+  text-align: right;
+  margin: 0;
+}
+
+
 .report-header-image {
   width: 100%;
   height: auto;

src/components/risultati/A_CUB.vue

@@ -5,7 +5,7 @@
             <tr>
             <th>ID<br>Provino</th>
             <th>Contrassegno</th>
-            <th>Verbale<br>di prelievo n.</th>
+            <th>Verbale di<br>prelievo n.</th>
             <th>Data<br>prelievo</th>
             <th>R<sub>CK</sub></th>
             <th>Area o elemento strutturale</th>

src/components/risultati/B_BAR.vue

@@ -3,12 +3,22 @@
     <table>
         <thead>
             <tr>
-            <th>ID<br>Provino</th>
+              <th rowspan="2">ID<br>Provino</th>
-            <th>Contrassegno</th>
+              <th rowspan="2">Contrass.</th>
-            <th>Verbale<br>di prelievo n.</th>
+              <th rowspan="2">Verbale<br>di prelievo n.</th>
-            <th>Data<br>prelievo</th>
+              <th rowspan="2">Data<br>prelievo</th>
-            <th>R<sub>CK</sub></th>
+              <th>Diametro<br>Nominale</th>
-            <th>Area o elemento strutturale</th>
+              <th>Lungh.</th>
+              <th>Massa</th>
+              <th>Diametro<br>Effettivo</th>
+              <th rowspan="2">Marchio</th>
+              <th rowspan="2">Struttura di<br>riferimento</th>
+            </tr>
+            <tr>
+              <th>[mm]</th>
+              <th>[mm]</th>
+              <th>[g]</th>
+              <th>[mm]</th>
             </tr>
         </thead>
         <tbody>
@@ -17,7 +27,11 @@
             <td>{{ row.contrassegno }}</td>
             <td>{{ row.verbale }}</td>
             <td>{{ formatDate(row.dataPrelievo) }}</td>
-            <td>{{ formatNumber(row.rck, 0) }}</td>
+            <td>{{ row.diaNom }}</td>
+            <td>{{ row.lunBase }}</td>
+            <td>{{ row.masG }}</td>
+            <td>{{ row.diaEff }}</td>
+            <td>{{ row.ferriera }}</td>
             <td v-if="row.rowspanArea > 0" :rowspan="row.rowspanArea">{{ row.area }}</td>
             </tr>
         </tbody>
@@ -30,45 +44,30 @@
     <table>
       <thead>
         <tr>
-          <th colspan="5">DATI PRELIMINARI ALLA PROVA</th>
+          <th>ID<br>Provino</th>
-          <th colspan="5">RESISTENZA ALLA COMPRESSIONE</th>
+          <th>Carico di<br>snevamento<br>F<sub>y</sub><br>[kN]</th>
-        </tr>
+          <th>Tensione di<br>snevamento<br>f<sub>y</sub><br>[N/mm²]</th>
-        <tr>
+          <th>Carico di<br>rottura<br>F<sub>t</sub><br>[kN]</th>
-          <th rowspan="3">ID<br>Provino</th>
+          <th>Tensione di<br>rottura<br>f<sub>t</sub><br>[N/mm²]</th>
-          <th rowspan="3">Data<br>prova</th>
+          <th>Allungamento<br>a rottura<br>A<sub>gt</sub><br>[%]</th>
-          <th colspan="2">Dimensioni</th>
+          <th>f<sub>t</sub>/f<sub>y</sub></th>
-          <th rowspan="2">Massa<br>volumica</th>
+          <th>f<sub>t</sub>/f<sub>ynom</sub></th>
-          <th rowspan="2">F</th>
+          <th>Mandrino<br><br>D<br>[mm]</th>
-          <th rowspan="2">R<sub>c</sub></th>
+          <th>Esito<br>Piega</th>
-          <th rowspan="2">R<sub>PRELIEVO</sub></th>
-          <th rowspan="3">R**</th>
-          <th rowspan="3">P***</th>
-        </tr>
-        <tr>
-          <th>D</th>
-          <th>h</th>
-        </tr>
-        <tr>
-          <th>[mm]</th>
-          <th>[mm]</th>
-          <th>[kg/m³]</th>
-          <th>[kN]</th>
-          <th>[N/mm²]</th>
-          <th>[N/mm²]</th>
         </tr>
       </thead>
       <tbody>
         <tr v-for="row in risult_data" :key="row.idProvino">
           <td>{{ row.idProvino }}</td>
-          <td>{{ formatDate(row.dataProva) }}</td>
+          <td>{{ row.carsne }}</td>
-          <td>{{ formatNumber(row.dimA, 2) }}</td>
+          <td>{{ row.tensne }}</td>
-          <td>{{ formatNumber(row.dimH, 2) }}</td>
+          <td>{{ row.carot }}</td>
-          <td>{{ formatNumber(row.massaVolumica, 0) }}</td>
+          <td>{{ row.tenrot }}</td>
-          <td>{{ formatNumber(row.f, 1) }}</td>
+          <td>{{ row.agt }}</td>
-          <td>{{ formatNumber(row.rc, 2) }}</td>
+          <td>{{ row.ftFy }}</td>
-          <td v-if="row.rowspanRprelievo > 0" :rowspan="row.rowspanRprelievo">{{ row.rprelievo }}</td>
+          <td>{{ row.ftFyNom }}</td>
-          <td>{{ row.rType }}</td>
+          <td>{{ row.mandrino }}</td>
-          <td>{{ row.pType }}</td>
+          <td>{{ row.esipie }}</td>
         </tr>
       </tbody>
     </table>
@@ -94,5 +93,4 @@
         : '—'
     }
 
-</script>
+</script>
-  

src/components/risultati/B_RET.vue

@@ -0,0 +1 @@
+<template></template>