From 6192eba8070623cf64b7e28704af419fbc7bdf3d Mon Sep 17 00:00:00 2001 From: 梁保满 Date: Tue, 19 Dec 2023 09:19:45 +0800 Subject: [PATCH] 引用上传文件组件问题，备题组卷顶部 --- src/api/apis/apis.js | 42 ++++++++++++++++++++++++++++++++++++++++++ src/api/urls/apis.js | 11 +++++++++++ src/assets/css/index.scss | 9 +++++++-- src/components/backBox.vue | 26 +++++++++++++++++++------- src/components/upload.vue | 39 +++++++++++++++++++++------------------ src/views/basic/ask/list.vue | 0 src/views/basic/device/index.vue | 4 ++-- src/views/basic/examinationPaper/add.vue | 2005 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/basic/examinationPaper/detail.vue | 190 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/basic/examinationPaper/edit.vue | 997 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/basic/examinationPaper/index.vue | 537 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/basic/examinationPaper/recycle.vue | 411 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/basic/setUp/account.vue | 4 ++-- src/views/basic/setUp/archived.vue | 8 ++++---- src/views/basic/setUp/clazz.vue | 4 ++-- src/views/basic/setUp/student.vue | 4 ++-- src/views/basic/setUp/teacher.vue | 4 ++-- src/views/basic/test/analysis.vue | 4 ++-- src/views/basic/test/index.vue | 4 ++-- src/views/examinationPaper/add.vue | 177 +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/examinationPaper/addAsk.vue | 1750 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/examinationPaper/edit.vue | 228 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ src/views/examinationPaper/editAsk.vue | 1269 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/examinationPaper/index.vue | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/layout/layout.vue | 4 ---- src/views/personal/setUp/student.vue | 4 ++-- src/views/personal/test/analysis.vue | 4 ++-- src/views/personal/test/index.vue | 4 ++-- 28 files changed, 3285 insertions(+), 4771 deletions(-) create mode 100644 src/views/basic/ask/list.vue delete mode 100644 src/views/basic/examinationPaper/add.vue delete mode 100644 src/views/basic/examinationPaper/detail.vue delete mode 100644 src/views/basic/examinationPaper/edit.vue delete mode 100644 src/views/basic/examinationPaper/index.vue delete mode 100644 src/views/basic/examinationPaper/recycle.vue create mode 100644 src/views/examinationPaper/addAsk.vue create mode 100644 src/views/examinationPaper/editAsk.vue diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js index 3f0da5c..fa4985a 100644 --- a/src/api/apis/apis.js +++ b/src/api/apis/apis.js @@ -1562,4 +1562,46 @@ export default { data }); }, + + // 删除即时测考试 + deleteReport(data) { + return service({ + url: setUpUrls.deleteReport, + method: "POST", + data + }); + }, + // 设置单班科目分析低分区间 + setLowRange(data) { + return service({ + url: setUpUrls.setLowRange, + method: "POST", + data + }); + }, + // 查询即时测多班对比情况详情 + examMultiClassReport(data) { + return service({ + url: setUpUrls.examMultiClassReport, + method: "POST", + data + }); + }, + // 导出即时测多班报表 + exportExamMultiReport(data) { + return service({ + url: setUpUrls.exportExamMultiReport, + method: "POST", + data + }); + }, + // 查询即时测多班默认等级列表 + defaultLevels(data) { + return service({ + url: setUpUrls.defaultLevels, + method: "POST", + data + }); + }, + }; diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js index ced6ae2..18587c7 100644 --- a/src/api/urls/apis.js +++ b/src/api/urls/apis.js @@ -405,4 +405,15 @@ export default { // 删除班级信息 removeClass: "/api_html/school/manager/delClass", + + //删除即时测考试 + deleteReport: "/api_html/teaching/deleteReport", + //设置单班科目分析低分区间 + setLowRange: "/api_html/teaching/setLowRange", + //查询即时测多班对比情况详情 + examMultiClassReport: "/api_html/teaching/examMultiClassReport", + //导出即时测多班报表 + exportExamMultiReport: "/api_html/teaching/exportExamMultiReport", + //查询即时测多班默认等级列表 + defaultLevels: "/api_html/teaching/defaultLevels", } diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss index 6c688a4..0b5d78e 100644 --- a/src/assets/css/index.scss +++ b/src/assets/css/index.scss @@ -149,6 +149,10 @@ margin: 10px; } +.down-box { + padding-left: 160px; +} + .down-txt { display: flex; align-items: center; @@ -180,12 +184,13 @@ ul { } .cascader-clazz { - .el-cascader-menu{ + .el-cascader-menu { .el-checkbox { display: none; } } - .el-cascader-menu:nth-child(3){ + + .el-cascader-menu:nth-child(3) { .el-checkbox { display: block; } diff --git a/src/components/backBox.vue b/src/components/backBox.vue index 63308f5..1e6ce9e 100644 --- a/src/components/backBox.vue +++ b/src/components/backBox.vue @@ -11,20 +11,29 @@ - - \ No newline at end of file diff --git a/src/views/basic/examinationPaper/detail.vue b/src/views/basic/examinationPaper/detail.vue deleted file mode 100644 index 4611414..0000000 --- a/src/views/basic/examinationPaper/detail.vue +++ /dev/null @@ -1,190 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/basic/examinationPaper/edit.vue b/src/views/basic/examinationPaper/edit.vue deleted file mode 100644 index 4736cc5..0000000 --- a/src/views/basic/examinationPaper/edit.vue +++ /dev/null @@ -1,997 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/basic/examinationPaper/index.vue b/src/views/basic/examinationPaper/index.vue deleted file mode 100644 index 6c3fe42..0000000 --- a/src/views/basic/examinationPaper/index.vue +++ /dev/null @@ -1,537 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/basic/examinationPaper/recycle.vue b/src/views/basic/examinationPaper/recycle.vue deleted file mode 100644 index 110986a..0000000 --- a/src/views/basic/examinationPaper/recycle.vue +++ /dev/null @@ -1,411 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/basic/setUp/account.vue b/src/views/basic/setUp/account.vue index 58ed870..b8d3638 100644 --- a/src/views/basic/setUp/account.vue +++ b/src/views/basic/setUp/account.vue @@ -350,7 +350,7 @@ - 模板下载 。

