{i.name} -
+
+ jupyter将于
@@ -457,7 +475,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 +488,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..b2c900652 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,32 @@ 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; +} + +.Countdownfonttpi{ + width: 60px; + display: inline-block; +} + +.Countdownfonttpi .ant-statistic-content-value{ + font-size: 14px; } \ 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..c1a5f8dea 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); } @@ -420,6 +423,7 @@ class Challengesjupyter extends Component { } onFinish=()=>{ + Modal.destroyAll(); let id=this.props.match.params.shixunId; let that=this; Modal.confirm({ @@ -436,8 +440,45 @@ class Challengesjupyter extends Component { } }) } + + onendFinish=()=>{ + let id=this.props.match.params.shixunId; + let that=this; + Modal.confirm({ + title:"服务中断提醒", + content: ( +
+ jupyter将于
diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css index d2bba2f84..b59bd86fd 100644 --- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css +++ b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css @@ -239,3 +239,12 @@ background-color: #29BD8B !important; border-color: transparent ; } + +.Countdownfonttpm{ + width: 60px; + display: inline-block; +} + +.Countdownfonttpm .ant-statistic-content-value{ + font-size: 14px; +} \ No newline at end of file diff --git a/public/react/src/redux/actions/jupyter.js b/public/react/src/redux/actions/jupyter.js index c58e85b6e..1a3654c3f 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