m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_aliyun' into develop

Browse Source
dev_cs
cxt 6 years ago
parent 5c1111f56d e5b927b270
commit 3c63a2dece
17 changed files with 570 additions and 501 deletions
Show Stats Download Patch File Download Diff File

1
Gemfile.lock
Unescape View File

@ -378,6 +378,7 @@ DEPENDENCIES
kaminari (~> 1.1, >= 1.1.1) kaminari (~> 1.1, >= 1.1.1)
listen (>= 3.0.5, < 3.2) listen (>= 3.0.5, < 3.2)
mysql2 (>= 0.4.4, < 0.6.0) mysql2 (>= 0.4.4, < 0.6.0)
newrelic_rpm
oauth2 oauth2
pdfkit pdfkit
puma (~> 3.11) puma (~> 3.11)

11
app/controllers/application_controller.rb
Unescape View File

@ -14,6 +14,7 @@ class ApplicationController < ActionController::Base
#before_action :check_account #before_action :check_account
DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z) DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
OPENKEY = "79e33abd4b6588941ab7622aed1e67e8"
helper_method :current_user helper_method :current_user
@ -246,6 +247,16 @@ class ApplicationController < ActionController::Base
User.current = find_current_user User.current = find_current_user
uid_logger("user_setup: " + (User.current.logged? ? "#{User.current.try(:login)} (id=#{User.current.try(:id)})" : "anonymous")) uid_logger("user_setup: " + (User.current.logged? ? "#{User.current.try(:login)} (id=#{User.current.try(:id)})" : "anonymous"))
# 开放课程通过链接访问的用户
if !User.current.logged? && !params[:chinaoocTimestamp].blank? && !params[:websiteName].blank? && !params[:chinaoocKey].blank?
content = "#{OPENKEY}#{params[:websiteName]}#{params[:chinaoocTimestamp]}"
if Digest::MD5.hexdigest(content) == params[:chinaoocKey]
user = User.open_class_user
start_user_session(user) if user
User.current = user
end
end
if !User.current.logged? && Rails.env.development? if !User.current.logged? && Rails.env.development?
User.current = User.find 1 User.current = User.find 1
end end

23
app/models/user.rb
Unescape View File

@ -610,6 +610,29 @@ class User < ApplicationRecord
admin? || business? admin? || business?
end end
# 149课程的评审用户数据创建（包含创建课堂学生）
def open_class_user
user = User.find_by(login: "OpenClassUser")
unless user
ActiveRecord::Base.transaction do
user_params = {status: 1, login: "OpenClassUser", lastname: "开放课程",
nickname: "开放课程", professional_certification: 1, certification: 1, grade: 0,
password: "12345678", phone: "11122223333", profile_completed: 1}
user = User.create!(user_params)
UserExtension.create!(user_id: user.id, gender: 0, school_id: 117, :identity => 1, :student_id => "openclassuser")
subject = Subject.find_by(id: 149)
if subject
subject.courses.each do |course|
CourseMember.create!(course_id: course.id, role: 4, user_id: user.id) if !course.course_students.exists?(user_id: user.id)
end
end
end
end
user
end
protected protected
def validate_password_length def validate_password_length
# 管理员的初始密码是5位 # 管理员的初始密码是5位

2
public/react/src/common/educoder.js
Unescape View File

@ -63,7 +63,7 @@ export { default as Clappr } from './components/media/Clappr'
export { default as AliyunUploader } from './components/media/AliyunUploader' export { default as AliyunUploader } from './components/media/AliyunUploader'
export { default as ImageLayerHook } from './hooks/ImageLayerHook' export { default as ImageLayer2 } from './hooks/ImageLayer2'
// 外部 // 外部
export { default as CBreadcrumb } from '../modules/courses/common/CBreadcrumb' export { default as CBreadcrumb } from '../modules/courses/common/CBreadcrumb'

4
public/react/src/common/hooks/ImageLayerHook.js → public/react/src/common/hooks/ImageLayer2.js
Unescape View File

@ -2,7 +2,7 @@ import React, { useState, useEffect, memo } from 'react';
import ImageLayer from '../../modules/page/layers/ImageLayer'; import ImageLayer from '../../modules/page/layers/ImageLayer';
import { isImageExtension } from 'educoder'; import { isImageExtension } from 'educoder';
const $ = window.$; const $ = window.$;
function ImageLayerHook(props) { function ImageLayer2(props) {
const [showImage, setShowImage] = useState(false) const [showImage, setShowImage] = useState(false)
const [imageSrc, setImageSrc] = useState('') const [imageSrc, setImageSrc] = useState('')
@ -45,4 +45,4 @@ function ImageLayerHook(props) {
) )
} }
export default memo(ImageLayerHook) export default memo(ImageLayer2)

