Skip to content

B
biz.qingxiao.com
Commit cc39137c authored by baixian's avatar baixian
Browse files
Options

优化

parent ee2e9938
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2043 additions and 528 deletions
src/components/CourseChart.js
View file @ cc39137c
......@@ -907,7 +907,12 @@ class CourseChart extends React.Component {
<div className={`${pageStyle.coursechartbox} coursechartbox`}>
<div className={pageStyle.titlebox}>
<div className={pageStyle.leftbox} style={{ marginRight: '50px' }}>
<span className={pageStyle.title}>课表</span>
{/* <span className={pageStyle.title}>课表</span> */}
{hasBtnPower('sjd/indexstaic', 'planSchedule') &&
<BtnPermission btnId="30008">
<Button className={pageStyle.planCourseBtn} type="primary" ghost onClick={goPlanCourse}>一键排课</Button>
</BtnPermission>
}
{/* <span className={pageStyle.selectdate} onClick={() => this.changeDate('pre')}>上周</span>
<span className={pageStyle.selectdate} onClick={() => this.changeDate('current')}>本周</span>
<span className={pageStyle.selectdate} onClick={() => this.changeDate('next')}>下周</span> */}
......@@ -918,11 +923,6 @@ class CourseChart extends React.Component {
</Button.Group>
</div>
<div className={pageStyle.rightbox}>
{hasBtnPower('sjd/indexstaic', 'planSchedule') &&
<BtnPermission btnId="30008">
<Button type="primary" onClick={goPlanCourse}>一键排课</Button>
</BtnPermission>
}
{LocalStorage.getItem('role') != 1 &&
<Select className={pageStyle.selectitem} value={scheduleListQueryParams.teacher_id} onChange={this.changeTeacher}>
<Option value="">全部老师</Option>
......
src/components/CourseChart.less
View file @ cc39137c
.titlebox {
display: flex;
align-items: center;
// justify-content: space-between;
justify-content: space-between;
padding: 20px 22px 20px 24px;
.planCourseBtn {
margin-right: 40px;
}
.title {
font-size: 16px;
color: #000;
......@@ -32,6 +35,7 @@
.tableth {
position: relative;
width: 60px;
display: flex;
.weekday {
font-size: 16px;
color: #000;
......
src/components/SjdHeader.js
View file @ cc39137c
......@@ -119,16 +119,16 @@ class SjdMenu extends React.Component {
<div className={SjdHeaderStyle.accountoperate}>
{!isDepartment &&
<div className={SjdHeaderStyle.useraccount}>
<img alt={(schoolUserInfo && schoolUserInfo.name) || ''} src={(schoolUserInfo && imagify(schoolUserInfo.avatar)) || ''} className={SjdHeaderStyle.avator} />
<span className={SjdHeaderStyle.usermobile}>{(schoolUserInfo && schoolUserInfo.nickname) || ''}</span>
<Icon type="caret-down" className={SjdHeaderStyle.caretDown} />
<img alt={(schoolUserInfo && schoolUserInfo.name) || ''} src={(schoolUserInfo && imagify(schoolUserInfo.avatar)) || ''} className={SjdHeaderStyle.avator} />
</div>
}
{isDepartment &&
<div className={SjdHeaderStyle.useraccount}>
<img alt={(userInfo && userInfo.name) || ''} src={(userInfo && imagify(schoolUserInfo.avatar)) || ''} className={SjdHeaderStyle.avator} />
<span className={SjdHeaderStyle.usermobile}>{(userInfo && userInfo.nickname) || ''}</span>
<Icon type="caret-down" className={SjdHeaderStyle.caretDown} />
<img alt={(userInfo && userInfo.name) || ''} src={(userInfo && imagify(schoolUserInfo.avatar)) || ''} className={SjdHeaderStyle.avator} />
</div>
}
</div>
......
src/components/SjdHeader.less
View file @ cc39137c
......@@ -18,8 +18,8 @@
color: #333;
}
.usermobile{
padding-left: 5px;
font-size: 14px;
margin-right: 8px;
}
.accountoperate{
float: right;
......@@ -56,7 +56,7 @@
width:28px;
height:28px;
border-radius:50%;
margin-left: 11px;
margin-right: 8px;
}
.caretDown {
color: #C2C2C2;
......@@ -77,5 +77,6 @@
}
.schoolTitle {
font-size: 14px;
color: #333;
font-weight:500;
color:rgba(81,81,81,1);
}
src/pages/index/copyindex.js 0 → 100644
View file @ cc39137c
This diff is collapsed.
src/pages/index/copyindex.less 0 → 100644
View file @ cc39137c
@import '../../less/variables.less';
.topbox {
// display: flex;
// margin-bottom: 20px;
}
.staticbox {
width: 820px;
margin-right: 20px;
// height: 510px;
min-width: 410px;
}
.staticcard {
height: 147px;
background-color: #fff;
border-radius: 6px;
margin-bottom: 14px;
// &:nth-child(1) {
// }
&:nth-child(2) {
.staticitembox {
.staticitem {
.staticname {
justify-content: center;
}
}
}
}
}
.makebox {
background-color: #fff;
height: 310px;
border-radius: 6px;
}
.cardtitle {
padding: 20px 20px 10px;
display: flex;
align-items: center;
line-height: 1;
position: relative;
}
.cardtitleline {
width:4px;
height:16px;
background:rgba(25,181,254,1);
border-radius:2px;
}
.cardtitle span {
font-size:16px;
font-family:PingFang-SC-Bold;
color:rgba(0,0,0,1);
}
.staticitembox {
display: flex;
align-items: center;
justify-content: space-around;
text-align: center;
// margin-top: 60px;
}
.staticitem {
flex: 1;
justify-content: center;
align-items: center;
padding: 0 20px;
}
.statictotal {
font-size:24px;
color:rgba(0,0,0,1);
line-height: 32px;
.statictip {
font-size:14px;
color:#999999;
line-height:24px;
display: inline-block;
margin-left: 10px;
}
}
.staticname {
color: #999999;
font-size: 14px;
line-height: 22px;
margin: 10px 0;
font-family:PingFangSC;
font-weight:400;
display: flex;
align-items: center;
.staticicon {
width: 30px;
height: 30px;
margin-right: 17px;
}
}
.makeitembox {
padding: 5px 24px;
display: flex;
flex-wrap: wrap;
}
.makeitem {
cursor: pointer;
height: 70px;
border-radius:6px;
margin-bottom: 15px;
display: flex;
align-items: center;
color: #FFFFFF;
width: 48%;
.makeitemLeft {
display: flex;
align-items: center;
margin-left: 14px;
}
&:nth-child(2n+1) {
margin-right: 10px;
}
&:nth-child(1) {
background:rgba(255,184,121,1);
}
&:nth-child(1):hover {
box-shadow:0px 0px 10px 0px rgba(255,184,121,1);
}
&:nth-child(2) {
background:#63B7FF;
}
&:nth-child(2):hover {
box-shadow:0px 0px 10px 0px #63B7FF;
}
&:nth-child(3) {
background:#24CACC;
}
&:nth-child(3):hover {
box-shadow:0px 0px 10px 0px #24CACC;
}
&:nth-child(4) {
background:#50C666;
}
&:nth-child(4):hover {
box-shadow:0px 0px 10px 0px #50C666;
}
&:nth-child(5) {
background:#FFB532;
}
&:nth-child(5):hover {
box-shadow:0px 0px 10px 0px #FFB532;
}
&:nth-child(6) {
background:#FF586F;
}
&:nth-child(6):hover {
box-shadow:0px 0px 10px 0px #FF586F;
}
}
.themeicon {
img {
width: 47px;
height: 48px;
margin-right: 15px;
}
}
.themetypename {
font-size:18px;
font-weight:400;
color:#fff;
}
.chartbox {
// width: 1656px;
// min-width: 870px;
background-color: #fff;
border-radius: 2px;
padding-top: 20px;
padding-right: 52px;
height: auto;
.cardtitle {
span {
font-size:16px;
font-family:PingFangSC;
font-weight:500;
color:rgba(0,0,0,0.85);
}
}
.cardtitleline {
float: left;
}
}
.chartbox{
.cardrest{
span {
color: red;
}
}
}
.chartbox {
.cardtitlereset {
display: flex;
align-items: center;
padding: 4px 0 18px 20px;
position: relative;
width: 100%;
margin-top: -8px;
span {
font-size:16px;
font-family:PingFangSC;
font-weight:500;
color:rgba(0,0,0,0.85);
}
}
}
.informList {
border-radius: 6px;
margin-bottom: 14px;
.informItem {
cursor: pointer;
text-align: center;
.informImg {
width: 77px;
height: 77px;
position: relative;
margin: 0 auto;
margin-bottom: 3px;
&>img {
width: 77px;
height: 77px;
}
.informNum {
position: absolute;
top: 0;
right: -10px;
}
}
.informTip {
font-size:18px;
font-weight:500;
color:#515558;
line-height:1;
margin-top: 28px;
}
}
}
@media (min-width: 1680px) {
.chartbox {
.cardtitlereset {
position: absolute;
}
}
}
.staticcolorbox {
display: flex;
// position: absolute;
// right: 0;
//float: right;
z-index: 2;
}
.staticchartcolor {
width: 53px;
height: 9px;
border-radius: 5px;
&.blue {
background-color: #63B7FF;
}
&.orange {
background-color: #FFB879;
}
&.green {
background-color: #24CACC;
}
}
.staticchartitem {
display: flex;
align-items: center;
justify-content: center;
padding-left: 20px;
}
.staticchartname {
font-size: 20px;
color: #000000;
padding-left: 23px;
}
.chartdayshift {
display: flex;
margin-left: 30px;
cursor: pointer;
// position: absolute;
// right: 0;
}
.dayshift {
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
font-weight: 400;
letter-spacing: 1px;
font-family:PingFangSC;
color: #595959;
margin-right: 24px;
&:first-child {
border-right: none;
border-radius: 10px 0 0 10px;
}
&:last-child {
border-left: none;
border-radius: 0 10px 10px 0;
}
&.tabactive {
color: #1890FF;
}
}
.chartcontent {
width: 100%;
//height: 400px;
display: flex;
align-items: center;
justify-content: center;
color: red;
font-size: 20px;
}
.chartcontentfail {
width: 100%;
height: 100px;
display: flex;
align-items: center;
justify-content: center;
color: red;
font-size: 20px;
}
.todoitem{
background: #fff;
//width: 375px;
.items{
padding: 15px 0 20px 40px;
margin-bottom: 20px;
}
.cardtitle {
padding: 16px 0 14px 20px;
display: flex;
align-items: center;
line-height: 1;
position: relative;
border-bottom: solid 1px rgba(233,233,233,1);
}
.renew{
margin-bottom: 16px;
cursor: pointer;
span{
padding: 0 8px;
background:rgba(255,255,255,1);
border-radius:3px;
border:1px solid rgba(255,24,24,1);
color: #FF1818;
margin-right: 8px;
cursor: pointer;
}
}
.renew:hover {
color:rgba(24,144,255,1);
}
.birthday{
margin-bottom: 16px;
cursor: pointer;
span{
padding: 0 8px;
background:rgba(255,255,255,1);
border-radius:3px;
border:1px solid rgba(24,144,255,1);
margin-right: 8px;
color: #1890FF;
}
}
.birthday:hover {
color:rgba(24,144,255,1);
}
}
.Schedulebox{
// height: 1000px;
background: #fff;
margin-bottom: 20px;
border-radius: 6px;
}
.rangePicker {
width: 350px;
}
@media (max-width: 510px) {
.staticitem {
padding: 0;
}
.chartbox {
.cardtitlereset {
display: block;
}
.chartdayshift {
margin-left: 0;
margin-top: 10px;
}
}
}
@media screen and (min-width: 1200px) and (max-width: 1920px) {
.topbox {
:global {
.ant-col-xl-8 {
padding-left: 2px !important;
}
}
}
}
src/pages/index/index.js
View file @ cc39137c
This diff is collapsed.
src/pages/index/index.less
View file @ cc39137c
@import '../../less/variables.less';
.topbox {
// display: flex;
// margin-bottom: 20px;
}
.staticbox {
width: 820px;
margin-right: 20px;
// height: 510px;
min-width: 410px;
}
.staticcard {
height: 147px;
background-color: #fff;
border-radius: 6px;
margin-bottom: 14px;
// &:nth-child(1) {
// }
&:nth-child(2) {
.staticitembox {
.staticitem {
.staticname {
justify-content: center;
}
}
}
}
}
.makebox {
background-color: #fff;
height: 310px;
border-radius: 6px;
}
.cardtitle {
padding: 20px 20px 10px;
display: flex;
align-items: center;
line-height: 1;
position: relative;
}
.cardtitleline {
width:4px;
height:16px;
background:rgba(25,181,254,1);
border-radius:2px;
}
.cardtitle span {
font-size:16px;
font-family:PingFang-SC-Bold;
color:rgba(0,0,0,1);
}
.staticitembox {
display: flex;
align-items: center;
justify-content: space-around;
text-align: center;
// margin-top: 60px;
}
.staticitem {
flex: 1;
justify-content: center;
align-items: center;
padding: 0 20px;
}
.statictotal {
font-size:24px;
color:rgba(0,0,0,1);
line-height: 32px;
.statictip {
font-size:14px;
color:#999999;
margin-bottom: 20px;
.staticcard {
.cardtitle {
font-size:16px;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:600;
color:rgba(104,104,104,1);
line-height:24px;
display: inline-block;
margin-left: 10px;
}
}
.staticname {
color: #999999;
font-size: 14px;
line-height: 22px;
margin: 10px 0;
font-family:PingFangSC;
font-weight:400;
display: flex;
align-items: center;
.staticicon {
width: 30px;
height: 30px;
margin-right: 17px;
margin-bottom: 15px;
}
}
.makeitembox {
padding: 5px 24px;
}
.staticitembox {
display: flex;
flex-wrap: wrap;
}
.makeitem {
cursor: pointer;
height: 70px;
border-radius:6px;
margin-bottom: 15px;
display: flex;
align-items: center;
color: #FFFFFF;
width: 48%;
.makeitemLeft {
display: flex;
align-items: center;
margin-left: 14px;
}
&:nth-child(2n+1) {
margin-right: 10px;
}
&:nth-child(1) {
background:rgba(255,184,121,1);
}
&:nth-child(1):hover {
box-shadow:0px 0px 10px 0px rgba(255,184,121,1);
}
&:nth-child(2) {
background:#63B7FF;
}
&:nth-child(2):hover {
box-shadow:0px 0px 10px 0px #63B7FF;
}
&:nth-child(3) {
background:#24CACC;
}
&:nth-child(3):hover {
box-shadow:0px 0px 10px 0px #24CACC;
}
&:nth-child(4) {
background:#50C666;
}
&:nth-child(4):hover {
box-shadow:0px 0px 10px 0px #50C666;
}
&:nth-child(5) {
background:#FFB532;
}
&:nth-child(5):hover {
box-shadow:0px 0px 10px 0px #FFB532;
}
&:nth-child(6) {
background:#FF586F;
}
&:nth-child(6):hover {
box-shadow:0px 0px 10px 0px #FF586F;
}
}
.themeicon {
img {
width: 47px;
height: 48px;
margin-right: 15px;
}
}
.themetypename {
font-size:18px;
font-weight:400;
color:#fff;
}
.chartbox {
// width: 1656px;
// min-width: 870px;
background-color: #fff;
border-radius: 2px;
padding-top: 20px;
padding-right: 52px;
height: auto;
.cardtitle {
span {
font-size:16px;
font-family:PingFangSC;
font-weight:500;
color:rgba(0,0,0,0.85);
}
}
.cardtitleline {
float: left;
}
}
.chartbox{
.cardrest{
span {
color: red;
.staticitem {
flex: 1;
text-align: center;
.statictotal {
font-size:24px;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(0,0,0,0.85);
line-height:32px;
}
.staticname {
font-size:14px;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(153,153,153,1);
line-height:22px;
white-space: nowrap;
}
}
}
}
.chartbox {
.cardtitlereset {
.fasterBox {
margin-bottom: 20px;
.commonTitle {
font-size:16px;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:600;
color:rgba(104,104,104,1);
line-height:24px;
}
.fasterList {
padding: 0 20px;
}
.fasterItem {
display: flex;
align-items: center;
padding: 4px 0 18px 20px;
position: relative;
width: 100%;
margin-top: -8px;
span {
font-size:16px;
font-family:PingFangSC;
font-weight:500;
color:rgba(0,0,0,0.85);
}
}
}
.informList {
border-radius: 6px;
margin-bottom: 14px;
.informItem {
width: 20%;
white-space: nowrap;
margin-top: 40px;
cursor: pointer;
text-align: center;
.informImg {
width: 77px;
height: 77px;
.fasterLeft {
position: relative;
margin: 0 auto;
margin-bottom: 3px;
&>img {
width: 77px;
height: 77px;
margin-right: 18px;
.fasterImg {
}
.informNum {
.fasterNum {
position: absolute;
top: 0;
right: -10px;
top: -15px;
right: -25px
}
}
.informTip {
font-size:18px;
font-weight:500;
color:#515558;
line-height:1;
margin-top: 28px;
&>span {
font-size:15px;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(45,45,45,1);
line-height:21px;
}
}
}
@media (min-width: 1680px) {
.chartbox {
.cardtitlereset {
position: absolute;
}
}
}
.staticcolorbox {
display: flex;
// position: absolute;
// right: 0;
//float: right;
z-index: 2;
}
.staticchartcolor {
width: 53px;
height: 9px;
border-radius: 5px;
&.blue {
background-color: #63B7FF;
}
&.orange {
background-color: #FFB879;
}
&.green {
background-color: #24CACC;
}
}
.staticchartitem {
display: flex;
align-items: center;
justify-content: center;
padding-left: 20px;
}
.staticchartname {
font-size: 20px;
color: #000000;
padding-left: 23px;
}
.chartdayshift {
display: flex;
margin-left: 30px;
cursor: pointer;
// position: absolute;
// right: 0;
}
.dayshift {
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
font-weight: 400;
letter-spacing: 1px;
font-family:PingFangSC;
color: #595959;
margin-right: 24px;
&:first-child {
border-right: none;
border-radius: 10px 0 0 10px;
}
&:last-child {
border-left: none;
border-radius: 0 10px 10px 0;
}
&.tabactive {
color: #1890FF;
}
}
.chartcontent {
width: 100%;
//height: 400px;
display: flex;
align-items: center;
justify-content: center;
color: red;
font-size: 20px;
}
.chartcontentfail {
width: 100%;
height: 100px;
display: flex;
align-items: center;
justify-content: center;
color: red;
font-size: 20px;
}
.todoitem{
background: #fff;
//width: 375px;
.items{
padding: 15px 0 20px 40px;
margin-bottom: 20px;
}
.cardtitle {
padding: 16px 0 14px 20px;
display: flex;
align-items: center;
line-height: 1;
position: relative;
border-bottom: solid 1px rgba(233,233,233,1);
}
.renew{
margin-bottom: 16px;
cursor: pointer;
span{
padding: 0 8px;
background:rgba(255,255,255,1);
border-radius:3px;
border:1px solid rgba(255,24,24,1);
color: #FF1818;
margin-right: 8px;
cursor: pointer;
}
}
.renew:hover {
color:rgba(24,144,255,1);
}
.birthday{
margin-bottom: 16px;
cursor: pointer;
span{
padding: 0 8px;
background:rgba(255,255,255,1);
border-radius:3px;
border:1px solid rgba(24,144,255,1);
margin-right: 8px;
color: #1890FF;
}
}
.birthday:hover {
color:rgba(24,144,255,1);
}
}
.Schedulebox{
// height: 1000px;
background: #fff;
margin-bottom: 20px;
border-radius: 6px;
}
.rangePicker {
width: 350px;
// height: 1000px;
background: #fff;
margin-bottom: 20px;
border-radius: 6px;
}
@media (max-width: 510px) {
.staticitem {
padding: 0;
}
.chartbox {
.cardtitlereset {
display: block;
}
.chartdayshift {
margin-left: 0;
margin-top: 10px;
@media (max-width: 1200px) {
.topbox {
margin-bottom: 0;
:global {
.ant-row {
.ant-col {
margin-bottom: 20px;
}
}
}
}
}
@media screen and (min-width: 1200px) and (max-width: 1920px) {
.topbox {
:global {
.ant-col-xl-8 {
padding-left: 2px !important;
@media (max-width: 1080px) {
.fasterBox {
.fasterItem {
.fasterLeft {
margin-right: 10px;
}
}
}
}
src/pages/studentinfo/Renew.js
View file @ cc39137c
......@@ -223,6 +223,10 @@ class StudentAddForm extends React.Component {
required: true,
message: '请输入购买课时',
},
{
message: '请输入正整数',
pattern: new RegExp(/^[1-9]\d*$/, 'g'),
},
],
})(
<InputNumber min={1} style={{ width: 200 }} />,
......
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