From 568d941d90c678240e54f76d0c91b02089a54812 Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 23 Jan 2024 11:44:52 +0100 Subject: [PATCH] proximite double cartouch width for boussole #2333 --- src/components/ConcernementMapItem.vue | 2 +- src/components/contents/TerrainDeVie.vue | 22 ++++++++++++---------- src/views/Concernement.vue | 11 +++++++---- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/components/ConcernementMapItem.vue b/src/components/ConcernementMapItem.vue index 71e2ecc..f0001e5 100644 --- a/src/components/ConcernementMapItem.vue +++ b/src/components/ConcernementMapItem.vue @@ -723,7 +723,7 @@ export default { return segments; }, setPaperContour(){ - console.log('setPaperContour, this.sailentEntites', this.sailentEntites); + // console.log('setPaperContour, this.sailentEntites', this.sailentEntites); // convert sailent entites to x,y points let points = []; this.sailentEntites.forEach(entite => { diff --git a/src/components/contents/TerrainDeVie.vue b/src/components/contents/TerrainDeVie.vue index 5a50002..dece6a0 100644 --- a/src/components/contents/TerrainDeVie.vue +++ b/src/components/contents/TerrainDeVie.vue @@ -77,16 +77,18 @@ export default { // revisions let data=[]; - this.concernement.revisions.forEach(rev => { - if (rev.entites.length > 3) { - let d = new Date(rev.changed); - data.push({ - 'id': rev.revision_id, - 'changed': d.toLocaleDateString("fr-FR") - }) - this.history_value = Math.max(this.history_value, parseInt(rev.revision_id)); - } - }); + if (this.concernement && this.concernement.revisions) { + this.concernement.revisions.forEach(rev => { + if (rev.entites.length > 3) { + let d = new Date(rev.changed); + data.push({ + 'id': rev.revision_id, + 'changed': d.toLocaleDateString("fr-FR") + }) + this.history_value = Math.max(this.history_value, parseInt(rev.revision_id)); + } + }); + } if (data.length > 1) { this.history_slider_ops = { diff --git a/src/views/Concernement.vue b/src/views/Concernement.vue index 79e5f28..a63bbb4 100644 --- a/src/views/Concernement.vue +++ b/src/views/Concernement.vue @@ -81,14 +81,17 @@ export default { } }, created () { + console.log(`Concernement view created, this.$route`, this.$route); console.log(`Concernement view created, id: ${this.cid}, eid: ${this.eid}, opened_concernement:${this.opened_concernement}`); console.log('Concernement view created, allSuperpositions_clustered', this.allSuperpositions_clustered); console.log("superposition", this.superposition); - if(this.map_mode === "proximite" && this.$route.query.proximite_cid && this.$route.query.proximite_eid){ - this.proximite_cid_eid = { - cid: this.$route.query.proximite_cid, - eid: this.$route.query.proximite_eid, + if(this.map_mode === "proximite"){ + if (this.$route.query.proximite_cid && this.$route.query.proximite_eid) { + this.proximite_cid_eid = { + cid: this.$route.query.proximite_cid, + eid: this.$route.query.proximite_eid, + } } // as we have two content to show multiply the cartouch with by 2 // necessary for mapitem opening scale and position