From 90dc32590a9b4863ad42b62af60247891e18aa55 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Fri, 30 Oct 2015 18:15:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B2=A1=E6=9C=89=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=20vm=20=E5=AF=BC=E8=87=B4=E7=9A=84=E4=B8=8A=E4=B8=AA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E5=B8=A6=E5=88=B0=E4=B8=8B?= =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/app/admin/contest/addContest.js | 13 +++++++++++- .../src/js/app/admin/contest/editContest.js | 1 + .../src/js/app/admin/contest/editProblem.js | 21 +++++++++++++++---- static/src/js/app/admin/problem/addProblem.js | 16 +++++++++++++- 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/static/src/js/app/admin/contest/addContest.js b/static/src/js/app/admin/contest/addContest.js index 9cbd57dd..cd4e1fdf 100644 --- a/static/src/js/app/admin/contest/addContest.js +++ b/static/src/js/app/admin/contest/addContest.js @@ -61,8 +61,19 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date }); //editor("#editor"); - if (avalon.vmodels.add_contest) + if (avalon.vmodels.add_contest) { var vm = avalon.vmodels.add_contest; + vm.title = ""; + vm.startTime = ""; + vm.endTime = ""; + vm.password = ""; + vm.isGlobal = true; + vm.allGroups = []; + vm.showGlobalViewRadio = true; + vm.realTimeRank = true; + avalon.vmodels.contestDescriptionEditor.content = ""; + + } else var vm = avalon.define({ $id: "add_contest", diff --git a/static/src/js/app/admin/contest/editContest.js b/static/src/js/app/admin/contest/editContest.js index f34e2614..67a027c3 100644 --- a/static/src/js/app/admin/contest/editContest.js +++ b/static/src/js/app/admin/contest/editContest.js @@ -130,6 +130,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date vm.realTimeRank = contest.real_time_rank; vm.startTime = contest.start_time.substring(0, 16).replace("T", " "); vm.endTime = contest.end_time.substring(0, 16).replace("T", " "); + vm.password = contest.password; if (contest.contest_type == 0) { //contest_type == 0, 小组内比赛 vm.isGlobal = false; for (var i = 0; i < vm.allGroups.length; i++) { diff --git a/static/src/js/app/admin/contest/editProblem.js b/static/src/js/app/admin/contest/editProblem.js index 31b2560a..4fdb94fe 100644 --- a/static/src/js/app/admin/contest/editProblem.js +++ b/static/src/js/app/admin/contest/editProblem.js @@ -49,7 +49,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE ajaxData["id"] = avalon.vmodels.admin.problemId; var alertContent = "题目编辑成功"; } - else{ + else { var method = "post"; var alertContent = "题目创建成功"; } @@ -134,6 +134,19 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE }); else { var vm = avalon.vmodels.editProblem; + title = ""; + description = ""; + timeLimit = 1000; + memoryLimit = 128; + samples = []; + hint = ""; + sortIndex = ""; + visible = true; + inputDescription = ""; + outputDescription = ""; + testCaseId = ""; + testCaseList = []; + uploadSuccess = false; } var testCaseUploader = uploader("#testCaseFile", "/api/admin/test_case_upload/", function (file, response) { @@ -142,7 +155,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE else { vm.testCaseId = response.data.test_case_id; vm.testCaseList = []; - for(var key in response.data.file_list){ + for (var key in response.data.file_list) { vm.testCaseList.push({ input: response.data.file_list[key].input_name, output: response.data.file_list[key].output_name @@ -189,8 +202,8 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE url: "/api/admin/test_case_upload/?test_case_id=" + vm.testCaseId, method: "get", dataType: "json", - success: function(response){ - if(response.code){ + success: function (response) { + if (response.code) { bsAlert(response.data); } else { diff --git a/static/src/js/app/admin/problem/addProblem.js b/static/src/js/app/admin/problem/addProblem.js index dc19f0b5..e2f9e6fc 100644 --- a/static/src/js/app/admin/problem/addProblem.js +++ b/static/src/js/app/admin/problem/addProblem.js @@ -79,6 +79,20 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE if (avalon.vmodels.addProblem) { var vm = avalon.vmodels.addProblem; + vm.title = ""; + vm.timeLimit = 1000; + vm.memoryLimit = 128; + vm.samples = [{input: "", output: "", "visible": true}]; + vm.visible = true; + vm.difficulty = "1"; + vm.tags = []; + vm.inputDescription = ""; + vm.outputDescription = ""; + vm.testCaseId = ""; + vm.testCaseList = []; + vm.uploadSuccess = false; + vm.source = ""; + vm.uploadProgress = 0; } else var vm = avalon.define({ @@ -135,7 +149,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE vm.testCaseId = response.data.test_case_id; vm.uploadSuccess = true; vm.testCaseList = []; - for(var key in response.data.file_list){ + for (var key in response.data.file_list) { vm.testCaseList.push({ input: response.data.file_list[key].input_name, output: response.data.file_list[key].output_name