-
+ ![]()
@@ -69,10 +66,19 @@ Array.prototype.removeByValue = function (val) {
export default {
data() {
return {
- chooseList: []
+ keyword: '',
+ searchTimer: null,
+ chooseList: [],
+ classList: []
};
},
watch: {
+ keyword: function(val) {
+ clearTimeout(this.searchTimer)
+ this.searchTimer = setTimeout(() => {
+ this.fuzzyQuery()
+ },500)
+ },
chooseList(n, o) {
this.$emit('chooseNode', n);
}
@@ -81,14 +87,25 @@ export default {
props: {
data: {
type: Array
- }
+ },
+ allClassList: {
+ type: Array
+ },
},
methods: {
+ fuzzyQuery(){
+ let list = this.allClassList
+ let result = []
+
+ list.map((n,i) => {
+ if(n.label.includes(this.keyword)) result.push(n)
+ })
+ this.classList = result
+ },
//点击节点时伸展或收缩列表
open(item) {
item.ifVisible = !item.ifVisible;
},
-
//选中叶子节点时将选中的叶子节点添加进数组，如果叶子节点存在则删除，removeByvalue函数定义在main.js中
choose(item) {
item.ifVisible = !item.ifVisible;
@@ -102,15 +119,11 @@ export default {
this.$emit('fircheckitem',item);
},
twocheckitem(item){
- console.log(22,item)
this.$emit('twocheckitem',item);
},
threecheckitem(item){
this.$emit('threecheckitem',item);
},
- fourcheckitem(item){
- this.$emit('fourcheckitem',item);
- },
//判断数组中是否包含某个对象
isHasObj(arr, val) {
var flag = 0; //1为有 0为没有
@@ -124,7 +137,7 @@ export default {
} else {
return false;
}
- }
+ },
}
};
diff --git a/src/pages/assessment/monitor/index.vue b/src/pages/assessment/monitor/index.vue
index 52b6712..29b57c9 100644
--- a/src/pages/assessment/monitor/index.vue
+++ b/src/pages/assessment/monitor/index.vue
@@ -39,7 +39,7 @@
+
+
+
+
+
+
+
+ {{item.label}}班
+
+
- 
-
+
{{item2.label}}班
-
-
-
+
{{item2.label}}班
-
-
-
-
- {{item3.label}}
-
- 考试状态
@@ -127,9 +127,9 @@ export default {
'userId','clientId'
]),
...mapState('assessment', [
- 'id','stateList','endTime'
+ 'id','studentStateList','endTime'
]),
- ...mapGetters('assessment', [
+ ...mapGetters('assessment', [
'getTypeName','getStudentStateName'
])
},
diff --git a/src/pages/assessment/review/index.vue b/src/pages/assessment/review/index.vue
index a4d29e7..f7db598 100644
--- a/src/pages/assessment/review/index.vue
+++ b/src/pages/assessment/review/index.vue
@@ -6,10 +6,9 @@
-
+
@@ -45,7 +44,7 @@
- {{transferToMinutes(scope.row.timeSpent)}}
+
@@ -83,7 +82,7 @@ import { mapState,mapGetters,mapActions } from 'vuex'
export default {
data() {
return {
- assessmentId: '',
+ state: '',
reviewStatusList: [
{
id: 0,
@@ -104,6 +103,11 @@ export default {
searchTimer: null,
};
},
+ filters: {
+ transferToMinutes(val){
+ return isNaN(val) ? val : (val / 60).toFixed(2)
+ }
+ },
computed: {
...mapState('user', [
'userId','clientId'
@@ -131,7 +135,7 @@ export default {
'setReviewInfo'
]),
getData() {
- this.$post(`${this.api.reviewList}?pageNum=${this.page}&pageSize=${this.pageSize}&userId=${this.userId}&assessmentId=${this.id}`)
+ this.$post(`${this.api.reviewList}?pageNum=${this.page}&pageSize=${this.pageSize}&userId=${this.userId}&assessmentId=${this.id}&keyword=${this.keyword}&state=${this.state}`)
.then(res => {
this.listData = res.data.list.list
this.total = res.data.list.totalCount
@@ -152,9 +156,6 @@ export default {
})
this.$router.push('/testPaper/doReview')
},
- transferToMinutes(seconds){
- return isNaN(seconds) ? seconds : (seconds / 60).toFixed(2)
- }
}
};
diff --git a/src/pages/assessment/scoreQuery/index.vue b/src/pages/assessment/scoreQuery/index.vue
index fc3da4b..2c9f081 100644
--- a/src/pages/assessment/scoreQuery/index.vue
+++ b/src/pages/assessment/scoreQuery/index.vue
@@ -1,100 +1,94 @@
{{scope.row.timeSpent | transferToMinutes}}
-
-
-
-
-
+
+
-
-
-
+
-
- {{scope.$index + (page - 1) * pageSize + 1}}
-
-
-
- 查看详情
-
-
-
-
-
-
+
+
+ {{scope.$index + (page - 1) * pageSize + 1}}
+
+
+
+ 查看详情
+
+
+
+
diff --git a/src/pages/exception/error/404/index.vue b/src/pages/exception/error/404/index.vue
index 02b30ba..bbb8580 100644
--- a/src/pages/exception/error/404/index.vue
+++ b/src/pages/exception/error/404/index.vue
@@ -1,23 +1,26 @@
- 筛选
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 筛选
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ 考试成绩
-
-
- 成绩统计
- 导出
-
-
+
- 考试成绩
+
+
+ 成绩统计
+ 导出
+
+
-
-
+
+
-
+ 404
- 啊哦~ 你所访问的页面不存在
-
-
- 返回首页
-
- 返回上一页
-
-
+
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 9c523c7..ba43f62 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -85,14 +85,14 @@
404
+ 啊哦~ 你所访问的页面不存在
+
+
+ 返回首页
+
+ 返回上一页
+
+ -
-
- +
-
{{item.className}}
班级：{{item.className}}
- - + +
-
-
- {{item.name}} + +
- {{item.name}} +
@@ -69,19 +71,24 @@ export default {
tabs: [
{
id: 1,
- name: '单选题'
+ name: '单选题',
+ show: true
},{
id: 2,
- name: '多选题'
+ name: '多选题',
+ show: true
},{
id: 3,
- name: '判断题'
+ name: '判断题',
+ show: true
},{
id: 4,
- name: '简答题'
+ name: '简答题',
+ show: true
},{
id: 5,
- name: '填空题'
+ name: '填空题',
+ show: true
}
],
typeNameList: ['单项选择','多项选择','判断题','简答题','填空题'],
@@ -119,6 +126,12 @@ export default {
}
})
this.list = data.list
+ let tabs = this.tabs
+ data.list.find(n => n.typeName == '单项选择') || (tabs[0].show = false)
+ data.list.find(n => n.typeName == '多项选择') || (tabs[1].show = false)
+ data.list.find(n => n.typeName == '判断题') || (tabs[2].show = false)
+ data.list.find(n => n.typeName == '简答题') || (tabs[3].show = false)
+ data.list.find(n => n.typeName == '填空题') || (tabs[4].show = false)
this.handleOptions()
this.paperName = data.paperName
this.userName = data.stuName
diff --git a/src/pages/practice/list/index.vue b/src/pages/practice/list/index.vue
index ad61d87..b249f2c 100644
--- a/src/pages/practice/list/index.vue
+++ b/src/pages/practice/list/index.vue
@@ -93,8 +93,8 @@
-
-
+
@@ -214,14 +214,16 @@ export default {
'userId','clientId'
]),
...mapState('practice', [
- 'typeList','stateList'
+ 'typeList','stateList','classId','className'
]),
...mapGetters('practice', [
'getStateName'
])
},
mounted() {
+ this.className && (this.keyword = this.className)
this.getData()
+ this.addEvent()
},
watch: {
keyword: function(val) {
@@ -242,13 +244,15 @@ export default {
'setInfo'
]),
...mapActions('practice', [
- 'setPracInfo'
+ 'setPracInfo','setClassInfo'
]),
...mapActions('achievement', [
'setPracListInfo'
]),
getData() {
- this.$post(`${this.api.pageByName}?pageNum=${this.page}&pageSize=${this.pageSize}&practiseName=${this.keyword}&userId=${this.userId}`)
+ let url = `${this.api.pageByName}?pageNum=${this.page}&pageSize=${this.pageSize}&practiseName=${this.keyword}&userId=${this.userId}`
+ if(this.classId) url += `&classId=${this.classId}`
+ this.$post(url)
.then(res => {
this.listData = res.data.list.list
this.total = res.data.list.totalCount
@@ -286,9 +290,13 @@ export default {
},
fircheck(val,val2){
val.ischeck = !val.ischeck
- val.children.map( e => e.ischeck = val.ischeck)
- val.children.map( e => e.children.map(n => n.ischeck = e.ischeck))
- this.handleCheck(val2)
+ if(val.children){
+ val.children.map( e => e.ischeck = val.ischeck)
+ val.children.map( e => e.children.map(n => n.ischeck = e.ischeck))
+ this.handleCheck(val2)
+ }else{
+ this.form.classId = val.classId
+ }
},
twocheck(val,val2){
val.ischeck = !val.ischeck
@@ -333,7 +341,6 @@ export default {
this.addVisible = true
this.isAdd = false
this.stuCompKey++
- console.log(11,this.form)
},
scoreQuery(row){
this.setPracListInfo({
@@ -405,14 +412,14 @@ export default {
this.testPaperName = ''
},
getCourses() {
- this.$get(this.api.getTypeByOneLever)
+ this.$get(`${this.api.getCourses}?type=1`)
.then(res => {
this.coursesList = res.data.list
})
.catch(err => {})
},
getPapers() {
- this.$post(`${this.api.schoolTestPaperByRelease}?schoolId=${this.clientId}&effect=1`)
+ this.$post(`${this.api.schoolTestPaperByRelease}?schoolId=${this.clientId}&effect=1&courses=${this.cid}&name=${this.keywordPaper}`)
.then(res => {
this.testPaperData = res.data.list
// this.totalPaper = res.data.list.totalCount
@@ -448,8 +455,13 @@ export default {
})
.catch(err => {})
},
- closeDetail(){
-
+ addEvent(){
+ this.$once('hook:beforeDestroy',() => {
+ this.setClassInfo({
+ classId: '',
+ className: ''
+ })
+ })
},
}
}
diff --git a/src/pages/practice/list/studentSide.vue b/src/pages/practice/list/studentSide.vue
index fc208b7..40e7590 100644
--- a/src/pages/practice/list/studentSide.vue
+++ b/src/pages/practice/list/studentSide.vue
@@ -1,7 +1,7 @@
@@ -32,6 +32,7 @@ export default {
className: ''
},
majorNoAdd: true,
+ allClassList: [],
};
},
computed: {
@@ -51,6 +52,7 @@ export default {
schoolId: this.clientId
}
let classId = this.classId ? this.classId.split(',') : []
+ let classList = []
this.$get(this.api.queryStudentProfessionalArchitecture,data).then(res => {
let StaffProfessionalArchitectureList = res.data.StaffProfessionalArchitectureList
StaffProfessionalArchitectureList.map(n => {
@@ -82,6 +84,7 @@ export default {
}
})
j.children = res.data.Class
+ classList = classList.concat(res.data.Class)
if(j.children.every(i => i.ischeck)){
j.ischeck = true
}
@@ -95,6 +98,7 @@ export default {
setTimeout(() => {
this.majorList = StaffProfessionalArchitectureList
this.majorList[0].ifVisible = true
+ this.allClassList = classList
}, 500);
}).catch(res => {});
},
diff --git a/src/pages/practice/list/studentTree.vue b/src/pages/practice/list/studentTree.vue
index 1abcc5b..9103285 100644
--- a/src/pages/practice/list/studentTree.vue
+++ b/src/pages/practice/list/studentTree.vue
@@ -1,6 +1,16 @@
-
-
+ ![]()
{
+ this.fuzzyQuery()
+ },500)
+ },
chooseList(n, o) {
this.$emit('chooseNode', n);
}
@@ -65,9 +85,20 @@ export default {
props: {
data: {
type: Array
- }
+ },
+ allClassList: {
+ type: Array
+ },
},
methods: {
+ fuzzyQuery(){
+ let list = this.allClassList
+ let result = []
+ list.map((n,i) => {
+ if(n.label.includes(this.keyword)) result.push(n)
+ })
+ this.classList = result
+ },
//点击节点时伸展或收缩列表
open(item) {
item.ifVisible = !item.ifVisible;
diff --git a/src/pages/practice/scoreQuery/index.vue b/src/pages/practice/scoreQuery/index.vue
index 35a4533..4614c55 100644
--- a/src/pages/practice/scoreQuery/index.vue
+++ b/src/pages/practice/scoreQuery/index.vue
@@ -1,94 +1,88 @@
diff --git a/src/pages/quesBank/list/myQuesBank.vue b/src/pages/quesBank/list/myQuesBank.vue
index 2ce0f71..f41c9ca 100644
--- a/src/pages/quesBank/list/myQuesBank.vue
+++ b/src/pages/quesBank/list/myQuesBank.vue
@@ -1,120 +1,114 @@
+
+
+
+
+
+ {{item.label}}班
+
+
-
-
-
-
-
+
+
-
-
-
+
-
- {{scope.$index + (page - 1) * pageSize + 1}}
-
-
-
- 查看详情
-
-
-
-
-
-
+
+
+ {{scope.$index + (page - 1) * pageSize + 1}}
+
+
+
+ 查看详情
+
+
+
+
筛选
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 筛选
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ 练习成绩
-
-
- 导出
-
-
+
- 练习成绩
+
+
+ 导出
+
+
-
-
+
+
diff --git a/src/pages/quesBank/list/globalQuesBank.vue b/src/pages/quesBank/list/globalQuesBank.vue
index 7dfb438..be3a7b6 100644
--- a/src/pages/quesBank/list/globalQuesBank.vue
+++ b/src/pages/quesBank/list/globalQuesBank.vue
@@ -21,7 +21,7 @@
-
-
-
-
-
-
+
+
-
-
-
+
-
- {{scope.$index + (page - 1) * pageSize + 1}}
-
-
-
- 查看
- 修改
- 删除
- 共享
- 取消共享
-
-
-
-
-
-
+
+
+ {{scope.$index + (page - 1) * pageSize + 1}}
+
+
+
+ 查看
+ 修改
+ 删除
+ 共享
+ 取消共享
+
+
+
+
测评题库
-
-
-
-
-
-
-
-
-
-
-
- 测评题库
+
+
+
+
+
+
+
+
+
+
+
+
-
+ 题目列表
-
-
- 单题上传
- 批量上传
- 批量共享
-
- 批量删除
-
-
+
- 题目列表
+
+
+ 单题上传
+ 批量上传
+ 批量共享
+
+ 批量删除
+
+
-
-
+
+
-
试题课程：
-
+
+
+
+
@@ -300,11 +307,18 @@ export default {
// 智能组卷
inteVisible: false,
inteListData: [],
+ knListData: [],
+ inteType: '1',
course: [],
+ kn: [],
courseProps: {
key: 'courses',
label: 'courses'
},
+ knProps: {
+ key: 'knowledgePoint',
+ label: 'knowledgePoint'
+ },
countNumber1: 0,
countNumber2: 0,
countNumber3: 0,
@@ -474,6 +488,7 @@ export default {
this.manualVisible = true
}else{
this.getInteData()
+ this.getKnData()
this.inteVisible = true
}
},
@@ -557,9 +572,18 @@ export default {
.catch(err => {})
},
getQuesBank() {
- this.$get(this.api.getTypeByOneLever)
+ let data = {
+ pageNum: 1,
+ pageSize: 10000
+ }
+ this.$post(this.api.listByPage,data)
.then(res => {
- this.quesBankList = res.data.list
+ let list = res.data.list.list
+ let result = list
+ list.map((n,i) => {
+ result = result.concat(n.secondColumn)
+ })
+ this.quesBankList = result
})
.catch(err => {})
},
@@ -623,6 +647,16 @@ export default {
this.inteListData = res.data.fuzzyList
}).catch(err => {})
},
+ getKnData() {
+ let data = {
+ schoolId: this.clientId,
+ userId: this.userId,
+ }
+ this.$post(this.api.queryKnowledgePoints,data)
+ .then(res => {
+ this.knListData = res.data.fuzzyList
+ }).catch(err => {})
+ },
courseChange(val,dir,allData){
let data = {
coursesList: val,
@@ -639,6 +673,22 @@ export default {
this.countNumber5 = data.countNumber5
}).catch(err => {})
},
+ knChange(val,dir,allData){
+ let data = {
+ knowledgePointsList: val,
+ schoolId: this.clientId,
+ userId: this.userId,
+ }
+ this.$post(this.api.statistical,data)
+ .then(res => {
+ let data = res.data.count
+ this.countNumber1 = data.countNumber1
+ this.countNumber2 = data.countNumber2
+ this.countNumber3 = data.countNumber3
+ this.countNumber4 = data.countNumber4
+ this.countNumber5 = data.countNumber5
+ }).catch(err => {})
+ },
typeValid(index){
return this.countCheck[`countCheck${index}`] && this[`countNumberInput${index}`] && this[`countNumber${index}`]
},
@@ -803,10 +853,14 @@ export default {
}
}
let data = {
- coursesList: this.course,
schoolId: this.clientId,
userId: this.userId,
}
+ if(this.inteType == 1){
+ data.coursesList = this.course
+ }else{
+ data.knowledgePointsList = this.kn
+ }
this.$post(this.api.getQuestionListBySelect,data)
.then(res => {
let list = res.data.count
@@ -822,7 +876,9 @@ export default {
}).catch(err => {})
},
closeInte(){
- this.course = [],
+ this.inteType = '1'
+ this.course = []
+ this.kn = []
this.countNumber1 = 0
this.countNumber2 = 0
this.countNumber3 = 0
diff --git a/src/pages/testPaper/show/index.vue b/src/pages/testPaper/show/index.vue
new file mode 100644
index 0000000..b48d0db
--- /dev/null
+++ b/src/pages/testPaper/show/index.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/router/modules/achievement.js b/src/router/modules/achievement.js
index 2ec8879..41d0aa7 100644
--- a/src/router/modules/achievement.js
+++ b/src/router/modules/achievement.js
@@ -22,7 +22,7 @@ export default {
{
name: `${pre}statistics`,
path: `statistics`,
- component: () => import('@/components/achiStatistics'),
+ component: () => import('@/pages/achievement/statistics'),
meta: { title: '成绩统计' }
},
{
diff --git a/src/router/modules/assessment.js b/src/router/modules/assessment.js
index b82440a..ef92d6b 100644
--- a/src/router/modules/assessment.js
+++ b/src/router/modules/assessment.js
@@ -28,7 +28,7 @@ export default {
{
name: `${pre}scoreQuery`,
path: `scoreQuery`,
- component: () => import('@/pages/assessment/scoreQuery/index.vue'),
+ component: () => import('@/pages/assessment/scoreQuery'),
meta: { title: '成绩查询' }
},
{
diff --git a/src/router/modules/practice.js b/src/router/modules/practice.js
index 620e587..b5b1fe5 100644
--- a/src/router/modules/practice.js
+++ b/src/router/modules/practice.js
@@ -28,7 +28,7 @@ export default {
{
name: `${pre}scoreQuery`,
path: `scoreQuery`,
- component: () => import('@/pages/practice/scoreQuery/index.vue'),
+ component: () => import('@/pages/practice/scoreQuery'),
meta: { title: '成绩查询' }
},
{
diff --git a/src/router/modules/testPaper.js b/src/router/modules/testPaper.js
index 66fe611..57f76fa 100644
--- a/src/router/modules/testPaper.js
+++ b/src/router/modules/testPaper.js
@@ -18,11 +18,6 @@ export default {
path: `list`,
component: () => import('@/pages/testPaper/list'),
meta: { title: '试卷管理' }
- },{
- name: `${pre}review`,
- path: `review`,
- component: () => import('@/pages/testPaper/review'),
- meta: { title: '练习批阅' }
},{
name: `${pre}add`,
path: `add`,
@@ -31,13 +26,8 @@ export default {
},{
name: `${pre}show`,
path: `show`,
- component: () => import('@/components/testPaperDetail'),
+ component: () => import('@/pages/testPaper/show'),
meta: { title: '试卷预览' }
- },{
- name: `${pre}doReview`,
- path: `doReview`,
- component: () => import('@/components/doReview'),
- meta: { title: '批改' }
- },
+ }
]
};
\ No newline at end of file
diff --git a/src/router/permission.js b/src/router/permission.js
index c7caeea..eb2db78 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -7,10 +7,14 @@ router.beforeEach((to, from, next) => {
document.title = `${to.meta.title} | ${Setting.titleSuffix}`
const role = util.session.get(Setting.usernameKey)
if (!role && to.path !== '/login') {
- next({
- path: '/login',
- query: {redirect: to.fullPath}
- })
+ if(to.fullPath == '/'){
+ next('/login')
+ }else{
+ next({
+ path: '/login',
+ query: {redirect: to.fullPath}
+ })
+ }
} else if(role && to.path == '/login') {
next('/index')
} else if(role && to.path == '/') {
diff --git a/src/store/modules/practice.js b/src/store/modules/practice.js
index 492feec..ef164d1 100644
--- a/src/store/modules/practice.js
+++ b/src/store/modules/practice.js
@@ -12,6 +12,8 @@ export default {
isReview: false,
reviewStatus: '',
userId: '',
+ classId: '',
+ className: '',
stateList: [
{
id: 1,
@@ -92,6 +94,10 @@ export default {
SET_REVIEW_BY_STUDENT_INFO: (state, info) => {
state.userId = info.userId
},
+ SET_CLASS_INFO: (state, info) => {
+ state.classId = info.classId
+ state.className = info.className
+ },
},
actions: {
setPracInfo({ commit },info) {
@@ -103,5 +109,8 @@ export default {
setReviewInfo({ commit },info) {
commit('SET_REVIEW_INFO',info)
},
+ setClassInfo({ commit },info) {
+ commit('SET_CLASS_INFO',info)
+ },
}
}
\ No newline at end of file