Skip to content

T
tea-resources-web
Commit a2629a32 authored by FangYuePeng's avatar FangYuePeng
Browse files
Options

Merge remote-tracking branch 'origin/1.0' into 1.0

parents a424c7ee ed07b372
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 25 deletions
public/index.html
View file @ a2629a32
......@@ -7,7 +7,7 @@
<link rel="icon" href="<%= BASE_URL %>collapseMenuLogo.png">
<!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">-->
<!-- <title><%= webpackConfig.name %></title>-->
<title>教育资源云平台</title>
<title>教学资源云平台</title>
</head>
<body>
<noscript>
......
src/layout/components/Sidebar/Logo.vue
View file @ a2629a32
......@@ -32,7 +32,7 @@ export default {
data() {
return {
collapseLogo: require('@/assets/image/collapseMenuLogo.png'),
title: '教育资源云平台'
title: '教学资源云平台'
// logo: require('@/assets/image/denglu_logo@2x.png')
}
},
......
src/layoutLogin/components/logo.vue
View file @ a2629a32
......@@ -24,7 +24,7 @@ export default {
},
data() {
return {
title: '教育资源云平台',
title: '教学资源云平台',
logo: 'https://image-1252351428.cos.ap-beijing.myqcloud.com/home_logo.png'
}
},
......
src/settings.js
View file @ a2629a32
module.exports = {
title: '教育资源云平台',
title: '教学资源云平台',
/**
* @type {boolean} true | false
......
src/utils/auth.js
View file @ a2629a32
import Cookies from 'js-cookie'
const TokenKey = 'Admin-Token'
const TokenKey = 'Admin-TokenWeb'
export function getToken() {
return Cookies.get(TokenKey)
......
src/utils/auth/index.js
View file @ a2629a32
const TokenKey = 'token'
const TokenKey = 'tokenWeb'
const emailKey = 'email'
export function getToken() {
......
src/views/contentManagement/banner/index.vue
View file @ a2629a32
......@@ -160,6 +160,7 @@
<el-input v-model.trim="form.bannerName" show-word-limit :maxlength="500" placeholder="请输入banner名字" />
</el-form-item>
<el-form-item label="图片" prop="bannerPicture">
<el-input v-model="form.bannerPicture" style="display: none"></el-input>
<el-upload
class="avatar-uploader"
action="#"
......
src/views/courseInformation/examinationManagement/examinationPaper.vue
View file @ a2629a32
......@@ -215,10 +215,10 @@
<el-form-item label="题目答案" prop="answerList" :rules="[{required: form.questionType===2, message: '请输入答案', trigger: 'blur'}]">
<!-- 四个多选框-->
<el-checkbox-group v-model="form.answerList">
<el-checkbox label="A">A</el-checkbox>
<el-checkbox label="B">B</el-checkbox>
<el-checkbox label="C">C</el-checkbox>
<el-checkbox label="D">D</el-checkbox>
<el-checkbox label="A" />
<el-checkbox label="B" />
<el-checkbox label="C" />
<el-checkbox label="D" />
</el-checkbox-group>
</el-form-item>
</el-col>
......@@ -352,6 +352,7 @@ export default {
},
data() {
return {
fileList: [],
upload: {
// 是否显示弹出层（开课导入）
open: false,
......@@ -497,6 +498,7 @@ export default {
**/
handleQuestionsChange(value) {
console.log('value', value)
this.form.questionType = value
switch (value) {
case 1:
this.form.answer = null
......@@ -752,7 +754,23 @@ export default {
res.data.answer = null
}
// 处理选项内容
this.form = res.data
// this.form = res.data,
this.form.courseId = res.data.courseId,
this.form.questionType = res.data.questionType,
this.form.questionStem = res.data.questionStem,
this.form.difficulty = res.data.difficulty,
this.form.content = res.data.content,
this.form.answer = res.data.answer,
this.form.answerList = res.data.answerList,
this.form.optionA = res.data.optionA,
this.form.optionB = res.data.optionB,
this.form.optionC = res.data.optionC,
this.form.optionD = res.data.optionD,
this.form.mark = res.data.mark,
this.form.flag = res.data.flag,
this.form.remarks = res.data.remarks,
this.form.weight = res.data.weight,
this.form.optionsList = res.data.optionsList,
// this.form.optionA = optionA
// this.form.optionB = optionB
// this.form.optionC = optionC
......
src/views/courseInformation/examinationManagement/index.vue
View file @ a2629a32
......@@ -47,7 +47,8 @@ export default {
// },
created() {
// 接受路由传递的参数
this.courseId = this.$route.query.businessId
// this.courseId = this.$route.query.businessId
this.courseId = this.$route.query.courseId
console.log('this.courseId', this.courseId)
this.id = this.$route.query.courseId
this.name = this.$route.query.name
......
src/views/login/login.vue
View file @ a2629a32
......@@ -7,7 +7,7 @@
<div class="login_form_logo" />
</div>
<div class="loginTitleRow">
<div class="title">教育资源云平台</div>
<div class="title">教学资源云平台</div>
</div>
<div class="login-form-content">
<el-form-item prop="username">
......@@ -196,10 +196,10 @@ export default {
})
},
getCookie() {
const username = Cookies.get('username')
const password = Cookies.get('password')
const type = Cookies.get('type')
const rememberMe = Cookies.get('rememberMe')
const username = Cookies.get('usernameWeb')
const password = Cookies.get('passwordWeb')
const type = Cookies.get('typeWeb')
const rememberMe = Cookies.get('rememberMeWeb')
this.loginForm = {
username: username === undefined ? this.loginForm.username : username,
type: type === undefined ? this.loginForm.type : type,
......@@ -233,15 +233,15 @@ export default {
},
rememberMe() {
if (this.loginForm.rememberMe) {
Cookies.set('username', this.loginForm.username, { expires: 30 })
Cookies.set('type', this.loginForm.type, { expires: 30 })
Cookies.set('password', passwordEncrypt(this.loginForm.password), { expires: 30 })
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
Cookies.set('usernameWeb', this.loginForm.username, { expires: 30 })
Cookies.set('typeWeb', this.loginForm.type, { expires: 30 })
Cookies.set('passwordWeb', passwordEncrypt(this.loginForm.password), { expires: 30 })
Cookies.set('rememberMeWeb', this.loginForm.rememberMe, { expires: 30 })
} else {
Cookies.remove('username')
Cookies.remove('type')
Cookies.remove('password')
Cookies.remove('rememberMe')
Cookies.remove('usernameWeb')
Cookies.remove('typeWeb')
Cookies.remove('passwordWeb')
Cookies.remove('rememberMeWeb')
}
},
successLogin() {
......
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