diff --git a/src/App.vue b/src/App.vue index 6561d77..32ba27b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -22,9 +22,10 @@ export default { const docHeight = document.body.clientHeight; - const docWidth = document.body.clientWidth; - - if (docWidth < 1700) { + const docWidth = document.body.clientWidth; + + if (docWidth < 1700) { + const currentScale = docHeight / docWidth; let [scale, translate] = [0, 0]; @@ -51,22 +52,56 @@ export default { offsetHeight > 0 ? `translate(0, ${offsetHeight / 2}px)` : ""; } - if (docHeight <= 700) { + if (docHeight <= 600) { + + $app.style.cssText = ` + transform: scale(${scale}) ${translate}; + transform-origin: top left; + min-width: 1920px; + min-height:830px; + `; + } + else if (docHeight == 610) { + $app.style.cssText = ` + transform: scale(${scale}) ${translate}; + transform-origin: top left; + min-width: 1920px; + min-height:885px; + `; + } + else if (docHeight <= 606) { + $app.style.cssText = ` + transform: scale(${scale}) ${translate}; + transform-origin: top left; + min-width: 1920px; + min-height:850px; + `; + } + else if (docHeight <= 650) { + + $app.style.cssText = ` + transform: scale(${scale}) ${translate}; + transform-origin: top left; + min-width: 1920px; + min-height:850px; + `; + } + else if (docHeight <= 700) { $app.style.cssText = ` transform: scale(${scale}) ${translate}; transform-origin: top left; min-width: 1920px; - min-height: 885px; + min-height: 890px; `; } - else if (docHeight <= 780) { + else if (docHeight <= 750) { $app.style.cssText = ` transform: scale(${scale}) ${translate}; transform-origin: top left; min-width: 1920px; - min-height:910px; + min-height: 910px; `; } else { diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss index 8e42948..348be45 100644 --- a/src/assets/css/index.scss +++ b/src/assets/css/index.scss @@ -498,7 +498,7 @@ ul { .flex-btn { position: fixed !important; z-index: 999 !important; - bottom: 30px !important; + bottom: 0px !important; padding: 10px 10px !important; right: 0px !important; background-color: white !important; @@ -514,7 +514,7 @@ ul { .flex-btn { position: fixed !important; z-index: 999 !important; - bottom: 30px !important; + bottom: -4px !important; padding: 10px 10px !important; right: 0px !important; background-color: white !important; @@ -541,11 +541,13 @@ ul { @media screen and (max-width: 1920px) { - * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6, .el-progress__text) { + * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6, .el-progress__text, .text-radius) { font-size: 18px !important; - + .text-radius *{ + font-size: 16px !important; + } .default-body-detail * { font-size: 15px !important; @@ -576,11 +578,15 @@ ul { } @media screen and (min-width: 1921px) { - * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6, .el-progress__text) { + * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6, .el-progress__text, .text-radius) { font-size: 14px !important; - .default-body-detail * { + .text-radius * { + font-size: 14px !important; + } + + .default-body-detail * { font-size: 13px !important; .cell { @@ -591,7 +597,7 @@ ul { .default-body .default-filter * { line-height: 38px !important; - } + } .card-content { width: 48% !important; diff --git a/src/config/index.js b/src/config/index.js index a29c918..f0cc3f5 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,13 +1,13 @@ const modeUrl = { // 开发环境 development: { - baseURL: "/api/", + baseURL: "/", authBaseURL: "", $cdn:"" }, // 生产环境 production: { - baseURL: "/api/", + baseURL: "/", authBaseURL: "", $cdn:"" }, diff --git a/src/store/index.js b/src/store/index.js index 38a429e..fe06309 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -67,9 +67,11 @@ const store = new Vuex.Store({ } return null; }); + state.addRouters = aRouters; // 保存动态路由用来addRouter state.routers = defaultRouter.concat(aRouters); // 所有有权限的路由表，用来生成菜单列表 localStorage.setItem("addRouters", JSON.stringify(routers)); + console.log('routers',state) }, setTokenSources(state, data) { if (data instanceof Array) { diff --git a/src/views/basic/askTestQuestion/components/askSummaryReport.vue b/src/views/basic/askTestQuestion/components/askSummaryReport.vue index f84eb4d..968138b 100644 --- a/src/views/basic/askTestQuestion/components/askSummaryReport.vue +++ b/src/views/basic/askTestQuestion/components/askSummaryReport.vue @@ -306,8 +306,7 @@ export default { _export() { this.diaShow = true; }, - _print() { - + _print() { let title = this.detail.title || this.subjectNames?.join(); tablePrint({ id: "print-content", @@ -473,6 +472,8 @@ export default { this.singleSubjectSummary = periodListReponse.data.list; this.total = periodListReponse.data.count; + + this.exportStudent = [...this.singleSubjectSummary]; }, async _studentPerformance() { diff --git a/src/views/basic/askTestQuestion/detail.vue b/src/views/basic/askTestQuestion/detail.vue index b6f0b8e..b179b45 100644 --- a/src/views/basic/askTestQuestion/detail.vue +++ b/src/views/basic/askTestQuestion/detail.vue @@ -17,16 +17,13 @@
- + 单题低分率： - 设置学生成绩等级 @@ -405,6 +402,7 @@ {{ scoped.row.missPeopleNumber }} 人 选{{ item.option }}：{{ item.students.join("/") }} @@ -1650,7 +1648,7 @@ export default { var missCount = 0; - var missI = questionList[i].details.filter(item => !item.right); + var missI = questionList[i].details.filter(item => item.option.indexOf('未答') < 0 && !item.right); missI.forEach(itemsa => { missCount = Number(missCount) + Number(itemsa.students?.length ?? 0) diff --git a/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue b/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue index acfb718..f725952 100644 --- a/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue +++ b/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue @@ -182,7 +182,7 @@ 总计 {{ scoped.row.missPeopleNumber }} 人 - 选{{ item.option }}：{{ item.students.join("/") }} @@ -1044,7 +1044,7 @@ export default { var missCount = 0; - var missI = questionList[i].details.filter(item => !item.right); + var missI = questionList[i].details.filter(item => item.option.indexOf('未答') < 0 && !item.right); missI.forEach(itemsa => { missCount = Number(missCount) + Number(itemsa.students?.length ?? 0) diff --git a/src/views/basic/askTestQuestion/index.vue b/src/views/basic/askTestQuestion/index.vue index 3a090c0..974886c 100644 --- a/src/views/basic/askTestQuestion/index.vue +++ b/src/views/basic/askTestQuestion/index.vue @@ -40,7 +40,7 @@
-
+
@@ -53,6 +53,9 @@
{{ item.id }}
+
+ {{ item.tag }}  +
@@ -73,7 +76,8 @@ - 删除 @@ -145,6 +149,9 @@
{{ item.id }}
+
+ {{ item.tag }}  +
@@ -164,7 +171,8 @@ - 删除 @@ -274,7 +282,7 @@ -
+

第二步：上传完成编辑好的试卷。

@@ -308,14 +316,14 @@ export default { sharedList: [], dataType: "1", importType: 0, - tabType: "0", + tabType: "0", url: "/api_html/common/paper/upload", //上传文档地址 listPage: { page: 1, size: 8, total: 0, }, - query: { + query: { dateStatus: "-1", title: "", class: null, @@ -339,19 +347,19 @@ export default { this.listPage.page = 1; this._serach(); }, - 'query.dateStatus'(val) { + 'query.dateStatus'(val) { var dateRange = setDateRules(val); this.query.dateRange = [dateRange.startDay, dateRange.endDay]; } }, - async created() { + async created() { this.dataType = location.href.endsWith("askPreparationQuestions") ? "1" : "2"; this.code = this.$store.getters.csCode; this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; - this.query.dateStatus = "onWeek"; + this.query.dateStatus = "onWeek"; await this._loadQueryDatas(); }, methods: { @@ -657,182 +665,206 @@ export default { }; \ No newline at end of file diff --git a/src/views/basic/askTestQuestion/update.vue b/src/views/basic/askTestQuestion/update.vue index 1684b87..dc6a124 100644 --- a/src/views/basic/askTestQuestion/update.vue +++ b/src/views/basic/askTestQuestion/update.vue @@ -26,8 +26,7 @@

分享范围： 任课班级分享 - 自定义分享班级 + 自定义分享班级

@@ -225,26 +224,30 @@ :append-to-body="true">
-
- 年级： - {{ gradeName }} -
+ +
+ 年级： + {{ gradeName }} +
+ - 班级： -
+ 班级： +
- - 全选 -
- - {{ item.className }} - -
- -
+ + 全选 +
+ + {{ item.className }} + +
+ +
+
@@ -1134,7 +1137,7 @@ export default { }, }; - diff --git a/vue.config.js b/vue.config.js index 26ea643..a40c443 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,8 +1,9 @@ const path = require("path"); const resolve = (dir) => path.join(__dirname, dir); const IS_PROD = ["production", "prod"].includes(process.env.NODE_ENV); -const BundleAnalyzerPlugin = require("webpack-bundle-analyzer") - .BundleAnalyzerPlugin; +const BundleAnalyzerPlugin = require("webpack-bundle-analyzer").BundleAnalyzerPlugin; + +const TimeStamp = new Date().getTime(); module.exports = { publicPath: "./", // 编译后的地址，可以根据环境进行设置 @@ -33,9 +34,21 @@ module.exports = { }, disableHostCheck: true }, + configureWebpack: { + devtool: 'source-map', + output: { // 输出重构 打包编译后的 文件名称 【模块名称.版本号.js】 + filename: `js/[name].${TimeStamp}.js`, + chunkFilename: `js/[name].${TimeStamp}.js` + }, + }, css: { extract: IS_PROD, // 是否将组件中的 CSS 提取至一个独立的 CSS 文件中 (而不是动态注入到 JavaScript 中的 inline 代码)。 sourceMap: false, + extract: { + // 修改打包后css文件名 // css打包文件，添加时间戳 + filename: `css/[name].${TimeStamp}.css`, + chunkFilename: `css/[name].${TimeStamp}.css` + } }, chainWebpack: (config) => { config.plugin('html').tap(args => {