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

feat:合并

Browse Source
This commit is contained in:
李晓鸽
2022-10-19 10:08:09 +08:00
parent aeeb4d7c6b dbf651e716
commit f35c80c809
3 changed files with 180 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/assets/scss/common.scss
View File

@@ -373,4 +373,113 @@ textarea {
}
}
//弹窗--------------------------------------------------------
//弹窗--------------------------------------------------------
//面授管理弹窗
.FacMa {
.ant-modal {
width: 424px;
height: 258px;
.ant-modal-content {
width: 424px;
height: 258px;
.ant-modal-body {
width: 424px;
height: 258px;
padding: 0px;
.head {
width: 424px;
height: 68px;
// position: absolute;
// left: 0;
// top: 0;
background: linear-gradient(180deg,
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%);
display: flex;
justify-content: center;
.inhead {
width: 90%;
height: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.left {
display: flex;
align-items: center;
.gan {
width: 16px;
height: 16px;
background-image: url(../../assets/images/taskpage/gan.png);
}
.tis {
margin-left: 5px;
width: 32px;
font-size: 16px;
font-weight: 600;
color: #333333;
}
}
.right {
width: 22px;
height: 22px;
background-image: url(../../assets/images/basicinfo/close.png);
background-size: 100% 100%;
cursor: pointer;
}
}
}
.main {
margin-top: 20px;
width: 100%;
display: flex;
justify-content: center;
font-size: 14px;
font-weight: 400;
color: #333333;
}
.butn {
width: 100%;
display: flex;
margin-top: 60px;
justify-content: center;
.btn {
width: 100px;
height: 40px;
border-radius: 4px;
cursor: pointer;
}
.btn1 {
color: #387df7;
background: #ffffff;
border: 1px solid #387df7;
}
.btn2 {
background: #388be1;
color: #fff;
border: 0;
margin-left: 10px;
}
}
}
}
}
}
//面授管理弹窗

133
src/components/drawers/FaceManage.vue
View File

