diff --git a/public/react/build.zip b/public/react/build.zip deleted file mode 100644 index bcc9974cf..000000000 Binary files a/public/react/build.zip and /dev/null differ diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js index 044fc7968..25f82ef94 100644 --- a/public/react/src/modules/tpm/jupyter/index.js +++ b/public/react/src/modules/tpm/jupyter/index.js @@ -310,7 +310,7 @@ function JupyterTPI (props) { }); const oUl = ( - <ul className="jupyter_data_list"> + <ul className="jupyter_data_list" > { oList } </ul> ); @@ -412,7 +412,7 @@ function JupyterTPI (props) { <h2 className="borbottom17212F jupyterfilepaths"> <span className={"ml50"}>文件路径</span> <div className="sortinxdirection"> - <a className="jupyter_name ml50 maxnamewidth200 lineheighttaj colorlineheighttaj">{jupyter_folder_name}</a> + <a className="jupyter_name ml50 maxnamewidth186JUPYTER lineheighttaj colorlineheighttaj">{jupyter_folder_name}</a> <a className={"fr color-blue lineheighttaj font-14"} onClick={() => { jsCopy("jupyter_folder_name") diff --git a/public/react/src/modules/tpm/jupyter/index.scss b/public/react/src/modules/tpm/jupyter/index.scss index c056f019b..e6a95406a 100644 --- a/public/react/src/modules/tpm/jupyter/index.scss +++ b/public/react/src/modules/tpm/jupyter/index.scss @@ -215,13 +215,13 @@ line-height: 50px !important; background: #070F1A !important; } -.maxnamewidth200{ - max-width: 200px; +.maxnamewidth186JUPYTER{ + max-width: 186px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; cursor: default; - width: 200px; + width: 186px; } .maxnamewidth181{ diff --git a/public/react/src/redux/actions/jupyter.js b/public/react/src/redux/actions/jupyter.js index 5ecdbf699..b2d66d6e6 100644 --- a/public/react/src/redux/actions/jupyter.js +++ b/public/react/src/redux/actions/jupyter.js @@ -7,7 +7,7 @@ * @LastEditTime: 2019-12-13 23:03:27 */ import types from "./actionTypes"; -import { message } from 'antd'; +import { message ,Modal} from 'antd'; import { fetchJupyterTpiDataSet, fetchJupyterTpiUrl, @@ -78,8 +78,8 @@ export const getJupyterTpiUrl = (obj) => { if (res.status === 200) { const { status, url = '', port } = res.data; dispatch(updataspinning(false)) - setTimeout(()=>{ dispatch(addjypertime(Date.now() +3600 * 1000))},500) - // timeinfo_with_tpi(id,dispatch) + //setTimeout(()=>{ dispatch(addjypertime(Date.now() +3600 * 1000))},500) + timeinfo_with_tpi(id,dispatch) dispatch({ type: types.GET_JUPYTER_TPI_URL, payload: { @@ -240,27 +240,26 @@ export const updataspinning=(type)=>{ // 获取重置实训后的时间 export const timeinfo_with_tpi = (identifier, dispatch) => { - debugger const params = { identifier: identifier }; - debugger timeinfo_with_tpis(params).then(res => { - debugger - console.log('同步时间成功: ', res); if (res.data.status === 401) return; if (res.status === 200) { - const {status} = res.data - console.log(status) - // dispatch(addjypertime(Date.now() +3600 * 1000)) - // setTimeout(()=>{ dispatch(addjypertime(Date.now() +3600 * 1000))},500) - // if (status === 0) { - // message.success(msg); - // dispatch(updataspinning(false)) - // setTimeout(() => { - // window.location.reload(); - // }, 300); - // } + if(res.data.status===0){ + if(res.data.useSeconds===null){ + Modal.warning({ + title: '提示', + content: '因为这个实训pod不在了,无法获取倒计时,请联系系统管理人员', + }); + }else{ + let useSeconds=res.data.useSeconds; + let summain=3600 * 1000; + let sums= useSeconds * 1000; + let sum=summain-sums; + setTimeout(()=>{ dispatch(addjypertime(Date.now() +sum))},500); + } + } } }) } \ No newline at end of file