diff --git a/src/main.js b/src/main.js index f36004e..15b58d5 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,9 @@ import { createApp } from 'vue' +// @ts-ignore import App from './App.vue' import router from './router' import store from './store' + import 'jquery' import 'jquery.md5' import 'bootstrap/dist/css/bootstrap.min.css' @@ -45,10 +47,13 @@ import '@/assets/plugins/jQuery-Validation-Engine/js/languages/jquery.validation import '@/assets/plugins/bootstrap-treeview/css/bootstrap-treeview.min.css' import '@/assets/plugins/bootstrap-treeview/js/bootstrap-treeview.min.js' +// @ts-ignore import components from '@/utils/components.js' // import ElementPlus from 'element-plus' // import 'element-plus/dist/index.css' import '@/css/public.css' -createApp(App).use(store).use(router).use(components).mount('#app') +const app = createApp(App) +app.config.warnHandler = () => null; +app.use(store).use(router).use(components).mount('#app') diff --git a/src/views/wishingStar/userParticipationRecord.vue b/src/views/wishingStar/userParticipationRecord.vue index d7eb45e..7f3133c 100644 --- a/src/views/wishingStar/userParticipationRecord.vue +++ b/src/views/wishingStar/userParticipationRecord.vue @@ -59,9 +59,6 @@ v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]" - :small="small" - :disabled="disabled" - :background="background" layout="sizes, prev, pager, next" :total="total" @size-change="handleSizeChange" @@ -73,13 +70,17 @@ import { promiseStarUserRecordPage, promiseStarUserRecordExport, +// @ts-ignore } from "@/api/wishingStar/wishingStar"; +// @ts-ignore import { dateFormat } from "@/utils/system-helper"; +// @ts-ignore import { ElMessage } from "element-plus"; export default { name: "userParticipationRecord", data() { return { + loading: false, //查询所需条件对象 inquire: { turnId: "", @@ -115,6 +116,7 @@ export default { endTime: endTime, page: this.currentPage, pageSize: this.pageSize, + // @ts-ignore }).then((res) => { this.tableData = res.data.records; this.total = res.data.total; @@ -138,14 +140,14 @@ export default { endTime: endTime, page: this.currentPage, pageSize: this.pageSize, - }).then((res) => {}); + }).then(() => {}); }, // 分页导航 - handleSizeChange(val) { + handleSizeChange() { this.getData(); }, - handleCurrentChange(val) { + handleCurrentChange() { this.getData(); }, }, diff --git a/src/views/wishingStar/wishingRound.vue b/src/views/wishingStar/wishingRound.vue index e1e6a35..c3f7f2d 100644 --- a/src/views/wishingStar/wishingRound.vue +++ b/src/views/wishingStar/wishingRound.vue @@ -84,9 +84,6 @@ v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]" - :small="small" - :disabled="disabled" - :background="background" layout="sizes, prev, pager, next" :total="total" @size-change="handleSizeChange" @@ -119,8 +116,11 @@