diff --git a/src/views/ems/dzjk/sbjk/dtdc/ChartDetail.vue b/src/views/ems/dzjk/sbjk/dtdc/ChartDetail.vue
index f461b9e..2afb5e1 100644
--- a/src/views/ems/dzjk/sbjk/dtdc/ChartDetail.vue
+++ b/src/views/ems/dzjk/sbjk/dtdc/ChartDetail.vue
@@ -46,6 +46,7 @@ export default {
siteId:'',
deviceId:'',
clusterDeviceId:'',
+ dataType:'',//展示的数据类型 空值展示所有数据
pickerOptions:{
disabledDate(time) {
return time.getTime() > Date.now();
@@ -82,10 +83,11 @@ export default {
this.dateRange=[]
this.getData()
},
- initChart({siteId, clusterDeviceId, deviceId}) {
+ initChart({siteId, clusterDeviceId, deviceId},dataType) {
this.siteId=siteId
this.clusterDeviceId=clusterDeviceId
this.deviceId=deviceId
+ this.dataType=dataType
this.dateRange=[]
this.dialogTableVisible = true
this.$nextTick(()=>{
@@ -94,10 +96,47 @@ export default {
})
},
setOption(data) {
- const source = [['日期','电压','温度','SOC','SOH']]
- data.forEach(item => {
- source.push([item.dataTimestamp,item.voltage,item.temperature,item.soc,item.soh])
- })
+ const obj = {
+ voltage:'电压',
+ temperature:'温度',
+ soc:'SOC',
+ soh:'SOH',
+ }
+ let source,series,{dataType} = this
+ if(dataType){
+ source = [['日期',obj[dataType]]]
+ data.forEach(item => {
+ source.push([item.dataTimestamp,item[dataType]])
+ })
+ series=[{
+ name:obj[dataType],
+ type: 'line',
+ }]
+ }else{
+ source = [['日期','电压','温度','SOC','SOH']]
+ data.forEach(item => {
+ source.push([item.dataTimestamp,item.voltage,item.temperature,item.soc,item.soh])
+ })
+ series=[
+ {
+ name:'电压',
+ type: 'line',
+
+ },{
+ name:'温度',
+ type: 'line',
+ },
+ {
+ name:'SOC',
+ type: 'line',
+
+ },{
+ name:'SOH',
+ type: 'line',
+ }]
+ }
+
+
this.chart && this.chart.setOption({
color:['#FFBD00','#3C81FF','#05AEA3','#F86F70'],
legend: {
@@ -121,23 +160,7 @@ export default {
dataset:{
source
},
- series: [
- {
- name:'电压',
- type: 'line',
-
- },{
- name:'温度',
- type: 'line',
- },
- {
- name:'SOC',
- type: 'line',
-
- },{
- name:'SOH',
- type: 'line',
- }]
+ series
})
}
},
diff --git a/src/views/ems/dzjk/sbjk/dtdc/index.vue b/src/views/ems/dzjk/sbjk/dtdc/index.vue
index 126940b..6e0ea7e 100644
--- a/src/views/ems/dzjk/sbjk/dtdc/index.vue
+++ b/src/views/ems/dzjk/sbjk/dtdc/index.vue
@@ -48,18 +48,50 @@
prop="voltage"
label="电压(V)"
>
+
+
+ {{scope.row.voltage}}
+
+
+
+
+ {{scope.row.temperature}}
+
+
+
+
+ {{scope.row.soc}}
+
+
+
+
+ {{scope.row.soh}}
+
+
@@ -115,9 +147,9 @@ export default {
},
methods:{
//查看表格行图表
- chartDetail(row){
+ chartDetail(row,dataType = ''){
const { clusterDeviceId, deviceId} = row,{siteId} = this
- this.$refs.chartDetail.initChart({siteId,clusterDeviceId,deviceId})
+ this.$refs.chartDetail.initChart({siteId,clusterDeviceId,deviceId},dataType)
},
// 分页
handleSizeChange(val) {