Merge branch 'new' of http://122.9.151.159:9090/r/smart-web into new

李喆(开发组)

2025-11-18 f8f6aef5508148a784c05e71366796bb0b61164d

 src/views/mdc/processParam/index.vue

@@ -278,6 +278,7 @@
            })
        },
        setLineOptions(data, myname) {
            console.log('data0',data)
            if (!data) return
            // console.log(data, myname)
            let xAxis = data?.map(item => {
@@ -328,6 +329,9 @@
        },
        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
@@ -350,6 +354,10 @@
                }
                // }
                // let color = !name ? 'transparent' : data.data[i - 1].color
                //name = name+'s'
                if(name == undefined){
                    name = "无数据"
                }
                return {
                    name,
                    type: 'bar',
@@ -436,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, // 这一行固定的颜色值需要删除或注释
                    // },
@@ -455,10 +466,13 @@
            }).map(v => {
                if (myname === 'DeviceStatus') {
                    if(v.name != 'undefined') {
                        //＃D3D3D3 灰色
                        //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:'＃D3D3D3'
                            }
                        }
                    }
@@ -471,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: {