hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-13 21:06:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/components/student/TableStudent.vue
This commit is contained in:
yuping
2022-12-26 17:29:49 +08:00
parent 5e4e6f16b7 4698f25a22
commit 876d1b715a
3 changed files with 551 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/drawers/AddTest.vue
View File

@@ -538,11 +538,13 @@ export default {
//TODO缺少paperName字段 //TODO缺少paperName字段
state.test.examinationTestName = state.paperName; state.test.examinationTestName = state.paperName;
//考试推送 //考试推送
state.test.targetId = 0; state.test.targetId = 0;
state.test.type = 0; state.test.type = 0;
if (props.isLevel == 1) { state.test.chapterId=0;
state.test.targetId = props.routerId; if(props.isLevel == 1){
state.test.type = 2; state.test.targetId = props.routerId;
state.test.chapterId = props.isactive;
state.test.type = 2;
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
state.test.targetId = props.projectId; state.test.targetId = props.projectId;

5
src/components/student/TableStudent.vue
View File

@@ -357,7 +357,7 @@ function closeModal1() {
} }
// 取消优秀学员-弹框关闭 // 取消优秀学员-弹框关闭
function cancelcanyou() { function cancelcanyou() {
canclestu1.value = false; canclestu1.value = false;
} }
@@ -459,7 +459,7 @@ const projectId = ref(null)
background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, rgba(78, 166, 255, 0) 100%); background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, rgba(78, 166, 255, 0) 100%);
} }
.delete { /*.delete {
z-index: 9999; z-index: 9999;
width: 424px; width: 424px;
background: #ffffff; background: #ffffff;
@@ -682,4 +682,5 @@ const projectId = ref(null)
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
} }
*/
</style> </style>

1157
src/views/projectcenter/SonProject.vue
View File

File diff suppressed because it is too large Load Diff