搜索
@@ -109,6 +120,7 @@ const queryData = ref({
hall_id: null,
status: null,
time: null,
+ time1: null,
})
const options = ref([])
@@ -199,6 +211,8 @@ const get_list = async () => {
pageSize: pagination.value.pageSize,
StartTime: queryData.value.time ? queryData.value.time[0] : '',
EndTime: queryData.value.time ? queryData.value.time[1] : '',
+ UseStartTime: queryData.value.time1 ? queryData.value.time1[0] : '',
+ UseEndTime: queryData.value.time1 ? queryData.value.time1[1] : '',
}
Reflect.deleteProperty(obj, 'time')
const res = await api.getData(obj)
diff --git a/src/views/game/route.js b/src/views/game/route.js
index 20cf597..4d60781 100644
--- a/src/views/game/route.js
+++ b/src/views/game/route.js
@@ -7,7 +7,7 @@ export default {
redirect: '/game_jl',
meta: {
title: '游戏统计',
- icon: 'mdi:home',
+ icon: 'mdi:index',
order: 100,
},
children: [
@@ -17,7 +17,7 @@ export default {
component: () => import('./jl/index.vue'),
meta: {
title: '豆子记录',
- icon: 'mdi:home',
+ icon: 'mdi:index',
},
},
],
diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue
index 3c47bb0..48b12cb 100644
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -82,6 +82,7 @@
:data="data"
:pagination="pagination"
:bordered="false"
+ :scroll-x="1800"
remote
/>
@@ -89,6 +90,7 @@
+
+
diff --git a/src/views/workbench/route.js b/src/views/workbench/route.js
index c1a8796..0ab7953 100644
--- a/src/views/workbench/route.js
+++ b/src/views/workbench/route.js
@@ -12,7 +12,7 @@ export default {
component: () => import('./index.vue'),
meta: {
title: '工作台',
- icon: 'mdi:home',
+ icon: 'mdi:index',
order: 0,
},
},