Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
e01d7c1fc6
|
@ -1,7 +1,7 @@
|
|||
html {
|
||||
font-family: "Roboto", "Helvetica", "Arial", sans-serif;
|
||||
margin-top: -7px;
|
||||
font-size: 28px;
|
||||
font-size: 20px;
|
||||
}
|
||||
table {
|
||||
border: 1px solid;
|
||||
|
@ -10,22 +10,22 @@ table {
|
|||
}
|
||||
td {
|
||||
border: 1px solid;
|
||||
padding: 5px;
|
||||
padding: 2px;
|
||||
width: 100%;
|
||||
}
|
||||
span {
|
||||
font-size: 48px;
|
||||
font-size: 34px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.lbl {
|
||||
color: gray;
|
||||
font-weight: lighter;
|
||||
font-size: 18px;
|
||||
font-size: 12px;
|
||||
display: block;
|
||||
}
|
||||
.cell {
|
||||
width: 157px;
|
||||
height: 50px;
|
||||
height: 35px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
|
|
@ -10,7 +10,7 @@ module.exports = {
|
|||
async serverPrefetch() {
|
||||
const buy = await models.Buy.findById(this.id, null);
|
||||
this.buys = await this.rawSqlFromDef('buy', [buy.entryFk, buy.entryFk, buy.entryFk, this.id, this.id]);
|
||||
const date = new Date();
|
||||
const date = Date.vnNew();
|
||||
this.weekNum = moment(date).isoWeek();
|
||||
this.dayNum = moment(date).day();
|
||||
},
|
||||
|
@ -24,7 +24,8 @@ module.exports = {
|
|||
format: 'code128',
|
||||
displayValue: false,
|
||||
width: 3.8,
|
||||
height: 115,
|
||||
height: 60,
|
||||
margin: 3,
|
||||
});
|
||||
return new XMLSerializer().serializeToString(svgNode);
|
||||
},
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"width": "10cm",
|
||||
"height": "10cm",
|
||||
"height": "6.5cm",
|
||||
"margin": {
|
||||
"top": "0.17cm",
|
||||
"right": "0.2cm",
|
||||
|
|
Loading…
Reference in New Issue