diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue
index ad99fec..5c16b49 100644
--- a/src/views/enforce/earlyWarning.vue
+++ b/src/views/enforce/earlyWarning.vue
@@ -18,20 +18,23 @@
-
请输入关键字搜索。
+
+ 由于企业过多,请输入关键字搜索。
@@ -180,7 +200,11 @@
//搜索时间
dateSearch: ref(),
//搜索次数
- num: null,
+ numLeft: null,
+ numRight: null,
+ //自定义时间
+ beginTime: null,
+ endTime: null,
warnType: 1,
});
@@ -189,7 +213,8 @@
dataList: [],
dateSearch: ref(),
showDatePicker: false,
- currentDate: ref(['2024', '01']),
+ showCalendarPicker: false,
+ currentDate: ref(['2025', '01']),
minDate: new Date(2020, 0, 1),
maxDate: new Date(2125, 5, 1),
columnsType: ['year', 'month'],
@@ -212,14 +237,27 @@
isLodding.value = false;
});
const queryList = () => {
- searchParam.pageNum = (data.curPage-1)*searchParam.pageSize;
+ //默认展示前30个自然日
+ if (searchParam.numLeft==null && searchParam.numRight==null
+ && searchParam.beginTime==null && searchParam.endTime==null) {
+ const formatDate = (date) =>
+ `${date.getFullYear()}-${date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1)
+ : date.getMonth()+1}-${date.getDate() < 10 ? '0'+date.getDate() : date.getDate()}`;
+ searchParam.beginTime = formatDate(new Date(new Date().setDate(new Date().getDate() - 30)));
+ searchParam.endTime = formatDate(new Date());
+ }
+
+ searchParam.pageNum = (data.curPage-1)*searchParam.pageSize;
queryRegistrationListNew(searchParam, success => {
data.curPage++;
data.loading = false; // 查4出结果停止加载
- searchParam.num = null;
if (success.total <= data.dataList.length) {
// 查到最后没数据
data.finished = ref(true);
+ // searchParam.numLeft = null;
+ // searchParam.numRight = null;
+ // searchParam.beginTime = null;
+ // searchParam.endTime =null;
return;
}
// data.dataList = success.data;
@@ -337,12 +375,16 @@
isLodding.value = false;
};
+ const dateAnyway = () => {
+ searchParam.dateType = 4;
+ data.checkNum = 8;
+ data.showCalendarPicker = true;
+ }
const selectDate = () => {
searchParam.dateType = 4;
data.checkNum = 9;
data.showDatePicker = true;
- console.log(data.showDatePicker)
}
const selectNum = () => {
@@ -350,7 +392,6 @@
searchParam.dateType = 4;
data.checkNum = 10;
data.showNumPicker = true;
- console.log(data.showNumPicker)
}
const onDateConfirm = (value) => {
@@ -367,10 +408,23 @@
onRefresh();
}
+ const onCalendarConfirm = (values) => {
+ const formatDate = (date) =>
+ `${date.getFullYear()}-${date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1)
+ : date.getMonth()+1}-${date.getDate() < 10 ? '0'+date.getDate() : date.getDate()}`;
+ const [start, end] = values;
+ searchParam.beginTime =formatDate(start);
+ searchParam.endTime = formatDate(end);
+
+ data.showCalendarPicker = false;
+ data.dateShow = true;
+ data.curPage = 1;
+ data.dataList = [];
+ onRefresh();
+ }
+
const confirmNum = (value) => {
- console.log(value)
- searchParam.num = value.selectedValues[0] ;
data.showNumPicker = false;
data.curPage = 1;
data.dataList = [];
@@ -379,7 +433,9 @@
}
const cancelNum = (value) => {
-
+ data.showNumPicker = false;
+ searchParam.numLeft=null;
+ searchParam.numRight=null;
}
const nowDate = (time) => {