4
public/react/src/common/util/ShareUtil.js
Unescape View File

@ -122,11 +122,11 @@ export function configShareForCourses () {
export function configShareForCustom (title, desc, imgUrl, path) { export function configShareForCustom (title, desc, imgUrl, path) {
requestForSignatrue(() => { requestForSignatrue(() => {
console.log('configShareForCustom', host) console.log('configShareForCustom', host)
const _path = window.location.href.split('#')[0]; const _url = window.location.href.split('#')[0];
var shareData = { var shareData = {
title: title, title: title,
desc: desc, desc: desc,
link: `${host}/${path || _path}`, link: path ? `${host}/${path}` : _url,
imgUrl: imgUrl || window.__testImageUrl imgUrl: imgUrl || window.__testImageUrl
|| host + '/react/build/images/share_logo_icon.jpg' || host + '/react/build/images/share_logo_icon.jpg'
}; };

3
public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
Unescape View File

@ -2,7 +2,7 @@ import React,{Component} from "React";
import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd"; import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
import {Link} from 'react-router-dom'; import {Link} from 'react-router-dom';
import locale from 'antd/lib/date-picker/locale/zh_CN'; import locale from 'antd/lib/date-picker/locale/zh_CN';
import { WordsBtn, MarkdownToHtml, markdownToHTML } from 'educoder'; import { WordsBtn, MarkdownToHtml, markdownToHTML, ImageLayer2 } from 'educoder';
import axios from 'axios'; import axios from 'axios';
import Modals from '../../modals/Modals'; import Modals from '../../modals/Modals';
import CoursesListType from '../coursesPublic/CoursesListType'; import CoursesListType from '../coursesPublic/CoursesListType';
@ -197,6 +197,7 @@ class CommonWorkAppraise extends Component{
border-bottom: none !important; border-bottom: none !important;
} }
`}</style> `}</style>
<ImageLayer2 parentSel=".workAppraise" childSel="a.imageTarget"></ImageLayer2>
<div className={"workAppraise"}> <div className={"workAppraise"}>
{(description || (attachments && attachments.length != 0)) && <div className={"stud-class-set edu-back-white padding20-30"}> {(description || (attachments && attachments.length != 0)) && <div className={"stud-class-set edu-back-white padding20-30"}>
<div className={"color-grey-6 mb15 font-16"}> <div className={"color-grey-6 mb15 font-16"}>

9
public/react/src/modules/courses/busyWork/NewWorkForm.js
Unescape View File

@ -73,7 +73,6 @@ class NewWorkForm extends Component{
setTimeout(() => { setTimeout(() => {
this.contentMdRef.current.setValue(data.description || '') this.contentMdRef.current.setValue(data.description || '')
this.answerMdRef.current.setValue(data.reference_answer || '') this.answerMdRef.current.setValue(data.reference_answer || '')
}, 2000) }, 2000)
this.props.form.setFieldsValue({ this.props.form.setFieldsValue({
@ -86,8 +85,13 @@ class NewWorkForm extends Component{
} else { // new } else { // new
} }
this._scrollToTop()
}
_scrollToTop = () => {
setTimeout(() => {
$("html").animate({ scrollTop: 0 })
}, 1500)
} }
// 输入title // 输入title
changeTitle=(e)=>{ changeTitle=(e)=>{
@ -289,6 +293,7 @@ class NewWorkForm extends Component{
} }
componentDidMount() { componentDidMount() {
window.$('.groupSetting .ant-form-item-label > label').addClass('ant-form-item-required') window.$('.groupSetting .ant-form-item-label > label').addClass('ant-form-item-required')
this._scrollToTop()
} }
render(){ render(){

6
public/react/src/modules/message/js/Leftdialogue.js
Unescape View File

@ -5,7 +5,7 @@ import {
} from "antd"; } from "antd";
import axios from 'axios'; import axios from 'axios';
import moment from 'moment'; import moment from 'moment';
import {getImageUrl,markdownToHTML,ImageLayerHook} from 'educoder'; import {getImageUrl,markdownToHTML,ImageLayer2} from 'educoder';
import "../css/messagemy.css" import "../css/messagemy.css"
import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
//私信页面 //私信页面
@ -51,8 +51,8 @@ class Leftdialogue extends Component{
</a> </a>
<div className="fl pr OtherSide-info"> <div className="fl pr OtherSide-info">
<span className="trangle"></span> <span className="trangle"></span>
<ImageLayerHook parentSel={`#Leftdialogue${this.props.keys}`} parentSel={`#Leftdialogue${this.props.keys}`}> <ImageLayer2 parentSel={`#Leftdialogue${this.props.keys}`} parentSel={`#Leftdialogue${this.props.keys}`}>
</ImageLayerHook> </ImageLayer2>
<div className="sms break_word markdown-body" id={`Leftdialogue${this.props.keys}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div> <div className="sms break_word markdown-body" id={`Leftdialogue${this.props.keys}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
<div className="edu-txt-right mt5"> <div className="edu-txt-right mt5">
<a className="color-grey-c" onClick={()=>this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)} >删除</a> <a className="color-grey-c" onClick={()=>this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)} >删除</a>

6
public/react/src/modules/message/js/Rightdialogue.js
Unescape View File

@ -5,7 +5,7 @@ import {
} from "antd"; } from "antd";
import axios from 'axios'; import axios from 'axios';
import moment from 'moment'; import moment from 'moment';
import {getImageUrl,markdownToHTML,ImageLayerHook} from 'educoder'; import {getImageUrl,markdownToHTML,ImageLayer2} from 'educoder';
import "../css/messagemy.css" import "../css/messagemy.css"
import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
//私信页面 //私信页面
@ -51,8 +51,8 @@ class Rightdialogue extends Component{
</a> </a>
<div className="fr pr ThisSide-info"> <div className="fr pr ThisSide-info">
<span className="trangle"></span> <span className="trangle"></span>
<ImageLayerHook parentSel={`#Rightdialogue${this.props.keys}`} parentSel={`#Rightdialogue${this.props.keys}`}> <ImageLayer2 parentSel={`#Rightdialogue${this.props.keys}`} parentSel={`#Rightdialogue${this.props.keys}`}>
</ImageLayerHook> </ImageLayer2>
<div className="sms break_word markdown-body" id={`Rightdialogue${this.props.keys}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div> <div className="sms break_word markdown-body" id={`Rightdialogue${this.props.keys}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
<div className="edu-txt-left mt5"> <div className="edu-txt-left mt5">
<a className="color-grey-c" onClick={()=>this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)} <a className="color-grey-c" onClick={()=>this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)}

3
public/react/src/modules/paths/PathDetail/PathDetailIndex.js
Unescape View File

@ -1,5 +1,5 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import {getImageUrl,markdownToHTML} from 'educoder'; import {getImageUrl,markdownToHTML, configShareForCustom} from 'educoder';
import DetailTop from './DetailTop.js'; import DetailTop from './DetailTop.js';
import DetailCards from './DetailCards.js' import DetailCards from './DetailCards.js'
import AddCollaborators from "./addCollaborators.js"; import AddCollaborators from "./addCollaborators.js";
@ -164,6 +164,7 @@ class PathDetailIndex extends Component{
// window.location.href = "/403"; // window.location.href = "/403";
return; return;
} }
configShareForCustom(result.data.name, result.data.description)
if(result.data.allow_visit===true){ if(result.data.allow_visit===true){
this.setState({ this.setState({

413
public/react/src/modules/paths/SchoolStatistics/FirstTab.js
Unescape View File

@ -1,203 +1,212 @@
import React,{ Component } from "react"; import React,{ Component } from "react";
import {Pagination} from 'antd'; import {Pagination} from 'antd';
import axios from 'axios'; import axios from 'axios';
const $ = window.$; const $ = window.$;
const echarts = require('echarts'); const echarts = require('echarts');
function InitChapterUsageSituation(_data){ function InitChapterUsageSituation(_data){
var Color = ['#49A9EE', '#FFD86E', '#98D87D', '#8996E6','#F3857B', '#B97BF3','#4DE8B4','#f76d0c','#510cf7','#def70c','#3bf70c','#0cf7e1']; var myChart = echarts.init(document.getElementById('chapterUsageSituation'));
myChart.showLoading({
var option = { text: "数据获取中",
title: { effect: 'whirling'
show:false })
}, var Color = ['#49A9EE', '#FFD86E', '#98D87D', '#8996E6','#F3857B', '#B97BF3','#4DE8B4','#f76d0c','#510cf7','#def70c','#3bf70c','#0cf7e1'];
tooltip : {
trigger: 'item', var option = {
formatter: "{d}%" title: {
}, show:false
legend: { },
//orient: 'vertical', tooltip : {
// top: 'middle', trigger: 'item',
bottom: 30, formatter: "{d}%"
//left: 20, },
data:["第1章", "第2章", "第3章", "第4章", "第5章"], legend: {
selectedMode:false //orient: 'vertical',
}, // top: 'middle',
series : [{ bottom: 30,
name: '使用情况', //left: 20,
type: 'pie', data:["第1章", "第2章", "第3章", "第4章", "第5章"],
radius : '50%', selectedMode:false
center: ['50%', '40%'], },
selectedMode: 'single', series : [{
label: { name: '使用情况',
normal: { type: 'pie',
// {abg|} radius : '50%',
// {a|{a}}\n center: ['50%', '40%'],
formatter: ' {b|{b}} ', selectedMode: 'single',
backgroundColor: '#eee', label: {
borderColor: '#aaa', normal: {
borderWidth: 1, // {abg|}
borderRadius: 4, // {a|{a}}\n
rich: { formatter: ' {b|{b}} ',
a: { backgroundColor: '#eee',
color: '#999', borderColor: '#aaa',
lineHeight: 22, borderWidth: 1,
align: 'center' borderRadius: 4,
}, rich: {
hr: { a: {
borderColor: '#aaa', color: '#999',
width: '100%', lineHeight: 22,
borderWidth: 0.5, align: 'center'
height: 0 },
}, hr: {
b: { borderColor: '#aaa',
fontSize: 16, width: '100%',
lineHeight: 33 borderWidth: 0.5,
}, height: 0
per: { },
color: '#eee', b: {
backgroundColor: '#334455', fontSize: 16,
padding: [2, 4], lineHeight: 33
borderRadius: 2 },
} per: {
color: '#eee',
} backgroundColor: '#334455',
}, padding: [2, 4],
borderRadius: 2
}, }
data: _data,
// [{"value":19,"name":"\u7b2c1\u7ae0"},{"value":45,"name":"\u7b2c2\u7ae0"},{"value":16,"name":"\u7b2c3\u7ae0"},{"value":10,"name":"\u7b2c4\u7ae0"},{"value":10,"name":"\u7b2c5\u7ae0"}], }
itemStyle: { },
emphasis: {
shadowBlur: 10, },
shadowOffsetX: 0, data: _data,
shadowColor: 'rgba(0, 0, 0, 0.5)' // [{"value":19,"name":"\u7b2c1\u7ae0"},{"value":45,"name":"\u7b2c2\u7ae0"},{"value":16,"name":"\u7b2c3\u7ae0"},{"value":10,"name":"\u7b2c4\u7ae0"},{"value":10,"name":"\u7b2c5\u7ae0"}],
}, itemStyle: {
normal:{ emphasis: {
show: true, shadowBlur: 10,
color: function(params) { shadowOffsetX: 0,
return Color[params.dataIndex] shadowColor: 'rgba(0, 0, 0, 0.5)'
} },
} normal:{
} show: true,
}] color: function(params) {
}; return Color[params.dataIndex]
}
var myChart = echarts.init(document.getElementById('chapterUsageSituation')); }
myChart.setOption(option); }
} }]
class FirstTab extends Component{ };
constructor(props){
super(props);
this.state = {
page:1, setTimeout(() => {
total:undefined myChart.setOption(option);
} myChart.hideLoading();
} }, 1000)
}
onChange=(pageNumber)=>{ class FirstTab extends Component{
this.setState({ constructor(props){
page:pageNumber super(props);
}) this.state = {
this.getData(pageNumber); page:1,
} total:undefined
}
getData=(page)=>{ }
var pathId = this.props.match.params.pathId;
onChange=(pageNumber)=>{
const url = `/paths/${pathId}/statistics.json?page=`+page; this.setState({
axios.get(url, { page:pageNumber
}) })
.then((response) => { this.getData(pageNumber);
// TODO 没用，404返回的error }
if (response.data.status == 404) {
this.props.showSnackbar('未找到对应数据，请查看地址是否正确。') getData=(page)=>{
return var pathId = this.props.match.params.pathId;
}
this.setState({ ...response.data }) const url = `/paths/${pathId}/statistics.json?page=`+page;
const _data = response.data.stage_info.map( (item, index) => { axios.get(url, {
return { })
value: item.value, .then((response) => {
name: item.stage_no // TODO 没用，404返回的error
} if (response.data.status == 404) {
}) this.props.showSnackbar('未找到对应数据，请查看地址是否正确。')
InitChapterUsageSituation(_data); return
}
const { course_count, learn_count, school_total_count, subject_name, subject_id } = response.data this.setState({ ...response.data })
this.props.initBannerData({ const _data = response.data.stage_info.map( (item, index) => {
course_count, return {
learn_count, value: item.value,
school_total_count, name: item.stage_no
subject_name, }
subject_id })
}) InitChapterUsageSituation(_data);
this.setState({
total:response.data.school_total_count const { course_count, learn_count, school_total_count, subject_name, subject_id } = response.data
}) this.props.initBannerData({
}) course_count,
.catch(function (error) { learn_count,
console.log(error); school_total_count,
}); subject_name,
} subject_id
})
componentDidMount(){ this.setState({
let {page}=this.state; total:response.data.school_total_count
this.getData(page); })
} })
.catch(function (error) {
render(){ console.log(error);
const { schools, stage_info,page,total } = this.state; });
return( }
<div className="clearfix panelForm-1">
<div className="with60 pr40 fl"> componentDidMount(){
<div className="static_shadow edu-back-white"> let {page}=this.state;
<p className="padding30-20 clearfix"><span className="font-24 fl">课堂使用概况</span><span className="fr color-grey-9">共{total}条记录</span></p> this.getData(page);
<div className="minH-440"> }
<table className="edu-pop-table head-color edu-txt-center bor-top-greyE" cellSpacing="0" cellPadding="0">
<thead> render(){
<tr><th>序号</th> const { schools, stage_info,page,total } = this.state;
<th className="edu-txt-left" width="35%">所属院校</th> return(
<th>课堂</th> <div className="clearfix panelForm-1">
<th>学生</th> <div className="with60 pr40 fl">
<th>选用实训</th> <div className="static_shadow edu-back-white">
</tr></thead> <p className="padding30-20 clearfix"><span className="font-24 fl">课堂使用概况</span><span className="fr color-grey-9">共{total}条记录</span></p>
{/* <div className="minH-440">
course_count: 30 <table className="edu-pop-table head-color edu-txt-center bor-top-greyE" cellSpacing="0" cellPadding="0">
homework_count: 117 <thead>
name: "国防科技大学" <tr><th>序号</th>
student_count: 2700 <th className="edu-txt-left" width="35%">所属院校</th>
*/} <th>课堂</th>
<tbody> <th>学生</th>
{ <th>选用实训</th>
schools && schools.map( (school, index) => { </tr></thead>
return ( {/*
<tr> course_count: 30
<td>{ index + 1 }</td> homework_count: 117
<td className="edu-txt-left task-hide" style={{"maxWidth":"238px"}}>{school.name}</td> name: "国防科技大学"
<td>{school.course_count}</td> student_count: 2700
<td>{school.student_count}</td> */}
<td><span className="color-blue mr3">{school.homework_count}</span>次</td> <tbody>
</tr>) {
}) schools && schools.map( (school, index) => {
} return (
</tbody> <tr>
</table> <td>{ index + 1 }</td>
</div> <td className="edu-txt-left task-hide" style={{"maxWidth":"238px"}}>{school.name}</td>
<div className="pt35 edu-txt-center" style={{"height":"102px"}}> <td>{school.course_count}</td>
{ <td>{school.student_count}</td>
total > 10 && <td><span className="color-blue mr3">{school.homework_count}</span>次</td>
<Pagination showQuickJumper defaultCurrent={page} pageSize={10} total={total} onChange={this.onChange} /> </tr>)
} })
</div> }
</div> </tbody>
</div> </table>
<div className="with40 fl static_shadow edu-back-white"> </div>
<p className="font-24 padding30-20">章节使用情况</p> <div className="pt35 edu-txt-center" style={{"height":"102px"}}>
<div id="chapterUsageSituation" style={{"width":"480px","height":"542px"}}></div> {
</div> total > 10 &&
</div> <Pagination showQuickJumper defaultCurrent={page} pageSize={10} total={total} onChange={this.onChange} />
) }
} </div>
} </div>
</div>
<div className="with40 fl static_shadow edu-back-white">
<p className="font-24 padding30-20">章节使用情况</p>
<div id="chapterUsageSituation" style={{"width":"480px","height":"542px"}}></div>
</div>
</div>
)
}
}
export default FirstTab; export default FirstTab;

550
public/react/src/modules/paths/SchoolStatistics/SecondTab.js
Unescape View File

@ -1,271 +1,281 @@
import React,{ Component } from "react"; import React,{ Component } from "react";
import axios from 'axios'; import axios from 'axios';
const $ = window.$; const $ = window.$;
const echarts = require('echarts'); const echarts = require('echarts');
function InitShixunStudyStatistics(yAxisMonth_a, barData_a, mapByNumber, myChart){ function InitShixunStudyStatistics(yAxisMonth_a, barData_a, mapByNumber, myChart){
let yAxisMonth = yAxisMonth_a let yAxisMonth = yAxisMonth_a
// [ // [
// "1-1", "1-2", "1-3", "1-4", "2-1", "2-2", "2-3", "3-1", // "1-1", "1-2", "1-3", "1-4", "2-1", "2-2", "2-3", "3-1",
// "1-1", "1-2", "1-3", "1-4", "2-1", "2-2", "2-3", "3-1", // "1-1", "1-2", "1-3", "1-4", "2-1", "2-2", "2-3", "3-1",
// "1-1", "1-2", "1-3", "1-4", "2-1", "2-2", "2-3", "3-1", "3-2"]; // "1-1", "1-2", "1-3", "1-4", "2-1", "2-2", "2-3", "3-1", "3-2"];
let barData = barData_a let barData = barData_a
// [ // [
// 1164, 739, 784, 720, 726, 556, 381, 432, // 1164, 739, 784, 720, 726, 556, 381, 432,
// 1164, 739, 784, 720, 726, 556, 381, 432, // 1164, 739, 784, 720, 726, 556, 381, 432,
// 1164, 739, 784, 720, 726, 556, 381, 432, 239]; // 1164, 739, 784, 720, 726, 556, 381, 432, 239];
// let yAxisMonth = yAxisMonth_a; // let yAxisMonth = yAxisMonth_a;
// let barData = barData_a; // let barData = barData_a;
let barDataTwo = []; let barDataTwo = [];
let coordData2 = []; let coordData2 = [];
let coordData = []; let coordData = [];
for (let i = 0; i < barData.length; i++) { for (let i = 0; i < barData.length; i++) {
barDataTwo.push(Math.max.apply(Math, barData) + 5000); barDataTwo.push(Math.max.apply(Math, barData) + 5000);
coordData.push({ coordData.push({
"coord": [Number(barData[i]) - 1, i] "coord": [Number(barData[i]) - 1, i]
}); });
coordData2.push({ coordData2.push({
"coord": [Math.max.apply(Math, barData) + 5000, i] "coord": [Math.max.apply(Math, barData) + 5000, i]
}) })
} }
var option = { var option = {
backgroundColor: "#fff", backgroundColor: "#fff",
title: { title: {
text: '' text: ''
}, },
legend: null, legend: null,
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
type: 'none' type: 'none'
}, },
formatter: function(params) { formatter: function(params) {
return params[0].name + ":" + (mapByNumber[params[0].name] && mapByNumber[params[0].name].shixun_name) + "<br/>" + '学习人数: ' + params[0].value; return params[0].name + ":" + (mapByNumber[params[0].name] && mapByNumber[params[0].name].shixun_name) + "<br/>" + '学习人数: ' + params[0].value;
} }
}, },
grid: { grid: {
containLabel: true, containLabel: true,
left: "30px", left: "30px",
top: "0", top: "0",
bottom:"10px" bottom:"10px"
}, },
yAxis: [{ yAxis: [{
data: yAxisMonth, data: yAxisMonth,
inverse: true, inverse: true,
axisLine: { axisLine: {
show: false show: false
}, },
axisTick: { axisTick: {
show: false show: false
}, },
axisLabel: { axisLabel: {
margin: 10, margin: 10,
textStyle: { textStyle: {
fontSize: 12, fontSize: 12,
color: '#747A7F' color: '#747A7F'
}, },
formatter: function(value) { formatter: function(value) {
return '{Sunny|' + value + '}'; return '{Sunny|' + value + '}';
}, },
rich: { rich: {
value: { value: {
lineHeight: 20 lineHeight: 20
}, },
Sunny: { Sunny: {
height: 25, height: 25,
padding: [0, 8, 0, 8], padding: [0, 8, 0, 8],
align: 'center', align: 'center',
backgroundColor: '#fff' backgroundColor: '#fff'
} }
} }
} }
},{ },{
data: yAxisMonth, data: yAxisMonth,
inverse: true, inverse: true,
axisLine: { axisLine: {
show: false show: false
}, },
axisTick: { axisTick: {
show: false show: false
}, },
axisLabel: { axisLabel: {
show: false show: false
} }
} }
], ],
xAxis: [{ xAxis: [{
type: "value", type: "value",
splitLine: { splitLine: {
show: false show: false
}, },
axisLabel: { axisLabel: {
show: false show: false
}, },
axisTick: { axisTick: {
show: false show: false
}, },
axisLine: { axisLine: {
show: false show: false
} }
}, { }, {
type: "value", type: "value",
splitLine: { splitLine: {
show: false show: false
}, },
axisLabel: { axisLabel: {
show: false show: false
}, },
axisTick: { axisTick: {
show: false show: false
}, },
axisLine: { axisLine: {
show: false show: false
} }
}], }],
series: [{ series: [{
z: 10, z: 10,
xAxisIndex: 0, xAxisIndex: 0,
yAxisIndex: 0, yAxisIndex: 0,
name: '', name: '',
type: 'pictorialBar', type: 'pictorialBar',
data: barData, data: barData,
barCategoryGap: '90%', barCategoryGap: '90%',
label: { label: {
normal: { normal: {
show: true, show: true,
position: 'inside', position: 'inside',
textStyle: { textStyle: {
fontSize: 12, fontSize: 12,
color: '#666' color: '#666'
} }
} }
}, },
symbolRepeat: false, symbolRepeat: false,
symbolSize: ['100%', 25], symbolSize: ['100%', 25],
symbolOffset: [-16.5, 0], symbolOffset: [-16.5, 0],
itemStyle: { itemStyle: {
normal: { normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
offset: 0, offset: 0,
color: '#FFD86E' color: '#FFD86E'
}], false), }], false),
borderRadius:'10' borderRadius:'10'
} }
}, },
symbolClip: true, symbolClip: true,
symbolPosition: 'end', symbolPosition: 'end',
symbol: 'rect' symbol: 'rect'
}] }]
}; };
myChart.setOption(option); myChart.setOption(option);
} }
class SecondTab extends Component{ class SecondTab extends Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state = { this.state = {
}
} }
}
componentDidMount(){
componentDidMount(){ var pathId = this.props.match.params.pathId;
var pathId = this.props.match.params.pathId;
var myCharts = echarts.init(document.getElementById('showloding'));
var myChart = echarts.init(document.getElementById('shixunStudyStatistics')); myCharts.showLoading({
myChart.showLoading({ text: "数据获取中",
text: "数据获取中", effect: 'whirling'
effect: 'whirling' })
}) const url = `/paths/${pathId}/shixun_report.json`
const url = `/paths/${pathId}/shixun_report.json` axios.get(url, {
axios.get(url, { })
}) .then((response) => {
.then((response) => { // TODO 没用，404返回的error
// TODO 没用，404返回的error if (response.data.status == 404) {
if (response.data.status == 404) { this.props.showSnackbar('未找到对应数据，请查看地址是否正确。')
this.props.showSnackbar('未找到对应数据，请查看地址是否正确。') return
return }
}
/**
/** let yAxisMonth = ["1-1", "1-2", "1-3", "1-4", "2-1", "2-2", "2-3", "3-1", "3-2"];
let yAxisMonth = ["1-1", "1-2", "1-3", "1-4", "2-1", "2-2", "2-3", "3-1", "3-2"]; let barData = [1164, 739, 784, 720, 726, 556, 381, 432, 239];
let barData = [1164, 739, 784, 720, 726, 556, 381, 432, 239];
{
{ "number": "6-1",
"number": "6-1", "shixun_name": "网页抓取及信息提取",
"shixun_name": "网页抓取及信息提取", "member_count": 0,
"member_count": 0, "school_count": 0
"school_count": 0 }
} */
*/ let yAxisMonth = []
let yAxisMonth = [] let barData = []
let barData = [] let shixunList = []
let shixunList = [] let mapByNumber = {}
let mapByNumber = {} const _data = response.data.shixun_lists.forEach( (ar, index) => {
const _data = response.data.shixun_lists.forEach( (ar, index) => { ar.forEach( (item, itemIndex) => {
ar.forEach( (item, itemIndex) => { shixunList.push(item)
shixunList.push(item) yAxisMonth.push(item.number)
yAxisMonth.push(item.number) barData.push(item.member_count)
barData.push(item.member_count) mapByNumber[item.number] = item
mapByNumber[item.number] = item })
}) })
})
this.setState({ shixunList }, () => { this.setState({
InitShixunStudyStatistics(yAxisMonth, barData, mapByNumber, myChart); shixunList
myChart.hideLoading() })
}) var myChart = echarts.init(document.getElementById('shixunStudyStatistics'));
myChart.showLoading({
text: "数据获取中",
}) effect: 'whirling'
.catch(function (error) { })
console.log(error); setTimeout(() => {
}); InitShixunStudyStatistics(yAxisMonth, barData, mapByNumber, myChart);
} myCharts.hideLoading();
myChart.hideLoading();
render(){ }, 1000)
const { shixunList } = this.state;
return( })
<div className="clearfix panelForm-2"> .catch(function (error) {
<div className="with60 pr40 fl"> console.log(error);
<div className="static_shadow edu-back-white"> });
<p className="font-24 padding30-20">实训使用详情</p> }
<div className="minH-440" id="tableHeight">
<table className="edu-pop-table head-color edu-txt-center bor-top-greyE" cellSpacing="0" cellPadding="0"> render(){
<thead> const { shixunList } = this.state;
<tr> return(
<th>章节</th> <div className="clearfix panelForm-2">
<th className="edu-txt-left" width="40%">实训名称</th> <div className="with60 pr40 fl">
<th>学习人数</th> <div className="static_shadow edu-back-white">
<th>受用院校</th> <p className="font-24 padding30-20">实训使用详情</p>
</tr> <div className="minH-440" id="tableHeight">
</thead> <table className="edu-pop-table head-color edu-txt-center bor-top-greyE" cellSpacing="0" cellPadding="0">
<tbody> <thead>
<tr>
{ <th>章节</th>
shixunList && shixunList.map( (shixun, index) => { <th className="edu-txt-left" width="40%">实训名称</th>
return ( <th>学习人数</th>
<tr> <th>受用院校</th>
<td>{shixun.number}</td> </tr>
<td className="edu-txt-left task-hide" style={{"maxWidth":"272px"}}>{shixun.shixun_name}</td> </thead>
<td>{shixun.member_count}</td> <tbody>
<td className="color-blue">{shixun.school_count}</td>
</tr>) {
}) shixunList && shixunList.map( (shixun, index) => {
} return (
<tr>
</tbody> <td>{shixun.number}</td>
</table> <td className="edu-txt-left task-hide" style={{"maxWidth":"272px"}}>{shixun.shixun_name}</td>
</div> <td>{shixun.member_count}</td>
</div> <td className="color-blue">{shixun.school_count}</td>
</div> </tr>)
<div className="with40 fl static_shadow edu-back-white"> })
<p className="font-24 padding30-20">实训学习统计</p> }
<div id="shixunStudyStatistics"
style={{"width":"480px","height": shixunList ? `${shixunList.length * 35 + 100}px` : "440px"}}></div> </tbody>
</div> </table>
</div> </div>
) </div>
} </div>
} <div className="with40 fl static_shadow edu-back-white">
<p className="font-24 padding30-20">实训学习统计</p>
{shixunList===undefined?<div id="showloding"
style={{"width":"480px","height":"440px"}}></div>:""}
{shixunList===undefined?"":<div id="shixunStudyStatistics"
style={{"width":"480px","minHeight":`${shixunList&&shixunList.length *50}px`}}></div>}
</div>
</div>
)
}
}
export default SecondTab; export default SecondTab;

6
public/react/src/modules/user/modal/RealNameCertificationModal.js
Unescape View File

@ -2,7 +2,7 @@ import React, { Component } from "react";
import { message, Icon, Input, Form, Upload} from "antd"; import { message, Icon, Input, Form, Upload} from "antd";
import axios from 'axios' import axios from 'axios'
import ModalWrapper from "../../courses/common/ModalWrapper" import ModalWrapper from "../../courses/common/ModalWrapper"
import { City, getUploadActionUrl, getImageUrl, ImageLayerHook, getUploadActionUrlOfAuth } from 'educoder' import { City, getUploadActionUrl, getImageUrl, ImageLayer2, getUploadActionUrlOfAuth } from 'educoder'
import '../account/common.css' import '../account/common.css'
import authImg from '../../../images/account/auth.png' import authImg from '../../../images/account/auth.png'
@ -308,8 +308,8 @@ class RealNameCertificationModal extends Component{
<div className="df mt10 color-grey-9" style={{ justifyContent: 'center' }} > <div className="df mt10 color-grey-9" style={{ justifyContent: 'center' }} >
<span className="fl mr20 edu-txt-center" style={{width:"160px"}}>示例图片</span> <span className="fl mr20 edu-txt-center" style={{width:"160px"}}>示例图片</span>
<span className="fl edu-txt-center mr20" style={{width:"160px"}}> <span className="fl edu-txt-center mr20" style={{width:"160px"}}>
<ImageLayerHook parentSel={'#imageLayerBtn'} parentSel={'#imageLayerBtn'} <ImageLayer2 parentSel={'#imageLayerBtn'} parentSel={'#imageLayerBtn'}
></ImageLayerHook> ></ImageLayer2>
<a href="javascript:void(0)" id="imageLayerBtn" src={imageUrl || imageUrl2} className="color-orange" style={{borderBottom:"1px solid #ff6800"}}>查看大图</a> <a href="javascript:void(0)" id="imageLayerBtn" src={imageUrl || imageUrl2} className="color-orange" style={{borderBottom:"1px solid #ff6800"}}>查看大图</a>
</span> </span>
</div> </div>

22
public/react/src/modules/user/usersInfo/InfosTopics.js
Unescape View File

@ -370,17 +370,17 @@ class InfosTopics extends Component{
{ {
` `
::-webkit-scrollbar-thumb { // ::-webkit-scrollbar-thumb {
background-color: #cde5fe; // background-color: #cde5fe;
//
box-shadow: 0px 0px black; // box-shadow: 0px 0px black;
} // }
//
//
::-webkit-scrollbar-track { // ::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0); // -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0);
background-color: #fff; // background-color: #fff;
} // }
.shaiContent li.shaiItem { .shaiContent li.shaiItem {
padding: 0px 9px; padding: 0px 9px;

4
public/react/src/modules/user/usersInfo/usersInfo.css
Unescape View File

@ -429,4 +429,8 @@
.topsicinline{ .topsicinline{
display: inline-block; display: inline-block;
}
/* 防抖 */
.educontent .square-list {
min-height: 400px;
} }

4
public/react/src/modules/user/usersInfo/video/InfosVideo.css
Unescape View File

@ -1,3 +1,7 @@
/* 撑开滚动条，防抖 */
.educontent > .itemWrap {
min-height: 400px;
}
.itemWrap { .itemWrap {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

Write Preview
Loading…
Cancel
Save