From f8f6aef5508148a784c05e71366796bb0b61164d Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期二, 18 十一月 2025 14:04:31 +0800
Subject: [PATCH] Merge branch 'new' of http://122.9.151.159:9090/r/smart-web into new
---
src/views/mdc/processParam/index.vue | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index 8d7781c..b42be0b 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
- * @LastEditors: gaoshp
- * @LastEditTime: 2024-11-13 20:20:54
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-12-18 15:20:37
* @FilePath: /cps-web/src/views/mdc/processParam/index.vue
瀹炴椂鐪嬫澘
-->
@@ -165,7 +165,7 @@
workstationName: ''
}).then(res => {
if (res.success) {
- window.open(res.data.link)
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
} else {
this.$message.error(res.msg)
}
@@ -278,6 +278,7 @@
})
},
setLineOptions(data, myname) {
+ console.log('data0',data)
if (!data) return
// console.log(data, myname)
let xAxis = data?.map(item => {
@@ -325,10 +326,12 @@
showPie: false
})
}
-
},
setDeviceStatusOptions(data, myname) {
debugger
+ //console.log('data1',data)
+ //console.log('endtime1',this.timeRange.endTime)
+
let total = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime)))
let start = this.timeRange.startTime
let len = data?.data?.length
@@ -351,6 +354,10 @@
}
// }
// let color = !name ? 'transparent' : data.data[i - 1].color
+ //name = name+'s'
+ if(name == undefined){
+ name = "鏃犳暟鎹�"
+ }
return {
name,
type: 'bar',
@@ -437,18 +444,21 @@
}
let key = myname === 'DeviceStatus' ? 'name' : 'value'
data.forEach(v => {
- if (obj[v[key]]) {
- obj[v[key]] += moment(v.time).valueOf() - moment(start).valueOf()
- } else {
- obj[v[key]] = moment(v.time).valueOf() - moment(start).valueOf()
+ if(v[key] != undefined){
+
+
+ if (obj[v[key]]) {
+ obj[v[key]] += moment(v.time).valueOf() - moment(start).valueOf()
+ } else {
+ obj[v[key]] = moment(v.time).valueOf() - moment(start).valueOf()
+ }
+ start = v.time
}
- start = v.time
-
})
let result = Object.keys(obj).map(key => {
return {
value: obj[key] / 1000,
- name: key,
+ name: key,//杩愯/鎶ヨ/寰呮満
// itemStyle: {
// color: item.color, // 杩欎竴琛屽浐瀹氱殑棰滆壊鍊奸渶瑕佸垹闄ゆ垨娉ㄩ噴
// },
@@ -456,10 +466,13 @@
}).map(v => {
if (myname === 'DeviceStatus') {
if(v.name != 'undefined') {
+ //锛僁3D3D3 鐏拌壊
+ //let itemFound = this.legend.find(item => item.name === v.name)
return {
...v,
itemStyle: {
color: this.legend.find(item => item.name === v.name).color
+ //color: itemFound?itemFound.color:'锛僁3D3D3'
}
}
}
@@ -472,7 +485,12 @@
trigger: 'item',
formatter: function (params) {
let d = moment.duration(params.value, 'seconds')
- return `${params.name}: ${d.hours()}灏忔椂${d.minutes()}鍒�${d.seconds()}绉抈
+ let nameVal = params.name
+ if(params.name == undefined){
+ nameVal = '鏃犳暟鎹�'
+ }
+ //return `${params.name}: ${d.hours()}灏忔椂${d.minutes()}鍒�${d.seconds()}绉抈
+ return `${nameVal}: ${d.hours()}灏忔椂${d.minutes()}鍒�${d.seconds()}绉抈
}
},
legend: {
--
Gitblit v1.9.3