设备类型去除图表,设备单独添加图表
This commit is contained in:
parent
4f57550fdc
commit
b2c1b4a283
23
equipment.js
23
equipment.js
@ -22,7 +22,27 @@ class Equipment {
|
||||
this.chartConfiguration = chart_option;
|
||||
this.dataType = data_type;
|
||||
}
|
||||
this.dataType = params.data_type||0;
|
||||
|
||||
if (params.chart_option) {
|
||||
this.chartConfiguration = {
|
||||
type: '折线图',
|
||||
xAxis: params.chart_option.xAxis,
|
||||
yAxis: params.chart_option.yAxis,
|
||||
};
|
||||
} else {
|
||||
this.chartConfiguration = {
|
||||
type: '折线图',
|
||||
xAxis: {
|
||||
key: null,
|
||||
unit: null,
|
||||
},
|
||||
yAxis: {
|
||||
key: null,
|
||||
unit: null,
|
||||
},
|
||||
};
|
||||
}
|
||||
this.creator = params.creator;
|
||||
this.updater = params.updater;
|
||||
this.createTime = params.create_time;
|
||||
@ -38,7 +58,8 @@ class Equipment {
|
||||
editTask.addParam('_model', params.equipmentModel);
|
||||
editTask.addParam('_laboratory_id', params.laboratoryId);
|
||||
editTask.addParam('_name', params.name);
|
||||
|
||||
editTask.addParam('_data_type', params.dataType);
|
||||
editTask.addParam('_chart_option', params.chartConfiguration);
|
||||
return new Promise((resolve, reject) => {
|
||||
editTask
|
||||
.execute()
|
||||
|
@ -10,27 +10,7 @@ class ArtworkEquipmentType {
|
||||
this.id = params.id;
|
||||
this.name = params.name;
|
||||
this.description = params.description;
|
||||
this.dataType = params.data_type;
|
||||
|
||||
if (params.chart_option) {
|
||||
this.chartConfiguration = {
|
||||
type: '折线图',
|
||||
xAxis: params.chart_option.xAxis,
|
||||
yAxis: params.chart_option.yAxis,
|
||||
};
|
||||
} else {
|
||||
this.chartConfiguration = {
|
||||
type: '折线图',
|
||||
xAxis: {
|
||||
key: null,
|
||||
unit: null,
|
||||
},
|
||||
yAxis: {
|
||||
key: null,
|
||||
unit: null,
|
||||
},
|
||||
};
|
||||
}
|
||||
this.equipmentCount = params.equipment_count || 0;
|
||||
this.style = params.style;
|
||||
this.tags = [];
|
||||
@ -51,8 +31,7 @@ class ArtworkEquipmentType {
|
||||
editTask.addParam('_description', description);
|
||||
editTask.addParam('_name', name);
|
||||
editTask.addParam('_style', style);
|
||||
editTask.addParam('_data_type', dataType);
|
||||
editTask.addParam('_chart_option', chartConfiguration);
|
||||
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
editTask
|
||||
@ -82,7 +61,8 @@ class ArtworkEquipmentType {
|
||||
editTask.addParam('_model', params.equipmentModel);
|
||||
editTask.addParam('_laboratory_id', params.laboratoryId);
|
||||
editTask.addParam('_name', params.name);
|
||||
|
||||
editTask.addParam('_data_type', params.dataType);
|
||||
editTask.addParam('_chart_option', params.chartConfiguration);
|
||||
return new Promise((resolve, reject) => {
|
||||
editTask
|
||||
.execute()
|
||||
|
Loading…
x
Reference in New Issue
Block a user