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

Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

Browse Source
This commit is contained in:
wyx
2023-01-12 14:01:28 +08:00
parent 553fb1f736 f2b6905a04
commit ad70bbe62e
6 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -16,7 +16,7 @@ VUE_APP_OUTPUT_DIR=./dist
# iframe嵌套url
VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc/iframe
# 学员端路由
VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loading
VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loadingVUE_APP_BOE_API_URLVUE_APP_BOE_API_URL
# 课程二维码
VUE_APP_COURSE_STUDY=https://u-pre.boe.com/pc/course/studyindex?id=

9
src/components/TwoDimensionalCode.vue
View File

@@ -25,7 +25,7 @@
{{ codeInfo.name ? codeInfo.name : "" }}
</div>
<qrcode-vue
:value="codeInfo.url ? codeInfo.url : ''"
:value="codeInfo.url.startsWith('/')?(domain+codeInfo.url):codeInfo.url"
:size="qrcodeSize"
style="width: 200px; height: 200px"
></qrcode-vue>
@@ -34,12 +34,12 @@
<div class="codeUrl" :style="{ display: showUrl ? 'flex' : 'none' }">
<div class="codeUrlLink">链接</div>
<a-input
:value="codeInfo.url ? codeInfo.url : ''"
:value="codeInfo.url.startsWith('/')?(domain+codeInfo.url):codeInfo.url"
disabled
class="codeUrlInp"
/>
<a-input
:value="codeInfo.url ? codeInfo.url : ''"
:value="codeInfo.url.startsWith('/')?(domain+codeInfo.url):codeInfo.url"
id="courseUrl"
class="codeUrlInp"
style="position: absolute; opacity: 0; z-index: -1"
@@ -104,6 +104,7 @@ export default {
codeInfo: {},
courseUrl: "https://www.baidu.com/",
showUrl: false,
domain: location.protocol+'//'+location.host
});
//下载二维码图片
@@ -147,7 +148,7 @@ export default {
// selection.removeRange(range); // 移除选中的元素
var input = document.createElement("input"); // 创建input对象
input.value = state.codeInfo.url ? state.codeInfo.url : ""; // 设置复制内容
input.value = state.codeInfo.url.startsWith('/')?(state.domain+state.codeInfo.url):state.codeInfo.url; // 设置复制内容
document.body.appendChild(input); // 添加临时实例
input.select(); // 选择实例内容
document.execCommand("Copy"); // 执行复制

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

@@ -109,7 +109,7 @@
<div class="wz">导出数据</div>
</div>
</div>
<!-- <div class="line">
<!-- <div class="line">
<div class="inline">
<div class="left">
<div class="img"></div>
@@ -173,7 +173,7 @@
/>
</div> -->
</div>
<!--
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
@@ -431,10 +431,10 @@ export default {
title: "【签到】二维码",
name: props.projectTaskInfo?.name,
url:
process.env.VUE_APP_BOE_API_URL +
process.env.VUE_APP_BASE_API +
`/admin/student/studentSign?taskId=${
props.projectTaskInfo.projectTaskId
}&type=${1}`,
}&taskType=${props.projectTaskInfo.type}&type=${1}`,
};
console.log("codeInfo", state.codeInfo);
state.codeIndex = 0;
@@ -869,7 +869,9 @@ export default {
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${
props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=2&thirdType=2`
}&type=${1}&pid=${
props.projectTaskInfo.projectId
}&taskType=2&thirdType=2`
);
// api
// .exportTaskStudent({

6
src/components/drawers/router/RouterFaceStu.vue
View File

@@ -167,7 +167,7 @@
/>
</div> -->
</div>
<!--
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
@@ -846,10 +846,10 @@ export default {
title: "【签到】二维码",
name: props.datasource?.name,
url:
process.env.VUE_APP_BOE_API_URL +
process.env.VUE_APP_BASE_API +
`/admin/student/studentSign?taskId=${
props.datasource.routerTaskId
}&type=${2}`,
}&taskType=${props.datasource.type}&type=${2}`,
};
console.log("codeInfo", state.codeInfo);
state.codeIndex = 0;

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

