diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 2ea57f5..699a26f 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -490,4 +490,33 @@ li { } .edui-default { line-height: normal; +} +.html-parse { + table { + display: table; + margin-bottom: 10px; + border-collapse: collapse; + + th, + td { + padding: 5px 10px; + border: 1px solid #DDD; + } + } + + ol { + padding-left: 30px; + + li { + list-style-type: decimal; + } + } + + ul { + padding-left: 30px; + + li { + list-style-type: disc; + } + } } \ No newline at end of file diff --git a/src/views/match/add/step3.vue b/src/views/match/add/step3.vue index 2425f32..8b9b6bc 100644 --- a/src/views/match/add/step3.vue +++ b/src/views/match/add/step3.vue @@ -81,8 +81,13 @@ diff --git a/src/views/match/manage/theoryArchList.vue b/src/views/match/manage/theoryArchList.vue index 3596bf3..3cbe705 100644 --- a/src/views/match/manage/theoryArchList.vue +++ b/src/views/match/manage/theoryArchList.vue @@ -45,15 +45,8 @@ -
- 上传成绩 - {{ exporting ? '正在导出' : '批量导出' - }} -
-
- {{ exporting1 ? '正在导出' : '批量导出' - }} -
+ {{ exporting ? '正在导出' : '批量导出' + }} @@ -256,6 +249,7 @@ export default { competitionId: this.id, isNakadai: 1, stageId: this.stageId, + participatingState: this.active, }, { headers: this.headers, responseType: 'blob' @@ -265,31 +259,22 @@ export default { } } }, - // 导出(有勾选:就导勾选中的;没有勾选:就导全部) - exportData1 () { - this.exporting1 = true - let list = this.list1 - if (this.multipleSelection1.length) { - list = this.multipleSelection1 - } - Zip('批量导出', list, () => { - this.exporting1 = false + async handleDelete (row) { // 删除 + await this.$confirm(`

确认要删除【${row.userName}】的成绩记录吗?

删除后成绩数据不可恢复,自动变为未提交

`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + closeOnClickModal: false, + dangerouslyUseHTMLString: true, }) - }, - handleDelete (row) { // 删除 - this.$confirm("确定要删除吗?", "提示", { - type: "warning" - }).then(() => { - this.$post(this.api.batchDeleteContestGrade, { - ids: [this.method == 2 ? row.scoreId : row.reportId], - competitionId: this.id, - stageId: this.stageId - }).then(res => { - util.successMsg("删除成功"); - this.getData(); - }).catch(res => { - }); - }).catch(() => { }); + + await this.$post(this.api.batchDeleteContestGrade, { + ids: [this.method == 2 ? row.scoreId : row.reportId], + competitionId: this.id, + stageId: this.stageId + }) + util.successMsg("删除成功") + this.getData() }, delAllData () { // 批量删除 const list = this.multipleSelection @@ -433,6 +418,8 @@ export default { }, // tab回调 tabChange (i) { + this.multipleSelection = [] + this.$refs.table.clearSelection() this.active = i this.initData() }, diff --git a/src/views/match/manage/theoryReport.vue b/src/views/match/manage/theoryReport.vue index bdfaf9d..a29c29b 100644 --- a/src/views/match/manage/theoryReport.vue +++ b/src/views/match/manage/theoryReport.vue @@ -112,7 +112,7 @@