Skip to content

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

Merge branch 'dev' of… 

Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
parents ed917f83 df3a31a5
Showing with 580 additions and 321 deletions
public/h5.html
......@@ -75,7 +75,7 @@
$(document).ready(function () {
var BASIC_HOST_MAP = {
dev: 'https://dev-heimdall.xiaomai5.com/',
dev1: 'https://dev1-heimdall.xiaomai5.com/',
dev1: 'https://dev-heimdall.xiaomai5.com/',
rc: 'https://rc-heimdall.xiaomai5.com/',
gray: 'https://gray-heimdall.xiaomai5.com/',
prod: 'https://gateway.xiaomai5.com/'
......
src/bu-components/ChooseMembersModal.less
......@@ -21,7 +21,7 @@
.container-left-body-table{
width: 300px;
height: 330px;
overflow: scroll;
.ant-table {
border: none;
min-height: 250px !important;
......
src/common/js/wechatApi.js
......@@ -2,7 +2,7 @@
* @Author: wufan
* @Date: 2021-05-11 10:21:37
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-19 15:24:27
* @LastEditTime: 2021-07-21 14:25:37
* @Description: 企业微信api
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*
......@@ -14,8 +14,10 @@ import Service from '@/common/js/service';
export default class WechatApi {
static async initConfig(params = { isAgentConfig: false, url: '' }) {
if(Platform.isWorkWx()){
return Service.Hades('anon/hades/getWxCorpJSAPISignature', {
if (Platform.isWorkWx()) {
return new Promise(async (resolve, reject) => {
Service.Hades('anon/hades/getWxCorpJSAPISignature', {
storeId: User.getStoreId(),
url: params.url,
}).then((result) => {
......@@ -29,8 +31,6 @@ export default class WechatApi {
signature: res.signature, // 必填，签名，见 附录-JS-SDK使用权限签名算法
jsApiList: ['chooseImage', 'shareToExternalContact', 'selectExternalContact', 'selectEnterpriseContact'],
}).then(() => {
if (params.isAgentConfig) {
return new Promise(async (resolve, reject) => {
Service.Hades('anon/hades/getWxWorkJSAPISignature', {
storeId: User.getStoreId(),
url: params.url,
......@@ -42,7 +42,7 @@ export default class WechatApi {
timestamp: res2.timestamp, // 必填，生成签名的时间戳
nonceStr: res2.nonceStr, // 必填，生成签名的随机串
signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat'],
jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat', 'startLiving', 'replayLiving'],
success: (res) => {
console.log(res, 'res-agentconfig');
console.info('window.WWOpenData', window.WWOpenData);
......@@ -55,15 +55,16 @@ export default class WechatApi {
},
});
});
});
}
})
});
}else{
})
} else {
if (params.isAgentConfig) {
console.log(32132132,'cesgu')
console.log(32132132, 'cesgu')
return new Promise(async (resolve, reject) => {
Service.Hades('anon/hades/getWxWorkJSAPISignature', {
storeId: User.getStoreId(),
......@@ -76,7 +77,7 @@ export default class WechatApi {
timestamp: res2.timestamp, // 必填，生成签名的时间戳
nonceStr: res2.nonceStr, // 必填，生成签名的随机串
signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat'],
jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat', 'startLiving', 'replayLiving'],
success: (res) => {
console.log(res, 'res-agentconfig');
console.info('window.WWOpenData', window.WWOpenData);
......@@ -113,19 +114,7 @@ export default class WechatApi {
}
static async agentConfig(config) {
return new Promise((success, fail) => {
console.info('wx.agentConfig', config);
wx.agentConfig({ ...config, success, fail });
}).then(
(res) => {
console.info('wx.agentConfig success', res);
return res;
},
(error) => {
console.error('wx.agentConfig fail', error);
throw error;
}
);
wx.agentConfig({ ...config });
}
static getCurExternalContact() {
......@@ -168,7 +157,39 @@ export default class WechatApi {
reject(res.err_msg); //错误处理
}
});
});
})
}
static replayLiving(id) {
return new Promise((resolve, reject) => {
wx.ready(() => {
wx.invoke('replayLiving', {
"livingId": id,
}, function(res) {
console.log("WorkWXAPI 进入直播间",res)
if (res.err_msg === "replayLiving:ok") {
resolve(true)
} else {
let err = "进入回放失败"
console.log(res.err_msg);
if (res.err_msg === "replayLiving:fail_invalid living id") {
err = "不合法的直播ID"
} else if (res.err_msg === "replayLiving:fail_not allow to cross corp") {
err = "不可跨企业使用直播ID"
} else if (res.err_msg === "replayLiving:fail_not allow to cross app") {
err = "不可跨应用使用直播ID"
} else if (res.err_msg === "replayLiving:fail_living has no replay") {
err = "直播回放已失效或不存在"
} else if (res.err_msg === "replayLiving:fail_replay is beging creating") {
err = "回放生成中，请耐心等待"
} else if (res.err_msg === "replayLiving:fail_create replay failed") {
err = "回放创建失败"
} else if (res.err_msg === "replayLiving:fail_invalid parameter") {
err = "参数不合法"
}
reject(err); //错误处理
}
});
});
})
}
......
src/components/ContactWidget.tsx
import React, { ReactElement } from "react";
import { Popover } from "antd";
import { TooltipPlacement } from "antd/lib/tooltip";
import { brandLogo,xfrwm } from '@/domains/brand/constants'
import "./ContactWidget.less"
interface ContactWidgetProps {
......@@ -14,7 +15,7 @@ function Content() {
return (
<div className="contact-widget">
<div className="qrcode">
<img src="https://cdn.xiaomai5.com/qixueyuankehu.png" alt=""></img>
<img src={xfrwm} alt=""></img>
<div className="des">微信/企业微信扫码咨询</div>
</div>
<div className="phone"><svg style={{position:"relative",top:"2px",marginRight:"4px"}} viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M512.651 3.78c-281.433 0-509.21 228.324-509.21 509.209 0 281.43 228.325 509.203 509.21 509.203 281.427 0 509.202-228.317 509.202-509.203 0.55-280.885-227.775-509.21-509.202-509.21z m198.205 743.553c-36.14 36.136-169.737 1.641-302.24-130.312-131.953-131.959-165.902-266.104-129.768-301.695 31.211-31.21 68.99-85.417 125.939-14.782 56.943 70.629 29.016 90.34-3.291 122.647-22.449 22.448 24.642 79.392 73.37 128.125 49.283 48.73 105.678 95.818 128.126 73.368 32.306-32.305 52.017-60.23 122.646-3.288 71.182 56.949 16.426 95.276-14.782 125.937z" p-id="4409" fill="#999999"></path></svg>
......
src/core/routeHook.js
......@@ -23,6 +23,7 @@ class routeHook {
}
cancel() { //取消跳转
console.log('jhgjh')
this.routeFun.pop()
}
......@@ -42,7 +43,10 @@ class routeHook {
// **
addSaveCase() { //离开保存校验时将方法注入
setTimeout(()=>{
this.add(this.saveBeforeLeave.bind(this))
},100)
}
saveBeforeLeave() { //离开保存时触发的方法
......
src/domains/brand/constants.ts
......@@ -27,7 +27,7 @@ const PATH_MAP: any = {
}
const LIVE_SHARE_MAP: any = {
xiaomai: 'https://res.xiaomai0.com/store-live/index.html#/',
xiaomai: process.env.DEPLOY_ENV === 'dev' ? 'https://dev.xiaomai5.com/store-live/index.html#/' : 'https://res.xiaomai0.com/store-live/index.html#/',
syoo: 'https://dev.xiaomai5.com/dev1/store-live/index.html#/',
}
......@@ -38,6 +38,12 @@ const CorpType_MAP: any = {
}
const XF_RWM_MAP: any = {
xiaomai: 'https://cdn.xiaomai5.com/qixueyuankehu.png',
syoo: 'https://image.xiaomaiketang.com/xm/Z2X2GTmKdj.png'
}
export const brandName: string = BrandNameMap[BRAND];
......@@ -47,5 +53,6 @@ export const brandBanner: string = BrandBannerMap[BRAND];
export const path: string = PATH_MAP[BRAND];
export const live: string = LIVE_SHARE_MAP[BRAND];
export const corpType: string = CorpType_MAP[BRAND];
export const xfrwm: string = XF_RWM_MAP[BRAND]
window.brandName = BrandNameMap[BRAND];
src/index.tsx
......@@ -69,6 +69,7 @@ window.RCHistory = _.extend({}, history, {
});
window.onhashchange = () => {
console.log(132121)
routeHook.cancel()
}
......
src/modules/college-manage/EmployeeManage.less
......@@ -17,4 +17,10 @@
font-size:14px;
color:#5289FA;
}
.post-name{
max-width: 200px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
\ No newline at end of file
src/modules/college-manage/EmployeeManage.tsx
......@@ -9,7 +9,7 @@ import React, { useEffect, useState } from "react";
import { withRouter } from "react-router-dom";
import _ from "underscore";
import { CheckBox, PageControl } from "@/components";
import { Button, Table, Modal, message, Input } from "antd";
import { Button, Table, Modal, message, Input,Tooltip} from "antd";
import { XMTable } from '@/components';
import college from '@/common/lottie/college.json';
import StoreService from "@/domains/store-domain/storeService";
......@@ -182,10 +182,17 @@ function EmployeeManage() {
if(!record.depNameList){
return <span>-</span>
}
return record.depNameList.map((item,index)=>{
return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNameList.length -1)?'、':''}</span>;
})
if(record.depNameList.length === 0){
return <span>-</span>
}
// return record.depNameList.map((item,index)=>{
// return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNameList.length -1)?';':''}</span>;
// })
return <Tooltip title={<div>{handleDepName(record.depNameList)}</div>} placement='top' arrowPointAtCenter><div className="post-name"> {record.depNameList.map((item, index) => {
return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNameList.length -1)?'；':''}</span>
})}
</div>
</Tooltip>
},
},
{
......@@ -237,6 +244,13 @@ function EmployeeManage() {
return columns;
}
function handleDepName(depArray:any):any{
const depArrayDom = depArray.map((item:any, index:any) => {
return <span><WWOpenDataCom type="departmentName" openid={item}/>；</span>
});
return depArrayDom;
};
function handleEditEmployee(record: RecordTypes) {
const { nickName, phone, roleCodes, avatar, id, weChatAccount } = record;
const _choosesItem = {
......@@ -342,10 +356,10 @@ function EmployeeManage() {
userType:'USER'
}
StoreService.syncWorkWeChatDepartment(params).then((res) => {
getEmployeeList();
message.success('已更新');
});
}
return (
<div className="page employee-manage-page">
<div className="content-header">角色管理</div>
......
src/modules/college-manage/LimitTip.tsx
/*
* @Author: your name
* @Date: 2021-08-04 15:21:36
* @LastEditTime: 2021-08-04 15:27:16
* @LastEditTime: 2021-08-04 15:23:37
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: /xiaomai-cloud-class-web/src/modules/college-manage/LimitTip.tsx
......@@ -34,7 +34,7 @@ export default function LimitTip(props:{total:number,type:string,tip:() => React
{
isOver ? (
<>
<div style={{marginLeft:"14px",display:"inline-block"}}>当前企业使用人数已达到上限 (<span style={{color:"#333333",fontWeight:"bold"}}>{limitUser}</span>人)，将无法添加新员工、新学员，如需增加人数限制，请联系{window.brandName}服务平台。</div>
<div style={{marginLeft:"14px",display:"inline-block"}}>当前企业使用人数已达到上限 <span style={{color:"#333333",fontWeight:"bold"}}>{limitUser}</span>人，将无法添加新员工、新学员，如需增加人数限制，请联系{window.brandName}服务平台。</div>
<ContactWidget trigger="hover" placement="bottom">
<div className="renew-text">立即续费<span className="icon iconfont" style={{fontSize:"10px"}}>&#59291;</span></div>
</ContactWidget>
......
src/modules/college-manage/components/DepartMentTabCon.jsx
import React, { useEffect, useState } from "react";
import { withRouter } from "react-router-dom";
import { Button, Input, message,Modal} from "antd";
import { Button, Input, message,Modal,Tooltip} from "antd";
import NewChooseMembersModal from "@/modules/college-manage/modal/NewChooseMembersModal";
import LeftStructureTree from "./LeftStructureTree";
import { XMTable, PageControl } from "@/components";
......@@ -17,7 +17,7 @@ const { Search } = Input;
const { confirm } = Modal;
const DefaultQuery = {
size: 10,
current: 1,
current:1,
};
function DepartMentTabCon(props) {
const [chooseMembersModalVisible, setChooseMembersModalVisible] = useState(
......@@ -73,23 +73,31 @@ function DepartMentTabCon(props) {
title: "岗位",
dataIndex: "depNameList",
render: (val, record) => {
if(!record.depNameList){
return <span>-</span>
}else{
if(record.depNameList.length === 0){
return <span>-</span>
}
return record.depNameList.map((item, index) => {
return <span>{item}{index!==record.depNameList.length-1 && <span>、</span>}</span>;
})
return <Tooltip title={handleDepName(record.depNameList)} placement='top' arrowPointAtCenter><div className="post-name"> {record.depNameList.map((item, index) => {
return <span>{item}{index!==record.depNameList.length-1 && <span>；</span>}</span>
})}
</div>
</Tooltip>
}
}
},
{
title: "手机号",
dataIndex: "phone",
render: (val, item) => {
return <span>{val}</span>;
if(!val){
return <span>-</span>
}else{
return <span>{item.phone}</span>
}
},
},
{
......@@ -116,6 +124,17 @@ function DepartMentTabCon(props) {
},
},
];
function handleDepName(depArray){
let depStr = '';
depArray.forEach((item, index) => {
if (index < depArray.length - 1) {
depStr = depStr + item + '；';
} else {
depStr = depStr + item;
}
});
return depStr;
};
function closeChooseMembersModal() {
setChooseMembersModalVisible(false);
}
......@@ -202,8 +221,8 @@ function DepartMentTabCon(props) {
StoreService.delDepartmentUser(params).then((res) => {
message.success(`删除成功`);
getUserList();
Bus.trigger("changeTreeData",{treeType:props.currentTab});
});
}
function handleSelectUserList(record, selected){
let _list = [];
......@@ -360,12 +379,12 @@ function DepartMentTabCon(props) {
/>
<div className="box-footer">
<PageControl
current={query.current}
current={query.current - 1}
pageSize={query.size}
total={total}
toPage={(page) => {
const queryStates = _.clone(query);
queryStates.current = page;
queryStates.current = page + 1;
setQuery(queryStates);
getUserList(null,null,queryStates.current);
}}
......
src/modules/college-manage/components/DepartMentTabCon.less
......@@ -3,6 +3,12 @@
.table-con{
margin-left:16px;
flex:1;
.post-name{
max-width: 200px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.operate-area{
margin-bottom:16px;
.add-user-btn{
......
src/modules/college-manage/components/LeftStructureTree.jsx
......@@ -24,10 +24,32 @@ function LeftStructureTree(props) {
const [currentGroupData,setCurrentGroupData] = useState({});
const [completeOptions,setCompleteOption] = useState([]);
const [selectedKeys,setSelectedKeys]= useState([]); // 设置选中的部门key值
const [queryName,setQueryName] = useState('');
const [postGroupTreeData,setPostGroupTreeData] = useState([]);
const [queryName,setQueryName] = useState(''); // 搜索框内的值
const [selctQueryName,setSelctQueryName]= useState(''); // 搜索出结果后最终选择的名字
const [postGroupTreeData,setPostGroupTreeData] = useState([]); // 为了判定创建和编辑时的数据会不会重明
const [open,setOpen]=useState(false);
useEffect(()=>{
setQueryName(''); //切换tab时搜索置空
setCompleteOption([]);
setOpen(false); //切换tab时搜索的下拉框置为空
getTreeData().then((res)=>{
const _defaultSelectedKeys = [];
if(res.length > 0){
_defaultSelectedKeys.push(res[0].id);
setSelectedKeys(_defaultSelectedKeys);
props.onChangeSelectDep(res[0])
props.searchUserList(res[0],treeType,1);
}
});
},[props.treeType]);
useEffect(()=>{
Bus.bind("addCustomer",(record)=>{addCustomer(record.treeType,record.query)})
},[]);
useEffect(()=>{
Bus.bind("changeTreeData",(record)=>{getTreeData(record.treeType)})
},[]);
const renderTitle = (title) => (
<span>
{title}
......@@ -62,33 +84,28 @@ function LeftStructureTree(props) {
const notFoundContentNode = ()=>{
return <span>暂无数据</span>
}
const Complete = () => (
<AutoComplete
dropdownClassName="certain-category-search-dropdown"
dropdownMatchSelectWidth={250}
allowClear
// onChange={(value)=>{setQueryName(value)}}
onSearch={(value)=>{setQueryName(value)}}
notFoundContent={notFoundContentNode()}
value={queryName}
open={open}
onFocus={()=>{setOpen(true)}}
onBlur={()=>{setOpen(false)}}
style={{
width: 250,
}}
options={completeOptions}
onSelect={confirmSearchSelect}
placeholder='搜索员工、部门'
>
</AutoComplete>
);
function handlePlaceHolder(){
let placeholder = '';
switch (props.treeType){
case 'departMentTab':
placeholder = '搜索学员姓名、部门';
break;
case 'postGrouptab':
placeholder = '搜索学员姓名/岗位/岗位组';
break;
case 'customGroupTab':
placeholder = '搜索学员姓名/自定义分组集合/自定义分组';
break;
default:
break;
}
return placeholder
}
function confirmSearchSelect(value,option){
console.log('option',option);
setOpen(false);
setQueryName(value);
// console.log('option',option);
// setSelctQueryName(option)
props.searchUserList({queryName:value},treeType,1);
}
......@@ -115,7 +132,7 @@ function LeftStructureTree(props) {
const { result = {}} = res;
const {departmentUserVOList=[],departmentVOList=[],subLevelDepartmentVOList=[]} = result;
if(departmentUserVOList.length>0){
userObj.label=renderTitle('员工');
userObj.label=renderTitle('学员');
userObj.options=departmentUserVOList.map((item,index)=>{
return renderItem(item,'user');
})
......@@ -166,24 +183,6 @@ function LeftStructureTree(props) {
});
}
useEffect(()=>{
setQueryName(''); //切换tab时搜索置空
setCompleteOption([]);
setOpen(false); //切换tab时搜索的下拉框置为空
getTreeData().then((res)=>{
const _defaultSelectedKeys = [];
if(res.length > 0){
_defaultSelectedKeys.push(res[0].id);
setSelectedKeys(_defaultSelectedKeys);
props.onChangeSelectDep(res[0])
props.searchUserList(res[0],treeType,1);
}
});
},[props.treeType]);
useEffect(()=>{
Bus.bind("addCustomer",(record)=>{addCustomer(record.treeType,record.query)})
},[]);
async function addCustomer(treeType,query){
await getTreeData(treeType);
......@@ -212,6 +211,7 @@ function LeftStructureTree(props) {
}
function handleData(dataArray){
const _dataArray = dataArray.map((item,index)=>{
item.title = "";
item.key=item.id;
if(item.sonDepartmentVOList){
item.children = item.sonDepartmentVOList;
......@@ -258,10 +258,21 @@ function LeftStructureTree(props) {
//添加岗位组/岗位
function addPostGroup(level,record) {
if (treeData.length === 10) {
if(level===0){
if (treeData.length > 9) {
message.error("岗位组数量已达10个上限");
return;
}
}
if(level===1){
if(record.sonDepartmentVOList){
if(record.sonDepartmentVOList.length > 19){
message.error("岗位数量已达20个上限");
return;
}
}
}
setCurrentGroupData({});
setAddOrEditPostGroupShow(true);
setOperatePostGroupModalType("add");
......@@ -293,8 +304,19 @@ function LeftStructureTree(props) {
}else{
setPostGroupModalTitle('编辑岗位');
setPostGroupModalLable('岗位');
setPostGroupTreeData([]);
setPostGroupTreeData(getParentChildernData(record.parentId));
}
}
// 获取父节点下的所有的子级数据
function getParentChildernData(parentId){
let _parentChildernData = []
treeData.map((item,index)=>{
if( parentId=== item.id){
_parentChildernData = item.sonDepartmentVOList
}
})
return _parentChildernData
}
function delPostGroup(record){
let title = '确认删除该岗位组吗？';
......@@ -334,10 +356,21 @@ function LeftStructureTree(props) {
//添加自定义分组集合/分组
function addCustomGroup(level,record) {
if (treeData.length === 10) {
message.error("岗位组数量已达10个上限");
if(level===0){
if (treeData.length > 9) {
message.error("自定义分组集合数量已达10个上限");
return;
}
}
console.log("record.sonDepartmentVOList",record.sonDepartmentVOList)
if(level===1){
if(record.sonDepartmentVOList){
if(record.sonDepartmentVOList.length > 19){
message.error("自定义分组数量已达20个上限");
return;
}
}
}
setCurrentGroupData({});
setAddOrEditPostGroupShow(true);
setOperatePostGroupModalType("add");
......@@ -360,14 +393,14 @@ function LeftStructureTree(props) {
setPostGroupModalLevel(record.level);
setCurrentGroupData(record)
//level为0的时候编辑的是岗位组 大于0的时候
if(record.level===0){
if(record.depLevel===0){
setPostGroupModalTitle('编辑分组集合');
setPostGroupModalLable('分组集合');
setPostGroupTreeData(treeData);
}else{
setPostGroupModalTitle('编辑分组');
setPostGroupModalLable('分组');
setPostGroupTreeData([]);
setPostGroupTreeData(getParentChildernData(record.parentId));
}
}
function delCustomGroup(record){
......@@ -426,7 +459,7 @@ function LeftStructureTree(props) {
}}
options={completeOptions}
onSelect={confirmSearchSelect}
placeholder='搜索员工、部门'
placeholder={handlePlaceHolder()}
>
</AutoComplete>
</div>
......@@ -455,6 +488,7 @@ function LeftStructureTree(props) {
</div>
)}
<div className="tree-con">
{!selctQueryName ?
<DirectoryTree
defaultExpandAll
showIcon={false}
......@@ -530,6 +564,32 @@ function LeftStructureTree(props) {
);
}}
/>
:
<div>
{ (props.treeType==='departMentTab') &&
<div>
{ option.name?
<WWOpenDataCom type="departmentName" openid={option.name}/>
:
<WWOpenDataCom type="userName" openid={option.userName}/>
}
</div>
}
{ (props.treeType==='postGrouptab' || props.treeType=== 'customGroupTab') &&
<div>
{ option.name?
<span>{option.name}</span>
:
<span>{option.userName}</span>
}
</div>
}
</div>
}
</div>
</div>
{addOrEditPostGroupShow && (
......
src/modules/college-manage/components/LeftStructureTree.less
.left-structure-tree {
margin-right: 24px;
width:250px;
width:260px;
height: calc(~'100vh - 260px');
overflow-y: scroll;
.organization{
overflow: scroll;
.search-con{
......
src/modules/college-manage/components/MemberTree.jsx
......@@ -38,6 +38,7 @@ function MemberTree(props) {
}
function handleData(dataArray){
const _dataArray = dataArray.map((item,index)=>{
item.title = "";
item.key=item.id;
item.children = []
if(item.departmentUserVOList){
......
src/modules/college-manage/components/SearchUser.jsx
......@@ -52,7 +52,7 @@ function SearchUser(props) {
// onBlur={()=>{onBlur()}}
/>
{dropDownVisible &&
<div className="drop-down" style={{width:'100%'}}>
<div className="drop-down">
<div className="drop-down__list">
{props.data.departmentUserVOList &&
<div>
......@@ -66,6 +66,7 @@ function SearchUser(props) {
<Checkbox onChange={(e)=>{selectuser(e,item)}} >
<div className="drop-down__item__con__item">
<div className="drop-down__item__con__item__left">
<span className="icon iconfont title-icon">&#xe603;</span>
<WWOpenDataCom type="userName" openid={item.userName}/>
</div>
<div className="drop-down__item__con__item__right">
......
src/modules/college-manage/components/SearchUser.less
.search-user{
position: relative;
padding:12px 16px;
.drop-down{
padding:18px;
position: absolute;
......@@ -8,11 +9,12 @@
background: #FFFFFF;
box-shadow: 0px 2px 15px 6px rgba(0, 0, 0, 0.05);
border-radius:2px;
width:270px;
.ant-checkbox-wrapper{
width:100%;
.drop-down__item__con__item{
display:flex;
width:240px;
width:220px;
justify-content:space-between;
color:#333;
font-size:14px;
......
src/modules/college-manage/components/UserTable.jsx
......@@ -41,7 +41,7 @@ function UserTable() {
title: '岗位',
dataIndex: 'post',
render: (val, record) => {
return <span>{val}</span>
return <span className="post-name">{val}</span>
}
},
{
......
src/modules/college-manage/components/UserTable.less
.user-table{
.post-name{
max-width: 100px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
\ No newline at end of file
src/modules/college-manage/modal/AddOrEditPostGroupModal.jsx
......@@ -2,7 +2,7 @@
* @Author: wufan
* @Date: 2020-11-27 16:21:49
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-08-03 17:23:40
* @LastEditTime: 2021-08-06 17:10:50
* @Description: Description
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
......@@ -16,25 +16,29 @@ function AddOrEditPostGroupModal(props) {
const [nameErrorMsg,setNameErrorMsg] = useState('');
const [validateStatus,setValidateStatus] = useState('success');
const [postGroupName,setPostGroupName] = useState('');
const [isError,setIsError] = useState(false)
useEffect(() => {
},[]);
function changePostGroupName(e){
let isError = false;
setIsError(false)
setValidateStatus('success');
setNameErrorMsg('');
if((!e.target.value) || /^\s+$/.test(e.target.value)){
setValidateStatus('error');
setNameErrorMsg(`${props.label}不能为空`);
setIsError(true)
}
props.postGroupTreeData.map((item,index)=>{
if(item.name === e.target.value){
setValidateStatus('error');
setNameErrorMsg(`该${props.label}已存在`);
isError = true;
setIsError(true)
}
return item;
})
if(!isError){
setPostGroupName(e.target.value);
}
}
function handleConfirm(){
if(props.modalOperateType === 'add'){
......@@ -44,10 +48,11 @@ function AddOrEditPostGroupModal(props) {
}
}
function addGroup(){
if(!postGroupName){
if(isError){
return;
}
const { postGroupModalLevel,currentTab,currentGroupData,label} = props
let parmas={
depLevel:postGroupModalLevel,
depType:DepType[currentTab],
......@@ -68,7 +73,7 @@ function AddOrEditPostGroupModal(props) {
});
}
function editGroup(){
if(!postGroupName){
if(isError){
return;
}
const {postGroupModalLevel,currentTab,currentGroupData,label} = props
......
src/modules/college-manage/modal/ChooseMembersModal.jsx
......@@ -18,7 +18,6 @@ import WechatApi from '@/common/js/wechatApi';
import WWOpenDataCom from '@/components/WWOpenDataCom';
const { Search } = Input;
class ChooseMembersModal extends React.Component {
constructor(props) {
super(props);
......@@ -204,6 +203,7 @@ class ChooseMembersModal extends React.Component {
})
}
})
}
addCustomer = () => {
......
src/modules/college-manage/modal/ChooseMembersModal.less
......@@ -23,7 +23,7 @@
.container-left-body-table{
width: 300px;
height: 330px;
overflow: scroll;
.ant-table {
border: none;
min-height: 250px !important;
......
src/modules/college-manage/modal/NewChooseMembersModal.jsx
......@@ -56,7 +56,7 @@ class NewChooseMembersModal extends React.Component {
return (
<div className='avatar'>
<span className="icon iconfont avatar-icon">&#xe84a;</span>
<Tooltip title={userName}>
<Tooltip title={<WWOpenDataCom type="userName" openid={userName}/>}>
<span className='userImg'>
<WWOpenDataCom type="userName" openid={userName}/>
{/* {userName} */}
......@@ -348,7 +348,7 @@ class NewChooseMembersModal extends React.Component {
this.setState({ selectObject });
}}
onClose={() => {
this.setState({ openSetModal: true},()=>{this.handleClose()})
// this.setState({ openSetModal: true},()=>{this.handleClose()})
this.setState({ openSetModal: false, visible: true })
}}
onCancel={() => {
......
src/modules/college-manage/modal/SetEmployeeModal.jsx
......@@ -19,10 +19,25 @@ export default class SetEmployeeModal extends React.Component {
})
const selectedData = list[0] || {};
this.state = {
list,
list:this.uniqArr([...list]),
selected: selectedData.userId,
roleCode: selectedData.roleCode,
submit:false
}
}
uniqArr(arr){
let obj={};
arr.map((item,index)=>{
// 若重复则删除该项
if(obj.hasOwnProperty(item.userId)){
arr.splice(index,1);
// 不重复则存入obj
}else{
obj[item.userId]=item.userName;
}
});
return arr;
}
handleChangeValues(value) {
......@@ -33,7 +48,7 @@ export default class SetEmployeeModal extends React.Component {
}
})
this.props.onChange(selected, value);
this.setState({ roleCode: value, list });
this.setState({ roleCode: value, list});
}
render() {
......@@ -41,6 +56,7 @@ export default class SetEmployeeModal extends React.Component {
list,
roleCode,
selected,
submit
} = this.state;
return (
<Modal
......@@ -55,7 +71,7 @@ export default class SetEmployeeModal extends React.Component {
<div className="modal-footer">
<Button style={{ float: 'left' }} onClick={() => this.props.onClose()}>上一步</Button>
<Button onClick={() => this.props.onCancel()}>取消</Button>
<Button onClick={() => this.props.onOk(list)} type="primary">确定</Button>
<Button onClick={() =>{this.setState({submit:true},()=>this.props.onOk(list))}} type="primary" disabled={submit}>确定</Button>
</div>
}
>
......
src/modules/course-manage/AddLive.jsx
......@@ -362,6 +362,8 @@ class AddLive extends React.Component {
scheduleMediaRequests,
};
routeHook.cancel()
if (type === 'add') {
const params = {
...commonParams,
......
src/modules/course-manage/DataList/CourseData.jsx
......@@ -93,6 +93,18 @@ class DataList extends React.Component {
};
studentTypeEnum = (type)=> {
if (type === "STUDENT") {
return "学员"
}
if (type === "NON_STUDENT") {
return "待加入"
}
if (type === "GUEST") {
return "游客"
}
}
// 进入直播次数列表
getVisiterColumns() {
const columns = [
......@@ -190,7 +202,7 @@ class DataList extends React.Component {
const columnsWorkWX = [
{
title: '学员姓名',
dataIndex: 'userName',
dataIndex: 'name',
},
{
title: ()=> {
......@@ -210,43 +222,16 @@ class DataList extends React.Component {
</div>
)
},
dataIndex: 'phone',
dataIndex: 'studentTypeEnum',
render: (text, record) => {
const { phone = '', bindingWeChat } = record;
return <div>{phone}</div>;
return <div>{this.studentTypeEnum(record.studentTypeEnum)}</div>;
},
},
{
title: '账号类型',
dataIndex: 'entryNum',
dataIndex: 'accountTypeEnum',
render: (text, record) => {
if (text > 0) {
if (record.visitorInfoVOList && record.visitorInfoVOList.length > 0) {
const table = (
<XMTable
renderEmpty={{
image: college,
description: '暂无数据',
}}
columns={this.getVisiterColumns()}
dataSource={record.visitorInfoVOList}
scroll={{ y: 75 }}
size={'small'}
style={{ width: 450 }}
pagination={false}
/>
);
return (
<Popover content={table} trigger='click'>
<span className='handel-btn'>{text}</span>
</Popover>
);
} else {
return <div className='live-table--empty'>暂无观看数据</div>;
}
} else {
return <span>{text}</span>;
}
return record.accountTypeEnum === "ENTERPRISE_WECHAT" ? <span style={{color:"#5289FA"}}>企业微信</span> : <span style={{color:"#1DCC65"}}>微信</span>
},
},
{
......
src/modules/course-manage/components/AddLiveClassInfoWorkWX.jsx
import React, { useEffect, useState } from "react";
import { DatePicker, TimePicker, Select } from 'antd';
import { DatePicker, TimePicker, Select, message } from 'antd';
import StoreService from "@/domains/store-domain/storeService";
import "./AddLiveClassInfoWorkWX.less";
import GraphicsEditor from "./GraphicsEditor";
......@@ -17,6 +17,8 @@ export default function AddLiveClassInfoWorkWX(props) {
const [teacherQuery, setTeacherQuery] = useState(defaultTeacherQuery)
const [teacherList, setTeacherList] = useState([])
const [hasNext, setHasNext] = useState(false)
const [introduce, setIntroduce] = useState({content:props.introduce})
const [duration, setDuration] = useState(props.data.duration)
const [cusTime, setCusTime] = useState(false)
......@@ -26,18 +28,13 @@ export default function AddLiveClassInfoWorkWX(props) {
const [endDate, setEndDate] = useState(0)
const [endTime, setEndTime] = useState(0)
const [teacherId, setTeacherId] = useState()
const [remindTime, setRemindTime] = useState(0)
useEffect(()=> {
getTeacherList()
},[])
const [remindTime, setRemindTime] = useState(900)
useEffect(()=> {
setBeginTime(props.data.startTime)
setBeginDate(moment(props.data.startTime).startOf('day').valueOf())
setEndTime(props.data.startTime+Number(props.data.duration))
setEndDate(moment(props.data.startTime+Number(props.data.duration)).startOf('day').valueOf())
setEndTime(props.data.startTime+Number(props.data.duration)*1000)
setEndDate(moment(props.data.startTime+Number(props.data.duration)*1000).startOf('day').valueOf())
setTeacherId(props.data.teacherId)
setRemindTime(props.data.remindTime)
},[props.data])
......@@ -47,10 +44,28 @@ export default function AddLiveClassInfoWorkWX(props) {
setIntroduce(intro)
},[props.introduce])
function disabledDate(current) {
// Can not select days before today and today
return current && current < moment().startOf('day');
}
//开始日期
function onBeginDateChange(date, dateString) {
if (date) {
setBeginDate(date.startOf('day').valueOf())
if (date.isBefore(moment())) {
message.warning('开始日期不能早于当前日期')
setBeginDate(moment().startOf('day').valueOf())
} else {
let _begindate = date.startOf('day').valueOf();
let _begintime = moment(beginTime)
let datetime = _begindate+(_begintime.hour()*60+_begintime.minute())*60*1000
setBeginTime(datetime)
props.onChange("beginTime",datetime)
if (!cusTime) {
props.onChange("endTime",datetime+duration*1000)
}
setBeginDate(_begindate)
}
} else {
setBeginDate(0)
}
......@@ -60,24 +75,37 @@ export default function AddLiveClassInfoWorkWX(props) {
console.log(date)
}
//开始时间
function onBeginTimeChange(date, dateString) {
console.log("onBeginTimeChange",date)
// props.onChange("beginTime",date.valueOf())
function onBeginTimeChange(time, dateString) {
let begin = beginDate+(time.hour()*60+time.minute())*60*1000
setBeginTime(begin)
props.onChange("beginTime",begin)
if (!cusTime) {
props.onChange("endTime",begin+duration*1000)
}
}
function onBeginTimeOK(time) {
if (time.isBefore(moment())) {
message.warning('开始时间不能早于当前时间')
return
}
let begin = beginDate+(time.hour()*60+time.minute())*60*1000
setBeginTime(begin)
props.onChange("beginTime",begin)
if (!cusTime) {
props.onChange("endTime",begin+duration)
props.onChange("endTime",begin+duration*1000)
}
}
//结束日期
function onEndDateChange(date, dateString) {
if (date) {
setEndDate(date.startOf('day').valueOf())
let _endDate = date.startOf('day').valueOf()
let _endtime = moment(endTime)
let datetime = _endDate+(_endtime.hour()*60+_endtime.minute())*60*1000
setEndTime(datetime)
props.onChange("endTime",datetime)
setEndDate(_endDate)
} else {
setEndDate(0)
}
......@@ -88,11 +116,21 @@ export default function AddLiveClassInfoWorkWX(props) {
}
//结束时间
function onEndTimeChange(date, dateString) {
// props.onChange("endTime",date.valueOf())
function onEndTimeChange(time, dateString) {
if (time.isSameOrBefore(moment(beginTime))) {
message.warning('结束时间不能早于开始时间')
return
}
let end = endDate+(time.hour()*60+time.minute())*60*1000
setEndTime(end)
props.onChange("endTime",end)
}
function onEndTimeOK(time) {
if (time.isSameOrBefore(moment(beginTime))) {
message.warning('结束时间不能早于开始时间')
return
}
let end = endDate+(time.hour()*60+time.minute())*60*1000
setEndTime(end)
props.onChange("endTime",end)
......@@ -105,7 +143,7 @@ export default function AddLiveClassInfoWorkWX(props) {
}
let d = value*60*1000;
setDuration(d)
props.onChange("endTime",beginDate+d)
props.onChange("endTime",beginTime+d)
}
function onTeacherChange(value, option) {
......@@ -127,34 +165,49 @@ export default function AddLiveClassInfoWorkWX(props) {
function getTeacherList(current = 1) {
const _query = {
...teacherQuery,
current,
size:15
...teacherQuery
};
StoreService.getStoreUserBasicPage( _query).then((res) => {
StoreService.getStoreUserBasicPage(_query).then((res) => {
const { result = {} } = res;
const { records = [], total = 0, hasNext } = result;
const list = current > 1 ? teacherList.concat(records) : records;
const list = _query.current > 1 ? teacherList.concat(records) : records;
console.log(list)
setTeacherList(list)
setTeacherQuery({..._query,hasNext})
setHasNext(hasNext)
});
}
useEffect(()=> {
getTeacherList()
},[teacherQuery])
// 滑动加载更多讲师列表
function handleScrollTeacherList(e) {
const container = e.target;
//判定元素是否滚动到底部
const scrollToBottom = container && container.scrollHeight <= container.clientHeight + container.scrollTop;
if (scrollToBottom && hasNext) {
let _teacherQuery = teacherQuery;
_teacherQuery.current = _teacherQuery.current + 1
setTeacherQuery({..._teacherQuery})
}
}
// console.log(moment(beginDate).format("YYYY-MM-DD HH:mm"))
// console.log(moment(endDate).format("YYYY-MM-DD HH:mm"))
return (
<div className="AddLiveClassInfoWorkWX">
<div className="begin-time item">
<span className="label"><span className="require">*</span>开始时间：</span>
<DatePicker
value={beginTime===0?undefined:moment(beginTime)}
value={beginDate===0?undefined:moment(beginDate)}
onChange={onBeginDateChange}
onOk={onBeginDateOK}
disabledDate={disabledDate}
/>
<TimePicker
value={beginTime===0?undefined:moment(beginTime)}
onChange={onBeginTimeChange}
onOk={onBeginTimeOK}
allowClear={false}
format="HH:mm" />
</div>
<div className="duration-time item">
......@@ -163,14 +216,18 @@ export default function AddLiveClassInfoWorkWX(props) {
<>
<span className="label"><span className="require">*</span>结束时间：</span>
<DatePicker
value={endTime === 0?undefined:moment(endTime)}
value={endDate===0?undefined:moment(endDate)}
onChange={onEndDateChange}
onOk={onEndDateOK}
disabledDate={(current)=> {
return current && current < beginDate
}}
/>
<TimePicker
value={endTime === 0?undefined:moment(endTime)}
onChange={onEndTimeChange}
onOk={onEndTimeOK}
allowClear={false}
format="HH:mm" />
</>
) : (
......@@ -195,9 +252,27 @@ export default function AddLiveClassInfoWorkWX(props) {
onChange={onTeacherChange}
style={{width:"240px"}}
placeholder="请选择讲师"
disabled={!props.isEdit ? true: false}
filterOption={(input, option) => option}
showSearch
allowClear
onPopupScroll={handleScrollTeacherList}
onSearch={(value)=> {
let query = {...teacherQuery}
query.nickName = value
query.current = 1
setTeacherQuery(query)
}}
onClear={()=> {
setTeacherQuery({
current: 1,
nickName: null,
size: 15
})
}}
>
{
_.map(teacherList, (item, index) => {
teacherList.map((item, index) => {
return (
<Select.Option value={item.id} key={item.id}>{item.nickName}</Select.Option>
);
......@@ -207,9 +282,10 @@ export default function AddLiveClassInfoWorkWX(props) {
</div>
<div className="remind-time item">
<span className="label"><span className="require">*</span>提醒时间：</span>
<Select value={remindTime} onChange={onRemindChange} defaultValue={0} style={{width:"100px"}}>
<Select onChange={onRemindChange} placeholder={"15分钟前"} style={{width:"130px"}}>
<Option value={0}>无</Option>
<Option value={300}>5分钟前</Option>
<Option value={900}>15分钟前</Option>
<Option value={3600}>1小时前</Option>
<Option value={86400}>1天前</Option>
</Select>
......
src/modules/course-manage/components/CreateWorkWXCourse.jsx
......@@ -15,8 +15,6 @@ import Breadcrumbs from '@/components/Breadcrumbs';
import Bus from '@/core/tbus';
import AddLiveBasic from './AddLiveBasic';
import AddLiveClass from './AddLiveClass';
import AddLiveIntro from './AddLiveIntro';
import AddLiveClassInfoWorkWX from './AddLiveClassInfoWorkWX';
import { randomString } from '@/domains/basic-domain/utils';
import Upload from '@/core/upload';
......@@ -41,10 +39,10 @@ const defaultBasicInfo = {
const defaultClassInfo = {
teacherId: '', //讲师的Id
teacherId: null, //讲师的Id
courseName: '', //课程名称
duration: 3600000, //直播时长默认1小时
remindTime: 0, //提醒时间
duration: 3600, //直播时长默认1小时
remindTime: 900, //提醒时间
startTime: new Date().getTime() + 300000,
};
......@@ -60,12 +58,15 @@ function CreateWorkWXCourse() {
const [classInfo, setClassInfo] = useState(defaultClassInfo)
const [endTime, setEndTime] = useState(0)
const [introduce, setIntroduce] = useState('')
const [getInfo, setGetInfo] = useState(false)
const [previewLiveCourseModal, setPreviewLiveCourseModal] = useState()
useEffect(()=> {
routeHook.addSaveCase();
if (type === 'edit') {
getCourseDetail();
}else{
setGetInfo(true)
}
Bus.bind('editorLimit', (editorTextLength) => {
setEditorTextLength(editorTextLength)
......@@ -104,9 +105,11 @@ function CreateWorkWXCourse() {
default:
break;
}
return item;
});
if (!hasIntro) {
setGetInfo(true)
}
const _basicInfo = {
courseName,
......@@ -133,6 +136,7 @@ function CreateWorkWXCourse() {
setBasicInfo(_basicInfo)
setClassInfo(_classInfo)
setCourseState(courseState)
});
};
......@@ -146,6 +150,7 @@ function CreateWorkWXCourse() {
success: (res) => {
setLoadintroduce(true)
setIntroduce(res)
setGetInfo(true)
},
error: () => {
message.warning('获取简介失败');
......@@ -193,11 +198,6 @@ function CreateWorkWXCourse() {
}
}
// 修改简介
function handleChangeIntroInfo(field, value) {
};
// 完成创建/编辑
function handleSubmit() {
//过期判断
......@@ -221,8 +221,8 @@ function CreateWorkWXCourse() {
});
return;
}
// this.handleValidate(addLiveBasicInfo, addLiveClassInfo, addLiveIntroInfo, isEdit, editorTextLength).then((res) => {
// if (!res) return;
handleValidate().then((res) => {
if (!res) return;
//上传简介
Upload.uploadTextToOSS(
introduce,
......@@ -232,7 +232,7 @@ function CreateWorkWXCourse() {
},
() => message.warning('上传课程简介失败')
);
// });
});
};
function submitRemote({ introduceId, id }) {
......@@ -240,10 +240,12 @@ function CreateWorkWXCourse() {
} else {
}
console.log('取消')
routeHook.cancel()
if (type === 'add') {
if (endTime !== 0) {
classInfo.duration = String(endTime - classInfo.startTime)
classInfo.duration = String((endTime - classInfo.startTime)/1000)
}
const params = {
...classInfo,
......@@ -255,6 +257,7 @@ function CreateWorkWXCourse() {
CourseService.createWorkWXLiveCourse(params).then((res) => {
if (res.success) {
message.success('新建成功');
Bus.trigger('freshCourseList')
window.RCHistory.push({
pathname: `/live-course`,
});
......@@ -262,7 +265,7 @@ function CreateWorkWXCourse() {
});
} else {
if (endTime !== 0) {
classInfo.duration = String(endTime - classInfo.startTime)
classInfo.duration = String((endTime - classInfo.startTime)/1000)
}
const params = {
...classInfo,
......@@ -274,6 +277,7 @@ function CreateWorkWXCourse() {
};
CourseService.updateWorkWXLiveCourse(params).then((res) => {
if (res.success) {
Bus.trigger('freshCourseList')
message.success('更新成功');
window.RCHistory.push({
pathname: `/live-course`,
......@@ -282,103 +286,33 @@ function CreateWorkWXCourse() {
});
}
};
/*
handleValidate = (addLiveBasicInfo, addLiveClassInfo, addLiveIntroInfo, isEdit, editorTextLength) => {
return new Promise((resolve) => {
const { type } = this.state;
const { courseName, categoryId } = addLiveBasicInfo;
const { liveDate, timeHorizonStart, timeHorizonEnd, teacherId, calendarTime } = addLiveClassInfo;
const { liveCourseMediaRequests } = addLiveIntroInfo;
const currentTime = +new Date();
if (!courseName) {
message.warning('请输入课程名称');
resolve(false);
return;
}
if (!categoryId) {
message.warning('请选择课程分类');
resolve(false);
return;
}
if (type === 'add') {
const { startTime, endTime } = addLiveClassInfo;
if (calendarTime.length === 0) {
message.warning('请选择上课日期');
resolve(false);
return;
} else if (startTime === endTime || startTime > endTime) {
message.warning('结束时间必须晚于开始时间');
resolve(false);
return;
}
// 若有今日排课 校验当前时间
const currentDay = moment(currentTime).format('YYYY-MM-DD');
const itemToday = _.find(calendarTime, (item) => {
const itemDay = moment(item).format('YYYY-MM-DD');
return itemDay === currentDay;
});
if (itemToday) {
const itemDay = moment(itemToday).format('YYYY-MM-DD');
const itemHour = moment(startTime).format('HH:mm');
if (itemDay === currentDay) {
if (moment(itemDay + ' ' + itemHour).format('x') < currentTime) {
message.warning('开始时间不能早于现在');
resolve(false);
return;
}
}
}
} else {
const _liveDate = moment(liveDate).format('YYYY-MM-DD');
const _timeHorizonStart = moment(timeHorizonStart).format('HH:mm');
const _timeHorizonEnd = moment(timeHorizonEnd).format('HH:mm');
const startTime = moment(_liveDate + ' ' + _timeHorizonStart).format('x');
const endTime = moment(_liveDate + ' ' + _timeHorizonEnd).format('x');
if (!startTime || !endTime) {
message.warning('日期不能为空');
resolve(false);
return;
} else if (!timeHorizonStart) {
message.warning('开始时间不能为空');
resolve(false);
return;
} else if (!timeHorizonEnd) {
message.warning('结束时间不能为空');
resolve(false);
return;
} else if (isEdit && startTime < currentTime) {
message.warning('开始时间不能早于当前时间');
resolve(false);
return;
} else if (isEdit && endTime < currentTime) {
message.warning('结束时间不能早于当前时间');
resolve(false);
return;
} else if (isEdit && endTime <= startTime) {
message.warning('结束时间不能早于开始时间');
resolve(false);
return;
function handleValidate() {
return new Promise((resolve) => {
if (_.isEmpty(basicInfo.courseName)) {
message.warning("课程名称不能为空")
resolve(false)
return
}
if (_.isEmpty(basicInfo.categoryId)) {
message.warning("课程分类未选择")
resolve(false)
return
}
if (!teacherId) {
message.warning('请选择讲师');
resolve(false);
return;
if (!classInfo.startTime) {
message.warning("未设置开始时间")
resolve(false)
return
}
if (editorTextLength > 1000) {
message.warning('课程简介超过字数限定');
resolve(false);
return;
if (_.isEmpty(classInfo.teacherId)) {
message.warning("课程分类未选择")
resolve(false)
return
}
resolve(true);
resolve(true)
});
};
*/
// 显示预览课程弹窗
function handleShowPreviewModal() {
......@@ -427,14 +361,17 @@ function CreateWorkWXCourse() {
</div>
<div className='add-live-page__form'>
<div className='basic-info__wrap'>
<div className='title'>基本信息</div>
<div className='title'>基本信息<span style={{marginLeft:"24px",color:"#2966FF",fontSize:"14px"}}>温馨提示：在直播间可控制回放录制功能。</span></div>
<AddLiveBasic isEdit={isEdit} pageType={type} data={basicInfo} onChange={handleChangeBasicInfo} />
</div>
<div className='class-info__wrap'>
<div className='title'>上课信息</div>
{/* <AddLiveClass isEdit={isEdit} pageType={type} data={{ ...addLiveClassInfo, id }} onChange={handleChangeClassInfo} /> */}
<AddLiveClassInfoWorkWX type={type} data={classInfo} introduce={introduce} onChange={onClassInfoChange}/>
{
getInfo && <AddLiveClassInfoWorkWX type={type} data={classInfo} isEdit={isEdit} introduce={introduce} onChange={onClassInfoChange}/>
}
</div>
</div>
......
src/modules/course-manage/components/LiveCourseFilter.jsx
......@@ -151,6 +151,7 @@ class LiveCourseFilter extends React.Component {
courseState: undefined,
current: 1,
shelfState: null,
thirdPartType: null
},
},
() => {
......@@ -303,6 +304,16 @@ class LiveCourseFilter extends React.Component {
style={{ width: 'calc(100% - 70px)' }}
placeholder='请选择'
allowClear={true}
onClear={(value) => {
this.setState(
{
query: {...this.state.query,thirdPartType:null}
},
() => {
this.props.onChange(this.state.query)
}
)
}}
value={thirdPartType}
onChange={(value) => {
this.handleChangeQuery('thirdPartType', value)
......
src/modules/course-manage/components/LiveCourseList.jsx
......@@ -24,6 +24,7 @@ import DataList from '../DataList/DataList';
import ManageCoursewareModal from '../modal/ManageCoursewareModal';
import RelatedPlanModal from '../modal/RelatedPlanModal';
import ShareLiveModal from '../modal/ShareLiveModal';
import Bus from '@/core/bus';
import './LiveCourseList.less';
const { confirm } = Modal
......@@ -65,6 +66,9 @@ class LiveCourseList extends React.Component {
}
componentDidMount() {
this.getDownloadVersion()
Bus.bind('freshCourseList',()=>{
this.refreshCourseList()
})
}
// 显示分享弹窗
handleShowShareModal = (item, needStr = false) => {
......@@ -629,6 +633,7 @@ class LiveCourseList extends React.Component {
}
renderMoreOperate = (item) => {
let now = new Date().getTime()
return (
<Menu
onClick={({key})=> {
......@@ -641,15 +646,48 @@ class LiveCourseList extends React.Component {
}
}}
>
{
item.thirdPartType === "WECHAT" &&
<Tooltip placement="left" title="企微直播，暂不支持关联培训任务">
<Menu.Item style={{color:"#999999"}}>
关联培训计划
</Menu.Item>
</Tooltip>
}
{
item.thirdPartType !== "WECHAT" &&
<Menu.Item disabled={!(User.getUserRole() === 'CloudManager' || User.getUserRole() === 'StoreManager')} key="link">
关联培训计划
</Menu.Item>
<Menu.Item disabled={item.courseState === "STARTING" || item.courseState === "FINISH"} key="edit">
}
{
(item.courseState === "STARTING" || item.courseState === "FINISH") &&
<Tooltip placement="left" title={`${item.courseState === "STARTING"?"直播已开始，不能编辑":"直播已结束，不能编辑"}`}>
<Menu.Item style={{color:"#999999"}}>
编辑
</Menu.Item>
</Tooltip>
}
{
item.courseState !== "STARTING" && item.courseState !== "FINISH" &&
<Menu.Item key="edit">
编辑
</Menu.Item>
<Menu.Item disabled={item.courseState === "STARTING"} key="del">
}
{
(item.courseState === "STARTING" || (now > item.startTime && now < item.endTime)) &&
<Tooltip placement="left" title="直播进行中，不能删除">
<Menu.Item style={{color:"#999999"}}>
删除
</Menu.Item>
</Tooltip>
}
{
(item.courseState !== "STARTING" && (now < item.startTime || now > item.endTime)) &&
<Menu.Item key="del">
删除
</Menu.Item>
}
</Menu>
)
// return (
......@@ -734,9 +772,12 @@ class LiveCourseList extends React.Component {
return
}
WechatApi.enterLiveRoom(item.livingId).then((res)=> {
console.log(res)
console.log("进入企微直播间",res)
}).catch((err)=> {
console.log(err)
Modal.warning({
title:"提示",
content: err
})
})
return
}
......@@ -794,7 +835,34 @@ class LiveCourseList extends React.Component {
})
}
handleViewPlayBack = (item) => {
let htmlUrl
if (item.thirdPartType === "WECHAT") {
if (!isWorkWx()) {
Modal.warning({
title:"提示",
content:"请使用企业微信进入回放"
})
return
}
if (item.startTime + 60*60*1000 < new Date().getTime()) {
Modal.warning({
title: '提示',
content: "该直播课的回放视频已失效",
});
return
}
WechatApi.replayLiving(item.livingId)
.then((res)=> {
console.log("进入企微回放")
})
.catch((err)=> {
Modal.warning({
title: '提示',
content: err,
});
})
return
}
let htmlUrl;
if (item.teacherId === User.getUserId()) {
htmlUrl = `${LIVE_SHARE}replay/${item.liveCourseId}?teacherId=${User.getUserId()}&id=${User.getStoreId()}`
} else if (_.pluck(item.admins, 'adminId').includes(User.getUserId())) {
......
src/modules/course-manage/components/LiveCourseOpt.jsx
......@@ -91,7 +91,7 @@ class LiveCourseOpt extends React.Component {
<Button type="primary" onClick={this.handleCreateLiveCouese}>新建直播课</Button>
}
{/* <Button type="primary" onClick={this.handleCreateQWCouese}>新建企微直播课</Button> */}
{!this.state.isMac && <Button onClick={this.handleDownloadClient}>下载直播客户端</Button>}
<Button onClick={this.handleDownloadClient}>下载直播客户端</Button>
</div>
<Route path={`${match.url}/createqwcourse`} component={CreateWorkWXCourse} />
</div>
......
src/modules/course-manage/modal/ManageCoursewareModal.jsx
......@@ -333,6 +333,7 @@ class ManageCoursewareModal extends React.Component {
];
const { list, scanFileModal, editData, cancelObject, showSelectFileModal, selectedFileList, diskList, showPreviewModal, previewStatus, url } = this.state;
const _list = _.reject(list, (item) => cancelObject[item.id]);
const { thirdPartType } = this.props.data
return (
<Modal
visible={true}
......@@ -348,10 +349,17 @@ class ManageCoursewareModal extends React.Component {
{_.isEmpty(_list) ? (
<div className='empty-body'>
<div id='lottie-box' className='empty-image'></div>
<Button className='empty-button' type='primary' onClick={() => this.addFile()}>
{ thirdPartType === "WECHAT" && <div className="qiwei-tip">企微直播<br/>Mac暂不支持上传课件，Windows可在直播间添加课件</div>}
<Button className='empty-button' type='primary'
disabled={thirdPartType === "WECHAT"}
onClick={() => {
if (thirdPartType !== "WECHAT") {
this.addFile()
}
}}>
上传课件
</Button>
<p className='empty-tip'>提前上传直播需要的课件和素材，直播将会变得更便捷！</p>
{ thirdPartType !== "WECHAT" && <p className='empty-tip'>提前上传直播需要的课件和素材，直播将会变得更便捷！</p>}
</div>
) : (
<div className='manage-body'>
......
src/modules/course-manage/modal/ManageCoursewareModal.less
......@@ -11,6 +11,14 @@
width:150px;
height:150px;
}
.qiwei-tip {
font-size: 14px;
font-weight: 400;
color: #999;
text-align: center;
margin-top: 12px;
margin-bottom: 12px;
}
.empty-button {
display: block;
margin: 0 auto 8px;
......
src/modules/course-manage/modal/PreviewCourseModal.jsx
......@@ -48,7 +48,6 @@ class PreviewCourseModal extends React.Component {
return hours + ":" + mins + ":" + seconds;
};
dealWithTime = (startTime, endTime) => {
debugger
const startDate = new Date(Number(startTime));
const endDate = new Date(Number(endTime));
......
src/modules/personalInfo/index.tsx
......@@ -2,7 +2,7 @@
* @Author: zhangleyuan
* @Date: 2020-11-27 15:06:31
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-08-02 16:35:20
* @LastEditTime: 2021-08-05 10:26:25
* @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
......@@ -178,7 +178,7 @@ function PersonalInfoPage() {
<div>
<span className="label">所在部门：</span>
{departmentList.map((item,index)=>{
return <span>{item}{index<departmentList.length-1?'、':''}</span>
return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<departmentList.length-1?'、':''}</span>
})}
</div>
<div className="save-btn">
......
src/modules/plan-manage/modal/relatedCourseModal.jsx
......@@ -353,17 +353,6 @@ class SelectOperatorModal extends React.Component {
},
},
{
title: '直播方式',
key: 'thirdPartType',
dataIndex: 'thirdPartType',
width: 120,
render: (val, record) => {
return (
<div>{record.thirdPartType === "WECHAT" ? "企微直播":"小麦直播"}</div>
);
},
},
{
title: '学院展示',
key: 'shelfState',
dataIndex: 'shelfState',
......
src/modules/root/App.tsx
......@@ -2,24 +2,24 @@
* @Author: 吴文洁
* @Date: 2019-07-10 10:30:49
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-21 14:33:49
* @LastEditTime: 2021-07-19 16:21:07
* @Description:
*/
import React, { useContext, useEffect, useState } from 'react';
import { withRouter } from 'react-router-dom';
import { ConfigProvider, message, Layout, DatePicker } from 'antd';
import { ConfigProvider, message, Layout } from 'antd';
import Header from './Header'
import Menu from './Menu'
import Main from './Main'
import zhCN from 'antd/lib/locale/zh_CN'
import zhCN from 'antd/es/locale/zh_CN'
import User from '@/common/js/user';
import BaseService from "@/domains/basic-domain/baseService";
import moment from 'moment';
import WechatApi from '@/common/js/wechatApi';
import { VersionContext, VersionInfo, XMContext } from '@/store/context';
import { setStoreGroupPermission, setStorePermission, setStoreGroupList, setStoreList, setWechatLogin } from '@/store/actions/index';
import Service from "@/common/js/service";
import Bus from '@/core/tbus';
import WechatApi from '@/common/js/wechatApi';
const { Footer, Sider, Content } = Layout;
......@@ -52,12 +52,7 @@ const App: React.FC = (props: any) => {
})
async function initWechatConfig() {
WechatApi.initConfig({ isAgentConfig: true, url: window.location.href.split('#')[0] })
}
}
useEffect(() => {
getStorePermission();
}, [window.location.hash])
......@@ -173,6 +168,15 @@ const App: React.FC = (props: any) => {
return (
<div id="home">
{/* <Layout>
<Sider><Menu menuType={menuType} handleMenuType={handleMenuType} /></Sider>
<Layout>
<Header id="app" handleMenuType={handleMenuType} menuType={menuType} />
<ConfigProvider locale={zhCN} autoInsertSpaceInButton={false}>
<Main menuType={menuType} />
</ConfigProvider>
</Layout>
</Layout> */}
<Header id="app" handleMenuType={handleMenuType} menuType={menuType} />
<VersionContext.Provider value={versionInfo}>
<ConfigProvider locale={zhCN} autoInsertSpaceInButton={false}>
......
src/modules/root/CollegeManagePage.jsx
......@@ -6,8 +6,8 @@ import User from "@/common/js/user";
import { LIVE_SHARE } from "@/domains/course-domain/constants";
import { Modal, message } from 'antd';
import WechatApi from '@/common/js/wechatApi';
import { brandLogo } from '@/domains/brand/constants'
import WWOpenDataCom from '@/components/WWOpenData';
import { brandLogo,xfrwm } from '@/domains/brand/constants'
import './CollegeManagePage.less';
import storage from '@/common/js/storage';
......@@ -94,7 +94,7 @@ function ExpirationPopover(props) {
}
<div className="qrcode">
<img src="https://cdn.xiaomai5.com/qixueyuankehu.png" alt=""></img>
<img src={xfrwm} alt=""></img>
<div className="des">微信/企业微信扫码咨询</div>
</div>
<div className="phone"><svg style={{ position: "relative", top: "2px", marginRight: "4px" }} viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M512.651 3.78c-281.433 0-509.21 228.324-509.21 509.209 0 281.43 228.325 509.203 509.21 509.203 281.427 0 509.202-228.317 509.202-509.203 0.55-280.885-227.775-509.21-509.202-509.21z m198.205 743.553c-36.14 36.136-169.737 1.641-302.24-130.312-131.953-131.959-165.902-266.104-129.768-301.695 31.211-31.21 68.99-85.417 125.939-14.782 56.943 70.629 29.016 90.34-3.291 122.647-22.449 22.448 24.642 79.392 73.37 128.125 49.283 48.73 105.678 95.818 128.126 73.368 32.306-32.305 52.017-60.23 122.646-3.288 71.182 56.949 16.426 95.276-14.782 125.937z" p-id="4409" fill="#999999"></path></svg>
......
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