|
@@ -753,7 +753,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<div>
|
|
|
- <ListSE @update="handleUpdate"/>
|
|
|
+ <ListSE :isList="true" @update="handleUpdate"/>
|
|
|
<!-- <el-form>
|
|
|
<el-form-item label="设计集:" >
|
|
|
<el-select v-model="listval" :suffix-icon="CaretBottom" placeholder="请选择">
|
|
@@ -774,7 +774,7 @@
|
|
|
<div class="dialog-footer">
|
|
|
|
|
|
<el-button @click="dialog.listdialog = false">取消</el-button>
|
|
|
- <el-button type="primary" @click="dialog.listdialog = false">
|
|
|
+ <el-button type="primary" @click="selectshujuto();dialog.listdialog = false">
|
|
|
确定
|
|
|
</el-button>
|
|
|
</div>
|
|
@@ -791,7 +791,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<div>
|
|
|
- <ListSE @update="handleUpdate"/>
|
|
|
+ <ListSE :isList="false" @update="handleUpdate"/>
|
|
|
</div>
|
|
|
<template #footer>
|
|
|
<div class="dialog-footer">
|
|
@@ -814,7 +814,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<div>
|
|
|
- <ListSE @update="handleUpdate"/>
|
|
|
+ <ListSE :isList="false" @update="handleUpdate"/>
|
|
|
</div>
|
|
|
<template #footer>
|
|
|
<div class="dialog-footer">
|
|
@@ -2706,6 +2706,9 @@ const dialogbolen = () => {
|
|
|
case "列表":
|
|
|
echatsfunc();
|
|
|
dialog.value.listdialog = true;
|
|
|
+ nextTick(() => {
|
|
|
+ initListSe();
|
|
|
+ });
|
|
|
break;
|
|
|
case "面积图":
|
|
|
echatsfunc();
|
|
@@ -3096,10 +3099,6 @@ const curveLine4 = () => {
|
|
|
}
|
|
|
console.log("表格数据:", datatotabledata.value);
|
|
|
console.log("表头数据:", datatotableheader.value);
|
|
|
- // emitter.emit('update:datatotableheader', datatotableheader.value);
|
|
|
- // emitter.emit('update:datatotabledata', datatotabledata.value);
|
|
|
- // scatterref.value.getshuju(datatotableheader.value,datatotabledata.value);
|
|
|
- // echartLineref.value.getshuju(datatotableheader.value,datatotabledata.value);
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
ElMessage.error(err.returnMsg)
|
|
@@ -3197,6 +3196,8 @@ const selectshujuto = () => {
|
|
|
scatterref.value.selectshuju(listcbval.value,listcbval2.value,datatotableheader.value,datatotabledata.value);
|
|
|
}else if(tabactive.value === '折线图'){
|
|
|
echartLineref.value.selectshuju(listcbval.value,listcbval2.value,datatotableheader.value,datatotabledata.value);
|
|
|
+ }else if(tabactive.value === '列表'){
|
|
|
+ tablelistref.value.selectshuju(listcbval2.value)
|
|
|
}
|
|
|
}
|
|
|
|