Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

dev_forum
hjm 5 years ago
commit 9c944a07b3

@ -442,12 +442,18 @@ class ApplicationController < ActionController::Base
shixun.shixun_service_configs.each do |config|
mirror = config.mirror_repository
if mirror.name.present?
# 资源限制没有就传默认值。
cpu_limit = config.cpu_limit.presence || 1
cpu_request = config.lower_cpu_limit.presence || 0.1
memory_limit = config.memory_limit.presence || 1024
request_limit = config.resource_limit.presence || 10
resource_limit = config.resource_limit.presence || 10000
container << {:image => mirror.name,
:cpuLimit => config.cpu_limit,
:cpuRequest => config.lower_cpu_limit,
:memoryLimit => "#{config.memory_limit}M",
:memoryRequest => "#{config.request_limit}M",
:resourceLimit => "#{config.resource_limit}K",
:cpuLimit => cpu_limit,
:cpuRequest => cpu_request,
:memoryLimit => "#{memory_limit}M",
:memoryRequest => "#{request_limit}M",
:resourceLimit => "#{resource_limit}K",
:type => mirror.try(:main_type) == "1" ? "main" : "sub"}
end
end

@ -1,5 +1,5 @@
class EduSettingsController < ApplicationController
# before_action :require_admin
before_action :require_admin
before_action :set_edu_setting, only: [:show, :edit, :update, :destroy]
# GET /edu_settings

