Skip to content

S
school-paper-admin-front
Commit d3c16c17 by zhangmengjie
Options

修改

parent acf28595
Showing with 24 additions and 13 deletions
src/views/school-paper/questionBank/index.vue
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
<template v-if="[1, '1', 3, '3'].includes(form.species)"> <template v-if="[1, '1', 3, '3'].includes(form.species)">
<el-form-item label="答案" prop="answer"> <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-input type="textarea" placeholder="请输入内容" v-model="form.answer"> <el-input type="textarea" placeholder="请输入内容" v-model="form.answer">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="答案图片" prop="rightAnswersPic"> <el-form-item label="答案图片" prop="rightAnswersPic">
...@@ -434,7 +434,7 @@ export default { ...@@ -434,7 +434,7 @@ export default {
self.$refs.form.clearValidate(); self.$refs.form.clearValidate();
self.initleRules(); self.initleRules();
self.isExplan(e); self.isExplan(e);
self.isSpec(self.form.species); // self.isSpec(self.form.species);
} }
}, },
isExplan(val) { isExplan(val) {
...@@ -580,7 +580,7 @@ export default { ...@@ -580,7 +580,7 @@ export default {
rightAnswersPic: undefined, rightAnswersPic: undefined,
resolveCourse: undefined, resolveCourse: undefined,
resolveVideo: undefined, resolveVideo: undefined,
resolveVideoName:undefined, resolveVideoName: undefined,
remark: undefined, remark: undefined,
status: undefined, status: undefined,
createTime: undefined, createTime: undefined,
...@@ -710,7 +710,7 @@ export default { ...@@ -710,7 +710,7 @@ export default {
// 判断是否是填空题 // 判断是否是填空题
if (self.form.species == 1 || self.form.species == 3) { if (self.form.species == 1 || self.form.species == 3) {
// self.form.answer = self.form.rightAnswers // self.form.answer = self.form.rightAnswers
self.$set(self.form,'answer',self.form.rightAnswers) self.$set(self.form, 'answer', self.form.rightAnswers)
if (self.form.rightAnswersPic) { if (self.form.rightAnswersPic) {
let arr = self.form.rightAnswersPic.split(','), let arr = self.form.rightAnswersPic.split(','),
brr = []; brr = [];
...@@ -725,7 +725,7 @@ export default { ...@@ -725,7 +725,7 @@ export default {
// 判断是否是解答题 // 判断是否是解答题
if (self.form.species == 3) { if (self.form.species == 3) {
// self.form.answer = self.form.rightAnswers // self.form.answer = self.form.rightAnswers
self.$set(self.form,'answer',self.form.rightAnswers) self.$set(self.form, 'answer', self.form.rightAnswers)
} }
if (this.form.type == 1) { if (this.form.type == 1) {
self.form.type = true self.form.type = true
......
src/views/school-paper/testPaperRecord/index.vue
...@@ -142,8 +142,8 @@ ...@@ -142,8 +142,8 @@
<el-form-item label="答案" prop="answer"> <el-form-item label="答案" prop="answer">
<editor v-model="form.answer" :min-height="192" :iconType="['image']" :readOnly="true" /> <editor v-model="form.answer" :min-height="192" :iconType="['image']" :readOnly="true" />
</el-form-item> </el-form-item>
<el-form-item label="答案图片" prop="correctAnswerPic"> <el-form-item label="答案图片" prop="answerPic">
<imageUpload :limit="9" v-model="form.correctAnswerPic" :disabled="true" /> <imageUpload :limit="9" v-model="form.answerPic" :disabled="true" />
</el-form-item> </el-form-item>
</template> </template>
<template v-if="[2, '2'].includes(form.species)"> <template v-if="[2, '2'].includes(form.species)">
...@@ -418,6 +418,7 @@ export default { ...@@ -418,6 +418,7 @@ export default {
examination(val) { examination(val) {
if (val) { if (val) {
this.classId = val.classId this.classId = val.classId
this.queryParams.pageNum = 1
} }
// this.resetQuery() // this.resetQuery()
// let classId = this.$refs['refSelect'].value // let classId = this.$refs['refSelect'].value
...@@ -519,6 +520,16 @@ export default { ...@@ -519,6 +520,16 @@ export default {
self.$nextTick(() => { self.$nextTick(() => {
self.form = response.rows[0]; self.form = response.rows[0];
self.form.topicScore = Number(self.form.topicScore) self.form.topicScore = Number(self.form.topicScore)
if (self.form.answerPic) {
let arr = self.form.answerPic.split(','),
brr = [];
arr.forEach((item) => {
brr.push({
url: item
})
})
self.form.answerPic = brr
}
if (self.form.good == 1) { if (self.form.good == 1) {
self.form.good = false self.form.good = false
} else if (self.form.good == 0) { } else if (self.form.good == 0) {
......
src/views/system/user/index.vue
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
<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">
<div class="radioClass"> <div class="radioClass">
<el-form-item label="用户名称" prop="userName"> <el-form-item label="用户名称" prop="nickName">
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" <el-input v-model="queryParams.nickName" placeholder="请输入用户名称" clearable style="width: 240px"
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="手机号码" prop="phonenumber"> <!-- <el-form-item label="手机号码" prop="phonenumber">
...@@ -386,7 +386,7 @@ export default { ...@@ -386,7 +386,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
userName: undefined, nickName: undefined,
}, },
// 列信息 // 列信息
columns: [ columns: [
...@@ -453,7 +453,7 @@ export default { ...@@ -453,7 +453,7 @@ export default {
/** 查询用户列表 */ /** 查询用户列表 */
getList() { getList() {
this.loading = true; this.loading = true;
this.$set(this.queryParams,'nickName',this.queryParams.userName) // this.$set(this.queryParams,'nickName',this.queryParams.userName)
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;
......
vue.config.js
...@@ -35,8 +35,8 @@ module.exports = { ...@@ -35,8 +35,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://farming.nyinhong.com`, //打包 prod // target: `http://farming.nyinhong.com`, //打包 prod
// target: `http://farming.nyinhong.com/api/`, //本地测试 target: `http://farming.nyinhong.com/api/`, //本地测试
// target: `http://192.168.0.169:8111/`, // target: `http://192.168.0.169:8111/`,
// target: `http://192.168.0.165:8111/`, // target: `http://192.168.0.165:8111/`,
changeOrigin: true, changeOrigin: true,
......
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