Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
09ee7373 by weimo934
Options

Merge remote-tracking branch 'origin/3ddc' into 3ddc

2 parents 89013ff3 39438852
Inline Side-by-side
Showing 9 changed files with 147 additions and 2 deletions
......@@ -44,6 +44,21 @@
border: 1px solid #cac8c8;
min-height: 750px;
}
.el-table__body-wrapper::-webkit-scrollbar {
width: 4px;
height: 6px;
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius: 6px;
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
background: rgba(0,0,0,0.2);
}
.el-table__body-wrapper::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
border-radius: 0;
background: rgba(0,0,0,0.1);
}
.el-table th {
background:#F2F2F2 !important;
}
......
......@@ -46,6 +46,21 @@
min-height: 750px;
}
.el-table__body-wrapper::-webkit-scrollbar {
width: 4px;
height: 6px;
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius: 6px;
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
background: rgba(0,0,0,0.2);
}
.el-table__body-wrapper::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
border-radius: 0;
background: rgba(0,0,0,0.1);
}
.el-table th {
background:#F2F2F2 !important;
}
......
......@@ -44,6 +44,21 @@
border: 1px solid #cac8c8;
min-height:750px
}
.el-table__body-wrapper::-webkit-scrollbar {
width: 4px;
height: 6px;
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius: 6px;
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
background: rgba(0,0,0,0.2);
}
.el-table__body-wrapper::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
border-radius: 0;
background: rgba(0,0,0,0.1);
}
.el-table th {
background:#F2F2F2 !important;
}
......
......@@ -44,6 +44,21 @@
margin-top: 20px;
min-height: 750px;
}
.el-table__body-wrapper::-webkit-scrollbar {
width: 4px;
height: 6px;
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius: 6px;
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
background: rgba(0,0,0,0.2);
}
.el-table__body-wrapper::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
border-radius: 0;
background: rgba(0,0,0,0.1);
}
.el-table th {
background:#F2F2F2 !important;
}
......
......@@ -21,6 +21,21 @@ var self = new Vue({
mounted(){
this.getData();
},
//私有过滤器
filters:{
dataFormat:function (originVal) {
const dt = new Date(originVal)
const y = dt.getFullYear()
const m = (dt.getMonth() + 1 + '').padStart(2, '0')
const d = (dt.getDate() + '').padStart(2, '0')
const hh = (dt.getHours() + '').padStart(2, '0')
const mm = (dt.getMinutes() + '').padStart(2, '0')
const ss = (dt.getSeconds() + '').padStart(2, '0')
// yyyy-mm-dd hh:mm:ss
return `${y}-${m}-${d} ${hh}:${mm}:${ss}`
}
},
methods:{
handleSizeChange(){
......
......@@ -31,6 +31,21 @@
border: 1px solid #cac8c8;
min-height:750px
}
.el-table__body-wrapper::-webkit-scrollbar {
width: 4px;
height: 6px;
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius: 6px;
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
background: rgba(0,0,0,0.2);
}
.el-table__body-wrapper::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
border-radius: 0;
background: rgba(0,0,0,0.1);
}
.el-table th {
background:#F2F2F2 !important;
}
......@@ -178,8 +193,13 @@
prop="CREATETIME"
label="创建时间"
align="center"
width="100"
width="200"
>
<template slot-scope="scope">
<span>{{
scope.row.CREATETIME | dataFormat
}}</span>
</template>
</el-table-column>
</el-table>
<!-- 分页区域-->
......
......@@ -107,6 +107,21 @@ var self = new Vue({
mounted(){
this.getData();
},
//私有过滤器
filters:{
dataFormat:function (originVal) {
const dt = new Date(originVal)
const y = dt.getFullYear()
const m = (dt.getMonth() + 1 + '').padStart(2, '0')
const d = (dt.getDate() + '').padStart(2, '0')
const hh = (dt.getHours() + '').padStart(2, '0')
const mm = (dt.getMinutes() + '').padStart(2, '0')
const ss = (dt.getSeconds() + '').padStart(2, '0')
// yyyy-mm-dd hh:mm:ss
return `${y}-${m}-${d} ${hh}:${mm}:${ss}`
}
},
methods:{
getData() {
axios.get(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', {
......
......@@ -34,6 +34,21 @@
border: 1px solid #cac8c8;
min-height: 750px;
}
.el-table__body-wrapper::-webkit-scrollbar {
width: 4px;
height: 6px;
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius: 6px;
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
background: rgba(0,0,0,0.2);
}
.el-table__body-wrapper::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
border-radius: 0;
background: rgba(0,0,0,0.1);
}
.el-table tbody tr:hover>td {
background-color:#EEF9FF!important
}
......@@ -178,8 +193,13 @@
prop="CREATETIME"
label="创建时间"
align="center"
width="100"
width="180"
>
<template slot-scope="scope">
<span>{{
scope.row.CREATETIME | dataFormat
}}</span>
</template>
</el-table-column>
</el-table>
<!-- 分页区域-->
......
......@@ -31,6 +31,21 @@
border: 1px solid #cac8c8;
min-height:750px
}
.el-table__body-wrapper::-webkit-scrollbar {
width: 4px;
height: 6px;
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius: 6px;
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
background: rgba(0,0,0,0.2);
}
.el-table__body-wrapper::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
border-radius: 0;
background: rgba(0,0,0,0.1);
}
.el-table th {
background:#F2F2F2 !important;
}
......