Skip to content

X
xiaomai-cloud-class-web
Commit b6e69746 by guomingpang
Options

Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web

parents e8c34a03 1a27722f
Showing with 43 additions and 33 deletions
src/modules/course-manage/video-course/components/VideoCourseList.jsx
/* import React from "react"
* @Author: 吴文洁 import { Table, Modal, message, Tooltip, Switch, Dropdown } from "antd"
* @Date: 2020-08-05 10:12:45 import _ from "underscore"
* @LastEditors: wufan import { PageControl } from "@/components"
* @LastEditTime: 2021-05-30 20:53:07 import { LIVE_SHARE } from "@/domains/course-domain/constants"
* @Description: 视频课-列表模块
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
import React from 'react';
import { Table, Modal, message , Tooltip,Switch,Dropdown} from 'antd';
import { PageControl } from "@/components";
import ShareLiveModal from "@/modules/course-manage/modal/ShareLiveModal" import ShareLiveModal from "@/modules/course-manage/modal/ShareLiveModal"
import WatchDataModal from "../modal/WatchDataModal" import WatchDataModal from "../modal/WatchDataModal"
import CourseService from "@/domains/course-domain/CourseService" import CourseService from "@/domains/course-domain/CourseService"
...@@ -142,10 +137,23 @@ class VideoCourseList extends React.Component { ...@@ -142,10 +137,23 @@ class VideoCourseList extends React.Component {
} }
}, },
{ {
title: <span> title: (
<span>
<span>学院展示</span> <span>学院展示</span>
<Tooltip title={<div>开启后，学员可在学院内查看到此课程。<br/>关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px',fontWeight:'normal'}}>&#xe61d;</i></Tooltip> <Tooltip
</span>, title={
<div>
开启后，学员可在学院内查看到此课程。
<br />
关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。
</div>
}>
<i className='icon iconfont' style={{ marginLeft: "5px", cursor: "pointer", color: "#bfbfbf", fontSize: "14px" }}>
&#xe61d;
</i>
</Tooltip>
</span>
),
width: 120, width: 120,
key: "shelfState", key: "shelfState",
dataIndex: "shelfState", dataIndex: "shelfState",
...@@ -240,12 +248,9 @@ class VideoCourseList extends React.Component { ...@@ -240,12 +248,9 @@ class VideoCourseList extends React.Component {
</If> </If>
<span className='operate__item split'> | </span> <span className='operate__item split'> | </span>
<Dropdown overlay={this.renderMoreOperate(record)}> <Dropdown overlay={this.renderMoreOperate(record)}>
<span className="more-operate"> <span className='more-operate'>
<span className="operate-text">更多</span> <span className='operate-text'>更多</span>
<span <span className='iconfont icon' style={{ color: "#2966FF" }}>
className="iconfont icon"
style={{ color: "#2966FF" }}
>
&#xe824; &#xe824;
</span> </span>
</span> </span>
......
src/modules/root/WechatLogin.less
...@@ -9,34 +9,38 @@ ...@@ -9,34 +9,38 @@
color: #999999; color: #999999;
line-height: 20px; line-height: 20px;
} }
.rwm { .rwm{
position: relative; position: relative;
width: 160px; width: 210px;
height: 160px; height: 210px;
text-align: center; text-align: center;
display: inline-block; display: inline-block;
margin-top: 24px; margin-top: 24px;
.error { border: 1px solid #e8e8e8;
border-radius: 2px;
padding:15px;
.error{
position: absolute; position: absolute;
width: 100%; width: 200px;
height: 100%; height: 200px;
background: rgba(255, 255, 255, 0.95); background: rgba(255, 255, 255, 0.95);
display: flex; display: flex;
align-items: center; align-items:center;
justify-content: center; justify-content:center;
left: 0px; left:5px;
top: 0px; top:5px;
div { div{
margin: 0 10px; margin: 0 10px;
font-size: 14px; font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 20px; line-height: 20px;
} }
.ope { .ope{
cursor: pointer; cursor: pointer;
color: rgba(82, 137, 250, 1); color:rgba(82, 137, 250, 1);
} }
} }
} }
......
src/modules/teach-tool/examination-manager/Index.tsx
...@@ -129,6 +129,7 @@ function ExaminationManager(props: any) { ...@@ -129,6 +129,7 @@ function ExaminationManager(props: any) {
{ {
title: "创建时间", title: "创建时间",
dataIndex: "examCreateTime", dataIndex: "examCreateTime",
align:fixStr.right,
sorter: true, sorter: true,
sortOrder: field === "examCreateTime" ? order : sortStatus.type, sortOrder: field === "examCreateTime" ? order : sortStatus.type,
render: (text: any, record: any) => <span>{moment(text).format("YYYY-MM-DD HH:mm")}</span>, render: (text: any, record: any) => <span>{moment(text).format("YYYY-MM-DD HH:mm")}</span>,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment