Merge remote-tracking branch 'origin/master'

jiangping

2025-05-09 0c045df28935e21879b8c0b58b58311c011294c5

 screen/src/views/EnergyConsum.vue

@@ -17,7 +17,7 @@
            <div class="com_header">
              <div class="title">
                <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
                <div>本年累计循环烟箱</div>
                <div>本年安徽中烟累计循环烟箱</div>
              </div>
              <img src="@/assets/images/title@2x.png" class="bg" alt="" />
            </div>
@@ -357,7 +357,7 @@
      formatter: function (params) {
        // 遍历悬浮时的所有点，定制化显示内容
        let result = `<div>
          <div style="width: 120px">${params[0].name}月</div>  
          <div style="width: 120px">${params[0].name}月</div>
          <div style="display: flex;align-items: center;;margin-top: 2px;">
            <div style="display: flex;align-items: center;"><div style="width: 10px;height: 10px; border-radius: 50%;background-color: #f6d047;margin-right: 6px;"></div></div>
            <div><strong>${params[0].value} L</strong></div>
@@ -651,7 +651,7 @@
      formatter: function (params) {
        // 遍历悬浮时的所有点，定制化显示内容
        let result = `<div>
          <div style="width: 120px">${params[0].name}月</div>  
          <div style="width: 120px">${params[0].name}月</div>
          <div style="display: flex;align-items: center;;margin-top: 2px;">
            <div style="display: flex;align-items: center;"><div style="width: 10px;height: 10px; border-radius: 50%;background-color: #61a1c4;margin-right: 6px;"></div></div>
            <div><strong>${params[0].value} </strong></div>
@@ -1281,4 +1281,4 @@
    z-index: -1;
  }
}
</style>
</style>