Skip to content

add status detail #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szdytom merged 7 commits into from
Nov 21, 2020
Merged

add status detail #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2b01e32
add status detail
ZTL-UwU Nov 21, 2020
687ab57
fix word
ZTL-UwU Nov 21, 2020
8586d38
fix lint err
ZTL-UwU Nov 21, 2020
7c270f3
remove console log
ZTL-UwU Nov 21, 2020
5347571
Update lint.yml
ZTL-UwU Nov 21, 2020
5ae6118
Update lint.yml
ZTL-UwU Nov 21, 2020
ace6e94
Merge branch 'master' into add-status-detail-ztl
ZTL-UwU Nov 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/components/problem/content.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>
<MarkdownContainer v-if="description" :content="description" :allowHTML="this.allowHTML"/>
</div>
<div id="pannel" v-if="!isWider">
<div id="panel" v-if="!isWider">
<div id="tools">
<el-card v-if="showSmallToolBar || !smallScreen">
<div><i class="el-icon-s-tools" /> Tool Bar</div>
Expand Down Expand Up @@ -61,8 +61,8 @@
<div><i class="el-icon-menu" /> Limitation </div>
<el-divider class="divider">Time</el-divider>
<div class="tool-content">{{time}} MS</div>
<el-divider class="divider">Memery</el-divider>
<div class="tool-content">{{memery}} MB</div>
<el-divider class="divider">Memory</el-divider>
<div class="tool-content">{{memory}} MB</div>
</el-card>
<el-card shadow="never" class="margin-top">
<div class="margin-bottom">
Expand Down Expand Up @@ -114,7 +114,7 @@ export default {
enable: true,
hidden: false,
time: '-',
memery: '-',
memory: '-',
timeAdd: 'Unknown',
tags: [],
rendertags: [],
Expand Down Expand Up @@ -146,7 +146,7 @@ export default {
this.title = data.title;
this.pid = data.pid;
this.allowHTML = data.allow_html;
this.memery = data.memory_limit / 1000;
this.memory = data.memory_limit / 1000;
this.time = data.time_limit;
this.hidden = !data.enabled;
this.timeAdd = timeFormat(data.date_added);
Expand All @@ -165,7 +165,7 @@ export default {
} else if(err.request.status === 403) {
this.$SegmentMessage.error(this, 'Permission denied');
} else {
this.$SegmentMessage.error(this, 'Unkown error');
this.$SegmentMessage.error(this, 'Unknown error');
}
});
},
Expand Down Expand Up @@ -209,20 +209,20 @@ export default {
}

@media only screen and (max-width: 700px) {
#pannel {
#panel {
position: fixed;
bottom: 90px;
right: 30px;
z-index: 1000;
transition: 0.5s;
}

#pannel:active {
#panel:active {
z-index: 1000;
opacity: 1;
}

#pannel:hover {
#panel:hover {
z-index: 1000;
opacity: 1;
}
Expand Down Expand Up @@ -253,7 +253,7 @@ export default {
border: 1px solid #ebeef5;
}

