Skip to content

C
confucius
Commit c4617401 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent b6791f93
Show whitespace changes
Inline Side-by-side
Showing with 218 additions and 15 deletions
src/App.vue
View file @ c4617401
......@@ -12,7 +12,7 @@ export default {
<style>
@import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_j3irt4s1vw8.css');
@import url('//at.alicdn.com/t/font_2077629_1tjpqpx3bj7.css');
html,
body,
......
src/components/schedul/schedul-orderlist.vue
View file @ c4617401
<style>
.sche_ListInner {
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
}
.sche_List_in {
display: flex;
align-items: center;
flex: 1;
margin-bottom: 5px;
align-items: baseline;
}
.sche_List_in .sche_Dian {
flex-shrink: 0;
position: relative;
top: -2px;
}
.sche_mid .el-input__inner {
border: 0;
width: 90%;
margin-left: 20px;
height: 30px;
line-height: 30px;
}
.sche_Fenye {
display: flex;
width: 100px;
position: absolute;
right: 20px;
bottom: 20px;
}
.sche_left {
border: 1px solid #EBEBEB;
width: 24px;
height: 24px;
border-radius: 6px;
text-align: center;
line-height: 24px;
color: #B4B4B4;
cursor: pointer;
}
.sche_left i {
font-size: 23px;
}
.sche_Page {
font-size: 12px;
width: 50px;
line-height: 24px;
text-align: center;
}
.addSche {
width: 60px;
height: 60px;
position: absolute;
top: 23px;
right: 31px;
border-radius: 16px;
background-color: rgba(255, 255, 255, 0.5);
text-align: center;
line-height: 60px;
cursor: pointer;
}
.addSche i {
color: #fff;
font-size: 30px;
font-weight: bold;
}
.secondList_Bottom {
margin: 15px 20px 0 20px;
font-size: 14px;
color: #000000;
min-height: 100px;
padding-bottom: 10px;
min-height: 135px;
}
.schNoneNum {
left: 174px !important;
background-color: rgba(255, 255, 255, 0.5) !important;
}
.secondList_Bottom .el-textarea__inner {
border: 0;
}
.sche_hengLine {
width: 20px;
height: 4px;
background-color: #fff;
border-radius: 2px;
position: absolute;
left: 32px;
top: 60px;
}
.tufaPop .el-textarea__inner{
background-color: #E9EFFF;
border:0;
}
.schedul_Upload{
background-color: #E9EFFF;
border: 1px dashed #c0ccda;
border-radius: 6px;
box-sizing: border-box;
width: 148px;
height: 148px;
cursor: pointer;
line-height: 146px;
vertical-align: top;
font-size:40px;
text-align: center;
line-height: 148px;
}
</style>
<template>
<div>
......@@ -8,20 +131,87 @@
<div class="scheList_TOP">
<img src="../../assets/images/work_list.png" />
<span class="word_sche">工作清单</span>
<div class="sche_hengLine"></div>
<span class="word_scheNumber">3</span>
</div>
<div class="scheList_Bottom">
<div>
<span class="sche_Dian"></span>
打开门面，把电视打开，打扫前台和每处卫生。
<div class="sche_List_in">
<div class="sche_Dian"></div>
<div class="sche_ListInner">打开门面，把电视打开，打扫前台和每处卫生。</div>
</div>
<div class="sche_List_in">
<div class="sche_Dian"></div>
<div class="sche_ListInner">注意：不能在前台吃早饭，会有新学生来，需要给他们倒水，介绍所有房间的寓意及说介绍所有房间的寓意及说介绍所有房间的寓意及说</div>
</div>
</div>
<el-input v-model="aa" placeholder="完成情况怎么样"></el-input>
<div class="sche_Fenye">
<div class="sche_left">
<i class="iconfont icon-arrow-left"></i>
</div>
<div class="sche_Page">1/3</div>
<div class="sche_left">
<i class="iconfont icon-arrow-right1"></i>
</div>
</div>
</div>
<div class="sche_midList">
<div class="scheList_TOP">
<img src="../../assets/images/tufa.png" />
<span class="word_sche">突发事件</span>
<span class="word_scheNumber">1</span>
<div class="sche_hengLine"></div>
<el-popover placement="bottom" popper-class="tufaPop" width="400" trigger="click">
<div>
<el-upload class="schedul_Upload" action="" :show-file-list="false" :http-request="UploadAttachment">
<i class="el-icon-plus"></i>
</el-upload>
<el-input type="textarea" style="margin-top:20px;" resize="none" placeholder="添加文字内容" v-model="bb" :rows="5"></el-input>
<q-btn color="accent" size="sm" style="float:right;margin-top:10px;" label="保存" />
</div>
<div slot="reference" class="addSche">
<i class="iconfont icon-img_haha"></i>
</div>
</el-popover>
</div>
<div class="secondList_Bottom">
<div class="sche_List_in">
<div class="sche_ListInner">打开门面，把电视打开，打扫前台和每处卫生，注意：不能在前台吃早饭</div>
</div>
</div>
<div class="sche_Fenye">
<div class="sche_left">
<i class="iconfont icon-arrow-left"></i>
</div>
<div class="sche_Page">1/3</div>
<div class="sche_left">
<i class="iconfont icon-arrow-right1"></i>
</div>
</div>
</div>
<div class="sche_midList">
<div class="scheList_TOP">
<img src="../../assets/images/jiaojie.png" />
<span class="word_sche">交接工作说明</span>
<div class="sche_hengLine"></div>
<span class="word_scheNumber schNoneNum">0</span>
<div class="addSche">
<i class="iconfont icon-img_haha"></i>
</div>
</div>
<div class="secondList_Bottom">
<el-input type="textarea" resize="none" :rows="5" placeholder="安排工作说明不要忘记啦"></el-input>
</div>
<div class="sche_Fenye">
<div class="sche_left">
<i class="iconfont icon-arrow-left"></i>
</div>
<div class="sche_Page">1/3</div>
<div class="sche_left">
<i class="iconfont icon-arrow-right1"></i>
</div>
</div>
</div>
</div>
</div>
......@@ -36,7 +226,10 @@
},
data() {
return {
dataList: {}
dataList: {},
tufaVisible: false,
aa: '',
bb:''
}
},
created() {
......@@ -47,6 +240,10 @@
getList() {
},
//上传
UploadAttachment(){
}
},
}
......
src/pages/scheduling/scheduleBoard.vue
View file @ c4617401
......@@ -166,6 +166,8 @@
border:1px solid #EBEBEB;
box-shadow: 0px 1px 1px 0px #E4E7FB;
overflow: hidden;
font-family: 'MicrosoftYaHei';
position: relative;
}
.Sche_Bottom {
......@@ -181,7 +183,8 @@
}
.scheList_TOP img {
width: 100%;
/* width: 100%; */
height:100%;
}
.word_sche {
......@@ -198,17 +201,19 @@
color:#fff;
background-color: #FE4475;
position: absolute;
top:25px;
left:134px;
top:30px;
left:130px;
text-align: center;
line-height: 36px;
border-radius: 8px;
font-size:30px;
font-size:25px;
}
.scheList_Bottom{
margin:20px;
margin:15px 20px 0 20px;
font-size:14px;
color:#000000;
padding-bottom:10px;
border-bottom:1px solid #F3F3F3;
}
.sche_Dian{
display:inline-block;
......@@ -216,6 +221,7 @@
height:6px;
background-color: #6D97FF;
border-radius: 50%;
margin-right:10px;
}
</style>
......@@ -244,13 +250,13 @@
<div class="sche_Topflex">
<div class="Sctop_Color Scdu_benci" style="position:relative;">本次值班信息</div>
<div class="Sctop_Color">
<span class="Scotop_little">校区</span>城中一校区
<span class="Scotop_little">校区</span>{{dataList.SchoolName}}
</div>
<div class="Sctop_Color" style="width:300px;">
<span class="Scotop_little">时间</span>2021.04.27 周二 9:30
</div>
<div class="Sctop_Color">
<span class="Scotop_little">班次</span>早班
<span class="Scotop_little">班次</span>{{dataList.ShiftName}}
</div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment