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

合并冲突

Browse Source
This commit is contained in:
lpq
2023-03-04 14:20:16 +08:00
parent 11086021f9 62a0600a8a
commit 142c1d8977
43 changed files with 1126 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/App.vue
View File

@@ -155,8 +155,8 @@ const getDictList = (param) => api1.getDictTree({code: param,}).then((res) => re
} }
.white { .white {
background: #fff; // background: #fff;
color: #4ea6ff; // color: #4ea6ff;
} }
.cus-input { .cus-input {

21
src/api/ThirdApi.js
View File

@@ -1,14 +1,15 @@
//学员列表带分页 //学员列表带分页
export const USER_LIST_PAGE = '/userbasic/user/list post' export const USER_LIST_PAGE = "/userbasic/user/list post";
//学员列表 没有分页数据 只能通过名称检索 速度较快 //学员列表 没有分页数据 只能通过名称检索 速度较快
export const USER_LIST = '/userbasic/user/searchList post' export const USER_LIST = "/userbasic/user/searchList post";
export const ORG_LIST = '/userbasic/org/list post' export const ORG_LIST = "/userbasic/org/list post";
export const ORG_CHILD_LIST = '/userbasic/org/info post' export const ORG_CHILD_LIST = "/userbasic/org/info post";
// export const AUDIENCE_LIST = '/userbasic/audience/list post' // export const AUDIENCE_LIST = '/userbasic/audience/list post'
//当前用户可以查看的受众接口 //当前用户可以查看的受众接口
export const AUDIENCE_LIST = '/userbasic/audience/userAudiencesFilter post' export const AUDIENCE_LIST = "/userbasic/audience/userAudiencesFilter post";
export const USER_PERMISSION = '/userbasic/permission/listByUser post' export const USER_PERMISSION = "/userbasic/permission/listByUser post";
export const CASE_PAGE = '/systemapi/xboe/m/boe/cases/pagelist post formData' export const CASE_PAGE = "/systemapi/xboe/m/boe/cases/pagelist post formData";
export const EXAM_PAPER_PAGE = '/systemapi/xboe/m/exam/paper/querylist post formData' export const EXAM_PAPER_PAGE = "/systemapi/xboe/m/exam/paper/querylist post formData";
export const TEST_PAGE = '/api/b1/system/quiz/quiz-list post formData' export const TEST_PAGE = "/api/b1/system/quiz/quiz-list post formData";
export const ONLINE_PAGE = '/systemapi/xboe/m/course/manage/pagelist post formData' export const ONLINE_PAGE = "/systemapi/xboe/m/course/manage/pagelist post formData";
export const ONLINE_COURSE_DEL = (id, courseId) => `/systemapi/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId} post`;

1
src/api/apis.js
View File

@@ -6,3 +6,4 @@ export const ROUTER_DETAIL_MODIFY = '/admin/router/routerInfoTemp post';
export const PROJECT_DETAIL_MODIFY = '/admin/project/projectInfoTemp post'; export const PROJECT_DETAIL_MODIFY = '/admin/project/projectInfoTemp post';
export const PROJECT_TEMPLATE_DETAIL_MODIFY = '/admin/project/template/editStageAndTask post'; export const PROJECT_TEMPLATE_DETAIL_MODIFY = '/admin/project/template/editStageAndTask post';
export const PROJECT_RELEASE = '/admin/project/realease'; export const PROJECT_RELEASE = '/admin/project/realease';
export const ASYNC_STUDENT_STATUS = '/admin/cache/getStudentAsyncStatus';

2
src/api/request.js
View File

@@ -237,7 +237,7 @@ export function useRequest(_url, params = {}, init = true) {
}; };
} }
export async function boeRequest(_url, params) { export async function boeRequest(_url, params = {}) {
const s = _url.split(' ') const s = _url.split(' ')
let url = s[0] let url = s[0]
const method = s[1]?.toLowerCase() || 'get' const method = s[1]?.toLowerCase() || 'get'

32
src/components/common/CommonAlert.vue
View File

@@ -22,7 +22,7 @@
<div><span>{{ content }}</span></div> <div><span>{{ content }}</span></div>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn1" @click="close"> <div class="del_btn btn2" @click="close" v-if="cancel">
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2" @click="handleConfirm"> <div class="del_btn btn2" @click="handleConfirm">
@@ -34,9 +34,9 @@
</a-modal> </a-modal>
</template> </template>
<script setup> <script setup>
import notide from '@/assets/images/coursewareManage/notice.png' import notide from "@/assets/images/coursewareManage/notice.png";
import infoPng from '@/assets/images/coursewareManage/QR.png' import infoPng from "@/assets/images/coursewareManage/QR.png";
import {defineProps, ref} from "vue"; import {defineProps, onMounted, ref} from "vue";
const props = defineProps({ const props = defineProps({
close: { close: {
@@ -50,22 +50,34 @@ const props = defineProps({
content: String, content: String,
title: { title: {
type: String, type: String,
default: '提示' default: "提示"
},
cancel: {
type: Boolean,
default: true
},
duration: {
type: Number,
default: 0
}, },
type: { type: {
type: Number, type: Number,
default: 1 default: 1
} }
}) });
const types = { const types = {
1: infoPng, 1: infoPng,
2: notide 2: notide
} };
const type = ref(1) const type = ref(1);
onMounted(() => {
props.duration && setTimeout(() => props.close(), props.duration)
});
function handleConfirm() { function handleConfirm() {
props.ok() props.ok();
props.close() props.close();
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

10
src/components/drawers/AddOnline.vue
View File

@@ -17,7 +17,7 @@
</div> </div>
<div> <div>
<div class="contentMain" style="padding:20px"> <div class="contentMain" style="padding:20px">
<CreateOnline ref="onlineRef"> <CreateOnline ref="onlineRef" :id="props.id" :type="props.infoType">
<a-button type="primary" style="border-radius: 4px">{{ <a-button type="primary" style="border-radius: 4px">{{
taskIndex === -1 ? '选择/新建课程' : '重新选择' taskIndex === -1 ? '选择/新建课程' : '重新选择'
}} }}
@@ -46,7 +46,9 @@ import {message} from "ant-design-vue";
import CreateOnline from "@/components/drawers/CreateOnline.vue"; import CreateOnline from "@/components/drawers/CreateOnline.vue";
const props = defineProps({ const props = defineProps({
type: Number, infoType: Number,
courseSyncFlag: Number,
id: Number,
taskList: [] taskList: []
}) })
const visible = ref(false) const visible = ref(false)
@@ -133,6 +135,10 @@ function confirm() {
function selectCourse(row) { function selectCourse(row) {
console.log(row) console.log(row)
if(!props.courseSyncFlag && !row.refId){
message.warning("请新建本项目在线课！");
return
}
rowSelectKeys.value = [row.id] rowSelectKeys.value = [row.id]
selectsData.value = [row] selectsData.value = [row]
onlineRef.value.closeModal() onlineRef.value.closeModal()

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

@@ -59,7 +59,7 @@
<span style="font-size: 14px; line-height: 33px">{{ formData.examinationTestName }}</span> <span style="font-size: 14px; line-height: 33px">{{ formData.examinationTestName }}</span>
</a-tag> </a-tag>
</div> </div>
<s-test v-else v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName"> <s-test v-if="taskIndex < 0" v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
<div class="btnbox"> <div class="btnbox">
<button class="xkbtn" style="margin:0" > <button class="xkbtn" style="margin:0" >
{{ formData.examinationPaperId ? "重选" : "选择" }}试卷 {{ formData.examinationPaperId ? "重选" : "选择" }}试卷
@@ -212,7 +212,7 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0" <a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0"
placeholder="请输入数据来源" :maxlength="20" /> placeholder="请输入数据来源" :maxlength="120" />
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
@@ -327,6 +327,8 @@ watch(() => formData.value.examType, () => {
const closeDrawer = () => { const closeDrawer = () => {
visible.value = false visible.value = false
taskIndex.value = -1 taskIndex.value = -1
formData.value.examinationLimit = ''
formData.value.examinationExplain = ''
resetFields() resetFields()
dateTime.value = [] dateTime.value = []
}; };

8
src/components/drawers/CheckVote.vue
View File

@@ -19,7 +19,7 @@
<div class="main"> <div class="main">
<div class="basetext"><span>投票题目</span></div> <div class="basetext"><span>投票题目</span></div>
<div v-if="voteResource" class="basequestion"> <div v-if="voteResource" class="basequestion">
<div class="ques" v-for=" item,index in voteResource.ballotVo.voteStemVoList" :key="index"> <div class="ques" v-for=" item,index in voteResource.voteStemDtoList" :key="index">
<div class="quename">{{ index+1 +"."+ item.voteStemName }}</div> <div class="quename">{{ index+1 +"."+ item.voteStemName }}</div>
<div class="queanswer"> <div class="queanswer">
<a-radio-group v-model:value="currentChoice[index]"> <a-radio-group v-model:value="currentChoice[index]">
@@ -27,7 +27,7 @@
<div class="queabox" v-for="items,index in item.optionDetailList" :key="index"> <div class="queabox" v-for="items,index in item.optionDetailList" :key="index">
<a-radio <a-radio
v-model:checked="checked" v-model:checked="checked"
:value="items.optionId" :value="items.id"
> >
{{items.optionName}} {{items.optionName}}
</a-radio> </a-radio>
@@ -138,11 +138,11 @@ export default {
state.voteResource = res.data.data state.voteResource = res.data.data
let choiceArr = [] let choiceArr = []
let dataQuestion = state.voteResource.ballotVo.voteStemVoList let dataQuestion = state.voteResource.voteStemDtoList
for(let i=0;i<dataQuestion.length;i++){ for(let i=0;i<dataQuestion.length;i++){
for(let j=0;j<dataQuestion[i].optionDetailList.length;j++){ for(let j=0;j<dataQuestion[i].optionDetailList.length;j++){
if(dataQuestion[i].optionDetailList[j].isAnswer){ if(dataQuestion[i].optionDetailList[j].isAnswer){
choiceArr.push(dataQuestion[i].optionDetailList[j].optionId) choiceArr.push(dataQuestion[i].optionDetailList[j].id)
break break
} }
if(j==dataQuestion[i].optionDetailList.length - 1 && dataQuestion[i].optionDetailList[j].isAnswer == false){ if(j==dataQuestion[i].optionDetailList.length - 1 && dataQuestion[i].optionDetailList[j].isAnswer == false){

14
src/components/drawers/CommonTest.vue
View File

@@ -68,14 +68,14 @@
</div> </div>
<span style="margin-right: 3px">选择试卷：</span> <span style="margin-right: 3px">选择试卷：</span>
</div> </div>
<s-test v-model:id="formData.examinationTestId" v-model:name="formData.examinationTestName"> <s-test v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
<div class="btnbox"> <div class="btnbox">
<button class="xkbtn" style="margin:0"> <button class="xkbtn" style="margin:0">
{{ formData.examinationTestId ? "重选" : "选择" }}试卷 {{ formData.examinationPaperId ? "重选" : "选择" }}试卷
</button> </button>
</div> </div>
</s-test> </s-test>
<div v-if="formData.examinationTestId"> <div v-if="formData.examinationPaperId">
<a-tag closable color="processing" @close="delTag" :closeIcon="true"> <a-tag closable color="processing" @close="delTag" :closeIcon="true">
<span style="font-size: 14px; line-height: 33px">{{ formData.examinationTestName }}</span> <span style="font-size: 14px; line-height: 33px">{{ formData.examinationTestName }}</span>
</a-tag> </a-tag>
@@ -287,7 +287,7 @@
v-model:value="formData.source" v-model:value="formData.source"
style="width: 400px; height: 40px; border-radius: 8px" style="width: 400px; height: 40px; border-radius: 8px"
placeholder="请输入数据来源" placeholder="请输入数据来源"
:maxlength="20" :maxlength="120"
/> />
</div> </div>
</div> </div>
@@ -327,7 +327,7 @@ const props = defineProps({
const visible = ref(false) const visible = ref(false)
const initValue = { const initValue = {
examinationName: '', examinationName: '',
examinationTestId: '', examinationPaperId: '',
examinationStartTime: '', examinationStartTime: '',
examinationEndTime: '', examinationEndTime: '',
examinationDuration: '', examinationDuration: '',
@@ -349,7 +349,7 @@ const innerRule = {
message: '请输入考试名称', message: '请输入考试名称',
}, },
], ],
examinationTestId: [ examinationPaperId: [
{ {
required: true, required: true,
message: '请输入选择试卷', message: '请输入选择试卷',
@@ -440,7 +440,7 @@ function openDrawer() {
} }
const delTag = () => { const delTag = () => {
formData.value.examinationTestId = ''; formData.value.examinationPaperId = '';
formData.value.examinationTestName = ''; formData.value.examinationTestName = '';
} }

1
src/components/drawers/CreVote.vue
View File

@@ -375,6 +375,7 @@ export default {
background-color: #fafafa !important; background-color: #fafafa !important;
} }
.crevoteDrawer { .crevoteDrawer {
z-index: 9999;
.drawerMain { .drawerMain {
.header { .header {
height: 73px; height: 73px;

18
src/components/drawers/CreateOnline.vue
View File

@@ -14,7 +14,7 @@
<iframe <iframe
id="iframe" id="iframe"
style="width: 100%; height: 600px" style="width: 100%; height: 600px"
:src="iframeUrl + '/course/manages?f=choose'" :src="`${iframeUrl}/course/manages?f=choose?ref_id=${props.id}&ref_type=${props.type}`"
name="myframe" name="myframe"
security="restricted" security="restricted"
sandbox="allow-forms allow-scripts allow-same-origin allow-popups" sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
@@ -22,19 +22,25 @@
</a-modal> </a-modal>
</template> </template>
<script setup> <script setup>
import {ref} from "vue"; import {defineProps, ref} from "vue";
import {iframeUrl} from "@/api/method"; import {iframeUrl} from "@/api/method";
const visible = ref(false) const visible = ref(false);
const props = defineProps({
type: Number,
id: Number,
});
function openModal() { function openModal() {
visible.value = true visible.value = true;
} }
function closeModal() { function closeModal() {
visible.value = false visible.value = false;
} }
defineExpose({closeModal})
defineExpose({ closeModal });
</script> </script>
<style lang="scss"> <style lang="scss">

2
src/components/drawers/ViewAssess.vue
View File

@@ -130,7 +130,7 @@
</div> </div>
<div class="btnn"> <div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button> <button class="btn2" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button> <button class="btn2" @click="closeDrawer">确定</button>
</div> </div>
</div> </div>

12
src/components/drawers/project/ProjectExamManage.vue
View File

@@ -117,7 +117,7 @@
<EScore v-model:eScorevisible="eScorevisible" /> <EScore v-model:eScorevisible="eScorevisible" />
</a-drawer> </a-drawer>
<!-- 查看答卷抽屉 --> <!-- 查看答卷抽屉 -->
<CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource"/> <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource1"/>
</template> </template>
<script> <script>
@@ -318,14 +318,14 @@ export default {
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
{text.record.status == '0' ? "查看答卷" : {text.record.status === 1 || text.record.status === 9 ?
<a onClick={()=>{ <a onClick={()=>{
state.studentKid = text.record.studentKid; state.studentKid = text.record.studentKid;
state.datasource = text.record; state.datasource1 = text.record;
state.CAvisible = true; state.CAvisible = true;
}}> 查看答卷 </a> }}>查看答卷 </a> :
<span style="color:rgba(0, 0, 0, 0.25);cursor:not-allowed;"> 查看答卷 </span>
} }
</div> </div>
); );
}, },
@@ -334,7 +334,7 @@ export default {
loadingData: true, loadingData: true,
studentKid: '', studentKid: '',
CAvisible: false, CAvisible: false,
datasource: '' datasource1: ''
}); });
const closeDrawer = () => { const closeDrawer = () => {

2
src/components/drawers/project/ProjectOnlineManage.vue
View File

@@ -498,7 +498,7 @@ export default {
window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.stageId}&type=${1}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.stageId}&type=${1}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}`)
}else if(props.datasource.type==11){ }else if(props.datasource.type==11){
{/* 评估导出 */} {/* 评估导出 */}
window.open(`${process.env.VUE_APP_BASE_API}admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
}else{ }else{
window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
} }

2
src/components/drawers/router/RouterCommonManage.vue
View File

@@ -505,7 +505,7 @@ export default {
window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
}else if(props.datasource.type==11){ }else if(props.datasource.type==11){
{/* 评估导出 */} {/* 评估导出 */}
window.open(`${process.env.VUE_APP_BASE_API}admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
}else{ }else{
window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
} }

2
src/components/drawers/router/RouterExaminationExternalManage.vue
View File

@@ -437,7 +437,7 @@
{/* 导出数据 */} {/* 导出数据 */}
function exportData() { function exportData() {
window.open(`${process.env.VUE_APP_BASE_API}/admin/external/exam/manage/exportExternalExam?chapterId=${props.datasource.chapterId}&type=${1}&targetId=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/external/exam/manage/exportExternalExam?chapterId=${props.datasource.chapterId}&type=${1}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
} }
return { return {
...toRefs(state), ...toRefs(state),

8
src/components/drawers/router/RouterExaminationManage.vue
View File

@@ -79,7 +79,7 @@
<EScore v-model:eScorevisible="eScorevisible" /> <EScore v-model:eScorevisible="eScorevisible" />
</a-drawer> </a-drawer>
<!-- 查看答卷抽屉 --> <!-- 查看答卷抽屉 -->
<CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource" /> <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource1" />
</template> </template>
<script> <script>
@@ -306,7 +306,7 @@ export default {
type="link" type="link"
onClick={() => { onClick={() => {
state.studentKid = text.record.studentKid; state.studentKid = text.record.studentKid;
state.datasource = text.record; state.datasource1 = text.record;
state.CAvisible = true; state.CAvisible = true;
}}> }}>
查看答卷 查看答卷
@@ -321,7 +321,7 @@ export default {
disabled disabled
onClick={() => { onClick={() => {
state.studentKid = text.record.studentKid; state.studentKid = text.record.studentKid;
state.datasource = text.record; state.datasource1 = text.record;
state.CAvisible = true; state.CAvisible = true;
}}> }}>
查看答卷 查看答卷
@@ -336,7 +336,7 @@ export default {
loadingData: true, loadingData: true,
studentKid: '', studentKid: '',
CAvisible: false, CAvisible: false,
datasource: '' datasource1: ''
}); });
const closeDrawer = () => { const closeDrawer = () => {

2
src/components/student/CommonStudent.vue
View File

@@ -780,7 +780,7 @@ const submitAuth = () => {
if (props.type === 2) { if (props.type === 2) {
stageVisible.value = true; stageVisible.value = true;
} else { } else {
handleStageOk(); handleDialogOk();
} }
}; };

161
src/components/student/OnlineClassModelStudent.vue
View File

@@ -8,16 +8,16 @@
> >
<div class="header-content"> <div class="header-content">
<div style="font-size: 16px"> <div style="font-size: 16px">
xxxxxxxx 课程 {{ formData.name }} 课程
</div> </div>
<div> <div>
<span style="color:#999">内容分类</span>：12312 <span style="color:#999">内容分类</span>：12312
</div> </div>
<div> <div>
<span style="color:#999">授课教师</span>：12312 <span style="color:#999">授课教师</span>：{{ formData.sysType1 }}/{{ formData.sysType2 }}/{{ formData.sysType3 }}
</div> </div>
<div> <div>
<span style="color:#999">审核状态</span>：12312 <span style="color:#999">审核状态</span>：{{ formData.status }}
</div> </div>
</div> </div>
<div class="TableStudent"> <div class="TableStudent">
@@ -62,7 +62,8 @@
<a-col :span="1.5"> <a-col :span="1.5">
<CommonStudent <CommonStudent
:type="type" :type="type"
:id="id" title="添加在线课学员"
:id="formData.id"
@finash="submitCall" @finash="submitCall"
:stage="stage" :stage="stage"
> >
@@ -81,12 +82,11 @@
:pagination="stuPagination" :pagination="stuPagination"
:loading="loading" :loading="loading"
row-key="id" row-key="id"
:row-selection="stuRowSelection"
> >
<template #action="{ record }"> <template #action="{ record }">
<a-space :size="2"> <a-space :size="2">
<slot name="extension" v-bind:data="{ record }"></slot> <slot name="extension" v-bind:data="{ record }"></slot>
<a-button v-if="checkPer(permissions)" @click="del(record.id)" type="link" danger>删除</a-button> <a-button v-if="checkPer(permissions)" @click="del(record.courseStuId)" type="link" danger>删除</a-button>
</a-space> </a-space>
</template> </template>
</a-table> </a-table>
@@ -95,22 +95,20 @@
</a-modal> </a-modal>
</template> </template>
<script setup> <script setup>
import {computed, createVNode, defineExpose, defineProps, ref, watch} from "vue"; import {computed, defineExpose, defineProps, ref, watch} from "vue";
import {usePage} from "@/api/request"; import {boeRequest, usePage} from "@/api/request";
import {STUDENT_LIST} from "@/api/apis"; import {STUDENT_LIST} from "@/api/apis";
import {delStudentList} from "@/api/index1";
import {ExclamationCircleOutlined} from "@ant-design/icons-vue";
import {Modal} from "ant-design-vue";
import CommonStudent from "@/components/student/CommonStudent"; import CommonStudent from "@/components/student/CommonStudent";
import {checkPer} from "@/utils/utils"; import {checkPer} from "@/utils/utils";
import dialog from "@/utils/dialog";
import {ONLINE_COURSE_DEL} from "@/api/ThirdApi";
const props = defineProps({ const props = defineProps({
permissions: { permissions: {
type: String, type: String,
default: '' default: ""
}, },
type: Number, type: Number,
id: String,
stage: { stage: {
type: Array, type: Array,
default: () => [], default: () => [],
@@ -127,20 +125,20 @@ const initParams = {
studentName: "", studentName: "",
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
type: props.type || '', type: props.type || "",
types: props.types, types: props.types,
pid: props.id || '', pid: props.id || "",
} };
const searchParams = ref(initParams) const searchParams = ref(initParams);
const searchName = ref('') const searchName = ref("");
const columns = ref([ const columns = ref([
{ {
title: "姓名", title: "姓名",
dataIndex: "studentName", dataIndex: "studentName",
key: "studentName", key: "studentName",
width: 30, width: 50,
align: "center", align: "center",
ellipsis: true, ellipsis: true,
}, },
@@ -160,6 +158,76 @@ const columns = ref([
align: "center", align: "center",
ellipsis: true, ellipsis: true,
}, },
{
title: "岗位",
dataIndex: "studentJobName",
key: "studentJobName",
width: 80,
align: "center",
ellipsis: true,
},
{
title: "Band",
dataIndex: "studentBandDesc",
key: "studentBandDesc",
width: 80,
align: "center",
ellipsis: true,
},
{
title: "报名状态",
dataIndex: "studentDepartName",
key: "studentDepartName",
width: 80,
align: "center",
ellipsis: true,
customRender: () => "已报名",
},
{
title: "加入方式",
dataIndex: "studentDepartName",
key: "studentDepartName",
width: 80,
align: "center",
ellipsis: true,
customRender: () => "手动加入",
},
{
title: "数据来源",
dataIndex: "id",
key: "id",
width: 80,
align: "center",
ellipsis: true,
customRender: () => "-",
},
{
title: "评估状态",
dataIndex: "status",
key: "status",
width: 80,
align: "center",
ellipsis: true,
customRender: () => "-",
},
{
title: "考试成绩",
dataIndex: "score",
key: "score",
width: 80,
align: "center",
ellipsis: true,
customRender: ({ record: { score } }) => score || "-",
},
{
title: "状态",
dataIndex: "status",
key: "status",
width: 80,
align: "center",
ellipsis: true,
customRender: ({ record: { status } }) => status ? "已完成" : "未开始",
},
{ {
title: "操作", title: "操作",
dataIndex: "operation", dataIndex: "operation",
@@ -168,9 +236,11 @@ const columns = ref([
align: "center", align: "center",
slots: { customRender: "action" }, slots: { customRender: "action" },
}, },
]) ]);
const {data: studentList, fetch: searchStu, total, loading} = usePage(STUDENT_LIST, searchParams) const formData = ref({});
const { data: studentList, fetch: searchStu, total, loading } = usePage(STUDENT_LIST, searchParams, false);
const stuPagination = computed(() => ({ const stuPagination = computed(() => ({
total: total.value, total: total.value,
@@ -180,21 +250,13 @@ const stuPagination = computed(() => ({
onChange: changePagination onChange: changePagination
})); }));
const stuSelectKeys = ref([]);
const stuRowSelection = computed(() => ({ const openDrawer = (raw) => {
columnWidth: 20, console.log(raw);
selectedRowKeys: stuSelectKeys.value, searchParams.value.pid = raw.id;
onChange: onStuSelectChange, formData.value = raw;
preserveSelectedRowKeys: true,
}));
function onStuSelectChange(e) {
stuSelectKeys.value = e;
}
const openDrawer = () => {
visiable.value = true; visiable.value = true;
searchStu();
}; };
const changePagination = (page) => { const changePagination = (page) => {
@@ -202,20 +264,17 @@ const changePagination = (page) => {
}; };
function del(id) { function del(id) {
Modal.confirm({ dialog({ content: "确定删除?", ok: async () => {
title: () => '确定删除?',
icon: () => createVNode(ExclamationCircleOutlined),
content: () => '数据删除后不可恢复！',
okText: () => '确定',
okType: 'danger',
cancelText: () => '取消',
onOk() {
if (id) { if (id) {
loading.value = true loading.value = true;
delStudentList({ids: [id]}).then(() => searchStu()) await boeRequest(ONLINE_COURSE_DEL(id, formData.value.id))
searchStu()
} }
}, }});
}); }
function submitCall(flag) {
flag && searchStu();
} }
const closeDrawer = () => { const closeDrawer = () => {
@@ -223,13 +282,13 @@ const closeDrawer = () => {
}; };
function reset() { function reset() {
searchParams.value = initParams searchParams.value = initParams;
searchName.value = '' searchName.value = "";
} }
watch(visiable, () => { watch(visiable, () => {
visiable.value && searchStu() visiable.value && searchStu();
searchParams.value = initParams searchParams.value = initParams;
}); });
defineExpose({ defineExpose({
@@ -237,7 +296,7 @@ defineExpose({
loading, loading,
closeDrawer, closeDrawer,
openDrawer openDrawer
}) });
</script> </script>
<style lang="scss"> <style lang="scss">
.header-content { .header-content {

25
src/components/student/TableModelStudent.vue
View File

@@ -35,6 +35,7 @@
class="cus-btn" class="cus-btn"
style="background: #4ea6ff; color: #fff; width: 100px" style="background: #4ea6ff; color: #fff; width: 100px"
@click="search" @click="search"
:loading="stuAsyncLoading"
> >
<template #icon <template #icon
><img ><img
@@ -131,7 +132,6 @@
<script setup> <script setup>
import { import {
computed, computed,
// createVNode,
defineProps, defineProps,
defineExpose, defineExpose,
ref, ref,
@@ -140,8 +140,7 @@ import {
import { usePage } from "@/api/request"; import { usePage } from "@/api/request";
import { STUDENT_LIST } from "@/api/apis"; import { STUDENT_LIST } from "@/api/apis";
import { delStudentList } from "@/api/index1"; import { delStudentList } from "@/api/index1";
// import { ExclamationCircleOutlined } from "@ant-design/icons-vue"; import {useAsyncStu} from "@/utils/useCommon";
// import { Modal } from "ant-design-vue";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
@@ -231,6 +230,9 @@ const {
loading, loading,
} = usePage(STUDENT_LIST, searchParams); } = usePage(STUDENT_LIST, searchParams);
const { loading: stuAsyncLoading } = useAsyncStu(props.id, props.types.join(","), searchStu);
const stuPagination = computed(() => ({ const stuPagination = computed(() => ({
total: total.value, total: total.value,
showSizeChanger: false, showSizeChanger: false,
@@ -250,6 +252,7 @@ const changePagination = (page) => {
function search() { function search() {
searchParams.value.studentName = searchName.value; searchParams.value.studentName = searchName.value;
searchParams.value.pageNo = 1; searchParams.value.pageNo = 1;
searchStu()
} }
const deleteModalVisible = ref(false); const deleteModalVisible = ref(false);
@@ -257,20 +260,6 @@ const deleteId = ref(null);
function del(id) { function del(id) {
deleteModalVisible.value = true; deleteModalVisible.value = true;
deleteId.value = id; deleteId.value = id;
// Modal.confirm({
// title: () => "确定删除?",
// icon: () => createVNode(ExclamationCircleOutlined),
// content: () => "数据删除后不可恢复！",
// okText: () => "确定",
// okType: "danger",
// cancelText: () => "取消",
// onOk() {
// if (id) {
// loading.value = true;
// delStudentList({ ids: [id] }).then(() => searchStu());
// }
// },
// });
} }
//确定删除 //确定删除
@@ -294,6 +283,8 @@ const closeDrawer = () => {
function reset() { function reset() {
searchParams.value = initParams; searchParams.value = initParams;
searchName.value = ""; searchName.value = "";
searchParams.value.pageNo = 1;
searchStu()
} }
watch(visiable, () => { watch(visiable, () => {

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

@@ -42,9 +42,7 @@
style="width: 260px; height: 40px" style="width: 260px; height: 40px"
placeholder="是否为优秀学员" placeholder="是否为优秀学员"
:options="topFlagList" :options="topFlagList"
@change="selectProjectName"
allowClear allowClear
showSearch
></a-select> ></a-select>
</div> </div>
</a-form-item> </a-form-item>
@@ -54,6 +52,7 @@
class="cus-btn" class="cus-btn"
style="background: #4ea6ff; color: #fff; width: 100px" style="background: #4ea6ff; color: #fff; width: 100px"
@click="getStuList" @click="getStuList"
:loading="stuAsyncLoading"
> >
<template #icon> <template #icon>
<img <img
@@ -68,7 +67,7 @@
<template #icon> <template #icon>
<img <img
style="margin-right: 10px" style="margin-right: 10px"
src="../../assets/images/leveladd/reset.png" src="../../assets/images/courseManage/reset0.png"
/></template> /></template>
重置 重置
</a-button> </a-button>
@@ -104,7 +103,7 @@
<template #icon <template #icon
><img ><img
style="margin-right: 10px" style="margin-right: 10px"
src="../../assets/images/basicinfo/in2.png" src="../../assets/images/basicinfo/in.png"
/></template> /></template>
导入学员 导入学员
</a-button> </a-button>
@@ -131,7 +130,7 @@
<template #icon <template #icon
><img ><img
style="margin-right: 10px" style="margin-right: 10px"
src="../../assets/images/projectadd/delete.png" src="../../assets/images/projectadd/delete1.png"
/></template> /></template>
批量删除 批量删除
</a-button> </a-button>
@@ -223,13 +222,15 @@
v-if="type === 3 && record.status !== 0 && checkPer(permissions)" v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
@click="updateStatus(0, record.id)" @click="updateStatus(0, record.id)"
type="link" type="link"
>通过</a-button >通过
</a-button
> >
<a-button <a-button
v-if="type === 3 && record.status !== 0 && checkPer(permissions)" v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
@click="updateStatus(2, record.id)" @click="updateStatus(2, record.id)"
type="link" type="link"
>拒绝</a-button >拒绝
</a-button
> >
<a-button <a-button
v-if="checkPer(permissions)" v-if="checkPer(permissions)"
@@ -237,7 +238,8 @@
@click="del(record.id, record)" @click="del(record.id, record)"
type="link" type="link"
danger danger
>删除</a-button >删除
</a-button
> >
</a-space> </a-space>
</template> </template>
@@ -393,15 +395,14 @@ import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
import CommonStudent from "@/components/student/CommonStudent"; import CommonStudent from "@/components/student/CommonStudent";
import ChangeLevelModal from "./ChangeLevelModal.vue"; import ChangeLevelModal from "./ChangeLevelModal.vue";
import {message} from "ant-design-vue"; import {message} from "ant-design-vue";
// import { topStudent } from "../../api/indexProjStu";
import SeeStu from "../../components/drawers/SeeStu"; import SeeStu from "../../components/drawers/SeeStu";
import EScore from "../drawers/ExportScore.vue"; import EScore from "../drawers/ExportScore.vue";
import OrgClass from "@/components/project/OrgClass"; import OrgClass from "@/components/project/OrgClass";
import ExportHomeWork from "../Modals/ExportHomeWork.vue"; import ExportHomeWork from "../Modals/ExportHomeWork.vue";
import * as api from "../../api/index1"; import * as api from "../../api/index1";
import ImpStu from "../drawers/AddLevelImportStu"; import ImpStu from "../drawers/AddLevelImportStu";
// import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
import {checkPer} from "@/utils/utils"; import {checkPer} from "@/utils/utils";
import {useAsyncStu} from "@/utils/useCommon";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
@@ -435,6 +436,9 @@ const props = defineProps({
default: () => [], default: () => [],
}, },
}); });
const { loading: stuAsyncLoading, start } = useAsyncStu(props.id, props.type, getStuList);
const topFlagList = ref([ const topFlagList = ref([
{ {
id: 0, id: 0,
@@ -680,11 +684,12 @@ function bathDel() {
); );
} }
tableData.value.loading = true; tableData.value.loading = true;
delStudentList({ ids: stuSelectKeys.value }).then(() => getStuList()); delStudentList({ ids: stuSelectKeys.value, type: props.type, targetId: props.id }).then(() => getStuList());
} }
const deleteModalVisible = ref(false); const deleteModalVisible = ref(false);
const deleteId = ref(null); const deleteId = ref(null);
function del(id, row) { function del(id, row) {
if (row.isLeader === "1") { if (row.isLeader === "1") {
return message.warning("" + row.name + "是小组长，请勿删除!"); return message.warning("" + row.name + "是小组长，请勿删除!");
@@ -707,6 +712,7 @@ function del(id, row) {
// }, // },
// }); // });
} }
//确定删除 //确定删除
const sureSameModal = () => { const sureSameModal = () => {
if (deleteId.value) { if (deleteId.value) {
@@ -724,6 +730,7 @@ const closeSameModal = () => {
function submitCall(flag) { function submitCall(flag) {
tableData.value.loading = true; tableData.value.loading = true;
flag && getStuList(); flag && getStuList();
flag && start();
} }
// 调整关卡; // 调整关卡;
@@ -885,9 +892,11 @@ const AddImpStuvisibleClose = (isget) => {
getStuList(); getStuList();
} }
}; };
function startLoading() { function startLoading() {
tableData.value.loading = true; tableData.value.loading = true;
} }
defineExpose({ getStuList, startLoading }); defineExpose({ getStuList, startLoading });
</script> </script>
<style lang="scss"> <style lang="scss">
@@ -1194,11 +1203,13 @@ defineExpose({ getStuList, startLoading });
} }
} }
} }
.ant-modal-close-x { .ant-modal-close-x {
display: none; display: none;
} }
} }
} }
/*.delete { /*.delete {
z-index: 9999; z-index: 9999;
width: 424px; width: 424px;

62
src/utils/useCommon.js
View File

@@ -1,19 +1,22 @@
import {ref} from "vue"; import {onMounted, ref, watch} from "vue";
import {message} from "ant-design-vue"; import {message} from "ant-design-vue";
import {ASYNC_STUDENT_STATUS} from "@/api/apis";
import {request} from "@/api/request";
import dialog from "@/utils/dialog";
export function useInterval(fun, time) { export function useInterval(fun, time) {
const timer = ref(); const timer = ref();
function start(d) { function start(d) {
clearInterval(timer.value) clearInterval(timer.value);
timer.value = setInterval(async () => { timer.value = setInterval(async () => {
if (await fun(d)) { if (await fun(d)) {
clearInterval(timer.value) clearInterval(timer.value);
} }
}, time); }, time);
} }
return {start} return { start };
} }
export function useTimeout(asyncFun, time) { export function useTimeout(asyncFun, time) {
@@ -21,25 +24,56 @@ export function useTimeout(asyncFun, time) {
const maxCount = ref(0); const maxCount = ref(0);
function start(d) { function start(d) {
clearTimeout(timer.value) clearTimeout(timer.value);
maxCount.value = 0 maxCount.value = 0;
execute(d) execute(d);
} }
async function execute(d) { async function execute(d) {
if (maxCount.value > 300) { if (maxCount.value > 300) {
message.error("等待超时，请联系管理员！") message.error("等待超时，请联系管理员！");
throw Error("等待超时 查询任务结束") throw Error("等待超时 查询任务结束");
} }
try { try {
await asyncFun(d) await asyncFun(d);
maxCount.value = maxCount.value + 1 maxCount.value = maxCount.value + 1;
timer.value = setTimeout(() => execute(d), time); timer.value = setTimeout(() => execute(d), time);
} catch (e) { } catch (e) {
clearTimeout(timer.value) clearTimeout(timer.value);
console.log(e) console.log(e);
} }
} }
return {start} return { start };
} }
export function useAsyncStu(id, type, func) {
const loading = ref(false);
const { start } = useTimeout(async () => {
const { data } = await request(ASYNC_STUDENT_STATUS, { id, type });
if (!data) {
loading.value = false;
throw Error("查询任务结束");
}
loading.value = true;
}, 10000);
watch(loading, () => {
loading.value && dialog({
duration: 3500,
cancel: false,
content: "您选择的学员正在添加中，请耐心等待，进行其他操作不影响此次添加"
});
loading.value || (func && func());
});
onMounted(() => {
console.log(22222222);
console.log(id);
console.log(type);
id && type && start();
});
return { loading, start };
}

31
src/views/DownLoad.vue
View File

@@ -34,7 +34,7 @@
</div> </div>
<div class="btn2" @click="reseatDownloadList"> <div class="btn2" @click="reseatDownloadList">
<div class="img2"> <div class="img2">
<img src="../assets/images/courseManage/reset1.png" /> <img src="../assets/images/courseManage/reset0.png" />
</div> </div>
<div class="wz">重置</div> <div class="wz">重置</div>
</div> </div>
@@ -290,24 +290,24 @@ export default {
margin-left: 10px; margin-left: 10px;
} }
} }
.btn1:hover { // .btn1:hover {
background: rgba(64, 158, 255, 0.76); // background: rgba(64, 158, 255, 0.76);
.search { // .search {
background-image: url("../assets/images/courseManage/search0.png"); // background-image: url("../assets/images/courseManage/search0.png");
} // }
.btnText { // .btnText {
color: #ffffff; // color: #ffffff;
} // }
} // }
.btn1:active { .btn1:active {
background: #0982ff; background: #0982ff;
} }
.btn2:hover { // .btn2:hover {
background: rgba(64, 158, 255, 0.1); // background: rgba(64, 158, 255, 0.1);
} // }
.btn2:active { .btn2:active {
background: rgba(64, 158, 255, 0.2); background: rgba(64, 158, 255, 0.2);
} }
@@ -317,12 +317,11 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
color: #4ea6ff; color: #fff;
font-size: 14px; font-size: 14px;
background: #ffffff; background: #4ea6ff;
border-radius: 8px; border-radius: 8px;
cursor: pointer; cursor: pointer;
border: 1px solid #4ea6ff;
.wz { .wz {
margin-left: 10px; margin-left: 10px;
} }

37
src/views/courselibrary/CoursewareManage.vue
View File

@@ -3623,6 +3623,8 @@ export default defineComponent({
state.EditTestId = 0; state.EditTestId = 0;
state.assessmentId = null; state.assessmentId = null;
state.assessmentName = ""; state.assessmentName = "";
state.workInfo = {};
state.examInfo = {};
state.EditWorkId = null; state.EditWorkId = null;
state.beforeValue = null; //考勤 开始前 state.beforeValue = null; //考勤 开始前
state.afterStartValue = null; //考勤 开始后 state.afterStartValue = null; //考勤 开始后
@@ -4655,7 +4657,7 @@ export default defineComponent({
state.manageStuLoading = true; state.manageStuLoading = true;
console.log(787666, item); console.log(787666, item);
state.faceClassification = item.contentTxt; state.faceClassification = item.contentTxt;
state.faceStatus = item.kkty; state.faceStatus = item.status;
state.currentFaceId = item.id; state.currentFaceId = item.id;
getCourseStudentList(); getCourseStudentList();
state.newCourseName = item.name; state.newCourseName = item.name;
@@ -5138,7 +5140,7 @@ export default defineComponent({
.btnn { .btnn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: #ffffff; background: #4ea6ff;
border-radius: 8px; border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
display: flex; display: flex;
@@ -5155,7 +5157,7 @@ export default defineComponent({
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #4ea6ff; color: #fff;
line-height: 36px; line-height: 36px;
margin-left: 5px; margin-left: 5px;
} }
@@ -5168,18 +5170,23 @@ export default defineComponent({
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
} }
.btn1:active {
background: #0982ff;
}
.btn2:active {
background: #0982ff;
}
.btn2 { .btn2 {
.search { .search {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
.daochu { .daochu {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/coursewareManage/export.png"); background-image: url("../../assets/images/coursewareManage/export1.png");
} }
} }
@@ -5236,7 +5243,9 @@ export default defineComponent({
margin-left: 5px; margin-left: 5px;
} }
} }
.btn3:active {
background: #0982ff;
}
.btn3 { .btn3 {
.search { .search {
width: 17px; width: 17px;
@@ -6241,9 +6250,10 @@ export default defineComponent({
.btn { .btn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 40px; height: 40px;
background: rgba(64, 158, 255, 0); background: rgba(64, 158, 255, 1);
border-radius: 8px; border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
color: #fff;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@@ -6257,7 +6267,7 @@ export default defineComponent({
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: rgba(64, 158, 255, 1); color: #fff;
line-height: 36px; line-height: 36px;
margin-left: 5px; margin-left: 5px;
} }
@@ -6288,7 +6298,7 @@ export default defineComponent({
width: 16px; width: 16px;
height: 18px; height: 18px;
margin-right: 6px; margin-right: 6px;
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
} }
} }
@@ -6863,9 +6873,10 @@ export default defineComponent({
.btnn { .btnn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: #ffffff; background: #4ea6ff;
border-radius: 8px; border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
color:#fff;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@@ -6880,7 +6891,7 @@ export default defineComponent({
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #4ea6ff; color: #fff;
line-height: 36px; line-height: 36px;
margin-left: 5px; margin-left: 5px;
} }
@@ -6898,7 +6909,7 @@ export default defineComponent({
.search { .search {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
} }

3
src/views/courselibrary/OnlineManage.vue
View File

@@ -19,7 +19,7 @@
security="restricted" security="restricted"
sandbox="allow-forms allow-scripts allow-same-origin allow-popups" sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
></iframe> ></iframe>
<OnlineClassModelStudent ref="stuRef"></OnlineClassModelStudent> <OnlineClassModelStudent ref="stuRef" :type="13"></OnlineClassModelStudent>
</div> </div>
</template> </template>
<script setup> <script setup>
@@ -32,6 +32,7 @@ const stuRef = ref()
onMounted(() => { onMounted(() => {
window.openSelectStu = stuRef.value.openDrawer window.openSelectStu = stuRef.value.openDrawer
}) })
</script> </script>
<style lang="scss"> <style lang="scss">
.courseManage { .courseManage {

7
src/views/examine/CourseReviewed.vue
View File

@@ -678,7 +678,12 @@ export default {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
} }
.btn2:active {
background: #0982ff;
}
.btn1:active {
background: #0982ff;
}
.btn2 { .btn2 {
background: #4ea6ff; background: #4ea6ff;
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;

7
src/views/examine/CourseReviewedN.vue
View File

@@ -1613,7 +1613,12 @@ export default {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
} }
.btn2:active {
background: #0982ff;
}
.btn1:active {
background: #0982ff;
}
.btn2 { .btn2 {
background: #4ea6ff; background: #4ea6ff;
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;

11
src/views/examine/ProjectReviewed.vue
View File

@@ -89,10 +89,10 @@
@expand="expandTable" :pagination="false" /> @expand="expandTable" :pagination="false" />
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn22" @click="closeProjAuditModal" style="margin-right: 32px;"> <div class="del_btn btn22" @click="closeProjAuditModal" style="margin-right: 32px;color: #fff;background: #4ea6ff;">
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn22" @click="closeProjAuditModal"> <div class="del_btn btn22" @click="closeProjAuditModal" style="margin-right: 32px;color: #fff;background: #4ea6ff;">
<div class="btnText">确定</div> <div class="btnText">确定</div>
</div> </div>
</div> </div>
@@ -599,7 +599,12 @@ export default {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
} }
.btn22:active {
background: #0982ff;
}
.btn11:active {
background: #0982ff;
}
.btn22 { .btn22 {
background: #4ea6ff; background: #4ea6ff;
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;

7
src/views/examine/ProjectReviewedN.vue
View File

@@ -383,7 +383,12 @@ export default {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("../../assets/images/courseManage/search0.png");
} }
} }
.btn2:active {
background: #0982ff;
}
.btn1:active {
background: #0982ff;
}
.btn2 { .btn2 {
background: #4ea6ff; background: #4ea6ff;
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;

44
src/views/learningpath/LearningPath.vue
View File

@@ -2359,7 +2359,7 @@ export default {
.btnn { .btnn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: #ffffff; background: rgba(64, 158, 255, 1);
border-radius: 8px; border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
display: flex; display: flex;
@@ -2376,7 +2376,7 @@ export default {
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #4ea6ff; color: #fff;
line-height: 36px; line-height: 36px;
margin-left: 5px; margin-left: 5px;
} }
@@ -2394,32 +2394,32 @@ export default {
.search { .search {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
} }
.btn1:hover { // .btn1:hover {
background: rgba(64, 158, 255, 0.76); // background: rgba(64, 158, 255, 0.76);
.search { // .search {
background-image: url("../../assets/images/courseManage/search0.png"); // background-image: url("../../assets/images/courseManage/search0.png");
} // }
.btnText { // .btnText {
color: #ffffff; // color: #ffffff;
} // }
} // }
.btn1:active { .btn1:active {
background: #0982ff; background: #0982ff;
} }
.btn2:hover { // .btn2:hover {
background: rgba(64, 158, 255, 0.1); // background: rgba(64, 158, 255, 0.1);
} // }
.btn2:active { .btn2:active {
background: rgba(64, 158, 255, 0.2); background: #0982ff;
} }
} }
@@ -2462,18 +2462,6 @@ export default {
} }
} }
.btn3:hover {
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/add0.png");
}
.btnText {
color: #ffffff;
}
}
.btn3:active { .btn3:active {
background: #0982ff; background: #0982ff;
} }

22
src/views/learningpath/LevelAdd.vue
View File

@@ -2637,7 +2637,7 @@ export default {
codeUrl = codeUrl =
window.location.protocol + window.location.protocol +
process.env.VUE_APP_H5 + process.env.VUE_APP_H5 +
"/externalexam?courseId=" + "/externalexam?type=2&courseId=" +
item.courseId; item.courseId;
} else { } else {
codeUrl = codeUrl =
@@ -2705,7 +2705,7 @@ export default {
item.courseId + item.courseId +
"&evaType=" + "&evaType=" +
item.evaType + item.evaType +
"&targetId=" + "&type=2&targetId=" +
item.targetId; item.targetId;
} }
@@ -2737,7 +2737,7 @@ export default {
item.id + item.id +
"&chapterOrStageId=" + "&chapterOrStageId=" +
item.chapterId + item.chapterId +
"&infoId=" + "&type=2&infoId=" +
state.routerId; state.routerId;
} }
// 项目 // 项目
@@ -2745,7 +2745,7 @@ export default {
codeUrl = codeUrl =
window.location.protocol + window.location.protocol +
process.env.VUE_APP_H5 + process.env.VUE_APP_H5 +
"/projectdetails?projectId=" + "/projectdetails?type=2&projectId=" +
item.courseId; item.courseId;
} }
state.codevisible = true; state.codevisible = true;
@@ -2786,12 +2786,14 @@ export default {
// 共享文档文件下载 // 共享文档文件下载
const downloadFile = (url) => { const downloadFile = (url) => {
debugger url && window.open(url);
const urlNew = url.slice(1); console.log(url);
console.log(urlNew); window.open(
if (urlNew) { window.location.protocol +
window.open(process.env.VUE_APP_FILE_PATH + urlNew); process.env.VUE_APP_BOE_API_URL +
} process.env.VUE_APP_FILE_PATH +
url
);
// if(url){ // if(url){
// const filename = '操作指南' // const filename = '操作指南'
// const x = new XMLHttpRequest() // const x = new XMLHttpRequest()

3
src/views/learningpath/LevelAddDetail.vue
View File

@@ -140,7 +140,7 @@
</div> </div>
<div class="mid"> <div class="mid">
<div class="item" v-for="(value,key) in TASK_TYPE" :key="key"> <div class="item" v-for="(value,key) in TASK_TYPE" :key="key">
<component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="2" :id="routerInfo.routerInfo?.id" :courseSyncFlag="routerInfo.routerInfo?.courseSyncFlag"
v-model:task-list="routerInfo.chapterList[activeIndex].draftTaskList"> v-model:task-list="routerInfo.chapterList[activeIndex].draftTaskList">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -564,6 +564,7 @@ const submitStorage = async () => {
} }
confirmLoading.value = true; confirmLoading.value = true;
await request(ROUTER_DETAIL_MODIFY, routerInfo.value); await request(ROUTER_DETAIL_MODIFY, routerInfo.value);
await getDetail();
message.success("关卡和任务数据已保存"); message.success("关卡和任务数据已保存");
confirmLoading.value = false; confirmLoading.value = false;
}; };

378
src/views/projectcenter/LibraryAdd.vue
View File

@@ -34,14 +34,12 @@
</div> </div>
</div> </div>
<div class="line"></div> --> <div class="line"></div> -->
<router-link to="/templatelibrary" <router-link to="/templatelibrary">
>
<div style="display: flex"> <div style="display: flex">
<img class="img2" src="../../assets/images/leveladd/back.png" /> <img class="img2" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div> <div class="return">返回</div>
</div> </div>
</router-link </router-link>
>
</div> </div>
</div> </div>
<div class="split"></div> <div class="split"></div>
@@ -60,7 +58,10 @@
<!-- <button class="btn" @click="showFaceIn">批量面授报名</button> --> <!-- <button class="btn" @click="showFaceIn">批量面授报名</button> -->
<router-link <router-link
class="edit" class="edit"
:to="{ path: `/temTask`, query: { projectId: projectTemplateId } }" :to="{
path: `/temTask`,
query: { projectId: projectTemplateId },
}"
> >
<img <img
class="editimg" class="editimg"
@@ -422,84 +423,51 @@
><span>积分</span> ><span>积分</span>
</div> </div>
<div class="content"> <div class="content">
<span>完成作业成绩不低于 </span <span>完成作业成绩不低于 </span>
>
<a-input v-model:value="done2" :bordered="false" /> <a-input v-model:value="done2" :bordered="false" />
<span <span>分获得</span>
>分获得</span
>
<a-input v-model:value="done3" :bordered="false" /> <a-input v-model:value="done3" :bordered="false" />
<span <span>积分</span>
>积分</span
>
</div> </div>
<div class="content"> <div class="content">
<span>前</span <span>前</span>
>
<a-input v-model:value="four1" :bordered="false" /> <a-input v-model:value="four1" :bordered="false" />
<span <span>名学完在线课程获得</span>
>名学完在线课程获得</span
>
<a-input v-model:value="four2" :bordered="false" /> <a-input v-model:value="four2" :bordered="false" />
<span <span style="margin-right: 50px">积分</span>
style="margin-right: 50px" <span>前</span>
>积分</span
>
<span>前</span
>
<a-input v-model:value="four3" :bordered="false" /> <a-input v-model:value="four3" :bordered="false" />
<span <span>名提交作业且成绩不低于</span>
>名提交作业且成绩不低于</span
>
<a-input v-model:value="four4" :bordered="false" /> <a-input v-model:value="four4" :bordered="false" />
<span <span>分获得</span>
>分获得</span
>
<a-input v-model:value="four5" :bordered="false" /> <a-input v-model:value="four5" :bordered="false" />
<span <span>积分</span>
>积分</span
>
</div> </div>
<div class="content"> <div class="content">
<span>考试成绩高于</span <span>考试成绩高于</span>
>
<a-input v-model:value="five1" :bordered="false" /> <a-input v-model:value="five1" :bordered="false" />
<span <span>分获得</span>
>分获得</span
>
<a-input v-model:value="five2" :bordered="false" /> <a-input v-model:value="five2" :bordered="false" />
<span <span>积分</span>
>积分</span
>
</div> </div>
<div class="content"> <div class="content">
<span>考勤正常学员获得 </span <span>考勤正常学员获得 </span>
>
<a-input v-model:value="six1" :bordered="false" /> <a-input v-model:value="six1" :bordered="false" />
<span <span>积分</span>
>积分</span
>
</div> </div>
<div class="content"> <div class="content">
<span>成为小组长获得</span <span>成为小组长获得</span>
>
<a-input v-model:value="seven1" :bordered="false" /> <a-input v-model:value="seven1" :bordered="false" />
<span <span style="margin-right: 50px">积分</span>
style="margin-right: 50px"
>积分</span
>
<span>优秀学员可获得</span> <span>优秀学员可获得</span>
<a-input v-model:value="seven2" :bordered="false" /> <a-input v-model:value="seven2" :bordered="false" />
<span <span>积分</span>
>积分</span
>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="4" tab="设置"> <a-tab-pane key="4" tab="设置">
<div class="split"></div> <div class="split"></div>
<a-tabs> <a-tabs>
@@ -556,26 +524,33 @@
<div class="setc_name"><span>资源归属：</span></div> <div class="setc_name"><span>资源归属：</span></div>
<div class="setc_main"> <div class="setc_main">
<span style="color: #999999">{{ <span style="color: #999999">{{
(projectInfo.sourceBelongFullName || '') + projectInfo.sourceBelongName (projectInfo.sourceBelongFullName || "") +
projectInfo.sourceBelongName
}}</span> }}</span>
</div> </div>
</div> </div>
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>项目级别：</span></div> <div class="setc_name"><span>项目级别：</span></div>
<div class="setc_main"> <div class="setc_main">
<ProjectLevel :value="projectInfo.level" :tag="true"></ProjectLevel> <ProjectLevel
:value="projectInfo.level"
:tag="true"
></ProjectLevel>
</div> </div>
</div> </div>
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>培训体系：</span></div> <div class="setc_name"><span>培训体系：</span></div>
<div class="setc_main"> <div class="setc_main">
<TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass> <TrainClass
:value="projectInfo.systemId"
:tag="true"
></TrainClass>
</div> </div>
</div> </div>
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>同步学习记录：</span></div> <div class="setc_name"><span>同步学习记录：</span></div>
<div class="setc_main"> <div class="setc_main">
<a-radio v-model:checked="projectInfo.courseSyncFlag" :disabled="true" <a-radio v-model:checked="projectInfo.courseSyncFlag"
><span style="color: #333333" ><span style="color: #333333"
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-radio ></a-radio
@@ -585,7 +560,9 @@
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>是否BOEU实施：</span></div> <div class="setc_name"><span>是否BOEU实施：</span></div>
<div class="setc_main"> <div class="setc_main">
<a-radio v-model:checked="projectInfo.boeFlag" :disabled="true" <a-radio
v-model:checked="projectInfo.boeFlag"
:disabled="true"
><span style="color: #333333">BOEU实施</span></a-radio ><span style="color: #333333">BOEU实施</span></a-radio
> >
</div> </div>
@@ -633,7 +610,13 @@
> >
<img <img
src="@/assets/images/basicinfo/cloud.png" src="@/assets/images/basicinfo/cloud.png"
style="cursor: pointer; width: 24px; height: 24px; margin-left: 8px;margin-bottom: 3px;" style="
cursor: pointer;
width: 24px;
height: 24px;
margin-left: 8px;
margin-bottom: 3px;
"
alt="" alt=""
/> />
</a-upload> </a-upload>
@@ -649,7 +632,7 @@
<div <div
v-for="item in fileList" v-for="item in fileList"
:key="item.uid" :key="item.uid"
style="margin-bottom: 30px;" style="margin-bottom: 30px"
class="docListStyle" class="docListStyle"
> >
<!-- <img <!-- <img
@@ -662,35 +645,74 @@
" "
alt="" alt=""
/> --> /> -->
<img v-if=" <img
v-if="
item.name.indexOf('jpg') !== -1 || item.name.indexOf('jpg') !== -1 ||
item.name.indexOf('jpeg') !== -1 || item.name.indexOf('jpeg') !== -1 ||
item.name.indexOf('png') !== -1 item.name.indexOf('png') !== -1
" "
style="width: 27px;height: 32px;margin-right: 40px;" style="width: 27px; height: 32px; margin-right: 40px"
src="@/assets/images/coursewareManage/pngpic.png"/> src="@/assets/images/coursewareManage/pngpic.png"
/>
<div v-else> <div v-else>
<img v-if="item.name.indexOf('doc') !== -1" <img
style="width: 27px;height: 32px;margin-right: 40px;" v-if="item.name.indexOf('doc') !== -1"
src="@/assets/images/coursewareManage/docpic.png"/> style="
width: 27px;
height: 32px;
margin-right: 40px;
"
src="@/assets/images/coursewareManage/docpic.png"
/>
<div v-else> <div v-else>
<img v-if="item.name.indexOf('xls') !== -1" <img
style="width: 27px;height: 32px;margin-right: 40px;" v-if="item.name.indexOf('xls') !== -1"
src="@/assets/images/coursewareManage/xlspic.png"/> style="
width: 27px;
height: 32px;
margin-right: 40px;
"
src="@/assets/images/coursewareManage/xlspic.png"
/>
<div v-else> <div v-else>
<img v-if="item.name.indexOf('ppt') !== -1" <img
style="width: 27px;height: 32px;margin-right: 40px;" v-if="item.name.indexOf('ppt') !== -1"
src="@/assets/images/coursewareManage/pptpic.png"/> style="
width: 27px;
height: 32px;
margin-right: 40px;
"
src="@/assets/images/coursewareManage/pptpic.png"
/>
<div v-else> <div v-else>
<img v-if="item.name.indexOf('pdf') !== -1" <img
style="width: 27px;height: 32px;margin-right: 40px;" v-if="item.name.indexOf('pdf') !== -1"
src="@/assets/images/coursewareManage/pdfpic.png"/> style="
width: 27px;
height: 32px;
margin-right: 40px;
"
src="@/assets/images/coursewareManage/pdfpic.png"
/>
<div v-else> <div v-else>
<img v-if="item.name.indexOf('zip') !== -1" <img
style="width: 27px;height: 32px;margin-right: 40px;" v-if="item.name.indexOf('zip') !== -1"
src="@/assets/images/coursewareManage/zippic.png"/> style="
<img v-else style="width: 27px;height: 32px;margin-right: 40px;" width: 27px;
src="@/assets/images/coursewareManage/docpic.png"/> height: 32px;
margin-right: 40px;
"
src="@/assets/images/coursewareManage/zippic.png"
/>
<img
v-else
style="
width: 27px;
height: 32px;
margin-right: 40px;
"
src="@/assets/images/coursewareManage/docpic.png"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -698,13 +720,26 @@
</div> </div>
<span <span
style="font: oblique bold 16px Sans-serif;width:300px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ style="
item.name font: oblique bold 16px Sans-serif;
}}</span> width: 300px;
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
"
>{{ item.name }}</span
>
<a <a
href="javascript:void(0);" href="javascript:void(0);"
@click="downloadFile(item.response ? item.response.data : '')" @click="
style="margin-left: 5px">下载</a> downloadFile(
item.response ? item.response.data : ''
)
"
style="margin-left: 5px"
>下载</a
>
<span <span
style="color: #4ea6ff; cursor: pointer" style="color: #4ea6ff; cursor: pointer"
@click="deFile(item.uid)" @click="deFile(item.uid)"
@@ -716,8 +751,6 @@
</div> </div>
</div> </div>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
@@ -756,8 +789,7 @@
</div> </div>
</div> </div>
</div> </div>
</a-modal </a-modal>
>
</div> </div>
</div> </div>
</template> </template>
@@ -944,7 +976,9 @@ export default defineComponent({
const value = ref(""); const value = ref("");
const textnum = "150"; const textnum = "150";
const routered = useRouter(); const routered = useRouter();
const {query: {projectTemplateId}} = useRoute(); const {
query: { projectTemplateId },
} = useRoute();
const changeopclo = () => { const changeopclo = () => {
state.projectInfo.noticeFlag = state.checked ? 1 : 0; state.projectInfo.noticeFlag = state.checked ? 1 : 0;
api api
@@ -1017,7 +1051,7 @@ export default defineComponent({
// 获取详情 // 获取详情
const getDetail = () => { const getDetail = () => {
api.templateEditDetail(projectTemplateId).then((res) => { api.templateEditDetail(projectTemplateId).then((res) => {
state.templateInfo = res.data.data state.templateInfo = res.data.data;
state.taskSyllabus = []; state.taskSyllabus = [];
state.projectInfo = res.data.data.projectTemplateInfo; state.projectInfo = res.data.data.projectTemplateInfo;
state.noticeContent = state.projectInfo.notice; state.noticeContent = state.projectInfo.notice;
@@ -1027,13 +1061,12 @@ export default defineComponent({
res.data.data.projectTemplateInfo res.data.data.projectTemplateInfo
); );
try { try {
state.fileList = JSON.parse( state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach);
res.data.data.projectTemplateInfo.attach
);
} catch { } catch {
state.fileList = []; state.fileList = [];
} }
state.attachSwitch = res.data.data.projectTemplateInfo.attachSwitch == 1; state.attachSwitch =
res.data.data.projectTemplateInfo.attachSwitch == 1;
let data = res.data.data.stageList; let data = res.data.data.stageList;
console.log("data=====", data); console.log("data=====", data);
for (let i in data) { for (let i in data) {
@@ -1060,7 +1093,7 @@ export default defineComponent({
}); });
} }
} }
}) });
}; };
// 发布公告 // 发布公告
@@ -1148,7 +1181,7 @@ export default defineComponent({
projectTaskId: 0, projectTaskId: 0,
projectTemplateId: localStorage.getItem("projectTemplateId"), projectTemplateId: localStorage.getItem("projectTemplateId"),
stageId: 0, stageId: 0,
type: 0 type: 0,
}; };
api api
.editTask(obj) .editTask(obj)
@@ -1165,6 +1198,7 @@ export default defineComponent({
scoreRule({ scoreRule({
projectId: projectTemplateId, projectId: projectTemplateId,
}) })
<<<<<<< HEAD
.then((res) => { .then((res) => {
let result = res.data.data; let result = res.data.data;
//Write operation failed: computed value is readonly 总积分 //Write operation failed: computed value is readonly 总积分
@@ -1196,6 +1230,51 @@ export default defineComponent({
.catch((err) => { .catch((err) => {
console.log("获取项目积分规则失败了", err); console.log("获取项目积分规则失败了", err);
}); });
=======
.then((res) => {
let result = res.data.data;
//Write operation failed: computed value is readonly 总积分
state.scoresum =
Number(result[0].pointsCount) +
Number(result[1].pointsCount) +
Number(result[2].pointsCount) +
Number(result[3].pointsCount) +
Number(result[4].pointsCount) +
Number(result[5].pointsCount) +
Number(result[6].pointsCount) +
Number(result[7].pointsCount);
state.score1 = result[0].pointsCount;
state.done2 = result[1].typeDescConfig;
state.done3 = result[1].pointsCount;
state.four1 = result[2].typeDescConfig;
state.four2 = result[2].pointsCount;
state.four3 = result[3].typeDescConfig.slice(
0,
result[3].typeDescConfig.indexOf(";")
);
state.four4 = result[3].typeDescConfig.slice(
result[3].typeDescConfig.indexOf(";") + 1
);
state.four5 = result[3].pointsCount;
state.five1 = result[4].typeDescConfig;
state.five2 = result[4].pointsCount;
state.six1 = result[5].pointsCount;
state.seven1 = result[6].pointsCount;
state.seven2 = result[7].pointsCount;
})
.catch((err) => {
console.log("获取项目积分规则失败了", err);
});
>>>>>>> 62a0600a8a44904ec64b4bb4c14a4eb3e3dc7d74
}; };
const handleChange2 = ({ file, fileList }) => { const handleChange2 = ({ file, fileList }) => {
console.log(fileList); console.log(fileList);
@@ -1276,16 +1355,16 @@ export default defineComponent({
attach: str, attach: str,
}) })
.then((res) => { .then((res) => {
console.log(res) console.log(res);
message.destroy(); message.destroy();
message.success("删除成功"); message.success("删除成功");
return return;
}) })
.catch((err) => { .catch((err) => {
console.log(err) console.log(err);
message.destroy(); message.destroy();
message.warning("删除失败"); message.warning("删除失败");
return return;
}); });
}; };
@@ -1293,7 +1372,9 @@ export default defineComponent({
const checkedClose = (data, a) => { const checkedClose = (data, a) => {
console.log(data, a); console.log(data, a);
console.log("模板id：" + projectTemplateId); console.log("模板id：" + projectTemplateId);
console.log("开关数据：" + JSON.stringify(data) + "====" + JSON.stringify(a)) console.log(
"开关数据：" + JSON.stringify(data) + "====" + JSON.stringify(a)
);
state.attachSwitch = data; state.attachSwitch = data;
// 更新开关状态 // 更新开关状态
@@ -1317,54 +1398,54 @@ export default defineComponent({
projectId: projectTemplateId, projectId: projectTemplateId,
datas: [ datas: [
{ {
"type": 1, type: 1,
"pointsCount": Number(state.score1), pointsCount: Number(state.score1),
"typeDesc": "完成【必修/选修】获得%p积分", typeDesc: "完成【必修/选修】获得%p积分",
"typeDescConfig": "" typeDescConfig: "",
}, },
{ {
"type": 2, type: 2,
"pointsCount": Number(state.done3), pointsCount: Number(state.done3),
"typeDesc": "完成作业成绩不低于%d分获得%p积分", typeDesc: "完成作业成绩不低于%d分获得%p积分",
"typeDescConfig": state.done2 typeDescConfig: state.done2,
}, },
{ {
"type": 3, type: 3,
"pointsCount": Number(state.four2), pointsCount: Number(state.four2),
"typeDesc": "前%d名学完在线课程获得%p积分", typeDesc: "前%d名学完在线课程获得%p积分",
"typeDescConfig": state.four1 typeDescConfig: state.four1,
}, },
{ {
"type": 4, type: 4,
"pointsCount": Number(state.four5), pointsCount: Number(state.four5),
"typeDesc": "前%d名提交作业且成绩不低于%d分获得%p积分", typeDesc: "前%d名提交作业且成绩不低于%d分获得%p积分",
"typeDescConfig": state.four3 + ';' + state.four4 typeDescConfig: state.four3 + ";" + state.four4,
}, },
{ {
"type": 5, type: 5,
"pointsCount": Number(state.five2), pointsCount: Number(state.five2),
"typeDesc": "考试成绩高于%d分获得%p积分", typeDesc: "考试成绩高于%d分获得%p积分",
"typeDescConfig": state.five1 typeDescConfig: state.five1,
}, },
{ {
"type": 6, type: 6,
"pointsCount": Number(state.six1), pointsCount: Number(state.six1),
"typeDesc": "考勤正常学员获得%p积分", typeDesc: "考勤正常学员获得%p积分",
"typeDescConfig": "" typeDescConfig: "",
}, },
{ {
"type": 7, type: 7,
"pointsCount": Number(state.seven1), pointsCount: Number(state.seven1),
"typeDesc": "成为小组长获得%p积分", typeDesc: "成为小组长获得%p积分",
"typeDescConfig": "" typeDescConfig: "",
}, },
{ {
"type": 8, type: 8,
"pointsCount": Number(state.seven2), pointsCount: Number(state.seven2),
"typeDesc": "优秀学员可获得%p积分", typeDesc: "优秀学员可获得%p积分",
"typeDescConfig": "" typeDescConfig: "",
} },
] ],
}; };
console.log(obj); console.log(obj);
setScoreRule(obj) setScoreRule(obj)
@@ -1387,10 +1468,17 @@ export default defineComponent({
// 共享文档文件下载 // 共享文档文件下载
const downloadFile = (url) => { const downloadFile = (url) => {
console.log(url) console.log(url);
if (url) { window.open(
window.open(url) window.location.protocol +
} process.env.VUE_APP_BOE_API_URL +
process.env.VUE_APP_FILE_PATH +
url
);
// if (url) {
// window.open(url)
// }
// if(url){ // if(url){
// const filename = '操作指南' // const filename = '操作指南'
// const x = new XMLHttpRequest() // const x = new XMLHttpRequest()
@@ -1406,7 +1494,7 @@ export default defineComponent({
// } // }
// x.send() // x.send()
// } // }
} };
return { return {
...toRefs(state), ...toRefs(state),
@@ -1431,7 +1519,7 @@ export default defineComponent({
checkedClose, checkedClose,
editNotice, editNotice,
deFile, deFile,
downloadFile downloadFile,
}; };
}, },
}); });

17
src/views/projectcenter/ProjectAdd.vue
View File

@@ -150,21 +150,8 @@
<div class="namebox"> <div class="namebox">
<div class="inname">同步学习记录</div> <div class="inname">同步学习记录</div>
</div> </div>
<div class="in ggysxz" v-if="courseSyncFlag"> <div class="in ggysxz">
<!-- :disabled="viewDetail ? true : false" --> <a-checkbox v-model:checked="courseSyncFlag">
<a-checkbox v-model:checked="courseSyncFlag" disabled>
<span style="
width: 100%;
color: rgba(109, 117, 132, 1);
font-size: 14px;
">
同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
</span>
</a-checkbox>
</div>
<div class="in" v-else>
<!-- :disabled="viewDetail ? true : false" -->
<a-checkbox v-model:checked="courseSyncFlag" disabled>
<span style=" <span style="
width: 100%; width: 100%;
color: rgba(109, 117, 132, 1); color: rgba(109, 117, 132, 1);

43
src/views/projectcenter/ProjectManage.vue
View File

@@ -1352,8 +1352,11 @@ export default {
projectId: state.copyProjectId, projectId: state.copyProjectId,
type: 2 type: 2
}) })
.then(() => getTableDate()); .then(() => {
state.tableLoading = false;
message.success("复制成功"); message.success("复制成功");
getTableDate()
});
}; };
//打开提交审核弹窗 //打开提交审核弹窗
const showReviewModal = (projectId) => { const showReviewModal = (projectId) => {
@@ -1829,7 +1832,7 @@ export default {
.btn { .btn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: rgba(64, 158, 255, 0); background: #4ea6ff;
border-radius: 8px; border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
display: flex; display: flex;
@@ -1846,7 +1849,7 @@ export default {
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: rgba(64, 158, 255, 1); color: #fff;
line-height: 36px; line-height: 36px;
margin-left: 5px; margin-left: 5px;
} }
@@ -1890,32 +1893,32 @@ export default {
.search { .search {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
} }
.btn1:hover { // .btn1:hover {
background: rgba(64, 158, 255, 0.76); // background: rgba(64, 158, 255, 0.76);
.search { // .search {
background-image: url("../../assets/images/courseManage/search0.png"); // background-image: url("../../assets/images/courseManage/search0.png");
} // }
.btnText { // .btnText {
color: #ffffff; // color: #ffffff;
} // }
} // }
.btn1:active { .btn1:active {
background: #0982ff; background: #0982ff;
} }
.btn2:hover { // .btn2:hover {
background: rgba(64, 158, 255, 0.1); // background: rgba(64, 158, 255, 0.1);
} // }
.btn2:active { .btn2:active {
background: rgba(64, 158, 255, 0.2); background: #0982ff;
} }
} }
@@ -1958,9 +1961,9 @@ export default {
} }
} }
.btn3:hover { // .btn3:hover {
background: rgba(64, 158, 255, 0.76); // background: rgba(64, 158, 255, 0.76);
} // }
.btn3:active { .btn3:active {
background: #0982ff; background: #0982ff;

5
src/views/projectcenter/TaskAdd.vue
View File

@@ -25,7 +25,7 @@
<a-popover placement="topLeft" trigger="click"> <a-popover placement="topLeft" trigger="click">
<template #content> <template #content>
<div style="width: 130px"> <div style="width: 130px">
{{ element.name || "暂无说明" }} {{ element.remark || "暂无说明" }}
</div> </div>
</template> </template>
<template #title> <template #title>
@@ -100,7 +100,7 @@
<div class="mid"> <div class="mid">
<div class="item" v-for="(value,key) in TASK_TYPE" :key="key"> <div class="item" v-for="(value,key) in TASK_TYPE" :key="key">
<div v-if="key!=13"> <div v-if="key!=13">
<component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="1" :id="projectInfo.projectInfo?.id" :courseSyncFlag="projectInfo.projectInfo?.courseSyncFlag"
v-model:task-list="projectInfo.stageList[activeIndex].taskDraftDtoList"> v-model:task-list="projectInfo.stageList[activeIndex].taskDraftDtoList">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">
@@ -613,6 +613,7 @@ const submitStorage = async () => {
} }
confirmLoading.value = true confirmLoading.value = true
await request(PROJECT_DETAIL_MODIFY, projectInfo.value) await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
await getTask()
message.success("阶段和任务数据已保存") message.success("阶段和任务数据已保存")
confirmLoading.value = false confirmLoading.value = false
}; };

55
src/views/projectcenter/TaskPage.vue
View File

@@ -366,12 +366,13 @@
:key="item.stageId" :key="item.stageId"
@click="stageChange(item, index)" @click="stageChange(item, index)"
> >
{{ item.name || "无阶段" }} <div v-if="item.id === '0'">无阶段</div>
<div v-else>{{ "阶段" + (index + 1) }}</div>
</div> </div>
<!-- <div class="stage1">阶段1</div> <!-- <div class="stage1">阶段1</div>
<div class="stage2">阶段2</div> --> <div class="stage2">阶段2</div> -->
</div> </div>
<div class="stagesecond"> <div class="stagesecond" v-if="choosedStageName">
<div class="staname">阶段名称：</div> <div class="staname">阶段名称：</div>
<div class="stamess">{{ choosedStageName }}</div> <div class="stamess">{{ choosedStageName }}</div>
</div> </div>
@@ -465,7 +466,7 @@
<button class="edit"> <button class="edit">
<img <img
class="editimg" class="editimg"
src="../../assets/images/projectadd/edit.png" src="../../assets/images/projectadd/edit1.png"
/> />
<span class="editext">编辑</span> <span class="editext">编辑</span>
</button> </button>
@@ -2918,13 +2919,16 @@ export default {
} }
} }
levelList.stageList = res.data.data.stageList; levelList.stageList = res.data.data.stageList;
if (levelList.stageList.length === 1) { if (
levelList.stageList.length === 1 &&
levelList.stageList[0].id === "0"
) {
// 无解段任务 // 无解段任务
state.rankjieduan = [{ value: 0, label: "无阶段" }]; state.rankjieduan = [{ value: 0, label: "无阶段" }];
state.valuestu2 = 0; state.valuestu2 = 0;
} else { } else {
// 有阶段任务 // 有阶段任务
console.log(levelList.stageList); console.log("有阶段任务", levelList.stageList);
let arrStage = []; let arrStage = [];
for (let i = 0; i < levelList.stageList.length; i++) { for (let i = 0; i < levelList.stageList.length; i++) {
if (levelList.stageList[i].id !== "0") { if (levelList.stageList[i].id !== "0") {
@@ -3925,7 +3929,7 @@ export default {
}; };
//创建小组 //创建小组
const createGroup = async () => { const createGroup = async () => {
debugger debugger;
console.log("state.groupPageList" + state.groupPageList); console.log("state.groupPageList" + state.groupPageList);
const id = state.groupInfo.id; const id = state.groupInfo.id;
const d = state.groupPageList const d = state.groupPageList
@@ -4513,7 +4517,7 @@ export default {
codeUrl = codeUrl =
window.location.protocol + window.location.protocol +
process.env.VUE_APP_H5 + process.env.VUE_APP_H5 +
"/faceteach?type=2&courseId=" + "/faceteach?type=1&courseId=" +
item.courseId + item.courseId +
"&id=" + "&id=" +
item.id; item.id;
@@ -4540,7 +4544,7 @@ export default {
codeUrl = codeUrl =
window.location.protocol + window.location.protocol +
process.env.VUE_APP_H5 + process.env.VUE_APP_H5 +
"/externalexam?courseId=" + "/externalexam?type=1&courseId=" +
item.courseId; item.courseId;
} else { } else {
codeUrl = codeUrl =
@@ -4607,7 +4611,7 @@ export default {
process.env.VUE_APP_H5 + process.env.VUE_APP_H5 +
"/evaluation?courseId=" + "/evaluation?courseId=" +
item.courseId + item.courseId +
"&evaType=" + "&type=1&evaType=" +
item.evaType + item.evaType +
"&targetId=" + "&targetId=" +
item.targetId; item.targetId;
@@ -4638,7 +4642,7 @@ export default {
process.env.VUE_APP_H5 + process.env.VUE_APP_H5 +
"/ballotpage?courseId=" + "/ballotpage?courseId=" +
item.courseId + item.courseId +
"&btype=2&id=" + "&type=1&btype=2&id=" +
item.id + item.id +
"&chapterOrStageId=" + "&chapterOrStageId=" +
item.stageId + item.stageId +
@@ -4663,7 +4667,7 @@ export default {
url: url:
window.location.protocol + window.location.protocol +
process.env.VUE_APP_H5 + process.env.VUE_APP_H5 +
"/projectdetails?projectId=" + "/projectdetails?type=1&projectId=" +
state.projectId, state.projectId,
}; };
state.codeInfo = obj; state.codeInfo = obj;
@@ -4678,8 +4682,14 @@ export default {
} }
// 共享文档文件下载 // 共享文档文件下载
const downloadFile = (url) => { const downloadFile = (url) => {
debugger
url && window.open(url); url && window.open(url);
console.log(url);
window.open(
window.location.protocol +
process.env.VUE_APP_BOE_API_URL +
process.env.VUE_APP_FILE_PATH +
url
);
}; };
function stageChange(item, index) { function stageChange(item, index) {
state.choosedStageName = item.name; state.choosedStageName = item.name;
@@ -5955,12 +5965,13 @@ export default {
position: absolute; position: absolute;
right: 38px; right: 38px;
top: 0; top: 0;
color: #4ea6ff; color: #fff;
background: #ffffff; background: #4ea6ff;
width: 100px; width: 100px;
height: 40px; height: 40px;
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;
border-radius: 8px; border-radius: 8px;
cursor: pointer;
.editimg { .editimg {
width: 15px; width: 15px;
@@ -5974,15 +5985,15 @@ export default {
} }
} }
.edit:hover { // .edit:hover {
color: #ffffff; // color: #ffffff;
background-color: #4ea6ff; // background-color: #4ea6ff;
cursor: pointer; // cursor: pointer;
.editimg { // .editimg {
background-image: url("../../assets/images/projectadd/edit1.png"); // background-image: url("../../assets/images/projectadd/edit1.png");
} // }
} // }
} }
.second { .second {

36
src/views/projectcenter/TemplateLibrary.vue
View File

@@ -368,10 +368,15 @@ export default defineComponent({
} }
.btnText2 { .btnText2 {
color: rgba(64, 158, 255, 1); color: rgb(255, 255, 255);
} }
} }
.btn1:active {
background: #0982ff;
}
.btn2:active {
background: #0982ff;
}
.btn1 { .btn1 {
background: #4ea6ff; background: #4ea6ff;
@@ -383,39 +388,14 @@ export default defineComponent({
} }
.btn2 { .btn2 {
background: #ffffff; background: #4ea6ff;
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;
.search { .search {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png");
}
}
.btn1:hover {
background: rgb(255, 255, 255);
border: 1px solid #4ea6ff;
.search {
background-image: url("../../assets/images/courseManage/search1.png");
}
.btnText {
color: rgba(64, 158, 255, 1);
}
}
.btn2:hover {
background: rgba(64, 158, 255, 1);
.search {
background-image: url("../../assets/images/courseManage/reset0.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
.btnText {
color: #ffffff;
}
} }
} }
} }

2
src/views/projectcenter/temTask.vue
View File

@@ -98,7 +98,7 @@
<div class="mid"> <div class="mid">
<div class="item" v-for="(value, key) in TASK_TYPE" :key="key"> <div class="item" v-for="(value, key) in TASK_TYPE" :key="key">
<div v-if="key != 13"> <div v-if="key != 13">
<component :is="value.component" :ref="el => courseRef['el' + key] = el" :type="key" <component :is="value.component" :ref="el => courseRef['el' + key] = el" :type="key" :infoType="1" :id="projectInfo.projectTemplateInfo?.id"
v-model:task-list="projectInfo.stageList[activeIndex].taskTemplateList"> v-model:task-list="projectInfo.stageList[activeIndex].taskTemplateList">
<div class="itcon"> <div class="itcon">
<div class="img"> <div class="img">

4
src/views/projectcenter/templateAdd.vue
View File

@@ -197,7 +197,7 @@
</div> </div>
<div class="in ggysxz" v-if="courseSyncFlag"> <div class="in ggysxz" v-if="courseSyncFlag">
<!-- :disabled="viewDetail ? true : false" --> <!-- :disabled="viewDetail ? true : false" -->
<a-checkbox disabled v-model:checked="courseSyncFlag" <a-checkbox v-model:checked="courseSyncFlag"
><span ><span
style=" style="
width: 100%; width: 100%;
@@ -210,7 +210,7 @@
</div> </div>
<div class="in" v-else> <div class="in" v-else>
<!-- :disabled="viewDetail ? true : false" --> <!-- :disabled="viewDetail ? true : false" -->
<a-checkbox disabled v-model:checked="courseSyncFlag" <a-checkbox v-model:checked="courseSyncFlag"
><span ><span
style=" style="
width: 100%; width: 100%;

21
src/views/research/ManagePage.vue
View File

@@ -31,7 +31,7 @@
</div> </div>
<div style="width: 103px; margin-right: 126px; float: left"> <div style="width: 103px; margin-right: 126px; float: left">
<span class="name">创建人:</span> <span class="name">创建人:</span>
<span class="descript">{{ basicInfo.createName }}</span> <span class="descript">{{ createName }}</span>
</div> </div>
<div style="width: 88px; margin-right: 126px; float: left"> <div style="width: 88px; margin-right: 126px; float: left">
<span class="name">状态:</span> <span class="name">状态:</span>
@@ -40,7 +40,7 @@
</div> </div>
<div style="width: 192px; margin-right: 126px; float: left"> <div style="width: 192px; margin-right: 126px; float: left">
<span class="name">创建时间:</span> <span class="name">创建时间:</span>
<span class="descript">{{ basicInfo.createTime }}</span> <span class="descript">{{ createTime }}</span>
</div> </div>
<div style="width: 192px; margin-right: 126px; float: left"> <div style="width: 192px; margin-right: 126px; float: left">
<span class="name">发布时间:</span> <span class="name">发布时间:</span>
@@ -82,7 +82,7 @@
import ViewAssess from "../../components/drawers/ViewAssess"; import ViewAssess from "../../components/drawers/ViewAssess";
import { reactive, toRefs } from "vue"; import { reactive, toRefs } from "vue";
import { queryAssessmentDetailList } from "@/api/indexResearch"; import { queryAssessmentDetailList } from "@/api/indexResearch";
import { useRouter } from "vue-router"; import { useRouter, useRoute } from "vue-router";
import * as api from "@/api/indexTaskManage"; import * as api from "@/api/indexTaskManage";
export default { export default {
@@ -90,6 +90,7 @@ export default {
components: { ViewAssess }, components: { ViewAssess },
setup() { setup() {
const router = useRouter(); const router = useRouter();
const { query: { createName, createTime }} = useRoute();
const state = reactive({ const state = reactive({
Assessvisible: false, Assessvisible: false,
basicInfo: "", basicInfo: "",
@@ -322,7 +323,9 @@ export default {
], ],
showassess, showassess,
changePaginationStu, changePaginationStu,
exportStudentInfo exportStudentInfo,
createName,
createTime
}; };
}, },
}; };
@@ -482,7 +485,7 @@ export default {
.img2 { .img2 {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url(../../assets/images/coursewareManage/export.png); background-image: url(../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%; background-size: 100% 100%;
margin-right: 7px; margin-right: 7px;
} }
@@ -495,9 +498,13 @@ export default {
} }
.btn2 { .btn2 {
background: #ffffff; background: #4ea6ff;
color: #4ea6ff; color: #fff;
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;
} }
.btn2:active {
background: #0982ff;
}
}</style> }</style>

5
src/views/research/ResearchAdd.vue
View File

@@ -82,6 +82,8 @@
height: 40px; height: 40px;
margin-left: 14px; margin-left: 14px;
border-radius: 8px; border-radius: 8px;
color:#fff;
background-color: #4ea6ff;
" "
@click="handleAllCancel" @click="handleAllCancel"
> >
@@ -665,7 +667,8 @@ export default {
cursor: pointer; cursor: pointer;
width: 80px; width: 80px;
height: 40px; height: 40px;
color: #4ea6ff; color: #fff;
background: #4ea6ff;
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;
border-radius: 4px; border-radius: 4px;
display: flex; display: flex;

57
src/views/research/ResearchManage.vue
View File

@@ -76,7 +76,7 @@
@click=" handleEditPage(record.id)" type="link">基础信息 @click=" handleEditPage(record.id)" type="link">基础信息
</a-button> </a-button>
<a-button v-if="record.releaseStatus === '2' && checkPer(record.permissions)" <a-button v-if="record.releaseStatus === '2' && checkPer(record.permissions)"
@click=" toManage(record.id)" type="link">管理 @click=" toManage(record.id, record)" type="link">管理
</a-button> </a-button>
<a-button v-if="checkPer(record.permissions)" @click=" handleOper(record,'copy')" type="link">复制 <a-button v-if="checkPer(record.permissions)" @click=" handleOper(record,'copy')" type="link">复制
</a-button> </a-button>
@@ -144,7 +144,7 @@
</div> </div>
</div> </div>
<div class="btn"> <div class="btn">
<button class="samtn btn1" @click="handleCancel">取消</button> <button class="samtn btn2" @click="handleCancel">取消</button>
<a-button class="samtn btn2" @click="handleNext" :loading="formData.validated===1"> <a-button class="samtn btn2" @click="handleNext" :loading="formData.validated===1">
{{ !formData.id ? "下一步" : "确定" }} {{ !formData.id ? "下一步" : "确定" }}
</a-button> </a-button>
@@ -369,9 +369,10 @@ function handleEditPage(id) {
router.push("/researchadd/" + id); router.push("/researchadd/" + id);
} }
function toManage(id) { function toManage(id, record) {
router.push("/managepage/" + id); router.push({ path: `/managepage/${id}`, query: { createName:record.createName, createTime:record.createTime } });
} }
const handleNext = async () => { const handleNext = async () => {
await validate().catch(({ errorFields }) => { await validate().catch(({ errorFields }) => {
message.warning(errorFields[0].errors.join()); message.warning(errorFields[0].errors.join());
@@ -588,7 +589,7 @@ const handleNext = async () => {
.btnn { .btnn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: #ffffff; background: #4ea6ff;
border-radius: 8px; border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
display: flex; display: flex;
@@ -605,7 +606,7 @@ const handleNext = async () => {
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #4ea6ff; color: #fff;
line-height: 36px; line-height: 36px;
margin-left: 5px; margin-left: 5px;
} }
@@ -623,29 +624,29 @@ const handleNext = async () => {
.search { .search {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
} }
.btn1:hover { // .btn1:hover {
background: rgba(64, 158, 255, 0.76); // background: rgba(64, 158, 255, 0.76);
.search { // .search {
background-image: url("../../assets/images/courseManage/search0.png"); // background-image: url("../../assets/images/courseManage/search0.png");
} // }
.btnText { // .btnText {
color: #ffffff; // color: #ffffff;
} // }
} // }
.btn1:active { .btn1:active {
background: #0982ff; background: #0982ff;
} }
.btn2:hover { // .btn2:hover {
background: rgba(64, 158, 255, 0.1); // background: rgba(64, 158, 255, 0.1);
} // }
.btn2:active { .btn2:active {
background: rgba(64, 158, 255, 0.2); background: rgba(64, 158, 255, 0.2);
@@ -691,17 +692,17 @@ const handleNext = async () => {
} }
} }
.btn3:hover { // .btn3:hover {
background: rgba(64, 158, 255, 0.76); // background: rgba(64, 158, 255, 0.76);
.search { // .search {
background-image: url("../../assets/images/courseManage/add0.png"); // background-image: url("../../assets/images/courseManage/add0.png");
} // }
.btnText { // .btnText {
color: #ffffff; // color: #ffffff;
} // }
} // }
.btn3:active { .btn3:active {
background: #0982ff; background: #0982ff;