diff --git a/app/services/users/shixun_service.rb b/app/services/users/shixun_service.rb index aeaac6a2c..9460d3a88 100644 --- a/app/services/users/shixun_service.rb +++ b/app/services/users/shixun_service.rb @@ -41,6 +41,8 @@ class Users::ShixunService def user_policy_filter(relations) # 只有自己或者管理员才有过滤筛选及查看全部状态下实训功能 + Rails.logger.info("self_or_admin?: #{self_or_admin?}") + Rails.logger.info("user: #{user.id}") if self_or_admin? relations = relations.where.not(status: -1) status_filter(relations) diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js index 9312b24fd..0338481f7 100644 --- a/public/react/src/modules/tpm/SiderBar.js +++ b/public/react/src/modules/tpm/SiderBar.js @@ -1,5 +1,6 @@ import React, { Component } from 'react'; import { getImageUrl} from 'educoder'; +import {Tooltip} from 'antd'; import './TPMIndex.css'; const $ = window.$; @@ -81,60 +82,70 @@ class SiderBar extends Component { } componentDidMount() { - _initSider(); + _initSider() } render() { + // console.log(this.props) return (
- {this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?
-
- - - -
- -
- - - -
+ {this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?
+ +
+ + + +
+
+ + +
+ + + +
+
- -

-

- - -

微信扫一扫

-

关注公众号

- -

-

+ +

+

+ + +

微信扫一扫

+

关注公众号

+

+

+ + }> + +
-
- - - -
-
:""} - + +
+ + + +
+
+
:""}
); } diff --git a/public/react/src/modules/tpm/TPMIndex.css b/public/react/src/modules/tpm/TPMIndex.css index bbec3d34d..caf962596 100644 --- a/public/react/src/modules/tpm/TPMIndex.css +++ b/public/react/src/modules/tpm/TPMIndex.css @@ -226,4 +226,7 @@ body>.-task-title { .headwith100b{ width: 100%; +} +.wechatcenter{ + text-align: center; } \ No newline at end of file