From b789fc50be79c569f288f79a7b9ef29d9c06968e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <hetongchong@csxjy.com>
Date: Wed, 15 Jun 2022 17:09:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=BD=92wiki=E3=80=81issue=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Head/Header.js            |  2 +-
 src/forge/Main/sub/DetailBanner.jsx |  2 +-
 src/forge/Merge/MergeItem.js        |  4 ++--
 src/forge/Order/OrderItem.js        |  6 ++++--
 src/forge/Order/order.js            | 24 ++++++++++++++++++------
 src/glcc/check/index.jsx            |  6 ++++--
 src/modules/tpm/TPMIndex.css        |  2 +-
 7 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index ec2756e5..58d3fcae 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -386,7 +386,7 @@ class NewHeader extends Component {
               }
             </span>
             :
-            <Dropdown placement={`bottomRight`} visible={true} overlay={this.renderMenu(settings && settings.personal)}>
+            <Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)}>
               <a href={`/${this.props.current_user  && this.props.current_user.login}`}>
                 <img alt="头像" src={getImageUrl(`/${user.image_url}`)} className="currentImg"></img>
               </a>
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index d215936f..15633f3b 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -9,7 +9,7 @@ function DetailBanner({ history,list , owner , projectsId ,showNotification , ur
   const [ menuName , setMenuName ] = useState(undefined);
   const [ visible , setVisible ] =  useState(false);
   useEffect(()=>{
-    if(list){
+    if(Array.isArray(list)){
       // 没有资源库banner但是通过连接进资源库页面时
       let a = list.filter(item=>item.menu_name === "resources");
       if((pathname && pathname==="source") && (a && a.length === 0)){
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index ef026261..23ad1a14 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import { Link } from "react-router-dom";
-import { Tag } from "antd";
+import { Tag, Tooltip } from "antd";
 import { AlignCenter } from '../Component/layout';
 import { getImageUrl, turnbar } from "educoder";
 import "./merge.css";
@@ -157,7 +157,7 @@ class MergeItem extends Component {
                     "--"
                   )}
                 </li>
-                <li>{item.version || "--"}</li>
+                <li>{item.version ? <Tooltip placement="topLeft" title={item.version}>{item.version}</Tooltip> : "--"}</li>
 
                 <li>
                   <div
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index 4455d7ba..0da644c2 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Popconfirm } from 'antd'
+import { Popconfirm,Tooltip } from 'antd'
 import { TagInfo } from '../Utils/TagColor';
 class OrderItem extends Component {
   constructor(props) {
@@ -84,7 +84,9 @@ class OrderItem extends Component {
             }
           </li>
           <li>{item.tracker || "--"}</li>
-          { !mile ?<li>{item.version || "--"}</li>:""}
+          {!mile ? <li>
+            {item.version ? <Tooltip placement="topLeft" title={item.version}>{item.version}</Tooltip> : "--"}
+          </li> : ""}
           <li>{item.issue_status || "--"}</li>
           <li style={{color:`${item.done_ratio === "100%"?"#28BD6C":"#F73030"}`}}>{item.done_ratio || "--"}</li>
           <li>
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 74645711..6ce659ba 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -282,13 +282,17 @@ class order extends Component {
   // 翻页
   ChangePage = (page) => {
     window.scrollTo(0,0);
-    const { status_type } = this.state;
+    const { status_type,select_params } = this.state;
     this.setState({
       isSpin: true,
       checkedValue: [],
       all: false,
+      select_params:{
+        ...select_params,
+        page
+      }
     },()=>{
-      this.state.select_params.page=page;
+      // this.state.select_params.page=page;
       this.getIssueList(status_type);
     });
   };
@@ -432,17 +436,25 @@ class order extends Component {
 
   // 修改开始时间
   changeBeginTime = (data, value) => {
-    const { status_type } = this.state;
+    const { status_type,select_params } = this.state;
     this.setState({
-      begin: value
+      begin: value,
+      select_params:{
+        ...select_params,
+        page:1
+      }
     },()=>{
       this.getIssueList(status_type, value, this.state.end);
     })
   }
   changeEndTime = (data, value) => {
-    const { status_type } = this.state;
+    const { status_type,select_params } = this.state;
     this.setState({
-      end: value
+      end: value,
+      select_params:{
+        ...select_params,
+        page:1
+      }
     },()=>{
       this.getIssueList(status_type, this.state.begin, value);
     });
diff --git a/src/glcc/check/index.jsx b/src/glcc/check/index.jsx
index ea2e5af9..5b66e803 100644
--- a/src/glcc/check/index.jsx
+++ b/src/glcc/check/index.jsx
@@ -23,6 +23,8 @@ function Check({ current_user, showNotification, history }) {
   const [taskId, setTaskId] = useState();
   const [havePass, setHavePass] = useState(false);
 
+  const disabledCheck =  new Date().getTime() > new Date('2022-07-01').getTime();
+
   const columns = [
     {
       title: '学生姓名',
@@ -128,8 +130,8 @@ function Check({ current_user, showNotification, history }) {
         return (
           <div className='actionBox'>
             {
-              text ? <Button type="default" onClick={() => { checkStudent(record.id, 0) }}>撤销</Button> :
-                <Button type="primary" disabled={havePass} onClick={() => { checkStudent(record.id, 1) }}>通过</Button>
+              text ? <Button disabled={disabledCheck} type="default" onClick={() => { checkStudent(record.id, 0) }}>撤销</Button> :
+                <Button disabled={disabledCheck} type="primary" disabled={havePass} onClick={() => { checkStudent(record.id, 1) }}>通过</Button>
             }
           </div>
         )
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index 8701a8aa..4e3288dd 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -27,7 +27,7 @@ body>.-task-title {
   width: 100%;
   height:58px;
   min-width: 1200px;
-  z-index: 1000;
+  z-index: 1031;
   position: fixed;
   background: #1B2440;
   color: #fff;