diff --git a/src/api/system/ChargeType/type.ts b/src/api/system/ChargeType/type.ts index 6999c32..86bc417 100644 --- a/src/api/system/ChargeType/type.ts +++ b/src/api/system/ChargeType/type.ts @@ -2,7 +2,7 @@ export interface ChargeTypeVO { /** * 收费类型表id */ - id: string | number; + id: string; /** * 收费类型名称 diff --git a/src/api/system/InspectionPlan/index.ts b/src/api/system/InspectionPlan/index.ts index 4399838..7d7fed3 100644 --- a/src/api/system/InspectionPlan/index.ts +++ b/src/api/system/InspectionPlan/index.ts @@ -70,6 +70,6 @@ export const changePlanStatus = (id: string, status: string) => { return request({ url: '/inspection/plan/changeStatus', method: 'put', - data: { id, status } + params: { id, status } }); }; diff --git a/src/api/system/Questionnaire/index.ts b/src/api/system/Questionnaire/index.ts index 1ef09e4..f87bde7 100644 --- a/src/api/system/Questionnaire/index.ts +++ b/src/api/system/Questionnaire/index.ts @@ -67,3 +67,33 @@ export const delQuestionnaire = (ids: string | string[], vailid: boolean = true) } }); }; +/** + * 查询问卷调查回答列表 + */ +export const getQuestionnaireAnswer = ( + { + pageSize, + pageNum, + questionnaireId + } +) => { + return request({ + url: '/questionnaireAnswer/list', + method: 'GET', + params: { + pageSize, + pageNum, + questionnaireId, + answerStatus: '1' + } + }); +}; +/** + * 查询问卷调查回答详情 + */ +export const getQuestionnaireAnswerMain = (id: string) => { + return request({ + url: '/questionnaireAnswer/' + id, + method: 'GET' + }); +}; diff --git a/src/api/system/Questionnaire/type.ts b/src/api/system/Questionnaire/type.ts index 35a897a..d2e9c2f 100644 --- a/src/api/system/Questionnaire/type.ts +++ b/src/api/system/Questionnaire/type.ts @@ -154,6 +154,7 @@ export interface QuestionComponentItem { type: string; title: string; required: boolean; + options: QuestionComponentOption[]; } diff --git a/src/api/system/report/dailyFeeReport/type.ts b/src/api/system/report/dailyFeeReport/type.ts index 1d75308..bb4fa23 100644 --- a/src/api/system/report/dailyFeeReport/type.ts +++ b/src/api/system/report/dailyFeeReport/type.ts @@ -37,12 +37,8 @@ export type ChargeTypeAmounts = { export type FilterResponse = { code: number; data: { - 'field': string; - 'label': string; - 'type': string; - 'placeholder': string; - 'chargeTypeName': null; - 'subField': null; + 'chargeTypeId': string; + 'chargeTypeName': string; }[]; msg: string; }; diff --git a/src/components/Holder/user.vue b/src/components/Holder/user.vue index 2216efe..5348302 100644 --- a/src/components/Holder/user.vue +++ b/src/components/Holder/user.vue @@ -356,7 +356,7 @@ defineExpose({ // 重置查询条件，避免残留上次的筛选条件 queryParams.value = { pageNum: 1, - pageSize: 10, + pageSize: 5, buildingId: null, residentName: null, houseNo: null, diff --git a/src/utils/sse.ts b/src/utils/sse.ts index 059c8f8..e94ced5 100644 --- a/src/utils/sse.ts +++ b/src/utils/sse.ts @@ -26,15 +26,16 @@ export const initSSE = (url: any) => { watch(data, () => { if (!data.value) return; + const notice = JSON.parse(data.value); useNoticeStore().addNotice({ - message: data.value, + message: notice.message, read: false, time: new Date().toLocaleString() }); ElNotification({ - title: '消息', - message: data.value, - type: 'success', + title: notice.title, + message: notice.message, + type: notice.type, duration: 3000 }); data.value = null; diff --git a/src/views/system/Activity/index.vue b/src/views/system/Activity/index.vue index d4eddc7..029dd39 100644 --- a/src/views/system/Activity/index.vue +++ b/src/views/system/Activity/index.vue @@ -51,6 +51,11 @@ + + +