@@ -14,7 +14,7 @@
/>
</a-form-item>
</a-col>
<!-- <a-col v-if="type === 1">
<!-- <a-col v-if="type === 1">
<a-form-item title="小组名称：">
<a-input
class="cus-input"
@@ -50,7 +50,11 @@
</a-form-item>
</a-col>
<a-col>
<a-button class="cus-btn" style="width: 100px" @click="getStuList">
<a-button
class="cus-btn"
style="background: #4ea6ff; color: #fff; width: 100px"
@click="getStuList"
>
<template #icon>
<img
style="margin-right: 10px"
@@ -78,7 +82,7 @@
@finash="submitCall"
:stage="stage"
>
<a-button class="cus-btn">
<a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
<template #icon
><img
style="margin-right: 10px"
@@ -146,9 +150,10 @@
<div class="btn4_tit" @click="showEScoreModal">
<span>批量录入成绩</span>
</div>
<div class="btn4_op1" @click="updateStatus(1)">
<!--2023-1-12 隐藏 后面放开 -->
<!-- <div class="btn4_op1" @click="updateStatus(1)">
<span>批量结业</span>
</div>
</div> -->
<div class="btn4_op2" @click="updateStatus(0)">
<span>批量通过</span>
</div>
@@ -506,7 +511,8 @@ function exportTaskStu() {
console.log("props.datasource", props.datasource);
window.open(
`${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0`
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0`
);
}
@@ -682,15 +688,13 @@ const exportHomeWorkShow = () => {
taskType: 0,
type: 3,
};
api
.exportHomeWork(obj)
.then((res) => {
console.log("导出作业", res.data.data);
//message.destroy();
// message.success("导出作业成功");
exportHomeWorkV.value = true;
downloadUrl.value = res.data.data;
})
api.exportHomeWork(obj).then((res) => {
console.log("导出作业", res.data.data);
//message.destroy();
// message.success("导出作业成功");
exportHomeWorkV.value = true;
downloadUrl.value = res.data.data;
});
};
// //导出作业
// const exportHomeWork = () => {
@@ -704,7 +708,8 @@ const exportHomeWorkShow = () => {
const exportStu = () => {
window.open(
`${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
);
};

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

@@ -2030,7 +2030,11 @@
<div class="qrm_btn btn1" @click="rg_exit">
<div class="btnText">取消</div>
</div>
<div class="qrm_btn btn2" @click="handleJoin">
<div
class="qrm_btn btn2"
style="background-color: #4ea6ff; color: #ffffff"
@click="handleJoin"
>
<div class="btnText">确定</div>
</div>
</div>
@@ -3067,7 +3071,8 @@ export default defineComponent({
dataIndex: "evastatus",
key: "8",
align: "center",
customRender: ({record}) => record.assessmentStatus ? '已评估' : '未评估'
customRender: ({ record }) =>
record.assessmentStatus ? "已评估" : "未评估",
},
{
title: "作业成绩",
@@ -3118,14 +3123,15 @@ export default defineComponent({
key: "8",
align: "center",
},
{
title: "结业状态",
width: "15%",
dataIndex: "completionStatus",
key: "8",
align: "center",
customRender: ({ record }) => <div>{{1:'结业'}[record.completionStatus] || '-'}</div>,
},
// 2023-1-12 隐藏 后面放开
// {
// title: "结业状态",
// width: "15%",
// dataIndex: "completionStatus",
// key: "8",
// align: "center",
// customRender: ({ record }) => <div>{{1:'结业'}[record.completionStatus] || '-'}</div>,
// },
],
shipType: 1,
addLoading: false,
@@ -4755,7 +4761,7 @@ export default defineComponent({
};
const handleJoin = async () => {
state.lrcj_inputV1 || message.error("请输入成绩")
state.lrcj_inputV1 || message.error("请输入成绩");
if (state.rg_hs) {
if (state.piliang) {
api1.updateStudent({
@@ -5548,7 +5554,7 @@ export default defineComponent({
url:
type == 1
? process.env.VUE_APP_COURSE_STUDY + record.offcourseId
: process.env.VUE_APP_BOE_API_URL +
: process.env.VUE_APP_BASE_API +
`/admin/student/studentSign?taskId=${
record.offcoursePlanId
}&type=${3}`,
@@ -5840,8 +5846,6 @@ export default defineComponent({
}
.btn1 {
.search {
background-image: url("../../assets/images/courseManage/search0.png");
}
@@ -5850,7 +5854,7 @@ export default defineComponent({
color: #ffffff;
}
}
/**
/**
.btn1:active {
background: #0982ff;
}
@@ -5894,11 +5898,7 @@ export default defineComponent({
}
}
.btn3 {
.search {
width: 17px;
height: 18px;
@@ -5909,7 +5909,6 @@ export default defineComponent({
color: #ffffff;
}
}
}
}
@@ -6951,7 +6950,7 @@ export default defineComponent({
}
}
.btn2{
.btn2 {
background: rgba(64, 158, 255, 1);
.search {
@@ -7571,9 +7570,7 @@ export default defineComponent({
}
}
.btn1{
.btn1 {
.search {
background-image: url("../../assets/images/courseManage/search0.png");
}
@@ -7582,7 +7579,7 @@ export default defineComponent({
color: #ffffff;
}
}
/**
/**
.btn1:active {
background: #0982ff;
}
@@ -7624,19 +7621,15 @@ export default defineComponent({
margin-left: 5px;
}
.btn2 {
margin-right: 0px;
margin-right: 0px;
.img2 {
width: 17px;
height: 18px;
background-image: url(../../assets/images/coursewareManage/export1.png);
.img2 {
width: 17px;
height: 18px;
background-image: url(../../assets/images/coursewareManage/export1.png);
}
}
}
}
}
}