@ -911,7 +911,7 @@ class PollsController < ApplicationController
end
error_question = error_question.reject(&:blank?)
if error_question.reject(&:blank?).length > 0
normal_status(-1, "#{error_question.join("\n")}")
normal_status(-1, "#{error_question.join("")}")
else
poll_user_current = @poll.poll_users.find_by_group_ids(current_user.id).first
poll_user_params = {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

@ -1,7 +1,10 @@
/*--------------------------首页*/
/*头部导航条样式---2018-03-19--by-cs*/
.newHeader{background: #24292D !important; width:100%; height: 60px !important; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);}
.newHeader .logoimg{margin-top:12px;float: left;width: 36px}
.newHeader .logoimg{
margin-top: 16px;
float: left;
width: 97px;}
.head-nav{float: left;width: 780px;text-align: center;height: 60px;box-sizing: border-box; min-width: 400px;}
.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;padding-left: 30px;}
.head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

@ -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,14 +88,36 @@ 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 (
<div>
<div className="newMain clearfix">
{/*头部banner*/}
<CoursesBanner {...this.props}></CoursesBanner>
{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"}}>
<div className="stud-class-set">

@ -135,8 +135,8 @@ class shixunAnswer extends Component{
let url=`/exercise_questions/${this.props.questionType.question_id}/adjust_score.json`
const list = Object.assign({}, this.state.dataCopy[key])
console.log("111111111111111111111111");
console.log(this.props);
// console.log("111111111111111111111111");
// console.log(this.props);
// 调分值为0且和第一次的数据相同则不修改
if(parseInt(e.target.value)==parseInt(list.my_score)){
return;

@ -459,6 +459,11 @@ class CoursesNew extends Component {
width: 280px;
margin-left: 10px;
}
.construction .ant-select-selection__placeholder, .ant-select-search__field__placeholder {
line-height: 28px;
z-index: 2000;
}
`}
</style>
@ -641,7 +646,7 @@ class CoursesNew extends Component {
</Form.Item>
</div>
<div className="stud-class-set padding10200 coursenavbox mb20">
<div className="stud-class-set padding10200 mb20">
<Form.Item label="课堂所属单位">
{getFieldDecorator('school', {
rules: [{required: true, message: "不能为空"}],

@ -464,7 +464,7 @@ class Poll extends Component{
modalsBottomval,
loadtype
}=this.state;
console.log(this.props);
// console.log(this.props);
let {child}=this.props;
let {coursesId,Id}=this.props.match.params
const isAdmin = this.props.isAdmin()

@ -34,7 +34,7 @@ class PollDetailIndex extends Component{
}
getPollInfo=()=>{
console.log(this.props);
// console.log(this.props);
let pollId=this.props.match.params.pollId;
let url=`/polls/${pollId}/common_header.json`
axios.get(url).then((result)=>{

@ -66,7 +66,7 @@ class PollDetailTabSecond extends Component{
<span className="font-16 clearfix">
<span className="color-blue fl">{parseInt(page-1)*parseInt(limit)+(key+1)}{map[item.question.question_type]}</span>
{ item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10 mt6">必答</span>:"" }
{ item.question.question_type == 2 && item.question.min_choices && item.question.max_choice ?
{ item.question.question_type == 2 && item.question.min_choices && item.question.max_choices ?
<span className="color-grey-9">
{
item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :

@ -71,7 +71,7 @@ class PollDetailTabThird extends Component{
<p className="pl30 pr30 pt30 pb15 font-16 clearfix">
<span className="color-blue mr8 fl">{item.question.question_number}{map[item.question.question_type]}</span>
{ item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10">必答</span>:<span className="mustAnswer fl ml10 mr10"></span> }
{ item.question.question_type == 2 && item.question.min_choices && item.question.max_choice ?
{ item.question.question_type == 2 && item.question.min_choices && item.question.max_choices ?
<span className="color-grey-9 font-14 fl mt2">
{
item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :
@ -89,8 +89,8 @@ class PollDetailTabThird extends Component{
item.question.answers.map((index,k)=>{
return(
<li className="df">
<Radio value={index.answer_id}></Radio>
<span className={index.answer_text=="其他"?"break_word":"break_word flex1"}>{index.answer_text}</span>
<Radio className="fl" value={index.answer_id}></Radio>
<span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
{
index.answer_text=="其他" ? <p className="textLine"></p>:""
}
@ -109,8 +109,8 @@ class PollDetailTabThird extends Component{
item.question.answers.map((index,k)=>{
return(
<li className="df">
<Checkbox value={index.answer_id}></Checkbox>
<span className={index.answer_text=="其他"?"break_word":"break_word flex1"}>{index.answer_text}</span>
<Checkbox className="fl mr8" value={index.answer_id}></Checkbox>
<span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
{
index.answer_text=="其他" ? <p className="textLine"></p>:""
}

@ -135,7 +135,7 @@ class PollInfo extends Component{
postAnswer=(q_id,a_id,text,key)=>{
let url=`/poll_questions/${q_id}/poll_votes.json`;
console.log(text);
axios.post(url,{
poll_answer_id:a_id,
vote_text:text
@ -207,8 +207,9 @@ class PollInfo extends Component{
})
if(text!=undefined){
url+="vote_text="+text;
axios.post(url).then((result)=>{
axios.post((url),{
vote_text:text
}).then((result)=>{
if(result.status==200){
const answer=Object.assign({}, this.state.question_answered[key]);
answer.ques_status=result.data.poll_vote.question_status;
@ -383,7 +384,7 @@ class PollInfo extends Component{
<div className="pl30 pr30 mt30 mb10 clearfix">
<span className="color-blue fl font-16">{item.question.question_number}{map[item.question.question_type]}</span>
{ item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10 mt5">必答</span>:<span className="mustAnswer fl ml10 mr10 mt5"></span> }
{ item.question.question_type == 2 && item.question.min_choices && item.question.max_choice ?
{ item.question.question_type == 2 && item.question.min_choices && item.question.max_choices ?
<span className="color-grey-9 font-14 fl mt2">
{
item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :
@ -400,8 +401,9 @@ class PollInfo extends Component{
{
item.question.answers && item.question.answers.map((i,k)=>{
return(
<li className={i.answer_text=="其他"?"df":""}>
<Radio name={[item.question.id,key]} className="break-word" value={i.answer_id} >{i.answer_text}</Radio>
<li className={i.answer_text=="其他"?"df clearfix":"clearfix"}>
<Radio name={[item.question.id,key]} className="fl" value={i.answer_id} ></Radio>
<span className="break-word fl" style={{maxWidth:"1116px"}}>{i.answer_text}</span>
{
i.answer_text=="其他" ?
<React.Fragment>
@ -442,8 +444,9 @@ class PollInfo extends Component{
{
item.question.answers && item.question.answers.map((i,k)=>{
return(
<li className={i.answer_text=="其他"?"df":""}>
<Checkbox className="break-word" value={i.answer_id}>{i.answer_text}</Checkbox>
<li className={i.answer_text=="其他"?"df clearfix":"clearfix"}>
<Checkbox className="fl mr8" value={i.answer_id}></Checkbox>
<span className="break-word fl" style={{maxWidth:"1116px"}}>{i.answer_text}</span>
{
i.answer_text=="其他"?
<React.Fragment>

@ -844,12 +844,12 @@ class PollNew extends Component {
if (object.question.question_type === 2) {
if (object.question.max_choices > 0) {
if (object.question.min_choices < 2) {
this.props.showNotification(`可选最小不能少于2个`);
return;
}
// if (object.question.min_choices < 2) {
// this.props.showNotification(`可选最小不能少于2个`);
//
// return;
//
// }
}
}
@ -1332,10 +1332,10 @@ class PollNew extends Component {
if (object.question.question_type === 2) {
if (object.question.max_choices > 0) {
if (object.question.min_choices < 2) {
this.props.showNotification(`可选最小不能少于2个`);
return;
}
// if (object.question.min_choices < 2) {
// this.props.showNotification(`可选最小不能少于2个`);
// return;
// }
}
}
if (object.question.new === "new") {
@ -2108,14 +2108,24 @@ class PollNew extends Component {
}
//最大值
HandleGradationGroupChangeee = (value, index) => {
HandleGradationGroupChangeee = (value, index,minchoices) => {
// console.log("2112");
// console.log(value);
// console.log(minchoices);
let arr = this.state.adddom;
for (var i = 0; i < arr.length; i++) {
if (index === i) {
arr[i].question.max_choices = parseInt(value);
if(parseInt(value)===0&&parseInt(minchoices)===0){
arr[i].question.min_choices= parseInt(minchoices);
arr[i].question.max_choices = parseInt(value);
}else {
arr[i].question.min_choices= minchoices===null?2:minchoices===undefined?2:minchoices===0?2:parseInt(minchoices);
arr[i].question.max_choices = parseInt(value);
}
}
}
// console.log(2119);
// console.log(arr);
this.setState({
adddom: arr
})
@ -2145,12 +2155,12 @@ class PollNew extends Component {
pollid = this.state.pollid;
}
if(mews ==="new"){
// if(mews ==="new"){
if(this.state.poll_questions&&this.state.poll_questions.length===0){
this.props.showNotification("至少创建1个题目");
return;
}
}
// }
var url = `/polls/${pollid}.json`;
axios.put(url, {
@ -2285,7 +2295,7 @@ class PollNew extends Component {
readOnlys: "readOnly",
cancellation: false,
})
window.location.href = `/courses/${coursesId}/polls/${result.data.data.id}/edit`;
})
} else {
@ -2772,7 +2782,7 @@ class PollNew extends Component {
className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
{/*可选最大*/}
<Select className="fl w100"
onChange={(value) => this.HandleGradationGroupChangeee(value, indexo)}
onChange={(value) => this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices)}
value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices}
>
<Option value={String("0")}>--</Option>
@ -3015,7 +3025,7 @@ class PollNew extends Component {
className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
{/*可选最大*/}
<Select className="fl w100"
onChange={(value) => this.HandleGradationGroupChangeee(value, indexo)}
onChange={(value) => this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices)}
value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices}
>
<Option value={String("0")}>--</Option>
@ -3267,7 +3277,7 @@ class PollNew extends Component {
className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
{/*可选最大*/}
<Select className="fl w100"
onChange={(value) => this.HandleGradationGroupChangeee(value, indexo)}
onChange={(value) => this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices)}
value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices}
>
<Option value={String("0")}>--</Option>

@ -113,7 +113,7 @@
text-align: left;
}
.percentForm{
width: 340px;
width: 330px;
height: 11px;
background: #F5F5F5;
border-radius: 6px;

@ -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 (
<div className="guide-shadow">
<style>
{
`
body {
overflow: hidden !important;
}
`
}
</style>
{
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)} />
</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)}/>
</div>
:
""
}
{
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)}/>
</div>
:
""
}
{
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)}/>
</div>
:
""
}
{
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)}/>
</div>
:
""
}
{
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)}/>
</div>
:
""
}
</div>
)
}
}
export default Guide;

@ -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 (
<div className="newMain clearfix ">
<div className={"educontent mb20"} style={{width: "1200px"}}>
<div className="educontent mb20">

@ -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%;
}

@ -18,7 +18,9 @@ body>.-task-title {
/*Header START*/
.newHeader .logoimg {
max-height: 60px;
margin-top: 16px;
float: left;
width: 97px;
}
.head-right i {
font-size: 20px;

File diff suppressed because it is too large Load Diff

@ -42,7 +42,7 @@ class TPMNav extends Component {
className={`${match.url.indexOf('ranking_list') != -1 ? 'active' : ''} fl`}>排行榜</Link>
{/* target="_blank"*/}
<a
href={`/shixuns/${shixunId}/settings`} className="fr"
href={`/shixuns/${shixunId}/settings`} className="edu-default-btn edu-blueline-btn ml20 fr"
style={{display: this.props.identity >4||this.props.identity===undefined ? "none" : 'block'}}
>配置</a>
</div>

@ -14,7 +14,7 @@ class AccountNav extends Component {
}
render() {
let { basicInfo } = this.props
console.log(this.props);
// console.log(this.props);
const path = window.location.pathname
const isBasic = path.indexOf('profile') != -1 || path == "/account"
const isCertification = path.indexOf('certification') != -1

@ -1,7 +1,10 @@
/*--------------------------首页*/
/*头部导航条样式---2018-03-19--by-cs*/
.newHeader{background: #24292D !important; width:100%; height: 60px !important; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);}
.newHeader .logoimg{margin-top:12px;float: left;width: 36px}
.newHeader .logoimg{
margin-top: 16px;
float: left;
width: 97px;}
.head-nav{float: left;width: 780px;text-align: center;height: 60px;box-sizing: border-box; min-width: 400px;}
.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;padding-left: 30px;}
.head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}

Loading…
Cancel
Save