diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js
index 9f12f6434..f2dd74fd9 100644
--- a/public/react/src/modules/courses/ListPageIndex.js
+++ b/public/react/src/modules/courses/ListPageIndex.js
@@ -104,17 +104,17 @@ class ListPageIndex extends Component{
{/*头部banner*/}
<CoursesBanner {...this.props}></CoursesBanner>
- {/*{yslGuideone===null||yslGuideone===undefined||yslGuideone===false?*/}
- {/* (*/}
- {/* this.props.isAdmin()===true?*/}
- {/* <Guide*/}
- {/* setwindowlocal={(b)=>this.setwindowlocal(b)}*/}
- {/* >*/}
- {/* </Guide>*/}
- {/* :""*/}
- {/* )*/}
- {/* :""*/}
- {/*}*/}
+ {yslGuideone===null||yslGuideone===undefined||yslGuideone===false?
+ (
+ this.props.isAdmin()===true?
+ <Guide
+ setwindowlocal={(b)=>this.setwindowlocal(b)}
+ >
+ </Guide>
+ :""
+ )
+ :""
+ }
<div className="educontent clearfix" style={{flex: "1 0 auto"}}>
diff --git a/public/react/src/modules/courses/shixunHomework/Guide.js b/public/react/src/modules/courses/shixunHomework/Guide.js
index a4ca9b373..d501b2ab5 100644
--- a/public/react/src/modules/courses/shixunHomework/Guide.js
+++ b/public/react/src/modules/courses/shixunHomework/Guide.js
@@ -21,21 +21,32 @@ class Guide extends Component {
}
componentDidMount() {
+ // 1366x768
+ // var mywidthone=7;
- var mywidthone=0;
+ var mywidthone=0;
if(window.screen.width===1024){
mywidthone=1;
}
- if(window.screen.width===1280){
+ else if(window.screen.width===1280){
mywidthone=2;
}
- if(window.screen.width===1440){
+ else if(window.screen.width===1440){
mywidthone=3;
}
- if(window.screen.width===1680){
+ else if(window.screen.width===1680){
mywidthone=4;
}
- if(window.screen.width===1920){
+ else if(window.screen.width===1920){
+ mywidthone=5;
+ }
+ else if(window.screen.width===1366){
+ mywidthone=6;
+ }
+ else if(window.screen.width===1600){
+ mywidthone=7;
+ }
+ else{
mywidthone=5;
}
this.setState({
@@ -54,8 +65,9 @@ class Guide extends Component {
render() {
let {page,mywidth}=this.state;
// console.log("屏幕宽度");
- // console.log(window.screen.width);
- // console.log(mywidth);
+ console.log(window.screen.width);
+ console.log(mywidth);
+
return (
<div className="guide-shadow">
<style>
@@ -70,14 +82,14 @@ class Guide extends Component {
{
page===1?
<div className="guide-content">
- <img className={mywidth===1?"ysldiv11024":mywidth===2?"ysldiv11280":mywidth===3?"ysldiv11440":mywidth===4?"ysldiv11680":"ysldiv11900"} src={guihome1} onClick={(i)=>this.thissetPage(2)} />
+ <img className={mywidth===1?"ysldiv11024":mywidth===2?"ysldiv11280":mywidth===3?"ysldiv11440":mywidth===4?"ysldiv11680":mywidth===5?"ysldiv11900":mywidth===6?"ysldiv11366":mywidth===7?"ysldiv11600":"ysldiv11900"} src={guihome1} onClick={(i)=>this.thissetPage(2)} />
</div>
:""
}
{
page===2?
<div className="guide-content">
- <img className={mywidth===1?"ysldiv21024":mywidth===2?"ysldiv21280":mywidth===3?"ysldiv21440":mywidth===4?"ysldiv21680":"ysldiv21900"} src={guihome2} onClick={(i)=>this.thissetPage(3)}/>
+ <img className={mywidth===1?"ysldiv21024":mywidth===2?"ysldiv21280":mywidth===3?"ysldiv21440":mywidth===4?"ysldiv21680":mywidth===5?"ysldiv21900":mywidth===6?"ysldiv21366":mywidth===7?"ysldiv21600":"ysldiv21900"} src={guihome2} onClick={(i)=>this.thissetPage(3)}/>
</div>
:
""
@@ -85,7 +97,7 @@ class Guide extends Component {
{
page===3?
<div className="guide-content">
- <img className={mywidth===1?"ysldiv31024":mywidth===2?"ysldiv31280":mywidth===3?"ysldiv31440":mywidth===4?"ysldiv31680":"ysldiv31900"} src={guihome3} onClick={(i)=>this.thissetPage(4)}/>
+ <img className={mywidth===1?"ysldiv31024":mywidth===2?"ysldiv31280":mywidth===3?"ysldiv31440":mywidth===4?"ysldiv31680":mywidth===5?"ysldiv31900":mywidth===6?"ysldiv31366":mywidth===7?"ysldiv31600":"ysldiv31900"} src={guihome3} onClick={(i)=>this.thissetPage(4)}/>
</div>
:
""
@@ -93,7 +105,7 @@ class Guide extends Component {
{
page===4?
<div className="guide-content">
- <img className={mywidth===1?"ysldiv41024":mywidth===2?"ysldiv41280":mywidth===3?"ysldiv41440":mywidth===4?"ysldiv41680":"ysldiv41900"} src={guihome4} onClick={(i)=>this.thissetPage(5)}/>
+ <img className={mywidth===1?"ysldiv41024":mywidth===2?"ysldiv41280":mywidth===3?"ysldiv41440":mywidth===4?"ysldiv41680":mywidth===5?"ysldiv41900":mywidth===6?"ysldiv41366":mywidth===7?"ysldiv41600":"ysldiv41900"} src={guihome4} onClick={(i)=>this.thissetPage(5)}/>
</div>
:
""
@@ -101,7 +113,7 @@ class Guide extends Component {
{
page===5?
<div className="guide-content">
- <img className={mywidth===1?"ysldiv51024":mywidth===2?"ysldiv51280":mywidth===3?"ysldiv51440":mywidth===4?"ysldiv51680":"ysldiv51900"} src={guihome5} onClick={(i)=>this.thissetPage(6)}/>
+ <img className={mywidth===1?"ysldiv51024":mywidth===2?"ysldiv51280":mywidth===3?"ysldiv51440":mywidth===4?"ysldiv51680":mywidth===5?"ysldiv51900":mywidth===6?"ysldiv51366":mywidth===7?"ysldiv51600":"ysldiv51900"} src={guihome5} onClick={(i)=>this.thissetPage(6)}/>
</div>
:
""
@@ -109,7 +121,7 @@ class Guide extends Component {
{
page===6?
<div className="guide-content">
- <img className={mywidth===1?"ysldiv61024":mywidth===2?"ysldiv61280":mywidth===3?"ysldiv61440":mywidth===4?"ysldiv61680":"ysldiv61900"} src={guihome6} onClick={(i)=>this.thissetPage(7)}/>
+ <img className={mywidth===1?"ysldiv61024":mywidth===2?"ysldiv61280":mywidth===3?"ysldiv61440":mywidth===4?"ysldiv61680":mywidth===5?"ysldiv61900":mywidth===6?"ysldiv61366":mywidth===7?"ysldiv61600":"ysldiv61900"} src={guihome6} onClick={(i)=>this.thissetPage(7)}/>
</div>
:
""
diff --git a/public/react/src/modules/courses/shixunHomework/guide.css b/public/react/src/modules/courses/shixunHomework/guide.css
index b815b2937..efd7709aa 100755
--- a/public/react/src/modules/courses/shixunHomework/guide.css
+++ b/public/react/src/modules/courses/shixunHomework/guide.css
@@ -20,7 +20,7 @@
right: 0;
bottom: 0;
- background-color: rgba(0, 0, 0, 0.8);
+ background-color: rgba(0, 0, 0, 0.4);
transition: all .3s ease-out;
display: flex;
justify-content: center;
@@ -236,15 +236,19 @@
}
.ysldiv11680{
- margin-top: 11%;
- margin-left: 13%;
- margin-right: 10%;
+ margin-top: 11.5%;
+ margin-left: 13%;
+ margin-right: 9%;
+}
+.ysldiv11600{
+ margin-top: 12%;
+ margin-left: 11%;
+ margin-right: 7%;
}
.ysldiv11440{
margin-top: 14%;
margin-left: 7%;
margin-right: 3%;
- height: 60%;
}
.ysldiv11280{
@@ -253,6 +257,12 @@
margin-right: 0%;
height: 60%;
}
+.ysldiv11366{
+ margin-top: 15%;
+ margin-left: 5%;
+ margin-right: 2%;
+ height: 60%;
+}
.ysldiv11024{
margin-top: 20%;
margin-left: 0%;
@@ -270,16 +280,19 @@
}
.ysldiv21680{
- margin-top: 11%;
- margin-left: 45%;
+ margin-top: 11.5%;
+ margin-left: 45%;
+ margin-right: 20%;
+}
+.ysldiv21600{
+ margin-top: 12%;
+ margin-left: 47%;
margin-right: 20%;
- height: 24%;
}
.ysldiv21440{
margin-top: 14%;
margin-left: 47%;
margin-right: 17%;
- height: 25%;
}
.ysldiv21280{
@@ -288,6 +301,12 @@
margin-right: 14%;
height: 25%;
}
+.ysldiv21366{
+ margin-top: 15%;
+ margin-left: 51%;
+ margin-right: 14%;
+ height: 23%;
+}
.ysldiv21024{
margin-top: 20%;
margin-left: 61%;
@@ -303,12 +322,17 @@
}
.ysldiv31680{
- margin-top: 11%;
- margin-left: 14%;
+ margin-top: 11.5%;
+ margin-left: 14%;
+ margin-right: 45%;
+}
+.ysldiv31600{
+ margin-top: 12%;
+ margin-left: 12%;
margin-right: 45%;
}
.ysldiv31440{
- margin-top: 13%;
+ margin-top: 13.5%;
margin-left: 8%;
margin-right: 44%;
}
@@ -318,6 +342,11 @@
margin-left: 3%;
margin-right: 44%;
}
+.ysldiv31366{
+ margin-top: 14%;
+ margin-left: 6%;
+ margin-right: 43%;
+}
.ysldiv31024{
margin-top: 18%;
margin-left: 1%;
@@ -327,27 +356,37 @@
/*目录管理*/
.ysldiv41900{
- margin-top: 18%;
+ margin-top: 16%;
margin-left: 19%;
- margin-right: 28%;
+ margin-right: 29%;
}
.ysldiv41680{
- margin-top: 21%;
+ margin-top: 18%;
margin-left: 14%;
+ margin-right: 24%;
+}
+.ysldiv41600{
+ margin-top: 19%;
+ margin-left: 12%;
margin-right: 23%;
}
.ysldiv41440{
- margin-top: 24%;
+ margin-top: 21%;
margin-left: 8%;
- margin-right: 19%;
+ margin-right: 20%;
}
.ysldiv41280{
- margin-top: 27%;
+ margin-top: 24%;
margin-left: 3%;
margin-right: 17%;
}
+.ysldiv41366{
+ margin-top: 22%;
+ margin-left: 6%;
+ margin-right: 20%;
+}
.ysldiv41024{
margin-top: 29%;
margin-left: 0%;
@@ -356,27 +395,37 @@
/*导航排序*/
.ysldiv51900{
- margin-top: 18%;
+ margin-top: 16%;
margin-left: 18%;
margin-right: 42%;
}
.ysldiv51680{
- margin-top: 20%;
- margin-left: 13%;
- margin-right: 41%;
+ margin-top: 18%;
+ margin-left: 13%;
+ margin-right: 40%;
+}
+.ysldiv51600{
+ margin-top: 19%;
+ margin-left: 11%;
+ margin-right: 39%;
}
.ysldiv51440{
- margin-top: 24%;
+ margin-top: 21%;
margin-left: 7%;
- margin-right: 38%;
+ margin-right: 39%;
}
.ysldiv51280{
- margin-top: 27%;
+ margin-top: 24%;
margin-left: 2%;
margin-right: 38%;
}
+.ysldiv51366{
+ margin-top: 22%;
+ margin-left: 5%;
+ margin-right: 39%;
+}
.ysldiv51024{
margin-top: 34%;
margin-left: -1%;
@@ -395,6 +444,11 @@
margin-left: 31%;
margin-right: 14%;
}
+.ysldiv61600{
+ margin-top: 19%;
+ margin-left: 30%;
+ margin-right: 12%;
+}
.ysldiv61440{
margin-top: 21%;
margin-left: 28%;
@@ -407,6 +461,12 @@
margin-right: 3%;
height: 53%;
}
+.ysldiv61366{
+ margin-top: 22%;
+ margin-left: 26%;
+ margin-right: 6%;
+ height: 53%;
+}
.ysldiv61024{
margin-top: 26%;
margin-left: 27%;