Skip to content

S
school-paper-admin-front
Commit 81769c0d by H.wb.wang.peixun
Options

页面修改

parent dd10418a
Showing with 1592 additions and 388 deletions
src/api/school-paper/banner.js 0 → 100644
import request from '@/utils/request'
// 查询轮播图列表
export function listBanner(query) {
return request({
url: '/school-paper/banner/list',
method: 'get',
params: query
})
}
// 查询轮播图详细
export function getBanner(id) {
return request({
url: '/school-paper/banner/' + id,
method: 'get'
})
}
// 新增轮播图
export function addBanner(data) {
return request({
url: '/school-paper/banner',
method: 'post',
data: data
})
}
// 修改轮播图
export function updateBanner(data) {
return request({
url: '/school-paper/banner',
method: 'put',
data: data
})
}
// 删除轮播图
export function delBanner(id) {
return request({
url: '/school-paper/banner/' + id,
method: 'delete'
})
}
src/views/school-paper/banner/index.vue 0 → 100644
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="标题" prop="bannerTitle">
<el-input
v-model="queryParams.bannerTitle"
placeholder="请输入标题"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="图片地址" prop="url">
<el-input
v-model="queryParams.url"
placeholder="请输入图片地址"
clearable
@keyup.enter.native="handleQuery"
/>
</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-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['school-paper:banner:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['school-paper:banner:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['school-paper:banner:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['school-paper:banner:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="bannerList" @selection-change="handleSelectionChange">
<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="标题" align="center" prop="bannerTitle" />
<el-table-column label="图片地址" align="center" prop="url" />
<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">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['school-paper:banner:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['school-paper:banner:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改轮播图对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标题" prop="bannerTitle">
<el-input v-model="form.bannerTitle" placeholder="请输入标题" />
</el-form-item>
<el-form-item label="图片地址" prop="url">
<el-input v-model="form.url" placeholder="请输入图片地址" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listBanner, getBanner, delBanner, addBanner, updateBanner } from "@/api/school-paper/banner";
export default {
name: "Banner",
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 轮播图表格数据
bannerList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
bannerTitle: undefined,
url: undefined,
status: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "主键id不能为空", trigger: "blur" }
],
bannerTitle: [
{ required: true, message: "标题不能为空", trigger: "blur" }
],
url: [
{ required: true, message: "图片地址不能为空", trigger: "blur" }
],
remark: [
{ required: true, message: "备注不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态：0正常，1删除不能为空", trigger: "change" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询轮播图列表 */
getList() {
this.loading = true;
listBanner(this.queryParams).then(response => {
this.bannerList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: undefined,
bannerTitle: undefined,
url: undefined,
remark: undefined,
status: undefined,
createTime: undefined,
createBy: undefined,
updateTime: undefined,
updateBy: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加轮播图";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const id = row.id || this.ids
getBanner(id).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改轮播图";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.id != null) {
updateBanner(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addBanner(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除轮播图编号为"' + ids + '"的数据项？').then(() => {
this.loading = true;
return delBanner(ids);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('school-paper/banner/export', {
...this.queryParams
}, `banner_${new Date().getTime()}.xlsx`)
}
}
};
</script>
src/views/school-paper/errorList/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form
<el-form-item label="用户id" prop="userId"> :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-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 [
{ label: '全部', value: '' },
{ label: '填空', value: '1' },
{ label: '选择', value: '2' },
{ label: '解答', value: '3' },
]"
: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 [
{ label: '全部', value: '' },
{ label: '典例精讲', value: '1' },
]"
: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 [
{ label: '全部', value: '' },
{ label: '基础', value: '1' },
{ label: '中等', value: '2' },
{ label: '提高', value: '3' },
]"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="题目" prop="topic">
<el-input <el-input
v-model="queryParams.userId" v-model="queryParams.topic"
placeholder="请输入用户id" placeholder="请输入题目"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->
<el-form-item label="试卷id" prop="paperId"> <!-- <el-form-item label="正确答案" prop="rightAnswers">
<el-input <el-input
v-model="queryParams.paperId" v-model="queryParams.rightAnswers"
placeholder="请输入试卷id" placeholder="请输入正确答案"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->
<el-form-item label="题目id" prop="questionBankId"> <!-- <el-form-item label="正确答案图片" prop="rightAnswersPic">
<el-input <el-input
v-model="queryParams.questionBankId" v-model="queryParams.rightAnswersPic"
placeholder="请输入题目id" placeholder="请输入正确答案图片"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->
<!-- <el-form-item label="解答过程" prop="resolveCourse">
<el-input
v-model="queryParams.resolveCourse"
placeholder="请输入解答过程"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="解答视频" prop="resolveVideo">
<el-input
v-model="queryParams.resolveVideo"
placeholder="请输入解答视频"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['school-paper:errorList:add']" v-hasPermi="['school-paper:questionBank:add']"
>新增</el-button> >新增题目</el-button
</el-col> >
<el-col :span="1.5"> </el-col> -->
<!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
plain plain
...@@ -50,10 +168,11 @@ ...@@ -50,10 +168,11 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['school-paper:errorList:edit']" v-hasPermi="['school-paper:questionBank:edit']"
>修改</el-button> >修改</el-button
</el-col> >
<el-col :span="1.5"> </el-col> -->
<!-- <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
plain plain
...@@ -61,87 +180,339 @@ ...@@ -61,87 +180,339 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['school-paper:errorList:remove']" v-hasPermi="['school-paper:questionBank:remove']"
>删除</el-button> >删除</el-button
</el-col> >
<el-col :span="1.5"> </el-col> -->
<!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['school-paper:errorList:export']" v-hasPermi="['school-paper:questionBank:export']"
>导出</el-button> >导出</el-button
</el-col> >
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="errorListList" @selection-change="handleSelectionChange"> <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-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-footer">
<el-button icon="el-icon-edit-outline">编辑</el-button>
<el-button icon="el-icon-delete">删除</el-button>
</div>
</div>
</div>
<!-- <el-table
v-loading="loading"
:data="questionBankList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <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="主键id" align="center" prop="id" v-if="true" />
<el-table-column label="用户id" align="center" prop="userId" /> <el-table-column label="类别id" align="center" prop="categoryId" />
<el-table-column label="试卷id" align="center" prop="paperId" /> <el-table-column
<el-table-column label="题目id" align="center" prop="questionBankId" /> label="习题种类：1填空，2选择，3解答"
align="center"
prop="species"
/>
<el-table-column label="阶段id" align="center" prop="phaseId" />
<el-table-column label="类型：1典例精讲" align="center" prop="type" />
<el-table-column
label="强度：1基础，2中等，3提高"
align="center"
prop="intensity"
/>
<el-table-column label="题目" align="center" prop="topic" />
<el-table-column label="正确答案" align="center" prop="rightAnswers" />
<el-table-column
label="正确答案图片"
align="center"
prop="rightAnswersPic"
/>
<el-table-column label="解答过程" align="center" prop="resolveCourse" />
<el-table-column label="解答视频" align="center" prop="resolveVideo" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="状态：0正常，1删除" align="center" prop="status" /> <el-table-column
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> label="状态：0正常，1删除"
align="center"
prop="status"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['school-paper:errorList:edit']" v-hasPermi="['school-paper:questionBank:edit']"
>修改</el-button> >修改</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['school-paper:errorList:remove']" v-hasPermi="['school-paper:questionBank:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table> -->
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改错题集对话框 --> <!-- 添加或修改题库主对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <template v-if="open">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-dialog
<el-form-item label="用户id" prop="userId"> :title="title"
<el-input v-model="form.userId" placeholder="请输入用户id" /> :visible.sync="open"
</el-form-item> width="70%"
<el-form-item label="试卷id" prop="paperId"> append-to-body
<el-input v-model="form.paperId" placeholder="请输入试卷id" /> destroy-on-close
</el-form-item> >
<el-form-item label="题目id" prop="questionBankId"> <el-form
<el-input v-model="form.questionBankId" placeholder="请输入题目id" /> ref="form"
</el-form-item> :model="form"
<el-form-item label="备注" prop="remark"> :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-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 [
{ label: '高一', value: '1' },
{ label: '高二', value: '2' },
{ label: '高三', value: '3' },
]"
: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 [
{ label: '基础', value: '1' },
{ label: '中等', value: '2' },
{ label: '提高', value: '3' },
]"
: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 [
{ label: '填空', value: '1' },
{ label: '选择', value: '2' },
{ label: '解答', value: '3' },
]"
: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']"
/>
</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']"
/>
</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">
<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"
>
<span class="app-container-form-check-item-type">{{
index | filterType(form.checkList)
}}</span
><i
v-if="index + 1 === form.checkList.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']"
/>
</div>
</div>
</el-form-item>
<el-form-item
label="标准答案"
prop="rightAnswers"
v-if="form.checkList && form.checkList.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-group>
</el-form-item>
</template>
<el-form-item label="典例精讲" prop="explain">
<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']"
/>
</el-form-item>
<el-form-item label="解答视频" prop="resolveVideo">
<fileUpload
v-model="form.resolveVideo"
:limit="1"
:fileSize="1024"
:fileType="['mp4', 'mp3']"
/>
</el-form-item>
</template>
</el-col>
</el-row>
<!-- <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <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 @click="cancel">取 消</el-button> >确 定</el-button
</div> >
</el-dialog> <el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</template>
</div> </div>
</template> </template>
<script> <script>
import { listErrorList, getErrorList, delErrorList, addErrorList, updateErrorList } from "@/api/school-paper/errorList"; import {
listQuestionBank,
getQuestionBank,
delQuestionBank,
addQuestionBank,
updateQuestionBank,
} from "@/api/school-paper/questionBank";
export default { export default {
name: "ErrorList", name: "QuestionBank",
data() { data() {
return { return {
// 按钮loading // 按钮loading
...@@ -158,8 +529,8 @@ export default { ...@@ -158,8 +529,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 错题集表格数据 // 题库主表格数据
errorListList: [], questionBankList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
...@@ -168,45 +539,183 @@ export default { ...@@ -168,45 +539,183 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
userId: undefined, categoryId: undefined,
paperId: undefined, species: undefined,
questionBankId: undefined, phaseId: undefined,
type: undefined,
intensity: undefined,
topic: undefined,
rightAnswers: undefined,
rightAnswersPic: undefined,
resolveCourse: undefined,
resolveVideo: undefined,
status: undefined, status: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {},
id: [
{ required: true, message: "主键id不能为空", trigger: "blur" }
],
userId: [
{ required: true, message: "用户id不能为空", trigger: "blur" }
],
paperId: [
{ required: true, message: "试卷id不能为空", trigger: "blur" }
],
questionBankId: [
{ required: true, message: "题目id不能为空", trigger: "blur" }
],
remark: [
{ required: true, message: "备注不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态：0正常，1删除不能为空", trigger: "change" }
],
}
}; };
}, },
filters: {
filterType(val, list) {
if (val >= 0) {
let arr = [
"A",
"B",
"C",
"D",
"E",
"F",
"G",
"H",
"I",
"J",
"K",
"L",
"M",
"N",
"O",
"P",
"Q",
"R",
"S",
"T",
"U",
"V",
"W",
"X",
"Y",
"Z",
];
return arr[val];
} else {
return val;
}
},
},
created() { created() {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询错题集列表 */ changeExplain(e) {
let self = this;
if (e) {
self.$refs.form.clearValidate();
self.initleRules();
self.isExplan(e);
self.isSpec(self.form.species);
}
},
isExplan(val) {
let self = this;
if (val) {
self.$set(self.rules, "resolveCourse", [
{
required: true,
message: "解答过程不能为空",
trigger: ["blur", "change"],
},
]);
self.$set(self.rules, "resolveVideo", [
{
required: true,
message: "解答视频不能为空",
trigger: ["blur", "change"],
},
]);
}
},
changeSpecies(e) {
let self = this;
self.$refs.form.clearValidate();
self.initleRules();
self.isSpec(e);
self.isExplan(self.form.explain);
},
isSpec(val) {
let self = this;
switch (parseInt(val)) {
case 1:
self.$set(self.rules, "answer", [
{
required: true,
message: "答案不能为空",
trigger: ["blur", "change"],
},
]);
self.$set(self.rules, "rightAnswersPic", [
{
required: true,
message: "答案图片不能为空",
trigger: ["blur", "change"],
},
]);
break;
case 2:
self.$set(self.rules, "checkList", [
{
required: true,
message: "选项不能为空",
trigger: ["blur", "change"],
},
]);
self.$set(self.rules, "rightAnswers", [
{
required: true,
message: "标准答案不能为空",
trigger: ["blur", "change"],
},
]);
break;
case 3:
self.$set(self.rules, "answer", [
{
required: true,
message: "答案不能为空",
trigger: ["blur", "change"],
},
]);
self.$set(self.rules, "rightAnswersPic", [
{
required: true,
message: "答案图片不能为空",
trigger: ["blur", "change"],
},
]);
break;
}
},
initleRules() {
this.rules = {
categoryId: [
{ required: true, message: "题库类别不能为空", trigger: "change" },
],
species: [
{
required: true,
message: "习题种类不能为空",
trigger: "change",
},
],
phaseId: [
{ required: true, message: "年级阶段不能为空", trigger: "change" },
],
intensity: [
{
required: true,
message: "强度分类不能为空",
trigger: "change",
},
],
topic: [{ required: true, message: "题目不能为空", trigger: "change" }],
};
},
/** 查询题库主列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listErrorList(this.queryParams).then(response => { listQuestionBank(this.queryParams).then((response) => {
this.errorListList = response.rows; this.questionBankList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
...@@ -220,18 +729,83 @@ export default { ...@@ -220,18 +729,83 @@ export default {
reset() { reset() {
this.form = { this.form = {
id: undefined, id: undefined,
userId: undefined, answer: undefined,
paperId: undefined, categoryId: undefined,
questionBankId: undefined, species: undefined,
phaseId: undefined,
type: undefined,
intensity: undefined,
topic: undefined,
rightAnswers: undefined,
rightAnswersPic: undefined,
resolveCourse: undefined,
resolveVideo: undefined,
remark: undefined, remark: undefined,
status: undefined, status: undefined,
createTime: undefined, createTime: undefined,
createBy: undefined,
updateTime: undefined, updateTime: undefined,
updateBy: undefined createBy: undefined,
updateBy: undefined,
checkList: [],
explain: false,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
clickAddCheckList() {
if (this.form.checkList && !this.form.checkList.length) {
this.form.checkList.unshift({
html: "",
});
}
},
clickCheckItemAdd(index) {
let self = this,
isKong = false;
if (index < 25) {
self.form.checkList.forEach((item, ik) => {
if (self.IsEmptyStr(self.getWangEditorText(item.html + "") + "")) {
isKong = true;
}
});
if (isKong) {
self.$message.warning("请填写选项内容");
} else {
self.form.checkList.push({
html: "",
});
}
} else {
self.$message.warning("最多26个选项");
}
},
clickCheckItemDel(index) {
let self = this;
self
.$confirm("确定删除此项吗?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
self.$delete(this.form.checkList, index);
})
.catch(() => {});
},
// 判断字符串是否为空
IsEmptyStr(str) {
str = str.toString();
if (
str == null ||
str == "null" ||
str == undefined ||
str == "undefined" ||
str.match(/^[\s]*$/)
) {
return true;
} else {
return false;
}
},
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
...@@ -244,49 +818,92 @@ export default { ...@@ -244,49 +818,92 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map((item) => item.id);
this.single = selection.length!==1 this.single = selection.length !== 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加错题集"; this.title = "添加题库主";
this.initleRules();
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.loading = true; this.loading = true;
this.reset(); this.reset();
const id = row.id || this.ids const id = row.id || this.ids;
getErrorList(id).then(response => { getQuestionBank(id).then((response) => {
this.loading = false; this.loading = false;
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改错题集"; this.title = "修改题库主";
}); });
}, },
getWangEditorText(str) {
console.log(str, "========str");
if (str) {
return str
.replace(/<[^<p>]+>/g, "") // 将所有<p>标签 replace ''
.replace(/<[</p>$]+>/g, "") // 将所有</p>标签 replace ''
.replace(/&nbsp;/gi, "") // 将所有 空格 replace ''
.replace(/<[^<br/>]+>/g, ""); // 将所有 换行符 replace ''
} else {
return "";
}
},
isEditor(itemName) {
let self = this;
if (self.IsEmptyStr(self.getWangEditorText(self.form[itemName]) + "")) {
self.$set(self.form, itemName, undefined);
self.$refs.form.validateField(itemName);
}
},
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { let self = this,
isKong = false;
self.isEditor("topic");
if (self.form.checkList && self.form.checkList.length) {
self.form.checkList.forEach((item, ik) => {
console.log(item.html);
if (self.IsEmptyStr(self.getWangEditorText(item.html + "") + "")) {
isKong = true;
}
});
if (isKong) {
self.$message.warning("请填写选项内容");
self.$refs.form.validateField("checkList");
}
}
if (self.form.explain) {
self.isEditor("resolveCourse");
}
this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
console.log("规则通过");
this.buttonLoading = true; this.buttonLoading = true;
if (this.form.id != null) { if (this.form.id != null) {
updateErrorList(this.form).then(response => { updateQuestionBank(this.form)
this.$modal.msgSuccess("修改成功"); .then((response) => {
this.open = false; this.$modal.msgSuccess("修改成功");
this.getList(); this.open = false;
}).finally(() => { this.getList();
this.buttonLoading = false; })
}); .finally(() => {
this.buttonLoading = false;
});
} else { } else {
addErrorList(this.form).then(response => { addQuestionBank(this.form)
this.$modal.msgSuccess("新增成功"); .then((response) => {
this.open = false; this.$modal.msgSuccess("新增成功");
this.getList(); this.open = false;
}).finally(() => { this.getList();
this.buttonLoading = false; })
}); .finally(() => {
this.buttonLoading = false;
});
} }
} }
}); });
...@@ -294,24 +911,116 @@ export default { ...@@ -294,24 +911,116 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除错题集编号为"' + ids + '"的数据项？').then(() => { this.$modal
this.loading = true; .confirm('是否确认删除题库主编号为"' + ids + '"的数据项？')
return delErrorList(ids); .then(() => {
}).then(() => { this.loading = true;
this.loading = false; return delQuestionBank(ids);
this.getList(); })
this.$modal.msgSuccess("删除成功"); .then(() => {
}).catch(() => { this.loading = false;
}).finally(() => { this.getList();
this.loading = false; this.$modal.msgSuccess("删除成功");
}); })
.catch(() => {})
.finally(() => {
this.loading = false;
});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('school-paper/errorList/export', { this.download(
...this.queryParams "school-paper/questionBank/export",
}, `errorList_${new Date().getTime()}.xlsx`) {
} ...this.queryParams,
} },
`questionBank_${new Date().getTime()}.xlsx`
);
},
},
}; };
</script> </script>
<style lang="scss" scoped>
.app-container {
&-list {
padding: 20px 40px;
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;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-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;
border: 1px solid #eeecec;
font-size: 16px;
line-height: 16px;
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;
}
}
}
}
</style>
src/views/school-paper/testPaper/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="试卷名称" prop="testName"> <el-form-item label="审批阅卷" prop="testName">
<el-input <el-input v-model="queryParams.testName" placeholder="请输入试卷名称搜索" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.testName"
placeholder="请输入试卷名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="类别id" prop="categoryId"> <el-form-item label="阶段" prop="categoryId">
<el-input <el-select v-model="value" placeholder="请选择">
v-model="queryParams.categoryId" <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
placeholder="请输入类别id" </el-option>
clearable </el-select>
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="阶段id" prop="phaseId"> <!-- <el-form-item label="阶段id" prop="phaseId">
<el-input <el-input
v-model="queryParams.phaseId" v-model="queryParams.phaseId"
placeholder="请输入阶段id" placeholder="请输入阶段id"
...@@ -40,24 +33,17 @@ ...@@ -40,24 +33,17 @@
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['school-paper:testPaper:add']">随机组卷</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['school-paper:testPaper:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
...@@ -91,45 +77,27 @@ ...@@ -91,45 +77,27 @@
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row> -->
<el-table v-loading="loading" :data="testPaperList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="testPaperList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <!-- <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="主键id" align="center" prop="id" v-if="true" /> -->
<el-table-column label="试卷名称" align="center" prop="testName" /> <el-table-column label="试卷名称" prop="testName" />
<el-table-column label="类别id" align="center" prop="categoryId" /> <!-- <el-table-column label="类别id" align="center" prop="categoryId" /> -->
<el-table-column label="阶段id" align="center" prop="phaseId" /> <el-table-column label="阶段" prop="phaseId" />
<el-table-column label="班级id" align="center" prop="classId" /> <!-- <el-table-column label="班级id" align="center" prop="classId" />
<el-table-column label="总分：100，150" align="center" prop="totalPoints" /> <el-table-column label="总分：100，150" align="center" prop="totalPoints" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="状态：0正常，1删除" align="center" prop="status" /> <el-table-column label="状态：0正常，1删除" align="center" prop="status" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button type="primary" size="medium " @click="handleQuery">查看试题</el-button>
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['school-paper:testPaper:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['school-paper:testPaper:remove']"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
v-show="total>0" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改试卷对话框 --> <!-- 添加或修改试卷对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
...@@ -137,25 +105,62 @@ ...@@ -137,25 +105,62 @@
<el-form-item label="试卷名称" prop="testName"> <el-form-item label="试卷名称" prop="testName">
<el-input v-model="form.testName" placeholder="请输入试卷名称" /> <el-input v-model="form.testName" placeholder="请输入试卷名称" />
</el-form-item> </el-form-item>
<el-form-item label="类别id" prop="categoryId"> <el-form-item label="试卷类型" prop="categoryId">
<el-input v-model="form.categoryId" placeholder="请输入类别id" /> <el-select v-model="value" placeholder="请选择试卷类型">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="阶段id" prop="phaseId"> <el-form-item label="阶段" prop="phaseId">
<el-input v-model="form.phaseId" placeholder="请输入阶段id" /> <el-select v-model="value" placeholder="请选择阶段">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="班级id" prop="classId"> <el-form-item label="班级" prop="classId">
<el-input v-model="form.classId" placeholder="请输入班级id" /> <el-select v-model="value" placeholder="请选择班级">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="总分：100，150" prop="totalPoints"> </el-form>
<el-input v-model="form.totalPoints" placeholder="请输入总分：100，150" /> <div class="mark">
<div @click="clickMark(1)" :class="markSiz == 1 ? 'markCol' : ''">
100分
</div>
<div @click="clickMark(2)" :class="markSiz == 2 ? 'markCol' : ''">
150分
</div>
</div>
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button @click="cancel">取 消</el-button>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">生 成</el-button>
</div>
</el-dialog>
<!-- 详情对话框 -->
<el-dialog :title="title" :visible.sync="opens" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="题目" prop="userId">
<editor v-model="form.optionContent" :min-height="192" :iconType="['image']" />
</el-form-item>
<el-form-item label="答案" prop="testPaperId">
<el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea">
</el-input>
</el-form-item>
<el-form-item label="标准答案" prop="rightAnswers">
<el-radio-group v-model="rightAnswers">
<el-radio :label="index" v-for="(item, index) in checkList" :key="index">{{ index | filterType(checkList)
}}</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="图片" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
</el-image>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer" style="text-align: left;">
<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> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -168,6 +173,8 @@ export default { ...@@ -168,6 +173,8 @@ export default {
name: "TestPaper", name: "TestPaper",
data() { data() {
return { return {
markSiz: 0,
value: '',
// 按钮loading // 按钮loading
buttonLoading: false, buttonLoading: false,
// 遮罩层 // 遮罩层
...@@ -188,6 +195,7 @@ export default { ...@@ -188,6 +195,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
opens: true,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -227,13 +235,59 @@ export default { ...@@ -227,13 +235,59 @@ export default {
status: [ status: [
{ required: true, message: "状态：0正常，1删除不能为空", trigger: "change" } { required: true, message: "状态：0正常，1删除不能为空", trigger: "change" }
], ],
} },
checkList: [{
html: "",
}],
}; };
}, },
filters: {
filterType(val, list) {
if (val >= 0) {
let arr = [
"A",
"B",
"C",
"D",
"E",
"F",
"G",
"H",
"I",
"J",
"K",
"L",
"M",
"N",
"O",
"P",
"Q",
"R",
"S",
"T",
"U",
"V",
"W",
"X",
"Y",
"Z",
];
return arr[val];
} else {
return val;
}
},
},
created() { created() {
this.getList(); this.getList();
}, },
methods: { methods: {
clickMark(val) {
// if(val == 1){
this.markSiz = val
// }
},
/** 查询试卷列表 */ /** 查询试卷列表 */
getList() { getList() {
this.loading = true; this.loading = true;
...@@ -279,7 +333,7 @@ export default { ...@@ -279,7 +333,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
...@@ -349,3 +403,29 @@ export default { ...@@ -349,3 +403,29 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss">
.mark {
display: flex;
justify-content: space-around;
>div {
width: 200px;
height: 200px;
background-color: #fff;
text-align: center;
line-height: 200px;
font-size: 28px;
font-weight: 500;
color: #000;
}
}
.markCol {
color: blue !important;
border: 1px solid blue;
}
::v-deep .el-dialog {
background-color: #F7F8F9;
}
</style>
src/views/school-paper/testPaperRecord/index.vue
...@@ -2,22 +2,13 @@ ...@@ -2,22 +2,13 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="审批阅卷" prop="userId"> <el-form-item label="审批阅卷" prop="userId">
<el-input <el-input v-model="queryParams.userId" placeholder="请输入试卷名称搜索" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.userId"
placeholder="请输入试卷名称搜索"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="阶段" prop="testPaperId"> <el-form-item label="阶段" prop="testPaperId">
<el-select v-model="value" placeholder="请选择阶段"> <el-select v-model="value" placeholder="请选择阶段">
<el-option <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
v-for="item in options" </el-option>
:key="item.value" </el-select>
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
...@@ -71,7 +62,8 @@ ...@@ -71,7 +62,8 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> --> </el-row> -->
<el-table v-if="typePaper == 1" v-loading="loading" :data="testPaperRecordList" @selection-change="handleSelectionChange"> <el-table v-if="typePaper == 1" v-loading="loading" :data="testPaperRecordList"
@selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> <!-- <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="主键id" align="center" prop="id" v-if="true"/> -->
<el-table-column label="试卷名称" align="center" prop="userId" /> <el-table-column label="试卷名称" align="center" prop="userId" />
...@@ -81,7 +73,7 @@ ...@@ -81,7 +73,7 @@
<el-table-column label="备注" align="center" prop="remark" /> --> <el-table-column label="备注" align="center" prop="remark" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="medium" @click="examination(1)">批卷</el-button> <el-button type="primary" size="medium" @click="examination(1)">批卷</el-button>
<!-- <el-button <!-- <el-button
size="mini" size="mini"
...@@ -93,7 +85,8 @@ ...@@ -93,7 +85,8 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table v-if="typePaper == 2" v-loading="loading" :data="testPaperRecordList" @selection-change="handleSelectionChange"> <el-table v-if="typePaper == 2" v-loading="loading" :data="testPaperRecordList"
@selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> <!-- <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="主键id" align="center" prop="id" v-if="true"/> -->
<el-table-column label="同学名称" align="center" prop="userId" /> <el-table-column label="同学名称" align="center" prop="userId" />
...@@ -103,39 +96,38 @@ ...@@ -103,39 +96,38 @@
<el-table-column label="备注" align="center" prop="remark" /> --> <el-table-column label="备注" align="center" prop="remark" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="medium" @click="examination(2)">批卷</el-button> <el-button type="primary" size="medium" @click="examination(2)">批卷</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
v-show="total>0" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改答题记录对话框 --> <!-- 添加或修改答题记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="用户id" prop="userId"> <el-form-item label="题目" prop="userId">
<editor v-model="form.optionContent" :min-height="192"/> <editor v-model="form.optionContent" :min-height="192" :iconType="['image']" />
</el-form-item>
<el-form-item label="答案" prop="testPaperId">
<el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea">
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="试卷id" prop="testPaperId"> <el-form-item label="图片" prop="remark">
<el-input v-model="form.testPaperId" placeholder="请输入试卷id" /> <el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
</el-image>
</el-form-item> </el-form-item>
<el-form-item label="总得分" prop="totalPoints"> <el-form-item label="分数" prop="totalPoints">
<el-input v-model="form.totalPoints" placeholder="请输入总得分" /> <el-input v-model="form.totalPoints" placeholder="请输入总得分" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="优秀答案" prop="totalPoints">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-switch v-model="value" active-color="#13ce66" inactive-color="#ff4949">
</el-switch>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer" style="text-align: left;">
<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> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -148,24 +140,29 @@ export default { ...@@ -148,24 +140,29 @@ export default {
name: "TestPaperRecord", name: "TestPaperRecord",
data() { data() {
return { return {
value:'', url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
typePaper:1, srcList: [
'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
],
value: '',
typePaper: 1,
options: [{ options: [{
value: '选项1', value: '选项1',
label: '黄金糕' label: '黄金糕'
}, { }, {
value: '选项2', value: '选项2',
label: '双皮奶' label: '双皮奶'
}, { }, {
value: '选项3', value: '选项3',
label: '蚵仔煎' label: '蚵仔煎'
}, { }, {
value: '选项4', value: '选项4',
label: '龙须面' label: '龙须面'
}, { }, {
value: '选项5', value: '选项5',
label: '北京烤鸭' label: '北京烤鸭'
}], }],
// 按钮loading // 按钮loading
buttonLoading: false, buttonLoading: false,
// 遮罩层 // 遮罩层
...@@ -225,13 +222,13 @@ export default { ...@@ -225,13 +222,13 @@ export default {
}, },
methods: { methods: {
// 批卷 // 批卷
examination(val){ examination(val) {
if(val == 1){ if (val == 1) {
this.typePaper = 2 this.typePaper = 2
}else if(val == 2){ } else if (val == 2) {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加答题记录"; this.title = "正在批改 同学1 的（期中模考试卷1套）试卷";
} }
}, },
/** 查询答题记录列表 */ /** 查询答题记录列表 */
...@@ -277,7 +274,7 @@ export default { ...@@ -277,7 +274,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
......
src/views/system/user/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-row :gutter="20"> <el-row :gutter="20">
<!--部门数据--> <!--部门数据-->
<el-col :span="4" :xs="24"> <!-- <el-col :span="4" :xs="24">
<div class="head-container"> <div class="head-container">
<el-input <el-input
v-model="deptName" v-model="deptName"
...@@ -26,20 +26,15 @@ ...@@ -26,20 +26,15 @@
@node-click="handleNodeClick" @node-click="handleNodeClick"
/> />
</div> </div>
</el-col> </el-col> -->
<!--用户数据--> <!--用户数据-->
<el-col :span="20" :xs="24"> <el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户名称" prop="userName"> <el-form-item label="用户名称" prop="userName">
<el-input <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
v-model="queryParams.userName" @keyup.enter.native="handleQuery" />
placeholder="请输入用户名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="手机号码" prop="phonenumber"> <!-- <el-form-item label="手机号码" prop="phonenumber">
<el-input <el-input
v-model="queryParams.phonenumber" v-model="queryParams.phonenumber"
placeholder="请输入手机号码" placeholder="请输入手机号码"
...@@ -48,7 +43,7 @@ ...@@ -48,7 +43,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item>--> </el-form-item>-->
<!-- <el-form-item label="状态" prop="status"> <!-- <el-form-item label="状态" prop="status">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
placeholder="用户状态" placeholder="用户状态"
...@@ -63,7 +58,7 @@ ...@@ -63,7 +58,7 @@
/> />
</el-select> </el-select>
</el-form-item>--> </el-form-item>-->
<!-- <el-form-item label="创建时间"> <!-- <el-form-item label="创建时间">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
style="width: 240px" style="width: 240px"
...@@ -82,16 +77,10 @@ ...@@ -82,16 +77,10 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
type="primary" v-hasPermi="['system:user:add']">新增人员</el-button>
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:user:add']"
>新增人员</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
plain plain
...@@ -102,7 +91,7 @@ ...@@ -102,7 +91,7 @@
v-hasPermi="['system:user:edit']" v-hasPermi="['system:user:edit']"
>修改</el-button> >修改</el-button>
</el-col>--> </el-col>-->
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
plain plain
...@@ -114,16 +103,10 @@ ...@@ -114,16 +103,10 @@
>删除</el-button> >删除</el-button>
</el-col>--> </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
type="info" v-hasPermi="['system:user:import']">导入</el-button>
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
plain plain
...@@ -139,25 +122,24 @@ ...@@ -139,25 +122,24 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> <el-table-column label="编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
<el-table-column label="学号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" /> <el-table-column label="学号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
<el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column label="班级" align="center" key="deptListStr" prop="deptListStr" v-if="columns[3].visible" :show-overflow-tooltip="true" /> <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
<!-- <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />--> :show-overflow-tooltip="true" />
<el-table-column label="班级" align="center" key="deptListStr" prop="deptListStr" v-if="columns[3].visible"
:show-overflow-tooltip="true" />
<!-- <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />-->
<el-table-column label="状态" align="center" key="status" v-if="columns[4].visible"> <el-table-column label="状态" align="center" key="status" v-if="columns[4].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
v-model="scope.row.status" @change="handleStatusChange(scope.row)"></el-switch>
active-value="0"
inactive-value="1"
@change="handleStatusChange(scope.row)"
></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="身份" align="center" key="sex" v-if="columns[5].visible"> <el-table-column label="身份" align="center" key="sex" v-if="columns[5].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-for="dict in dict.type.sys_user_sex" :key="dict.value"> <span v-for="dict in dict.type.sys_user_sex" :key="dict.value">
<span v-if="dict.value==scope.row.sex"> <span v-if="dict.value == scope.row.sex">
{{dict.label}} {{ dict.label }}
</span> </span>
</span> </span>
</template> </template>
...@@ -167,33 +149,19 @@ ...@@ -167,33 +149,19 @@
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<template slot-scope="scope" v-if="scope.row.userId !== 1"> <template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
size="mini" v-hasPermi="['system:user:edit']">修改</el-button>
type="text" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
icon="el-icon-edit" v-hasPermi="['system:user:remove']">删除</el-button>
@click="handleUpdate(scope.row)" <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:user:edit']" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']"
>删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button> <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleResetPwd" icon="el-icon-key" <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item> v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
<!-- <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" <!-- <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>--> v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>-->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
...@@ -201,13 +169,8 @@ ...@@ -201,13 +169,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
v-show="total>0" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col> </el-col>
</el-row> </el-row>
...@@ -222,11 +185,11 @@ ...@@ -222,11 +185,11 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级" prop="deptId"> <el-form-item label="班级" prop="deptId">
<treeselect v-model="form.deptList" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" /> <treeselect ref="refSelect" :multiple="multiple" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row> <!-- <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号码" prop="phonenumber"> <el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" /> <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
...@@ -246,36 +209,29 @@ ...@@ -246,36 +209,29 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password"> <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/> <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份"> <el-form-item label="身份">
<el-select v-model="form.sex" placeholder="请选择身份"> <el-select v-model="form.sex" placeholder="请选择身份" @change="clickChange()">
<el-option <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
v-for="dict in dict.type.sys_user_sex" :value="dict.value"></el-option>
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
v-for="dict in dict.type.sys_normal_disable" }}</el-radio>
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row> <!-- <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="岗位"> <el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择岗位"> <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
...@@ -319,18 +275,9 @@ ...@@ -319,18 +275,9 @@
<!-- 用户导入对话框 --> <!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
ref="upload" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:limit="1" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip"> <div class="el-upload__tip text-center" slot="tip">
...@@ -338,7 +285,8 @@ ...@@ -338,7 +285,8 @@
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
</div> </div>
<span>仅允许导入xls、xlsx格式文件。</span> <span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link> <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
@click="importTemplate">下载模板</el-link>
</div> </div>
</el-upload> </el-upload>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -352,7 +300,8 @@ ...@@ -352,7 +300,8 @@
<script> <script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"; import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect"; // import Treeselect from "@riophae/vue-treeselect";
import Treeselect from "./profile/treeselect.vue"
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
...@@ -361,6 +310,8 @@ export default { ...@@ -361,6 +310,8 @@ export default {
components: { Treeselect }, components: { Treeselect },
data() { data() {
return { return {
// multiple:false, // 班级多选
// props: { multiple: true },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
...@@ -368,7 +319,7 @@ export default { ...@@ -368,7 +319,7 @@ export default {
// 非单个禁用 // 非单个禁用
single: true, single: true,
// 非多个禁用 // 非多个禁用
multiple: true, multiple: false,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
// 总条数 // 总条数
...@@ -392,7 +343,9 @@ export default { ...@@ -392,7 +343,9 @@ export default {
// 角色选项 // 角色选项
roleOptions: [], roleOptions: [],
// 表单参数 // 表单参数
form: {}, form: {
sex: ''
},
defaultProps: { defaultProps: {
children: "children", children: "children",
label: "label" label: "label"
...@@ -475,14 +428,23 @@ export default { ...@@ -475,14 +428,23 @@ export default {
}); });
}, },
methods: { methods: {
clickChange() {
console.log(this.form.sex, 'dict-------')
this.$refs['refSelect'].value = null
if(this.form.sex == 0){
this.multiple = true
}else{
this.multiple = false
}
},
/** 查询用户列表 */ /** 查询用户列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.userList = response.rows; this.userList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
} }
); );
}, },
/** 查询部门下拉树结构 */ /** 查询部门下拉树结构 */
...@@ -504,11 +466,11 @@ export default { ...@@ -504,11 +466,11 @@ export default {
// 用户状态修改 // 用户状态修改
handleStatusChange(row) { handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用"; let text = row.status === "0" ? "启用" : "停用";
this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() { this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function () {
return changeUserStatus(row.userId, row.status); return changeUserStatus(row.userId, row.status);
}).then(() => { }).then(() => {
this.$modal.msgSuccess(text + "成功"); this.$modal.msgSuccess(text + "成功");
}).catch(function() { }).catch(function () {
row.status = row.status === "0" ? "1" : "0"; row.status = row.status === "0" ? "1" : "0";
}); });
}, },
...@@ -532,7 +494,7 @@ export default { ...@@ -532,7 +494,7 @@ export default {
remark: undefined, remark: undefined,
postIds: [], postIds: [],
roleIds: [], roleIds: [],
deptList : '' deptList: ''
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -553,7 +515,7 @@ export default { ...@@ -553,7 +515,7 @@ export default {
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.userId); this.ids = selection.map(item => item.userId);
this.single = selection.length != 1; this.single = selection.length != 1;
this.multiple = !selection.length; // this.multiple = !selection.length;
}, },
// 更多操作触发 // 更多操作触发
handleCommand(command, row) { handleCommand(command, row) {
...@@ -604,18 +566,19 @@ export default { ...@@ -604,18 +566,19 @@ export default {
inputPattern: /^.{5,20}$/, inputPattern: /^.{5,20}$/,
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间" inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
}).then(({ value }) => { }).then(({ value }) => {
resetUserPwd(row.userId, value).then(response => { resetUserPwd(row.userId, value).then(response => {
this.$modal.msgSuccess("修改成功，新密码是：" + value); this.$modal.msgSuccess("修改成功，新密码是：" + value);
}); });
}).catch(() => {}); }).catch(() => { });
}, },
/** 分配角色操作 */ /** 分配角色操作 */
handleAuthRole: function(row) { handleAuthRole: function (row) {
const userId = row.userId; const userId = row.userId;
this.$router.push("/system/user-auth/role/" + userId); this.$router.push("/system/user-auth/role/" + userId);
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function () {
console.log(this.$refs['refSelect'].value, "this.$refs['refSelect'].value")
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.userId != undefined) { if (this.form.userId != undefined) {
...@@ -638,12 +601,12 @@ export default { ...@@ -638,12 +601,12 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const userIds = row.userId || this.ids; const userIds = row.userId || this.ids;
this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
return delUser(userIds); return delUser(userIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => { });
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
......
src/views/system/user/profile/treeselect.vue 0 → 100644
<template>
<!-- <div class="main">
<div class="tree"> -->
<Treeselect
v-model="value"
:options="options"
:placeholder="'请选择人员'"
:multiple="multiple"
@input="treeSelectInput"
@select="treeSelectChange"
@deselect="treeSelectDeselect"
@search-change="treeSelectSearch"
@open="treeSelectOpen"
@close="treeSelectClose"
/>
<!-- </div>
</div> -->
</template>
<script>
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
// import treeData from './data/tree'
export default {
data() {
return {
value: null,
options: []
}
},
props:{
multiple:{
type:false
}
},
components: { Treeselect },
mounted(){
// 延迟模拟请求数据
setTimeout(() => {
// this.options = treeData
// this.value = [ "1682295245318119426", "1682295184152584194"] // 测试回显操作
}, 300)
this.getDeptTree()
},
methods:{
/** 查询部门下拉树结构 */
getDeptTree() {
deptTreeSelect().then(response => {
this.options = response.data;
});
},
// 选中触发（第一次回显的时候会触发，清除值的时候会触发, value值为undefined） input事件用于v-model双向绑定组件更新父组件值
treeSelectInput(value, instanceId) {
console.log(value, 'input事件')
console.log(this.value, 'this.value -- input') // 这个不需要 延迟
},
// 选中触发（清除值的时候不会触发）
treeSelectChange(raw, instanceId) {
console.log(raw, '当前的对象')
setTimeout(() => { // 如果用到this.value 需要setTimeout延迟一下拿到最新的值
console.log(this.value, 'this.value -- select')
})
},
// 移除选项时触发 当设置multiple为true时生效 raw为当前移除的对象
treeSelectDeselect(raw, instanceId) {
console.log(raw, 'deselect-->>')
},
// 搜索
treeSelectSearch(searchQuery, instanceId) {
console.log(searchQuery, '当前搜索的值')
},
// 展开触发
treeSelectOpen(instanceId) {
console.log('展开了')
},
// 关闭触发
treeSelectClose(value, instanceId) {
console.log(value, '当前的value值')
},
// 字段默认 id label 用于规范化数据源
tenantIdnormalizer(node, instanceId) {
if (node.children && !node.children.length) {
delete node.children
}
return {
id: node.id,
label: node.title,
children: node.children
}
}
}
}
</script>
<style scoped>
.main {
width: 100%;
height: 100%;
padding: 60px 0 0 200px;
}
.main .tree {
width: 240px;
height: 40px;
}
::v-deep .vue-treeselect__label {
color: #606266;
}
</style>
\ No newline at end of file
src/views/tool/gen/index.vue
...@@ -278,7 +278,7 @@ export default { ...@@ -278,7 +278,7 @@ export default {
this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath); this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
}); });
} else { } else {
this.$download.zip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi.zip"); this.$download.zip("/localhost/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi.zip");
} }
}, },
/** 同步数据库操作 */ /** 同步数据库操作 */
......
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