From e011bf151deb401616926a54a79524fdc8d5ef52 Mon Sep 17 00:00:00 2001 From: wesley <470822125@qq.com> Date: Tue, 29 Mar 2022 15:41:59 +0800 Subject: [PATCH] 我先走一步 --- src/api/QuestionClass.js | 8 ++++++++ src/api/TestPaper.js | 3 ++- src/api/user.js | 10 +++++++++- src/views/QuestionBank/components/EditDimension.vue | 5 +++-- src/views/QuestionBank/index.vue | 1039 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/TestPaper/ManualTestPaper.vue | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------ src/views/TestPaper/TestPaperClass.vue | 11 +++++++++-- src/views/TestPaper/TestPaperList.vue | 24 +++++++++++++++++------- src/views/login/index.vue | 6 +++--- src/views/user/userlist.vue | 52 +++++++++++++++++++++++++++++++++++----------------- 10 files changed, 628 insertions(+), 607 deletions(-) diff --git a/src/api/QuestionClass.js b/src/api/QuestionClass.js index f4af1be..41de4d4 100644 --- a/src/api/QuestionClass.js +++ b/src/api/QuestionClass.js @@ -15,6 +15,14 @@ export function getQuestionClass(params) { params }) } + +export function GetQuestionClassByType(params) { + return request({ + url: `/QuestionClass/GetQuestionClassByType`, + method: 'get', + params + }) +} // 修改 | 保存 export function EditQuestionClass(params) { return request({ diff --git a/src/api/TestPaper.js b/src/api/TestPaper.js index c2f8bc6..93f4dc0 100644 --- a/src/api/TestPaper.js +++ b/src/api/TestPaper.js @@ -10,7 +10,8 @@ export function EditTestPaper(params) { export function getTestPaperList(params) { return request({ - url: `/TestPaper/List?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&sort=${params.sort}&sortOrder=${params.sortOrder}`, + url: `/TestPaper/List`, + // url: `/TestPaper/List?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&sort=${params.sort}&sortOrder=${params.sortOrder}`, method: 'get', data: params }) diff --git a/src/api/user.js b/src/api/user.js index f375988..82bced6 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -94,4 +94,12 @@ export function UpdateCurrentPasswordById(data) { method: 'post', data }) -} +} + +export function AddInvitationAnswerMultiple(data) { + return request({ + url: `/InvitationAnswer/AddInvitationAnswerMultiple`, + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/views/QuestionBank/components/EditDimension.vue b/src/views/QuestionBank/components/EditDimension.vue index 921d8fe..8ac49c4 100644 --- a/src/views/QuestionBank/components/EditDimension.vue +++ b/src/views/QuestionBank/components/EditDimension.vue @@ -237,8 +237,7 @@ } catch (e) { } }, show(id) { - if (id) { - this.data = { + this.data = { // id: Date.parse(new Date()) + '_' + Math.ceil(Math.random() * 99999), // key: Date.parse(new Date()) + '_' + Math.ceil(Math.random() * 99999), rules: [ @@ -255,6 +254,8 @@ } ] }; + if (id) { + this.dialogFormVisible = true; getQuestionClass({ id }).then(res => { diff --git a/src/views/QuestionBank/index.vue b/src/views/QuestionBank/index.vue index f66502f..d36c527 100644 --- a/src/views/QuestionBank/index.vue +++ b/src/views/QuestionBank/index.vue @@ -6,48 +6,24 @@
-
- +
+ - + {{ node.label }} - + 添加下级 - 编辑 - + 编辑 + + 删除 @@ -59,24 +35,16 @@
- 添加题目 + 添加题目
- + " :header-cell-class-name="headerStyle" :stripe="true"> - + - + + /deep/.cell { + padding-left: 0px; + } + + /deep/.el-form-item { + margin-bottom: 5px; + } + + /deep/.el-radio { + margin-right: 10px; + } + + /deep/.el-radio__input.is-checked .el-radio__inner { + border-color: #409eff; + background-color: #409eff; + } + + /deep/.el-radio__input.is-checked+.el-radio__label { + color: #409eff; + font-weight: bold; + } + + /deep/.tableStyle { + background-color: #304156 !important; + color: #fff; + font-weight: 400; + } + + .QuestDiv { + width: 24%; + float: left; + min-height: 50px; + border: 1px solid #cdcdcd; + margin-right: 10px; + box-shadow: 0 0 10px #808080; + border-radius: 8px; + min-height: 100px; + background-color: #fff; + opacity: 0.8; + margin-bottom: 10px; + height: 313px; + } + + .clear { + clear: both; + margin-bottom: 10px; + } + + .font-color { + background-color: #ae1e15 !important; + color: #fff; + box-shadow: 0 0 5px #ae1e15; + } + + /deep/.el-input-group__prepend { + font-weight: bold; + width: 30px; + text-align: center; + background: #409eff; + color: #fff; + } + + .optionInput { + float: left; + width: 620px !important; + } + + .el-icon { + font-size: 20px; + line-height: 40px; + margin: 0 5px; + cursor: pointer; + color: #409eff !important; + } + + >>>.subjectContentClass .el-checkbox__label { + padding-right: 10px !important; + } + + .seetingsDiv { + width: 100%; + height: 60px; + background: #efefef; + line-height: 60px; + border-radius: 5px; + box-shadow: 0 0 5px #cdcdcd; + } + + .seetingsDiv button { + background-color: #304156; + border: 0px; + margin-left: 10px; + box-shadow: 0 0 5px #cdcdcd; + float: right; + margin-top: 12px; + margin-right: 10px; + } + + .areadiv { + background-color: #efefef; + border-radius: 5px; + box-shadow: 0 0 5px #efefef; + } + + .TreeHeader { + background-color: #304156; + height: 60px; + border-radius: 5px; + box-shadow: 0 0 10px #efefef; + line-height: 60px; + color: #fff; + padding-left: 10px; + } + + .classbtn { + float: right; + margin: 11px 10px 0 0; + height: 35px; + line-height: 12px; + } + + .eltree { + background-color: #efefef; + } + + /deep/.el-tree-node__content { + min-height: 40px; + } + + .custom-tree-node { + flex: 1; + display: flex; + align-items: center; + justify-content: space-between; + font-size: 14px; + padding-right: 8px; + } + \ No newline at end of file diff --git a/src/views/TestPaper/ManualTestPaper.vue b/src/views/TestPaper/ManualTestPaper.vue index 91257e1..0afed77 100644 --- a/src/views/TestPaper/ManualTestPaper.vue +++ b/src/views/TestPaper/ManualTestPaper.vue @@ -10,10 +10,12 @@
+ -
  • {{ i.subject }}
    • +
  • {{ + i.subject }}

    • 加载中...

    没有更多了

     @@ -28,6 +30,7 @@
    +
  • @@ -38,6 +41,8 @@
    • + +
    @@ -56,7 +61,7 @@ 主观题：{{TestPaper.SubjectiveNumber}} - {{TestPaper.TotalScore}} + {{TestPaper.TotalScore || ''}} @@ -114,6 +119,7 @@