Commit 2a6cf8de by cmosquito

修改了成绩单样式

parent 892036c5
...@@ -246,12 +246,12 @@ export default { ...@@ -246,12 +246,12 @@ export default {
// this.form.gpa = ""; // this.form.gpa = "";
}, },
checkNumGrade() { checkNumGrade() {
this.form.grade = parseInt(this.form.grade.replace(/[^\d]/g, "")); this.form.grade = this.form.grade.replace(/[^\d]/g, "");
// console.log(this.form.grade); // console.log(this.form.grade);
}, },
checkNumGpa() { checkNumGpa() {
this.form.gpa = parseFloat(this.form.gpa.replace(/[^0-9.]/g, "")); this.form.gpa = this.form.gpa.replace(/[^\d.]/g,'').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^\./g, '');
// console.log(this.form.gpa); // gpa只能是数字或小数,不能是英文
} }
} }
}; };
......
...@@ -64,24 +64,31 @@ ...@@ -64,24 +64,31 @@
:header-cell-style="{ :header-cell-style="{
'text-align': 'center', 'text-align': 'center',
color: '#333', color: '#333',
'border-bottom': '2px solid' 'font-size': '15px',
'border-bottom': '2px solid',
'font-family': 'Times New Roman',
}" }"
:cell-style="{ :cell-style="{
padding: '0px', padding: '0px',
'text-align': 'center', 'text-align': 'center',
'font-size': '15px',
'font-weight': '400',
color: '#333' color: '#333'
}" }"
> >
<el-table-column label="Course Code"> <el-table-column label="COURSE CODE">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.auditCourseCode }}</template {{ scope.row.auditCourseCode }}</template
> >
</el-table-column> </el-table-column>
<el-table-column label="Description"> <el-table-column label="COURSE NAME" width="240px">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.courseName scope.row.courseName
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="POINTS">
<template slot-scope="scope">{{ scope.row.gpa }}</template>
</el-table-column>
<el-table-column prop="units" label="CREDITS"> <el-table-column prop="units" label="CREDITS">
4.0 4.0
</el-table-column> </el-table-column>
...@@ -123,9 +130,7 @@ ...@@ -123,9 +130,7 @@
<span v-if="scope.row.gpa < 60">F </span> <span v-if="scope.row.gpa < 60">F </span>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="Points">
<template slot-scope="scope">{{ scope.row.gpa }}</template>
</el-table-column>
</el-table> </el-table>
<img <img
class="logo" class="logo"
...@@ -331,13 +336,14 @@ export default { ...@@ -331,13 +336,14 @@ export default {
} }
} }
.leftText { .leftText {
margin-right: 40px; margin-right: 30px;
margin-left: 15px;
flex: 2; flex: 2;
} }
.rightInfo { .rightInfo {
margin-left: 20px; margin-left: 20px;
flex: 1; flex: 1;
padding-right: 30px; padding-right: 22px;
p { p {
text-align: left; text-align: left;
// font-weight: bold; // font-weight: bold;
...@@ -437,6 +443,8 @@ export default { ...@@ -437,6 +443,8 @@ export default {
} }
.date { .date {
display: flex; display: flex;
font-family: Sans-serif;
font-size: 15px;
// position: relative; // position: relative;
// margin-top: 70px; // margin-top: 70px;
} }
......
...@@ -425,6 +425,7 @@ export default { ...@@ -425,6 +425,7 @@ export default {
type: "success" type: "success"
}); });
this.allocDialogVisible = false; this.allocDialogVisible = false;
this.getList();
}); });
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment