|
|
@@ -58,7 +58,7 @@
|
|
|
<svg-icon icon-class="report_data_u" style="width: 35px;"/>
|
|
|
<span>附属属性</span>
|
|
|
</div>
|
|
|
- <div class="cy-chart-div" @click="dataEvent()">
|
|
|
+ <div class="cy-chart-div" @click="dataEvent(3)">
|
|
|
<svg-icon icon-class="report_data" style="width: 35px;"/>
|
|
|
<span>数据项</span>
|
|
|
</div>
|
|
|
@@ -819,6 +819,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ newItemId: 0,
|
|
|
ctrlxstatus: false,
|
|
|
sheetAxis: [],
|
|
|
showReportData: true,
|
|
|
@@ -1700,7 +1701,8 @@ export default {
|
|
|
this.isSelectAllItem = false
|
|
|
this.itemDataListByTree = []
|
|
|
const loading = showLoading(this, '加载中，请稍候···')
|
|
|
- getTableItemGroupById(id, this.hasBelongDataFlag ? 0 : null).then(res => {
|
|
|
+ const itemType = this.newItemId == 1 ? 1 : (this.hasBelongDataFlag ? 0 : null);
|
|
|
+ getTableItemGroupById(id, itemType).then(res => {
|
|
|
loading.close()
|
|
|
this.itemDataListByGroupName = res.data.groupName
|
|
|
let flag = this.chooseGroupItemList.length == 0
|
|
|
@@ -2025,10 +2027,13 @@ export default {
|
|
|
showAlertMsgWin(this, null, '请选择一项单元格！')
|
|
|
return
|
|
|
}
|
|
|
+ this.newItemId = 0;
|
|
|
// 基础数据项
|
|
|
if (type == 1) {
|
|
|
this.getBaseDataItem()
|
|
|
return
|
|
|
+ } else if (type == 3) {
|
|
|
+ this.newItemId = 1;
|
|
|
}
|
|
|
// 初始化数据显示方式
|
|
|
this.itemShowParams = {
|
ws