From ecdb91920fe791cd394d1c1d7f381999719347ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 16 Mar 2020 22:40:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/Videostatisticscomtwo.js | 29 +++++++++++++++---- .../component/Videostatisticslist.js | 21 ++++++++++++-- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js index ff6af4d38..f6a9b51de 100644 --- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js +++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js @@ -38,7 +38,12 @@ class Videostatisticscomtwo extends Component { className: 'font-14 maxnamewidth100s', width: '100px', render: (text, record) => ( - {record.user_name} + + {record.user_name} + + ), }, { @@ -63,7 +68,9 @@ class Videostatisticscomtwo extends Component { sorter: true, sortDirections: sortDirections, render: (text, record) => ( - {record.total_duration} + {record.total_duration} ), }, { @@ -76,7 +83,11 @@ class Videostatisticscomtwo extends Component { sorter: true, sortDirections: sortDirections, render: (text, record) => ( - {record.feq} + + {record.feq} + ), }, { @@ -87,7 +98,11 @@ class Videostatisticscomtwo extends Component { className: 'font-14 maxnamewidth100s', width: '100px', render: (text, record) => ( - {record.start_at} + + {record.start_at} + ), }, { @@ -98,7 +113,11 @@ class Videostatisticscomtwo extends Component { className: 'font-14 maxnamewidth100s', width: '100px', render: (text, record) => ( - {record.end_at} + + {record.end_at} + ), } ], diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js index e3f671f36..c44102e45 100644 --- a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js +++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js @@ -34,7 +34,12 @@ class Videostatisticslist extends Component { className: 'font-14 maxnamewidth150s', width: '150px', render: (text, record) => ( - {record.title} + + {record.title} + + ), }, { @@ -60,7 +65,12 @@ class Videostatisticslist extends Component { sorter: true, sortDirections: sortDirections, render: (text, record) => ( - {record.total_time} + + {record.total_time} + + ), }, { @@ -71,7 +81,12 @@ class Videostatisticslist extends Component { className: 'font-14 maxnamewidth100s', width: '100px', render: (text, record) => ( - {record.user_name} + + {record.user_name} + + ), }, { From b4584ab3e88d283c0d68c1686ce6de4d1b401492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 16 Mar 2020 22:57:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/signin/css/signincdi.css | 6 ++++ .../component/Videostatisticscom.js | 2 +- .../component/Videostatisticscomtwo.js | 22 ++++++--------- .../component/Videostatisticslist.js | 28 ++++++++----------- 4 files changed, 26 insertions(+), 32 deletions(-) diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css index 7ad9a0d0c..bd45185b9 100644 --- a/public/react/src/modules/courses/signin/css/signincdi.css +++ b/public/react/src/modules/courses/signin/css/signincdi.css @@ -188,6 +188,12 @@ padding-top: 20px; padding-bottom: 20px; } +.teacherentrydivss{ + padding-left: 20px; + padding-right: 20px; + padding-top: 20px; + padding-bottom: 20px; +} .teachedivp{ font-size:16px; font-family:Microsoft YaHei; diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js index 457c6d1f3..1111b6509 100644 --- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js +++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js @@ -33,7 +33,7 @@ class Videostatisticscom extends Component {
-
+
视频统计总览
播放数据从{this.props.watch_staticsdata&&this.props.watch_staticsdata.begin_at?this.props.watch_staticsdata.begin_at:0}开始统计
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js index f6a9b51de..ed72d6bb2 100644 --- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js +++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js @@ -1,6 +1,6 @@ import React, {Component} from "react"; import '../../signin/css/signincdi.css'; -import {Pagination, Table, Menu, Dropdown} from 'antd'; +import {Pagination, Table, Menu, Dropdown,Spin} from 'antd'; import {getImageUrl, sortDirections} from 'educoder'; import axios from 'axios'; import LoadingSpin from "../../../../common/LoadingSpin"; @@ -98,7 +98,7 @@ class Videostatisticscomtwo extends Component { className: 'font-14 maxnamewidth100s', width: '100px', render: (text, record) => ( - + {record.start_at} @@ -113,7 +113,7 @@ class Videostatisticscomtwo extends Component { className: 'font-14 maxnamewidth100s', width: '100px', render: (text, record) => ( - + {record.end_at} @@ -428,7 +428,7 @@ class Videostatisticscomtwo extends Component { return (
-
+
视频名称视频名称…
- { - loading === true ? -
- -
- : -
+ +
{ data.length === 0 ?
: + + } - } diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js index c44102e45..e26e1d48b 100644 --- a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js +++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js @@ -1,6 +1,6 @@ import React, {Component} from "react"; import '../../signin/css/signincdi.css'; -import {Pagination,Table} from 'antd'; +import {Pagination,Table,Spin} from 'antd'; import {getImageUrl,sortDirections} from 'educoder'; import axios from 'axios'; import LoadingSpin from "../../../../common/LoadingSpin"; @@ -60,13 +60,13 @@ class Videostatisticslist extends Component { dataIndex: 'total_time', key: 'total_time', align: "center", - className: 'font-14 maxnamewidth150s', - width: '150px', + className: 'font-14 maxnamewidth100s', + width: '100px', sorter: true, sortDirections: sortDirections, render: (text, record) => ( - - + {record.total_time} @@ -95,9 +95,9 @@ class Videostatisticslist extends Component { key: 'id', align: "center", className: 'font-14', - width: '90px', + width: '50px', render: (text, record) => ( - this.props.tisticsbools(true,record.id)}>详情 + this.props.tisticsbools(true,record.id)}>详情 ), } ], @@ -250,7 +250,7 @@ class Videostatisticslist extends Component {
-
+
统计详情
@@ -265,14 +265,7 @@ class Videostatisticslist extends Component { ` } - { - loading===true? -
- -
- : +
{ data.length===0? @@ -282,6 +275,7 @@ class Videostatisticslist extends Component {
: +
+ } - } From 173a7932cdbf326f384810365c655ef0d0a5e5f0 Mon Sep 17 00:00:00 2001 From: dinglink <837816638@qq.com> Date: Mon, 16 Mar 2020 23:00:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/user/usersInfo/video/VideoInReviewItem.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js index 299af0d08..71b16fab2 100644 --- a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js +++ b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js @@ -74,7 +74,8 @@ function VideoInReviewItem (props) {
{/*
累计学习时长：{play_duration} h
*/} {/* {moment(published_at || created_at).format('YYYY-MM-DD HH:mm:ss')}{people_num} */} - {link ? :累计学习时长：{ + + {link||total_time===undefined? :累计学习时长：{ formatSeconds(total_time)} {/* total_time<60?total_time+' s':total_time/60<60?(total_time/60).toFixed(0)+' min':(total_time/3600).toFixed(1)+ ' h' */} } @@ -82,7 +83,7 @@ function VideoInReviewItem (props) {
{/* 2019-09-01 10:00:22 */} - {!people_num || (people_num && people_num)===0 ? "" : + {total_time===undefined?'':!people_num || (people_num && people_num)===0 ? "" : {!people_num || (people_num && people_num)===0?"":people_num} } From ef115d75bb1548bf224b3730dfbb4b57598eeff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 16 Mar 2020 23:03:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/videostatistics/component/Videostatisticslist.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js index e26e1d48b..21f3ed9a0 100644 --- a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js +++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js @@ -1,7 +1,7 @@ import React, {Component} from "react"; import '../../signin/css/signincdi.css'; import {Pagination,Table,Spin} from 'antd'; -import {getImageUrl,sortDirections} from 'educoder'; +import {getImageUrl,sortDirections,formatSeconds} from 'educoder'; import axios from 'axios'; import LoadingSpin from "../../../../common/LoadingSpin"; import NoneDatas from "../../signin/component/NoneDatas"; @@ -152,7 +152,7 @@ class Videostatisticslist extends Component { number: (parseInt(this.state.page) - 1) * parseInt(this.state.limit) + (i + 1), title: response.data.videos[i].title, people_num: response.data.videos[i].people_num, - total_time: response.data.videos[i].total_time, + total_time: response.data.videos[i].total_time?formatSeconds(response.data.videos[i].total_time):0, user_name: response.data.videos[i].user_name, id: response.data.videos[i].id, }) From 2909a653b71e0f7fec9380dfb9d1432cd205e670 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 16 Mar 2020 23:05:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?vnc=E5=AE=9E=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 7015cca40..614008112 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -973,15 +973,15 @@ class GamesController < ApplicationController if res && res['code'].to_i != 0 raise("实训云平台繁忙（繁忙等级：99）") end - # @vnc_url = res['showServer'] - @vnc_url = - if request.subdomain == "pre-newweb" || request.subdomain == "test-newweb" - # 无域名版本 - "http://#{service_host}:#{res['port']}/vnc_lite.html?password=headless" - else - # 有域名版本 - "https://#{res['port']}.#{service_host}/vnc_lite.html?password=headless" - end + @vnc_url = res['showServer'] + # @vnc_url = + # if request.subdomain == "pre-newweb" || request.subdomain == "test-newweb" + # # 无域名版本 + # "http://#{service_host}:#{res['port']}/vnc_lite.html?password=headless" + # else + # # 有域名版本 + # "https://#{res['port']}.#{service_host}/vnc_lite.html?password=headless" + # end @vnc_evaluate = shixun.vnc_evaluate rescue Exception => e Rails.logger.error(e.message)