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

src/modules/college-manage/EmployeeManage.tsx

@@ -142,6 +142,7 @@ function EmployeeManage() {
       {
         title: "员工",
         dataIndex: "weChatAccount",
+        fixed:'left',
         render: (val: string, record: RecordTypes) => {
           return (
             <div className="employee-info">
@@ -200,6 +201,7 @@ function EmployeeManage() {
       {
         title: "操作",
         dataIndex: "operation",
+        fixed:'right',
         render: (val: string, record: RecordTypes) => {
           return record.role === "学院管理员" ||
             record.userId === User.getUserId() ? (
@@ -487,6 +489,7 @@ function EmployeeManage() {
                 image: college,
                 description: '暂无数据'
               }}
+              scroll={{ x: 1200 }}
               size={"middle"}
               pagination={false}
               dataSource={employeeList}

src/modules/college-manage/UserManagePage.tsx

 /*
  * @Author: wufan
  * @Date: 2020-11-30 10:47:38
- * @LastEditors: wufan
- * @LastEditTime: 2021-06-21 11:13:15
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-08-13 16:52:16
  * @Description: 学员管理页面
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */

src/modules/college-manage/components/DepartMentTabCon.jsx

@@ -8,6 +8,7 @@ import college from "@/common/lottie/college.json";
 import WWOpenDataCom from '@/components/WWOpenDataCom';
 import StoreService from "@/domains/store-domain/storeService";
 import { DepType } from "@/domains/store-domain/constants";
+import Platform from '@/common/js/platform';
 import User from "@/common/js/user";
 import moment from "moment";
 import "./DepartMentTabCon.less";
@@ -31,11 +32,13 @@ function DepartMentTabCon(props) {
   useEffect(()=>{
     setSelectUser([]);
   },[selectDep]);
+
   const columns = [
     {
       title: "学员",
       dataIndex: "nickName",
       width: 220,
+      fixed:!Platform.isWorkWx(),
       render: (val, item) => {
         return (
           <div>
@@ -59,7 +62,6 @@ function DepartMentTabCon(props) {
     {
       title: "真实姓名",
       dataIndex: "realName",
-      width: 180,
       render: (val, record) => {
         return <span>{val}</span>
       },
@@ -352,17 +354,21 @@ function DepartMentTabCon(props) {
             {(props.currentTab === "postGrouptab" || props.currentTab === "customGroupTab") &&
               <Button className="del-user-btn" onClick={()=>delUser('multiple')}>删除学员</Button>
             }
-            { selectDep.depId !== '10000' &&
+            { selectDep.depId !== '10000' ?
               <>
                 <Button className="update-user-btn" onClick={()=>{updateListData()}}>更新列表数据</Button>
-                <span className="origin-text">数据来源企业微信通讯录</span>
+                <div style={{marginTop:'12px'}}>
+                  <span className="origin-text">系统实时同步企业微信可见范围的学员信息，如需修改请前往企微管理后台通讯录中操作</span>
                   <a
                     href="https://www.yuque.com/docs/share/8c66333f-ed62-469d-909e-b36389a115ea?#"
                     target="_blank"
                   >
-                  <span className="view-text">查看数据更新说明</span>
+                    <span className="view-text">【查看说明】</span>
                   </a>
+                </div>
               </>
+              :
+              <span className="origin-text">微信学员通过授权或扫码登录后，数据自动同步到系统。</span>
             }
           </div>
         )}

src/modules/college-manage/components/LeftStructureTree.jsx

@@ -503,7 +503,7 @@ function LeftStructureTree(props) {
 
   function selectUserList(record, e) {
     const _selectKeys = [];
-    if(e.selectedNodes){
+    if(e.selectedNodes && e.selectedNodes.length>0){
       _selectKeys.push(e.selectedNodes[0].id)
     }
     setSelectedKeys(_selectKeys);

src/modules/college-manage/components/LeftStructureTree.less

@@ -100,6 +100,9 @@
         text-align:right;
       }
     }
+    .ant-select-item-option-grouped{
+      padding-left:12px;
+    }
     .empty-con{
       text-align:center;
       .empty-img{

src/modules/teach-tool/question-manage/components/QuestionList.jsx

 /*
  * @Author: yuananting
  * @Date: 2021-02-25 11:23:47
- * @LastEditors: yuananting
- * @LastEditTime: 2021-06-03 17:12:01
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-08-13 17:05:37
  * @Description: 助学工具-题库-题目列表数据
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */