diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100644 index b5dc6a8..0000000 --- a/.husky/pre-commit +++ /dev/null @@ -1,5 +0,0 @@ -# 使用 Prettier 格式化代码 -npx prettier --write 'src/**/*.{js,jsx,ts,tsx,json,css,md}' - -# 可以加入一个Git命令来确保这些改动被包含在push中 -git add . \ No newline at end of file diff --git a/package.json b/package.json index 310e146..fb31159 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "@vue/eslint-config-typescript": "^12.0.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-vue": "^9.21.1", - "husky": "^9.0.11", "naive-ui": "^2.37.3", "stylus": "^0.62.0", "typescript": "^5.3.3" diff --git a/src/views/manage/EventView.vue b/src/views/manage/EventView.vue index cbb1ead..71e6437 100644 --- a/src/views/manage/EventView.vue +++ b/src/views/manage/EventView.vue @@ -3,7 +3,7 @@ import { isDarkMode } from '@/Utils' import { useAccount } from '@/api/account' import { QueryGetAPI } from '@/api/query' import EventFetcherStatusCard from '@/components/EventFetcherStatusCard.vue' -import { AVATAR_URL, BASE_API } from '@/data/constants' +import { AVATAR_URL, BASE_API, EVENT_API_URL } from '@/data/constants' import { Grid28Filled, List16Filled } from '@vicons/fluent' import { format } from 'date-fns' import { saveAs } from 'file-saver' @@ -86,7 +86,7 @@ async function onDateChange() { } async function get() { try { - const data = await QueryGetAPI(BASE_API() + 'event/get', { + const data = await QueryGetAPI(EVENT_API_URL + 'get', { start: selectedDate.value[0], end: selectedDate.value[1], }) diff --git a/src/views/obs/WebFetcherOBS.vue b/src/views/obs/WebFetcherOBS.vue index 182c38b..3dfc16e 100644 --- a/src/views/obs/WebFetcherOBS.vue +++ b/src/views/obs/WebFetcherOBS.vue @@ -4,10 +4,25 @@ import { onMounted, onUnmounted, ref } from 'vue' const webFetcher = useWebFetcher() -onMounted(() => { - webFetcher.Start() +let timer: any +onMounted(async () => { + await webFetcher.Start() + setTimeout(() => { + // @ts-expect-error obs的东西 + if (!webFetcher.isStarted && window.obsstudio) { + timer = setInterval(() => { + if (webFetcher.isStarted) { + return + } + webFetcher.Stop() + webFetcher.Start() + }, 20000) + } + }, 10000) +}) +onUnmounted(() => { + clearInterval(timer) }) -onUnmounted(() => {})