- +
取 消
diff --git a/src/views/basic/setUp/archived.vue b/src/views/basic/setUp/archived.vue index 89d0b56..7e1b9be 100644 --- a/src/views/basic/setUp/archived.vue +++ b/src/views/basic/setUp/archived.vue @@ -78,7 +78,7 @@
  • - 。

    -     +
  • - 导出未分配教师。

    -     +
  • diff --git a/src/views/basic/setUp/clazz.vue b/src/views/basic/setUp/clazz.vue index ae01e44..71ed7b4 100644 --- a/src/views/basic/setUp/clazz.vue +++ b/src/views/basic/setUp/clazz.vue @@ -89,12 +89,12 @@ :visible.sync="diaUp" width="600" > - +

    通过Excel名单导入班级名单，点击 模板下载 。

    -     +
    取 消
    diff --git a/src/views/basic/setUp/student.vue b/src/views/basic/setUp/student.vue index c7c5ff0..2e0ae18 100644 --- a/src/views/basic/setUp/student.vue +++ b/src/views/basic/setUp/student.vue @@ -322,7 +322,7 @@ :visible.sync="diaUp" width="600" > - 模板下载 。

    -     +
    取 消
    diff --git a/src/views/basic/setUp/teacher.vue b/src/views/basic/setUp/teacher.vue index bd9f177..e29d037 100644 --- a/src/views/basic/setUp/teacher.vue +++ b/src/views/basic/setUp/teacher.vue @@ -258,7 +258,7 @@ :visible.sync="diaUp" width="600" > - 模板下载 。

    -     +
    取 消
    diff --git a/src/views/basic/test/analysis.vue b/src/views/basic/test/analysis.vue index 1f471d1..2a2021c 100644 --- a/src/views/basic/test/analysis.vue +++ b/src/views/basic/test/analysis.vue @@ -460,7 +460,7 @@ :visible.sync="diaUp" width="600" > - + - +
    取 消
    diff --git a/src/views/basic/test/index.vue b/src/views/basic/test/index.vue index 4a99ebd..658a85c 100644 --- a/src/views/basic/test/index.vue +++ b/src/views/basic/test/index.vue @@ -481,7 +481,7 @@

    -

    第二步：上传完成编辑的模板文件并导入。

    -     +
    取 消
    diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue index 0e3535c..3df8442 100644 --- a/src/views/examinationPaper/add.vue +++ b/src/views/examinationPaper/add.vue @@ -354,37 +354,6 @@

    - 保存
    - -
    - - - {{ - stem.screenshot || stem.answerScreenshot ? "重新上传" : "选择照片" - }} - -
    -
    - 关闭弹窗 -
    -     - -
    - - - - - - - - - - - - - - - - - -
    -
    - 取 消 - 确 定 -
    -     @@ -1003,8 +909,6 @@ export default { }, tagList: [], diaSetAns: false, //答案开关 - dialogStem: false, //截图开关 - dialogTag: false, //打标开关 formAns: { listIndex: 0, //大题位置 endIndex: 0, //相同题目最后一位题目的questionIndex @@ -1014,17 +918,6 @@ export default { answerOptions: [], //答案选项 answerList: "", //答案列表-字符串 }, - stem: { - type: 1, //类型 - index: 0, //大题位置 - indexs: 0, //小题位置 - screenshot: "", //题干图片id - answerScreenshot: "", //题干解析图片id - screenshotSrc: "", //题干图片地址显示用保存时删除 - answerScreenshotSrc: "", //题干解析图片地址显示用保存时删除 - difficultyFactor: 0, //题目难度 - knowledge: null, //知识点 - }, type: 1, //1-创建，2-复制答题卡 dialogVisible: false, //测验类型设置弹窗 addQuestionVisible: false, //添加大题弹窗 @@ -1068,64 +961,7 @@ export default { } }, methods: { - //上传截图 - openStem(obj, type, index, indexs) { - this.stem.type = type; - this.stem.index = index; - this.stem.indexs = indexs; - if (type == 1) { - this.stem.screenshot = obj.screenshot || ""; - this.stem.screenshotSrc = obj.screenshotSrc || ""; - this.stem.answerScreenshot = ""; - this.stem.answerScreenshotSrc = ""; - } else { - this.stem.screenshot = ""; - this.stem.screenshotSrc = ""; - this.stem.answerScreenshot = obj.answerScreenshot || ""; - this.stem.answerScreenshotSrc = obj.answerScreenshotSrc || ""; - } - this.dialogStem = true; - }, - //难度，知识点 - openTag(obj, type, index, indexs) { - this.stem = { ...this.stem, obj }; - this.stem.type = type; - this.stem.index = index; - this.stem.indexs = indexs; - this.stem.knowledge = (obj.knowledge && obj.knowledge.split(",")) || []; - this.stem.difficultyFactor = obj.difficultyFactor || ""; - this.dialogTag = true; - }, - //图片上传成功 - upSuccess(res, file) { - if (res && res.status == 0) { - let keys = this.stem.type == 1 ? "screenshot" : "answerScreenshot"; - this.stem[keys + "Src"] = res.data.url; - this.stem[keys] = res.data.resId; - this.form.questionList[this.stem.index].subQuestions[this.stem.indexs][ - keys - ] = this.stem[keys]; - this.form.questionList[this.stem.index].subQuestions[this.stem.indexs][ - keys + "Src" - ] = this.stem[keys + "Src"]; - this.$message.success("上传成功"); - } else { - this.$message.error(res.info); - } - }, - //保存难度、知识点 - setKnowledge() { - this.form.questionList[this.stem.index].subQuestions[ - this.stem.indexs - ].knowledge = this.stem.knowledge.join(","); - this.form.questionList[this.stem.index].subQuestions[ - this.stem.indexs - ].difficultyFactor = this.stem.difficultyFactor; - this.dialogTag = false; - }, - upError(res) { - this.$message.error("上传失败"); - }, + linkBack() { this.$confirm( (this.type == 2 ? "修改复制的" : "组建的") + @@ -2195,15 +2031,4 @@ export default { } } } -.upload-box { - .upload-demo { - text-align: center; - } - .stem-pic { - display: block; - margin: 0 auto 20px; - height: 200px; - object-fit: cover; - } -} \ No newline at end of file diff --git a/src/views/examinationPaper/addAsk.vue b/src/views/examinationPaper/addAsk.vue new file mode 100644 index 0000000..37c805f --- /dev/null +++ b/src/views/examinationPaper/addAsk.vue @@ -0,0 +1,1750 @@ + + + + + \ No newline at end of file diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue index 778aa7d..0cbfe7e 100644 --- a/src/views/examinationPaper/edit.vue +++ b/src/views/examinationPaper/edit.vue @@ -141,39 +141,6 @@

    -
    • @@ -274,35 +241,6 @@

    - @@ -395,77 +333,6 @@ 取 消     - -
    - - - {{ - stem.screenshot || stem.answerScreenshot ? "重新上传" : "选择照片" - }} - -
    -
    - 关闭弹窗 -
    -     - -
    - - - - - - - - - - - - - - - - - -
    -
    - 取 消 - 确 定 -
    -     @@ -476,19 +343,6 @@ export default { data() { return { role: "", - dialogStem: false, - dialogTag: false, - stem: { - type: 1, //类型 - index: 0, //大题位置 - indexs: 0, //小题位置 - screenshot: "", //题干图片id - answerScreenshot: "", //题干解析图片id - screenshotSrc: "", //题干图片地址显示用保存时删除 - answerScreenshotSrc: "", //题干解析图片地址显示用保存时删除 - difficultyFactor: 0, //题目难度 - knowledge: [], //知识点 - }, title: "", type: 1, questionList: [], @@ -542,77 +396,6 @@ export default { this._QueryDetail(); }, methods: { - openStem(obj, type, index, indexs) { - //上传截图 - this.stem.type = type; - this.stem.index = index; - this.stem.indexs = indexs; - if (type == 1) { - this.stem.screenshot = obj.screenshot || ""; - this.stem.screenshotSrc = obj.screenshotSrc || ""; - this.stem.answerScreenshot = ""; - this.stem.answerScreenshotSrc = ""; - } else { - this.stem.screenshot = ""; - this.stem.screenshotSrc = ""; - this.stem.answerScreenshot = obj.answerScreenshot || ""; - this.stem.answerScreenshotSrc = obj.answerScreenshotSrc || ""; - } - this.dialogStem = true; - }, - openTag(obj, type, index, indexs) { - //难度，知识点 - this.stem = { ...this.stem, obj }; - this.stem.type = type; - this.stem.index = index; - this.stem.indexs = indexs; - this.stem.knowledge = (obj.knowledge && obj.knowledge.split(",")) || []; - this.stem.difficultyFactor = obj.difficultyFactor || ""; - this.dialogTag = true; - }, - upSuccess(res, file) { - //图片上传成功 - if (res && res.status == 0) { - let keys = this.stem.type == 1 ? "screenshot" : "answerScreenshot"; - this.stem[keys + "Src"] = res.data.url; - this.stem[keys] = res.data.resId; - if (this.questionList[0].subQuestions) { - this.questionList[this.stem.index].subQuestions[this.stem.indexs][ - keys - ] = this.stem[keys]; - this.questionList[this.stem.index].subQuestions[this.stem.indexs][ - keys + "Src" - ] = this.stem[keys + "Src"]; - } else { - this.questionList[this.stem.index][keys] = this.stem[keys]; - this.questionList[this.stem.index][keys + "Src"] = - this.stem[keys + "Src"]; - } - this.$message.success("上传成功"); - } else { - this.$message.error(res.info); - } - }, - setKnowledge() { - //保存难度、知识点 - if (typeof this.stem.indexs != undefined) { - this.questionList[this.stem.index].subQuestions[ - this.stem.indexs - ].knowledge = this.stem.knowledge.join(","); - this.questionList[this.stem.index].subQuestions[ - this.stem.indexs - ].difficultyFactor = this.stem.difficultyFactor; - } else { - this.questionList[this.stem.index].knowledge = - this.stem.knowledge.join(","); - this.questionList[this.stem.index].difficultyFactor = - this.stem.difficultyFactor; - } - this.dialogTag = false; - }, - upError(res) { - this.$message.error("上传失败"); - }, linkBack() { this.$router.go(-1); }, @@ -1255,15 +1038,4 @@ export default { } } } -.upload-box { - .upload-demo { - text-align: center; - } - .stem-pic { - display: block; - margin: 0 auto 20px; - height: 200px; - object-fit: cover; - } -} \ No newline at end of file diff --git a/src/views/examinationPaper/editAsk.vue b/src/views/examinationPaper/editAsk.vue new file mode 100644 index 0000000..c12f926 --- /dev/null +++ b/src/views/examinationPaper/editAsk.vue @@ -0,0 +1,1269 @@ + + + + + \ No newline at end of file diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue index e68dabe..1ec108e 100644 --- a/src/views/examinationPaper/index.vue +++ b/src/views/examinationPaper/index.vue @@ -5,88 +5,47 @@ 备题组卷 +
    + + 备题 + 组卷 + +

    + + 导入课件 + + + 添加试卷 + + 导入试卷 + 手动创建 + + +

    +
    - - + + - - + + - - {{ item.label }} - - - - + + +
    @@ -94,6 +53,7 @@ 回收站内已有{{ archivedTotal }}份答题卡, 点击查看>>

    +
    - +
    - + @@ -206,6 +124,19 @@ 取 消 + + +
    +

    第一步：导出菁优网试卷或 + 模板下载 。 +

    +

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

    +
    +     +
    + 取 消 +
    +     @@ -222,14 +153,12 @@ export default { query: { classId: "", subjectName: "", - tagId: "", title: "", }, classList: [], subjectList: [], - typeList: [], archivedTotal: 0, //已归档答题卡数量 - tableData: null, + tableData: [], shareForm: { id: "", sharingType: 0, //0-任课班级/1-全年级 @@ -242,6 +171,11 @@ export default { total: 0, page: 1, size: 20, + + // v1.5 + diaUp: false, + examinationPaperType: 1,//题型类型 + url: "xxxxx",//上传文档地址 }; }, async created() { @@ -250,14 +184,13 @@ export default { this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; this.userName = this.$store.getters.info.name || ""; - this._QueryClassList2() - await this._QueryClassList(); - if (!this.query.classId) { - return; - } - await this._QuerySubjectList(); - this._QueryData(); - this._QueryTypeList(); + // this._QueryClassList2() + // await this._QueryClassList(); + // if (!this.query.classId) { + // return; + // } + // await this._QuerySubjectList(); + // this._QueryData(); }, methods: { refreshStic() { @@ -352,34 +285,6 @@ export default { await this._QuerySubjectList(); this._QueryData(false); }, - // 查找答题卡类型 - async _QueryTypeList() { - if (!this.query.classId) return; - let fetchTypeNames = - this.role == "ROLE_PERSONAL" - ? this.$request.pPaperTagList - : this.$request.fetchTypeNames; - - const { data, status, info } = await fetchTypeNames({ - classId: this.query.classId, - type: 0, - }); - if (status === 0) { - this.typeList = - data.list.map((item) => { - return { - value: item.tagId, - label: item.tag, - }; - }) || []; - this.typeList.unshift({ - value: "", - label: "请选择标签", - }); - } else { - this.$message.error(info); - } - }, // 查找班级 async _QueryClassList2() { this.loading = true; @@ -453,8 +358,6 @@ export default { query = { ...this.query }; } else { query = { title: this.query.title }; - this.query.tagId = ""; - // this.query.subjectName = ""; } query.classId = this.query.classId; query.subjectName = this.query.subjectName; @@ -490,6 +393,41 @@ export default { this.$message.error(info); } }, + + + //v1.5 + upSuccess(res) { + //导入成功 + this.$message.closeAll(); + this.$message({ + showClose: true, + message: `成功（${res.data.success}）`, + type: "success", + duration: 5000, + }); + this.diaUp = false; + + }, + handleAdd(value) { + if (value == 2) { + this.toAdd() + } else { + this.diaUp = true + } + }, + + + async downExcel() { + let data = await this.$request.teacherTemplate(); + if (data && !data.code) { + let blob = new Blob([data], { + type: "application/vnd.ms-excel;charset=utf-8", + }); + downloadFile(`试卷模版.xlsx`, blob); + } else { + this.$message.error(data.info); + } + }, }, }; @@ -503,11 +441,13 @@ export default { color: #999; margin-bottom: 10px; } + .content { margin: 0 20px; background: #f8f8f8; padding: 12px; border-radius: 20px; + .item { display: flex; align-items: center; @@ -518,9 +458,11 @@ export default { border-radius: 20px; background: #fff; margin-bottom: 12px; + &:last-of-type { margin-bottom: 0; } + .pic-box { width: 80px; height: 80px; @@ -531,12 +473,14 @@ export default { text-align: center; color: #fff; font-weight: 500; + .i-box { padding-top: 10px; font-size: 32px; margin-bottom: 3px; } } + .info { min-height: 80px; flex: 1; @@ -544,14 +488,17 @@ export default { display: flex; flex-direction: column; justify-content: space-between; + .s-line { padding: 0 5px; color: #e2e2e2; } + .title { font-size: 16px; color: #222; font-weight: 500; + .label { display: inline-block; font-size: 12px; @@ -563,61 +510,83 @@ export default { transform: translateY(-2px); } } + .person { color: #666; } } + .clazz { font-size: 14px; font-weight: 500; position: relative; position: relative; + &.active { color: #667ffd; } + .el-icon-success { position: absolute; right: 0; top: -5px; color: #667ffd; } + &:last-of-type { .el-icon-success { right: -18px; } } } + .btn-box { flex-shrink: 0; + .edit { margin-right: 12px; } } + .icon-refresh { margin-left: 20px; cursor: pointer; + &:hover { color: #2e9afe; } } } } + .answer-header { .sel-box { .sel { min-width: 160px; } + :deep(.el-cascader__tags) { flex-wrap: nowrap; } } } + .dialog-footer { text-align: center; + :deep(.el-button) { border-radius: 20px; padding: 8px 20px 7px; margin: 0 12px; } } + +// v1.5 +.examinationPaper-type { + padding: 16px 40px 0 20px; + width: 100%; + box-sizing: border-box; + display: flex; + justify-content: space-between; +} \ No newline at end of file diff --git a/src/views/layout/layout.vue b/src/views/layout/layout.vue index 126047b..11cdb77 100644 --- a/src/views/layout/layout.vue +++ b/src/views/layout/layout.vue @@ -42,10 +42,6 @@ export default { code: "", }; }, - created() { - // this.initRouter(); - console.log(this.$route.meta.keepAlive) - }, methods: { initRouter() { this.code = getURLParams("code") || this.$store.getters.code; diff --git a/src/views/personal/setUp/student.vue b/src/views/personal/setUp/student.vue index a9eaf35..4680e2a 100644 --- a/src/views/personal/setUp/student.vue +++ b/src/views/personal/setUp/student.vue @@ -195,12 +195,12 @@ - +

    通过Excel名单导入学生模板，点击 模板下载 。

    -     +
    取 消
    diff --git a/src/views/personal/test/analysis.vue b/src/views/personal/test/analysis.vue index 5f3a427..fa4c492 100644 --- a/src/views/personal/test/analysis.vue +++ b/src/views/personal/test/analysis.vue @@ -403,7 +403,7 @@ - + - +
    取 消
    diff --git a/src/views/personal/test/index.vue b/src/views/personal/test/index.vue index aa6e0b3..157fee2 100644 --- a/src/views/personal/test/index.vue +++ b/src/views/personal/test/index.vue @@ -413,7 +413,7 @@

    -

    第二步：上传完成编辑的模板文件并导入。

    -     +
    取 消
    -- libgit2 0.21.4