合并代码

This commit is contained in:
zhangsir
2024-09-27 10:30:55 +08:00
parent b9dec2abee
commit 0ee26671ce

View File

@@ -10,6 +10,7 @@
v-model:value="createName"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入创建人"
@pressEnter="handleSearch1"
/>
</div>
<div class="pathnameInp">
@@ -17,6 +18,7 @@
v-model:value="name"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入名称"
@pressEnter="handleSearch1"
/>
</div>
<div class="pathnameInp">
@@ -24,6 +26,7 @@
v-model:value="projectName"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入所属项目"
@pressEnter="handleSearch1"
/>
</div>
<div class="select">
@@ -679,9 +682,8 @@
</a-modal>
<!-- 面授 课程管理查看详情 页面 -->
<!--开课页面 -->
<a-modal
<a-drawer
v-model:visible="stm_hs"
title="Title"
@ok="stm_exit"
:footer="null"
:closable="false"
@@ -761,6 +763,8 @@
<div class="search"></div>
<div class="btnText">重置</div>
</div>
</div>
<div class="stm_inputbtn">
<div class="btns" v-if="checkPer(permissions,createId)">
<div class="btn btn3" @click="createkk">
<div class="search"></div>
@@ -769,6 +773,7 @@
</div>
</div>
</div>
</div>
<!-- 无数据样式 -->
<div class="notable" v-if="tableData6.length === 0">
@@ -788,12 +793,12 @@
</div>
<!-- 无数据样式 -->
<!-- 有数据表格 -->
<div class="tableBox" v-else>
<div class="tableBox" v-else style="margin-left: 58px;">
<a-table
:columns="columns6"
:data-source="tableData6"
:loading="tableCoursePlanLoading"
:scroll="{ x: 700, y: 800 }"
:scroll="{ x: 'max-content' }"
expandRowByClick="true"
@expand="expandTable"
:pagination="false"
@@ -801,9 +806,12 @@
<template #action="{ record, column }">
<div class="operation">
<div class="fb">
<div class="jc" @click="qrcodeVisible(record, 3)" v-if="checkPer(permissions,createId)">
评估码
</div>
<!--新加 签到 -->
<div class="jc" @click="qrcodeVisible(record, 2)" v-if="checkPer(permissions,createId)">
签到
签到
</div>
<div
@@ -884,7 +892,7 @@
</div>
</div>
</div>
</a-modal>
</a-drawer>
<!--开课页面 -->
<!--新建开课页面 -->
<a-modal
@@ -1989,7 +1997,7 @@ const columns6 = [
title: "教师名称",
dataIndex: "teacher",
key: "teacher",
width: "8%",
width: "24%",
align: "center",
ellipsis: true,
customRender: ({ record }) => {
@@ -2048,16 +2056,33 @@ const columns6 = [
width: 100,
align: "center",
ellipsis: true,
customRender: ({ text }) => {
return(
<div style="display:flex;justify-content:center;align-items:center;">
<span>{text || '0'}</span>
<div>xixi</div>
</div>
)
},
},
{
title: "评分",
dataIndex: "studentCnt",
key: "studentCnt",
width: 100,
align: "center",
ellipsis: true,
customRender: ({ text }) => {
return text ? text : "0";
},
},
{
title: "操作",
width: 200,
width: 300,
dataIndex: "operation",
key: "operation",
align: "center",
fixed: "right",
slots: { customRender: "action" },
},
];
@@ -3820,7 +3845,7 @@ function onFocusEnd(){
const stm_exit = () => {
state.stm_hs = false;
handleCancelStu();
handleRestTable();
// handleRestTable();
};
const createkk = () => {
state.xjkkinputV1 = state.newCourseName
@@ -5108,19 +5133,19 @@ function onFocusEnd(){
state.codevisible = true;
let teacherNames = record.offteachers?.filter(teacher => teacher.teacherName !== null).map(teacher => teacher.teacherName);
state.codeInfo = {
title: type == 1 ? "【课程】二维码" : "【签到】二维码",
name: record.name ? record.name+'签到' : "",
title: type == 1 ? "【课程】二维码" : type == 2 ? "【签到】二维码" : "【评估】二维码",
name: record.name ? record.name + type == 2 ?'签到' : '评估' : "",
teacherName: teacherNames.length > 0 ? teacherNames.join(' ') : "",
url:
type == 1
? process.env.VUE_APP_BASE_API +
`/stu/project/redirectDetail?courseId=${record.id}`
: process.env.VUE_APP_BASE_API +
: type == 2 ? process.env.VUE_APP_BASE_API +
`/admin/student/studentSign?taskId=${
record.id
}&taskType=${2}&type=${3}&openCourseId=${
record.id
}`,
}` : `${location.protocol}//${location.host}/student-h5/investigatpage?id=${record.id}&type=3&infoId=${record.id}&courseId=${record.assessmentId}&chapterOrStageId=0&level=${record.name}`
};
console.log("codeInfo", state.codeInfo, record);
state.codeIndex = 0;
@@ -5286,6 +5311,9 @@ function onFocusEnd(){
});
</script>
<style lang="scss">
.ant-drawer-body{
padding: 0;
}
.ant-table-cell-fix-right {
width: 250px !important;
}
@@ -7026,387 +7054,381 @@ function onFocusEnd(){
}
.schtimeModal {
.ant-modal {
.ant-modal-content {
// width:1358px !important;
.ant-modal-body {
.modalHeader {
.modalHeader {
display: flex;
align-items: center;
justify-content: space-between;
padding-top: 10px;
background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
.headerLeft {
margin-left: 27px;
display: flex;
align-items: center;
.headerLeftText {
font-size: 16px;
font-weight: 400;
color: #000000;
line-height: 36px;
}
}
}
.schooltime {
min-width: 1000px;
background: #ffffff;
.st_main {
width: 100%;
.tableBox {
margin: 20px 38px 30px;
th {
background-color: #eff4fc !important;
text-align: center !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(
.ant-table-row-selected
)
> td {
background: #f6f9fd;
}
.operation {
display: flex;
align-items: center;
justify-content: space-between;
justify-content: right;
.headerLeft {
margin-left: 27px;
.fb {
display: flex;
align-items: center;
margin-right: 20px;
.headerLeftText {
font-size: 16px;
font-weight: 400;
color: #000000;
line-height: 36px;
.jc {
color: #4ea6ff;
font-size: 14px;
margin-left: 20px;
white-space: nowrap;
cursor: pointer;
}
}
}
.schooltime {
min-width: 1000px;
.ynuse {
display: flex;
justify-content: center;
align-items: center;
.use {
cursor: pointer;
}
}
}
.stm_inputbtn {
display: flex;
width: 90%;
margin: 20px auto;
.stm_btn {
width: 100px;
height: 40px;
margin-right: 14px;
background: #ffffff;
border: 1px solid #4ea6ff;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
cursor: pointer;
.st_main {
width: 100%;
.btnText {
color: #4ea6ff;
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
}
.tableBox {
margin: 20px 38px 30px;
.btn {
padding: 0px 26px 0px 26px;
height: 38px;
background: #4ea6ff;
border-radius: 8px;
//border: 1px solid rgba(64, 158, 255, 1);
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
th {
background-color: #eff4fc !important;
text-align: center !important;
}
.search {
background-size: 100%;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(
.ant-table-row-selected
)
> td {
background: #f6f9fd;
}
.btnText {
font-size: 14px;
font-weight: 400;
color: #ffffff;
line-height: 36px;
margin-left: 5px;
}
}
.operation {
display: flex;
justify-content: right;
.btnn {
padding: 0px 26px 0px 26px;
height: 38px;
background: #4ea6ff;
border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1);
color: #fff;
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.fb {
display: flex;
margin-right: 20px;
.search {
background-size: 100%;
}
.jc {
color: #4ea6ff;
font-size: 14px;
margin-left: 20px;
white-space: nowrap;
cursor: pointer;
}
}
}
.btnText {
font-size: 14px;
font-weight: 400;
color: #fff;
line-height: 36px;
margin-left: 5px;
}
}
.ynuse {
display: flex;
justify-content: center;
align-items: center;
.btn1 {
.search {
width: 15px;
height: 17px;
background-image: url("../../assets/images/courseManage/search0.png");
}
}
.use {
cursor: pointer;
}
}
.btn2 {
.search {
width: 16px;
height: 18px;
background-image: url("../../assets/images/courseManage/reset0.png");
}
}
.btn1 {
.search {
background-image: url("../../assets/images/courseManage/search0.png");
}
.btnText {
color: #ffffff;
}
}
.btns {
display: flex;
// flex-wrap: wrap;
.btn {
padding: 0px 21px 0px 21px;
height: 38px;
background: #4ea6ff;
border-radius: 8px;
//border: 1px solid rgba(64, 158, 255, 1);
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
}
.stm_inputbtn {
display: flex;
width: 90%;
margin: 20px auto;
.stm_btn {
width: 100px;
height: 40px;
margin-right: 14px;
background: #ffffff;
border: 1px solid #4ea6ff;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
cursor: pointer;
.btnText {
color: #4ea6ff;
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
}
.btn {
padding: 0px 26px 0px 26px;
height: 38px;
background: #4ea6ff;
border-radius: 8px;
//border: 1px solid rgba(64, 158, 255, 1);
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
color: #ffffff;
line-height: 36px;
margin-left: 5px;
}
}
.btnn {
padding: 0px 26px 0px 26px;
height: 38px;
background: #4ea6ff;
border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1);
color: #fff;
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
color: #fff;
line-height: 36px;
margin-left: 5px;
}
}
.btn1 {
.search {
width: 15px;
height: 17px;
background-image: url("../../assets/images/courseManage/search0.png");
}
}
.btn2 {
.search {
width: 16px;
height: 18px;
background-image: url("../../assets/images/courseManage/reset0.png");
}
}
.btn1 {
.search {
background-image: url("../../assets/images/courseManage/search0.png");
}
.btnText {
color: #ffffff;
}
}
.btns {
display: flex;
// flex-wrap: wrap;
.btn {
padding: 0px 21px 0px 21px;
height: 38px;
background: #4ea6ff;
border-radius: 8px;
//border: 1px solid rgba(64, 158, 255, 1);
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
color: #ffffff;
line-height: 36px;
margin-left: 5px;
}
.btn2 {
margin-right: 0px;
.img2 {
width: 17px;
height: 18px;
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;
}
}
}
.btnText {
font-size: 14px;
font-weight: 400;
color: #ffffff;
line-height: 36px;
margin-left: 5px;
}
/**
.btn3 {
width: 130px;
height: 40px;
border: 1px solid #4ea6ff;
background-color: #4ea6ff;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
.btn2 {
margin-right: 0px;
.img2 {
width: 17px;
height: 18px;
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;
border: 1px solid #4ea6ff;
background-color: #4ea6ff;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
cursor: pointer;
.btnText {
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
.btn3 {
.add {
width: 17px;
height: 18px;
background-image: url("@/assets/images/coursewareManage/add0.png");
background-size: 100% 100%;
margin-right: 6px;
}
}
} */
.notable {
width: 100%;
height: 100%;
.notablebox {
width: 412px;
height: 212px;
background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%);
border-radius: 10px;
display: flex;
justify-content: center;
text-align: center;
margin: 77px auto 109px auto;
position: relative;
.smallleft {
position: absolute;
top: 18px;
left: 0px;
width: 8px;
height: 21px;
border-radius: 0px 4px 4px 0px;
background-color: #ffb64e;
}
.smallright {
position: absolute;
bottom: 18px;
right: 0px;
width: 8px;
height: 21px;
border-radius: 4px 0px 0px 4px;
background-color: #ffb64e;
}
.boxbody {
.boximg {
width: 72px;
height: 72px;
margin: 32px auto 20px auto;
background-image: url(@/assets/images/coursewareManage/nostate.png);
background-size: 100% 100%;
}
.boxtitle {
margin-bottom: 4px;
}
}
}
}
.tableBox {
position: relative;
padding-bottom: 80px;
.classify {
margin-left: 10px !important;
padding-left: 9px !important;
}
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 60px !important;
}
.ant-table-thead > tr > th {
background-color: #eff4fc !important;
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(
.ant-table-row-selected
)
> td {
background: #f6f9fd;
}
.operation {
display: flex;
justify-content: right;
.fb {
display: flex;
margin-right: 20px;
.jc {
color: #4ea6ff;
font-size: 14px;
margin-left: 20px;
white-space: nowrap;
cursor: pointer;
.btnText {
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
.btn3 {
.add {
width: 17px;
height: 18px;
background-image: url("@/assets/images/coursewareManage/add0.png");
background-size: 100% 100%;
margin-right: 6px;
}
}
} */
.notable {
width: 100%;
height: 100%;
.notablebox {
width: 412px;
height: 212px;
background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%);
border-radius: 10px;
display: flex;
justify-content: center;
text-align: center;
margin: 77px auto 109px auto;
position: relative;
.smallleft {
position: absolute;
top: 18px;
left: 0px;
width: 8px;
height: 21px;
border-radius: 0px 4px 4px 0px;
background-color: #ffb64e;
}
.smallright {
position: absolute;
bottom: 18px;
right: 0px;
width: 8px;
height: 21px;
border-radius: 4px 0px 0px 4px;
background-color: #ffb64e;
}
.boxbody {
.boximg {
width: 72px;
height: 72px;
margin: 32px auto 20px auto;
background-image: url(@/assets/images/coursewareManage/nostate.png);
background-size: 100% 100%;
}
.boxtitle {
margin-bottom: 4px;
}
}
}
}
}
}
.tableBox {
position: relative;
padding-bottom: 80px;
.classify {
margin-left: 10px !important;
padding-left: 9px !important;
}
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 60px !important;
}
.ant-table-thead > tr > th {
background-color: #eff4fc !important;
}
th.h {
background-color: #eff4fc !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(
.ant-table-row-selected
)
> td {
background: #f6f9fd;
}
.operation {
display: flex;
justify-content: right;
.fb {
display: flex;
margin-right: 20px;
.jc {
color: #4ea6ff;
font-size: 14px;
margin-left: 20px;
white-space: nowrap;
cursor: pointer;
}
}
}
.tableBox {
.pa {
left: 0;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
position: absolute;
bottom: 20px;
}
}
}
.tableBox {
.pa {
left: 0;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
position: absolute;
bottom: 20px;
}
}
}