diff --git a/src/views/demo/caseoffence/feifacaikuang/index.data.ts b/src/views/demo/caseoffence/feifacaikuang/index.data.ts
index bed89bf5..85d55c63 100644
--- a/src/views/demo/caseoffence/feifacaikuang/index.data.ts
+++ b/src/views/demo/caseoffence/feifacaikuang/index.data.ts
@@ -72,6 +72,12 @@ export const columns: BasicColumn[] = [
fixed: 'right',
width: 100,
},
+ {
+ title: '上报率',
+ dataIndex: 'sbl',
+ fixed: 'right',
+ width: 100,
+ },
];
// 无人机发现违法行为情况统计明细表-搜索
@@ -84,7 +90,7 @@ export const searchFormSchema: FormSchema[] = [
componentProps: {
format: 'YYYY-MM-DD',
placeholder: ['开始日期', '结束日期'],
- defaultValue: [dayjs(dayjs().add(-1, 'day'), 'YYYY-MM-DD'), dayjs(dayjs().add(-1, 'day'), 'YYYY-MM-DD')]
+ defaultValue: [dayjs('2024-08-01', 'YYYY-MM-DD'), dayjs(dayjs().add(-1, 'day'), 'YYYY-MM-DD')]
},
},
];
diff --git a/src/views/demo/caseoffence/feifacaikuang/index.vue b/src/views/demo/caseoffence/feifacaikuang/index.vue
index db8e41af..cbe9bf31 100644
--- a/src/views/demo/caseoffence/feifacaikuang/index.vue
+++ b/src/views/demo/caseoffence/feifacaikuang/index.vue
@@ -6,16 +6,13 @@
-
- {{ record.zgl }}%
-
+ {{ record.zgl }}%
-
- {{ record.bhl }}%
-
-
+ {{ record.bhl }}%
+
+ {{ record.sbl }}%
+
-
@@ -56,17 +53,28 @@
pagination: false,
beforeFetch: (data) => {
// 接口请求前 参数处理
- // 默认展示昨天的
- var temp = {
- startTime: data.startTime
- ? dayjs(data.startTime).startOf('day').format('YYYY-MM-DD')
- : dayjs().startOf('day').add(-1, 'day').format('YYYY-MM-DD'),
- endTime: data.endTime
- ? dayjs(data.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss')
- : dayjs().endOf('day').add(-1, 'day').format('YYYY-MM-DD HH:mm:ss'),
- };
- searchParams.value = temp;
- return temp;
+ console.log(data);
+ // 默认时间
+ if (Object.keys(data).length == 0) {
+ var temp = {
+ startTime: dayjs('2024-08-01').startOf('day').format('YYYY-MM-DD'),
+ endTime: dayjs().endOf('day').add(-1, 'day').format('YYYY-MM-DD HH:mm:ss'),
+ };
+ searchParams.value = temp;
+ return temp;
+ }
+ // 起始时间和结束时间格式和精确值
+ if (data.startTime && data.endTime) {
+ var temp = {
+ startTime: dayjs(data.startTime).startOf('day').format('YYYY-MM-DD'),
+ endTime: dayjs(data.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss'),
+ };
+ searchParams.value = temp;
+ return temp;
+ }
+ if (data.startTime === null || data.endTime === undefined) {
+ searchParams.value = {};
+ }
},
afterFetch: (res) => {},
});
diff --git a/src/views/demo/system/menu/MenuTree.vue b/src/views/demo/system/menu/MenuTree.vue
index bf51d67d..c7271178 100644
--- a/src/views/demo/system/menu/MenuTree.vue
+++ b/src/views/demo/system/menu/MenuTree.vue
@@ -19,7 +19,7 @@