bug修改
This commit is contained in:
parent
f246d6e7f8
commit
81c9816066
|
|
@ -14,7 +14,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div>
|
||||||
{{ typeValue.time }}
|
{{ typeValue.time ? typeValue.time : '' }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div>
|
||||||
{{ dataArr[0].time }}
|
{{ dataArr[0].time ? dataArr[0].time : '' }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -70,10 +70,10 @@
|
||||||
<span
|
<span
|
||||||
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
|
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
|
||||||
></span>
|
></span>
|
||||||
<span style="font-size:18px;">{{ this.chartName + '-' + this.componentName + '-' + '表格'+'-'+triggerType }}</span>
|
<span style="font-size:18px;">{{ this.chartName + '-' + this.componentName + '-' + '表格' + '-' + triggerType }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="tableTime">
|
<div class="tableTime">
|
||||||
{{ dataArr[0].time }}
|
{{ dataArr[0].time ? dataArr[0].time : '' }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="pageType == '断面'" style="margin-bottom: 20px; border: 1px solid #e4e7ed">
|
<div v-if="pageType == '断面'" style="margin-bottom: 20px; border: 1px solid #e4e7ed">
|
||||||
|
|
@ -180,7 +180,7 @@ export default {
|
||||||
// 监听触发数据
|
// 监听触发数据
|
||||||
dataArr: {
|
dataArr: {
|
||||||
handler(newVal) {
|
handler(newVal) {
|
||||||
console.log("dataArr",newVal)
|
console.log('dataArr', newVal);
|
||||||
},
|
},
|
||||||
|
|
||||||
immediate: true
|
immediate: true
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
</p>
|
</p>
|
||||||
<span class="downPull1" data-num="1" @click="sectionHandle(i)"></span>
|
<span class="downPull1" data-num="1" @click="sectionHandle(i)"></span>
|
||||||
</div>
|
</div>
|
||||||
<el-collapse v-model="s.children[0].analogAreaComponentId">
|
<el-collapse v-model="acticveName">
|
||||||
<div v-for="o in s.children" :key="o.analogAreaComponentId">
|
<div v-for="o in s.children" :key="o.analogAreaComponentId">
|
||||||
<el-collapse-item :title=o.componentName :name="o.analogAreaComponentId" >
|
<el-collapse-item :title=o.componentName :name="o.analogAreaComponentId" >
|
||||||
<OD
|
<OD
|
||||||
|
|
@ -130,7 +130,7 @@ export default {
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
acticveName: '1',
|
acticveName: [],
|
||||||
title1: '01断面',
|
title1: '01断面',
|
||||||
title2: '01区域',
|
title2: '01区域',
|
||||||
dialogVisible: false,
|
dialogVisible: false,
|
||||||
|
|
@ -391,10 +391,12 @@ export default {
|
||||||
});
|
});
|
||||||
this.sectionData = this.sectionArr.map(item => {
|
this.sectionData = this.sectionArr.map(item => {
|
||||||
item = { title: item, children: [] };
|
item = { title: item, children: [] };
|
||||||
|
this.acticveName=[]
|
||||||
this.componentList.forEach(val => {
|
this.componentList.forEach(val => {
|
||||||
if (item.title == val.combinationName) {
|
if (item.title == val.combinationName) {
|
||||||
item.children.push(val);
|
item.children.push(val);
|
||||||
}
|
}
|
||||||
|
this.acticveName.push(val.analogAreaComponentId)
|
||||||
});
|
});
|
||||||
return item;
|
return item;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue