span {
+ font-size: 18px;
+ font-weight: bold;
+ color: #002680;
+ position: absolute;
+ height: 21px;
+ bottom: 3px;
+ left: 6px;
+ right: 6px;
+ text-align: right;
+}
.modal.prophetimages header {
padding: 0 16px;
display: flex;
@@ -26,7 +45,7 @@
width: 100%;
height: 100%;
}
-.modal.prophetimages section .imagecontainer span {
+.modal.prophetimages section .imagecontainer > span {
position: absolute;
bottom: -20px;
width: 400px;
@@ -73,6 +92,7 @@
height: 140px;
transform: translateX(-100px);
bottom: 70px;
+ box-shadow: 0 2px 8px 0 rga(0, 0, 0, 0.5);
}
.modal.prophetimages section .color-bar {
display: grid;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.less b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.less
index 545c385b..83303f15 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.less
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.less
@@ -1,4 +1,24 @@
.modal.prophetimages {
+ .measure {
+ position: absolute;
+ background-image: url(/assets//icons/png/termo-inspection.png);
+ width: 72px;
+ height: 56px;
+ background-size: cover;
+ transform: translateX(-36px) translateY(-12px);
+ > span {
+ font-size: 18px;
+ font-weight: bold;
+ color: #002680;
+ position: absolute;
+ height: 21px;
+ bottom: 3px;
+ left: 6px;
+ right: 6px;
+ text-align: right;
+ }
+ }
+
header {
padding: 0 16px;
display: flex;
@@ -24,7 +44,7 @@
width: 100%;
height: 100%;
}
- span {
+ > span {
position: absolute;
bottom: -20px;
width: 400px;
@@ -76,6 +96,7 @@
height: 140px;
transform: translateX(-100px);
bottom: 70px;
+ box-shadow: 0 2px 8px 0 rga(0, 0, 0, 0.5);
}
}
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts
index 83b8bb75..1be49a38 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.ts
@@ -1,138 +1,72 @@
import Component from "vue-class-component";
import Vue from "vue";
import { ModalHelper, Modal } from "@/components/modals";
+import { Prop, Watch } from "vue-property-decorator";
+import { warmersService } from "@/services/warmersService";
+import { prodService } from "@/services/prodService";
+import { AppModel } from "@/store";
+import { debounce } from "@/_base/debounce";
@Component({
components: { modal: Modal },
})
export default class ThermoModal extends Vue {
+
+ TCamData: {
+ imageSize: { x: number, y: number },
+ rangeTemperature: { max: number, min: number },
+ } = {
+ imageSize: { x: 1024, y: 768 },
+ rangeTemperature: { max: 100, min: 0 }
+ }
+ get tstep() {
+ return (this.TCamData.rangeTemperature.max - this.TCamData.rangeTemperature.min) / 6;
+ }
+
+ measurePoints: {
+ x: number, y: number, temperature: number
+ }[] = [];
+
showPreview = 0;
selectedImage: number = 0;
serverPath = "/thermoprophet/colored";
- images = ['20201104-163047.jpg',
- '20201104-163309.jpg',
- '20201104-163547.jpg',
- '20201104-163826.jpg',
- '20201104-164544.jpg',
- '20201104-164850.jpg',
- '20201104-165142.jpg',
- '20201104-165418.jpg',
- '20201104-165658.jpg',
- '20201104-170154.jpg',
- '20201104-170504.jpg',
- '20201104-170741.jpg',
- '20201104-171015.jpg',
- '20201104-171256.jpg',
- '20201110-141036.jpg',
- '20201110-141318.jpg',
- '20201110-141600.jpg',
- '20201110-141842.jpg',
- '20201110-142125.jpg',
- '20201110-142333.jpg',
- '20201110-142610.jpg',
- '20201110-142852.jpg',
- '20201110-143132.jpg',
- '20201110-143434.jpg',
- '20201110-155540.jpg',
- '20201112-161151.jpg',
- '20201112-161427.jpg',
- '20201112-161701.jpg',
- '20201112-161935.jpg',
- '20201112-162221.jpg',
- '20201112-163046.jpg',
- '20201112-163107.jpg',
- '20201112-163134.jpg',
- '20201112-163141.jpg',
- '20201112-163152.jpg',
- '20201112-163235.jpg',
- '20201112-163249.jpg',
- '20201112-163313.jpg',
- '20201112-163355.jpg',
- '20201112-163435.jpg',
- '20201112-163946.jpg',
- '20201112-165438.jpg',
- '20201112-165908.jpg',
- '20201112-165931.jpg',
- '20201112-165952.jpg',
- '20201112-170518.jpg',
- '20201112-170531.jpg',
- '20201112-170604.jpg',
- '20201112-170654.jpg',
- '20201112-171322.jpg',
- '20201112-171842.jpg',
- '20201112-171946.jpg',
- '20201112-172249.jpg',
- '20201112-172440.jpg',
- '20201112-172636.jpg',
- '20201112-172834.jpg',
- '20201112-173642.jpg',
- '20201112-174108.jpg',
- '20201112-174216.jpg',
- '20201112-175159.jpg',
- '20201113-141151.jpg',
- '20201113-145345.jpg',
- '20201113-145524.jpg',
- '20201113-145707.jpg',
- '20201113-145915.jpg',
- '20201113-150118.jpg',
- '20201113-150321.jpg',
- '20201113-150527.jpg',
- '20201113-150740.jpg',
- '20201113-150959.jpg',
- '20201113-153100.jpg',
- '20201113-153143.jpg',
- '20201113-153302.jpg',
- '20201113-162158.jpg',
- '20201113-162335.jpg',
- '20201116-091043.jpg',
- '20201116-091230.jpg',
- '20201116-091419.jpg',
- '20201116-091615.jpg',
- '20201116-091828.jpg',
- '20201116-092041.jpg',
- '20201116-092301.jpg',
- '20201116-092528.jpg',
- '20201116-092802.jpg',
- '20201116-093040.jpg',
- '20201116-093327.jpg',
- '20201116-093616.jpg',
- '20201116-093914.jpg',
- '20201116-100141.jpg',
- '20201116-100404.jpg',
- '20201116-100632.jpg',
- '20201116-100858.jpg',
- '20201116-101125.jpg',
- '20201116-101403.jpg',
- '20201116-101629.jpg',
- '20201116-101858.jpg',
- '20201116-102128.jpg',
- '20201116-102356.jpg',
- '20201116-102623.jpg',
- '20201116-102847.jpg',
- '20201116-103108.jpg',
- '20201116-103332.jpg',
- '20201116-103557.jpg',
- '20201116-103819.jpg',
- '20201116-104042.jpg',
- '20201116-104305.jpg',
- '20201116-104529.jpg',
- '20201116-104756.jpg',
- '20201116-105023.jpg',
- '20201116-105251.jpg',
- '20201116-105520.jpg',
- '20201116-105751.jpg',
- '20201116-110020.jpg',
- '20201116-110349.jpg',
- '20201116-110618.jpg'];
+ items: Prod.IProd[] = [];
+ get images() {
+ return this.items.map(i => i.thermoImage)
+ }
close() {
- ModalHelper.HideModal();
+ ModalHelper.HideModal("modal2");
}
- mounted() {
- for (const iterator of this.images) {
-
- }
+ get lastItem() {
+ return (this.$store.state as AppModel).prod.prod;
}
+
+ async mounted() {
+ this.TCamData = await warmersService.GetTCamData();
+ await warmersService.ResetMeasurePoints();
+
+ let min = Math.min(this.lastItem.numDone);
+ this.items.push(...await prodService.History(min - 1, min - 1))
+ }
+
+ async imageclick(evt: MouseEvent) {
+
+ let t = evt.target as HTMLImageElement;
+ let x = (evt.offsetX / t.clientWidth) * t.naturalWidth;
+ let y = (evt.offsetY / t.clientHeight) * t.naturalHeight;
+
+ await warmersService.SetMeasurePoints(x, y);
+ this.measurePoints.push({ x, y, temperature: 0 })
+ this.reloadMeasuresDelayed();
+ }
+
+ @Watch("selectedImage")
+ reloadMeasuresDelayed = debounce(async () => this.measurePoints = await warmersService.GetMeasurePoints(this.images[this.selectedImage]), 500);
+
+
+
+
}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.vue
index bc26cbc5..13145b32 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermoProphet-modal.vue
@@ -4,33 +4,42 @@
-
![]()
+
{{'thermo-long-tap-info' | localize("Long tap on image to add temperature inspectors")}}
+
+
+ {{m.temperature}} °C
+
- 300° C
- 270° C
- 240° C
- 210° C
- 180° C
- 150° C
- 120° C
+ {{Math.round(TCamData.rangeTemperature.max - tstep*(c-1))}}° C
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts
index 2fb88a2c..ba96d595 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts
@@ -29,6 +29,11 @@ export default class Thermocamera extends Vue {
thermoImageOpacity: number = 0;
resistanceMode = 0;
+ TCamData: {
+ imageSize: { x: number, y: number },
+ rangeTemperature: { max: number, min: number },
+ } = null;
+
@Watch("warmers", { deep: true })
async ChangedTemps() {
@@ -47,6 +52,7 @@ export default class Thermocamera extends Vue {
}
async mounted() {
this.ChangedTemps();
+ this.TCamData = await warmersService.GetTCamData();
}
get selectedChannels(): Warmers.IChannel[] {
@@ -169,6 +175,6 @@ export default class Thermocamera extends Vue {
}
async openThermoModal() {
- ModalHelper.ShowModal(termoModal);
+ ModalHelper.ShowModal(termoModal, "modal2");
}
}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.ts
index 9c9f8d54..7a426863 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.ts
@@ -14,20 +14,20 @@ export default class Prevuoto extends Vue {
get bars() {
return [
{
- backgroundColor: "#fff",
- borderColor: "#848484",
+ backgroundColor: "#ededed",
+ borderColor: "#9e9e9e",
height: this.recipe.vacuum_pre_1_chart_setpointy.setpointHMI,
width: this.recipe.vacuum_pre_1_chart_setpointx.setpointHMI
},
{
backgroundColor: "#e5f3ff",
- borderColor: "#848484",
+ borderColor: "#79a9d2",
height: this.recipe.vacuum_pre_2_chart_setpointy.setpointHMI,
width: this.recipe.vacuum_pre_2_chart_setpointx.setpointHMI
},
{
backgroundColor: "#b3dbff",
- borderColor: "#848484",
+ borderColor: "#538fc6",
height: this.recipe.vacuum_pre_3_chart_setpointy.setpointHMI,
width: this.recipe.vacuum_pre_3_chart_setpointx.setpointHMI
}
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue
index b4f98b76..28f22c5d 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue
@@ -28,16 +28,19 @@