diff --git a/src/assets/main.scss b/src/assets/main.scss index 8c6be5b..d05c6ce 100644 --- a/src/assets/main.scss +++ b/src/assets/main.scss @@ -125,6 +125,8 @@ body{ } #content{ + display: flex; + gap: 0.5rem; @mixin main-cartouche{ background-color: rgba(255, 255, 255, 0.9); box-sizing: border-box; diff --git a/src/components/ConcernementMapItem.vue b/src/components/ConcernementMapItem.vue index ec04310..d675669 100644 --- a/src/components/ConcernementMapItem.vue +++ b/src/components/ConcernementMapItem.vue @@ -1395,8 +1395,12 @@ export default { // push route (keep the hash for map_mode) this.$router.push({ name: 'concernement', - hash: `#${this.map_mode}`, - params: {id: this.cid, mapitemid: this.id} + params: {cid: this.cid}, + query: { + mapitemid: this.id, + superposition_id: this.superposition_id + }, + hash: `#${this.map_mode}` }); // reset the mousehover this.resetHoverElmt(); diff --git a/src/components/ConcernementMapPopup.vue b/src/components/ConcernementMapPopup.vue index 0dc3561..e3aa084 100644 --- a/src/components/ConcernementMapPopup.vue +++ b/src/components/ConcernementMapPopup.vue @@ -36,10 +36,10 @@ export default { window.removeEventListener('mousemove', this.onMousemove); }, computed: { - ...mapState(ConcernementsStore,['concernements']), - ...mapState(ConcernementsStore,['concernementsByID']), - ...mapState(ConcernementsStore,['allEntitesById']), - ...mapState(ConcernementsStore,['allBesoinsById']) + ...mapState(ConcernementsStore,['concernements', + 'concernementsByID', + 'allEntitesById', + 'allBesoinsById']) }, watch: { infos: { diff --git a/src/components/MapConcernements.vue b/src/components/MapConcernements.vue index 97487cf..57b5022 100644 --- a/src/components/MapConcernements.vue +++ b/src/components/MapConcernements.vue @@ -1265,7 +1265,7 @@ export default {
  • superposition diff --git a/src/components/contents/TerrainDeVie.vue b/src/components/contents/TerrainDeVie.vue index b16eb93..f5ec9d2 100644 --- a/src/components/contents/TerrainDeVie.vue +++ b/src/components/contents/TerrainDeVie.vue @@ -16,9 +16,10 @@ import { mdiChevronRight } from '@mdi/js'; import { mdiChevronDown } from '@mdi/js'; export default { - props: ['id', 'eid', 'entite'], + props: ['cid', 'eid', 'entite'], data(){ return { + concernement: null, history_value: 0, history_slider_ops: null, infos_opened: false, @@ -29,16 +30,17 @@ export default { computed: { ...mapState(ConcernementsStore,['map_mode', 'opened_concernement', + 'concernementsByID', 'ct_concernement', 'ct_entite']), ...mapState(UserStore,['name']), created(){ - let d = new Date(this.opened_concernement.created); + let d = new Date(this.concernement.created); console.log('d', d); return d.toLocaleDateString("fr-FR");//.toISOString().split('T')[0]; }, changed(){ - let d = new Date(this.opened_concernement.changed); + let d = new Date(this.concernement.changed); console.log('d', d); return d.toLocaleDateString("fr-FR");//.toISOString().split('T')[0]; }, @@ -47,12 +49,14 @@ export default { } }, created () { - console.log(`terrain de vie content created, id: ${this.id}, eid: ${this.eid}, opened_concernement:`, this.opened_concernement); + this.concernement = this.concernementsByID[this.cid]; + + console.log(`terraindevie created, cid: ${this.cid}, eid: ${this.eid}, this.concernement:`, this.concernement); // revisions let data=[]; - this.opened_concernement.revisions.forEach(rev => { + this.concernement.revisions.forEach(rev => { if (rev.entites.length > 3) { let d = new Date(rev.changed); data.push({ @@ -80,7 +84,7 @@ export default { history_value: { handler (n, o) { console.log(`TerrainDeVie watch history_value o:${o}, n:${n}`); - this.setActiveRevision(this.opened_concernement.id, n); + this.setActiveRevision(this.concernement.id, n); }, deep: true } @@ -102,12 +106,12 @@ export default {