投资接口对接

investmentPort/investHomeGroup.html

@@ -202,7 +202,7 @@
               <div class="boxs">
                 <div class="numberTitle">产业转型</div>
                 <div class="pointer numberContent"
-                  @click.stop="showChartLTipSingle('投资金额','center','keyIndicators','cyplanamount')">
+                  @click.stop="showChartLTipSingle('投资金额','center','keyIndicators','cyplanamount','','','','','transform',1)">
                   <p>
                     <span class="name">投资金额</span>
                   </p>
@@ -212,7 +212,7 @@
                   </p>
                 </div>
                 <div class="pointer numberContent"
-                  @click.stop="showChartLTipSingle('项目数量','center','keyIndicators','cyplancount')">
+                  @click.stop="showChartLTipSingle('项目数量','center','keyIndicators','cyplancount','','','','','transform',1)">
                   <p>
                     <span class="name">项目数量</span>
                   </p>
@@ -223,7 +223,7 @@
                 </div>
                 <div class="numberTitle">数字转型</div>
                 <div class="pointer numberContent"
-                  @click.stop="showChartLTipSingle('投资金额','center','keyIndicators','szplanamount')">
+                  @click.stop="showChartLTipSingle('投资金额','center','keyIndicators','szplanamount','','','','','transform',0)">
                   <p>
                     <span class="name">投资金额</span>
                   </p>
@@ -233,7 +233,7 @@
                   </p>
                 </div>
                 <div class="pointer numberContent"
-                  @click.stop="showChartLTipSingle('项目数量','center','keyIndicators','szplancount')">
+                  @click.stop="showChartLTipSingle('项目数量','center','keyIndicators','szplancount','','','','','transform',0)">
                   <p>
                     <span class="name">项目数量</span>
                   </p>
@@ -271,12 +271,12 @@
                 产业转型
               </div> -->
               <div class="flex b">
-                <div class="pointer" @click.stop="showChartLTipSingle('投资总额','center','keyIndicators','investamount')">
+                <div class="pointer" @click.stop="showChartLTipSingle('投资总额','center','keyIndicators','investamount','','','','','tab','')">
                   <p>投资总额</p>
                   <p style="color:#40A9FF"><span>{{numFormat(center1[0])}}</span><span style="font-size: 25px;">亿</span>
                   </p>
                 </div>
-                <div class="pointer" @click.stop="showChartLTipSingle('项目总数','center','keyIndicators','projectcount')">
+                <div class="pointer" @click.stop="showChartLTipSingle('项目总数','center','keyIndicators','projectcount','','','','','tab','')">
                   <p>项目总数</p>
                   <p style="color:#40A9FF"><span>{{center1[1]}}</span><span style="font-size: 25px;">个</span></p>
                 </div>
@@ -288,12 +288,12 @@
                 数字转型
               </div> -->
               <div class="flex b">
-                <div class="pointer" @click.stop="showChartLTipSingle('固定资产','center','keyIndicators','gdzcamount')">
+                <div class="pointer" @click.stop="showChartLTipSingle('固定资产','center','keyIndicators','gdzcamount','','','','','tab','0')">
                   <p>固定资产</p>
                   <p style="color:#40A9FF"><span>{{numFormat(center1[2])}}</span><span style="font-size: 25px;">亿</span>
                   </p>
                 </div>
-                <div class="pointer" @click.stop="showChartLTipSingle('股权投资','center','keyIndicators','gqtzamount')">
+                <div class="pointer" @click.stop="showChartLTipSingle('股权投资','center','keyIndicators','gqtzamount','','','','','tab','1')">
                   <p>股权投资</p>
                   <p style="color:#40A9FF"><span>{{center1[3]}}</span><span style="font-size: 25px;">个</span></p>
                 </div>
@@ -353,12 +353,12 @@
               产业转型
             </div> -->
             <div class="flex b">
-              <div class="pointer" @click.stop="showChartLTipSingle('投资总额','center','keyIndicators','investamount')">
+              <div class="pointer" @click.stop="showChartLTipSingle('投资总额','center','keyIndicators','investamount','','','','','tab','')">
                 <p>投资总额</p>
                 <p style="color:#40A9FF"><span>{{numFormat(center1[0])}}</span><span style="font-size: 25px;">亿</span>
                 </p>
               </div>
