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

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

Browse Source
This commit is contained in:
dongruihua
2023-01-13 09:13:23 +08:00
parent 6e6324aa9e 1084781244
commit d3456cc406
11 changed files with 89 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
console.log("版本2.0.6------------");
console.log("版本2.0.7------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});

7
src/components/drawers/AddLevelImportStu.vue
View File

@@ -80,7 +80,7 @@
<div class="img"></div>
<div class="timebox">
<div class="timetop">
<div class="tit">{{ fileName }}</div>
<div class="tit" :title="fileName">{{ fileName }}</div>
<div
v-if="uploadErr"
class="stateloading"
@@ -503,6 +503,11 @@ export default {
font-size: 14px;
font-weight: 400;
color: #333333;
width: 200px;
height: 21px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.stateloading {
font-size: 14px;

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

@@ -116,7 +116,9 @@ export default {
</script>
<style lang="scss">
.AllStuOverModel {
.ant-modal {
z-index: 999;
width: 424px;
height: 258px;

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

@@ -69,7 +69,6 @@
:options="projectNameList2"
@change="selectProjectName2"
allowClear
showSearch
></a-select>
</div>
</div>
@@ -806,6 +805,7 @@ export default {
pid: props.projectTaskInfo.projectId,
// status: Number(state.name),
studentName: state.name,
signStatus: state.projectName2,
taskId: props.projectTaskInfo.projectTaskId,
});
api
@@ -818,6 +818,7 @@ export default {
// status: Number(state.name),
studentName: state.name,
taskId: props.projectTaskInfo.projectTaskId,
signStatus: state.projectName2,
taskType: props.projectTaskInfo.type,
})
.then((res) => {
@@ -865,13 +866,7 @@ export default {
function exportTaskStu() {
console.log("props.projectTaskInfo", props.projectTaskInfo);
window.open(
`${
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${
props.projectTaskInfo.stageId
}&type=${1}&pid=${
props.projectTaskInfo.projectId
}&taskType=2&thirdType=2`
`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=${1}&taskId=${props.projectTaskInfo.projectTaskId}&pid=${props.projectTaskInfo.projectId}&taskType=2&thirdType=2`
);
// api
// .exportTaskStudent({

11
src/components/drawers/project/ProjectFaceTaskManage.vue
View File

@@ -148,7 +148,7 @@
? projectTaskInfo.projectTaskId
: null
"
:type="2"
:type="1"
:pid="
projectTaskInfo && projectTaskInfo.projectId
? projectTaskInfo.projectId
@@ -397,10 +397,7 @@ export default {
return (
<div class="racona">
<span>
{text.record.assessmentScore ||
text.record.assessmentScore == 0
? text.record.examinationScore
: "-"}
{text.record.assessmentScore || "-"}
</span>
</div>
);
@@ -681,9 +678,7 @@ export default {
console.log("props.projectTaskInfo", props.projectTaskInfo);
window.open(
`${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=2`
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${props.projectTaskInfo.projectTaskId}&taskType=2`
);
// api
// .exportTaskStudent({

5
src/components/drawers/router/RouterFaceTeachManage.vue
View File

@@ -395,10 +395,7 @@ export default {
return (
<div class="racona">
<span>
{text.record.assessmentScore ||
text.record.assessmentScore == 0
? text.record.examinationScore
: "-"}
{text.record.assessmentScore || "-"}
</span>
</div>
);

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

@@ -187,6 +187,7 @@
:data-source="tableData.list"
:pagination="stuPagination"
:loading="tableData.loading"
:scroll="{ x: 1500 }"
row-key="id"
:row-selection="stuRowSelection"
>
@@ -228,13 +229,7 @@
-->
<a-col v-if="type === 3">
<div
style="
color: #4ea6ff;
font-size: 14px;
text-align: center;
margin-left: 10px;
cursor: pointer;
"
style=" color: #4ea6ff; font-size: 14px;text-align: center; margin-left: 10px; cursor: pointer; "
@click="updateStatus(0, record.id)"
>
通过
@@ -242,13 +237,7 @@
</a-col>
<a-col v-if="type === 3">
<div
style="
color: #4ea6ff;
font-size: 14px;
text-align: center;
margin-left: 10px;
cursor: pointer;
"
style=" color: #4ea6ff;font-size: 14px;text-align: center; margin-left: 10px;cursor: pointer; "
@click="updateStatus(2, record.id)"
>
拒绝
@@ -257,13 +246,7 @@
<a-col>
<div
@click="del(record.id)"
style="
color: #4ea6ff;
font-size: 14px;
text-align: center;
margin-left: 10px;
cursor: pointer;
"
style=" color: #4ea6ff;font-size: 14px;text-align: center; margin-left: 10px; cursor: pointer;"
>
删除
</div>
@@ -425,7 +408,7 @@ const tablecolumns = ref([
title: "姓名",
dataIndex: "studentName",
key: "studentName",
width: "12%",
width: "10%",
align: "left",
className: "h",
ellipsis: true,
@@ -454,7 +437,7 @@ const tablecolumns = ref([
title: "工号",
dataIndex: "studentUserNo",
key: "studentUserNo",
width: "15%",
width: "20%",
align: "center",
className: "h",
ellipsis: true,
@@ -472,7 +455,7 @@ const tablecolumns = ref([
title: "加入方式",
dataIndex: "source",
key: "source",
width: "15%",
width: "10%",
align: "center",
customRender: ({ record: { source } }) =>
({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
@@ -934,17 +917,7 @@ const AddImpStuvisibleClose = (isget) => {
}
}
.btn5:hover {
background: #4ea6ff;
.export {
background-image: url("@/assets/images/coursewareManage/export1.png");
}
.btnText {
color: #ffffff;
}
}
}
/*.delete {
z-index: 9999;

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

@@ -94,11 +94,11 @@
<div class="btns">
<!-- 2022-11-30注释 后面放开 -->
<div
class="btn btn2"
class="btnn btn2"
@click="openMessage"
style="margin-right: 14px"
>
<div class="img2"></div>
<div class="daochu"></div>
<div class="btnText">导出</div>
</div>
<div class="btn btn3" @click="of_hShow">
@@ -2712,7 +2712,7 @@ const columns6 = [
// title: "序号",
// dataIndex: "num",
// key: "num",
// width: "6%",
// width: "8%",
// align: "center",
// ellipsis: true,
// customRender: ({ index, record }) => {
@@ -2747,7 +2747,7 @@ const columns6 = [
title: "教师名称",
dataIndex: "teacher",
key: "teacher",
width: "10%",
width: "8%",
align: "center",
ellipsis: true,
customRender: ({ text }) => {
@@ -2783,7 +2783,7 @@ const columns6 = [
title: "创建人",
dataIndex: "createName",
key: "createName",
width: "10%",
width: "8%",
align: "center",
ellipsis: true,
customRender: ({ text }) => {
@@ -2998,7 +2998,7 @@ export default defineComponent({
stuColumns: [
{
title: "岗位",
width: "15%",
width: "8%",
dataIndex: "studentJobName",
key: "7",
align: "center",
@@ -3016,7 +3016,7 @@ export default defineComponent({
},
{
title: "Band",
width: "15%",
width: "8%",
dataIndex: "studentBandDesc",
key: "7",
align: "center",
@@ -3032,7 +3032,7 @@ export default defineComponent({
},
{
title: "报名状态",
width: "15%",
width: "8%",
dataIndex: "status",
key: "5",
align: "center",
@@ -3050,24 +3050,15 @@ export default defineComponent({
{
title: "签到状态",
width: "15%",
width: "8%",
dataIndex: "signstatus",
key: "7",
align: "center",
customRender: ({ record }) => {
switch (String(record.signStatus)) {
case "0":
return "未签到";
case "1":
return "已签到";
case "2":
return "请假";
}
},
customRender: ({ record }) => record.signStatus?'已签到':'未签到',
},
{
title: "评估状态",
width: "15%",
width: "8%",
dataIndex: "evastatus",
key: "8",
align: "center",
@@ -3076,24 +3067,25 @@ export default defineComponent({
},
{
title: "作业成绩",
width: "15%",
width: "8%",
dataIndex: "workScore",
key: "7",
align: "center",
customRender: ({ record }) => {
return (
<div class="racona">
{record.score ? (
<span>{record.score}</span>
{record.workScore ? (
<span>{record.workScore}</span>
) : (
<span
style={{ color: "#4EA6FF", cursor: "pointer" }}
onClick={() => {
handlJoinStu(record);
}}
>
成绩录入
</span>
// <span
// style={{ color: "#4EA6FF", cursor: "pointer" }}
// onClick={() => {
// handlJoinStu(record);
// }}
// >
// 成绩录入
// </span>
<span></span>
)}
</div>
);
@@ -3118,7 +3110,7 @@ export default defineComponent({
},
{
title: "考试成绩",
width: "15%",
width: "8%",
dataIndex: "examinationScore",
key: "8",
align: "center",
@@ -5843,6 +5835,11 @@ export default defineComponent({
height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png");
}
.daochu{
width: 16px;
height: 18px;
background-image: url("../../assets/images/coursewareManage/export.png");
}
}
.btn1 {
@@ -6942,25 +6939,15 @@ export default defineComponent({
}
}
.btn2 {
.btn2 {
.search {
width: 15px;
height: 17px;
background-image: url("@/assets/images/coursewareManage/reset1.png");
width: 16px;
height: 18px;
margin-right: 6px;
background-image: url("../../assets/images/courseManage/reset1.png");
}
}
.btn2 {
background: rgba(64, 158, 255, 1);
.search {
background-image: url("@/assets/images/coursewareManage/reset0.png");
}
.btnText {
color: #ffffff;
}
}
}
}
}
@@ -7579,19 +7566,7 @@ export default defineComponent({
color: #ffffff;
}
}
/**
.btn1:active {
background: #0982ff;
}
.btn2:hover {
background: rgba(64, 158, 255, 0.1);
}
.btn2:active {
background: rgba(64, 158, 255, 0.2);
}
*/
.btns {
display: flex;
@@ -7629,10 +7604,23 @@ export default defineComponent({
background-image: url(../../assets/images/coursewareManage/export1.png);
}
}
}
.btn3 {
.search {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add0.png");
}
.btnText {
color: #ffffff;
}
}
}
}
/**
.btn3 {
width: 130px;
height: 40px;
@@ -7660,7 +7648,7 @@ export default defineComponent({
margin-right: 6px;
}
}
}
} */
.notable {
width: 100%;

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

@@ -2164,7 +2164,7 @@ export default {
})
.catch((err) => {
console.log(err);
message.error("获取路径列表失败" + err);
// message.error("获取路径列表失败" + err);
});
};

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

@@ -1502,7 +1502,7 @@ export default {
onClick={() => {
showBackModal(value.record.projectId);
}}
style="cursor:pointer"
style="cursor:pointer; margin-left: 21px; width:70px;"
class="operation3"
>
撤回发布

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

@@ -72,17 +72,19 @@
</div>
<!-- 表格 -->
<!-- 分页 -->
<a-pagination
v-if="evalStuListDataTotal > 10"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="evalCurrentPage"
:total="evalStuListDataTotal"
class="pagination"
@change="changePaginationStu"
/>
<div style="width:100%;display:flex;justify-content:center;align-items:center;">
<a-pagination
v-if="evalStuListDataTotal > 10"
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="evalCurrentPage"
:total="evalStuListDataTotal"
class="pagination"
@change="changePaginationStu"
/>
</div>
<!-- 分页 -->
</div>
</div>
@@ -133,7 +135,7 @@ export default {
state.evalStuListLoading = true;
api.QueryAssessmentManageMessage({
"assessmentId": router.currentRoute.value.params.id,
"pageNo": state.currentPage,
"pageNo": state.evalCurrentPage,
"pageSize": state.pageSize
}).then(res=>{
console.log('获取学员信息',res)