From ef1ba0e84fb15027a2e1a24153f389b20a57f199 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Tue, 13 May 2025 11:24:07 +0800 Subject: [PATCH] sc --- src/permission.js | 4 ++-- src/views/Customer/Customer/index.vue | 4 ++-- src/views/Customer/ExamRecord/index.vue | 20 +++++++------------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/permission.js b/src/permission.js index f73b88d..991ff06 100644 --- a/src/permission.js +++ b/src/permission.js @@ -63,9 +63,9 @@ router.beforeEach(async (to, from, next) => { const tenantId = getTenantId() const appId = getAppId() if (tenantId && appId) { - next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页 + next(`/tiku/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页 } else { - next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 + next(`/tiku/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 } } } diff --git a/src/views/Customer/Customer/index.vue b/src/views/Customer/Customer/index.vue index 2837441..3e3a1df 100644 --- a/src/views/Customer/Customer/index.vue +++ b/src/views/Customer/Customer/index.vue @@ -85,7 +85,7 @@ type="primary" link @click="openForm('update', scope.row)" - v-hasPermi="['pers:employee:update']" + v-hasPermi="['customer:customer:update']" > 修改 @@ -93,7 +93,7 @@ type="primary" link @click="handleDelete(scope.row.userId)" - v-hasPermi="['pers:employee:delete']" + v-hasPermi="['customer:customer:delete']" > 删除 diff --git a/src/views/Customer/ExamRecord/index.vue b/src/views/Customer/ExamRecord/index.vue index 41f26f7..a241973 100644 --- a/src/views/Customer/ExamRecord/index.vue +++ b/src/views/Customer/ExamRecord/index.vue @@ -57,9 +57,12 @@ @@ -96,9 +99,6 @@ import download from '@/utils/download' import { getCustomerExamCarType } from '@/api/customer/customer.js' -const message = useMessage() // 消息弹窗 -const { t } = useI18n() // 国际化 - const carTypeOptions = ref([]) const searchForm = ref({ @@ -130,8 +130,8 @@ const getList = async () => { loading.value = true try { if (searchForm.value.examTime && searchForm.value.examTime.length > 0) { - searchForm.value.startTime = searchForm.value.examTime[0] - searchForm.value.endTime = searchForm.value.examTime[1] + searchForm.value.startTime = searchForm.value.examTime[0] + ' 00:00:00' + searchForm.value.endTime = searchForm.value.examTime[1] + ' 23:59:59' } else { searchForm.value.startTime = undefined searchForm.value.endTime = undefined @@ -147,20 +147,14 @@ const getList = async () => { function handleExport() { const params = removeNullField(searchForm.value) if (params.examTime && params.examTime.length > 0) { - params.startTime = params.examTime[0] - params.endTime = params.examTime[1] + params.startTime = params.examTime[0] + ' 00:00:00' + params.endTime = params.examTime[1] + ' 23:59:59' } else { params.startTime = undefined params.endTime = undefined } ExamRecordApi.exportRecord(params).then((res) => { download.excel(res, '考试成绩.xls') - - // if (res.code === 200) { - // message.success('导出成功') - // } else { - // message.error(res.msg) - // } }) }