|
@@ -51,11 +51,11 @@
|
|
|
<a-button id="btn" type="link" @click="clearAllList">清空全部</a-button>
|
|
|
<ul class="selectlist">
|
|
|
<li v-for="(item,index) in listNum" :key="index">
|
|
|
- <span v-if=" index <5">
|
|
|
+ <span v-if=" index <6">
|
|
|
<a-icon type="lock" />
|
|
|
<span class="listText">{{item.title}}</span>
|
|
|
</span>
|
|
|
- <span v-else-if=" index >=5">
|
|
|
+ <span v-else-if=" index >=6">
|
|
|
<a-icon type="menu" style="color:#ccc" />
|
|
|
<span class="listText">{{item.title}}</span>
|
|
|
<a-icon
|
|
@@ -200,6 +200,13 @@ const columnsFixd = [
|
|
|
width: 100,
|
|
|
fixed: 'left'
|
|
|
},
|
|
|
+ {
|
|
|
+ title: '项目名称',
|
|
|
+ dataIndex: 'projectName',
|
|
|
+ align: 'center',
|
|
|
+ width: 100,
|
|
|
+ fixed: 'left'
|
|
|
+ },
|
|
|
// {
|
|
|
// title: '视频链接',
|
|
|
// dataIndex: 'videoUrl',
|
|
@@ -311,24 +318,24 @@ let detailConsum = [
|
|
|
return obj
|
|
|
}
|
|
|
},
|
|
|
- {
|
|
|
- title: '视频链接',
|
|
|
- dataIndex: 'url',
|
|
|
- align: 'center',
|
|
|
- width:250,
|
|
|
- customRender: (value, row, index) => {
|
|
|
- const obj = {
|
|
|
- children: value,
|
|
|
- attrs: {}
|
|
|
- }
|
|
|
- if (index === 0) {
|
|
|
- obj.attrs.rowSpan = length
|
|
|
- } else {
|
|
|
- obj.attrs.rowSpan = 0
|
|
|
- }
|
|
|
- return obj
|
|
|
- }
|
|
|
- },
|
|
|
+// {
|
|
|
+// title: '视频链接',
|
|
|
+// dataIndex: 'url',
|
|
|
+// align: 'center',
|
|
|
+// width:250,
|
|
|
+// customRender: (value, row, index) => {
|
|
|
+// const obj = {
|
|
|
+// children: value,
|
|
|
+// attrs: {}
|
|
|
+// }
|
|
|
+// if (index === 0) {
|
|
|
+// obj.attrs.rowSpan = length
|
|
|
+// } else {
|
|
|
+// obj.attrs.rowSpan = 0
|
|
|
+// }
|
|
|
+// return obj
|
|
|
+// }
|
|
|
+// },
|
|
|
{
|
|
|
title: '时间',
|
|
|
dataIndex: 'statDatetime',
|
|
@@ -601,7 +608,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
- if (this.listNum.length == 5) {
|
|
|
+ if (this.listNum.length == 6) {
|
|
|
this.columns.map((item, index) => {
|
|
|
item.width = 300
|
|
|
})
|
|
@@ -609,7 +616,7 @@ export default {
|
|
|
this.columns.map((item, index) => {
|
|
|
if (index == 1||index==3) {
|
|
|
item.width = 150
|
|
|
- } else if (index >= 2 && index < 5 || index == 0) {
|
|
|
+ } else if (index >= 2 && index < 6 || index == 0) {
|
|
|
item.width = 100
|
|
|
}
|
|
|
})
|
|
@@ -715,6 +722,7 @@ export default {
|
|
|
// console.log(res)
|
|
|
if(res.success){
|
|
|
// console.log(JSON.parse(res.result))
|
|
|
+ if(res.result){
|
|
|
let columns=JSON.parse(res.result)
|
|
|
if(columns.length){
|
|
|
if(columns.length>=columnsFixd.length){
|
|
@@ -730,6 +738,7 @@ export default {
|
|
|
|
|
|
// console.log(this.columns)
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|