#pannel {
#panel {
background-color: #ffffff !important;
margin-left: 30px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/problem/create.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export default {
} else if(err.request.status === 403) {
this.$SegmentMessage.error(this, 'Permission denied');
} else {
this.$SegmentMessage.error(this, 'Unkown error');
this.$SegmentMessage.error(this, 'Unknown error');
}
});
}
Expand Down
20 changes: 10 additions & 10 deletions src/components/problem/edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
MS
</el-col>
</el-row>
<el-divider>Memery</el-divider>
<el-divider>Memory</el-divider>
<el-row :gutter="10">
<el-col :span="20">
<el-input v-model="memery" placeholder="Set memery limitation"></el-input>
<el-input v-model="memory" placeholder="Set memory limitation"></el-input>
</el-col>
<el-col :span="4" class="center-text">
MB
Expand Down Expand Up @@ -99,10 +99,10 @@
MS
</el-col>
</el-row>
<el-divider>Memery</el-divider>
<el-divider>Memory</el-divider>
<el-row :gutter="10">
<el-col :span="20">
<el-input v-model="memery" placeholder="Set memery limitation"></el-input>
<el-input v-model="memory" placeholder="Set memory limitation"></el-input>
</el-col>
<el-col :span="4" class="center-text">
MB
Expand Down Expand Up @@ -156,7 +156,7 @@ export default {
mdContent_sha256: null,
contentLoading: true,
time: 'Unknown',
memery: 'Unknown',
memory: 'Unknown',
disable: false,
html: false,
smallScreen: screen.width < 800,
Expand Down Expand Up @@ -187,7 +187,7 @@ export default {
.then(res => {
let data = res.data.res;
this.title = data.title;
this.memery = data.memory_limit / 1000;
this.memory = data.memory_limit / 1000;
this.time = data.time_limit;
this.disable = !data.enabled;
this.html = data.allow_html;
Expand All @@ -207,7 +207,7 @@ export default {
} else if (err.request.status === 403) {
this.$SegmentMessage.error(this, 'Permission denied');
} else {
this.$SegmentMessage.error(this, 'Unkown error');
this.$SegmentMessage.error(this, 'Unknown error');
}
});
},
Expand All @@ -217,7 +217,7 @@ export default {
submit() {
let request_data = {
title: this.title,
memory_limit: this.memery * 1000,
memory_limit: this.memory * 1000,
time_limit: this.time,
allow_html: this.html,
enabled: !this.disable
Expand All @@ -238,7 +238,7 @@ export default {
} else if (err.request.status === 403) {
this.$SegmentMessage.error(this, 'Permission denied');
} else {
this.$SegmentMessage.error(this, 'Unkown error');
this.$SegmentMessage.error(this, 'Unknown error');
}
});
},
Expand All @@ -254,7 +254,7 @@ export default {
} else if (err.request.status === 403) {
this.$SegmentMessage.error(this, 'Permission denied');
} else {
this.$SegmentMessage.error(this, 'Unkown error');
this.$SegmentMessage.error(this, 'Unknown error');
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/problem/editTag.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default {
} else if (err.request.status === 403) {
this.$SegmentMessage.error(this, 'Permission denied');
} else {
this.$SegmentMessage.error(this, 'Unkown error');
this.$SegmentMessage.error(this, 'Unknown error');
}
});
}
Expand Down
10 changes: 5 additions & 5 deletions src/components/problem/submit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<el-divider>Limitation</el-divider>
{{time}} MS
<el-divider direction="vertical"></el-divider>
{{memery}} MB
{{memory}} MB
</el-card>
</el-col>
<el-col :span="18">
Expand Down Expand Up @@ -87,7 +87,7 @@ export default {
title: 'Unknown',
pid: this.$route.params.id,
time: '-',
memery: '-',
memory: '-',
code: '',
lang_num: '-',
buttonLoading: false,
Expand All @@ -103,7 +103,7 @@ export default {
let data = res.data.res;
this.title = data.title;
this.pid = data.pid;
this.memery = data.memory_limit / 1000;
this.memory = data.memory_limit / 1000;
this.time = data.time_limit;
})
.catch(err => {
Expand All @@ -112,7 +112,7 @@ export default {
} else if(err.request.status === 403) {
this.$SegmentMessage.error(this, 'Permission denied');
} else {
this.$SegmentMessage.error(this, 'Unkown error');
this.$SegmentMessage.error(this, 'Unknown error');
}
});
},
Expand All @@ -137,7 +137,7 @@ export default {
} else if (err.request.status === 400) {
this.$SegmentMessage.error(this, 'Input your code');
} else {
this.$SegmentMessage.error(this, 'Unkown error');
this.$SegmentMessage.error(this, 'Unknown error');
}
this.buttonLoading = false;
});
Expand Down
Loading