From acf83a69c532bdd50ada4a3bd4503ef2a8804d91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 6 Jan 2020 11:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                 |  4 +-
 .../busyWork/reply/CommonWorkAppraiseReply.js |  2 +-
 public/react/src/modules/forums/MemoDetail.js |  2 +-
 public/react/src/modules/home/shixunsHome.js  |  4 +-
 public/react/src/modules/tpm/jupyter/index.js | 26 ++++++++--
 .../react/src/modules/tpm/jupyter/index.scss  | 15 ++++--
 .../Challenges/Challengesjupyter.js           | 47 +++++++++++++++++--
 public/react/src/redux/actions/jupyter.js     | 26 +++++++---
 .../react/src/redux/reducers/commonReducer.js |  6 ++-
 .../src/redux/reducers/jupyterReducer.js      |  2 +-
 10 files changed, 107 insertions(+), 27 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 87ab58f63..a18e395dd 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -40,7 +40,7 @@ if (isDev) {
 // 超管
 // debugType="admin";
 // 老师
-//ebugType="teacher";
+//debugType="teacher";
 // 学生
 //debugType="student";
 
@@ -126,7 +126,7 @@ export function initAxiosInterceptors(props) {
                 let timestamp = Date.parse(new Date())/1000;
                 if (window.location.port === "3007") {
                   // let timestamp=railsgettimes(proxy);
-                  console.log(timestamp)
+                 // console.log(timestamp)
                   railsgettimes(`${proxy}/api/main/first_stamp.json`);
                   let newopens=md5(opens+timestamp)
                     config.url = `${proxy}${url}`;
diff --git a/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js b/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js
index b67266d77..3d3f83bc6 100644
--- a/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js
+++ b/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js
@@ -297,7 +297,7 @@ class CommonWorkAppraiseReply extends Component{
             <style>{`
               
               .course-message .panel-comment_item .comment_orig_content {
-                width: 1074px;
+                width: 1040px;
               }
               .course-message .childrenCommentsView .comment_orig_content {
                 width: 1000px;
diff --git a/public/react/src/modules/forums/MemoDetail.js b/public/react/src/modules/forums/MemoDetail.js
index 7578eea6e..db00bdf6f 100644
--- a/public/react/src/modules/forums/MemoDetail.js
+++ b/public/react/src/modules/forums/MemoDetail.js
@@ -55,7 +55,7 @@ class MemoDetail extends Component {
       }
     }
     componentDidMount() {
-      window.$("html,body").animate({"scrollTop":0})
+      // window.$("html,body").animate({"scrollTop":0})
 
       const { match } = this.props
       
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 3e295344c..8ae97450d 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -200,13 +200,13 @@ class ShixunsHome extends Component {
                                                                     item.sub_repertoires.map((i,k)=>{
                                                                        return(
                                                                                <div className="clearfix mt20 mb5 pb10 navlistpanel-line" key={k}>
-                                                                                   <p className="little-title clearfix welcome_shixun_index little-titles"
+                                                                                   <div className="little-title clearfix welcome_shixun_index little-titles"
                                                                                       data-id="1" data-rep-id="1" data-type="sub"
                                                                                    >
                                                                                        <Link  to={"/shixuns?id="+i.id+"&type=sub&palce="+item.id}>
                                                                                            {i.name}
                                                                                        </Link>
-                                                                                   </p>
+                                                                                   </div>
                                                                                    {
                                                                                        i.tags.map((t,e)=>{
                                                                                            return(
diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js
index dab3a1f5e..cae540253 100644
--- a/public/react/src/modules/tpm/jupyter/index.js
+++ b/public/react/src/modules/tpm/jupyter/index.js
@@ -69,6 +69,7 @@ function JupyterTPI (props) {
     drawervisible,
     reset_with_tpi,
     jupytertime,
+    endjupytertime,
     active_with_tpi,
     spinning,
     updataspinning,
@@ -303,7 +304,7 @@ function JupyterTPI (props) {
             >
             <div className="sortinxdirection">
 							<Icon type="file-text" className="jupyter_icon fl lineheighttaj filestyles" />
-							<a className="jupyter_name ml10  maxnamewidth181 lineheighttaj colorlineheighttaj" title={item.title}>{item.title}</a>
+							<a className="jupyter_name ml10  maxnamewidth152 lineheighttaj colorlineheighttaj" title={item.title}>{item.title}</a>
 							<a className={"fr color-blue lineheighttaj"}
 								 onClick={() => {
 									 jsCopy("file_path"+i)
@@ -337,11 +338,24 @@ function JupyterTPI (props) {
       cancelText: '取消',
       onOk () {
         reset_with_tpi(myIdentifier, '重置成功');
-        // active_with_tpi(myIdentifier, '重置成功');
       }
     })
   }
-
+  const endonFinish= () =>{
+    Modal.confirm({
+      title: '命令行连接时长提醒',
+      content: (
+        <p style={{ lineHeight: '24px' }}>
+         命令行即将中断，需要延长使用时间吗？
+        </p>
+      ),
+      okText: '立即延长',
+      cancelText: '不需要',
+      onOk () {
+        active_with_tpi(myIdentifier, '延长成功');
+      }
+    })
+  }
   return (
     <Spin tip="加载中..." spinning={spinning}>
     <div className="jupyter_area">
@@ -351,6 +365,9 @@ function JupyterTPI (props) {
           <span className="title_desc" style={{ marginTop: '10px' }}>{jupyterInfo.name}</span>
           <span className="title_time jupytertitle_time">
             <Countdown value={jupytertime} format="HH:mm:ss" onFinish={onFinish}/>
+        	<span className={"Countdowntypes"}>
+            {endjupytertime===false?"":<Countdown value={endjupytertime} format="HH:mm:ss" onFinish={endonFinish}/>}
+					</span>
           </span>
         </p>
         <p className="jupyter_btn">
@@ -457,7 +474,7 @@ const mapStateToProps = (state) => {
     jupyter_pagination,
     jupyter_identifier
   } = state.jupyterReducer;
-  const { loading ,drawervisible,jupytertime,spinning} = state.commonReducer;
+  const { loading ,drawervisible,jupytertime,spinning,endjupytertime} = state.commonReducer;
   return {
     loading,
     jupyter_info,
@@ -470,6 +487,7 @@ const mapStateToProps = (state) => {
     jupyter_identifier,
     drawervisible,
     jupytertime,
+    endjupytertime,
     spinning
   };
 }
diff --git a/public/react/src/modules/tpm/jupyter/index.scss b/public/react/src/modules/tpm/jupyter/index.scss
index 2428b93fd..5cc42b1be 100644
--- a/public/react/src/modules/tpm/jupyter/index.scss
+++ b/public/react/src/modules/tpm/jupyter/index.scss
@@ -26,7 +26,7 @@
 .filestyles{
   color: #28b887 !important;
   font-size: 25px !important;
-  margin-left:20px;
+  margin-left:48px;
 }
 .Resizer.horizontal:hover {
   border-top: 5px solid rgba(0, 0, 0, 0.5);
@@ -230,16 +230,23 @@ line-height: 50px !important;
   width: 186px;
 }
 
-.maxnamewidth181{
-  max-width:181px;
+.maxnamewidth152{
+  max-width:152px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   cursor: default;
-  width: 181px;
+  width: 152px;
 }
 
 .height45lineheight45{
   height: 45px;
   line-height: 45px !important;
+}
+
+.Countdowntypes{
+  width:1px;
+  height:1px;
+  overflow: hidden;
+  display: block;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 0e30f21ea..f1459db1d 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -30,7 +30,8 @@ class Challengesjupyter extends Component {
 			fileList:[],
 			shuaxin:false,
 			showtime:false,
-			jupytertime:Date.now() +3600 * 1000
+			jupytertime:Date.now() +3600 * 1000,
+			endtimes:false
 		}
 	}
 
@@ -119,10 +120,12 @@ class Challengesjupyter extends Component {
 						let remainingSeconds=response.data.remainingSeconds;
 						// let summain=3600 * 1000;
 						let sums= remainingSeconds * 1000;
+						let endsms=(remainingSeconds-300<0?0:remainingSeconds-300)*1000
 						// let sum=summain-sums;
 						setTimeout(()=>{
 							this.setState({
-								jupytertime:Date.now() +sums
+								jupytertime:Date.now() +sums,
+								endtimes:endsms===0?Date.now() +1000:Date.now() +endsms
 							})
 						},500);
 					}
@@ -436,8 +439,45 @@ class Challengesjupyter extends Component {
 			}
 		})
 	}
+
+	onendFinish=()=>{
+		let id=this.props.match.params.shixunId;
+		let that=this;
+		Modal.confirm({
+			title: '命令行连接时长提醒',
+			content: (
+				<p style={{ lineHeight: '24px' }}>
+					命令行即将中断，需要延长使用时间吗？
+				</p>
+			),
+			okText: '立即延长',
+			cancelText: '不需要',
+			onOk () {
+				that.onendhandleClickResetTpi(id)
+			}
+		})
+	}
+
+
+	onendhandleClickResetTpi=(id)=>{
+
+		const url = `/jupyters/active_with_tpm.json`;
+		axios.get(url,{params:{
+				identifier:id
+			}}).then((response) => {
+			if(response.data.status===0){
+				this.props.showNotification('延长成功!');
+				setTimeout(()=>{
+					this.setState({
+						jupytertime:Date.now() + 900 * 1000,
+						endtimes:Date.now() + 300 * 1000
+					})
+				},500);
+			}
+		});
+	}
 	render() {
-		let{ChallengesDataList,booljupyterurls,enlarge,fileList}=this.state;
+		let{ChallengesDataList,booljupyterurls,enlarge,fileList,endtimes}=this.state;
 		let id = this.props.match.params.shixunId;
 		//老师
 		const  is_teacher = this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
@@ -509,6 +549,7 @@ class Challengesjupyter extends Component {
 					<span className={"Countdowntypes"}>
 								{/*this.state.jupytertime*/}
 						    <Countdown value={this.state.jupytertime} format="HH:mm:ss" onFinish={this.onFinish}/>
+								{endtimes===false?"":<Countdown value={endtimes} format="HH:mm:ss" onFinish={this.onendFinish}/>}
 					</span>
 
 					<p className="clearfix mb20 edu-back-white">
diff --git a/public/react/src/redux/actions/jupyter.js b/public/react/src/redux/actions/jupyter.js
index c58e85b6e..9b3bc4748 100644
--- a/public/react/src/redux/actions/jupyter.js
+++ b/public/react/src/redux/actions/jupyter.js
@@ -74,7 +74,7 @@ export const getJupyterTpiUrl = (obj) => {
     const id = obj.identifier || jupyter_info.myshixun_identifier;
     fetchJupyterTpiUrl({identifier: id}).then(res => {
       if (res.data.status === 401) return; // 用户未登录
-      console.log('获取url', res);
+      //console.log('获取url', res);
       if (res.status === 200) {
         const { status, url = '', port } = res.data;
         dispatch(updataspinning(false))
@@ -159,7 +159,8 @@ export const active_with_tpi = (identifier, msg) => {
         const {status} = res.data
         if (status === 0) {
           message.success(msg);
-          dispatch(addjypertime(Date.now() + 900 * 1000))
+          // dispatch(addjypertime(Date.now() + 900 * 1000,false))
+          setTimeout(()=>{dispatch(addjypertime(Date.now() + 900 * 1000,  Date.now() + 300 * 1000))},800);
         }
       }
     })
@@ -224,11 +225,21 @@ export const changeshowDrawer = (type) => {
   }
 }
 //增加倒计时
-export const  addjypertime=(time)=>{
-  return {
-    type: types.CHANGE_JYPYTER_TIME,
-    payload: time
+export const addjypertime=(time,endtime)=>{
+  if(endtime===false){
+    return {
+      type: types.CHANGE_JYPYTER_TIME,
+      payload: time,
+      endtime:false
+    }
+  }else{
+    return {
+      type: types.CHANGE_JYPYTER_TIME,
+      payload: time,
+      endtime:endtime
+    }
   }
+
 }
 
 export const updataspinning=(type)=>{
@@ -262,8 +273,9 @@ export const timeinfo_with_tpi = (identifier, dispatch) => {
             let remainingSeconds=res.data.remainingSeconds;
             // let summain=3600 * 1000;
             let sums= remainingSeconds * 1000;
+            let endsms=(remainingSeconds-300<0?0:remainingSeconds-300)*1000
             // let sum=summain-sums;
-            setTimeout(()=>{ dispatch(addjypertime(Date.now() +sums))},500);
+            setTimeout(()=>{ dispatch(addjypertime(Date.now() +sums,endsms===0?Date.now() +1000:Date.now() +endsms))},500);
           }
         }
       }
diff --git a/public/react/src/redux/reducers/commonReducer.js b/public/react/src/redux/reducers/commonReducer.js
index d0246afce..12c64c28f 100644
--- a/public/react/src/redux/reducers/commonReducer.js
+++ b/public/react/src/redux/reducers/commonReducer.js
@@ -17,11 +17,12 @@ const initialState = {
   isMySource: false,
   drawervisible:false,
   jupytertime:0,
+  endjupytertime:false,
   spinning:false
 }
 
 const commonReducer = (state = initialState, action) => {
-
+  console.log(action)
   switch (action.type) {
     case types.SHOW_OR_HIDE_CONTROL:
       return {
@@ -61,7 +62,8 @@ const commonReducer = (state = initialState, action) => {
     case types.CHANGE_JYPYTER_TIME:
       return {
         ...state,
-        jupytertime: action.payload
+        jupytertime: action.payload,
+        endjupytertime:action.endtime,
       }
     case types.CHANGE_UPDETA_SPIN:
       return {
diff --git a/public/react/src/redux/reducers/jupyterReducer.js b/public/react/src/redux/reducers/jupyterReducer.js
index 4b117b453..9981bff5c 100644
--- a/public/react/src/redux/reducers/jupyterReducer.js
+++ b/public/react/src/redux/reducers/jupyterReducer.js
@@ -45,7 +45,7 @@ const JupyterReducer = (state = initState, action) => {
         jupyter_tpi_code: port
       }
     case types.SAVE_JUPYTER_IDENTIFIER:
-      console.log('保存的jupyter_identifier', action.payload);
+      //console.log('保存的jupyter_identifier', action.payload);
       return {
         ...state,
         jupyter_identifier: action.payload