Skip to content

E
ec-report-refactor
Commit 59e5be80 authored by root's avatar root
Browse files
Options

update table

parent a34ad6a7
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
common/http.api.js
View file @ 59e5be80
// 请求的本域名 // 请求的本域名
const baseUrl = 'https://api.charleskeith.cn/api' // 正式环境 const baseUrl = 'https://api.charleskeith.cn/api' // 正式环境
const reportUrl = 'http://192.168.138.55:8081/api' // 测试环境 // const reportUrl = 'http://192.168.138.55:8081/api' // 测试环境
// const reportUrl = 'http://47.101.191.49:8083/api' // 外网测试环境 const reportUrl = 'http://47.101.191.49:8083/api' // 外网测试环境
const install = (Vue, vm) => { const install = (Vue, vm) => {
let getHttp = (url, params, config) => vm.$http.get(url, { params }, config) let getHttp = (url, params, config) => vm.$http.get(url, { params }, config)
let postHttp = (url, params, config) => vm.$http.post(url, params, config) let postHttp = (url, params, config) => vm.$http.post(url, params, config)
......
components/Table/Table.vue
View file @ 59e5be80
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
const { frameStyle, frameWidth, frameColor, bordered } = this.elementInfo.table const { frameStyle, frameWidth, frameColor, bordered } = this.elementInfo.table
const { backgroundColor } = this.elementInfo.table.tableCell const { backgroundColor } = this.elementInfo.table.tableCell
return { return {
'width': `${240 * this.elementInfo.table.column.length}rpx`, 'width': `${120 * this.elementInfo.table.column.length}rpx`,
'border-left': bordered ? `${frameStyle || 'solid'} ${frameWidth || 1}px ${frameColor || '#e4e7ed'}`: 'none', 'border-left': bordered ? `${frameStyle || 'solid'} ${frameWidth || 1}px ${frameColor || '#e4e7ed'}`: 'none',
'border-top': bordered ? `${frameStyle || 'solid'} ${frameWidth || 1}px ${frameColor || '#e4e7ed'}`: 'none', 'border-top': bordered ? `${frameStyle || 'solid'} ${frameWidth || 1}px ${frameColor || '#e4e7ed'}`: 'none',
'background-color': backgroundColor 'background-color': backgroundColor
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
'font-size': `${this.$u.common.pxToRpx(titleFontSize)}rpx`, 'font-size': `${this.$u.common.pxToRpx(titleFontSize)}rpx`,
'text-align': titlePostion || 'center', 'text-align': titlePostion || 'center',
'border-bottom': bordered ? `${frameStyle || 'solid'} ${frameWidth || 1}px ${frameColor || '#e4e7ed'}`: 'none', 'border-bottom': bordered ? `${frameStyle || 'solid'} ${frameWidth || 1}px ${frameColor || '#e4e7ed'}`: 'none',
'border-right': bordered ? `${frameStyle || 'solid'} ${frameWidth || 1}px ${frameColor || '#e4e7ed'}`: 'none' 'border-right': 'none'
} }
}, },
tdStyle() { tdStyle() {
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
'lineHeight': `${cellRowHeight || 30}px`, 'lineHeight': `${cellRowHeight || 30}px`,
'color': titleColor, 'color': titleColor,
'border-bottom': bordered ? `${frameStyle || 'solid'} ${frameWidth || 1}px ${frameColor || '#e4e7ed'}`: 'none', 'border-bottom': bordered ? `${frameStyle || 'solid'} ${frameWidth || 1}px ${frameColor || '#e4e7ed'}`: 'none',
'border-right': bordered ? `${frameStyle || 'solid'} ${frameWidth || 1}px ${frameColor || '#e4e7ed'}`: 'none' 'border-right': 'none'
} }
} }
}, },
...@@ -184,17 +184,17 @@ ...@@ -184,17 +184,17 @@
flex-direction: row; flex-direction: row;
} }
.th { .th {
flex: 0 0 240rpx; flex: 0 0 120rpx;
font-size: 28rpx; font-size: 28rpx;
color: $u-main-color; color: $u-main-color;
font-weight: bold; font-weight: bold;
padding: 10px; padding: 10px 0px;
background-color: rgb(245, 246, 248); background-color: rgb(245, 246, 248);
} }
.td{ .td{
flex: 0 0 240rpx; flex: 0 0 120rpx;
align-self: stretch; align-self: stretch;
padding: 10px; padding: 10px 0px ;
font-size: 28rpx; font-size: 28rpx;
color: $u-content-color; color: $u-content-color;
display: flex; display: flex;
......
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