diff --git a/src/AppConfig.js b/src/AppConfig.js index 665e85f0f..30eb7e9aa 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -25,7 +25,7 @@ if (isDev) { } debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' : window.location.search.indexOf('debug=s') !== -1 ? 'student' : - window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin' + window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'student' } window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/src/forge/Main/projecthome/Index.scss b/src/forge/Main/projecthome/Index.scss index 50b7b5069..80742234d 100644 --- a/src/forge/Main/projecthome/Index.scss +++ b/src/forge/Main/projecthome/Index.scss @@ -310,7 +310,6 @@ margin:0px auto; .left{ width: 850px; - box-shadow: 0px 0px 4px 5px rgba(0, 0, 0, 0.02); display: flex; .leftTypes{ width: 220px; @@ -343,6 +342,7 @@ } .leftLists{ flex:1; + box-shadow: 0px 0px 4px 5px rgba(0, 0, 0, 0.02); .leftTitles{ height: 60px; display: flex; diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index dd72c7617..3466ec358 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -62,7 +62,7 @@ class MergeItem extends Component {

diff --git a/src/forge/users/Echart/Calendar.jsx b/src/forge/users/Echart/Calendar.jsx index 743a0a551..c081f8bde 100644 --- a/src/forge/users/Echart/Calendar.jsx +++ b/src/forge/users/Echart/Calendar.jsx @@ -35,9 +35,11 @@ function Calendar({ userLogin , time , chooseTime }) { const url = `/users/${userLogin}/headmaps.json`; Axios.get(url).then(result=>{ if(result && result.data){ - let m = result.data.headmaps; + // result.data.headmaps + let m = []; m.sort(compare('contributions')); let max = m[m.length -1].contributions; + Init(m,max); } }).catch(error=>{}) @@ -52,6 +54,7 @@ function Calendar({ userLogin , time , chooseTime }) { } function getVirtulData(data) { + debugger; var date = +echarts.number.parseDate(baginT); var end = +echarts.number.parseDate(endT); var dayTime = 3600 * 24 * 1000;