diff --git a/src/views/dust_management/alarm_info_manage/alarm_info_disposal/components/alarm_disposal.vue b/src/views/dust_management/alarm_info_manage/alarm_info_disposal/components/alarm_disposal.vue index fec5088..3b07ce4 100644 --- a/src/views/dust_management/alarm_info_manage/alarm_info_disposal/components/alarm_disposal.vue +++ b/src/views/dust_management/alarm_info_manage/alarm_info_disposal/components/alarm_disposal.vue @@ -50,12 +50,12 @@ - + @@ -99,9 +99,7 @@ const rules = { DISPOSAL_RESULT: [ { required: true, message: "请选择处置结果", trigger: "blur" }, ], - DISPOSAL_FILE: [ - { required: true, message: "请上传处置图片", trigger: "change" }, - ], + FFILE: [{ required: true, message: "请上传处置图片", trigger: "change" }], }; const formRef = ref(null); @@ -120,11 +118,11 @@ const fnSubmit = debounce( formData.append(key, form.value[key]); }); - formData.delete("DISPOSAL_FILE"); + formData.delete("FFILE"); - for (let i = 0; i < form.value.DISPOSAL_FILE.length; i++) { - if (form.value.DISPOSAL_FILE[i].raw) - formData.append("DISPOSAL_FILE", form.value.DISPOSAL_FILE[i].raw); + for (let i = 0; i < form.value.FFILE.length; i++) { + if (form.value.FFILE[i].raw) + formData.append("FFILE", form.value.FFILE[i].raw); } await dustAlarmReDisposal(formData); diff --git a/src/views/dust_management/alarm_info_manage/alarm_info_disposal/index.vue b/src/views/dust_management/alarm_info_manage/alarm_info_disposal/index.vue index 2f2b8c6..a10af99 100644 --- a/src/views/dust_management/alarm_info_manage/alarm_info_disposal/index.vue +++ b/src/views/dust_management/alarm_info_manage/alarm_info_disposal/index.vue @@ -9,21 +9,27 @@ - - - + + + + + + @@ -102,14 +108,21 @@ import { } from "@/request/dust_clean_management"; import useListData from "@/assets/js/useListData.js"; -import { layoutFnDustDeviceOrdinaryType } from "@/assets/js/data_dictionary"; + import alarmDisposal from "./components/alarm_disposal.vue"; import { formatUTCDate } from "@/assets/js/utils.js"; -const declarationGradeList = await layoutFnDustDeviceOrdinaryType(); const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } = - useListData(dustAlarmRecordDisposalPagePage, {}); + useListData(dustAlarmRecordDisposalPagePage, { + beforeGetData: (searchForm) => + searchForm.dates?.[0] + ? { + START_DATE: searchForm.dates?.[0] + " 00:00:00", + END_DATE: searchForm.dates?.[1] + " 23:59:59", + } + : {}, + }); const alarmDisposalDialog = ref({ visible: false, diff --git a/src/views/dust_management/alarm_info_manage/alarm_info_manage/components/view.vue b/src/views/dust_management/alarm_info_manage/alarm_info_manage/components/view.vue index 3486eec..194905a 100644 --- a/src/views/dust_management/alarm_info_manage/alarm_info_manage/components/view.vue +++ b/src/views/dust_management/alarm_info_manage/alarm_info_manage/components/view.vue @@ -69,6 +69,15 @@ {{ form.PROCESSING_TIME.split(".")[0] }} + + +