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

Merge branch 'main' into loading

Browse Source
This commit is contained in:
dyhj625 2025-03-07 13:13:04 +09:00
parent b222e606c2
commit 39dd213949
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/board/BoardView.vue
View File

@ -1,7 +1,6 @@
<template>
<div class="container-xxl flex-grow-1 container-p-y">
<LoadingSpinner v-if="isLoading" />
<div v-else class="row">
<div class="row">
<div class="col">
<div class="card">
<!-- 프로필 헤더 -->
@ -132,8 +131,6 @@
import { useRoute, useRouter } from 'vue-router';
import { useUserInfoStore } from '@/stores/useUserInfoStore';
import axios from '@api';
import LoadingSpinner from "@v/LoadingPage.vue";
const isLoading = ref(true);
// 게시물 데이터 상태
const profileName = ref('');
const boardTitle = ref('제목 없음');
@ -227,7 +224,6 @@
// 게시물 상세 데이터 불러오기
const fetchBoardDetails = async () => {
try {
isLoading.value = true;
const response = await axios.get(`board/${currentBoardId.value}`);
const data = response.data.data;
@ -245,8 +241,6 @@
attachments.value = data.attachments || [];
} catch (error) {
alert('게시물 데이터를 불러오는 중 오류가 발생했습니다.');
} finally {
isLoading.value = false;
}
};

9
src/views/vacation/VacationManagement.vue
View File

@ -1,7 +1,6 @@
<template>
<div class="container-xxl flex-grow-1 container-p-y">
<LoadingSpinner v-if="isLoading" />
<div v-else class="card app-calendar-wrapper">
<div class="card app-calendar-wrapper">
<div class="row g-0">
<!-- Sidebar: 사이드바 영역 -->
<div class="col-3 app-calendar-sidebar border-end" id="app-calendar-sidebar">
@ -87,9 +86,6 @@ import { useToastStore } from '@s/toastStore';
// 라우터
import { useRouter } from "vue-router";
import LoadingSpinner from "@v/LoadingPage.vue";
const isLoading = ref(true);
const router = useRouter();
// 스토어
const toastStore = useToastStore();
@ -268,7 +264,6 @@ const handleProfileClick = async (user) => {
};
// 프로필 사원 리스트
const fetchUserList = async () => {
isLoading.value = true;
try {
await userListStore.fetchUserList();
userList.value = userListStore.userList;
@ -282,8 +277,6 @@ const fetchUserList = async () => {
});
} catch (error) {
console.error("📌 사용자 목록 불러오기 오류:", error);
} finally{
isLoading.value = false;
}
};
// 사원별 남은 연차 개수

7
src/views/voteboard/voteBoardList.vue
View File

@ -1,7 +1,6 @@
<template>
<div class="container-xxl flex-grow-1 container-p-y">
<LoadingSpinner v-if="isLoading" />
<div v-else class="row g-3">
<div class="row g-3">
<div class="mt-8">
<!-- 투표 작성 -->
<WriteBtn @click="voteWrite" />
@ -52,8 +51,6 @@ import Quill from 'quill';
import WriteBtn from '@c/button/WriteBtn.vue';
import voteList from '@c/voteboard/voteCardList.vue';
import { useRouter } from 'vue-router';
import LoadingSpinner from "@v/LoadingPage.vue";
const isLoading = ref(true);
const toastStore = useToastStore();
const category = ref('0');
@ -81,7 +78,6 @@ const changeCheck = () =>{
}
//투표목록
const getvoteList = async () => {
isLoading.value = true;
const response = await $api.get('vote/getVoteList',{
params:
{
@ -93,7 +89,6 @@ const getvoteList = async () => {
if (response.data.status === "OK") {
PageData.value = response.data.data;
voteListCardData.value = response.data.data.list;
isLoading.value = false;
}
};
const selectHandler = () =>{