diff --git a/package.json b/package.json index 9e2115a..a0ea1e3 100755 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "script-ext-html-webpack-plugin": "^2.1.5", "vue": "^2.6.11", "vue-i18n": "^8.4.0", - "vue-masonry": "^0.16.0", "vue-router": "^3.5.1", "vuedraggable": "^2.24.3", "vuex": "^3.6.2" diff --git a/src/main.js b/src/main.js index e7a2f78..4972374 100755 --- a/src/main.js +++ b/src/main.js @@ -20,13 +20,11 @@ import "@/router/permission" import "@/assets/css/base.css" import "@/assets/css/index.scss" -import { VueMasonryPlugin } from 'vue-masonry' Vue.config.productionTip = false Vue.use(ElementUI) Vue.use(globalPlugin) Vue.use(permission) -Vue.use(VueMasonryPlugin) NProgress.inc(0.2) NProgress.configure({ easing: "ease", speed: 500, showSpinner: false }) diff --git a/src/views/standard/test/contrast.vue b/src/views/standard/test/contrast.vue index cfe1429..a1b103a 100644 --- a/src/views/standard/test/contrast.vue +++ b/src/views/standard/test/contrast.vue @@ -8,40 +8,15 @@
- {{ item }} + {{ item }}
- 对比成绩等级设置 + 对比成绩等级设置
- 导出报表 - 打印 + 导出报表 + 打印
- + - + @@ -177,47 +78,29 @@ *等级最低

-
+
{{ index + 1 }}

- +

- + @keydown.native="keydownRange($event)"> %

~

- + %

- 删除 + 删除

- 添加一行 + 添加一行

@@ -293,8 +165,9 @@ export default { }, async created() { this.ids = this.$route.query.ids; - await this._QueryData(); + this.examPaperScore = Number(this.$route.query.examPaperScore || 100); await this._QueryDefaultLevels(); + await this._QueryData(); }, destroyed() { sessionStorage.setItem("levelFromData", ""); @@ -416,19 +289,17 @@ export default { this.$message.error(info); } }, - async _QueryData(params) { + async _QueryData() { let query = {}; - if (params) { - let paramObj = JSON.parse(JSON.stringify(params)) - if (paramObj.levelType == 0) { - paramObj.levels = paramObj.levels.map((item) => { - item[1] = ((item[1] / 100) * this.examPaperScore).toFixed(1); - item[2] = ((item[2] / 100) * this.examPaperScore).toFixed(1); - return item; - }); - } - query = { ...paramObj }; + let paramObj = JSON.parse(JSON.stringify(this.fromData)) + if (paramObj.levelType == 0) { + paramObj.levels = paramObj.levels.map((item) => { + item[1] = ((item[1] / 100) * this.examPaperScore).toFixed(1); + item[2] = ((item[2] / 100) * this.examPaperScore).toFixed(1); + return item; + }); } + query = { ...paramObj }; const { data, info, status } = await this.$request.examMultiClassReport({ examIds: this.ids, ...query, @@ -455,7 +326,6 @@ export default { let params = { ...this.fromData }; if (params.levelType == 0) { params.levels = params.levels.map((item) => { - console.log(item); item[1] = ((item[1] / 100) * this.examPaperScore).toFixed(1); item[2] = ((item[2] / 100) * this.examPaperScore).toFixed(1); return item; @@ -487,25 +357,31 @@ export default { .page-container { position: relative; height: 100%; + .table-box { min-height: 100%; } + &.active { overflow: hidden; } + .content-header { width: 100%; position: relative; + .setMinScore { position: absolute; bottom: 0; right: 0; } } + .page-content { padding: 20px 20px 0; } } + .tab-box { width: 400px; margin: 0 auto 12px; @@ -513,6 +389,7 @@ export default { border-radius: 20px; display: flex; user-select: none; + .tab-item { flex: 1; height: 40px; @@ -524,72 +401,91 @@ export default { background: transparent; border-radius: 20px; cursor: pointer; + &.active { background: #667ffd; color: #fff; } } } + .down { padding-top: 20px; width: 100%; display: flex; justify-content: space-between; } + .use-form { padding: 0 12px; + .use-form-item-box { :deep(.el-form-item__content) { display: flex; } + .use-form-item { width: 40%; margin-right: 20px; } } } + .dia-tab-box { + .dia-tab-tit, .dia-tab-item { margin-bottom: 10px; + i { color: #f30; padding-right: 5px; } + display: flex; + .item { width: 40px; } + .item1 { padding-left: 10px; width: 10%; } + .item2 { width: 18%; } + .item3 { padding-left: 12px; flex: 1; } + .score-ipt { width: 100px; } } + .dia-tab-tit { background: rgba(243, 243, 243, 1); } + .add { display: flex; justify-content: center; margin: 0 auto; + p { cursor: pointer; } + .el-button { margin-right: 6px; } } } + .p1 { line-height: 18px; } diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue index 81aea6a..fd7fc6d 100644 --- a/src/views/standard/test/index.vue +++ b/src/views/standard/test/index.vue @@ -5,122 +5,51 @@ 即时测-数据报表
- +

- 全选 + 全选

- +
- - + + - - + +
- + ~ - +

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

筛选
- + @@ -132,50 +61,15 @@
- - - - - - - + + + + + + +

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

-
+

已考试卷信息 - (相同报表名称后的数字代表同一份试卷的考试次数,例如:模拟卷_1指模拟卷第1次考试成绩,模拟卷_2指模拟卷第2次考试成绩) + (相同报表名称后的数字代表同一份试卷的考试次数,例如:模拟卷_1指模拟卷第1次考试成绩,模拟卷_2指模拟卷第2次考试成绩)

- 共筛选出{{ classTable.length }}个班级的已考试卷,不同班级请选择同一份试卷进行对比 + 共筛选出{{ classTable.length }}个班级的已考试卷,不同班级请选择同一份试卷进行对比

- - + +
- -