Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Frontend

Browse Source
This commit is contained in:
Thermo_SIM
2021-03-22 14:33:31 +01:00
parent 36dc4171e5
commit 2a0b3f7e72
5 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active.Database/Thermo.Active.Database.csproj
+7
View File
@@ -167,6 +167,10 @@
<Compile Include="Migrations\202103191626072_HistorySheetsCycle.Designer.cs"> <Compile Include="Migrations\202103191626072_HistorySheetsCycle.Designer.cs">
<DependentUpon>202103191626072_HistorySheetsCycle.cs</DependentUpon> <DependentUpon>202103191626072_HistorySheetsCycle.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Migrations\202103221323362_addedTypeValHistory.cs" />
<Compile Include="Migrations\202103221323362_addedTypeValHistory.Designer.cs">
<DependentUpon>202103221323362_addedTypeValHistory.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\Configuration.cs" /> <Compile Include="Migrations\Configuration.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Redis\redUtil.cs" /> <Compile Include="Redis\redUtil.cs" />
@@ -227,6 +231,9 @@
<EmbeddedResource Include="Migrations\202103191626072_HistorySheetsCycle.resx"> <EmbeddedResource Include="Migrations\202103191626072_HistorySheetsCycle.resx">
<DependentUpon>202103191626072_HistorySheetsCycle.cs</DependentUpon> <DependentUpon>202103191626072_HistorySheetsCycle.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Migrations\202103221323362_addedTypeValHistory.resx">
<DependentUpon>202103221323362_addedTypeValHistory.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogMisurazioni/components/tables/log-misurazioni-table/log-misurazioni-table.css
+6 -10
View File
@@ -12,21 +12,17 @@
} }
.main-container th.lastre-recipe, .main-container th.lastre-recipe,
.main-container td.lastre-recipe { .main-container td.lastre-recipe {
width: 40%; width: 30%;
} }
.main-container th.lastre-numpezzo, .main-container th.lastre-numpezzo,
.main-container td.lastre-numpezzo { .main-container td.lastre-numpezzo {
width: 10%; width: 10%;
} }
.main-container th.lastre-firstval, .main-container th.lastre-type,
.main-container td.lastre-firstval { .main-container td.lastre-type {
width: 10%; width: 10%;
} }
.main-container th.lastre-secondval, .main-container th.lastre-value,
.main-container td.lastre-secondval { .main-container td.lastre-value {
width: 10%; width: 30%;
}
.main-container th.lastre-thirdval,
.main-container td.lastre-thirdval {
width: 10%;
} }
Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogMisurazioni/components/tables/log-misurazioni-table/log-misurazioni-table.less
+4 -7
View File
@@ -11,19 +11,16 @@
width: 20%; width: 20%;
} }
&.lastre-recipe { &.lastre-recipe {
width: 40%; width: 30%;
} }
&.lastre-numpezzo { &.lastre-numpezzo {
width: 10%; width: 10%;
} }
&.lastre-firstval { &.lastre-type {
width: 10%; width: 10%;
} }
&.lastre-secondval { &.lastre-value {
width: 10%; width: 30%;
}
&.lastre-thirdval {
width: 10%;
} }
} }
} }
Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogMisurazioni/components/tables/log-misurazioni-table/log-misurazioni-table.ts
+12
View File
@@ -18,4 +18,16 @@ export default class LogMisurazioniTable extends Vue {
return moment(date).format('LTS'); return moment(date).format('LTS');
} }
convertType(item){
if (!item || item == 0)
return "ND"
else if (item == 1)
return "PALLET HEIGHT"
else if (item == 2)
return "SHEET TICKNESS"
else if (item == 2)
return "SHEET LENGTH"
else
return "ND"
}
} }
Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogMisurazioni/components/tables/log-misurazioni-table/log-misurazioni-table.vue
+4 -6
View File
@@ -6,9 +6,8 @@
<th class="lastre-date ">{{'underthehood_label_date' | localize("Date")}}</th> <th class="lastre-date ">{{'underthehood_label_date' | localize("Date")}}</th>
<th class="lastre-recipe">{{'underthehood_label_recipe' | localize("Ricetta")}}</th> <th class="lastre-recipe">{{'underthehood_label_recipe' | localize("Ricetta")}}</th>
<th class="lastre-numpezzo left">{{'underthehood_label_numpiece' | localize("N. Pezzo")}}</th> <th class="lastre-numpezzo left">{{'underthehood_label_numpiece' | localize("N. Pezzo")}}</th>
<th class="lastre-firstval left">{{'underthehood_label_firsvtal' | localize("firstVal")}}</th> <th class="lastre-type left">{{'underthehood_label_type' | localize("Type")}}</th>
<th class="lastre-secondval left">{{'underthehood_label_secondval' | localize("secondVal")}}</th> <th class="lastre-value left">{{'underthehood_label_value' | localize("Value")}}</th>
<th class="lastre-thirdval left">{{'underthehood_label_thirdval' | localize("thirdVal")}}</th>
</tr> </tr>
</thead> </thead>
<tbody class="autocolor"> <tbody class="autocolor">
@@ -17,9 +16,8 @@
<td>{{convertDate(item.dtEvent)}} - {{convertDateToTime(item.dtEvent)}}</td> <td>{{convertDate(item.dtEvent)}} - {{convertDateToTime(item.dtEvent)}}</td>
<td>{{item.recipeName}}</td> <td>{{item.recipeName}}</td>
<td class="left">{{item.numDone}}</td> <td class="left">{{item.numDone}}</td>
<td class="left">{{item.firstVal}}</td> <td class="left">{{convertType(item.typeVal)}}</td>
<td class="left">{{item.secondVal}}</td> <td class="left">{{item.firstVal}} [{{item.secondVal}}, {{item.thirdVal}}]</td>
<td class="left">{{item.thirdVal}}</td>
</tr> </tr>
</template> </template>
</tbody> </tbody>