bachir/ouatterrir-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better concernment and entite content display

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2023-05-24 22:16:35 +02:00
parent 453e07ec31
commit b360987c76
5 changed files with 90 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/ConcernementMapItem.vue
View File

@@ -121,7 +121,7 @@ export default {
},
hover_elmt: {
handler (n, o) {
console.log('watch hover_elmt', o, n);
// console.log('watch hover_elmt', o, n);
if (n && n.type === 'concernement' && n.id === this.id) {
this.isHover = true;
} else {
@@ -704,7 +704,7 @@ export default {
this.ctx.arc(part.position.x, part.position.y, 0.3*this.scale, 0, 2 * Math.PI, false);
// console.log(part.id, this.opened_entite_id);
if (part.id === this.opened_entite_id) {
this.ctx.fillStyle = "#F00";
this.ctx.fillStyle = "#01ffe2";
} else {
this.ctx.fillStyle = "#000";
}
@@ -724,7 +724,7 @@ export default {
this.ctx.arc(part.position.x, part.position.y, 1*this.scale, 0, 2 * Math.PI, false);
// console.log(part.id, this.opened_entite_id);
if (part.id === this.opened_entite_id) {
this.ctx.fillStyle = "#F00";
this.ctx.fillStyle = "#01ffe2";
} else {
this.ctx.fillStyle = "#000";
}

12
src/components/ConcernementMapPopup.vue
View File

@@ -72,18 +72,18 @@ export default {
this.dom.setAttribute("pos", `${v}-${h}`);
switch (h) {
case "right":
this.dom.style.left = `${e.clientX}px`;
this.dom.style.left = `${e.clientX+2}px`;
break;
case "left":
this.dom.style.left = `${e.clientX - this.dom.clientWidth}px`;
this.dom.style.left = `${e.clientX - this.dom.clientWidth-2}px`;
break;
}
switch (v) {
case "top":
this.dom.style.top = `${e.clientY - this.dom.clientHeight}px`;
this.dom.style.top = `${e.clientY - this.dom.clientHeight-2}px`;
break;
case "bottom":
this.dom.style.top = `${e.clientY}px`;
this.dom.style.top = `${e.clientY+2}px`;
break;
}
}
@@ -100,6 +100,10 @@ export default {
<div class="popup-content-wrapper">
<section v-if="infos.type === 'concernement'" class="concernement-map-popup">
<h1>{{ concernement.title }}</h1>
<ul class="icons">
<li v-if="concernement.has_agissantes" ><span class="icon action">Action</span></li>
<li v-if="concernement.has_puissancedagir" ><span class="icon puissanceagir">Puissance d'agir</span></li>
</ul>
</section>
<section v-if="infos.type === 'entite'" class="entite-map-popup">
<h1>{{ entite.entite.title }}</h1>