diff --git a/public/react/src/images/guideimg/guihome1.png b/public/react/src/images/guideimg/guihome1.png new file mode 100644 index 000000000..4ff6eb867 Binary files /dev/null and b/public/react/src/images/guideimg/guihome1.png differ diff --git a/public/react/src/images/guideimg/guihome2.jpg b/public/react/src/images/guideimg/guihome2.jpg new file mode 100644 index 000000000..1e6ee79ff Binary files /dev/null and b/public/react/src/images/guideimg/guihome2.jpg differ diff --git a/public/react/src/images/guideimg/guihome3.jpg b/public/react/src/images/guideimg/guihome3.jpg new file mode 100644 index 000000000..885ccd207 Binary files /dev/null and b/public/react/src/images/guideimg/guihome3.jpg differ diff --git a/public/react/src/images/guideimg/guihome4.jpg b/public/react/src/images/guideimg/guihome4.jpg new file mode 100644 index 000000000..5bb468627 Binary files /dev/null and b/public/react/src/images/guideimg/guihome4.jpg differ diff --git a/public/react/src/images/guideimg/guihome5.jpg b/public/react/src/images/guideimg/guihome5.jpg new file mode 100644 index 000000000..d0161b3e1 Binary files /dev/null and b/public/react/src/images/guideimg/guihome5.jpg differ diff --git a/public/react/src/images/guideimg/guihome6.jpg b/public/react/src/images/guideimg/guihome6.jpg new file mode 100644 index 000000000..721bcba29 Binary files /dev/null and b/public/react/src/images/guideimg/guihome6.jpg differ diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js index 1f8bf6b29..a15429bff 100644 --- a/public/react/src/modules/courses/ListPageIndex.js +++ b/public/react/src/modules/courses/ListPageIndex.js @@ -4,7 +4,7 @@ import {BrowserRouter as Router,Route,Switch} from 'react-router-dom'; import {Input,Pagination,Tooltip} from 'antd'; import Loadable from 'react-loadable'; import Loading from '../../Loading'; - +import Guide from "../../modules/courses/shixunHomework/Guide"; //业务组件 import CoursesBanner from "./coursesDetail/CoursesBanner"; import Coursesleftnav from "./coursesDetail/CoursesLeftNav"; @@ -66,11 +66,19 @@ const GraduationTasks= Loadable({ }) class ListPageIndex extends Component{ constructor(props) { - super(props) + super(props); + this.state={ + yslGuideone:true, + } } componentDidMount(){ - + var yslGuideone = window.localStorage.getItem('yslGuideone'); + console.log("77"); + console.log(yslGuideone); + this.setState({ + yslGuideone:yslGuideone, + }) } // // getleftNavid=(navid,newselectnavid)=>{ @@ -80,13 +88,28 @@ class ListPageIndex extends Component{ // navttype:newselectnavid // }) // } - + setwindowlocal=(bool)=>{ + window.localStorage.setItem('yslGuideone', bool); + this.setState({ + yslGuideone:bool, + }) + } render() { + let {yslGuideone} =this.state; + console.log("98"); + console.log(yslGuideone); return (
{/*头部banner*/} + {yslGuideone===null||yslGuideone===undefined||yslGuideone===false? + this.setwindowlocal(b)} + > + + :"" + }
diff --git a/public/react/src/modules/courses/shixunHomework/Guide.js b/public/react/src/modules/courses/shixunHomework/Guide.js new file mode 100644 index 000000000..a4ca9b373 --- /dev/null +++ b/public/react/src/modules/courses/shixunHomework/Guide.js @@ -0,0 +1,123 @@ +import React, {Component} from "react"; +import './guide.css' + +import guihome1 from "../../../images/guideimg/guihome1.png"; +import guihome2 from "../../../images/guideimg/guihome2.jpg"; +import guihome3 from "../../../images/guideimg/guihome3.jpg"; +import guihome4 from "../../../images/guideimg/guihome4.jpg"; +import guihome5 from "../../../images/guideimg/guihome5.jpg"; +import guihome6 from "../../../images/guideimg/guihome6.jpg"; + + +class Guide extends Component { + + constructor(props) { + super(props); + this.state={ + pingmuz:"", + page:1, + mywidth:1, + } + + } + componentDidMount() { + + var mywidthone=0; + if(window.screen.width===1024){ + mywidthone=1; + } + if(window.screen.width===1280){ + mywidthone=2; + } + if(window.screen.width===1440){ + mywidthone=3; + } + if(window.screen.width===1680){ + mywidthone=4; + } + if(window.screen.width===1920){ + mywidthone=5; + } + this.setState({ + mywidth:mywidthone, + }); + + } + thissetPage=(i)=>{ + this.setState({ + page:i, + }) + if(i===7){ + this.props.setwindowlocal(true); + } + } + render() { + let {page,mywidth}=this.state; + // console.log("屏幕宽度"); + // console.log(window.screen.width); + // console.log(mywidth); + return ( +
+ + { + page===1? +
+ this.thissetPage(2)} /> +
+ :"" + } + { + page===2? +
+ this.thissetPage(3)}/> +
+ : + "" + } + { + page===3? +
+ this.thissetPage(4)}/> +
+ : + "" + } + { + page===4? +
+ this.thissetPage(5)}/> +
+ : + "" + } + { + page===5? +
+ this.thissetPage(6)}/> +
+ : + "" + } + { + page===6? +
+ this.thissetPage(7)}/> +
+ : + "" + } +
+ ) + } +} + + +export default Guide; \ No newline at end of file diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index fec98e69b..9066750eb 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -17,6 +17,7 @@ import Workquestionandanswer from './Workquestionandanswer'; import CoursesListType from '../coursesPublic/CoursesListType'; import ShixunStudentWork from "./ShixunStudentWork"; import Startshixuntask from "../coursesPublic/Startshixuntask"; + import TPMMDEditor from "../../tpm/challengesnew/TPMMDEditor"; import DownloadMessageysl from "../../modals/DownloadMessageysl"; class ShixunHomeworkPage extends Component { @@ -128,6 +129,8 @@ class ShixunHomeworkPage extends Component { // console.log(teacherdatapage); return (
+ +
diff --git a/public/react/src/modules/courses/shixunHomework/guide.css b/public/react/src/modules/courses/shixunHomework/guide.css new file mode 100755 index 000000000..b815b2937 --- /dev/null +++ b/public/react/src/modules/courses/shixunHomework/guide.css @@ -0,0 +1,415 @@ + + +/*[class^="icon-"], [class*=" icon-"] {*/ +/* font-family:"iconfont";*/ +/* font-size:12px;*/ +/* font-style:normal;*/ +/* -webkit-font-smoothing: antialiased;*/ +/* -moz-osx-font-smoothing: grayscale;*/ +/*}*/ + +.guide-container{ + position: relative; +} + +.guide-shadow{ + position: fixed; + top:0; + z-index: 99999; + left: 0; + right: 0; + bottom: 0; + + background-color: rgba(0, 0, 0, 0.8); + transition: all .3s ease-out; + display: flex; + justify-content: center; +} + +.guide-content{ + position: absolute; + display: block; + z-index: 999991; + width: 100%; + height: 100%; + border-radius: 4px; + transition: all .3s ease-out; + display: flex; + flex-direction:column; + border: 1px solid rgba(0, 0, 0, .5); + box-shadow: 0 2px 15px rgba(0, 0, 0, .4); + +} +.guiimgconte{ + width: 100%; + height: 13%; + margin-top: 12%; + margin-left: 73%; +} + + + +.guiimgcontee{ + width: 100%; + display: flex; + justify-content:flex-end; + margin-top: 2%; +} +.gimgtwo{ + height: 30%; + margin-left: 8%; + margin-top: 2%; +} +.guide-icon-no{ + position: absolute; + border: 2px solid #fff; + border-radius: 50%; + z-index: 999998; + color: #fff; + background: linear-gradient(to bottom,#409EFF 0%,#007fff 100%); + font-weight: 6000; + padding: 1px; + font-size: 13px; + line-height: 20px; + font-family: Arial,verdana,tahoma; + text-shadow: 1px 1px 1px rgba(0,0,0,.3); + text-align: center; + box-shadow: 0 2px 5px rgba(0,0,0,.4); + transition: all .3s ease-out; +} + +.guide-tooltip{ + position: absolute; + border-radius: 5px; + z-index: 999995; + display: block; + opacity: 1; + padding: 15px 25px 15px 15px; + box-shadow: 0 1px 10px rgba(0, 0, 0, .4); + transition: opacity .1s ease-out; + min-width: 200px; + max-width: 250px; + background-color: #fff; +} + +.guide-tooltip div:nth-child(1) { + font: 14px/normal sans-serif; + color: #2d2d2d; + font-weight: 400; + zoom: 1; + margin-bottom: 0; +} + +.guide-tooltip .audio-play{ + position: absolute; + top: 17px; + z-index: 999999; + right: 5px; + width: 26px; + height: 18px; + background-size: 20px 19px; + background-repeat: no-repeat; + background-position: 7px -2px; + background-image: url('http://fanyi.bdstatic.com/static/translation/img/translate/output/sound2x_d6f553d.gif') +} + +.guide-tooltip .audio-noplay{ + position: absolute; + top: 17px; + z-index: 999999; + right: 5px; + background-repeat: no-repeat; + background-position: 0 -1046px; + height: 16px; + width: 19px; + background-image: url('http://fanyi.bdstatic.com/static/translation/sprite/images/normal/index-sc413d90635_65ba9b0.png') +} + +.guide-tooltip .guide-arrow{ + position: absolute; + content: ''; + border: 5px solid #fff; +} + +.guide-tooltip .top{ + top: -10px; + border-top-color: transparent; + border-right-color: transparent; + border-bottom-color: #fff; + border-left-color: transparent; +} + +.guide-tooltip .left{ + left: -10px; + top: 10px; + border-top-color: transparent; + border-right-color: #fff; + border-bottom-color: transparent; + border-left-color: transparent; +} + +.guide-tooltip .bottom{ + bottom: -10px; + left: 10px; + border-top-color: #fff; + border-right-color: transparent; + border-bottom-color: transparent; + border-left-color: transparent; +} + +.guide-tooltip .right{ + right: -10px; + top: 10px; + border-top-color: transparent; + border-right-color: transparent; + border-bottom-color: transparent; + border-left-color: #fff; +} + +.guide-bullets ul{ + display: flex; + justify-content: center; + padding: 0; +} +.guide-bullets ul li{ + list-style: none; +} +.guide-bullets ul li div{ + width: 8px; + height: 8px; + border-radius: 50%; + margin: 2px; + background-color: #ccc; + cursor: pointer; +} +.guide-bullets .active-dot{ + background-color: #409EFF +} + +.guide-button-group{ + display: flex; + justify-content: space-between; + margin-top: 5px; +} + +.guide-button{ + background-color: #409EFF; + border-color: #409EFF; + box-sizing: border-box; + cursor: pointer; + color: #fff; + line-height: 1; + font-size: 13px; + outline: none; + margin: 0; + padding: 4px 7px; +} + +.guide-button-total { + border-radius: 3px; +} + +.guide-button-left { + border-bottom-left-radius: 3px; + border-top-left-radius: 3px; + border-right-color: hsla(0,0%,100%,.5) +} + +.guide-button-right { + border-bottom-right-radius: 3px; + border-top-right-radius: 3px; +} + +.guide-button-disabled { + background-color: #a0cfff; + border-color: #a0cfff; + cursor: not-allowed; +} + + + +/*验证码*/ +.ysldiv11900{ + margin-top: 10%; + margin-left: 17%; + margin-right: 14%; + +} +.ysldiv11680{ + margin-top: 11%; + margin-left: 13%; + margin-right: 10%; +} +.ysldiv11440{ + margin-top: 14%; + margin-left: 7%; + margin-right: 3%; + height: 60%; +} + +.ysldiv11280{ + margin-top: 16%; + margin-left: 2%; + margin-right: 0%; + height: 60%; +} +.ysldiv11024{ + margin-top: 20%; + margin-left: 0%; + margin-right: -1%; + height: 59%; +} + + +/*添加成员*/ +.ysldiv21900{ + margin-top: 10%; + margin-left: 48%; + margin-right: 25%; + height: 18%; + +} +.ysldiv21680{ + margin-top: 11%; + margin-left: 45%; + margin-right: 20%; + height: 24%; +} +.ysldiv21440{ + margin-top: 14%; + margin-left: 47%; + margin-right: 17%; + height: 25%; +} + +.ysldiv21280{ + margin-top: 16%; + margin-left: 51%; + margin-right: 14%; + height: 25%; +} +.ysldiv21024{ + margin-top: 20%; + margin-left: 61%; + margin-right: 0%; + height: 33%; +} + +/*成员列表*/ +.ysldiv31900{ + margin-top: 10%; + margin-left: 19%; + margin-right: 45%; + +} +.ysldiv31680{ + margin-top: 11%; + margin-left: 14%; + margin-right: 45%; +} +.ysldiv31440{ + margin-top: 13%; + margin-left: 8%; + margin-right: 44%; +} + +.ysldiv31280{ + margin-top: 15%; + margin-left: 3%; + margin-right: 44%; +} +.ysldiv31024{ + margin-top: 18%; + margin-left: 1%; + margin-right: 38%; +} + +/*目录管理*/ + +.ysldiv41900{ + margin-top: 18%; + margin-left: 19%; + margin-right: 28%; + +} +.ysldiv41680{ + margin-top: 21%; + margin-left: 14%; + margin-right: 23%; +} +.ysldiv41440{ + margin-top: 24%; + margin-left: 8%; + margin-right: 19%; +} + +.ysldiv41280{ + margin-top: 27%; + margin-left: 3%; + margin-right: 17%; +} +.ysldiv41024{ + margin-top: 29%; + margin-left: 0%; + margin-right: 2%; +} + +/*导航排序*/ +.ysldiv51900{ + margin-top: 18%; + margin-left: 18%; + margin-right: 42%; + +} +.ysldiv51680{ + margin-top: 20%; + margin-left: 13%; + margin-right: 41%; +} +.ysldiv51440{ + margin-top: 24%; + margin-left: 7%; + margin-right: 38%; +} + +.ysldiv51280{ + margin-top: 27%; + margin-left: 2%; + margin-right: 38%; +} +.ysldiv51024{ + margin-top: 34%; + margin-left: -1%; + margin-right: 27%; +} + +/*任务操作*/ +.ysldiv61900{ + margin-top: 16%; + margin-left: 34%; + margin-right: 19% + +} +.ysldiv61680{ + margin-top: 18%; + margin-left: 31%; + margin-right: 14%; +} +.ysldiv61440{ + margin-top: 21%; + margin-left: 28%; + margin-right: 8%; +} + +.ysldiv61280{ + margin-top: 24%; + margin-left: 25%; + margin-right: 3%; + height: 53%; +} +.ysldiv61024{ + margin-top: 26%; + margin-left: 27%; + margin-right: 0%; + height: 40%; +} \ No newline at end of file