localnet/localhost-front
10
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

map

Browse Source
This commit is contained in:
yoon 2025-03-28 17:04:45 +09:00
parent 5af68dcf3d
commit da13750404
2 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/components/commuters/CommuterCalendar.vue
View File

@ -56,27 +56,54 @@
<template #body> <template #body>
<div v-if="selectedDateCommuters.length > 0"> <div v-if="selectedDateCommuters.length > 0">
<div v-for="(commuter, index) in selectedDateCommuters" :key="index"> <div v-for="(commuter, index) in selectedDateCommuters" :key="index">
<div class="d-flex align-items-center my-2"> <div class="row my-2 d-flex align-items-center">
<img :src="`${baseUrl}upload/img/profile/${commuter.profile}`" <div class="col-4">
class="rounded-circle me-2 w-px-50 h-px-50" <img :src="`${baseUrl}upload/img/profile/${commuter.profile}`"
@error="$event.target.src = '/img/icons/icon.png'"> class="rounded-circle me-2 w-px-50 h-px-50"
@error="$event.target.src = '/img/icons/icon.png'">
<span class="fw-bold">{{ commuter.memberName }}</span> <span class="fw-bold">{{ commuter.memberName }}</span>
</div>
<div class="ms-auto text-start fw-bold d-flex flex-column align-items-end"> <div class="col-8">
<div class="d-flex gap-1 align-items-center"> <div class="d-flex gap-1 align-items-center">
출근 : 출근 :
<div class="text-white rounded px-2" :style="`background: ${commuter.projctcolor} !important;`"> <MapPopover
{{ commuter.PROJCTNAM }} :address="commuter.projectAddress"
</div> v-if="commuter.projectAddress"
({{ commuter.COMMUTCMT }}) >
<template #trigger>
<div
class="text-white rounded px-2 cursor-pointer"
:style="`background: ${commuter.projctcolor} !important;`"
>
{{ commuter.PROJCTNAM }}
</div>
</template>
</MapPopover>
<span class="ms-auto">
({{ commuter.COMMUTCMT }})
</span>
</div> </div>
<div v-if="commuter.PROJCTLVE" class="d-flex gap-1 mt-1"> <div v-if="commuter.PROJCTLVE" class="d-flex gap-1 mt-1">
퇴근 : 퇴근 :
<div class="text-white rounded px-2" :style="`background: ${commuter.leaveProjectColor} !important;`"> <MapPopover
{{ commuter.leaveProjectName }} :address="commuter.leaveProjectAddress"
</div> v-if="commuter.leaveProjectAddress"
({{ commuter.COMMUTLVE || "00:00:00" }}) >
<template #trigger>
<div
class="text-white rounded px-2 cursor-pointer"
:style="`background: ${commuter.leaveProjectColor} !important;`"
>
{{ commuter.leaveProjectName }}
</div>
</template>
</MapPopover>
<span class="ms-auto">
({{ commuter.COMMUTLVE || "00:00:00" }})
</span>
</div> </div>
</div> </div>
</div> </div>
@ -105,6 +132,7 @@ import { useProjectStore } from '@/stores/useProjectStore';
import CommuterBtn from '@c/commuters/CommuterBtn.vue'; import CommuterBtn from '@c/commuters/CommuterBtn.vue';
import CommuterProjectList from '@c/commuters/CommuterProjectList.vue'; import CommuterProjectList from '@c/commuters/CommuterProjectList.vue';
import BackBtn from '@c/button/BackBtn.vue'; import BackBtn from '@c/button/BackBtn.vue';
import MapPopover from '@c/map/MapPopover.vue';
import { useDatePicker } from '@/stores/useDatePicker'; import { useDatePicker } from '@/stores/useDatePicker';
const datePickerStore = useDatePicker(); const datePickerStore = useDatePicker();

3
src/components/list/ProjectCard.vue
View File

@ -165,11 +165,10 @@
</template> </template>
<script setup> <script setup>
import { defineProps, onMounted, ref, computed, watch, nextTick } from 'vue'; import { defineProps, onMounted, ref, computed, watch } from 'vue';
import UserList from '@c/user/UserList.vue'; import UserList from '@c/user/UserList.vue';
import CenterModal from '@c/modal/CenterModal.vue'; import CenterModal from '@c/modal/CenterModal.vue';
import $api from '@api'; import $api from '@api';
import { KakaoMap, KakaoMapMarker } from 'vue3-kakao-maps';
import BackBtn from '@c/button/BackBtn.vue'; import BackBtn from '@c/button/BackBtn.vue';
import BackButton from '@c/button/BackBtn.vue'; import BackButton from '@c/button/BackBtn.vue';
import SaveButton from '@c/button/SaveBtn.vue'; import SaveButton from '@c/button/SaveBtn.vue';