diff --git a/src/assets/img/emptyImg.png b/src/assets/img/emptyImg.png new file mode 100644 index 0000000..0a4e8c1 Binary files /dev/null and b/src/assets/img/emptyImg.png differ diff --git a/src/views/Survey/Index.vue b/src/views/Survey/Index.vue index f67ffd9..c6dc2a9 100644 --- a/src/views/Survey/Index.vue +++ b/src/views/Survey/Index.vue @@ -7,13 +7,13 @@ @click="() => $router.push({ name: 'search' })" /> --> -
+
@@ -26,38 +26,44 @@ + + + + + diff --git a/src/views/Survey/components/SurveyItem.vue b/src/views/Survey/components/SurveyItem.vue index 1bb8f33..54023bd 100644 --- a/src/views/Survey/components/SurveyItem.vue +++ b/src/views/Survey/components/SurveyItem.vue @@ -1,348 +1,354 @@ - - - - - + + + + + diff --git a/src/views/Survey/hooks/useSurveyData.ts b/src/views/Survey/hooks/useSurveyData.ts index 84d9f8d..8214e92 100644 --- a/src/views/Survey/hooks/useSurveyData.ts +++ b/src/views/Survey/hooks/useSurveyData.ts @@ -1,18 +1,13 @@ import { getSurveysPage, deleteSurveys, saveTemplates } from '@/api/home'; import { ref } from 'vue'; import { showDialog, showConfirmDialog, showFailToast, showToast } from 'vant'; -import { getSurveysDetail } from '@/api/design'; - -const form = ref({ - page: 0, - pageSize: 10, - project_name: '' -}); +import { getSurveysDetail } from '@/api/design'; const searchValue = ref(''); const survey = ref([]); const total = ref(0); const loading = ref(false); +const requestLoading = ref(false); const finished = ref(false); const currentSurvey = ref(); @@ -25,10 +20,11 @@ async function fetchSingleSurvey(sn: string) { } } -async function fetchSurveys() { +async function fetchSurveys(form: any) { + requestLoading.value = true; const params = { - page: form.value.page, - per_page: form.value.pageSize, + page: form.page, + per_page: form.pageSize, group_id: 0, project_name: searchValue.value }; @@ -57,9 +53,10 @@ async function fetchSurveys() { } else { // Toast() } + requestLoading.value = false; } -function deleteItem(item: SurveyItem) { +function deleteItem(item: SurveyItem, form: any) { showDialog({ title: `确认删除问卷 "${item.project_name}" ?`, showCancelButton: true, @@ -72,9 +69,9 @@ function deleteItem(item: SurveyItem) { } else { showToast('删除成功!'); } - form.value.page = 1; + form.page = 1; survey.value = []; - await fetchSurveys(); + await fetchSurveys(form); }) .catch(() => { // on cancel @@ -96,7 +93,6 @@ async function saveTemplate(item: SurveyItem) { } export { - form, fetchSurveys, loading, finished, @@ -106,5 +102,6 @@ export { deleteItem, saveTemplate, currentSurvey, + requestLoading, fetchSingleSurvey }; diff --git a/src/views/Survey/views/Analysis/components/AnalysisInfo/Index.vue b/src/views/Survey/views/Analysis/components/AnalysisInfo/Index.vue index ff9500b..ee95cc9 100644 --- a/src/views/Survey/views/Analysis/components/AnalysisInfo/Index.vue +++ b/src/views/Survey/views/Analysis/components/AnalysisInfo/Index.vue @@ -1,80 +1,84 @@ - - - - + + + +