From ef16e57e44cc35452a97631094f164e361015342 Mon Sep 17 00:00:00 2001 From: LH_PC <2604481917@qq.com> Date: Thu, 22 Aug 2024 09:04:20 +0800 Subject: [PATCH] fix:前端版本迭代 --- public/static/课件模板.docx | Bin 59424 -> 0 bytes src/App.vue | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------- src/api/apis/apis.js | 24 ++++++++++++++++++++---- src/api/axios.js | 2 +- src/api/urls/apis.js | 14 ++++++++++---- src/assets/css/index.scss | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------- src/components/upload.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- src/config/index.js | 2 +- src/router/index.js | 2 +- src/store/index.js | 10 ++++------ src/utils/index.js | 480 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------- src/views/admin/clientVersion/components/upLoad.vue | 22 +++++++++++++++++++++- src/views/admin/clientVersion/components/upLoadImg.vue | 22 +++++++++++++++++++++- src/views/basic/ask/analysis.vue | 5 ++++- src/views/basic/ask/archiving.vue | 10 ++++++---- src/views/basic/ask/components/answerQustion.vue | 4 ++-- src/views/basic/ask/components/example.vue | 8 ++++---- src/views/basic/askTestQuestion/components/askBzrMulti.vue | 35 ++++++++++++++++++++++++++++------- src/views/basic/askTestQuestion/components/askListReport.vue | 22 ++++++++++++---------- src/views/basic/askTestQuestion/components/askSummaryReport.vue | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- src/views/basic/askTestQuestion/components/testBzrMulti.vue | 36 +++++++++++++++++++++--------------- src/views/basic/askTestQuestion/components/testListReport.vue | 4 +++- src/views/basic/askTestQuestion/components/testMultiClassReport.vue | 13 +++++++------ src/views/basic/askTestQuestion/components/testSummaryReport.vue | 25 ++++++++++++++++++------- src/views/basic/askTestQuestion/detail.vue | 589 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/basic/askTestQuestion/gradeAnalysisDetail.vue | 219 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------- src/views/basic/askTestQuestion/index.vue | 77 +++++++++++++++++++++++++++++++++++++++++++---------------------------------- src/views/basic/askTestQuestion/report.vue | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------- src/views/basic/askTestQuestion/update.vue | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------- src/views/basic/down/client.vue | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------- src/views/basic/setUp/clazz.vue | 9 ++++++--- src/views/basic/setUp/student.vue | 2 +- src/views/basic/setUp/teacher.vue | 188 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------- src/views/basic/test/archiving.vue | 411 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/basic/test/components/contrast.vue | 19 ++++++++++--------- src/views/basic/test/components/multipleSubTest.vue | 149 ++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------- src/views/basic/test/components/multipleTest.vue | 5 ++++- src/views/basic/test/components/scoreSet.vue | 45 +++++++++++++++++++++++++-------------------- src/views/examinationPaper/add.vue | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------- src/views/examinationPaper/addQs.vue | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------- src/views/examinationPaper/edit.vue | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------- src/views/examinationPaper/edit_Old.vue | 19 ++++++++++++++++++- src/views/index/mainIndex.vue | 21 ++++++++++++++++----- src/views/layout/header/header.vue | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------ src/views/login/index.vue | 4 ++-- vue.config.js | 4 +++- 46 files changed, 2297 insertions(+), 1781 deletions(-) diff --git a/public/static/课件模板.docx b/public/static/课件模板.docx index c26e1ac..25e2dd4 100644 Binary files a/public/static/课件模板.docx and b/public/static/课件模板.docx differ diff --git a/src/App.vue b/src/App.vue index 5aef7fe..6561d77 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,88 +13,84 @@ export default { mounted() { }, - created() { - this.$nextTick(() => { + methods: { + _reSize() { + const $app = this.$refs.app; - // 设置 屏幕 百分比 尺寸 适配 - const standardScale = "100%" / "100%"; - window.addEventListener( - "resize", - _.debounce(function () { - const docHeight = document.body.clientHeight; + const standardScale = "100%" / "100%"; - const docWidth = document.body.clientWidth; + const docHeight = document.body.clientHeight; - if (docWidth < 1700) { + const docWidth = document.body.clientWidth; + + if (docWidth < 1700) { + const currentScale = docHeight / docWidth; - const currentScale = docHeight / docWidth; + let [scale, translate] = [0, 0]; + if (currentScale < standardScale) { + // 以高度计算 + scale = docHeight / 1080; - let [scale, translate] = [0, 0]; + const shouleWidth = 1920 * scale; - if (currentScale < standardScale) { - // 以高度计算 - scale = docHeight / 1080; + const offsetWidth = docWidth - shouleWidth; - const shouleWidth = 1920 * scale; + translate = + offsetWidth > 0 ? `translate(${offsetWidth / 2}px, 0)` : ""; - const offsetWidth = docWidth - shouleWidth; + } else { + // 以宽度计算 + scale = docWidth / 1920; - translate = - offsetWidth > 0 ? `translate(${offsetWidth / 2}px, 0)` : ""; - - } else { - // 以宽度计算 - scale = docWidth / 1920; + const shouleHeight = 1080 * scale; - const shouleHeight = 1080 * scale; + const offsetHeight = docHeight - shouleHeight; - const offsetHeight = docHeight - shouleHeight; + translate = + offsetHeight > 0 ? `translate(0, ${offsetHeight / 2}px)` : ""; + } - translate = - offsetHeight > 0 ? `translate(0, ${offsetHeight / 2}px)` : ""; - } - - if (docHeight <= 700) { + if (docHeight <= 700) { - $app.style.cssText = ` + $app.style.cssText = ` transform: scale(${scale}) ${translate}; transform-origin: top left; min-width: 1920px; - min-height: 850px; - `; - } - else if (docHeight <= 750) { - - $app.style.cssText = ` + min-height: 885px; + `; + } + else if (docHeight <= 780) { + + $app.style.cssText = ` transform: scale(${scale}) ${translate}; transform-origin: top left; min-width: 1920px; - min-height:920px; - `; - } - else { - $app.style.cssText = ` + min-height:910px; + `; + } + else { + $app.style.cssText = ` transform: scale(${scale}) ${translate}; transform-origin: top left; min-width: 1920px; - min-height:1080px; - `; - } + min-height:1045px; + `; + } - } else { - $app.style.cssText = ''; - } - }), - 300 - ); + } else { + $app.style.cssText = ''; + } + }, + }, + created() { + let that = this; + this.$nextTick(() => { if (document.createEvent) { - var event = document.createEvent("HTMLEvents"); - event.initEvent("resize", true, true); - window.dispatchEvent(event); + that._reSize(); } else if (document.createEventObject) { - window.fireEvent("onresize"); + that._reSize(); } }); } @@ -106,7 +102,7 @@ export default { body { margin: 0px; padding: 0px; - font-family: Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, SimSun, sans-serif; + font-family: Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, SimSun, sans-serif; -webkit-font-smoothing: antialiased; } diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js index 9507ba0..d099a45 100644 --- a/src/api/apis/apis.js +++ b/src/api/apis/apis.js @@ -23,12 +23,22 @@ const downService = (url, data) => { responseType: 'arraybuffer', }); } -export default { +export default { // 知识点 gKnowledge(section, subject) { - return defaltService(setUpUrls.gtestExamReport, { - ...subject, ...section - }) + var requestParams = []; + if (section) { + requestParams.push("section=" + section); + } + if (subject) { + requestParams.push("subject=" + subject); + } + var requestUrl = setUpUrls.gKnowledge + (requestParams.length >= 1 ? "?" + requestParams.join("&") : ""); + return defaltGetService(requestUrl) + }, + // 年级组长-成绩概要 + gclassdiffReport(data) { + return defaltService(setUpUrls.gclassdiffReport, data) }, // 年级组长-成绩测验单 gTestExamReport(data) { @@ -213,6 +223,9 @@ export default { periodReportList(data) { return defaltService(setUpUrls.periodReportList, data) }, + classdiffreport(data) { + return defaltService(setUpUrls.classdiffreport, data) + }, //任课老师-查询阶段问答报表 phaseAnswerReport(data) { return defaltService(setUpUrls.phaseAnswerReport, data) @@ -680,6 +693,9 @@ export default { pModifyPaper(data) { return defaltService(setUpUrls.pModifyPaper, data) }, + pModifyPaperNew(data) { + return defaltService(setUpUrls.pModifyPaperNew, data) + }, // 删除答题卡 pDelPaper(data) { return defaltService(setUpUrls.pDelPaper, data) diff --git a/src/api/axios.js b/src/api/axios.js index 89387b9..70276fe 100644 --- a/src/api/axios.js +++ b/src/api/axios.js @@ -3,7 +3,7 @@ import NProgress from "nprogress"; import { Message } from "element-ui"; import router from "@/router/index"; import store from "@/store"; -import conf from "../config/index"; // 路径配置 +import conf from "@/config/index"; // 路径配置 import { getURLParams } from "@/utils"; let code = getURLParams("code") || getURLParams("dockkey") || localStorage.getItem("csCode") || ""; diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js index 85e46ef..b433de8 100644 --- a/src/api/urls/apis.js +++ b/src/api/urls/apis.js @@ -1,7 +1,7 @@ export default { - // 年级组长-查询报表列表 - gKnowledge: "/api_html/knowledge/list", + // 年级组长-查询报表列表 + gKnowledge: "/knowledge/list", // 年级组长-查询报表列表 gListExamReport: "/api_html/grade/manager/listExamReport", // 年级组长-查询管理的班级 @@ -17,6 +17,8 @@ export default { gExportPhaseInteractiveReport: "/api_html/grade/manager/exportPhaseInteractiveReport", // 年级组长-成绩测验单 gtestExamReport: "/api_html/grade/manager/testExamReport", + // 年级组长-考试概要 + gclassdiffReport: "/api_html/grade/manager/classdiffreport", // 年级组长-试题分析 gpaperExamReport: "/api_html/grade/manager/paperExamReport", // 年级组长-学生成绩排行 @@ -62,13 +64,15 @@ export default { //任课老师-查询管理班级 tClassList: "/api_html/teaching/classList", + //任老师-报表详情 + classdiffreport: "/api_html/teaching/classdiffreport", tpaperExamReport: "/api_html/teaching/paperExamReport", // 任课老师-学生成绩排行 tstudentExamReport2: "/api_html/teaching/studentExamReport2", // 任课老师-班级情况对比 tclassdiffExamReport: "/api_html/teaching/classdiffExamReport", tClassFromGrade: "/api_html/teaching/grade/classList", - tClassGrade:'/api_html/teaching/grade', + tClassGrade: '/api_html/teaching/grade', //任课老师-测验成绩单 tTestExamReport: "/api_html/teaching/testExamReport", //任课老师-查询答题卡详情 @@ -82,7 +86,7 @@ export default { phaseAnswerReport: "/api_html/teaching/phaseAnswerReport", //任课老师-查询阶段互动报表 phaseInteractiveReport: "/api_html/teaching/phaseInteractiveReport", - exportPhaseExamReport: "/api_html/teaching/exportPhaseExamReport", + exportPhaseExamReport: "/api_html/teaching/exportPhaseExamReport", //任课老师-查询课时题目列表 periodQuestionList: "/api_html/teaching/periodQuestionList", //任课老师-设置课时报表答案 @@ -93,6 +97,8 @@ export default { periodQuestionReport: "/api_html/teaching/periodQuestionReport", //任课老师-查询课时学生答题明细 periodStudentReport: "/api_html/teaching/periodStudentReport", + // 修改答题卡 + pModifyPaperNew: "/api_html/teaching/modifyPaperNew", //任课老师-分页查询即时测报表 examReportList: "/api_html/teaching/examReportList", //任课老师-查询阶段测练报表 diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss index 62f2730..8e42948 100644 --- a/src/assets/css/index.scss +++ b/src/assets/css/index.scss @@ -347,6 +347,26 @@ ul { // 默认实体 .default-body { + + .anwser-column { + border: 1px solid #ebeef5; + + padding: 0px !important; + + .cell { + height: 100%; + width: calc(100% - 2px); + } + + .red { + height: 100%; + width: 100%; + background: #FBEEDC; + color: red; + display: block; + } + } + font-size: 14px; font-weight: 400; color: #303133; @@ -386,7 +406,7 @@ ul { } tr, - td { + td:not(.anwser-column) { height: 40px; padding: 5px 0px !important; border: 1px solid #ebeef5; @@ -432,6 +452,12 @@ ul { line-height: 40px; } + .el-tag__close { + height: 100% !important; + line-height: 1.2; + min-width: 20px; + } + .filter-input, .filter-select { width: 13%; @@ -464,39 +490,108 @@ ul { } } -@media screen and (max-width: 1921px) and (max-height: 1081px) { - * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6) { +@media screen and (max-width: 1200px) { + .flex-content { + padding: 55px !important; + } + + .flex-btn { + position: fixed !important; + z-index: 999 !important; + bottom: 30px !important; + padding: 10px 10px !important; + right: 0px !important; + background-color: white !important; + width: calc(100% - 280px) !important; + } +} + +@media screen and (max-width: 1500px) and (min-width: 1201px) { + .flex-content { + padding: 55px !important; + } + + .flex-btn { + position: fixed !important; + z-index: 999 !important; + bottom: 30px !important; + padding: 10px 10px !important; + right: 0px !important; + background-color: white !important; + width: calc(100% - 280px) !important; + } +} + +@media screen and (min-width: 1501px) { + .flex-content { + padding: 25px !important; + } + + .flex-btn { + position: fixed !important; + z-index: 999 !important; + bottom: -10px !important; + padding: 10px 0px !important; + right: 30px !important; + background-color: white !important; + width: calc(100% - 280px) !important; + } + +} + + +@media screen and (max-width: 1920px) { + * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6, .el-progress__text) { + font-size: 18px !important; - .default-title { - font-size: 24px !important; + + + .default-body-detail * { + font-size: 15px !important; + + .cell { + padding-left: 2px !important; + padding-right: 2px !important; + } } - .el-button * { - font-size: 16px !important; + .default-title { + font-size: 24px !important; } - .el-select-dropdown__item * { + .el-select-dropdown__item *, + .small-button * { font-size: 16px !important; } .el-form :not(h1, h2, h3, h4, h5, h6), .el-dropdown-menu__item, - .el-cascader-node__label { + .el-form-item__error, + .el-dialog__body .el-checkbox *, + .el-checkbox__label { font-size: 16px !important; } - } } -@media screen and (min-width: 1921px) and (min-height: 1081px) { - * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6) { +@media screen and (min-width: 1921px) { + * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6, .el-progress__text) { font-size: 14px !important; + .default-body-detail * { + font-size: 13px !important; + + .cell { + padding-left: 4px !important; + padding-right: 4px !important; + } + } + .default-body .default-filter * { line-height: 38px !important; - } + } .card-content { width: 48% !important; @@ -506,13 +601,16 @@ ul { font-size: 24px !important; } - .el-select-dropdown__item * { + .el-select-dropdown__item *, + .small-button * { font-size: 12px !important; } .el-form :not(h1, h2, h3, h4, h5, h6), .el-dropdown-menu__item, - .el-cascader-node__label { + .el-form-item__error, + .el-dialog__body .el-checkbox *, + .el-checkbox__label { font-size: 12px !important; } diff --git a/src/components/upload.vue b/src/components/upload.vue index a8f9a36..1cab921 100644 --- a/src/components/upload.vue +++ b/src/components/upload.vue @@ -2,8 +2,9 @@
- 第一步: - - 或者导出菁优网试卷/组卷网(学科网)试卷; - 为保证第三方试卷导入成功,请注意参考导出示例: +
菁优网示例如下:
组卷网(学科网)示例如下:
- 第一步:
-
菁优网示例如下:
组卷网(学科网)示例如下:
第二步:上传完成编辑好的试卷。