-              <div class="pointer" @click.stop="showChartLTipSingle('项目总数','center','keyIndicators','projectcount')">
+              <div class="pointer" @click.stop="showChartLTipSingle('项目总数','center','keyIndicators','projectcount','','','','','tab','')">
                 <p>项目总数</p>
                 <p style="color:#40A9FF"><span>{{center1[1]}}</span><span style="font-size: 25px;">个</span></p>
               </div>
@@ -370,12 +370,12 @@
               数字转型
             </div> -->
             <div class="flex b">
-              <div class="pointer" @click.stop="showChartLTipSingle('固定资产','center','keyIndicators','gdzcamount')">
+              <div class="pointer" @click.stop="showChartLTipSingle('固定资产','center','keyIndicators','gdzcamount','','','','','tab','0')">
                 <p>固定资产</p>
                 <p style="color:#40A9FF"><span>{{numFormat(center1[2])}}</span><span style="font-size: 25px;">亿</span>
                 </p>
               </div>
-              <div class="pointer" @click.stop="showChartLTipSingle('股权投资','center','keyIndicators','gqtzamount')">
+              <div class="pointer" @click.stop="showChartLTipSingle('股权投资','center','keyIndicators','gqtzamount','','','','','tab','1')">
                 <p>股权投资</p>
                 <p style="color:#40A9FF"><span>{{center1[3]}}</span><span style="font-size: 25px;">个</span></p>
               </div>

investmentPort/js/investHomeGroup.js

