Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

dev_tpm_ui
daiao 5 years ago
commit 7086d250b9

@ -41,12 +41,14 @@ $ml: 20px;
} }
.item-desc{ .item-desc{
flex: 1; flex: 1;
margin-left: $ml; // margin-left: $ml;
margin-left: 5px;
} }
.item-header{ .item-header{
font-size: $fz14; font-size: $fz14;
line-height: $lh14; line-height: $lh14;
color: #333; color: #333;
margin-left: 15px;
.item-time{ .item-time{
font-size: $fz12; font-size: $fz12;
line-height: $lh14; line-height: $lh14;

@ -250,11 +250,7 @@ export const timeinfo_with_tpi = (identifier, dispatch) => {
if(res.data.useSeconds===null){ if(res.data.useSeconds===null){
Modal.confirm({ Modal.confirm({
title: '重置环境', title: '重置环境',
content: ( content:" 是否确定重置环境?" ,
<p style={{ lineHeight: '24px' }}>
是否确定重置环境
</p>
),
okText: '确定', okText: '确定',
cancelText: '取消', cancelText: '取消',
onOk () { onOk () {

Loading…
Cancel
Save