From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分，与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw
---
src/views/mdc/base/modules/deviceLog/WorkChartModel.vue | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue b/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue
index aefcf42..864753c 100644
--- a/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue
+++ b/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue
@@ -160,20 +160,19 @@
temp.push({ label: item.chineseName, value: item.id, englishName: item.englishName })
}
that.plainOptions = temp
-
if (temp.length > 0) {
that.option = [temp[0].value]
- let param = {
- driveType: that.node.driveType,
- equipmentId: that.node.equipmentId,
- date: that.queryParams.paramDateStr,
- start: that.queryParams.startStr,
- end: that.queryParams.endStr,
- interval: that.queryParams.period,
- codeTypeId: that.option.join(',')
- }
- that.initChart(param)
}
+ let param = {
+ driveType: that.node.driveType,
+ equipmentId: that.node.equipmentId,
+ date: that.queryParams.paramDateStr,
+ start: that.queryParams.startStr,
+ end: that.queryParams.endStr,
+ interval: that.queryParams.period,
+ codeTypeId: that.option.join(',')
+ }
+ that.initChart(param)
}
})
},
@@ -230,7 +229,7 @@
this.queryParams = {
equipmentId: node.equipmentId,
equipmentName: node.equipmentName,
- period: 1000,
+ period: 100,
paramDate: paramDate,
paramDateStr: paramDate.format('yyyy-MM-DD'),
start: start,
@@ -312,10 +311,10 @@
position: 'left',
boundaryGap: [0, '15%'],
axisLine: {
- show: true
- // lineStyle:{
- // color:'#000000'
- // }
+ show: true,
+ lineStyle:{
+ color:'#5470C6'
+ }
}
},
{
@@ -325,10 +324,10 @@
position: 'left',
boundaryGap: [0, '15%'],
axisLine: {
- show: true
- // lineStyle:{
- // color:'#000000'
- // }
+ show: true,
+ lineStyle:{
+ color:'#91CC75'
+ }
}
},
{
@@ -338,10 +337,10 @@
position: 'left',
boundaryGap: [0, '15%'],
axisLine: {
- show: true
- // lineStyle:{
- // color:'#000000'
- // }
+ show: true,
+ lineStyle:{
+ color:'#FAC858'
+ }
}
}
],
@@ -377,6 +376,7 @@
temp.push(item)
}
}
+ console.log('temp',temp)
getAction(this.url.workChart, param).then((res) => {
if (JSON.stringify(res.result) == '[]' || res.result == null) {
// this.$message.warning('鏃犳暟鎹紒')
@@ -423,12 +423,13 @@
symbol: 'circle',
symbolSize: 10,
yAxisIndex: i,
-
data: itemLine
}
result.push(line)
}
+ console.log('result===========',result)
+ console.log('legend=============',lengenddata)
// option.yAxis = Yarr;
option.series = result
option.legend = lengenddata
--
Gitblit v1.9.3