@@ -119,8 +119,7 @@
v-model:visible="showmodal"
centered="true"
:footer="null"
dialogClass="me"
style="width: 424px; height: 258px; padding: 0px; position: relative"
wrapClassName="FacMa"
>
<div class="head">
<div class="inhead">
@@ -361,103 +360,6 @@ export default {
</script>
<style lang="scss" >
.me {
.ant-modal-body {
padding: 0px;
}
}
.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: 0px !important;
.head {
width: 424px;
height: 68px;
// position: absolute;
// left: 0;
// top: 0;
background: linear-gradient(
180deg,
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%
);
display: flex;
justify-content: center;
.inhead {
width: 90%;
height: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.left {
display: flex;
align-items: center;
.gan {
width: 16px;
height: 16px;
background-image: url(../../assets/images/taskpage/gan.png);
}
.tis {
margin-left: 5px;
width: 32px;
font-size: 16px;
font-weight: 600;
color: #333333;
}
}
.right {
width: 22px;
height: 22px;
background-image: url(../../assets/images/basicinfo/close.png);
background-size: 100% 100%;
cursor: pointer;
}
}
}
.main {
margin-top: 20px;
width: 100%;
display: flex;
justify-content: center;
font-size: 14px;
font-weight: 400;
color: #333333;
}
.butn {
width: 100%;
display: flex;
margin-top: 60px;
justify-content: center;
.btn {
width: 100px;
height: 40px;
border-radius: 4px;
cursor: pointer;
}
.btn1 {
color: #387df7;
background: #ffffff;
border: 1px solid #387df7;
}
.btn2 {
background: #388be1;
color: #fff;
border: 0;
margin-left: 10px;
}
}
}
}
}
// .drawerStyle {
// .ant-drawer-content-wrapper {
// // max-width: 1000px;
@@ -470,6 +372,7 @@ export default {
// }
// }
.FaceManage {
.drawerMain {
min-width: 600px;
@@ -477,6 +380,7 @@ export default {
overflow-x: scroll;
display: flex;
flex-direction: column;
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
@@ -485,6 +389,7 @@ export default {
align-items: center;
// background-color: red;
margin-bottom: 20px;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -493,9 +398,11 @@ export default {
// margin-left: 24px;
}
}
.main {
width: 100%;
height: 100%;
// background-color: #bfa;
// overflow-y: auto;
.endtime {
@@ -503,6 +410,7 @@ export default {
font-weight: 500;
color: #333333;
}
.search {
width: 100%;
display: flex;
@@ -513,9 +421,11 @@ export default {
display: flex;
flex-wrap: nowrap;
margin-bottom: 10px;
.name {
margin-top: 8px;
}
// .name {
// margin-top: 8px;
@@ -524,6 +434,7 @@ export default {
// font-weight: 400;
// }
}
.btns {
display: flex;
flex-wrap: nowrap;
@@ -536,6 +447,7 @@ export default {
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
@@ -543,6 +455,7 @@ export default {
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 16px;
height: 18px;
@@ -557,6 +470,7 @@ export default {
color: #ffffff;
}
.btn2 {
background: #ffffff;
@@ -565,6 +479,7 @@ export default {
}
}
}
.btnss {
display: flex;
flex-wrap: nowrap;
@@ -577,6 +492,7 @@ export default {
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
@@ -584,6 +500,7 @@ export default {
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 17px;
height: 16px;
@@ -598,6 +515,7 @@ export default {
color: #ffffff;
}
.btn2 {
background: #ffffff;
margin-right: 20px;
@@ -605,6 +523,7 @@ export default {
border: 1px solid #388be1;
}
}
.line {
width: 100%;
height: 40px;
@@ -614,35 +533,42 @@ export default {
align-items: center;
margin-top: 20px;
border: 1px solid #c3e6fc;
.inline {
width: 95%;
height: 100%;
display: flex;
justify-content: space-between;
// background-color: #bfa;
.left {
height: 100%;
display: flex;
align-items: center;
.img {
width: 14px;
height: 15px;
background-image: url(../../assets/images/leveladd/gan.png);
background-size: 100% 100%;
}
.text {
color: #999ba3;
}
.text2 {
color: #4ea6ff;
margin-left: 5px;
margin-right: 5px;
}
.text3 {
color: #999ba3;
margin-left: 20px;
}
}
.right {
font-size: 14px;
font-weight: 400;
@@ -654,28 +580,35 @@ 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;
}
.ant-table-selection-column {
padding: 0 !important;
}
th.h {
background-color: #eff4fc !important;
}
.head {
padding-left: 0px !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.pa {
// left: 0;
margin-top: 15px;
@@ -700,6 +633,7 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
@@ -709,6 +643,7 @@ export default {
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;

38
src/components/drawers/WorkManage.vue
View File

@@ -54,7 +54,11 @@
</div>
</div>
<div class="btnss" style="margin-top: 20px">
<div class="btn btn1" style="margin-right: 20px">
<div
class="btn btn1"
style="margin-right: 20px; cursor: pointer"
@click="showModal"
>
<div class="img1"></div>
<div class="wz">导出数据</div>
</div>
@@ -79,6 +83,13 @@
<button class="btn1">取消</button>
<button class="btn2">确定</button>
</div>
<div class="modal">
<a-modal v-model:visible="visible" :closable="close" :footer="null">
<p>Some contents...</p>
<p>Some contents...</p>
<p>Some contents...</p>
</a-modal>
</div>
</div>
</a-drawer>
</template>
@@ -97,7 +108,8 @@ export default {
setup(props, ctx) {
const state = reactive({
name: null,
visible: false, //导出数据弹窗
close: false, //导出弹窗的关闭按钮
projectNameList: [
{
id: 1,
@@ -287,10 +299,18 @@ export default {
const closeDrawer = () => {
ctx.emit("update:Wvisible", false);
};
const showModal = () => {
state.visible = true;
};
const closeModal = () => {
state.visible = false;
};
return {
...toRefs(state),
selectProjectName,
closeDrawer,
showModal,
closeModal,
};
},
};
@@ -310,6 +330,20 @@ export default {
// }
.WorkManage {
.modal {
.ant-modal {
width: 473px !important;
height: 308px !important;
.ant-modal-content {
width: 473px !important;
height: 308px !important;
.ant-modal-body {
width: 473px !important;
height: 308px !important;
}
}
}
}
.drawerMain {
min-width: 600px;
margin: 0px 32px 0px 32px;