1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字...

zhuzhuanzhuan

2024-03-01 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e

 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