Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-05-14 6251de14f361b401d3603786196ce1fb9bde92ab

 src/views/supervisoryConsole/data.vue

@@ -352,12 +352,11 @@
      ];

      var sum = 0;

      m2R2Data.forEach((item) => {
        sum += item.value;
      });

      sum +=that.yj;
      // sum +=that.yj;

      var option = {
        title: [