diff --git a/.gitignore b/.gitignore index 9ad28d2..e52f20a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ tests/**/coverage/ *.ntvs* *.njsproj *.sln +vue.config.js diff --git a/src/api/TestPaper.js b/src/api/TestPaper.js index 93f4dc0..f627895 100644 --- a/src/api/TestPaper.js +++ b/src/api/TestPaper.js @@ -1,120 +1,122 @@ import request from '@/utils/request' //编辑试卷 export function EditTestPaper(params) { - return request({ - url: `/TestPaper/AddTestPaper`, - method: 'post', - data: params - }) + return request({ + url: `/TestPaper/AddTestPaper`, + method: 'post', + data: params + }) } export function getTestPaperList(params) { - return request({ - url: `/TestPaper/List`, - // url: `/TestPaper/List?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&sort=${params.sort}&sortOrder=${params.sortOrder}`, - method: 'get', - data: params - }) + console.log('getTestPaperList', params); + return request({ + url: `/TestPaper/List`, + // url: `/TestPaper/List?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&sort=${params.sort}&sortOrder=${params.sortOrder}`, + method: 'get', + data: params, + params: params + }) } export function getTestPaperClassList(params) { - return request({ - url: `/TestPaperClass/List?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}`, - method: 'get', - data: params - }) + return request({ + url: `/TestPaperClass/List?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}`, + method: 'get', + data: params + }) } //获取分类信息 export function GetTestPaperClassById(id) { - return request({ - url: `/TestPaperClass/Get/${id}`, - method: 'get', - }) + return request({ + url: `/TestPaperClass/Get/${id}`, + method: 'get', + }) } export function UpdateTestPaperClass(params) { - return request({ - url: `/TestPaperClass/Update`, - method: 'post', - data: params - }) + return request({ + url: `/TestPaperClass/Update`, + method: 'post', + data: params + }) } export function DeleteTestPaperClass(ids) { - return request({ - url: `/TestPaperClass/Delete?ids=${ids}`, - method: 'post', - }) + return request({ + url: `/TestPaperClass/Delete?ids=${ids}`, + method: 'post', + }) } export function CreateTestPaperClass(params) { - return request({ - url: `/TestPaperClass/Create`, - method: 'post', - data: params - }) + return request({ + url: `/TestPaperClass/Create`, + method: 'post', + data: params + }) } export function GetToplevel() { - return request({ - url: `/TestPaperClass/GetToplevel`, - method: 'get', - }) + return request({ + url: `/TestPaperClass/GetToplevel`, + method: 'get', + }) } export function GetTestManagerByAdmin(data) { - return request({ - url: `/TestPaper/GetTestManagerByAdmin?TestPaperId=`+data.TestPaperId, - method: 'get', - data - }) + return request({ + url: `/TestPaper/GetTestManagerByAdmin?TestPaperId=` + data.TestPaperId, + method: 'get', + data + }) } // POST /api/TestPaper/GetTestPaperListByPlateClass //获取模块下面的试卷列表 export function GetTestPaperListByPlateClass(data) { - return request({ - url: `/TestPaper/GetTestPaperListByPlateClass`, - method: 'post', - data - }) + return request({ + url: `/TestPaper/GetTestPaperListByPlateClass`, + method: 'post', + data + }) } //POST /api/TestPaper/AddTestPaperInfo 往模块中添加试卷 export function AddTestPaperInfo(data) { - return request({ - url: `/TestPaper/AddTestPaperInfo`, - method: 'post', - data - }) + return request({ + url: `/TestPaper/AddTestPaperInfo`, + method: 'post', + data + }) } //POST /api/TestPaper/Update 编辑 export function TestPaperUpdate(data) { - return request({ - url: `/TestPaper/Update`, - method: 'post', - data - }) + return request({ + url: `/TestPaper/Update`, + method: 'post', + data + }) } // get /api/TestPaper/DeleteTestPaper 标记删除 export function DeleteTestPaper(data) { - return request({ - url: `/TestPaper/DeleteTestPaper?TestPaperId=`+data, - method: 'get', - data - }) + return request({ + url: `/TestPaper/DeleteTestPaper?TestPaperId=` + data, + method: 'get', + data + }) } // POST /api/TestPaper/ReleaseTestPaper 上架试卷 export function ReleaseTestPaper(data) { - return request({ - url: `/TestPaper/ReleaseTestPaper?TestPaperId=`+data, - method: 'post', - data - }) + return request({ + url: `/TestPaper/ReleaseTestPaper?TestPaperId=` + data, + method: 'post', + data + }) } //POST /api/TestPaperDetail/Delete export function DeleteTestPaperDetail(data) { - return request({ - url: `/TestPaperDetail/DeleteTestPaperDetail`, - method: 'post', - params:data - }) -} + return request({ + url: `/TestPaperDetail/DeleteTestPaperDetail`, + method: 'post', + params: data + }) +} \ No newline at end of file diff --git a/src/views/TestPaper/ManualTestPaper.vue b/src/views/TestPaper/ManualTestPaper.vue index 210e828..5d47a4a 100644 --- a/src/views/TestPaper/ManualTestPaper.vue +++ b/src/views/TestPaper/ManualTestPaper.vue @@ -64,6 +64,7 @@ 单选题：{{TestPaper.SingleNumber}} 多选题：{{TestPaper.MultipleNumber}} 主观题：{{TestPaper.SubjectiveNumber}} + 主观题：{{TestPaper.VoiceNumber}} {{TestPaper.TotalScore || ''}} @@ -231,6 +232,7 @@ SingleNumber: 0, MultipleNumber: 0, SubjectiveNumber: 0, + VoiceNumber:0, OriginalPrice: "0", PresentPrice: "0", MembershipPrice: "0", @@ -369,6 +371,11 @@ this.dialogTableVisible = false; if (!list.length) { this.$message.warning('所选分类没有试题'); + }else{ + this.TestPaper.SingleNumber = list.filter(t=>t.subjectType == 1).length; + this.TestPaper.MultipleNumber = list.filter(t=>t.subjectType == 2).length; + this.TestPaper.SubjectiveNumber = list.filter(t=>t.subjectType == 3).length; + this.TestPaper.VoiceNumber = list.filter(t=>t.subjectType == 4).length; } }); }, @@ -506,6 +513,10 @@ if (e.item._underlying_vm_.subjectType == 3) { this.TestPaper.SubjectiveNumber -= 1; } + if (e.item._underlying_vm_.subjectType == 4) { + this.TestPaper.VoiceNumber -= 1; + } + this.TestPaper.TotalScore -= e.item._underlying_vm_.fraction; this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id); }, @@ -521,6 +532,9 @@ if (e.item._underlying_vm_.subjectType == 3) { this.TestPaper.SubjectiveNumber += 1; } + if (e.item._underlying_vm_.subjectType == 4) { + this.TestPaper.VoiceNumber += 1; + } this.TestPaper.TotalScore += e.item._underlying_vm_.fraction; this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id); @@ -548,6 +562,9 @@ if (rs.subjectType == 3) { this.TestPaper.SubjectiveNumber += 1; } + if (rs.subjectType == 4) { + this.TestPaper.VoiceNumber += 1; + } }); }); } diff --git a/src/views/TestPaper/TestPaperList.vue b/src/views/TestPaper/TestPaperList.vue index 1803eca..70066d8 100644 --- a/src/views/TestPaper/TestPaperList.vue +++ b/src/views/TestPaper/TestPaperList.vue @@ -21,6 +21,7 @@ {{ scope.row.TotalScore }} + + + + + + +