diff --git a/src/assets/template.xlsx b/src/assets/template.xlsx new file mode 100644 index 0000000..b16a0c3 Binary files /dev/null and b/src/assets/template.xlsx differ diff --git a/src/components/quill/index.vue b/src/components/quill/index.vue index d99f2be..f4d2118 100644 --- a/src/components/quill/index.vue +++ b/src/components/quill/index.vue @@ -26,6 +26,10 @@ type: Boolean, default: false }, + toTop: { + type: Boolean, + default: true + }, border: { type: Boolean, default: false @@ -112,9 +116,11 @@ this.Quill = new Quill(editor, this.options); // 默认值 this.Quill.pasteHTML(this.currentValue); - this.$nextTick(() => { - window.scrollTo(0,0) - }) + if(this.toTop){ + this.$nextTick(() => { + window.scrollTo(0,0) + }) + } // 绑定事件 this.Quill.on('text-change', (delta, oldDelta, source) => { const html = this.$refs.editor.children[0].innerHTML; diff --git a/src/libs/util.js b/src/libs/util.js index 1c8fb9a..37d0731 100644 --- a/src/libs/util.js +++ b/src/libs/util.js @@ -72,7 +72,14 @@ const util = { isImg(ext) { if('jpg,jpeg,png,gif,svg,psd'.includes(ext)) return true return false - } + }, + // 循环去除html标签 + removeHtmlTag(list,attr) { + list.map(n => { + n[attr] = n[attr].replace(/<\/?.+?>/gi,'') + }) + return list + }, } export default util \ No newline at end of file diff --git a/src/pages/client/add/index.vue b/src/pages/client/add/index.vue index 08cfce8..c407ea4 100644 --- a/src/pages/client/add/index.vue +++ b/src/pages/client/add/index.vue @@ -3,7 +3,7 @@ -
+
返回 @@ -15,10 +15,7 @@
-
-

- 基本信息 -
+
基本信息
diff --git a/src/pages/client/list/index.vue b/src/pages/client/list/index.vue index 8ee028e..b014c55 100644 --- a/src/pages/client/list/index.vue +++ b/src/pages/client/list/index.vue @@ -4,10 +4,8 @@
-
-

- 筛选 -
+
筛选
+
@@ -45,10 +43,8 @@
-
-

- 客户列表 -
+
客户列表
+
新增客户 批量删除 diff --git a/src/pages/quesBank/list/globalQuesBank.vue b/src/pages/quesBank/list/globalQuesBank.vue index 0d3629c..6224a53 100644 --- a/src/pages/quesBank/list/globalQuesBank.vue +++ b/src/pages/quesBank/list/globalQuesBank.vue @@ -2,10 +2,8 @@
-
-

- 筛选 -
+
筛选
+
@@ -34,10 +32,8 @@
-
-

- 题目列表 -
+
题目列表
+
批量删除 @@ -46,11 +42,7 @@ - - - + @@ -76,8 +68,9 @@ \ No newline at end of file + + + \ No newline at end of file diff --git a/src/pages/quesBank/list/quesDialog.vue b/src/pages/quesBank/list/quesDialog.vue index 701b8f6..32ad098 100644 --- a/src/pages/quesBank/list/quesDialog.vue +++ b/src/pages/quesBank/list/quesDialog.vue @@ -285,7 +285,8 @@ export default { if(!topicForm[`option${curOpt.toUpperCase()}`].length) isInvalidAnswer = true } } - if(optionCount < 2) return this.$message.warning('请至少添加两个选项！') + if((topicForm.typeId == 1 || topicForm.typeId == 3) && optionCount < 2) return this.$message.warning('请至少添加两个选项！') + if(topicForm.typeId == 2 && optionCount < 3) return this.$message.warning('请至少添加三个选项！') if(!answer) return this.$message.warning('请设置正确答案！') if(topicForm.questionType == '单选题' && answer.length > 1) return this.$message.warning('单选题只能设置一个正确选项！') if(topicForm.questionType == '多选题' && answer.length < 2) return this.$message.warning('多选题必须设置至少两个正确选项！') @@ -392,7 +393,7 @@ export default { message: "上传出错，请重试！", type: "error", center: true - }); + }) }, beforeRemove(file, fileList) { return this.$confirm(`确定移除 ${file.name}？`); @@ -403,6 +404,7 @@ export default { closeTopics() { this.$emit('update:visible',false) this.$emit('closeTopics') + this.uploadList = [] this.resetForm() }, closeDialog(){ diff --git a/src/pages/system/list/role.vue b/src/pages/system/list/role.vue index 6b35582..cd532dd 100644 --- a/src/pages/system/list/role.vue +++ b/src/pages/system/list/role.vue @@ -2,15 +2,11 @@
-
-

- 筛选 -
-
-
-
- -
+
筛选
+ +
+
+
@@ -18,10 +14,8 @@
-
-

- 角色列表 -
+
角色列表
+
新增角色 批量删除 diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue index 7edd604..93e55ff 100644 --- a/src/pages/user/list/index.vue +++ b/src/pages/user/list/index.vue @@ -2,15 +2,11 @@
-
-

- 筛选 -
-
-
-
- -
+
筛选
+ +
+
+
@@ -18,10 +14,8 @@
-
-

- 用户列表 -
+
用户列表
+
新增用户 批量导入 diff --git a/src/styles/common.scss b/src/styles/common.scss index a06aed2..d3c69bf 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -60,25 +60,32 @@ margin-right: 5px; color: #F56C6C; } -.hr_tag{ - background-color: $--color-primary; - width: 3px; - height: 15px; - margin-right: 5px; -} - -.per_title span{ - font-size: 16px; - font-weight: bold; -} -.per_back{ - margin-left: 5px; -} -.per_school{ - margin-left: 30px; +.p-title{ + display: flex; + align-items: center; + &:before{ + content: ''; + display: inline-block; + width: 3px; + height: 15px; + margin-right: 5px; + background-color: $--color-primary; + } } -.per_title:hover{ - cursor:pointer; +.per_title{ + span{ + font-size: 16px; + font-weight: bold; + } + .per_back{ + margin-left: 5px; + } + .per_school{ + margin-left: 30px; + } + &:hover{ + cursor:pointer; + } } [v-cloak] { diff --git a/src/styles/pages/tree.scss b/src/styles/pages/tree.scss index 59af75b..f540890 100644 --- a/src/styles/pages/tree.scss +++ b/src/styles/pages/tree.scss @@ -1,3 +1,5 @@ +@import "../default/index.scss"; + $insideColor: rgba(245, 242, 255, 0.8); //内部节点的边框颜色 $outColor: rgba(255, 255, 255, 0.8); //外部节点的边框颜色 //混合代码,提取item共同样式 @@ -59,7 +61,7 @@ $outColor: rgba(255, 255, 255, 0.8); //外部节点的边框颜色 margin-left:95px } .item2:hover{ - color: #cb221c; + color: $--color-primary; } .edit{ display: inline-block; diff --git a/题库导入模板.xlsx b/题库导入模板.xlsx new file mode 100644 index 0000000..b16a0c3 Binary files /dev/null and b/题库导入模板.xlsx differ