diff --git a/src/components/MapConcernements.vue b/src/components/MapConcernements.vue index e735401..14fe33e 100644 --- a/src/components/MapConcernements.vue +++ b/src/components/MapConcernements.vue @@ -467,7 +467,7 @@ export default { // big global exterior circle to keep center aligned new paper.Path.Circle({ center: [0, 0], - radius: r*2, + radius: r*3, style: { strokeColor: 'rgba(255,255,255,0)', strokeWidth: 0.5 diff --git a/src/components/contents/Doleancer.vue b/src/components/contents/Doleancer.vue index 411a674..424a123 100644 --- a/src/components/contents/Doleancer.vue +++ b/src/components/contents/Doleancer.vue @@ -5,6 +5,8 @@ import { ConcernementsStore } from '@stores/concernements' import { UserStore } from '@/stores/user' import { CommonStore } from '@/stores/common' +import CartoucheLayout from '@components/layout/CartoucheLayout.vue'; + export default { props: ['id'], data(){ @@ -13,115 +15,142 @@ export default { } }, computed: { - ...mapState(ConcernementsStore,['opened_concernement']), - ...mapState(ConcernementsStore,['ct_concernement']), - ...mapState(ConcernementsStore,['ct_entite']), + ...mapState(ConcernementsStore,['map_mode', + 'opened_concernement', + 'concernements_loaded', + 'ct_concernement', + 'ct_cercle_politique', + 'p_groupes_interets', + 'p_reception_et_traitement', + 'p_mise_en_oeuvre_decision', + 'p_reception_application_decision']), + ...mapState(CommonStore,['hover_elmt']) + }, created () { console.log(`Doleancer content created, id: ${this.id}, opened_concernement:`,this.opened_concernement); + }, + components: { + CartoucheLayout } } \ No newline at end of file diff --git a/src/views/Concernement.vue b/src/views/Concernement.vue index cf94ed9..4677aa2 100644 --- a/src/views/Concernement.vue +++ b/src/views/Concernement.vue @@ -27,16 +27,8 @@ export default { computed: { ...mapState(ConcernementsStore,['map_mode', 'opened_concernement', - // 'opened_entity_id', - 'concernements_loaded', - 'ct_concernement', - 'ct_entite', - 'ct_cercle_politique', - 'p_groupes_interets', - 'p_reception_et_traitement', - 'p_mise_en_oeuvre_decision', - 'p_reception_application_decision']), - ...mapState(CommonStore,['hover_elmt']) + 'concernements_loaded']), + // ...mapState(CommonStore,['hover_elmt']) }, created () { console.log(`Concernement view created, id: ${this.id}, eid: ${this.eid}, opened_concernement:${this.opened_concernement}`);