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

This commit is contained in:
songwc
2022-10-22 16:30:03 +08:00
6 changed files with 726 additions and 247 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 563 B

View File

@@ -78,12 +78,12 @@
<div class="btnss" style="margin-top: 20px">
<div class="btn btn1" style="margin-right: 20px">
<div class="img1"></div>
<div class="wz">导入学员</div>
<div class="wz" @click="showImpStu">导入学员</div>
</div>
<div class="btn btn2">
<div class="btn btn2" @click="showCopyModal">
<div class="wz">批量签到</div>
</div>
<div class="btn btn2">
<div class="btn btn2" @click="showStopModal">
<div class="wz" @click="showEntryScore">批量签退</div>
</div>
<div class="btn btn2">
@@ -149,12 +149,76 @@
<button class="btn2">确定</button>
</div>
</a-drawer>
<!-- 导入学员抽屉 -->
<imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
<!-- 批量签到弹窗 -->
<a-modal
v-model:visible="copyModal"
:footer="null"
:closable="closeCopy"
wrapClassName="CopyModal"
centered="true"
>
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
<div class="header">
<div class="icon"></div>
<span>提示</span>
<div class="close_exit" @click="closeCopyModal"></div>
</div>
<div class="body">
<span>您确定要批量签到吗</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
<div class="btnText" @click="delete_exit">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" @click="delete_exit">确定</div>
</div>
</div>
</div>
</div>
</a-modal>
<!-- 批量签退弹窗 -->
<a-modal
v-model:visible="stopModal"
:footer="null"
:closable="closeStop"
wrapClassName="CopyModal"
centered="true"
>
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
<div class="header">
<div class="icon"></div>
<span>提示</span>
<div class="close_exit" @click="closeStopModal"></div>
</div>
<div class="body">
<span>您确定要批量签退吗</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
<div class="btnText" @click="delete_exit">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" @click="delete_exit">确定</div>
</div>
</div>
</div>
</div>
</a-modal>
</template>
<script>
import { toRefs, reactive } from "vue";
import ImpStu from "../../components/drawers/AddLevelImportStu";
export default {
name: "FaceManage",
components: { ImpStu },
props: {
FSvisible: {
type: Boolean,
@@ -165,6 +229,11 @@ export default {
setup(props, ctx) {
const state = reactive({
Evisible: false, //录入成绩抽屉
AddImpStuvisible: false, //导入学员抽屉
copyModal: false, //批量签到弹窗
closeCopy: false, //签到弹窗关闭图标
stopModal: false, //签退弹窗
closeStop: false, //签退弹窗关闭图标
name: null,
showmodal: false, //勾选提示框
closable: false, //modal右上角的关闭按钮
@@ -346,7 +415,21 @@ export default {
const closeDrawer = () => {
ctx.emit("update:FSvisible", false);
};
const showImpStu = () => {
state.AddImpStuvisible = true;
};
const showCopyModal = () => {
state.copyModal = true;
};
const closeCopyModal = () => {
state.copyModal = false;
};
const showStopModal = () => {
state.stopModal = true;
};
const closeStopModal = () => {
state.stopModal = false;
};
const showEntryScore = () => {
state.Evisible = true;
};
@@ -498,6 +581,11 @@ export default {
showEntryScore,
tableDataFunc,
getTableData,
showImpStu,
showCopyModal,
closeCopyModal,
showStopModal,
closeStopModal,
};
},
};
@@ -509,7 +597,117 @@ export default {
padding: 0px;
}
}
.CopyModal {
.ant-modal {
width: 424px !important;
height: 258px !important;
.ant-modal-content {
width: 424px !important;
height: 258px !important;
.ant-modal-body {
width: 424px !important;
height: 258px !important;
padding: 0 !important;
.delete {
z-index: 999;
width: 424px;
height: 258px;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
border-radius: 4px;
// position: absolute;
// left: 50%;
// top: 10%;
// transform: translate(-50%, -50%);
.del_header {
position: absolute;
width: calc(100%);
height: 68px;
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
}
.del_main {
width: 100%;
position: relative;
.header {
display: flex;
align-items: center;
padding-top: 20px;
padding-left: 26px;
font-size: 16px;
.icon {
width: 16px;
height: 16px;
margin-right: 10px;
background-image: url(@/assets/images/coursewareManage/QR.png);
background-size: 100% 100%;
}
.close_exit {
position: absolute;
right: 42px;
cursor: pointer;
width: 20px;
height: 20px;
background-image: url(@/assets/images/coursewareManage/close.png);
background-size: 100% 100%;
}
}
.body {
width: 100%;
margin: 34px auto 56px auto;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
// background-color: red;
position: relative;
.back {
position: absolute;
top: 30px;
font-size: 12px;
font-weight: 400;
color: #666666;
}
}
.del_btnbox {
display: flex;
margin: 30px auto;
justify-content: center;
.del_btn {
width: 100px;
height: 40px;
background: rgba(64, 158, 255, 0);
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;
}
}
.btn1 {
border: 1px solid rgba(64, 158, 255, 1);
color: #4ea6ff;
margin-right: 14px;
}
.btn2 {
background-color: #4ea6ff;
color: #ffffff;
}
}
}
}
}
}
}
}
.largeDrawerStyle {
// width: 80%;
.ant-drawer-content-wrapper {

View File

@@ -54,7 +54,7 @@
</div>
</div>
<div class="btnss" style="margin-top: 20px">
<div class="btn btn1" style="margin-right: 20px; cursor: pointer">
<div class="btn btn1" @click="showopen" style="margin-right: 20px; cursor: pointer">
<div class="img2"></div>
<div class="wz">催促考试</div>
</div>
@@ -80,12 +80,17 @@
<button class="btn1">取消</button>
<button class="btn2">确定</button>
</div>
<div class="noticebox" v-show="open">
<div><img src="../../assets/images/taskpage/check.png"/></div>
<div class="notext">催促学员成功</div>
</div>
</div>
</a-drawer>
</template>
<script>
import { toRefs, reactive } from "vue";
import { toRefs, reactive, onMounted, onUnmounted} from "vue";
export default {
name: "TestManage",
props: {
@@ -102,6 +107,7 @@ export default {
setup(props, ctx) {
const state = reactive({
name: null,
open: false,
projectNameList: [
{
id: 1,
@@ -291,11 +297,25 @@ export default {
const closeDrawer = () => {
ctx.emit("update:TMvisible", false);
};
const showopen=()=>{
state.open = true;
};
let timer;
onMounted(()=> {
timer = setInterval(()=>{
state.open = false;
},3000);
});
onUnmounted(()=>{
clearInterval(timer);
});
return {
...toRefs(state),
selectProjectName,
closeDrawer,
showopen,
onMounted,
onUnmounted,
};
},
};
@@ -324,6 +344,24 @@ export default {
overflow-x: scroll;
display: flex;
flex-direction: column;
position: relative;
.noticebox {
width: 240px;
height: 64px;
background: rgba(255, 255, 255, 1);
border-radius: 4px;
position: absolute;
top: 161px;
display: flex;
align-items: center;
justify-content: center;
.notext {
color: rgba(51, 51, 51, 1);
font-size: 14px;
font-weight: 500;
margin-left: 20px;
}
}
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;

View File

@@ -54,7 +54,7 @@
</div>
</div>
<div class="btnss" style="margin-top: 20px">
<div class="btn btn1" style="margin-right: 20px">
<div class="btn btn1" @click="showopen" style="margin-right: 20px">
<div class="img1"></div>
<div class="wz">催促学习</div>
</div>
@@ -91,12 +91,16 @@
<button class="btn1">取消</button>
<button class="btn2">确定</button>
</div>
<div class="noticebox" v-show="open">
<div><img src="../../assets/images/taskpage/check.png"/></div>
<div class="notext">催促学员成功</div>
</div>
</div>
</a-drawer>
</template>
<script>
import { toRefs, reactive } from "vue";
import { toRefs, reactive, onMounted, onUnmounted} from "vue";
export default {
name: "TimeManage",
props: {
@@ -113,6 +117,7 @@ export default {
setup(props, ctx) {
const state = reactive({
name: null,
open: false,
pageSize: 10,
currentPage: 1,
tableDataTotal: 100,
@@ -269,10 +274,25 @@ export default {
const closeDrawer = () => {
ctx.emit("update:Tvisible", false);
};
const showopen=()=>{
state.open = true;
};
let timer;
onMounted(()=> {
timer = setInterval(()=>{
state.open = false;
},3000);
});
onUnmounted(()=>{
clearInterval(timer);
});
return {
...toRefs(state),
selectProjectName,
closeDrawer,
showopen,
onMounted,
onUnmounted,
};
},
};
@@ -297,6 +317,23 @@ export default {
overflow-x: scroll;
display: flex;
flex-direction: column;
.noticebox {
width: 240px;
height: 64px;
background: rgba(255, 255, 255, 1);
border-radius: 4px;
position: absolute;
top: 161px;
display: flex;
align-items: center;
justify-content: center;
.notext {
color: rgba(51, 51, 51, 1);
font-size: 14px;
font-weight: 500;
margin-left: 20px;
}
}
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;

View File

@@ -628,7 +628,7 @@ export default defineComponent({
},
});
</script>
<style lang="scss" scoped>
<style lang="scss">
.clearfix:before,
.clearfix:after {
content: " ";
@@ -858,7 +858,7 @@ export default defineComponent({
}
.taskSyllabus {
// flex: 1;
overflow-x: scroll;
overflow-x: auto;
.ant-collapse {
border: 0px;
@@ -876,7 +876,7 @@ export default defineComponent({
.ant-collapse-header {
display: flex;
height: 49px;
background-color: #fcf0ef;
background-color: #eff4fc;
align-items: center;
margin-top: 20px;
margin-left: 38px;

View File

@@ -69,7 +69,6 @@
@expand="expandTable"
:pagination="false"
/>
</div>
<div class="pa">
<a-pagination
@@ -83,7 +82,12 @@
/>
</div>
<!-- 表格 -->
<a-modal v-model:visible="out" :footer="null" :closable="false" style="margin-top: 250px">
<a-modal
v-model:visible="out"
:footer="null"
:closable="false"
style="margin-top: 250px"
>
<div class="out">
<div class="top">
<img class="topimg" src="../../assets/images/courseManage/add1.png" />
@@ -107,7 +111,8 @@
<div class="in">
<a-input
v-model:value="value"
show-count :maxlength="15"
show-count
:maxlength="15"
style="border-radius: 8px"
/>
</div>
@@ -119,6 +124,53 @@
</div>
</div></a-modal
>
<!--操作弹窗 -->
<a-modal
v-model:visible="delete_hs"
:footer="null"
:closable="closableQR"
wrapClassName="DelModal"
style="margin-top: 400px"
@cancel="delete_exit"
>
<div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
<div class="del_header"></div>
<div class="del_main">
<div class="header">
<div class="del-icon" :style="{ display: del_hs || over_hs ? 'block' : 'none' }"><img src="@/assets/images/coursewareManage/notice.png" alt=""></div>
<div class="del-icon" :style="{ display: copy_hs || back_hs || pub_hs ? 'block' : 'none' }"><img src="@/assets/images/coursewareManage/QR.png" alt=""></div>
<span>提示</span>
<div class="close_exit" @click="delete_exit"></div>
</div>
<div class="body">
<div :style="{ display: del_hs ? 'block' : 'none' }">
<span>您确定要删除此调研吗</span>
</div>
<div :style="{ display: over_hs ? 'block' : 'none' }">
<span>您确定要结束此调研吗</span>
</div>
<div :style="{ display: copy_hs ? 'block' : 'none' }">
<span>您确定要复制此调研吗</span>
</div>
<div :style="{ display: back_hs ? 'block' : 'none' }">
<span>您确定要撤回此调研吗</span>
</div>
<div :style="{ display: pub_hs ? 'block' : 'none' }">
<span>您确定要发布此调研吗</span>
</div>
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
<div class="btnText" @click="delete_exit">取消</div>
</div>
<div class="del_btn btn2">
<div class="btnText" @click="delete_exit">确定</div>
</div>
</div>
</div>
</div>
</a-modal>
<!--操作弹窗 -->
</div>
</template>
<script>
@@ -219,6 +271,12 @@ export default {
valueE: ref(" "),
valueEE: ref(" "),
valuei: ref(" "),
delete_hs: false,
del_hs: false,
over_hs: false,
copy_hs: false,
back_hs: false,
pub_hs: false,
});
const tableDataFunc = () => {
const columns = [
@@ -286,7 +344,6 @@ export default {
key: "opacation",
width: 200,
align: "center",
},
];
return columns;
@@ -299,38 +356,74 @@ export default {
//单层项目
value.opacation = (
<div class="operation">
{value.state === "已发布" ? (
<div class="fb">
<router-link to="/managepage" class="jc">管理</router-link>
<div class="jc">复制</div>
<div class="jc">撤回</div>
<div class="jc">结束</div>
<router-link to="/managepage" class="jc">
管理
</router-link>
<div class="jc"
onClick={()=>{
state.delete_hs = true;
state.copy_hs = true;
}}>复制</div>
<div class="jc"
onClick={()=>{
state.delete_hs = true;
state.back_hs = true;
}}>撤回</div>
<div class="jc"
onClick={()=>{
state.delete_hs = true;
state.over_hs = true;
}}>结束</div>
</div>
) : (
<div></div>
)}
{value.state === "待发布" ? (
<div class="fb">
<router-link to="/researchadd" class="jc">基础信息</router-link>
<router-link to="/managepage" class="jc">管理</router-link>
<div class="jc">复制</div>
<router-link to="/researchadd" class="jc">
基础信息
</router-link>
<router-link to="/managepage" class="jc">
管理
</router-link>
<div class="jc"
onClick={()=>{
state.delete_hs = true;
state.pub_hs = true;
}}>发布</div>
<div class="jc"
onClick={()=>{
state.delete_hs = true;
state.copy_hs = true;
}}>复制</div>
<div class="jc">编辑</div>
<div class="jc">删除</div>
<div class="jc"
onClick={()=>{
state.delete_hs = true;
state.del_hs = true;
}}>删除</div>
</div>
) : (
<div></div>
)}
{value.state === "已结束" ? (
<div class="fb">
<div class="jc">复制</div>
<div class="jc">删除</div>
<div class="jc"
onClick={()=>{
state.delete_hs = true;
state.copy_hs = true;
}}>复制</div>
<div class="jc"
onClick={()=>{
state.delete_hs = true;
state.del_hs = true;
}}>删除</div>
</div>
) : (
<div></div>
)}
</div>
);
}
@@ -357,6 +450,14 @@ export default {
const chooseImg = (id) => {
console.log(id);
};
const delete_exit = () => {
state.delete_hs = false;
state.del_hs = false;
state.over_hs = false;
state.copy_hs = false;
state.back_hs = false;
state.pub_hs = false;
};
return {
...toRefs(state),
selectProjectName,
@@ -366,6 +467,7 @@ export default {
tableDataFunc,
chooseImg,
getTableDate,
delete_exit,
};
},
};
@@ -464,7 +566,7 @@ export default {
width: 100px;
height: 40px;
font-size: 14px;
border: 1px solid #409EFF;
border: 1px solid #409eff;
border-radius: 8px;
cursor: pointer;
}
@@ -474,7 +576,7 @@ export default {
}
.btn2 {
margin-left: 10px;
background-color: #409EFF;
background-color: #409eff;
color: #fff;
}
}
@@ -596,7 +698,6 @@ export default {
> td {
background: #f6f9fd;
}
}
.pa {
width: 100%;
@@ -625,9 +726,114 @@ export default {
color: #4ea6ff;
font-size: 14px;
margin-left: 20px;
white-space: nowrap;
cursor: pointer;
}
}
}
}
.DelModal {
.ant-modal {
.ant-modal-content {
width: 424px !important;
.ant-modal-body {
.delete {
z-index: 999;
width: 424px;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
border-radius: 4px;
position: absolute;
left: 50%;
top: 10%;
transform: translate(-50%, -50%);
.del_header {
position: absolute;
width: calc(100%);
height: 40px;
background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
}
.del_main {
width: 100%;
position: relative;
.header {
display: flex;
align-items: center;
padding-top: 20px;
padding-left: 26px;
font-size: 16px;
.del-icon {
display: flex;
align-items: center;
margin-right: 10px;
// background-image: url(@/assets/images/coursewareManage/notice.png);
img{
background-size: 100% 100%;
width: 16px;
height: 16px;
}
}
.icon {
width: 16px;
height: 16px;
margin-right: 10px;
background-image: url(@/assets/images/coursewareManage/QR.png);
background-size: 100% 100%;
}
.close_exit {
position: absolute;
right: 42px;
cursor: pointer;
width: 20px;
height: 20px;
background-image: url(@/assets/images/coursewareManage/close.png);
background-size: 100% 100%;
}
}
.body {
width: 100%;
margin: 34px auto 56px auto;
display: flex;
justify-content: center;
align-items: center;
}
.del_btnbox {
display: flex;
margin: 30px auto;
justify-content: center;
.del_btn {
width: 100px;
height: 40px;
background: rgba(64, 158, 255, 0);
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
margin-right: 14px;
flex-shrink: 0;
cursor: pointer;
.btnText {
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
}
.btn1 {
border: 1px solid rgba(64, 158, 255, 1);
color: #4ea6ff;
}
.btn2 {
background-color: #4ea6ff;
color: #ffffff;
}
}
}
}
}
}
}
}
</style>