From ca39cc5253a620b50c780202bbf444040862fd33 Mon Sep 17 00:00:00 2001 From: 阿宝 Date: Tue, 27 Dec 2022 20:04:16 +0800 Subject: [PATCH] 飞书问题处理 --- src/router/index.js | 39 +++++++++++++++++++++++---------------- src/views/down/client.vue | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------- src/views/down/index.vue | 21 ++++++++++++--------- src/views/examinationPaper/add.vue | 54 ++++++++++++++++++++++++++++++++---------------------- src/views/examinationPaper/edit.vue | 15 +++++++++++++++ src/views/examinationPaper/index.vue | 16 +++++++++++----- src/views/index/mainIndex.vue | 2 +- src/views/layout/aside/aside.vue | 14 +++++++++++++- src/views/setUp/school.vue | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------- src/views/setUp/teacher.vue | 3 ++- 10 files changed, 234 insertions(+), 136 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 3f11df4..9303689 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -68,22 +68,22 @@ let defaultRouter = [ } ] }, - { - path: "/setUpConglomerate", - iconCls: "fa fa-building", // 图标样式class - name: "学校管理", - component: Layout, - alone: true, - children: [ - { - path: "/setUpConglomerate", - iconCls: "fa fa-building", - name: '集团管理', - component: SetUpConglomerate, - children: [] - }, - ] - }, + // { + // path: "/setUpConglomerate", + // iconCls: "fa fa-building", // 图标样式class + // name: "学校管理", + // component: Layout, + // alone: true, + // children: [ + // { + // path: "/setUpConglomerate", + // iconCls: "fa fa-building", + // name: '集团管理', + // component: SetUpConglomerate, + // children: [] + // }, + // ] + // }, { path: "/404", component: NotFound, @@ -113,6 +113,7 @@ let addrouters = [ //测试用,后续后端获取 iconCls: "", // 图标样式class name: "添加答题卡", component: ExaminationPaperAdd, + parent:"examinationPaper", children: [] }, { @@ -120,6 +121,7 @@ let addrouters = [ //测试用,后续后端获取 iconCls: "", // 图标样式class name: "修改答题卡", component: ExaminationPaperEdit, + parent:"examinationPaper", children: [] }, { @@ -127,6 +129,7 @@ let addrouters = [ //测试用,后续后端获取 iconCls: "", // 图标样式class name: "已归档答题卡", component: ExaminationPaperRecycle, + parent:"examinationPaper", children: [] }, ] @@ -151,6 +154,7 @@ let addrouters = [ //测试用,后续后端获取 iconCls: "", // 图标样式class name: "随堂问报表分析", component: AskAnalysis, + parent:"ask", children: [] } ] @@ -174,6 +178,7 @@ let addrouters = [ //测试用,后续后端获取 iconCls: "", // 图标样式class name: "即时测报表分析", component: TestAnalysis, + parent:"test", children: [] } @@ -292,6 +297,7 @@ let addrouters = [ //测试用,后续后端获取 iconCls: "fa fa-list-alt", // 图标样式class name: "", component: DeviceLog, + parent:"device", children: [] } ] @@ -331,6 +337,7 @@ let addrouters = [ //测试用,后续后端获取 iconCls: "", // 图标样式class name: "授课端软件", component: DownClient, + parent:"down", children: [] } ] diff --git a/src/views/down/client.vue b/src/views/down/client.vue index fe01dcb..23acb2d 100644 --- a/src/views/down/client.vue +++ b/src/views/down/client.vue @@ -48,15 +48,17 @@ -
+
-

参数设置

+

+ {{ `${type == 1 ? "参数设置" : formData.configName + "-修改入口"}` }} +

- + 老师选择 + > + @@ -337,56 +339,56 @@ export default { configName: [ { required: true, message: "请填写配置名称", trigger: "blur" }, ], - mainMenu: [ - { required: true, message: "请选择主菜单", trigger: "blur" }, - ], - popupMenu: [ - { required: true, message: "请选择弹出菜单", trigger: "blur" }, - ], - viesAnswerSet: [ - { required: true, message: "请选择抢答类型", trigger: "blur" }, - ], - countdown: [ - { required: true, message: "请输入抢答倒计时", trigger: "blur" }, - ], - ballotAnswerSet: [ - { required: true, message: "请选择抽答类型", trigger: "blur" }, - ], - singleChoiceNum: [ - { - required: true, - message: "请输入单选题选项默认个数", - trigger: "blur", - }, - ], - multipleChoiceNum: [ - { - required: true, - message: "请输入多选题选项默认个数", - trigger: "blur", - }, - ], - singleTypeNum: [ - { - required: true, - message: "请输入测—单题型默认题数", - trigger: "blur", - }, - ], - displayModel: [ - { - required: true, - message: "请选择答题结构", - trigger: "blur", - }, - ], - languageSet: [ - { - required: true, - message: "请选择语言", - trigger: "blur", - }, - ], + // mainMenu: [ + // { required: true, message: "请选择主菜单", trigger: "blur" }, + // ], + // popupMenu: [ + // { required: true, message: "请选择弹出菜单", trigger: "blur" }, + // ], + // viesAnswerSet: [ + // { required: true, message: "请选择抢答类型", trigger: "blur" }, + // ], + // countdown: [ + // { required: true, message: "请输入抢答倒计时", trigger: "blur" }, + // ], + // ballotAnswerSet: [ + // { required: true, message: "请选择抽答类型", trigger: "blur" }, + // ], + // singleChoiceNum: [ + // { + // required: true, + // message: "请输入单选题选项默认个数", + // trigger: "blur", + // }, + // ], + // multipleChoiceNum: [ + // { + // required: true, + // message: "请输入多选题选项默认个数", + // trigger: "blur", + // }, + // ], + // singleTypeNum: [ + // { + // required: true, + // message: "请输入测—单题型默认题数", + // trigger: "blur", + // }, + // ], + // displayModel: [ + // { + // required: true, + // message: "请选择答题结构", + // trigger: "blur", + // }, + // ], + // languageSet: [ + // { + // required: true, + // message: "请选择语言", + // trigger: "blur", + // }, + // ], }, menuList: ["问", "测", "析"], }; @@ -399,6 +401,7 @@ export default { setConfigForm(obj) { let content = JSON.parse(obj.content); console.log(content); + this.formData.configName = obj.configName for (let key in this.formData) { content[key] ? (this.formData[key] = content[key]) : ""; } @@ -407,6 +410,9 @@ export default { ); this.type = 2; (this.configId = obj.id), (this.dialogVis = true); + this.$nextTick(function () { + this.$refs.editDia.scrollTop = 0; + }); }, setDefaultForm() { for (let key in this.formData) { @@ -518,6 +524,7 @@ export default { diff --git a/src/views/setUp/school.vue b/src/views/setUp/school.vue index e96f3f2..2e039d6 100644 --- a/src/views/setUp/school.vue +++ b/src/views/setUp/school.vue @@ -99,19 +99,30 @@ label-width="160px" > - - {{ item }} + 更多... + + {{ item }} + +
+ + - - - - - - + + + {{ @@ -163,8 +174,9 @@ @@ -219,6 +231,7 @@ export default { diaUp: false, diaSchool: false, diaGrade: false, + showAll:false,//修改年级科目显示 school: { schoolName: "", managePwd: "", @@ -250,7 +263,7 @@ export default { { required: true, message: "请选择科目", trigger: "blur" }, ], }, - subjectName:"", + subjectName: "", sectionsList: [ { id: "1", name: "小学" }, { id: "2", name: "初中" }, @@ -273,14 +286,14 @@ export default { this.formGrade.gradeName = obj.gradeName; this.diaGrade = true; }, - addSubjectName(){ - if(!this.subjectName){ - this.$message.warning("请填写科目名称") - return + addSubjectName() { + if (!this.subjectName) { + this.$message.warning("请填写科目名称"); + return; } - this.subjectList.push(this.subjectName) - this.formGrade.subjectNames.push(this.subjectName) - this.subjectName = "" + this.subjectList.push(this.subjectName); + this.formGrade.subjectNames.push(this.subjectName); + this.subjectName = ""; }, async editSchool() { if (!this.formSchool.sections.length) { @@ -429,7 +442,7 @@ export default { flex-wrap: wrap; padding: 20px; .grade-item { - width: 300px; + width: calc((100% - 100px) / 3); margin-right: 50px; margin-bottom: 40px; box-sizing: border-box; @@ -442,6 +455,9 @@ export default { transform: translate(-2px, -5px); box-shadow: 5px 5px 10px #888; } + &:nth-of-type(3n) { + margin-right: 0; + } } .grade-name { font-size: 16px; @@ -468,11 +484,32 @@ export default { } .form-box { margin: 0 20px; + .subject-box{ + height:90px; + overflow:hidden; + position:relative; + &.active{ + height:auto; + overflow:auto; + } + .showAll{ + position:absolute; + bottom:0; + right:10px; + font-size: 12px; + color: #7f7f7f; + cursor: pointer; + padding:2px; + &:hover{ + color:#667ffd + } + } + } } -.el-icon-plus{ +.el-icon-plus { cursor: pointer; - &:hover{ - color:#667ffd + &:hover { + color: #667ffd; } } \ No newline at end of file diff --git a/src/views/setUp/teacher.vue b/src/views/setUp/teacher.vue index f14ca84..8b989cf 100644 --- a/src/views/setUp/teacher.vue +++ b/src/views/setUp/teacher.vue @@ -236,7 +236,7 @@ prop="loginName" > - + @@ -736,6 +736,7 @@ export default { } &.active { color: #667ffd; + background: #eee; } } } -- libgit2 0.21.4