@@ -26,38 +26,44 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ errorMsg }}
+
+
+ + 新建问卷
+
+
+
+
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{ survey.answer_num }}份
-
- {{ `${survey.start_time} 至 ${survey.end_time ?? '无限期'}` }}
-
-
-
-
-
![]()
-
-
-
-
-
-

-
{{ survey.owner ?? '未知用户' }}
-
-
-
-

-

-
- {{ survey.source === 1 ? '移动端' : 'PC端' }}
-
-
-
-
-

-
创建时间 {{ survey.created_at }}
-
-
-
-
-
-
-
-
- 回收数量
- {{ survey.answer_num }}
-
-
- 回收数量进度
- {{ survey.recycle_progress }}
-
-
- 投放时间进度
- {{ survey.recycle_time }}
-
-
-
-
-
-
- 编辑
-
- 统计
-
-
-
-
- {{ survey.status === 1 ? '结束投放' : '开启投放' }}
-
-
-
-
-
-
-
-
-
- 预览
- 复制
- 删除
- 存为模板
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ survey.answer_num }}份
+
+ {{ `${survey.start_time} 至 ${survey.end_time ?? '无限期'}` }}
+
+
+
+
+
![]()
+
+
+
+
+
+

+
{{ survey.owner ?? '未知用户' }}
+
+
+
+

+

+
+ {{ survey.source === 1 ? '移动端' : 'PC端' }}
+
+
+
+
+

+
创建时间 {{ survey.created_at }}
+
+
+
+
+
+
+
+
+ 回收数量
+ {{ survey.answer_num }}
+
+
+ 回收数量进度
+ {{ survey.recycle_progress }}
+
+
+ 投放时间进度
+ {{ survey.recycle_time }}
+
+
+
+
+
+
+ 编辑
+
+ 统计
+
+
+
+
+ {{ survey.status === 1 ? '结束投放' : '开启投放' }}
+
+
+
+
+
+
+
+
+
+ 预览
+ 复制
+ 删除
+ 存为模板
+
+
+
+
+
+
+
+
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 @@
-
-
-
-
-
-
- {{
- questionTypeMap.get(analysis.question_type as number)
- }}
- {{ analysis.stem }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{
+ questionTypeMap.get(analysis.question_type as number)
+ }}
+ {{ analysis.stem }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+