This commit is contained in:
LORENZO\pacio 2025-05-27 11:31:46 +02:00
parent dafaa9574e
commit 96b944370e
3 changed files with 115 additions and 16 deletions

View File

@ -70,6 +70,7 @@
<footer>
<div>{{ intestazione.notapp }}</div>
<div class="signatures">
<p>Lo sperimentatore<br>Dott. Ing. Giacomo Calussi</p>
<p>Il Direttore del Laboratorio<br>Dott. Ing. Paolo Neri</p>
@ -91,7 +92,7 @@ const componentMap = {
'A_CUB': A_CUB,
'A_CIL': A_CIL,
'B_BAR':B_BAR,
'B_RET':B_BAR
'B_RET':B_RET
}
const printable = ref(null)
@ -126,7 +127,7 @@ onMounted(async () => {
const data = await fetchReportDataWithToken(token, pSERCER);
intestazione.value = data.intestazione
datiacc_info.value = capitalizeAllFields(data.datiacc_info)
datiacc_info.value = data.datiacc_info
datiacc_data.value = data.datiacc_data
risult_data.value = calcolaMediaRcPerGruppo(data.risult_data)
note.value = data.note ?? []

View File

@ -27,10 +27,10 @@
<td>{{ row.contrassegno }}</td>
<td>{{ row.verbale }}</td>
<td>{{ formatDate(row.dataPrelievo) }}</td>
<td>{{ row.diaNom }}</td>
<td>{{ row.lunBase }}</td>
<td>{{ row.masG }}</td>
<td>{{ row.diaEff }}</td>
<td>{{ formatNumber(row.diaNom,0) }}</td>
<td>{{ formatNumber(row.dimA,0) }}</td>
<td>{{ formatNumber(row.masG,1) }}</td>
<td>{{ formatNumber(row.diaEff,2) }}</td>
<td>{{ row.ferriera }}</td>
<td v-if="row.rowspanArea > 0" :rowspan="row.rowspanArea">{{ row.area }}</td>
</tr>
@ -53,20 +53,20 @@
<th>f<sub>t</sub>/f<sub>y</sub></th>
<th>f<sub>t</sub>/f<sub>ynom</sub></th>
<th>Mandrino<br><br>D<br>[mm]</th>
<th>Esito<br>Piega</th>
<th>Esito<br>Piega*</th>
</tr>
</thead>
<tbody>
<tr v-for="row in risult_data" :key="row.idProvino">
<td>{{ row.idProvino }}</td>
<td>{{ row.carsne }}</td>
<td>{{ row.tensne }}</td>
<td>{{ row.carot }}</td>
<td>{{ row.tenrot }}</td>
<td>{{ row.agt }}</td>
<td>{{ row.ftFy }}</td>
<td>{{ row.ftFyNom }}</td>
<td>{{ row.mandrino }}</td>
<td>{{ formatNumber(row.carsne,2) }}</td>
<td>{{ formatNumber(row.tensne,1) }}</td>
<td>{{ formatNumber(row.carot,2) }}</td>
<td>{{ formatNumber(row.tenrot,1) }}</td>
<td>{{ formatNumber(row.agt,1) }}</td>
<td>{{ formatNumber(row.ftFy,2) }}</td>
<td>{{ formatNumber(row.ftFyNom,2) }}</td>
<td>{{ formatNumber(row.mandrino,0) }}</td>
<td>{{ row.esipie }}</td>
</tr>
</tbody>

View File

@ -1 +1,99 @@
<template></template>
<template>
<h3 class="section-title">DATI PRELIMINARI DI PROVA</h3>
<table>
<thead>
<tr>
<th rowspan="2">ID<br>Provino</th>
<th rowspan="2">Contrass.</th>
<th rowspan="2">Verbale<br>di prelievo n.</th>
<th rowspan="2">Data<br>prelievo</th>
<th>Diametro<br>Nominale</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>
<tr v-for="(row, index) in datiacc_data" :key="row.idProvino">
<td>{{ row.idProvino }}</td>
<td>{{ row.contrassegno }}</td>
<td>{{ row.verbale }}</td>
<td>{{ formatDate(row.dataPrelievo) }}</td>
<td>{{ formatNumber(row.diaNom,0) }}</td>
<td>{{ formatNumber(row.dimA,0) }}</td>
<td>{{ formatNumber(row.masG,1) }}</td>
<td>{{ formatNumber(row.diaEff,2) }}</td>
<td>{{ row.ferriera }}</td>
<td v-if="row.rowspanArea > 0" :rowspan="row.rowspanArea">{{ row.area }}</td>
</tr>
</tbody>
</table>
<!-- RISULTATI -->
<div class="section-title">{{ intestazione.prova1 }}</div>
<div class="sub-header">{{ intestazione.prova2 }}</div>
<table>
<thead>
<tr>
<th rowspan="2">ID<br>Provino</th>
<th rowspan="2">Carico di<br>snevamento<br>F<sub>y</sub><br>[kN]</th>
<th rowspan="2">Tensione di<br>snevamento<br>f<sub>y</sub><br>[N/mm²]</th>
<th rowspan="2">Carico di<br>rottura<br>F<sub>t</sub><br>[kN]</th>
<th rowspan="2">Tensione di<br>rottura<br>f<sub>t</sub><br>[N/mm²]</th>
<th rowspan="2">Allungamento<br>a rottura<br>A<sub>gt</sub><br>[%]</th>
<th rowspan="2">f<sub>t</sub>/f<sub>y</sub></th>
<th rowspan="2">f<sub>t</sub>/f<sub>ynom</sub></th>
<th colspan="2">Carico di rottura<br>nodo saldato</th>
</tr>
<tr>
<th>[kN]</th>
<th>Tipo*</th>
</tr>
</thead>
<tbody>
<tr v-for="row in risult_data" :key="row.idProvino">
<td>{{ row.idProvino }}</td>
<td>{{ formatNumber(row.carsne,2) }}</td>
<td>{{ formatNumber(row.tensne,1) }}</td>
<td>{{ formatNumber(row.carot,2) }}</td>
<td>{{ formatNumber(row.tenrot,1) }}</td>
<td>{{ formatNumber(row.agt,1) }}</td>
<td>{{ formatNumber(row.ftFy,2) }}</td>
<td>{{ formatNumber(row.ftFyNom,2) }}</td>
<td>{{ formatNumber(row.disnod,2) }}</td>
<td>{{ row.tipdis }}</td>
</tr>
</tbody>
</table>
</template>
<script setup>
defineProps({
risult_data: Array,
datiacc_data: Array,
intestazione: Object
})
function formatDate(dateStr) {
return new Date(dateStr).toLocaleDateString('it-IT')
}
function formatNumber(val, decimals) {
return val != null
? Number(val).toLocaleString('it-IT', {
minimumFractionDigits: decimals,
maximumFractionDigits: decimals
})
: '—'
}
</script>