@@ -7,7 +7,7 @@ let app = new Vue({
       lineCommonCompany: [], //双柱状图弹窗上面的折线图x轴
       commonCompanyAll: [], // 公司包括编码
       changeLine: true,
-      versions: false,
+      versions: true,
       app_token: '',
       centerShow: false, // 中间内容显示
       echartR4Chart: '',// 倒数第二个专用
@@ -203,7 +203,6 @@ let app = new Vue({
         get('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_middle/getOrgName', value).then(res => {
           this.commonCompanyAll = res.data
           commonCompany = res.data.map(item => item.simplename)
-          console.log(res.data, '????????')
           // 左边
           // this.getDate1()
           // this.getDate2()
@@ -213,15 +212,15 @@ let app = new Vue({
           // this.getDate6()
 
           // 右边
-          this.getDate7()
-          this.getDate8()
-          this.getDate9()
-          this.getDate10()
-          // this.getDate11() // 右下A
-          this.getDate12()  // 右下B
+          // this.getDate7()
+          // this.getDate8()
+          // this.getDate9()
+          // this.getDate10()
+          // // this.getDate11() // 右下A
+          // this.getDate12()  // 右下B
 
           // 中间
-          // this.getDate14()
+          this.getDate14()
           resolve(1);
         })
       });
@@ -582,10 +581,10 @@ let app = new Vue({
       return new Promise((resolve, err) => {
         let value = {
           access_token: this.access_token,
-          mock: false,
+          mock: true,
           presetYear: 2023
         }
-        get('/ierp/kapi/v2/mdnb/mdnb_pmba_ext/presetdata/getKeyData', value).then(res => {
+        get('/ierp/kapi/v2/mdnb/mdnb_xmkb/presetdata/getKeyData', value).then(res => {
           // 头部指标
           center4[0] = res.data.transformations.estateAmount
           center4[1] = res.data.transformations.estateNum
@@ -598,7 +597,7 @@ let app = new Vue({
           center1[3] = res.data.keyIndicators.invest
           // 投资产业分布
           res.data.distribution.forEach((item, index) => {
-            center2[index] = { name: item.type, y: item.amount, num: item.count }
+            center2[index] = { name: item.type, y: item.amount, num: item.count, typeno: item.typeno }
           })
           // 投资执行情况
           res.data.implementationStatus.forEach((item, index) => {
@@ -606,20 +605,17 @@ let app = new Vue({
             center3[index].value2 = item.reality
           })
           // 五个一体化
-          center6[0].value = res.data.five.amount1
-          center6[1].value = res.data.five.amount2
-          center6[2].value = res.data.five.amount3
-          center6[3].value = res.data.five.amount4
-          center6[4].value = res.data.five.amount5
+          res.data.five.forEach((item, index) => {
+            center6[index] = { name: item.type, value: item.amount, typeno: item.typeno }
+          })
           // 投资阶段分析
-          center7[0].value = res.data.investmentStage.newnum
-          center7[0].value2 = res.data.investmentStage.newamount
-          center7[1].value = res.data.investmentStage.renewnum
-          center7[1].value2 = res.data.investmentStage.renewamount
+          res.data.investmentStage.forEach((item, index) => {
+            center7[index] = { name: item.type, value: item.num, value2: item.amount, typeno: item.typeno }
+          })
           // 重点项目监控
           center8 = []
           res.data.projectMonitoring.forEach((item, index) => {
-            center8.push({ value: item.amount, name: item.name, office: item.group })
+            center8.push({ value: item.amount, name: item.name, office: item.group, typeno: item.typeno })
           })
           // 山西地图
           center5 = []
@@ -687,7 +683,7 @@ let app = new Vue({
       });
     },
     // 左边穿透一级
-    leftPenetrateOne (mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeNum) {
+    leftPenetrateOne (mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeNum, type, param) {
       return new Promise((resolve, err) => {
         let value = {
           access_token: this.access_token,
@@ -710,11 +706,11 @@ let app = new Vue({
               common5.push(item.mdnb_amountfield12)
             })
             setTimeout(() => {
-              this.initChartLTip2('left',mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23)
-              this.initChartLTip3('left',mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23)
+              this.initChartLTip2('left', mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param, typeCTwo, paramCTwo)
+              this.initChartLTip3('left', mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param, typeCTwo, paramCTwo)
             })
           } else if (typeNum == 1) {
-            this.initChartLTip('left',mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23)
+            this.initChartLTip('left', mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param, typeCTwo, paramCTwo)
           }
           resolve(1);
         })
@@ -739,26 +735,40 @@ let app = new Vue({
             },
             pageSize: 1000
           }
-          post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/ejct', value).then(res => {
-            console.log(res, '看看啥情况')
-            // res.data.forEach((item, index) => {
-            //   that.config6.data[index] = []
-            //   that.config6.data[index][0] = item.mdnb_project_name
-            //   that.config6.data[index][2] = item.mdnb_implement_org
-            //   that.config6.data[index][3] = item.mdnb_insdrutytype1
-            //   that.config6.data[index][4] = item.mdnb_insdrutytype2
-            // })
-            // that.config6 = { ...that.config6 }
-            that.projectListTipShow = true
-            resolve(1);
-          })
+          if (mdnb_textfield20) {
+            post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/ejct', value).then(res => {
+              // res.data.forEach((item, index) => {
+              //   that.config6.data[index] = []
+              //   that.config6.data[index][0] = item.mdnb_project_name
+              //   that.config6.data[index][2] = item.mdnb_implement_org
+              //   that.config6.data[index][3] = item.mdnb_insdrutytype1
+              //   that.config6.data[index][4] = item.mdnb_insdrutytype2
+              // })
+              // that.config6 = { ...that.config6 }
+              that.projectListTipShow = true
+              resolve(1);
+            })
+          } else {
+            post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/tzedfxzed', value).then(res => {
+              // res.data.forEach((item, index) => {
+              //   that.config6.data[index] = []
+              //   that.config6.data[index][0] = item.mdnb_project_name
+              //   that.config6.data[index][2] = item.mdnb_implement_org
+              //   that.config6.data[index][3] = item.mdnb_insdrutytype1
+              //   that.config6.data[index][4] = item.mdnb_insdrutytype2
+              // })
+              // that.config6 = { ...that.config6 }
+              that.projectListTipShow = true
+              resolve(1);
+            })
+          }
         });
       } else {
         that.projectListTipShow = true
       }
     },
     // 中间穿透一级                 一个柱状图还是两个
-    centerPenetrateOne (type, param, typeNum) {
+    centerPenetrateOne (type, param, typeNum, typeCTwo, paramCTwo) {
       let that = this
       return new Promise((resolve, err) => {
         let value = {
@@ -768,10 +778,10 @@ let app = new Vue({
           type,
           param
         }
-        get('/ierp/kapi/v2/mdnb/mdnb_pmba_ext/presetdata/getPenetrationLevel1', value).then(res => {
+        get('/ierp/kapi/v2/mdnb/mdnb_xmkb/presetdata/getPenetrationLevel1', value).then(res => {
           if (typeNum == 1) {
+            common3 = []
             res.data.keyIndicators.forEach((item, index) => {
-              common3 = []
               if (param == 'cyplanamount') {
                 common3.push(item.cyplanamount)
               }
@@ -811,9 +821,9 @@ let app = new Vue({
               if (param == 'cciamount') {
                 common3.push(item.cciamount)
               }
-              setTimeout(() => {
-                this.initChartLTip()
-              })
+            })
+            setTimeout(() => {
+              this.initChartLTip('center', '', '', '', '', typeCTwo, paramCTwo)
             })
           } else if (typeNum == 2) {
             common4 = []
@@ -830,21 +840,39 @@ let app = new Vue({
                   common5.push(item.newcount)
                 })
               } else if (param == '续建') {
-                es.data.keyIndicators.forEach((item, index) => {
+                res.data.keyIndicators.forEach((item, index) => {
                   common4.push(item.renewamount)
                   common5.push(item.renewcount)
                 })
               }
             }
             setTimeout(() => {
-              this.initChartLTip2('center')
-              this.initChartLTip3('center')
+              this.initChartLTip2('center', '', '', '', '', type, param, typeCTwo, paramCTwo)
+              this.initChartLTip3('center', '', '', '', '', type, param, typeCTwo, paramCTwo)
             })
           }
           resolve(1);
         })
       });
     },
+    // 中间穿透二级
+    centerPenetrateTwo (type, param, orgNum) {
+      let that = this
+      return new Promise((resolve, err) => {
+        let value = {
+          access_token: this.access_token,
+          mock: false,
+          presetYear: 2023,
+          type,
+          param,
+          orgNum
+        }
+        get('/ierp/kapi/v2/mdnb/mdnb_xmkb/presetdata/MainPageMonthReportProject', value).then(res => {
+          console.log('看看二级穿透',res)
+          resolve(1);
+        })
+      });
+    },
     yellowMouse (index) {
       if (index % 2 == 0) {
         this.yellowCount = index
@@ -877,7 +905,6 @@ let app = new Vue({
       // window.open('http://192.168.2.111:8080/ierp/accessTokenLogin.do?access_token=${this.access_token}&redirect=http://192.168.2.111:8080/ierp/index.html?formId=mdnb_threetoproject&prj=PL_ZZGY_0_2023_000036')
       this.boardUrl = `http://192.168.2.111:8080/ierp/accessTokenLogin.do?access_token=${this.access_token}&redirect=http://192.168.2.111:8080/ierp/index.html?formId=mdnb_threetoproject&prj=PL_ZZGY_0_2023_000036`
       this.boardTipShow = true
-      console.log(this.boardUrl, '??????')
     },
     // 根据key分组
     classify (arr, k) {
@@ -902,7 +929,7 @@ let app = new Vue({
       return myArr
     },
     // 两个柱状图的弹窗
-    showChartLTipDouble (e, location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param) {
+    showChartLTipDouble (e, location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param, typeCTwo, paramCTwo) {
       this.titleName = e
       this.closeTap()
       this.echartDoubleTipShow = true
@@ -914,7 +941,7 @@ let app = new Vue({
           this.leftPenetrateOne(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, 2)
         }
         if (location == 'center') {
-          this.centerPenetrateOne(type, param, 2)
+          this.centerPenetrateOne(type, param, 2, typeCTwo, paramCTwo)
         }
       } else {
         setTimeout(() => {
@@ -924,16 +951,16 @@ let app = new Vue({
       }
     },
     // 单个柱状图的弹窗
-    showChartLTipSingle (e, location, type, param, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23) {
+    showChartLTipSingle (e, location, type, param, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo) {
       this.closeTap()
       this.titleName = e
       this.echartSingleTipShow = true
       if (this.versions) {
         if (location == 'center') {
-          this.centerPenetrateOne(type, param, 1)
+          this.centerPenetrateOne(type, param, 1, typeCTwo, paramCTwo)
         }
         if (location == 'left') {
-          this.leftPenetrateOne(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, 1)
+          this.leftPenetrateOne(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, 1, type, param)
         }
       } else {
         setTimeout(() => {
@@ -941,7 +968,7 @@ let app = new Vue({
         })
       }
     },
-    initChartLTip (location,mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23) {
+    initChartLTip (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo) {
       this.myChartTip1 = echarts.init(document.getElementById("echartSingleTip"));
       let option = {
         grid: {
@@ -1092,11 +1119,14 @@ let app = new Vue({
       })
       let that = this
       that.myChartTip1.on('click', function (param) {
+        console.log(param, '??????')
         if (that.versions) {
           if (location == 'right') {
             that.rightPenetrateTwo('', '', param.name)
           } else if (location == 'left') {
-            that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23,param.name)
+            that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, param.name)
+          } else if (location == 'center') {
+            that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name))
           }
         } else {
           that.projectListTipShow = true
@@ -1104,7 +1134,7 @@ let app = new Vue({
       })
       that.myChartTip1.setOption(option);
     },
-    initChartLTip2 (location,mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23) {
+    initChartLTip2 (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo) {
       this.myChartTip2 = echarts.init(document.getElementById("echartSingleTip2"));
       let option = {
         grid: {
@@ -1237,7 +1267,9 @@ let app = new Vue({
           if (location == 'right') {
             that.rightPenetrateTwo('', '', that.findCode(param.name))
           } else if (location == 'left') {
-            that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23,param.name)
+            that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, param.name)
+          } else if (location == 'center') {
+            that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name))
           }
         } else {
           that.projectListTipShow = true
@@ -1245,7 +1277,7 @@ let app = new Vue({
       })
       that.myChartTip2.setOption(option);
     },
-    initChartLTip3 (location) {
+    initChartLTip3 (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo) {
       this.myChartTip3 = echarts.init(document.getElementById("echartSingleTip3"));
       let option = {
         grid: {
@@ -1375,7 +1407,9 @@ let app = new Vue({
           if (location == 'right') {
             that.rightPenetrateTwo('', '', that.findCode(param.name))
           } else if (location == 'left') {
-            that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23,param.name)
+            that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, param.name)
+          } else if (location == 'center') {
+            that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name))
           }
         } else {
           that.projectListTipShow = true
@@ -1803,7 +1837,6 @@ let app = new Vue({
               }, 2000);
             },
             legendItemClick: function (event) {
-              console.log(event);
               return true;
             }
           }
@@ -1885,7 +1918,6 @@ let app = new Vue({
                 that.showChartLTipDouble(e.point.name, 'left', '投资计划分析', e.point.name, '', '')
               },
               mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
-                //console.log(e) 
                 chartData.forEach((item, index) => {
                   // item.sliced = false
                   // item.selected = false
@@ -3697,9 +3729,7 @@ let app = new Vue({
       var chartData = center2
       var timer = null;
       var i = 0;
-
       let that = this
-
       var option = {
         colors: ['#497dad', '#a79c57', '#cc8c29', '#91a65f', '#383062', '#034a39', '#5783ab', '#5783ab'],
         chart: {
@@ -3736,7 +3766,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'distribution', e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'distribution', e.point.options.typeno,industry,e.point.options.typeno)
                         }
                       }
                     },
@@ -3820,7 +3850,7 @@ let app = new Vue({
           point: {
             events: {
               click: function (e) { //点击事件
-                that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'distribution', e.point.name)
+                that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'distribution', e.point.options.typeno,industry,e.point.options.typeno)
               },
               mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
                 //console.log(e) 
@@ -3837,7 +3867,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'distribution', e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'distribution', e.point.options.typeno,industry,e.point.options.typeno)
                         }
                       }
                     },
@@ -3868,7 +3898,7 @@ let app = new Vue({
                       point: {
                         events: {
                           click: function (e) {
-                            that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'distribution', e.point.name)
+                            that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'distribution', e.point.options.typeno,industry,e.point.options.typeno)
                           }
                         }
                       },
@@ -4083,6 +4113,7 @@ let app = new Vue({
       }
       myChart.on('click', function (param) {
         that.projectListTipShow = true
+        that.centerPenetrateTwo()
       })
       myChart.setOption(option)
       tools.loopShowTooltip(myChart, option, {
@@ -4577,15 +4608,15 @@ let app = new Vue({
       let that = this
       myChart.on('click', function (param) {
         if (param.name == '煤炭和煤电') {
-          that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'ceiamount')
+          that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'ceiamount','','','','','five','1')
         } else if (param.name == '煤电和新能源') {
-          that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'cpneiamount')
+          that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'cpneiamount','','','','','five','2')
         } else if (param.name == '煤炭和化工') {
-          that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'ccheiamount')
+          that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'ccheiamount','','','','','five','3')
         } else if (param.name == '煤炭和数字') {
-          that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'cdiamount')
+          that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'cdiamount','','','','','five','4')
         } else if (param.name == '煤炭和降碳') {
-          that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'cciamount')
+          that.showChartLTipSingle(param.name, 'center', 'keyIndicators', 'cciamount','','','','','five','5')
         }
       })
       myChart.setOption(option)
@@ -4600,18 +4631,17 @@ let app = new Vue({
       var timer = null;
       var timer2 = null;
       var i = 0;
-
       center7.forEach((item, index) => {
         let obj = {
           name: item.name,
           y: item.value2,
           num: item.value,
+          typeno: item.typeno,
           sliced: false,
           selected: false,
           color: index == 0 ? '#497dad' : '#a79c57'
         }
         chartData.push(obj)
-
       })
       let that = this
       var chart = Highcharts.chart('echartC4', {
@@ -4649,7 +4679,8 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'keyIndicators', e.point.name)
+                          console.log(e, '?????????')
+                          that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'keyIndicators', e.point.options.typeno,state,e.point.name=='新建'?'new':'renew')
                         }
                       }
                     },
@@ -4670,7 +4701,7 @@ let app = new Vue({
                       point: {
                         events: {
                           click: function (e) {
-                            that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'keyIndicators', e.point.name)
+                            that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'keyIndicators', e.point.options.typeno,state,e.point.name=='新建'?'new':'renew')
                           }
                         }
                       },
@@ -4748,7 +4779,7 @@ let app = new Vue({
           point: {
             events: {
               click: function (e) { //点击事件
-                that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'keyIndicators', e.point.name)
+                that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'keyIndicators', e.point.options.typeno,state,e.point.name=='新建'?'new':'renew')
               },
               mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
                 //console.log(e) 
@@ -4765,7 +4796,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'keyIndicators', e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'keyIndicators', e.point.options.typeno,state,e.point.name=='新建'?'new':'renew')
                         }
                       }
                     },
@@ -4796,7 +4827,7 @@ let app = new Vue({
                       point: {
                         events: {
                           click: function (e) {
-                            that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'keyIndicators', e.point.name)
+                            that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'keyIndicators', e.point.options.typeno,state,e.point.name=='新建'?'new':'renew')
                           }
                         }
                       },
@@ -4817,7 +4848,7 @@ let app = new Vue({
                         point: {
                           events: {
                             click: function (e) {
-                              that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'keyIndicators', e.point.name)
+                              that.showChartLTipDouble(e.point.name, 'center', '', '', '', '', 'keyIndicators', e.point.options.typeno,state,e.point.name=='新建'?'new':'renew')
                             }
                           }
                         },

investmentPort/js/request.js

@@ -4,8 +4,8 @@
  */
 const httpRequest = axios.create({
   // baseURL: 'http://192.168.2.155:8080', // 李瑞投前
-  baseURL: 'http://192.168.2.111:8080', // 苏文投后
-  // baseURL: 'http://192.168.2.147:8080', // 旭东中间大屏
+  // baseURL: 'http://192.168.2.111:8080', // 苏文投后
+  baseURL: 'http://192.168.2.147:8080', // 旭东中间大屏
   timeout: 3 * 60 * 1000, // 3分钟等待
   withCredentials: true, // 携带cookie
 })
@@ -56,7 +56,6 @@ httpRequest.interceptors.response.use(
     return response
   },
   function (error) {
-    console.log(error, '??????????')
     this.ELEMENT.Message.error(error.message)
     return Promise.reject(error)
   }