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

feat:合并

Browse Source
This commit is contained in:
李晓鸽
2022-10-25 11:39:06 +08:00
parent 2245d2cf4c 4fec145605
commit b99af0dcba
17 changed files with 3715 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/drawers/AddOnline.vue
View File

@@ -304,6 +304,7 @@ export default {
}
}
.contentMain {
padding-right: 12px;
.main_items {
display: flex;
justify-content: space-between;

34
src/components/drawers/NoticePub.vue
View File

@@ -1,11 +1,12 @@
<!--发布公告-->
<template>
<div class="noticeTitle"><span style="font-size: 18px;">公告</span>
<a-divider style="margin-top: 0px;margin-bottom:30px;"></a-divider>
<a-switch v-model:checked="noticeChecked" size="small"/><span style="margin-left: 16px;">开启</span>
<div class="split"></div>
<div class="noticeTitle">
<div class="notitle"><span class="titlespan">公告</span></div>
<div class="switch"><a-switch v-model:checked="noticeChecked" size="small"/><span style="margin-left: 16px;">开启</span></div>
<template v-if="noticeChecked">
<p style="margin-top: 35px;">公告内容</p>
<a-textarea v-model:value="noticeContent" show-count :maxlength="150" style="margin-top: -10px;margin-bottom:30px;height: 110px;"/>
<p>公告内容</p>
<a-textarea v-model:value="noticeContent" :maxlength="150" placeholder="公告信息最多输入150个字" style="margin-top: -10px;height: 120px;"/>
<div class="publish"><div class="iconPub"></div><div class="btnText">发布</div></div>
</template>
@@ -29,9 +30,26 @@ export default {
</script>
<style lang="scss">
.noticeTitle {
margin-left: 38px;
margin-right: 38px;
margin-left: 32px;
margin-right: 32px;
padding-top: 20px;
.notitle{
height: 55px;
border-bottom:1px solid #ededed;
position: relative;
.titlespan{
font-size: 18px;
position: absolute;
left: 0;
bottom: 0px;
}
}
.switch{
display: flex;
align-items: center;
height: 90px;
}
.publish {
width: 100px;
height:38px;
@@ -43,7 +61,7 @@ export default {
justify-content: center;
flex-shrink: 0;
float: right;
margin-top: 60px;
margin-top: 24px;
margin-bottom: 60px;
margin-right: 20px;
cursor: pointer;

749
src/components/drawers/OwnPower.vue
View File

File diff suppressed because it is too large Load Diff

132
src/components/drawers/PowerList.vue
View File

@@ -48,7 +48,7 @@
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
:scroll="{ x: 900, y: 400 }"
:scroll="{ x: 900}"
:pagination="false"
:row-selection="{
columnWidth: 30,
@@ -92,7 +92,7 @@
v-model:visible="cancelModal"
:footer="null"
:closable="closeCancel"
wrapClassName="CopyModal"
wrapClassName="copyModal"
centered="true"
>
<div class="delete">
@@ -104,7 +104,7 @@
<div class="close_exit" @click="closeCancelModal"></div>
</div>
<div class="body">
<span>是否取消当前用户对此数据的权限</span>
<span>您确定要取消该用户的授权吗</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn1">
@@ -332,7 +332,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/notice.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;
}
}
}
}
}
}
}
}
.powerList {
// width: 80%;
.ant-drawer-content-wrapper {
@@ -371,13 +481,13 @@ export default {
width: 100%;
// height: 100%;
// background-color: #bfa;
// overflow-y: auto;
overflow-y: auto;
.search {
width: 100%;
display: flex;
flex-wrap: wrap;
margin-top: 10px;
justify-content: space-between;
//justify-content: space-between;
.leftchoose {
display: flex;
margin-right: 20px;
@@ -428,15 +538,15 @@ export default {
}
.btn1 {
background: #388be1;
background: #409EFF;
color: #ffffff;
}
.btn2 {
background: #ffffff;
color: #388be1;
border: 1px solid #388be1;
color: #409EFF;
border: 1px solid #409EFF;
}
}
}
@@ -489,6 +599,12 @@ export default {
// position: absolute;
// bottom: 20px;
// margin-bottom: 20px;
.ant-pagination-prev, .ant-pagination-next,.ant-pagination-options {
margin-bottom: 10px;
}
.ant-pagination-item {
margin-bottom: 10px;
}
}
// .tab {
// .ant-table-thead > tr > th {

223
src/components/drawers/ProjectScore.vue
View File

@@ -1,15 +1,15 @@
<!--发布公告-->
<template>
<div class="content3">
<div class="split"></div>
<div class="contentscore">
<a-tabs v-model:activeKey="activeKeyScore">
<a-tab-pane key="1" tab="学员获取">
<div class="group">
<div class="groupleft">
<div class="groupname" style="width: 42px">姓名：</div>
<a-input
<a-input class="ant-input"
v-model:value="value"
placeholder="请输入姓名"
style="width: 131px"
/>
</div>
<div class="groupright">
@@ -23,8 +23,8 @@
</div>
</div>
</div>
<div class="tab" style="margin: 20px 32px 30px 32px">
<a-table
<div class="tableBox" style="margin: 20px 32px 30px 32px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumnStu"
:data-source="tabledataStu"
@@ -63,11 +63,10 @@
</div>
<div class="group" style="justify-content: center">
<div class="groupleft">
<div class="groupname" style="width: 42px">姓名：</div>
<a-input
<div class="groupname">姓名：</div>
<a-input class="ant-input" style="width:152px"
v-model:value="value"
placeholder="请输入姓名"
style="width: 130px"
/>
</div>
<div class="groupright">
@@ -92,37 +91,38 @@
<a-radio-button class="today" value="3">近一个月</a-radio-button>
</a-radio-group>
</div>
<div class="slist">
<a-list :data-source="stuValue ? datascoreg : datascore">
<template #renderItem="{ item }">
<div class="item">
<div v-if="item.id == 1" class="itemleft">
<div class="itemimage">
<img src="../../assets/images/taskpage/gold.png" />
<div class="listdiv"> <div class="slist">
<a-list :data-source="stuValue ? datascoreg : datascore">
<template #renderItem="{ item }">
<div class="item">
<div v-if="item.id == 1" class="itemleft">
<div class="itemimage">
<img src="../../assets/images/taskpage/gold.png" />
</div>
<div class="itemid">{{ item.id }}</div>
</div>
<div class="itemid">{{ item.id }}</div>
</div>
<div v-else-if="item.id == 2" class="itemleft">
<div class="itemimage">
<img src="../../assets/images/taskpage/siler.png" />
<div v-else-if="item.id == 2" class="itemleft">
<div class="itemimage">
<img src="../../assets/images/taskpage/siler.png" />
</div>
<div class="itemid">{{ item.id }}</div>
</div>
<div class="itemid">{{ item.id }}</div>
</div>
<div v-else-if="item.id == 3" class="itemleft">
<div class="itemimage">
<img src="../../assets/images/taskpage/copper.png" />
<div v-else-if="item.id == 3" class="itemleft">
<div class="itemimage">
<img src="../../assets/images/taskpage/copper.png" />
</div>
<div class="itemid">{{ item.id }}</div>
</div>
<div v-else class="itemleft">
<div class="elseid">{{ item.id }}</div>
</div>
<div class="itemid">{{ item.id }}</div>
</div>
<div v-else class="itemleft">
<div class="elseid">{{ item.id }}</div>
</div>
<div class="itemcenter">{{ item.name }}</div>
<div class="itemright">{{ item.score }}</div>
</div>
</template>
</a-list>
<div class="itemcenter">{{ item.name }}</div>
<div class="itemright">{{ item.score }}</div>
</div>
</template>
</a-list>
</div>
</div>
</div>
</a-tab-pane>
@@ -156,11 +156,17 @@
>
</a-tabs>
</div>
<stu-score-detail v-model:Svisible="Svisible" />
</template>
<script>
import StuScoreDetail from "../../components/drawers/StuScoreDetail";
import { reactive, toRefs } from "vue";
export default {
name: "ProjectScore",
components:{
StuScoreDetail,
},
setup() {
const state = reactive({
tabledataStu: [
@@ -172,7 +178,7 @@ export default {
group: "好好学习",
diploma: "0",
operation: "查看",
putin: "手动加入",
},
{
key: 2,
@@ -182,7 +188,7 @@ export default {
group: "天天向上",
diploma: "0",
operation: "查看",
putin: "手动加入",
},
{
key: 3,
@@ -192,7 +198,7 @@ export default {
group: "好好学习",
diploma: "0",
operation: "查看",
putin: "手动加入",
},
{
key: 4,
@@ -202,7 +208,7 @@ export default {
group: "天天向上",
diploma: "0",
operation: "查看",
putin: "手动加入",
},
],
@@ -319,18 +325,53 @@ export default {
todayvalue: "1",
tableDataTotal: 30,
stuValue: false,
Svisible:false,
});
const getTableData = () => {
let datas = state.tabledataStu;
datas.map((value) => {
{
//单层项目
value.operation = (
<div class="operation">
<div
class="jc"
onClick={() => {
state.Svisible = true;
}}
>
查看
</div>
</div>
);
}
});
state.tabledataStu = datas;
};
getTableData();
return {
...toRefs(state),
};
},
};
</script>
<style lang="scss" scoped>
.content3 {
<style lang="scss">
.contentscore {
margin-top: 20px;
margin-bottom: 100px;
.ant-tabs-tab-btn {
font-size: 18px;
font-weight: 700;
}
.ant-input {
border-radius: 8px;
width: 264px;
height: 40px;
}
.group {
display: flex;
justify-content: space-between;
@@ -338,12 +379,13 @@ export default {
display: flex;
align-items: center;
margin-left: 32px;
.groupname {
.groupname {
height: 22px;
width: 70px;
width: 42px;
color: #000000;
font-size: 14px;
}
}
.groupright {
display: flex;
@@ -382,10 +424,65 @@ export default {
}
}
}
}
.tableBox {
.ant-table-selection-column {
padding: 0px !important;
// padding-left: 45px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1) !important;
color: rgba(0, 0, 0, 0.8500);
}
.ant-table-cell {
color: rgba(0, 0, 0, 0.6500);
}
.ant-table-selection-column {
padding: 0 !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;
}
.ant-table-tbody > tr > td {
border-bottom: 1px solid rgba(240, 244, 254, 1);
padding: 16px 16px;
.operation {
color: rgba(56, 125, 247, 1);
cursor: pointer;
}
}
.ant-table-tbody{
.pa {
// left: 0;
margin-top: 15px;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
// position: absolute;
// bottom: 20px;
}
}
}
.scorelist {
padding-left: 20%;
padding-right: 20%;
padding-bottom: 100px;
padding-top: 50px;
.grouprightscore {
@@ -398,8 +495,8 @@ export default {
flex-direction: column;
align-items: center;
justify-content: center;
margin-left: 10%;
margin-right: 10%;
margin-left: 90px;
margin-right: 90px;
}
.btn1 {
@@ -407,21 +504,28 @@ export default {
}
}
.radiobutton {
margin-top: 23px;
margin-bottom: 23px;
justify-content: center;
display: flex;
text-align: center;
.today {
width: 105px;
width: 120px;
height: 32px;
}
}
.slist {
.listdiv{
display: flex;
justify-content: space-evenly;
text-align: center;
.slist {
width: 736px;
background-color: #f5f8fc;
padding-left: 20px;
padding-right: 20px;
padding-left: 28px;
padding-right: 28px;
padding-bottom: 20px;
padding-top: 10px;
padding-top: 16px;
font-size: 18px;
.item {
@@ -429,7 +533,7 @@ export default {
justify-content: space-evenly;
text-align: center;
border-bottom: none;
height: 60px;
height: 56px;
align-items: center;
background-color: white;
border-radius: 21px;
@@ -440,7 +544,7 @@ export default {
align-items: center;
width: 150px;
.itemid {
font-size: 46px;
font-size: 40px;
font-family: math;
font-style: italic;
font-weight: 700;
@@ -462,9 +566,9 @@ export default {
}
}
}
}
}
}
.projectscore {
.projectscore {
.pjc_body {
margin-left: 34px;
margin-right: 34px;
@@ -532,4 +636,7 @@ export default {
}
}
}
</style>
}
</style>

340
src/components/drawers/StuScoreDetail.vue Normal file
View File

@@ -0,0 +1,340 @@
<template>
<a-drawer
:visible="Svisible"
class="drawerStyle StuScore"
placement="right"
width="70%"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">学员获取详情</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="main">
<div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumns"
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 900, y: 560 }"
@expand="expandTable"
:pagination="false"
/>
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
/>
</div>
</div>
</div>
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>
</a-drawer>
</template>
<script>
import { toRefs, reactive } from "vue";
export default {
name: "StuScoreDetail",
props: {
Svisible: {
type: Boolean,
default: false,
},
},
setup(props, ctx) {
const state = reactive({
name: null,
pageSize: 10,
currentPage: 1,
tableDataTotal: 100,
selectedRowKeys: [],
tabledata: [
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
{
key: 1,
time: "2019-12-12 12:12",
score: "12",
type: "完成任务",
from: "【在线】如何成为产品经理",
},
],
tablecolumns: [
{
title: "获取时间",
dataIndex: "time",
key: "time",
width: 40,
align: "left",
className: "h head",
},
{
title: "积分",
dataIndex: "score",
key: "score",
width: 60,
align: "center",
className: "h",
},
{
title: "类型",
dataIndex: "type",
key: "type",
width: 60,
align: "center",
className: "h",
},
{
title: "来源",
dataIndex: "from",
key: "from",
width: 60,
align: "center",
className: "h",
},
],
});
const closeDrawer = () => {
ctx.emit("update:Svisible", false);
};
return {
...toRefs(state),
closeDrawer,
};
},
};
</script>
<style lang="scss" >
.StuScore{
.drawerMain {
min-width: 600px;
margin: 0px 32px 0px 32px;
overflow-x: scroll;
display: flex;
flex-direction: column;
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
justify-content: space-between;
align-items: center;
// background-color: red;
margin-bottom: 20px;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
// margin-left: 24px;
}
}
.main {
width: 100%;
height: 100%;
// background-color: #bfa;
// overflow-y: auto;
.endtime {
font-size: 16px;
font-weight: 500;
color: #333333;
}
.tableBox {
.ant-table-selection-column {
padding: 0px !important;
// padding-left: 45px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1) !important;
color: rgba(0, 0, 0, 0.8500);
}
.ant-table-cell {
color: rgba(0, 0, 0, 0.6500);
}
.ant-table-selection-column {
padding: 0 !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;
}
.ant-table-tbody > tr > td {
border-bottom: 1px solid rgba(240, 244, 254, 1);
padding: 16px 16px;
.operation {
color: rgba(56, 125, 247, 1);
cursor: pointer;
}
}
.pa {
// left: 0;
margin-top: 15px;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
// position: absolute;
// bottom: 20px;
}
}
}
.btnn {
height: 72px;
width: 100%;
position: absolute;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-left: 15px;
color: #fff;
}
}
}
}
</style>

6
src/components/windows/DelWins.vue
View File

@@ -37,9 +37,9 @@ import { toRefs, reactive, defineComponent } from "vue";
export default defineComponent({
name: "DelWins",
props: {
delete_hs: {
type: Boolean,
default: false,
delete_hs: {
type: Boolean,
default: false,
},
},
setup() {