修改气泡图前

investmentPort/js/groupData.js

@@ -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 = [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 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 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

@@ -607,6 +607,16 @@ let app = new Vue({
         post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/tqzdlxzb', value).then(res => {
           if (res.data.rows.length > 0) {
             let dataList2 = this.classify(res.data.rows[0].mdnb_entryentity1, 'mdnb_textfield3')
+            // 左边的轮播
+            let dataList = []
+            dataList2.forEach((item, index) => {
+              dataList[index] = []
+              dataList[index][0] = item.data[0].mdnb_textfield18
+              dataList[index][1] = item.data[0].mdnb_textfield3
+              dataList[index][2] = that.numFormat(that.yuanChange(item.data[0].mdnb_amountfield24)) + '亿'
+            })
+            this.storageRecordConfig.data = dataList
+            this.storageRecordConfig = { ...this.storageRecordConfig }
             // 右边的柱状图
             left12 = []
             dataList2.forEach((item, index) => {
@@ -618,16 +628,6 @@ let app = new Vue({
               }
             })
             that.initChartL9()
-            // 左边的轮播
-            let dataList = []
-            dataList2.forEach((item, index) => {
-              dataList[index] = []
-              dataList[index][0] = item.data[0].mdnb_textfield18
-              dataList[index][1] = item.data[0].mdnb_textfield3
-              dataList[index][2] = that.numFormat(that.yuanChange(item.data[0].mdnb_amountfield24)) + '亿'
-            })
-            this.storageRecordConfig.data = dataList
-            this.storageRecordConfig = { ...this.storageRecordConfig }
           }
           resolve(1);
         })
@@ -713,13 +713,14 @@ let app = new Vue({
         }
         post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_middle/getInvestSunstractionGas', value).then(res => {
           res.data.forEach((item, index) => {
-            right5[0][index][1] = item.mdnb_amount_zb
+            right5[0][index][1] = that.numMulti(item.mdnb_amount_zb, 100)
             right5[0][index][2] = that.yuanChange(item.mdnb_amount_z)
-            right5[1][index][1] = item.mdnb_amount_nb
+            right5[1][index][1] = that.numMulti(item.mdnb_amount_nb, 100)
             right5[1][index][2] = that.yuanChange(item.mdnb_amount_n)
-            right5[2][index][1] = item.mdnb_amount_fb
+            right5[2][index][1] = that.numMulti(item.mdnb_amount_fb, 100)
             right5[2][index][2] = that.yuanChange(item.mdnb_amount_f)
           })
+          console.log(right5, '?????????????^^^^^^^')
           this.initChartR2()
           resolve(1);
         })
@@ -973,7 +974,6 @@ let app = new Vue({
         }
         post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/yjct', value).then(res => {
           res.data.rows[0].mdnb_entryentity12.sort(that.compare('mdnb_integerfield19'))
-          console.log(res.data.rows[0].mdnb_entryentity12,'????????')
           if (res.data.rows.length > 0) {
             if (typeNum == 2) {
               common4 = []
@@ -987,9 +987,10 @@ let app = new Vue({
                 this.initChartLTip3('left', mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param, typeCTwo, paramCTwo)
               })
             } else if (typeNum == 1) {
+              this.titleName == '项目数量' || this.titleName == '项目总数'
               common3 = []
               res.data.rows[0].mdnb_entryentity12.forEach((item, index) => {
-                common3.push(that.yuanChange(item.mdnb_amountfield12))
+                (that.titleName == '项目数量' || that.titleName == '项目总数') ? common3.push(item.mdnb_integerfield18) : common3.push(that.yuanChange(item.mdnb_amountfield12))
               })
               this.initChartLTip('left', mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param, typeCTwo, paramCTwo)
             }
@@ -1290,7 +1291,7 @@ let app = new Vue({
       });
     },
     // 中间穿透二级
-    centerPenetrateTwo (type, param, orgNum, portType,proName) {
+    centerPenetrateTwo (type, param, orgNum, portType, proName) {
       this.boardType = 'center'
       let that = this
       return new Promise((resolve, err) => {
@@ -1385,7 +1386,7 @@ let app = new Vue({
                 that.config6.data[index][2] = item.tzzt
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
-                that.config6.data[index][5] = item.mdnb_quality
+                that.config6.data[index][5] = item.stage
                 that.config6.data[index][6] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 118) {
@@ -1675,7 +1676,9 @@ let app = new Vue({
     },
     initChartLTip (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo, portType) {
       this.myChartTip1 = echarts.init(document.getElementById("echartSingleTip"));
-      common3 = common3.map((item) => Number(item) + 1)
+      if (!(this.titleName == '项目数量' || this.titleName == '项目总数')) {
+        common3 = common3.map((item) => Number(item) + 1)
+      }
       let option = {
         grid: {
           top: 40,
@@ -1691,7 +1694,11 @@ let app = new Vue({
             type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
           },
           formatter: data => {
-            return `${data[0].name}</br>${data[0].seriesName}：${that.numFormat(data[0].value - 1)}${(this.titleName == '项目数量' || this.titleName == '项目总数') ? "个" : "亿"}`
+            if (this.titleName == '项目数量' || this.titleName == '项目总数') {
+              return `${data[0].name}</br>${data[0].seriesName}：${that.numFormat(data[0].value)}个`
+            } else {
+              return `${data[0].name}</br>${data[0].seriesName}：${that.numFormat(data[0].value - 1)}亿`
+            }
           },
           textStyle: {
             color: '#FFF',     // 文字的颜色
@@ -1724,9 +1731,8 @@ let app = new Vue({
           },
         },
         yAxis: {
-          type: 'log',
-          min: 1,
-          logBase: 2,
+          minInterval: 1,
+          // onZero:true,
           name: (this.titleName == '项目数量' || this.titleName == '项目总数') ? '个' : '亿',
           nameTextStyle: {//y轴上方单位的颜色
             color: '#fff',
@@ -1745,7 +1751,11 @@ let app = new Vue({
               fontSize: '20'
             },
             formatter: function (value) {
-              return value === 1 ? 0 : value
+              if (that.titleName == '项目数量' || that.titleName == '项目总数') {
+                return value
+              } else {
+                return value === 1 ? 0 : value
+              }
             }
           },
           splitLine: {
@@ -1805,6 +1815,11 @@ let app = new Vue({
           // 小图标的宽高
         },
       };
+      if (!(this.titleName == '项目数量' || this.titleName == '项目总数')) {
+        option.yAxis.min = 1
+        option.yAxis.type = 'log'
+        option.yAxis.logBase = 5
+      }
       tools.loopShowTooltip(this.myChartTip1, option, {
         interval: 2000,
         loopSeries: true,
@@ -1937,6 +1952,11 @@ let app = new Vue({
                 },
               ]),
             },
+            lineStyle: {
+              color: '#957DFF',
+              width: 3,
+            },
+
           },
         ],
         legend: {
@@ -1965,7 +1985,7 @@ let app = new Vue({
           } else if (location == 'left') {
             that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, param.name, that.projectNum)
           } else if (location == 'center') {
-            that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name),portType,param2)
+            that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name), portType, param2)
           }
         } else {
           that.projectListTipShow = true
@@ -2027,7 +2047,7 @@ let app = new Vue({
         yAxis: {
           type: 'log',
           min: 1,
-          logBase: 2,
+          logBase: 5,
           name: '亿',
           nameTextStyle: {//y轴上方单位的颜色
             color: '#fff',
@@ -2112,7 +2132,7 @@ let app = new Vue({
           } else if (location == 'left') {
             that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, param.name, that.projectNum)
           } else if (location == 'center') {
-            that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name), portType,param2)
+            that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name), portType, param2)
           }
         } else {
           that.projectListTipShow = true
@@ -3168,7 +3188,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业分析', e.point.name, '', '', '', '', '', '', 215)
+                          that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业', e.point.name, '', '', '', '', '', '', 215)
                           // that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '优势特色产业', '体育产业', '')
                         }
                       }
@@ -3263,7 +3283,7 @@ let app = new Vue({
           point: {
             events: {
               click: function (e) { //点击事件
-                that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业分析', e.point.name, '', '', '', '', '', '', 215)
+                that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业', e.point.name, '', '', '', '', '', '', 215)
                 // that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '优势特色产业', '体育产业', '')
               },
               mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
@@ -3281,7 +3301,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业分析', e.point.name, '', '', '', '', '', '', 215)
+                          that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业', e.point.name, '', '', '', '', '', '', 215)
                           // that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '优势特色产业', '体育产业', '')
                         }
                       }
@@ -3313,7 +3333,7 @@ let app = new Vue({
                       point: {
                         events: {
                           click: function (e) {
-                            that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业分析', e.point.name, '', '', '', '', '', '', 215)
+                            that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '传统产业', e.point.name, '', '', '', '', '', '', 215)
                             // that.showChartLTipDouble(e.point.name, 'left', '产业布局分析', '优势特色产业', '体育产业', '')
                           }
                         }
@@ -3968,6 +3988,7 @@ let app = new Vue({
       }
     },
     initChartL9 () {
+      let that = this
       this.chartCarousel = echarts.init(document.getElementById("echartL9"));
       option = {
         tooltip: {
@@ -4055,7 +4076,7 @@ let app = new Vue({
               },
             },
             // data: [70, 52, 33, 41, 52],
-            data: left12[this.count + 1][2]
+            data: this.storageRecordConfig.data.length == 0 ? [] : this.storageRecordConfig.data.length == 1 ? left12[this.count][2] : left12[this.count + 1][2]
           },
           {
             name: '',
@@ -4076,7 +4097,7 @@ let app = new Vue({
               },
             },
             // data: [20, 30, 15, 28, 36],
-            data: left12[this.count + 1][1]
+            data: this.storageRecordConfig.data.length == 0 ? [] : this.storageRecordConfig.data.length == 1 ? left12[this.count][1] : left12[this.count + 1][1]
           },
           {
             name: '',
@@ -4097,11 +4118,10 @@ let app = new Vue({
               },
             },
             // data: [15, 22, 17, 33, 14],
-            data: left12[this.count + 1][0]
+            data: this.storageRecordConfig.data.length == 0 ? [] : this.storageRecordConfig.data.length == 1 ? left12[this.count][0] : left12[this.count + 1][0]
           },
         ],
       }
-      let that = this
       // this.chartCarousel.on('click', function (param) {
       //   that.titleName = param.name
       //   that.echartSingleTipShow = true
@@ -6305,12 +6325,12 @@ let app = new Vue({
         },
         grid: {
           top: '10%',
-          right: '4%',
+          right: '7%',
           left: '7%',
           bottom: '5%',
         },
         yAxis: {
-          name: '',
+          boundaryGap:['50%', '50%'],
           splitLine: {
             show: true,
             lineStyle: {
@@ -6375,6 +6395,62 @@ let app = new Vue({
             symbolSize: function (data) {
               return that.numMulti(Math.sqrt(Math.sqrt(data[2])), 40);
             },
+            markLine: {
+              data: [
+                {
+                  name: '100%',
+                  yAxis: 100,
+                  lineStyle: {
+                    color: '#fff',
+                  },
+                  label: {
+                    formatter: '{b}',
+                    position: 'right',
+                    color: '#fff',
+                    fontSize: 20,
+                  },
+                },
+                {
+                  name: '5%',
+                  yAxis: 5,
+                  lineStyle: {
+                    color: '#fff',
+                  },
+                  label: {
+                    formatter: '{b}',
+                    position: 'right',
+                    color: '#fff',
+                    fontSize: 20,
+                  },
+                },
+                {
+                  name: '-5%',
+                  yAxis: -5,
+                  lineStyle: {
+                    color: '#fff',
+                  },
+                  label: {
+                    formatter: '{b}',
+                    position: 'right',
+                    color: '#fff',
+                    fontSize: 20,
+                  },
+                },
+                {
+                  name: '100%',
+                  yAxis: -100,
+                  lineStyle: {
+                    color: '#fff',
+                  },
+                  label: {
+                    formatter: '{b}',
+                    position: 'right',
+                    color: '#fff',
+                    fontSize: 20,
+                  },
+                },
+              ],
+            },
           },
           {
             name: '容差',