Skip to content

S
school-paper-admin-front
Commit 06ef68a8 by H.wb.wang.peixun
Options

接口对接

parent 7c5063c1
Showing with 114 additions and 290 deletions
src/api/school-paper/errorList.js
......@@ -42,3 +42,11 @@ export function delErrorList(id) {
method: 'delete'
})
}
// 查询题库主列表
export function questionType(query) {
return request({
url: '/school-paper/question-type/list',
method: 'get',
params: query
})
}
\ No newline at end of file
src/views/school-paper/errorList/index.vue
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="题库类别" prop="categoryId">
<el-select
clearable
v-model="queryParams.categoryId"
placeholder="请选择题库类别"
@change="handleQuery"
>
<el-option
v-for="item in [
{ label: '全部', value: '' },
{ label: '集合', value: '1' },
{ label: '不等式', value: '2' },
{ label: '函数', value: '3' },
{ label: '数列', value: '4' },
{ label: '立体几何', value: '5' },
]"
:key="item.value"
:label="item.label"
:value="item.value"
>
<el-select clearable v-model="queryParams.categoryId" placeholder="请选择题库类别" @change="handleQuery">
<el-option v-for="item in category" :key="item.id" :label="item.typeValue" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="习题种类：" prop="species">
<!-- 1填空，2选择，3解答 -->
<el-select
clearable
v-model="queryParams.species"
placeholder="请选择习题种类"
@change="handleQuery"
>
<el-option
v-for="item in [
<el-select clearable v-model="queryParams.species" placeholder="请选择习题种类" @change="handleQuery">
<el-option v-for="item in [
{ label: '全部', value: '' },
{ label: '填空', value: '1' },
{ label: '选择', value: '2' },
{ label: '解答', value: '3' },
]"
:key="item.value"
:label="item.label"
:value="item.value"
>
]" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select
clearable
v-model="queryParams.type"
placeholder="请选择类型"
@change="handleQuery"
>
<el-option
v-for="item in [
<el-select clearable v-model="queryParams.type" placeholder="请选择类型" @change="handleQuery">
<el-option v-for="item in [
{ label: '全部', value: '' },
{ label: '典例精讲', value: '1' },
]"
:key="item.value"
:label="item.label"
:value="item.value"
>
]" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="强度分类：" prop="intensity">
<!-- 1基础，2中等，3提高 -->
<el-select
clearable
v-model="queryParams.intensity"
placeholder="请选择强度"
@change="handleQuery"
>
<el-option
v-for="item in [
<el-select clearable v-model="queryParams.intensity" placeholder="请选择强度" @change="handleQuery">
<el-option v-for="item in [
{ label: '全部', value: '' },
{ label: '基础', value: '1' },
{ label: '中等', value: '2' },
{ label: '提高', value: '3' },
]"
:key="item.value"
:label="item.label"
:value="item.value"
>
]" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
......@@ -135,16 +81,8 @@
/>
</el-form-item> -->
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -195,28 +133,15 @@
>导出</el-button
>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<div class="app-container-list">
<div
class="app-container-list-item"
v-for="(item, index) in 10"
:key="index"
>
<div class="app-container-list-item" v-for="(item, index) in questionBankList" :key="index">
<div class="app-container-list-item-title">选择题</div>
<div
class="app-container-list-item-html"
v-html="
`<p>1.集合A中有m个元素，若A中增加一个元素，则它的.子集个数将增加（ ）个.集合A中有m个元素，若A中增加一个元素，则它的.子集个数将增加（ ）个.集合A中有m个元素，若A中增加一个元素，则它的.子集个数将增加（ ）个.集合A中有m个元素，若A中增加一个元素，则它的.子集个数将增加（ ）个.集合A中有m个元素，若A中增加一个元素，则它的.子集个数将增加（ ）个.</p>`
"
></div>
<div class="app-container-list-item-html" v-html="item.topic"></div>
<div class="app-container-list-item-footer">
<el-button icon="el-icon-edit-outline">编辑</el-button>
<el-button icon="el-icon-delete">删除</el-button>
<el-button icon="el-icon-edit-outline" @click="handleUpdate(item)">查看</el-button>
</div>
</div>
</div>
......@@ -281,208 +206,101 @@
</el-table-column>
</el-table> -->
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改题库主对话框 -->
<template v-if="open">
<el-dialog
:title="title"
:visible.sync="open"
width="70%"
append-to-body
destroy-on-close
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="120px"
label-position="top"
class="app-container-form"
>
<el-dialog :title="title" :visible.sync="open" width="70%" append-to-body destroy-on-close>
<el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="top"
class="app-container-form">
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="题库类别" prop="categoryId">
<el-select
clearable
v-model="form.categoryId"
placeholder="请选择题库类别"
>
<el-option
v-for="item in [
{ label: '集合', value: '1' },
{ label: '不等式', value: '2' },
{ label: '函数', value: '3' },
{ label: '数列', value: '4' },
{ label: '立体几何', value: '5' },
]"
:key="item.value"
:label="item.label"
:value="item.value"
>
<el-select clearable v-model="form.categoryId" placeholder="请选择题库类别">
<el-option v-for="item in category" :key="item.id" :label="item.typeValue" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="年级阶段" prop="phaseId">
<el-select
clearable
v-model="form.phaseId"
placeholder="请选择阶段"
@change="handleQuery"
>
<el-option
v-for="item in [
<el-select clearable v-model="form.phaseId" placeholder="请选择阶段" @change="handleQuery">
<el-option v-for="item in [
{ label: '高一', value: '1' },
{ label: '高二', value: '2' },
{ label: '高三', value: '3' },
]"
:key="item.value"
:label="item.label"
:value="item.value"
>
]" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="强度分类：" prop="intensity">
<!-- 1基础，2中等，3提高 -->
<el-select
clearable
v-model="form.intensity"
placeholder="请选择强度"
>
<el-option
v-for="item in [
<el-select clearable v-model="form.intensity" placeholder="请选择强度">
<el-option v-for="item in [
{ label: '基础', value: '1' },
{ label: '中等', value: '2' },
{ label: '提高', value: '3' },
]"
:key="item.value"
:label="item.label"
:value="item.value"
>
]" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="习题种类：" prop="species">
<!-- 1填空，2选择，3解答 -->
<el-select
clearable
v-model="form.species"
placeholder="请选择习题种类"
@change="changeSpecies"
>
<el-option
v-for="item in [
<el-select clearable v-model="form.species" placeholder="请选择习题种类" @change="changeSpecies">
<el-option v-for="item in [
{ label: '填空', value: '1' },
{ label: '选择', value: '2' },
{ label: '解答', value: '3' },
]"
:key="item.value"
:label="item.label"
:value="item.value"
>
]" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="题目" prop="topic">
<editor
v-model="form.topic"
:min-height="192"
:iconType="['image']"
/>
<editor v-model="form.topic" :min-height="192" :iconType="['image']" />
</el-form-item>
<template v-if="[1, '1', 3, '3'].includes(form.species)">
<el-form-item label="答案" prop="answer">
<editor
v-model="form.answer"
:min-height="192"
:iconType="['image']"
/>
<editor v-model="form.answer" :min-height="192" :iconType="['image']" />
</el-form-item>
<el-form-item label="答案图片" prop="rightAnswersPic">
<imageUpload :limit="9" v-model="form.rightAnswersPic" />
</el-form-item>
</template>
<template v-if="[2, '2'].includes(form.species)">
<el-form-item label="选项" prop="checkList">
<el-form-item label="选项" prop="options">
<div class="app-container-form-check">
<i
class="el-icon-circle-plus-outline app-container-form-check-add"
v-if="!form.checkList || !form.checkList.length"
@click="clickAddCheckList"
></i>
<div
v-for="(item, index) in form.checkList"
:key="index"
class="app-container-form-check-item"
>
<i class="el-icon-circle-plus-outline app-container-form-check-add"
v-if="!form.options || !form.options.length" @click="clickAddoptions"></i>
<div v-for="(item, index) in form.options" :key="index" class="app-container-form-check-item">
<span class="app-container-form-check-item-type">{{
index | filterType(form.checkList)
}}</span
><i
v-if="index + 1 === form.checkList.length"
index | filterType(form.options)
}}</span><i v-if="index + 1 === form.options.length"
class="el-icon-circle-plus-outline app-container-form-check-item-add"
@click="clickCheckItemAdd(index)"
></i>
<i
class="el-icon-remove-outline app-container-form-check-item-del"
v-else
@click="clickCheckItemDel(index)"
></i>
<editor
v-model="item.html"
:min-height="192"
:iconType="['image']"
/>
@click="clickCheckItemAdd(index)"></i>
<i class="el-icon-remove-outline app-container-form-check-item-del" v-else
@click="clickCheckItemDel(index)"></i>
<editor v-model="item.html" :min-height="192" :iconType="['image']" />
</div>
</div>
</el-form-item>
<el-form-item
label="标准答案"
prop="rightAnswers"
v-if="form.checkList && form.checkList.length"
>
<el-form-item label="标准答案" prop="rightAnswers" v-if="form.options && form.options.length">
<el-radio-group v-model="form.rightAnswers">
<el-radio
:label="index"
v-for="(item, index) in form.checkList"
:key="index"
>{{ index | filterType(form.checkList) }}</el-radio
>
<el-radio :label="index" v-for="(item, index) in form.options" :key="index">{{ index |
filterType(form.options) }}</el-radio>
</el-radio-group>
</el-form-item>
</template>
<el-form-item label="典例精讲" prop="explain">
<el-switch
@change="changeExplain"
v-model="form.explain"
active-color="#409eff"
>
<el-switch @change="changeExplain" v-model="form.explain" active-color="#409eff">
</el-switch>
</el-form-item>
<template v-if="form.explain">
<el-form-item label="解答过程" prop="resolveCourse">
<editor
v-model="form.resolveCourse"
:min-height="192"
:iconType="['image']"
/>
<editor v-model="form.resolveCourse" :min-height="192" :iconType="['image']" />
</el-form-item>
<el-form-item label="解答视频" prop="resolveVideo">
<fileUpload
v-model="form.resolveVideo"
:limit="1"
:fileSize="1024"
:fileType="['mp4', 'mp3']"
/>
<fileUpload v-model="form.resolveVideo" :limit="1" :fileSize="1024" :fileType="['mp4', 'mp3']" />
</el-form-item>
</template>
</el-col>
......@@ -492,9 +310,7 @@
</el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"
>确 定</el-button
>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
......@@ -504,17 +320,19 @@
<script>
import {
listQuestionBank,
getQuestionBank,
listErrorList,
getErrorList,
delQuestionBank,
addQuestionBank,
updateQuestionBank,
} from "@/api/school-paper/questionBank";
questionType
} from "@/api/school-paper/errorList";
export default {
name: "QuestionBank",
data() {
return {
category: [], // 题库类别
// 按钮loading
buttonLoading: false,
// 遮罩层
......@@ -596,6 +414,7 @@ export default {
},
created() {
this.getList();
this.questionType()
},
methods: {
changeExplain(e) {
......@@ -653,7 +472,7 @@ export default {
]);
break;
case 2:
self.$set(self.rules, "checkList", [
self.$set(self.rules, "options", [
{
required: true,
message: "选项不能为空",
......@@ -714,7 +533,7 @@ export default {
/** 查询题库主列表 */
getList() {
this.loading = true;
listQuestionBank(this.queryParams).then((response) => {
listErrorList(this.queryParams).then((response) => {
this.questionBankList = response.rows;
this.total = response.total;
this.loading = false;
......@@ -746,14 +565,14 @@ export default {
updateTime: undefined,
createBy: undefined,
updateBy: undefined,
checkList: [],
options: [],
explain: false,
};
this.resetForm("form");
},
clickAddCheckList() {
if (this.form.checkList && !this.form.checkList.length) {
this.form.checkList.unshift({
clickAddoptions() {
if (this.form.options && !this.form.options.length) {
this.form.options.unshift({
html: "",
});
}
......@@ -762,7 +581,7 @@ export default {
let self = this,
isKong = false;
if (index < 25) {
self.form.checkList.forEach((item, ik) => {
self.form.options.forEach((item, ik) => {
if (self.IsEmptyStr(self.getWangEditorText(item.html + "") + "")) {
isKong = true;
}
......@@ -770,7 +589,7 @@ export default {
if (isKong) {
self.$message.warning("请填写选项内容");
} else {
self.form.checkList.push({
self.form.options.push({
html: "",
});
}
......@@ -787,9 +606,9 @@ export default {
type: "warning",
})
.then(() => {
self.$delete(this.form.checkList, index);
self.$delete(this.form.options, index);
})
.catch(() => {});
.catch(() => { });
},
// 判断字符串是否为空
IsEmptyStr(str) {
......@@ -834,7 +653,7 @@ export default {
this.loading = true;
this.reset();
const id = row.id || this.ids;
getQuestionBank(id).then((response) => {
getErrorList(id).then((response) => {
this.loading = false;
this.form = response.data;
this.open = true;
......@@ -865,8 +684,8 @@ export default {
let self = this,
isKong = false;
self.isEditor("topic");
if (self.form.checkList && self.form.checkList.length) {
self.form.checkList.forEach((item, ik) => {
if (self.form.options && self.form.options.length) {
self.form.options.forEach((item, ik) => {
console.log(item.html);
if (self.IsEmptyStr(self.getWangEditorText(item.html + "") + "")) {
isKong = true;
......@@ -874,7 +693,7 @@ export default {
});
if (isKong) {
self.$message.warning("请填写选项内容");
self.$refs.form.validateField("checkList");
self.$refs.form.validateField("options");
}
}
if (self.form.explain) {
......@@ -922,7 +741,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {})
.catch(() => { })
.finally(() => {
this.loading = false;
});
......@@ -937,6 +756,13 @@ export default {
`questionBank_${new Date().getTime()}.xlsx`
);
},
//题库类别
questionType() {
questionType({ pageSize: 9999, pageNum: 1 }).then((res) => {
this.category = res.rows
// console.log(res,'this.questionBankList======')
})
},
},
};
</script>
......@@ -948,16 +774,19 @@ export default {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
&-item {
padding: 15px 20px;
width: calc(33% - 40px);
border-radius: 5px;
background-color: #f1efef;
margin-bottom: 20px;
&-title {
font-size: 18px;
margin-bottom: 10px;
}
&-html {
font-size: 16px;
margin-bottom: 20px;
......@@ -965,37 +794,46 @@ export default {
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3; /* 超出几行省略 */
-webkit-line-clamp: 3;
/* 超出几行省略 */
overflow: hidden;
}
&-footer {
display: flex;
justify-content: right;
button {
background: transparent;
border: none;
}
button::after {
border: none;
}
}
}
&-item:last-child {
margin-bottom: 0px;
}
}
&-form {
height: 60vh;
overflow-x: hidden;
overflow-y: auto;
&-check {
&-add {
font-size: 30px;
color: #409eff;
cursor: pointer;
}
&-item {
margin-bottom: 12px;
&-type {
display: inline-block;
padding: 8px 15px;
......@@ -1005,18 +843,22 @@ export default {
border-radius: 5px;
margin: 0px 12px 15px 0px;
}
&-add,
&-del {
font-size: 25px;
cursor: pointer;
}
&-add {
color: #409eff;
}
&-del {
color: #f56c6c;
}
}
&-item:last-child {
margin-bottom: 0rpx;
}
......
src/views/school-paper/profile/index.vue
......@@ -27,12 +27,10 @@
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['school-paper:profile:add']"
>上传</el-button>
>上传资料</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
......@@ -73,7 +71,7 @@
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<!-- <el-table-column label="主键id" align="center" prop="id" v-if="true"/> -->
<el-table-column label="资料名称" prop="profileName" />
<el-table-column label="上传者" prop="profileUrl" />
<el-table-column label="上传者" prop="createBy" />
<!-- <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="状态：0正常，1删除" align="center" prop="status" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......@@ -111,7 +109,7 @@
<el-input v-model="form.profileName" placeholder="请输入资料名称" />
</el-form-item>
<el-form-item label="上传文件" prop="profileUrl">
<DragUpload v-model="form.file" />
<DragUpload v-model="form.profileUrl" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align: center;">
......@@ -154,28 +152,17 @@ export default {
pageNum: 1,
pageSize: 10,
profileName: undefined,
profileUrl: undefined,
status: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "主键id不能为空", trigger: "blur" }
],
profileName: [
{ required: true, message: "资料名称不能为空", trigger: "blur" }
],
profileUrl: [
{ required: true, message: "资料地址不能为空", trigger: "blur" }
],
remark: [
{ required: true, message: "备注不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态：0正常，1删除不能为空", trigger: "change" }
],
}
};
},
......@@ -200,15 +187,8 @@ export default {
// 表单重置
reset() {
this.form = {
id: undefined,
profileName: undefined,
profileUrl: undefined,
remark: undefined,
status: undefined,
createTime: undefined,
createBy: undefined,
updateTime: undefined,
updateBy: undefined
};
this.resetForm("form");
},
......@@ -234,17 +214,10 @@ export default {
this.open = true;
this.title = "添加资料";
},
/** 修改按钮操作 */
/** 下载操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const id = row.id || this.ids
getProfile(id).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改资料";
});
this.download('system/user/importTemplateNew', {
}, `user_template_${new Date().getTime()}.xlsx`)
},
/** 提交按钮 */
submitForm() {
......
vue.config.js
......@@ -36,7 +36,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://farming.nyinhong.com/api`,
// target: `http://192.168.0.195:8111/`,
// target: `http://192.168.0.169:8111/`,
// target: `http://192.168.0.165:8111/`,
changeOrigin: true,
pathRewrite: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment