diff --git a/jeecgboot-vue3-master/.eslintrc.js b/jeecgboot-vue3-master/.eslintrc.js index 5fcac9eb..0276b3f7 100644 --- a/jeecgboot-vue3-master/.eslintrc.js +++ b/jeecgboot-vue3-master/.eslintrc.js @@ -7,6 +7,11 @@ module.exports = defineConfig({ node: true, es6: true, }, + globals: { + // 在这里声明html2canvas为全局变量 + html2canvas: 'readonly', + + }, parser: 'vue-eslint-parser', parserOptions: { parser: '@typescript-eslint/parser', diff --git a/jeecgboot-vue3-master/src/api/common/api.ts b/jeecgboot-vue3-master/src/api/common/api.ts index 4be01130..237e17fc 100644 --- a/jeecgboot-vue3-master/src/api/common/api.ts +++ b/jeecgboot-vue3-master/src/api/common/api.ts @@ -181,3 +181,11 @@ export const getStudent = () => { url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/xssybsjs' }) } + +// 组委会报告 +// /annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg +export const getOrganizingCommitteeReport = () => { + return defHttp.get({ + url:'/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/zwhfxbg' + }) +} \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/comprehensiveReport.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/comprehensiveReport.vue index 50140904..cf706eea 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/comprehensiveReport.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/comprehensiveReport.vue @@ -185,8 +185,8 @@ await clickDom(); // return var canvas = document.createElement('canvas'); - var w = parseInt(document.querySelector('.container').clientWidth); - var h = parseInt(document.querySelector('.container').clientHeight); + var w = parseInt((document.querySelector('.container') as Element).clientWidth); + var h = parseInt((document.querySelector('.container') as Element).clientHeight); console.log(w, h); canvas.width = w; diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue index 3a522f53..6c04fa1a 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue @@ -1,6 +1,6 @@