diff --git a/.vs/Ezquiz_Platform/FileContentIndex/55df62fa-5432-4cfd-bb10-cbdb5e263ba4.vsidx b/.vs/Ezquiz_Platform/FileContentIndex/55df62fa-5432-4cfd-bb10-cbdb5e263ba4.vsidx new file mode 100644 index 0000000..1ebcfd8 --- /dev/null +++ b/.vs/Ezquiz_Platform/FileContentIndex/55df62fa-5432-4cfd-bb10-cbdb5e263ba4.vsidx diff --git a/.vs/Ezquiz_Platform/FileContentIndex/read.lock b/.vs/Ezquiz_Platform/FileContentIndex/read.lock new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/.vs/Ezquiz_Platform/FileContentIndex/read.lock diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 0000000..f8b4888 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": null +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000..9c27876 --- /dev/null +++ b/.vs/slnx.sqlite diff --git a/package.json b/package.json index 02c8f96..632de50 100755 --- a/package.json +++ b/package.json @@ -16,14 +16,14 @@ "js-cookie": "^2.2.0", "jsencrypt": "^3.2.0", "lodash": "^4.17.21", + "mockjs": "1.1.0", "nprogress": "^0.2.0", "script-ext-html-webpack-plugin": "^2.1.5", "vue": "^2.6.11", "vue-i18n": "^8.4.0", "vue-router": "^3.5.1", "vuedraggable": "^2.24.3", - "vuex": "^3.6.2", - "mockjs": "1.1.0" + "vuex": "^3.6.2" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.5.0", @@ -46,4 +46,4 @@ "sass-loader": "^7.1.0", "vue-template-compiler": "^2.5.2" } -} \ No newline at end of file +} diff --git a/src/App.vue b/src/App.vue index 900ba22..b47af19 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,14 +1,100 @@ @@ -17,7 +103,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; font-size: 14px; -webkit-font-smoothing: antialiased; } @@ -28,9 +114,11 @@ body { bottom: 0px; width: 100%; } -a{ - color: #56a9ff; + +a { + color: #56a9ff; } + .fade-enter-active, .fade-leave-active { transition: all .2s ease; @@ -40,8 +128,9 @@ a{ .fade-leave-active { opacity: 0; } + #nprogress .bar { - height: 3px !important; - background: #56a9ff !important; //自定义颜色 + height: 3px !important; + background: #56a9ff !important; //自定义颜色 } diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js index 6b0e283..21ce772 100644 --- a/src/api/apis/apis.js +++ b/src/api/apis/apis.js @@ -8,6 +8,13 @@ const defaltService = (url, data) => { data, }); } +const defaltGetService = (url, data) => { + return service({ + url: url, + method: "Get", + data, + }); +} const downService = (url, data) => { return service({ url: url, @@ -17,6 +24,63 @@ const downService = (url, data) => { }); } export default { + // 年级组长-成绩测验单 + gTestExamReport(data) { + return defaltService(setUpUrls.gtestExamReport, data) + }, + // 年级组长-试题分析 + gPaperExamReport(data) { + return defaltService(setUpUrls.gpaperExamReport, data) + }, + // 年级组长-学生成绩排行 + gStudentExamReport(data) { + return defaltService(setUpUrls.gstudentExamReport, data) + }, + // 年级组长-班级情况对比 + gClassdiffExamReport(data) { + return defaltService(setUpUrls.gclassdiffExamReport, data) + }, + // 年级组长-查询即时测数据 + gExamListReport(data) { + return defaltService(setUpUrls.gListExamReport, data) + }, + // 年级组长-查询管理的班级 + gClass(data) { + return defaltGetService(setUpUrls.gClassList, data) + }, + // 年级组长-导出阶段问答报表-多科 + gExportPhaseAnswerReport(data) { + return defaltService(setUpUrls.gExportPhaseAnswerReport, data) + }, + // 年级组长-导出阶段测练 + gExportPhaseExamReport(data) { + return downService(setUpUrls.gExportPhaseExamReport, data) + }, + // 年级组长-导出阶段问答 + gExportPhaseInteractiveReport(data) { + return downService(setUpUrls.gExportPhaseInteractiveReport, data) + }, + + // 年级组长-首页统计数据 + gIndex(data) { + return defaltService(setUpUrls.gIndex, data) + }, + // 年级组长-查询阶段问答-多科 + gPhaseAnswerReport(data) { + return defaltService(setUpUrls.gPhaseAnswerReport, data) + }, + // 年级组长-查询阶段测练-多科 + gPhaseExamReport(data) { + return defaltService(setUpUrls.gPhaseExamReport, data) + }, + // 年级组长-查询阶段互动-多科 + gPhaseInteractiveReport(data) { + return defaltService(setUpUrls.gPhaseInteractiveReport, data) + }, + // 年级组长-查询年级授课科目 + gSubjectList(data) { + return defaltService(setUpUrls.gSubjectList + data, null) + }, // 教师首页数据 teacherIndex(data) { return defaltService(setUpUrls.teacherIndex, data) @@ -37,8 +101,10 @@ export default { personalIndex(data) { return defaltService(setUpUrls.personalIndex, data) }, - - + //班主任-查询管理的班级 + cTTestExamReport(data) { + return defaltService(setUpUrls.cTTestExamReport, data) + }, //班主任-查询管理的班级 cTClassList(data) { return defaltService(setUpUrls.cTClassList, data) @@ -71,15 +137,41 @@ export default { cTExportPhaseExamReport(data) { return downService(setUpUrls.cTExportPhaseExamReport, data) }, - + //任课老师-查询管理的班级 + tTestExamReport(data) { + return defaltService(setUpUrls.tTestExamReport, data) + }, //任课老师-查询管理的班级 tClassList(data) { return defaltService(setUpUrls.tClassList, data) }, + //任课老师-查询管理的班级 + tClassFromGrade(data) { + return defaltGetService(setUpUrls.tClassFromGrade + "?classId=" + data) + }, + tPaperDetail(data) { + return defaltService(setUpUrls.tPaperDetail, data) + }, //任课老师-查询管理班级授课科目 tSubjectList(data) { return defaltService(setUpUrls.tSubjectList, data) }, + // 年级组长-试题分析 + tPaperExamReport(data) { + return defaltService(setUpUrls.tpaperExamReport, data) + }, + // 年级组长-学生成绩排行 + tStudentExamReport(data) { + return defaltService(setUpUrls.tstudentExamReport, data) + }, + // 年级组长-班级情况对比 + tClassdiffExamReport(data) { + return defaltService(setUpUrls.tclassdiffExamReport, data) + }, + //任课老师-查询管理班级授课科目 + tListExamReport(data) { + return defaltService(setUpUrls.tListExamReport, data) + }, //任课老师-分页查询课时报表列表 periodReportList(data) { return defaltService(setUpUrls.periodReportList, data) @@ -194,8 +286,8 @@ export default { return defaltService(setUpUrls.tStudentList, data) }, //任课老师-学生测练统计 - tStudentExamReport(data) { - return defaltService(setUpUrls.tStudentExamReport, data) + tgStudentExamReport(data) { + return defaltService(setUpUrls.tstudentExamReport2, data) }, // 查询角色列表 diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js index 223fc3a..5f68a86 100644 --- a/src/api/urls/apis.js +++ b/src/api/urls/apis.js @@ -1,5 +1,33 @@ export default { + // 年级组长-查询报表列表 + gListExamReport: "/api_html/grade/manager/listExamReport", + // 年级组长-查询管理的班级 + gClassList: "/api_html/grade/manager/classList", + // 年级组长-导出阶段问答报表-多科 + gExportPhaseAnswerReport: "/api_html/grade/manager/exportPhaseAnswerReport", + // 年级组长-导出阶段测练 + gExportPhaseExamReport: "/api_html/grade/manager/exportPhaseExamReport", + // 年级组长-导出阶段问答 + gExportPhaseInteractiveReport: "/api_html/grade/manager/exportPhaseInteractiveReport", + // 年级组长-成绩测验单 + gtestExamReport: "/api_html/grade/manager/testExamReport", + // 年级组长-试题分析 + gpaperExamReport: "/api_html/grade/manager/paperExamReport", + // 年级组长-学生成绩排行 + gstudentExamReport: "/api_html/grade/manager/studentExamReport", + // 年级组长-班级情况对比 + gclassdiffExamReport: "/api_html/grade/manager/classdiffExamReport", + // 年级组长-首页统计数据 + gIndex: "/api_html/grade/manager/index", + // 年级组长-查询阶段问答-多科 + gPhaseAnswerReport: "/api_html/grade/manager/phaseAnswerReport", + // 年级组长-查询阶段测练-多科 + gPhaseExamReport: "/api_html/grade/manager/phaseExamReport", + // 年级组长-查询阶段互动-多科 + gPhaseInteractiveReport: "/api_html/grade/manager/phaseInteractiveReport", + // 年级组长-查询年级授课科目 + gSubjectList: "/api_html/grade/manager/subjectList", // 授课老师首页数据 teacherIndex: "/api_html/teaching/index", // 学校管理员首页数据 @@ -24,11 +52,24 @@ export default { cTExportPhaseInteractiveReport: "/api_html/class/manager/exportPhaseInteractiveReport", //班主任- 导出阶段测练报表 cTExportPhaseExamReport: "/api_html/class/manager/exportPhaseExamReport", + //班主任- 测验成绩单 + cTTestExamReport: "/api_html/class/manager/phaseExamReport", //任课老师-查询管理班级 tClassList: "/api_html/teaching/classList", + tpaperExamReport: "/api_html/teaching/paperExamReport", + // 任课老师-学生成绩排行 + tstudentExamReport2: "/api_html/teaching/studentExamReport2", + // 任课老师-班级情况对比 + tclassdiffExamReport: "/api_html/teaching/classdiffExamReport", + tClassFromGrade: "/api_html/teaching/grade/classList", + //任课老师-测验成绩单 + tTestExamReport: "/api_html/teaching/testExamReport", + //任课老师-查询答题卡详情 + tPaperDetail: "/api_html/teaching/paperDetail", //任课老师-查询管理班级授课科目 tSubjectList: "/api_html/teaching/subjectList", + tListExamReport: "/api_html/teaching/listExamReport", //任课老师-分页查询课时报表列表 periodReportList: "/api_html/teaching/periodReportList", //任课老师-查询阶段问答报表 diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss index 352ef50..a41a380 100644 --- a/src/assets/css/index.scss +++ b/src/assets/css/index.scss @@ -1,3 +1,45 @@ +.default-date-radio-group { + height: 100%; + line-height: 1; + + .el-radio-button__inner { + display: inline-block; + border: none; + height: 100%; + line-height: 10px; + font-size: 14px; + border: none !important; + box-shadow: none !important; + padding: 0px !important; + margin-right: 15px; + } + + :first-child { + margin-left: 12px; + } + + .el-radio-button__orig-radio:checked+.el-radio-button__inner { + background: transparent !important; + color: #6b7ef5 !important; + font-weight: bold; + border: none !important; + box-shadow: none !important; + } +} + +.green-el-button { + background-color: rgba(65, 204, 149, 1); + color: white; + border-color: rgba(65, 204, 149, 1); + + :focus,:hover { + background-color: rgba(65, 204, 149, 1); + color: white; + border-color: rgba(65, 204, 149, 1); + } + +} + .answer-header { padding: 16px 40px 12px 20px; display: flex; @@ -199,6 +241,7 @@ ul { .screenshot-box { width: 600px; + .screenshot { width: 100%; box-shadow: none; @@ -245,4 +288,125 @@ ul { width: 148px !important; } } +} + +// 默认标题 +.default-title { + height: 36px; + font-weight: bold; + font-size: 24px; + color: #131523; + line-height: 36px; + text-align: left; + font-style: normal; + text-transform: none; +} + +// 默认实体 +.default-body { + font-size: 14px; + font-weight: 400; + color: #303133; + background-color: #F5F6FA; + + .default-filter, + .el-main { + background: #FFFFFF; + box-shadow: 0px 1px 4px 0px rgba(21, 34, 50, 0.08); + } + + .detailBack { + height: auto !important; + border: none !important; + } + + .el-header { + padding: 20px !important; + } + + .el-main { + margin: 0px 20px !important; + padding: 0px !important; + + .default-table { + th { + font-weight: 400; + font-size: 14px; + color: #5A607F; + text-align: left; + font-style: normal; + text-transform: none; + border:1px solid #ebeef5; + } + + tr,td { + height: 40px; border:1px solid #ebeef5; + } + } + + .default-tabs { + .el-tabs__item { + border: none !important; + } + + .el-tabs__header { + background: #F5F7FA !important; + } + + .el-tabs__item.is-active { + background: white !important; + color: #667FFD !important; + } + } + } + + .el-footer-pagination { + height: 40px !important; + background: #FFFFFF; + margin: 0px 20px !important; + + .el-footer-pagination-box, + .el-pagination { + line-height: 30px; + float: right; + vertical-align: middle; + height: 30px; + } + } + + .default-filter { + margin: 14px 20px !important; + padding: 14px 20px !important; + + * { + height: 32px; + line-height: 32px; + } + + .filter-input, + .filter-select { + width: 13%; + margin-right: 10px; + } + + .filter-datePicker { + width: 25%; + margin-right: 10px; + + input { + // border: 1px solid #DCDFE6; + height: 31px; + } + } + + .el-button { + width: auto; + line-height: 0px; + padding: 0px 15px !important; + } + + .el-button--primary { + background-color: rgb(107, 126, 245); + } + } } \ No newline at end of file diff --git a/src/assets/desktop.ini b/src/assets/desktop.ini new file mode 100644 index 0000000..d957fd1 --- /dev/null +++ b/src/assets/desktop.ini @@ -0,0 +1,4 @@ +[ViewState] +Mode= +Vid= +FolderType=Generic diff --git a/src/assets/images/aside/ask-default.png b/src/assets/images/aside/ask-default.png new file mode 100644 index 0000000..97ef432 --- /dev/null +++ b/src/assets/images/aside/ask-default.png diff --git a/src/assets/images/aside/paper-default.png b/src/assets/images/aside/paper-default.png new file mode 100644 index 0000000..606360d --- /dev/null +++ b/src/assets/images/aside/paper-default.png diff --git a/src/assets/images/aside/paper-selected.png b/src/assets/images/aside/paper-selected.png new file mode 100644 index 0000000..abcf156 --- /dev/null +++ b/src/assets/images/aside/paper-selected.png diff --git a/src/assets/images/aside/shouye-default.png b/src/assets/images/aside/shouye-default.png new file mode 100644 index 0000000..19ad8bb --- /dev/null +++ b/src/assets/images/aside/shouye-default.png diff --git a/src/assets/images/aside/shouye-selected.png b/src/assets/images/aside/shouye-selected.png new file mode 100644 index 0000000..7191911 --- /dev/null +++ b/src/assets/images/aside/shouye-selected.png diff --git a/src/assets/images/aside/suitangwen-baobiao-default.png b/src/assets/images/aside/suitangwen-baobiao-default.png new file mode 100644 index 0000000..0cc20aa --- /dev/null +++ b/src/assets/images/aside/suitangwen-baobiao-default.png diff --git a/src/assets/images/aside/suitangwen-baobiao-selected.png b/src/assets/images/aside/suitangwen-baobiao-selected.png new file mode 100644 index 0000000..60d7164 --- /dev/null +++ b/src/assets/images/aside/suitangwen-baobiao-selected.png diff --git a/src/assets/images/aside/test-default.png b/src/assets/images/aside/test-default.png new file mode 100644 index 0000000..9e52104 --- /dev/null +++ b/src/assets/images/aside/test-default.png diff --git a/src/assets/images/rili.png b/src/assets/images/rili.png new file mode 100644 index 0000000..9cd8401 --- /dev/null +++ b/src/assets/images/rili.png diff --git a/src/assets/images/shuaxin.png b/src/assets/images/shuaxin.png new file mode 100644 index 0000000..0578220 --- /dev/null +++ b/src/assets/images/shuaxin.png diff --git a/src/assets/images/shuben.png b/src/assets/images/shuben.png new file mode 100644 index 0000000..5357ef8 --- /dev/null +++ b/src/assets/images/shuben.png diff --git a/src/assets/images/tishu.png b/src/assets/images/tishu.png new file mode 100644 index 0000000..32e856b --- /dev/null +++ b/src/assets/images/tishu.png diff --git a/src/assets/nav/askPreparationQuestions.png b/src/assets/nav/askPreparationQuestions.png new file mode 100644 index 0000000..5fd7b09 --- /dev/null +++ b/src/assets/nav/askPreparationQuestions.png diff --git a/src/assets/nav/testComposingPaper.png b/src/assets/nav/testComposingPaper.png new file mode 100644 index 0000000..5fd7b09 --- /dev/null +++ b/src/assets/nav/testComposingPaper.png diff --git a/src/components/exportDia.vue b/src/components/exportDia.vue index a170ebe..d4dd5e1 100644 --- a/src/components/exportDia.vue +++ b/src/components/exportDia.vue @@ -3,7 +3,7 @@ diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue index cfc3e4f..6c83837 100644 --- a/src/components/setAnswer.vue +++ b/src/components/setAnswer.vue @@ -3,7 +3,7 @@ class="el-dialog-wrapper" v-show="diaVisible" width="400" - center + center :append-to-body="true" @click.self="cancel" >
@@ -80,9 +80,9 @@
diff --git a/src/router/index.js b/src/router/index.js index 756c8c3..e58c11b 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -67,6 +67,17 @@ const SetUpClazz = () => import("@/views/basic/setUp/clazz") const Archived = () => import("@/views/basic/setUp/archived") const DeviceError = () => import("@/views/basic/device/error") +// v1.5 年级组长 +const gradeAnalysis = () => import("@/views/basic/askTestQuestion/gradeAnalysis") +const gradeDetail = () => import("@/views/basic/askTestQuestion/gradeAnalysisDetail") + +const askTestQuestion = () => import("@/views/basic/askTestQuestion/index") +const askTestDetail = () => import("@/views/basic/askTestQuestion/view") +const askTestUpdate = () => import("@/views/basic/askTestQuestion/update") +const askTestReport = () => import("@/views/basic/askTestQuestion/report") +const askTestReportDetail = () => import("@/views/basic/askTestQuestion/detail") +const askTestReportRecycle = () => import("@/views/basic/askTestQuestion/recycle") + /** * 重写路由的push方法 */ @@ -91,7 +102,9 @@ let defaultRouter = [ }, { path: "/index", - iconCls: "fa fa-home", // 图标样式class + iconImage: require("@/assets/images/aside/shouye-default.png"), + selectedIconImage: require("@/assets/images/aside/shouye-selected.png"), + // iconCls: "fa fa-home", // 图标样式class name: "应用首页", component: Layout, alone: true, @@ -108,7 +121,7 @@ let defaultRouter = [ { path: "/deviceError", iconCls: "fa fa-home", // 图标样式class - name: "异常设备信息", + name: "异常设备信息菜单", component: Layout, hidden: true, children: [ @@ -123,7 +136,7 @@ let defaultRouter = [ { path: "/userInfo", iconCls: "fa fa-user", // 图标样式class - name: "个人信息", + name: "个人信息菜单", component: Layout, hidden: true, children: [ @@ -151,7 +164,8 @@ let addrouters = [ iconCls: "fa fa-file-text", // 图标样式class name: "备题组卷", component: Layout, - alone: true, + alone: false, + hidden: true, children: [ { path: "/examinationPaper", @@ -204,96 +218,163 @@ let addrouters = [ ] }, { - path: "/ask", - iconCls: "fa fa-bar-chart", // 图标样式class - name: "随堂问报表", + path: "/testGrade", + iconImage: require("@/assets/images/aside/test-default.png"), + name: "即时测", component: Layout, - alone: true, children: [ { - path: "/ask", - iconCls: "fa fa-bar-chart", // 图标样式class - name: "随堂问报表", - component: Ask, + path: "/testGradeReport", + iconImage: require("@/assets/images/aside/suitangwen-baobiao-default.png"), + selectedIconImage: require("@/assets/images/aside/suitangwen-baobiao-selected.png"), + name: '即时测报表', + demoRoles: ["ROLE_NIANJI"], + component: gradeAnalysis, children: [] - - }, - { - path: "/askList", - iconCls: "fa fa-bar-chart", // 图标样式class - name: "随堂问报表", - component: AskList, - children: [ - { - path: "/askAnalysis", - iconCls: "", // 图标样式class - name: "随堂问报表分析", - component: AskAnalysis, - parent: "askList", - children: [] - }, - - ], - }, - { - path: "/askArchiving", - iconCls: "", // 图标样式class - name: "随堂问已归档报表分析", - component: AskArchiving, - parent: "ask", + }, { + path: "/testGradeReportDetail", + iconCls: "", + name: "testGradeReportDetail", + demoRoles: ["ROLE_NIANJI"], + component: gradeDetail, hidden: true, - meta: { - keepAlive: true, - }, children: [] - } ] }, { - path: "/test", - iconCls: "fa fa-pie-chart", // 图标样式class - name: "即时测报表", + path: "/askTeacher", + iconImage: require("@/assets/images/aside/ask-default.png"), + name: "随堂问", component: Layout, - alone: true, - children: [ - { - path: "/test", - iconCls: "fa fa-pie-chart", // 图标样式class - name: "", - component: Test, - children: [] - }, - { - path: "/testList", - name: "", - component: TestList, - - children: [ - { - path: "/testAnalysis", - iconCls: "", // 图标样式class - name: "即时测报表分析", - component: TestAnalysis, - parent: "test", - children: [] - }, - ] - }, - { - path: "/testArchiving", - iconCls: "", // 图标样式class - name: "即时测已归档报表分析", - component: TestArchiving, - parent: "test", - hidden: true, - meta: { - keepAlive: true, - }, - children: [] - } - - ] + children: [{ + path: "/askPreparationQuestions", + iconImage: require("@/assets/images/aside/paper-default.png"), + selectedIconImage: require("@/assets/images/aside/paper-selected.png"), + name: '备题', + demoRoles: ["ROLE_JIAOSHI"], + component: askTestQuestion, + children: [] + }, { + path: "/askReport", + iconImage: require("@/assets/images/aside/suitangwen-baobiao-default.png"), + selectedIconImage: require("@/assets/images/aside/suitangwen-baobiao-selected.png"), + name: '报表', + demoRoles: ["ROLE_JIAOSHI", "ROLE_BANZHUREN"], + component: askTestReport, + children: [] + }, { + path: "/askPreparationQuestionsDetail", + iconCls: "", + name: "askPreparationQuestionsDetail", + demoRoles: ["ROLE_JIAOSHI"], + component: askTestDetail, + hidden: true, + children: [] + }, { + path: "/askPreparationQuestionsUpdate", + iconCls: "", + name: "askPreparationQuestionsUpdate", + demoRoles: ["ROLE_JIAOSHI"], + component: askTestUpdate, + hidden: true, + children: [] + }, { + path: "/askReportDetail", + iconCls: "", + name: "askReportDetail", + demoRoles: ["ROLE_JIAOSHI"], + component: askTestReportDetail, + hidden: true, + children: [] + }, { + path: "/askPreparationQuestionsRecycle", + iconCls: "", + name: "askPreparationQuestionsRecycle", + demoRoles: ["ROLE_JIAOSHI"], + component: askTestReportRecycle, + hidden: true, + children: [] + }, { + path: "/askPreparationQuestionsAdd", + iconCls: "", + name: "askPreparationQuestionsAdd", + demoRoles: ["ROLE_JIAOSHI"], + component: ExaminationPaperAddQs, + hidden: true, + children: [] + }] + }, + { + path: "/testTeacher", + iconImage: require("@/assets/images/aside/test-default.png"), + name: "即时测", + component: Layout, + children: [{ + path: "/testPaper", + iconImage: require("@/assets/images/aside/paper-default.png"), + selectedIconImage: require("@/assets/images/aside/paper-selected.png"), + name: '组卷', + demoRoles: ["ROLE_JIAOSHI"], + component: askTestQuestion, + children: [] + }, { + path: "/testReport", + iconImage: require("@/assets/images/aside/suitangwen-baobiao-default.png"), + selectedIconImage: require("@/assets/images/aside/suitangwen-baobiao-selected.png"), + name: '报表', + demoRoles: ["ROLE_JIAOSHI", "ROLE_BANZHUREN"], + component: askTestReport, + children: [] + }, { + path: "/testPaperQuestionsDetail", + iconCls: "", + name: "testPaperQuestionsDetail", + demoRoles: ["ROLE_JIAOSHI"], + component: askTestDetail, + hidden: true, + children: [] + }, { + path: "/testPaperQuestionsUpdate", + iconCls: "", + name: "testPaperQuestionsUpdate", + demoRoles: ["ROLE_JIAOSHI"], + component: askTestUpdate, + hidden: true, + children: [] + }, { + path: "/testReportDetail", + iconCls: "", + name: "testReportDetail", + demoRoles: ["ROLE_JIAOSHI"], + component: askTestReportDetail, + hidden: true, + children: [] + }, { + path: "/testReportRecycle", + iconCls: "", + name: "testReportRecycle", + demoRoles: ["ROLE_JIAOSHI"], + component: askTestReportRecycle, + hidden: true, + children: [] + }, { + path: "/testPaperRecycle", + iconCls: "", + name: "testPaperRecycle", + demoRoles: ["ROLE_JIAOSHI"], + component: askTestReportRecycle, + hidden: true, + children: [] + }, { + path: "/testPaperAdd", + iconCls: "", + name: "testPaperAdd", + demoRoles: ["ROLE_JIAOSHI"], + component: ExaminationPaperAdd, + hidden: true, + children: [] + }] }, { path: "/setUpConglomerate", @@ -327,6 +408,7 @@ let addrouters = [ }, ] }, + { path: "/", iconCls: "fa fa-cog", @@ -506,6 +588,7 @@ let addrouters = [ // ] // }, ] + //长水版路由表 let csAddrouters = [ { @@ -574,7 +657,6 @@ let csAddrouters = [ keepAlive: true, }, children: [] - }, { path: "/askAnalysis", @@ -1046,7 +1128,7 @@ const addroutersPersonal = [ keepAlive: true, }, children: [] - + } ] }, diff --git a/src/store/index.js b/src/store/index.js index 6dc062e..4b7c831 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -41,6 +41,7 @@ const store = new Vuex.Store({ localStorage.setItem("info", JSON.stringify(data)); }, setRouters: (state, routers) => { + console.log('current', state); let addrouterList = [] if (state.info.showRole == 'ROLE_PERSONAL') { addrouterList = [...addroutersPersonal] @@ -52,13 +53,22 @@ const store = new Vuex.Store({ } else { addrouterList = [...addrouters] } - } + let aRouters = addrouterList.filter((item) => { + let path = item.children[0]?.path.replace("/", ""); - return routers?.includes(path); - }); + if (routers?.includes(path) == true) return item; + else if (item.demoRoles?.includes(state.info.showRole) == true) return item; + if (item.children) { + item.children = item.children.filter((itemFilter) => { + return itemFilter.demoRoles?.includes(state.info.showRole) == true + }); + if (item.children.length >= 1) return item; + } + return null; + }); state.addRouters = aRouters; // 保存动态路由用来addRouter state.routers = defaultRouter.concat(aRouters); // 所有有权限的路由表，用来生成菜单列表 localStorage.setItem("addRouters", JSON.stringify(routers)); @@ -91,6 +101,7 @@ const store = new Vuex.Store({ .then((res) => { let response = res; if (response.status == 0) { + console.log(response) const userInfo = { ...response.data }; if (userInfo.permissions && userInfo.permissions.length) { userInfo.showRoleName = response.data.permissions[0]?.roleName; diff --git a/src/store/modules/layout/index.js b/src/store/modules/layout/index.js index 4cff515..a3c495e 100644 --- a/src/store/modules/layout/index.js +++ b/src/store/modules/layout/index.js @@ -17,7 +17,7 @@ export default { path: "/index" }] }, - addTab(state, arg) { + addTab(state, arg) { state.isActive = arg.path if (state.tabnavBox[0] && state.tabnavBox[0].title !== "home") { state.tabnavBox.unshift({ diff --git a/src/utils/global.js b/src/utils/global.js index e889291..c65be88 100644 --- a/src/utils/global.js +++ b/src/utils/global.js @@ -1,9 +1,28 @@ import rules from "./rules" import request from "@/api" +import { Loading } from 'element-ui'; export default { - install (Vue, options) { + install(Vue, options) { Vue.prototype.$request = request Vue.prototype.$rules = rules + Vue.prototype.$loading = { + loading: null, + open() { + this.loading = Loading.service({ + lock: true, + text: '加载中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)', + fullscreen: true + }); + }, + close() { + if (this.loading) { + this.loading.close(); + this.loading = null; + } + } + } } } diff --git a/src/utils/index.js b/src/utils/index.js index e590be2..512e885 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -21,6 +21,62 @@ export function encryptLoginPassword(data) { } /** + * 设置本周，本月，本季度 + * @param index： 规则值 + * @returns startDay=开始时间，endDay=结束时间 + */ +export function setDateRules(type) { + var that = {}; + let aYear = new Date().getFullYear(); + let aMonth = new Date().getMonth() + 1; + + that.day = ""; + that.startDay = ""; + that.endDay = ""; + + switch (type) { + case "onDay": + that.day = formatDate(new Date(), "yyyy-MM-dd"); + that.startDay = that.day; + that.endDay = that.day; + break; + case "onWeek": + let day = new Date().getDay(); + if (day == 0) { + //中国式星期天是一周的最后一天 + day = 7; + } + day--; + let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day; + that.startDay = formatDate(new Date(aTime), "yyyy-MM-dd"); + that.endDay = formatDate(new Date(), "yyyy-MM-dd"); + break; + case "onMonth": + aMonth = aMonth < 10 ? "0" + aMonth : aMonth; + that.startDay = `${aYear}-${aMonth}-01`; + that.endDay = formatDate(new Date(), "yyyy-MM-dd"); + break; + case "onQuarter": + if (aMonth > 0 && aMonth < 4) { + aMonth = "1"; + } else if (aMonth > 3 && aMonth < 7) { + aMonth = "4"; + } else if (aMonth > 6 && aMonth < 10) { + aMonth = "7"; + } else { + aMonth = "10"; + } + + aMonth = aMonth < 10 ? "0" + aMonth : aMonth; + that.startDay = `${aYear}-${aMonth}-01`; + that.endDay = formatDate(new Date(), "yyyy-MM-dd"); + break; + } + + return that; +} + +/** * 对称加密 * @param secret：加密公钥 * @param data： 待加密数据 @@ -808,6 +864,17 @@ export function tablePrint(id, title, type = null) { .hui-s.s3{width: 120px;} .info { display: flex;flex-wrap: wrap;border-left: 1px solid #ccc;border-top: 1px solid #ccc;margin-bottom: 12px;} .info-item {width: 25%;height: 50px;box-sizing: border-box;flex-shrink: 0;background: #f8f8f8;border-right: 1px solid #ccc;border-bottom: 1px solid #ccc;line-height: 50px;text-align: center;} + .row-line { width: calc(20% - 2px); + border: 1px solid #ebeef5; + background: #f5f7fa; + display: inline-block; + height: 40px; + line-height: 40px; + + .line-subfix { + margin-left: 10px; + }} + .el-table__header,.el-table__body{width:100%!important;} #print-table{max-width:1400px;margin: 0 auto;width: 100%;} .hide{max-width:1400px;margin: 0 auto;width: 100%;border-left: 1px solid #ccc;border-spacing:0;box-sizing:border-box} diff --git a/src/views/admin/account/index.vue b/src/views/admin/account/index.vue index b4b4d62..e9c4fde 100644 --- a/src/views/admin/account/index.vue +++ b/src/views/admin/account/index.vue @@ -161,7 +161,9 @@
- + 取 消 - +
- {{ item.name }} + {{ item.name }}
@@ -29,66 +23,27 @@ - +
- +

- 导出报表 - 导出报表 - 打印 + 导出报表 + 导出报表 + 打印

- +
@@ -241,8 +196,8 @@ export default { this.type == 1 ? this.$request.pPeriodQuestionReport : this.type == 2 - ? this.$request.phaseAnswerReport - : this.$request.phaseInteractiveReport; + ? this.$request.phaseAnswerReport + : this.$request.phaseInteractiveReport; } else if (this.types == 3) { queryData = this.type == 2 @@ -262,8 +217,8 @@ export default { this.type == 1 ? this.$request.periodQuestionReport : this.type == 2 - ? this.$request.phaseAnswerReport - : this.$request.phaseInteractiveReport; + ? this.$request.phaseAnswerReport + : this.$request.phaseInteractiveReport; } else if (this.types == 3) { queryData = this.type == 2 @@ -370,8 +325,8 @@ export default { this.types == 1 ? "随堂问-单课时报表.xlsx" : this.types == 2 - ? `随堂问-${this.className}-${this.subjectNames[0]}汇总分析报表.xlsx` - : `随堂问-${this.className}-多科汇总分析报表.xlsx`; + ? `随堂问-${this.className}-${this.subjectNames[0]}汇总分析报表.xlsx` + : `随堂问-${this.className}-多科汇总分析报表.xlsx`; downloadFile(this.status ? "随堂问-已归档单课时报表.xlsx" : name, blob); } else { this.$message.error("下载失败"); diff --git a/src/views/basic/ask/archiving.vue b/src/views/basic/ask/archiving.vue index 8b3f334..5340d7d 100644 --- a/src/views/basic/ask/archiving.vue +++ b/src/views/basic/ask/archiving.vue @@ -7,82 +7,33 @@
- - + + - - + + - - + +
- + ~ - +

- 今天 - 本周 - 本月 - 本季度 + 今天 + 本周 + 本月 + 本季度

筛选
@@ -105,352 +56,103 @@
- - - - - - - - + + + + + + + + - +
- - - - - - - - - - - + + + + + + + + + + + - + - - - - - + + + + + - + - + - +
- - - - - - - - - + + + + + + + + + - - - - - + + + + + - + - + - +
- +
-

- 导出报表 - 打印 +

+ 导出报表 + 打印

@@ -642,8 +344,8 @@ export default { obj.prop == "participationRate" ? 1 : obj.prop == "answerCorrectRate" - ? 2 - : 3; + ? 2 + : 3; this.custom.orderType = obj.order == "ascending" ? 0 : 1; this.page = 1; this._QueryData(); @@ -984,6 +686,7 @@ div::-webkit-scrollbar { width: 3px; height: 10px; } + div::-webkit-scrollbar-thumb { border-radius: 10px; background-color: #ccc; @@ -993,17 +696,21 @@ div::-webkit-scrollbar-thumb { .main { height: 100%; } + .table-box { margin: 0 20px; padding: 16px; background: #f8f8f8; border-radius: 5px; + .table-cont { min-height: 300px; } + :deep(.fa-arrow-right) { padding-left: 2px; } + :deep(.fa-file-text) { padding-left: 2px; } @@ -1015,14 +722,17 @@ div::-webkit-scrollbar-thumb { font-size: 16px; margin-left: 10px; } + .dia-btn { border-radius: 20px; margin: 0 20px; padding: 10px 20px; } + .dia-tips { padding-bottom: 10px; } + .dia-question-box { padding: 16px 16px 1px; background: #f8f8f8; @@ -1034,32 +744,39 @@ div::-webkit-scrollbar-thumb { cursor: pointer; } } + .set-questions { display: flex; margin-bottom: 12px; width: 100%; + .qs-num { flex-shrink: 0; margin-right: 10px; } + .qs-options { flex: 1; + .ipt { margin-bottom: 5px; } } + .delButton { border-color: #ff6868; background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center; background-size: 19px; color: transparent; } + .ac { border-color: #ff6868; background: #ff6868; color: #fff; } } + .down { padding-top: 16px; } diff --git a/src/views/basic/ask/components/answerQustion.vue b/src/views/basic/ask/components/answerQustion.vue index aff922e..db57ac2 100644 --- a/src/views/basic/ask/components/answerQustion.vue +++ b/src/views/basic/ask/components/answerQustion.vue @@ -241,7 +241,7 @@
班级： - - + +
@@ -27,24 +17,12 @@ 科目：

- 全选 + 全选

- - {{ item }} + + {{ item }}

@@ -54,12 +32,7 @@

- {{ item }} + {{ item }}

@@ -67,34 +40,18 @@
日期：
- + ~ - +

- 本周 - 本月 - 本季度 + 本周 + 本月 + 本季度

@@ -230,8 +187,8 @@ export default { this.role == "ROLE_BANZHUREN" ? this.$request.cTClassList : this.role == "ROLE_PERSONAL" - ? this.$request.pClassList - : this.$request.tClassList; + ? this.$request.pClassList + : this.$request.tClassList; const { data, status, info } = await fetchClassList(); if (status === 0) { this.classList = data.list.map((item) => { @@ -250,8 +207,8 @@ export default { this.role == "ROLE_BANZHUREN" ? this.$request.cTSubjectList : this.role == "ROLE_PERSONAL" - ? this.$request.pSubjectList - : this.$request.tSubjectList; + ? this.$request.pSubjectList + : this.$request.tSubjectList; const { data, status, info } = await fetchSubjectList({ classId: this.query.classId, diff --git a/src/views/basic/ask/list.vue b/src/views/basic/ask/list.vue index b1ac7c7..ed6ec23 100644 --- a/src/views/basic/ask/list.vue +++ b/src/views/basic/ask/list.vue @@ -5,20 +5,9 @@ 随堂问-数据报表 @@ -26,17 +15,10 @@

筛选 - 查看汇总报表 + 查看汇总报表

- + - - - - - + + + + + - - - + + +
- +
@@ -315,8 +227,8 @@ export default { this.multipleSelection.length == 1 ? 1 : subjectArr.length == 1 - ? 2 - : 3, + ? 2 + : 3, subjectNames: subjectArr.join(","), params: this.$route.query.params, // classId: classId, @@ -407,8 +319,8 @@ export default { this.role == "ROLE_BANZHUREN" ? this.$request.cTExportPhaseInteractiveReport : this.role == "ROLE_PERSONAL" - ? this.$request.pExportPhaseReport - : this.$request.exportPhaseInteractiveReport; + ? this.$request.pExportPhaseReport + : this.$request.exportPhaseInteractiveReport; const data = await exportData({ ...query }); this.exportLoading = false; if (data) { @@ -438,9 +350,11 @@ div::-webkit-scrollbar-thumb { .main { height: 100%; } + .remove-test { margin-left: 10px; } + .table-box { padding: 16px; border-radius: 5px; @@ -466,4 +380,4 @@ div::-webkit-scrollbar-thumb { top: 4px; z-index: 10; } - \ No newline at end of file + diff --git a/src/views/basic/askTestQuestion/components/askBzrMulti.vue b/src/views/basic/askTestQuestion/components/askBzrMulti.vue new file mode 100644 index 0000000..8724954 --- /dev/null +++ b/src/views/basic/askTestQuestion/components/askBzrMulti.vue @@ -0,0 +1,422 @@ + + + diff --git a/src/views/basic/askTestQuestion/components/askListReport.vue b/src/views/basic/askTestQuestion/components/askListReport.vue new file mode 100644 index 0000000..8068354 --- /dev/null +++ b/src/views/basic/askTestQuestion/components/askListReport.vue @@ -0,0 +1,78 @@ + + + diff --git a/src/views/basic/askTestQuestion/components/askSummaryReport.vue b/src/views/basic/askTestQuestion/components/askSummaryReport.vue new file mode 100644 index 0000000..64a1358 --- /dev/null +++ b/src/views/basic/askTestQuestion/components/askSummaryReport.vue @@ -0,0 +1,572 @@ + + + + + diff --git a/src/views/basic/askTestQuestion/view.vue b/src/views/basic/askTestQuestion/view.vue new file mode 100644 index 0000000..6cdad04 --- /dev/null +++ b/src/views/basic/askTestQuestion/view.vue @@ -0,0 +1,107 @@ + + + \ No newline at end of file diff --git a/src/views/basic/dataSync/index.vue b/src/views/basic/dataSync/index.vue index 45fe59d..f1496a7 100644 --- a/src/views/basic/dataSync/index.vue +++ b/src/views/basic/dataSync/index.vue @@ -41,7 +41,7 @@ - + {{ tipData.paperNum }} diff --git a/src/views/basic/device/error.vue b/src/views/basic/device/error.vue index a2e0579..4f4b24a 100644 --- a/src/views/basic/device/error.vue +++ b/src/views/basic/device/error.vue @@ -106,7 +106,7 @@ - - 取 消 - 取 消 - - + 取 消 - - +

通过Excel名单导入学生模板，点击 diff --git a/src/views/basic/setUp/account.vue b/src/views/basic/setUp/account.vue index aadc9d5..db175f7 100644 --- a/src/views/basic/setUp/account.vue +++ b/src/views/basic/setUp/account.vue @@ -213,7 +213,7 @@ - + 取 消 - + 取 消 - + - 取 消 - --> - - 取 消 - 取 消 - 取 消 - - + 取 消 - +

注意该操作会将所有年级升级，请谨慎操作！

确认升级 diff --git a/src/views/basic/setUp/student.vue b/src/views/basic/setUp/student.vue index fb136be..3f764bd 100644 --- a/src/views/basic/setUp/student.vue +++ b/src/views/basic/setUp/student.vue @@ -201,7 +201,7 @@
- 取 消 - 关 闭 - 取 消 -
- + - - + + - - + + - - + + diff --git a/src/views/basic/test/components/test.vue b/src/views/basic/test/components/test.vue index ddb5374..151dee6 100644 --- a/src/views/basic/test/components/test.vue +++ b/src/views/basic/test/components/test.vue @@ -4,134 +4,55 @@

{{ - `${paperModifyLog.modifiedTime} ${paperModifyLog.realName}` - }}修改了答案，是否重新记分？ + `${paperModifyLog.modifiedTime} ${paperModifyLog.realName}` + }}修改了答案，是否重新记分？

- 重新计分 - 暂时不计 + 重新计分 + 暂时不计
- {{ item }} + {{ item }}
- 设置低分值 + 设置低分值
- - - - - - - - - + + + + + + + + + - @@ -26,216 +14,96 @@

筛选 - 查看汇总报表 + 查看汇总报表

- + - +