Skip to content

X
xiaomai-cloud-class-web
Commit ce07b166 by zhangleyuan
Options

Merge branch 'feature/zhangleyuan/20210812/opzi-organize' into rc

parents 5dec598d 6436cf14
Showing with 26 additions and 14 deletions
src/modules/college-manage/EmployeeManage.tsx
...@@ -142,6 +142,7 @@ function EmployeeManage() { ...@@ -142,6 +142,7 @@ function EmployeeManage() {
{ {
title: "员工", title: "员工",
dataIndex: "weChatAccount", dataIndex: "weChatAccount",
fixed:'left',
render: (val: string, record: RecordTypes) => { render: (val: string, record: RecordTypes) => {
return ( return (
<div className="employee-info"> <div className="employee-info">
...@@ -200,6 +201,7 @@ function EmployeeManage() { ...@@ -200,6 +201,7 @@ function EmployeeManage() {
{ {
title: "操作", title: "操作",
dataIndex: "operation", dataIndex: "operation",
fixed:'right',
render: (val: string, record: RecordTypes) => { render: (val: string, record: RecordTypes) => {
return record.role === "学院管理员" || return record.role === "学院管理员" ||
record.userId === User.getUserId() ? ( record.userId === User.getUserId() ? (
...@@ -487,6 +489,7 @@ function EmployeeManage() { ...@@ -487,6 +489,7 @@ function EmployeeManage() {
image: college, image: college,
description: '暂无数据' description: '暂无数据'
}} }}
scroll={{ x: 1200 }}
size={"middle"} size={"middle"}
pagination={false} pagination={false}
dataSource={employeeList} dataSource={employeeList}
......
src/modules/college-manage/UserManagePage.tsx
/* /*
* @Author: wufan * @Author: wufan
* @Date: 2020-11-30 10:47:38 * @Date: 2020-11-30 10:47:38
* @LastEditors: wufan * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-06-21 11:13:15 * @LastEditTime: 2021-08-13 16:52:16
* @Description: 学员管理页面 * @Description: 学员管理页面
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
......
src/modules/college-manage/components/DepartMentTabCon.jsx
...@@ -8,6 +8,7 @@ import college from "@/common/lottie/college.json"; ...@@ -8,6 +8,7 @@ import college from "@/common/lottie/college.json";
import WWOpenDataCom from '@/components/WWOpenDataCom'; import WWOpenDataCom from '@/components/WWOpenDataCom';
import StoreService from "@/domains/store-domain/storeService"; import StoreService from "@/domains/store-domain/storeService";
import { DepType } from "@/domains/store-domain/constants"; import { DepType } from "@/domains/store-domain/constants";
import Platform from '@/common/js/platform';
import User from "@/common/js/user"; import User from "@/common/js/user";
import moment from "moment"; import moment from "moment";
import "./DepartMentTabCon.less"; import "./DepartMentTabCon.less";
...@@ -31,11 +32,13 @@ function DepartMentTabCon(props) { ...@@ -31,11 +32,13 @@ function DepartMentTabCon(props) {
useEffect(()=>{ useEffect(()=>{
setSelectUser([]); setSelectUser([]);
},[selectDep]); },[selectDep]);
const columns = [ const columns = [
{ {
title: "学员", title: "学员",
dataIndex: "nickName", dataIndex: "nickName",
width: 220, width: 220,
fixed:!Platform.isWorkWx(),
render: (val, item) => { render: (val, item) => {
return ( return (
<div> <div>
...@@ -59,7 +62,6 @@ function DepartMentTabCon(props) { ...@@ -59,7 +62,6 @@ function DepartMentTabCon(props) {
{ {
title: "真实姓名", title: "真实姓名",
dataIndex: "realName", dataIndex: "realName",
width: 180,
render: (val, record) => { render: (val, record) => {
return <span>{val}</span> return <span>{val}</span>
}, },
...@@ -352,17 +354,21 @@ function DepartMentTabCon(props) { ...@@ -352,17 +354,21 @@ function DepartMentTabCon(props) {
{(props.currentTab === "postGrouptab" || props.currentTab === "customGroupTab") && {(props.currentTab === "postGrouptab" || props.currentTab === "customGroupTab") &&
<Button className="del-user-btn" onClick={()=>delUser('multiple')}>删除学员</Button> <Button className="del-user-btn" onClick={()=>delUser('multiple')}>删除学员</Button>
} }
{ selectDep.depId !== '10000' && { selectDep.depId !== '10000' ?
<> <>
<Button className="update-user-btn" onClick={()=>{updateListData()}}>更新列表数据</Button> <Button className="update-user-btn" onClick={()=>{updateListData()}}>更新列表数据</Button>
<span className="origin-text">数据来源企业微信通讯录</span> <div style={{marginTop:'12px'}}>
<a <span className="origin-text">系统实时同步企业微信可见范围的学员信息，如需修改请前往企微管理后台通讯录中操作</span>
href="https://www.yuque.com/docs/share/8c66333f-ed62-469d-909e-b36389a115ea?#" <a
target="_blank" href="https://www.yuque.com/docs/share/8c66333f-ed62-469d-909e-b36389a115ea?#"
> target="_blank"
<span className="view-text">查看数据更新说明</span> >
</a> <span className="view-text">【查看说明】</span>
</a>
</div>
</> </>
:
<span className="origin-text">微信学员通过授权或扫码登录后，数据自动同步到系统。</span>
} }
</div> </div>
)} )}
......
src/modules/college-manage/components/LeftStructureTree.jsx
...@@ -503,7 +503,7 @@ function LeftStructureTree(props) { ...@@ -503,7 +503,7 @@ function LeftStructureTree(props) {
function selectUserList(record, e) { function selectUserList(record, e) {
const _selectKeys = []; const _selectKeys = [];
if(e.selectedNodes){ if(e.selectedNodes && e.selectedNodes.length>0){
_selectKeys.push(e.selectedNodes[0].id) _selectKeys.push(e.selectedNodes[0].id)
} }
setSelectedKeys(_selectKeys); setSelectedKeys(_selectKeys);
......
src/modules/college-manage/components/LeftStructureTree.less
...@@ -100,6 +100,9 @@ ...@@ -100,6 +100,9 @@
text-align:right; text-align:right;
} }
} }
.ant-select-item-option-grouped{
padding-left:12px;
}
.empty-con{ .empty-con{
text-align:center; text-align:center;
.empty-img{ .empty-img{
......
src/modules/teach-tool/question-manage/components/QuestionList.jsx
/* /*
* @Author: yuananting * @Author: yuananting
* @Date: 2021-02-25 11:23:47 * @Date: 2021-02-25 11:23:47
* @LastEditors: yuananting * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-06-03 17:12:01 * @LastEditTime: 2021-08-13 17:05:37
* @Description: 助学工具-题库-题目列表数据 * @Description: 助学工具-题库-题目列表数据
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
......
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