diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue index 80913b73..7790ba89 100644 --- a/components/AiDvRender.vue +++ b/components/AiDvRender.vue @@ -30,7 +30,12 @@ :limitArea="data.limitArea === '1'" :is3dAround="data.is3dAround === '1'"> --> - + + diff --git a/components/layout/AiDvTable/AiDvTable.vue b/components/layout/AiDvTable/AiDvTable.vue index af00fa93..9546946d 100644 --- a/components/layout/AiDvTable/AiDvTable.vue +++ b/components/layout/AiDvTable/AiDvTable.vue @@ -1,11 +1,23 @@ - {{ item }} + + {{ item.v }} + - {{ column }} + + {{ index + 1 }} + {{ column.v }} + @@ -19,13 +31,19 @@ data: { type: Array, default: () => [] + }, + + isShowIndex: { + type: String, + default: '0' } }, data () { return { header: [], - body: [] + body: [], + colorIndex: '' } }, @@ -52,12 +70,26 @@ } const headerKey = Object.keys(value[0])[0] - const bodyKey = Object.keys(value[0]).filter(v => v !== headerKey) - this.header = this.data.map(v => v[headerKey]) - this.body = bodyKey.map(v => { - return value.map(e => e[v]) + const bodyKey = Object.keys(value[0]).filter(v => { + return v !== headerKey && v !== 'color' && v !== 'width' + }) + + this.header = value.map(v => { + return { + v: v[headerKey], + width: v.width || '' + } + }) + console.log(this.header) + this.body = bodyKey.map(v => { + return value.map(e => { + return { + v: e[v], + color: e.color, + width: e.width || '' + } + }) }) - console.log(this.body) } } } @@ -65,6 +97,8 @@