修改bug

investmentPort/js/groupData.js

@@ -570,8 +570,8 @@ let right4 = [
 // 左边下面
 let right5 = [
   [
-    ['山西焦煤', '5', 43.8],
-    ['晋能控股', '5', 49.8],
+    ['山西焦煤', '5', 110],
+    ['晋能控股', '5', 88.8],
     ['华阳新材', '5', 46],
     ['潞安化工', '5', 53.8],
     ['华新燃气', '5', 59],
@@ -590,7 +590,7 @@ let right5 = [
     ['神农科技', '5', 45.6]
   ],
   [
-    ['山西焦煤', '0', 25.8],
+    ['山西焦煤', '-20', 77.8],
     ['晋能控股', '0', 25.8],
     ['华阳新材', '0', 38],
     ['潞安化工', '0', 37.8],
@@ -610,7 +610,7 @@ let right5 = [
     ['神农科技', '0', 35.6]
   ],
   [
-    ['山西焦煤', '-5', -15.8],
+    ['山西焦煤', '-35', 20.8],
     ['晋能控股', '-5', -15.8],
     ['华阳新材', '-5', -8],
     ['潞安化工', '-5', -17.8],
@@ -683,7 +683,7 @@ let right8 = [
 let common1 = [135.26, 186.82, 78.40, 46.02, 354.47, 400.49,0.6]
 let common2 = [0.1463]
 // 单柱状图弹窗
-let common3 = [3594.91, 400.49, 117.65, 148.96, 34.84, 17.79, 26.15, 26.18, 16.83, 0.00, 43.49, 0.00, 43.39, 76.53, 5.05, 8.59, 0.00, 0.28]
+let common3 = [29, 0.9, 117.65, 148.96, 34.84, 17.79, 26.15, 26.18, 16.83, 0.00, 43.49, 0.00, 43.39, 76.53, 5.05, 8.59, 0.00, 0.28]
 // 双柱状图弹窗
 let common4 = [359.91, 400.49, 117.65, 148.96, 34.84, 17.79, 26.15, 26.18, 16.83, 0.00, 43.49, 0.00, 43.39, 76.53, 5.05, 8.59, 0.00, 0.28]
 let common5 = [359.91, 400.49, 117.65, 148.96, 34.84, 17.79, 26.15, 26.18, 16.83, 0.00, 43.49, 0.00, 43.39, 76.53, 5.05, 8.59, 0.00, 0.28]

investmentPort/js/investHomeGroup.js

@@ -5151,7 +5151,7 @@ let app = new Vue({
           // 补0
           return intPartFormat + '.' + floatPart + '0'
         } else {
-          floatPart = floatPart.slice(0, 2)
+          floatPart = floatPart.slice(0, 2) 
           return intPartFormat + '.' + floatPart
         }
       } else {
@@ -5989,7 +5989,7 @@ let app = new Vue({
       })
       let option = {
         tooltip: {
-          formatter: data => {
+          formatter: (data,ticket, callback) => {
             return `${data[0].name}<br /><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[0].color.colorStops[0].color}"></span> ${data[0].seriesName}：${that.numFormat(data[0].value)}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[1].color.colorStops[0].color}"></span> ${data[1].seriesName}：${that.numFormat(data[1].value)}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[2].color.colorStops[0].color}"></span> ${data[2].seriesName}：${that.numFormat(data[2].value)}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[3].color.colorStops[0].color}"></span> ${data[3].seriesName}：${that.numFormat(data[3].value)}亿<br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${data[4].color.colorStops[0].color}"></span> ${data[4].seriesName}：${that.numFormat(data[4].value)}亿`
           },
           textStyle: {
@@ -6040,6 +6040,7 @@ let app = new Vue({
           bottom: '5%',
         },
         legend: {
+          selectedMode:false,
           data: ["预算额", "已签合同额", '产值认定额', '结算额', '付款额'],
           x: 'center',
           y: '0px',
@@ -6228,34 +6229,6 @@ let app = new Vue({
     },
     initChartR2 () {
       let that = this
-      console.log('right5',right5)
-      // 计算y轴的最大最小值，来确定范围
-      let List = []
-      let maxVlaue = ''
-      let minVlaue = ''
-      let maxSize = ''
-      let sizeList = []
-      right5.forEach(item => {
-        item.forEach(item2 => {
-          List.push(item2[1])
-        })
-      })
-      right5.forEach(item => {
-        item.forEach(item2 => {
-          sizeList.push(item2[2])
-        })
-      })
-      maxSize =  sizeList.reduce((x, y) => {
-        return x > y ? x : y;
-      });
-      maxVlaue = List.reduce((x, y) => {
-        return x > y ? x : y;
-      });
-      minVlaue = List.reduce((x, y) => {
-        return x > y ? y : x;
-      });
-      maxVlaue < 100 && (maxVlaue = 100)
-      minVlaue > -100 && (minVlaue = -100)
       const itemStyle = {
         // opacity: 0.8,
         shadowBlur: 10,
@@ -6325,6 +6298,7 @@ let app = new Vue({
           }
         ],
         legend: {
+          selectedMode:false,
           top: 10,
           data: ['正偏差', '容差', '负偏差'],
           textStyle: {
@@ -6358,8 +6332,8 @@ let app = new Vue({
           bottom: '5%',
         },
         yAxis: {
-          min: minVlaue - 10,
-          max: maxVlaue + 10,
+          min: -110,
+          max: 110,
           maxInterval: 5,
           splitLine: {
             show: false,
@@ -6438,7 +6412,13 @@ let app = new Vue({
             itemStyle: itemStyle,
             data: right5[0],
             symbolSize: function (data) {
-              return that.numMulti(Math.sqrt(Math.sqrt(data[2])), 16400/maxSize);
+              if ((data[2] > 0 && data[2] < 50) || data[2] == 50) {
+                return 40;
+              } else if ((data[2] > 50 && data[2] < 100) || data[2] == 100) {
+                return 70;
+              } else if (data[2] > 100) {
+                return 100;
+              }
             },
             markLine: {
               symbol: 'none',
@@ -6455,6 +6435,9 @@ let app = new Vue({
                     position: 'right',
                     color: '#fff',
                     fontSize: 20,
+                    label: {
+                      show: false
+                    }
                   },
                 },
                 {
@@ -6508,7 +6491,13 @@ let app = new Vue({
             itemStyle: itemStyle,
             data: right5[1],
             symbolSize: function (data) {
-              return that.numMulti(Math.sqrt(Math.sqrt(data[2])), 16400/maxSize);
+              if ((data[2] > 0 && data[2] < 50) || data[2] == 50) {
+                return 40;
+              } else if ((data[2] > 50 && data[2] < 100) || data[2] == 100) {
+                return 70;
+              } else if (data[2] > 100) {
+                return 100;
+              }
             },
           },
           {
@@ -6517,12 +6506,19 @@ let app = new Vue({
             itemStyle: itemStyle,
             data: right5[2],
             symbolSize: function (data) {
-              return that.numMulti(Math.sqrt(Math.sqrt(data[2])), 16400/maxSize);
+              if ((data[2] > 0 && data[2] < 50) || data[2] == 50) {
+                return 40;
+              } else if ((data[2] > 50 && data[2] < 100) || data[2] == 100) {
+                return 70;
+              } else if (data[2] > 100) {
+                return 100;
+              }
             },
           }
         ]
       }
       that.right2Chart.on('click', function (param) {
+        console.log(param.seriesName, '?????????')
         if (that.versions) {
           that.rightAdd.modelName = 1
           that.rightAdd.substraction = param.seriesName == '正偏差' ? 1 : param.seriesName == '容差' ? 2 : 3
@@ -6630,6 +6626,7 @@ let app = new Vue({
           bottom: '20%',
         },
         legend: {
+          selectedMode:false,
           data: ["低风险", "中风险", '高风险'],
           x: 'center',
           y: '15px',