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 @@ ...@@ -44,6 +44,21 @@
44 border: 1px solid #cac8c8; 44 border: 1px solid #cac8c8;
45 min-height: 750px; 45 min-height: 750px;
46 } 46 }
47 .el-table__body-wrapper::-webkit-scrollbar {
48 width: 4px;
49 height: 6px;
50 }
51 .el-table__body-wrapper::-webkit-scrollbar-thumb {
52 border-radius: 6px;
53 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
54 background: rgba(0,0,0,0.2);
55 }
56 .el-table__body-wrapper::-webkit-scrollbar-track {
57 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
58 border-radius: 0;
59 background: rgba(0,0,0,0.1);
60
61 }
47 .el-table th { 62 .el-table th {
48 background:#F2F2F2 !important; 63 background:#F2F2F2 !important;
49 } 64 }
......
...@@ -46,6 +46,21 @@ ...@@ -46,6 +46,21 @@
46 min-height: 750px; 46 min-height: 750px;
47 47
48 } 48 }
49 .el-table__body-wrapper::-webkit-scrollbar {
50 width: 4px;
51 height: 6px;
52 }
53 .el-table__body-wrapper::-webkit-scrollbar-thumb {
54 border-radius: 6px;
55 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
56 background: rgba(0,0,0,0.2);
57 }
58 .el-table__body-wrapper::-webkit-scrollbar-track {
59 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
60 border-radius: 0;
61 background: rgba(0,0,0,0.1);
62
63 }
49 .el-table th { 64 .el-table th {
50 background:#F2F2F2 !important; 65 background:#F2F2F2 !important;
51 } 66 }
......
...@@ -44,6 +44,21 @@ ...@@ -44,6 +44,21 @@
44 border: 1px solid #cac8c8; 44 border: 1px solid #cac8c8;
45 min-height:750px 45 min-height:750px
46 } 46 }
47 .el-table__body-wrapper::-webkit-scrollbar {
48 width: 4px;
49 height: 6px;
50 }
51 .el-table__body-wrapper::-webkit-scrollbar-thumb {
52 border-radius: 6px;
53 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
54 background: rgba(0,0,0,0.2);
55 }
56 .el-table__body-wrapper::-webkit-scrollbar-track {
57 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
58 border-radius: 0;
59 background: rgba(0,0,0,0.1);
60
61 }
47 .el-table th { 62 .el-table th {
48 background:#F2F2F2 !important; 63 background:#F2F2F2 !important;
49 } 64 }
......
...@@ -44,6 +44,21 @@ ...@@ -44,6 +44,21 @@
44 margin-top: 20px; 44 margin-top: 20px;
45 min-height: 750px; 45 min-height: 750px;
46 } 46 }
47 .el-table__body-wrapper::-webkit-scrollbar {
48 width: 4px;
49 height: 6px;
50 }
51 .el-table__body-wrapper::-webkit-scrollbar-thumb {
52 border-radius: 6px;
53 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
54 background: rgba(0,0,0,0.2);
55 }
56 .el-table__body-wrapper::-webkit-scrollbar-track {
57 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
58 border-radius: 0;
59 background: rgba(0,0,0,0.1);
60
61 }
47 .el-table th { 62 .el-table th {
48 background:#F2F2F2 !important; 63 background:#F2F2F2 !important;
49 } 64 }
......
...@@ -21,6 +21,21 @@ var self = new Vue({ ...@@ -21,6 +21,21 @@ var self = new Vue({
21 mounted(){ 21 mounted(){
22 this.getData(); 22 this.getData();
23 }, 23 },
24 //私有过滤器
25 filters:{
26 dataFormat:function (originVal) {
27 const dt = new Date(originVal)
28 const y = dt.getFullYear()
29 const m = (dt.getMonth() + 1 + '').padStart(2, '0')
30 const d = (dt.getDate() + '').padStart(2, '0')
31
32 const hh = (dt.getHours() + '').padStart(2, '0')
33 const mm = (dt.getMinutes() + '').padStart(2, '0')
34 const ss = (dt.getSeconds() + '').padStart(2, '0')
35 // yyyy-mm-dd hh:mm:ss
36 return `${y}-${m}-${d} ${hh}:${mm}:${ss}`
37 }
38 },
24 methods:{ 39 methods:{
25 handleSizeChange(){ 40 handleSizeChange(){
26 41
......
...@@ -31,6 +31,21 @@ ...@@ -31,6 +31,21 @@
31 border: 1px solid #cac8c8; 31 border: 1px solid #cac8c8;
32 min-height:750px 32 min-height:750px
33 } 33 }
34 .el-table__body-wrapper::-webkit-scrollbar {
35 width: 4px;
36 height: 6px;
37 }
38 .el-table__body-wrapper::-webkit-scrollbar-thumb {
39 border-radius: 6px;
40 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
41 background: rgba(0,0,0,0.2);
42 }
43 .el-table__body-wrapper::-webkit-scrollbar-track {
44 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
45 border-radius: 0;
46 background: rgba(0,0,0,0.1);
47
48 }
34 .el-table th { 49 .el-table th {
35 background:#F2F2F2 !important; 50 background:#F2F2F2 !important;
36 } 51 }
...@@ -178,8 +193,13 @@ ...@@ -178,8 +193,13 @@
178 prop="CREATETIME" 193 prop="CREATETIME"
179 label="创建时间" 194 label="创建时间"
180 align="center" 195 align="center"
181 width="100" 196 width="200"
182 > 197 >
198 <template slot-scope="scope">
199 <span>{{
200 scope.row.CREATETIME | dataFormat
201 }}</span>
202 </template>
183 </el-table-column> 203 </el-table-column>
184 </el-table> 204 </el-table>
185 <!-- 分页区域--> 205 <!-- 分页区域-->
......
...@@ -107,6 +107,21 @@ var self = new Vue({ ...@@ -107,6 +107,21 @@ var self = new Vue({
107 mounted(){ 107 mounted(){
108 this.getData(); 108 this.getData();
109 }, 109 },
110 //私有过滤器
111 filters:{
112 dataFormat:function (originVal) {
113 const dt = new Date(originVal)
114 const y = dt.getFullYear()
115 const m = (dt.getMonth() + 1 + '').padStart(2, '0')
116 const d = (dt.getDate() + '').padStart(2, '0')
117
118 const hh = (dt.getHours() + '').padStart(2, '0')
119 const mm = (dt.getMinutes() + '').padStart(2, '0')
120 const ss = (dt.getSeconds() + '').padStart(2, '0')
121 // yyyy-mm-dd hh:mm:ss
122 return `${y}-${m}-${d} ${hh}:${mm}:${ss}`
123 }
124 },
110 methods:{ 125 methods:{
111 getData() { 126 getData() {
112 axios.get(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', { 127 axios.get(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', {
......
...@@ -34,6 +34,21 @@ ...@@ -34,6 +34,21 @@
34 border: 1px solid #cac8c8; 34 border: 1px solid #cac8c8;
35 min-height: 750px; 35 min-height: 750px;
36 } 36 }
37 .el-table__body-wrapper::-webkit-scrollbar {
38 width: 4px;
39 height: 6px;
40 }
41 .el-table__body-wrapper::-webkit-scrollbar-thumb {
42 border-radius: 6px;
43 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
44 background: rgba(0,0,0,0.2);
45 }
46 .el-table__body-wrapper::-webkit-scrollbar-track {
47 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
48 border-radius: 0;
49 background: rgba(0,0,0,0.1);
50
51 }
37 .el-table tbody tr:hover>td { 52 .el-table tbody tr:hover>td {
38 background-color:#EEF9FF!important 53 background-color:#EEF9FF!important
39 } 54 }
...@@ -178,8 +193,13 @@ ...@@ -178,8 +193,13 @@
178 prop="CREATETIME" 193 prop="CREATETIME"
179 label="创建时间" 194 label="创建时间"
180 align="center" 195 align="center"
181 width="100" 196 width="180"
182 > 197 >
198 <template slot-scope="scope">
199 <span>{{
200 scope.row.CREATETIME | dataFormat
201 }}</span>
202 </template>
183 </el-table-column> 203 </el-table-column>
184 </el-table> 204 </el-table>
185 <!-- 分页区域--> 205 <!-- 分页区域-->
......
...@@ -31,6 +31,21 @@ ...@@ -31,6 +31,21 @@
31 border: 1px solid #cac8c8; 31 border: 1px solid #cac8c8;
32 min-height:750px 32 min-height:750px
33 } 33 }
34 .el-table__body-wrapper::-webkit-scrollbar {
35 width: 4px;
36 height: 6px;
37 }
38 .el-table__body-wrapper::-webkit-scrollbar-thumb {
39 border-radius: 6px;
40 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
41 background: rgba(0,0,0,0.2);
42 }
43 .el-table__body-wrapper::-webkit-scrollbar-track {
44 -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
45 border-radius: 0;
46 background: rgba(0,0,0,0.1);
47
48 }
34 .el-table th { 49 .el-table th {
35 background:#F2F2F2 !important; 50 background:#F2F2F2 !important;
36 } 51 }
......