-
+
+
随机
@@ -158,11 +196,33 @@ import { mapState, mapActions } from 'vuex'
export default {
data() {
return {
+ founderKeys: {
+ 0: '系统',
+ 1: '老师'
+ },
+ permissionsKeys: {
+ 0: '练习',
+ 1: '考核',
+ 2: '竞赛'
+ },
id: '',
- roleStatus: util.getRoleName,
+ type: 1, // 发布类型(1、手动发布 2、定时发布)
+ isSpecify: 1, // 考核发布(1、指定范围 2、无指定范围)
+ filterClassName: "", // 班级名称搜索
+ tagList: [], // 班级名称标签
+ classTreeList: [], // 班级树数据
+ defaultCheckedList: [], // 默认选中
+ allCheckedNodes: [], // 当前选中和半选节点
+ allCheckedKeys: [], // 当前选中的班级和学生节点key
+ defaultProps: {
+ children: 'children',
+ label: 'organizationName'
+ }, // 树控件配置选项
+ schoolId: Setting.schoolId, // 学校id Setting.schoolId
systemId: Setting.systemId,
systemList: Setting.systemList,
- isDetail: true,
+ roleStatus: util.getRoleName,
+ isDetail: Boolean(this.$route.query.show),
duration: {
day: '',
hour: '',
@@ -175,12 +235,10 @@ export default {
experimentalNumber: 0,
projectId: '',
projectName: '',
- status: '',
+ status: 0, // 状态(0、待开始 1、进行中 2、已结束)
surplusTime: '',
experimentalName: '',//考核名称
- experimentalClassName: '', //班级名称
- type: '1',
- isCode: '0', //是否设置邀请码
+ isEnableCode: 0, //是否设置邀请码
startTime: '0000-00-00 00:00:00', //开始时间
stopTime: '0000-00-00 00:00:00', //结束时间
invitationCode: '',
@@ -216,13 +274,13 @@ export default {
]),
},
mounted() {
- console.log(22,this.assFields)
+ // console.log(22,this.assFields)
this.date = [util.formatDate("yyyy-MM-dd hh:mm:ss",new Date(new Date().getTime() + 300000)),util.formatDate("yyyy-MM-dd hh:mm:ss",new Date(new Date().getTime() + 300000))]
this.id = this.$route.query.id
- this.isDetail = Boolean(this.$route.query.show)
this.id && this.getData()
this.getProjectData()
this.recoveryData()
+ this.getClassTreeData()
},
beforeDestroy(){
if(!this.isToProject) this.setAss({})
@@ -245,31 +303,128 @@ export default {
this.searchTimer = setTimeout(() => {
this.initData()
},500)
+ },
+ filterClassName(val) {
+ this.$refs.tree.filter(val);
}
},
methods: {
...mapActions('project', [
'setAss'
]),
+ handleCloseTag(tag) { // 关闭班级标签
+ let tagIndex = this.tagList.findIndex( i => i.classId === tag.classId);
+ this.tagList.splice(tagIndex, 1);
+
+ // 获取当前班级在全部节点中的下标
+ let classIndex = this.allCheckedNodes.findIndex( i => i.id === tag.id);
+
+ // 获取当前班级下学生keys
+ let studentsKeys = [];
+ if(this.allCheckedNodes[classIndex].children && this.allCheckedNodes[classIndex].children.length) {
+ studentsKeys = this.allCheckedNodes[classIndex].children.map( i => i.id);
+ }
+ let filterKeys = [...studentsKeys, this.allCheckedNodes[classIndex].id];
+ let setKeys = []; // 设置选中的节点
+ this.allCheckedKeys.forEach(i => {
+ if(!filterKeys.includes(i)){
+ setKeys.push(i)
+ }
+ }); // 一个数组过滤另一个数组
+ this.allCheckedKeys = setKeys; // 重新缓存全选状态下的班级和学生节点key
+
+ console.log("所有节点keys===",JSON.stringify(this.allCheckedKeys));
+ console.log("当前班级和学生keys===",JSON.stringify(filterKeys));
+ console.log("设置选中的节点===",JSON.stringify(setKeys));
+
+
+ let tempArr = [];
+ this.allCheckedNodes.forEach(i => {
+ if(!filterKeys.includes(i.id)){
+ tempArr.push(i)
+ }
+ });
+ this.allCheckedNodes = tempArr; // 缓存全选和半选状态下的所有节点
+ this.$refs.tree.setCheckedKeys(setKeys);
+
+ },
+ handleCheck(data, checked) { // 当复选框被点击的时候触发
+ console.log(checked);
+ // console.log(JSON.stringify(checked.checkedNodes));
+
+ // 全选和半选状态下的班级都显示在标签
+ let checkedClass = checked.checkedNodes.filter( i => i.level === 3);
+ let halfCheckedClass = checked.halfCheckedNodes.filter( i => i.level === 3);
+ this.tagList = [...checkedClass, ...halfCheckedClass].map(i => {
+ return {classId: i.id, className: i.organizationName}
+ });
+
+ // 缓存全选和半选状态下的所有节点
+ this.allCheckedNodes = [...checked.checkedNodes, ...checked.halfCheckedNodes];
+
+ // 缓存全选状态下的班级和学生节点key
+ let tempArr = checked.checkedNodes.filter( i => i.level === 3 || i.level === 4);
+ this.allCheckedKeys = tempArr.map(i => i.id);
+ },
+ filterNode(value, data) { // 对树节点进行过滤
+ if (!value) return true;
+ return data.organizationName.indexOf(value) !== -1;
+ },
+ toTreeId(data) { // 多个班级有相同的学生，将学生id重新封装成（班级id+学生id）,已便达到树节点需要的key唯一性
+ if (!data) return data;
+ let result;
+ if (Array.isArray(data)) {
+ result = [];
+ data.forEach(item => {
+ if (item.level < 4 && item.children && item.children.length) {
+ item.children = this.toTreeId(item.children);
+ } else if (item.level === 4) {
+ item.id = `${item.parentId}-${item.id}`;
+ }
+ result.push(item);
+ });
+ }
+ return result;
+ },
+ getClassTreeData () { // 获取树结构数据
+ this.$post(`${this.api.treeList}?schoolId=${this.schoolId}`).then(res => {
+ let {status, list} = res;
+ if (status === 200 && list) {
+ this.classTreeList = this.toTreeId(res.list);
+ } else {
+ util.errorMsg(res.message);
+ }
+ }).catch(err => {
+ console.log(err);
+ });
+ },
getProjectData(){
let data = {
- pageNo: this.page,
+ schoolId: this.schoolId, // 学校id
+ platformId: 1, // 平台：职站:1 中台:3
+ permissions: 1, // 项目权限(0:练习 1:考核 2:竞赛)
+ projectName: this.keyword, // 项目名称
+ systemId: this.systemId, // 系统id
+ founder: 0, // 创建人角色(0:系统 1:老师)
+ state: 1, // 状态(0:草稿箱 1:已发布)
+ pageNum: this.page,
pageSize: 10000,
- userId: this.userId,
- systemId: this.systemId,
- projectName: this.keyword,
- projectPermissions: 1,
}
- this.$get(this.api.queryAllManagements,data).then(res => {
- let list = res.pageInfo.list
- let result = []
- list.map(n => {
- n.enable || result.push(n)
- })
- this.projectDataAll = result
- this.total = result.length
- this.handlePage()
- }).catch(res => {});
+ this.$post(this.api.queryProjectManage, data).then(res => {
+ let { status, data } = res;
+ if (status === 200 && data) {
+ let list = data.records;
+ let result = []
+ list.map(n => {
+ n.enable || result.push(n)
+ })
+ this.projectDataAll = result
+ this.total = result.length
+ this.handlePage()
+ }
+ }).catch(err => {
+ console.log(err);
+ });
},
handlePage(){
let list = this.projectDataAll
@@ -284,112 +439,155 @@ export default {
if(JSON.stringify(this.assFields) != '{}'){
let info = this.assFields
this.experimentDuration = info.experimentDuration
- this.experimentalClassName = info.experimentalClassName
this.experimentalName = info.experimentalName
this.invitationCode = info.invitationCode
- this.isCode = String(info.isCode)
+ this.isEnableCode = info.isEnableCode
this.projectId = info.projectId
this.startTime = info.startTime
this.stopTime = info.stopTime
this.surplusTime = info.surplusTime
- this.type = String(info.type)
+ this.type = info.type
this.expNameRepeat = info.expNameRepeat
this.formatDuration()
}
},
- upload() {
- if(!this.experimentalName) return this.$message.warning('请填写考核名称')
- if(this.expNameRepeat) return this.$message.warning('考核名称重复，请重新输入')
- if(!this.experimentalClassName) return this.$message.warning('请填写班级名称')
- if(this.type == 1){
- this.status = 1
- }else{
- if(new Date().getTime() > new Date(this.startTime).getTime()) return this.$message.warning('开始时间不能早于当前时间')
- this.status = 1
+ upload() { // 提交
+ if(!this.experimentalName) return util.warningMsg('请填写考核名称')
+ if(this.expNameRepeat) return util.warningMsg('考核名称重复，请重新输入')
+ if(this.type !== 1){
+ if(new Date().getTime() > new Date(this.startTime).getTime()) return util.warningMsg('开始时间不能早于当前时间')
let timestamp = new Date(new Date(this.stopTime).getTime() - new Date(this.startTime).getTime())
let minute = 1000 * 60
let hour = minute * 60
let day = hour * 24
this.experimentDuration = `${Math.floor(timestamp / day)}d${Math.floor(timestamp % day / hour)}h${Math.floor(timestamp % day % hour / minute)}m`
}
- if(this.type == 1 && this.experimentDuration == '0d0h0m') return this.$message.warning('请填写实验时长')
- if(this.type == 2 && this.startTime == '0000-00-00 00:00:00') return this.$message.warning('请填写实验时间')
- if(!this.projectId) return this.$message.warning('请选择实训项目')
+ if(this.type == 1 && this.experimentDuration == '0d0h0m') return util.warningMsg('请填写实验时长')
+ if(this.type == 2 && this.startTime == '0000-00-00 00:00:00') return util.warningMsg('请填写实验时间')
+ if(!this.projectId) return util.warningMsg('请选择实训项目')
this.projectName = this.projectData.find(n => n.projectId == this.projectId).projectName
- if(this.isCode == 0){
- if(!this.invitationCode) return this.$message.warning('请设置邀请码')
- if(!this.invitationCode || String(this.invitationCode).length < 6 || isNaN(this.invitationCode)) return this.$message.warning('请输入6位纯数字邀请码')
- // if(this.invRepeat) return this.$message.warning('邀请码重复，请重新输入')
+ if(this.isSpecify === 0 && this.isEnableCode == 0){
+ if(!this.invitationCode) return util.warningMsg('请设置邀请码')
+ if(!this.invitationCode || String(this.invitationCode).length < 6 || isNaN(this.invitationCode)) return util.warningMsg('请输入6位纯数字邀请码')
+ // if(this.invRepeat) return util.warningMsg('邀请码重复，请重新输入')
}
-
+
+ let classId = "";
+ let stuInfo = [];
+ if (this.isSpecify === 1) {
+ if (!this.tagList.length) {
+ util.warningMsg('请选择学生')
+ return;
+ } else {
+ let ids = this.tagList.map(i => i.classId);
+ classId = ids.toString();
+ let nodes = this.allCheckedNodes.filter( i => i.level === 4);
+ nodes.forEach(i => {
+ let arr = i.id.split("-")
+ stuInfo.push({classId: arr[0], stuAccountId: arr[1]})
+ });
+ }
+ }
+
let data = {
id: this.id,
experimentDuration: this.experimentDuration,
- creationTime: this.id ? this.creationTime : util.formatDate("yyyy-MM-dd hh:mm:ss"),
- experimentalClassName: this.experimentalClassName,
+ createTime: this.id ? this.createTime : util.formatDate("yyyy-MM-dd hh:mm:ss"),
experimentalName: this.experimentalName,
experimentalNumber: this.experimentalNumber,
invitationCode: this.invitationCode,
- isCode: this.isCode,
+ isEnableCode: this.isEnableCode,
projectId: this.projectId,
projectName: this.projectName,
- status: Number(this.status),
+ status: this.status,
surplusTime: this.surplusTime,
- type: Number(this.type),
+ type: this.type,
userId: this.userId,
- systemId: this.systemId
+ systemId: this.systemId,
+ isSpecify: this.isSpecify,
+ classId,
+ stuInfo,
+
}
if(this.type == 2){
data.startTime = this.startTime
data.stopTime = this.stopTime
- }else{
- data.startTime = '0000-00-00 00:00:00'
- data.stopTime = '0000-00-00 00:00:00'
}
if(this.id){
- this.$post(this.api.expUpdate, data).then(res => {
+ this.$post(this.api.modifyAssessment, data).then(res => {
util.successMsg('修改成功');
this.$router.back()
})
.catch(err => {
+ console.log(err);
});
}else{
- this.$post(this.api.expSave, data).then(res => {
- util.successMsg('创建成功');
- this.$router.back()
+ this.$post(this.api.saveAssessment, data).then(res => {
+ if (res.status === 200) {
+ util.successMsg('创建成功');
+ this.$router.back()
+ } else {
+
+ }
})
.catch(err => {
+ console.log(err);
});
}
},
getData() {
- this.$get(this.api.expInfo + this.id)
+ this.$get(`${this.api.getDetailById}?id=${this.id}`)
.then(res => {
- if(res.errmessage == 'success'){
- let info = res.ExperimentalTeaching
- this.creationTime = info.creationTime
+ if(res.status == 200){
+ let info = res.data;
+ this.createTime = info.createTime
this.experimentDuration = info.experimentDuration
- this.experimentalClassName = info.experimentalClassName
this.experimentalName = info.experimentalName
this.experimentalNumber = info.experimentalNumber
this.invitationCode = info.invitationCode
- this.isCode = String(info.isCode)
+ this.isEnableCode = info.isEnableCode
this.projectId = info.projectId
this.projectName = info.projectName
this.startTime = info.startTime
this.status = info.status
this.stopTime = info.stopTime
this.surplusTime = info.surplusTime
- this.type = String(info.type)
+ this.type = info.type
+
+ // 处理实验时间
+ this.formatDuration();
+
+ // 编辑时，设置默认勾选
+ if (info.stuInfo && info.stuInfo.length) {
+ let keys = info.stuInfo.map(i => {
+ return `${i.classId}-${i.stuAccountId}`;
+ });
+ this.$nextTick(function () {
+ this.$refs.tree.setCheckedKeys(keys);
+ });
+ }
+
+ // 获取树结构选中和半选中状态下的数据
+ this.allCheckedNodes = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
- this.formatDuration()
+ // 缓存全选状态下的班级和学生节点key
+ let tempArr = this.$refs.tree.getCheckedNodes().filter( i => i.level === 3 || i.level === 4);
+ this.allCheckedKeys = tempArr.map(i => i.id);
+
+ this.tagList = this.allCheckedNodes.map(i => {
+ let obj = {};
+ if (i.level === 3) {
+ obj = { classId: i.id, className: i.organizationName }
+ }
+ return obj;
+ })
}else{
- util.errorMsg('查询失败');
+ util.errorMsg(res.message);
}
})
.catch(err => {
-
+ console.log(err);
});
},
formatDuration(){
@@ -405,10 +603,9 @@ export default {
let data = {
id: this.id,
experimentDuration: this.experimentDuration,
- experimentalClassName: this.experimentalClassName,
experimentalName: this.experimentalName,
invitationCode: this.invitationCode,
- isCode: this.isCode,
+ isEnableCode: this.isEnableCode,
projectId: this.projectId,
startTime: this.startTime,
stopTime: this.stopTime,
@@ -421,11 +618,11 @@ export default {
},
toProject(){
this.handleCacheData()
- this.$router.push('/project')
+ this.$router.push('/project/list/?show=1')
},
showProject(row){
this.handleCacheData()
- this.$router.push(`/addproject?id=${row.projectId}&show=1`)
+ this.$router.push(`/project/add?projectId=${row.projectId}&show=1`)
},
goBack() {
if(this.isDetail){
@@ -444,7 +641,7 @@ export default {
this.$get(this.api.getInvitationCode, { invitationCode: this.invitationCode })
.then(res => {
if(res.InvitationCode) {
- this.$message.warning('邀请码重复，请重新输入')
+ util.warningMsg('邀请码重复，请重新输入')
this.invRepeat = true
}else{
this.invRepeat = false
@@ -463,19 +660,7 @@ export default {
handleCurrentChange(val){
this.page = val
this.handlePage()
- },
- judgeExpName(){
- this.$get(this.api.expCheck, { experimentalName: util.encodeStr(this.experimentalName) })
- .then(res => {
- if(res.errmessage != 'success') {
- this.$message.warning('考核名称重复，请重新输入')
- this.expNameRepeat = true
- }else{
- this.expNameRepeat = false
- }
- })
- .catch(err => {});
- },
+ }
},
};
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index fc3ce3d..0019e89 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -35,7 +35,7 @@
-
+
@@ -45,17 +45,17 @@
-
+
- {{scope.$index + (page - 1) * pageSize + 1}}
+ {{scope.$index + (pageNum - 1) * pageSize + 1}}
-
+
-
+
-
+
@@ -63,7 +63,7 @@
- {{scope.row.isCode == 0 ? scope.row.invitationCode : ''}}
+ {{scope.row.isEnableCode == 0 ? scope.row.invitationCode : ''}}
@@ -71,23 +71,23 @@
{{types[scope.row.type]}}
-
+
{{transferTime(scope.row.startTime,scope.row.type)}}
-
+
{{transferTime(scope.row.stopTime,scope.row.type)}}
-
+
@@ -96,22 +96,22 @@
-
+
启动
修改
-
+
提前结束
-
+
查看成绩
- 删除
+ 删除
上传资源
+
+