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

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

Browse Source 
# Conflicts:
#	src/components/drawers/AddOpenCourse.vue
This commit is contained in:
yuping
2023-03-18 00:34:04 +08:00
parent 8c7755c1c4 280fb6c279
commit 5522b5c2dc
4 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/config.js
View File

@@ -61,6 +61,8 @@ http.interceptors.response.use(
(process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ?
router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) :
(window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
// TODO token过期后退出登录 清空当前用户标记 - 为了刷新页面使用
localStorage.removeItem('refreshPage')
return Promise.reject(response);
}
show && message.error(msg);

33
src/components/drawers/AddOpenCourse.vue
View File

@@ -122,10 +122,10 @@
<a-input
v-model:value="formData.address"
maxlength="50"
style="width: 440px; height: 40px; border-radius: 8px"
style="width: 88%; height: 40px; border-radius: 8px"
placeholder="请输入详细地点"
/>
<div class="inp_num" style="right: 164px">
<div class="inp_num" style="right: 90px">
<span style="color: #c7cbd2">{{ formData.address.length || 0 }}/50</span>
</div>
</div>
@@ -142,7 +142,7 @@
</div>
<div class="select fitems">
<a-range-picker
style="width: 440px; height: 40px; border-radius: 8px"
style="width: 88%; height: 40px; border-radius: 8px"
:show-time="{ format: 'HH:mm' }"
:disabled-date="disabledDate"
format="YYYY-MM-DD HH:mm"
@@ -164,7 +164,7 @@
</div>
<span style="margin-right: 3px">授课教师</span>
</div>
<div class="select" style="width: 440px">
<div class="select" style="width: 88%">
<ProjectManager
v-model:value="formData.teacherId"
v-model:name="formData.teacher"
@@ -173,10 +173,10 @@
</div>
<div class="cstm_items">
<div class="signbox">
<span style="margin-right: 3px">考勤设置：</span>
<span style="margin-right: 3px">考勤设置</span>
</div>
<div style="display: flex; align-items: center">
<div style="margin-right: 10px">签到</div>
<div style="display: flex; align-items: center; width: 88%;">
<div style="margin-right: 24px;">签到</div>
<div
style="display: flex; align-items: center; margin-right: 20px"
>
@@ -217,7 +217,7 @@
<div class="signbox">
<span style="margin-right: 3px">报名设置</span>
</div>
<div class="b_input">
<div class="b_input" style="width: 88%;">
<CheckBox v-model="formData.applyFlag"
:check-value="1"
:un-check-value="0">
@@ -226,11 +226,11 @@
</div>
</div>
<div class="cstm_items">
<div class="cstm_items" style="align-items: flex-start;">
<div class="signbox">
<span style="margin-right: 3px">现场参与</span>
</div>
<div class="b_input">
<div class="b_input" style="width: 88%;display: flex;flex-direction: column;">
<CheckBox v-model="formData.projectSignFlag"
:check-value="1"
:un-check-value="0">
@@ -238,6 +238,7 @@
</CheckBox>
<CheckBox v-model="formData.signFlag"
:check-value="1"
style="margin-left: 0px;"
:un-check-value="0">
<span style="color: #6d7584">允许项目外人员临时到场参加</span>
</CheckBox>
@@ -248,7 +249,7 @@
<div class="signbox">
<span style="margin-right: 3px">评估设置</span>
</div>
<div class="b_input">
<div class="b_input" style="width: 88%;">
<CheckBox v-model="formData.evalFlag" :checkValue="1" :un-checkValue="0">
<span style="color: #6d7584">是否需要评估</span>
</CheckBox>
@@ -256,7 +257,7 @@
</div>
<div v-if="formData.evalFlag" class="cstm_items main_item">
<div class="signbox"></div>
<div class="btnbox">
<div class="btnbox" style="display: flex;">
<AssessmentList
v-model:assessmentName="formData.assessmentName"
v-model:assessmentId="formData.assessmentId"
@@ -280,7 +281,7 @@
<div class="cstm_items main_item">
<div class="signbox"></div>
<div class="btnbox">
<div class="btnbox" style="display: flex;">
<add-homework v-model:info="formData.workInfo">
<button class="xkbtn" style="margin-bottom: 0; margin-top: 0">
配置作业
@@ -297,7 +298,7 @@
</div>
<div class="cstm_items main_item" style="margin-bottom: 0">
<div class="signbox"></div>
<div class="btnbox">
<div class="btnbox" style="display: flex;">
<add-test v-model:info="formData.examInfo">
<button class="xkbtn" style="margin-bottom: 0; margin-top: 0">
配置考试
@@ -576,6 +577,10 @@ defineExpose({ openDrawer });
background-color: #fafafa !important;
}
.fitems {
width: 88%;
}
.sameModal {
.ant-modal {
width: 424px !important;

6
src/router/index.js
View File

@@ -33,9 +33,15 @@ const timers = setInterval(() => {
if(pathArr.length!==0){
// 刷新界面是否重新执行
if(pathArr.indexOf(currentPath)==-1){
if(localStorage.getItem("refreshPage") == "jumpverify"){
clearInterval(timers)
return
}
clearInterval(timers)
router.push({path: pathArr[0]})
localStorage.setItem("refreshPage", "jumpverify")
}else{
localStorage.setItem("refreshPage", "jumpverify")
clearInterval(timers)
}
}

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

@@ -2834,7 +2834,13 @@ export default {
window.location.protocol +
process.env.VUE_APP_H5 +
"/projectdetails?type=2&projectId=" +
item.courseId;
item.courseId +
"&id=" +
item.id +
"&chapterOrStageId=" +
item.chapterId +
"&type=2&infoId=" +
state.routerId;
}
state.codevisible = true;
let obj = {