zhbyyy 2 жил өмнө
parent
commit
359880118b

+ 21 - 21
investmentPort/investHomeGroup.html

@@ -40,7 +40,7 @@
           </div>
           <div class="content">
             <div>
-              <div class="item3 commonBack pointer" @click.stop="showChartLTipSingle('年度投资计划总额')">
+              <div class="item3 commonBack pointer" @click.stop="showChartLTipSingle('年度投资计划总额','left')">
                 <div class="item3-title"><div>{{numFormat(left4[0])}}<span>亿</span></div></div>
                 <div class="item3-img">
                   <img style="width: 100%; height: 100%;" src="./groupImg/icon-8-home2.png" alt="">
@@ -54,11 +54,11 @@
                 <div class="item4">
                   <div class="item4-title">固定资产类项目</div>
                   <div class="item4-con">
-                    <div class="item pointer" @click.stop="showChartLTipSingle('投资金额')">
+                    <div class="item pointer" @click.stop="showChartLTipSingle('投资金额','left')">
                       <div class="text" >投资金额</div>
                       <div class="title"><div>{{numFormat(left4[1])}}<span>亿</span></div></div>
                     </div>
-                    <div class="item pointer" @click.stop="showChartLTipSingle('项目数量')">
+                    <div class="item pointer" @click.stop="showChartLTipSingle('项目数量','left')">
                       <div class="text" >项目数量</div>
                       <div class="title"><div>{{numFormat(left4[2])}}<span>个</span></div></div>
                     </div>
@@ -69,11 +69,11 @@
                 <div class="item4">
                   <div class="item4-title">股权类项目</div>
                   <div class="item4-con">
-                    <div class="item pointer" @click.stop="showChartLTipSingle('投资金额')">
+                    <div class="item pointer" @click.stop="showChartLTipSingle('投资金额','left')">
                       <div class="text" >投资金额</div>
                       <div class="title"><div>{{numFormat(left4[3])}}<span>亿</span></div></div>
                     </div>
-                    <div class="item pointer" @click.stop="showChartLTipSingle('项目数量')">
+                    <div class="item pointer" @click.stop="showChartLTipSingle('项目数量','left')">
                       <div class="text" >项目数量</div>
                       <div class="title"><div>{{numFormat(left4[4])}}<span>个</span></div></div>
                     </div>
@@ -119,7 +119,7 @@
                 </div>
               </div>
             </div>
-            <div class="h-full w-full overflow-hidden relative commonBack" @click="projectListTipShow = true">
+            <div class="h-full w-full overflow-hidden relative commonBack" @click="leftPenetrateTwo('企业额度分析','总额度','','',titleName)">
               <div class="total">总额度<span>{{numFormat(left2[1])}}<span style="font-size: 20px;">亿</span></span></div>
               <img src="./groupImg/light2.png" class="absolute ballLight" alt="">
               <div ref="echartL1" style="width: 90%; height: 90%;margin: auto;"></div>
@@ -170,7 +170,7 @@
             <span class="text">重点项目两线指标</span>
           </div>
           <div class="content left-lb">
-            <dv-scroll-board ref="aaa" :config="storageRecordConfig" @scroll-change="scrollChange"
+            <dv-scroll-board ref="indicator" :config="storageRecordConfig" @scroll-change="scrollChange"
               class="commonBack"></dv-scroll-board>
             <div id="echartL9" class="commonBack" style="width: 100%; height: 100%;"></div>
           </div>
@@ -190,7 +190,7 @@
             <div class="content">
               <div class="boxs">
                 <div class="numberTitle">产业转型</div>
-                <div class="pointer numberContent" @click.stop="showChartLTipSingle('投资金额')">
+                <div class="pointer numberContent" @click.stop="showChartLTipSingle('投资金额','center','keyIndicators','cyplanamount')">
                   <p>
                     <span class="name">投资金额</span>
                   </p>
@@ -199,7 +199,7 @@
                         style="font-size: 26px;">亿</span></i>
                   </p>
                 </div>
-                <div class="pointer numberContent"  @click.stop="showChartLTipSingle('项目数量')">
+                <div class="pointer numberContent"  @click.stop="showChartLTipSingle('项目数量','center','keyIndicators','cyplancount')">
                   <p>
                     <span class="name">项目数量</span>
                   </p>
@@ -209,7 +209,7 @@
                   </p>
                 </div>
                 <div class="numberTitle">数字转型</div>
-                <div class="pointer numberContent" @click.stop="showChartLTipSingle('投资金额')">
+                <div class="pointer numberContent" @click.stop="showChartLTipSingle('投资金额','center','keyIndicators','szplanamount')">
                   <p>
                     <span class="name">投资金额</span>
                   </p>
@@ -218,7 +218,7 @@
                         style="font-size: 26px;">亿</span></i>
                   </p>
                 </div>
-                <div class="pointer numberContent" @click.stop="showChartLTipSingle('项目数量')">
+                <div class="pointer numberContent" @click.stop="showChartLTipSingle('项目数量','center','keyIndicators','szplancount')">
                   <p>
                     <span class="name">项目数量</span>
                   </p>
@@ -256,12 +256,12 @@
                 产业转型
               </div> -->
               <div class="flex b">
-                <div class="pointer" @click.stop="showChartLTipSingle('投资总额')">
+                <div class="pointer" @click.stop="showChartLTipSingle('投资总额','center')">
                   <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('项目总数')">
+                <div class="pointer" @click.stop="showChartLTipSingle('项目总数','center')">
                   <p>项目总数</p>
                   <p style="color:#40A9FF"><span>{{center1[1]}}</span><span style="font-size: 25px;">个</span></p>
                 </div>
@@ -273,12 +273,12 @@
                 数字转型
               </div> -->
               <div class="flex b">
-                <div class="pointer" @click.stop="showChartLTipSingle('固定资产')">
+                <div class="pointer" @click.stop="showChartLTipSingle('固定资产','center')">
                   <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('股权投资')">
+                <div class="pointer" @click.stop="showChartLTipSingle('股权投资','center')">
                   <p>股权投资</p>
                   <p style="color:#40A9FF"><span>{{center1[3]}}</span><span style="font-size: 25px;">个</span></p>
                 </div>
@@ -337,12 +337,12 @@
               产业转型
             </div> -->
             <div class="flex b">
-              <div class="pointer" @click.stop="showChartLTipSingle('投资总额')">
+              <div class="pointer" @click.stop="showChartLTipSingle('投资总额','center')">
                 <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('项目总数')">
+              <div class="pointer" @click.stop="showChartLTipSingle('项目总数','center')">
                 <p>项目总数</p>
                 <p style="color:#40A9FF"><span>{{center1[1]}}</span><span style="font-size: 25px;">个</span></p>
               </div>
@@ -354,12 +354,12 @@
               数字转型
             </div> -->
             <div class="flex b">
-              <div class="pointer" @click.stop="showChartLTipSingle('固定资产')">
+              <div class="pointer" @click.stop="showChartLTipSingle('固定资产','center')">
                 <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('股权投资')">
+              <div class="pointer" @click.stop="showChartLTipSingle('股权投资','center')">
                 <p>股权投资</p>
                 <p style="color:#40A9FF"><span>{{center1[3]}}</span><span style="font-size: 25px;">个</span></p>
               </div>
@@ -435,8 +435,8 @@
               </div>
             </div>
           </div>
-          <div class="" style="position:relative;width: 100%;height: 100%;background-color: #092853;"
-            @click="projectListTipShow = true">
+          <div class="" style="position:relative;width: 100%;height: 100%;background-color: #092853;border-radius: 15px;"
+            @click="leftPenetrateTwo('企业额度分析','总额度','','',titleName)">
             <div class="total3 total">总额度:<span style="font-size: 40px;">{{numFormat(common1[5])}}<span
                   style="font-size: 30px;">亿</span></span></div>
             <img src="./groupImg/light2.png" class="absolute ballLight2" alt="">

+ 164 - 78
investmentPort/js/investHomeGroup.js

@@ -206,15 +206,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);
         })
       });
@@ -414,6 +414,15 @@ let app = new Vue({
         }
         post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/tqzdlxzb', value).then(res => {
           let dataList2 = this.classify(res.data.rows[0].mdnb_entryentity1, 'mdnb_textfield3')
+          left12 = []
+          dataList2.forEach((item, index) => {
+            left12[index] = [[], [], []]
+            for (let i = 0; i < 5; i++) {
+              left12[index][0] = item.data[i].mdnb_integerfield10
+              left12[index][1] = item.data[i].mdnb_integerfield12
+              left12[index][2] = item.data[i].mdnb_integerfield9
+            }
+          })
           let dataList = []
           dataList2.forEach((item, index) => {
             dataList[index] = []
@@ -569,7 +578,6 @@ let app = new Vue({
           presetYear: 2023
         }
         get('/ierp/kapi/v2/mdnb/mdnb_pmba_ext/presetdata/getKeyData', value).then(res => {
-          console.log(res.data, '????????')
           // 头部指标
           center4[0] = res.data.transformations.estateAmount
           center4[1] = res.data.transformations.estateNum
@@ -605,7 +613,6 @@ let app = new Vue({
           res.data.projectMonitoring.forEach((item, index) => {
             center8.push({ value: item.amount, name: item.name, office: item.group })
           })
-          console.log(center8,'??????????')
           // 山西地图
           center5 = []
           res.data.investmentMap.forEach((item, index) => {
@@ -643,7 +650,7 @@ let app = new Vue({
       });
     },
     // 右边穿透二级
-    rightPenetrateTwo (modelName, substraction,name) {
+    rightPenetrateTwo (modelName, substraction, name) {
       let that = this
       return new Promise((resolve, err) => {
         let value = {
@@ -652,7 +659,7 @@ let app = new Vue({
             isInsert: '0',
             modelName,
             substraction,
-            orgName:name
+            orgName: name
           },
           pageSize: 1000
         }
@@ -672,12 +679,18 @@ let app = new Vue({
       });
     },
     // 左边穿透一级
-    leftPenetrateOne () {
+    leftPenetrateOne (mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, mdnb_textfield5) {
       return new Promise((resolve, err) => {
         let value = {
           access_token: this.access_token,
-          "request": {
-            isInsert: '0'
+          "data": {
+            mdnb_combofield: 'A',
+            mdnb_textfield11,
+            mdnb_textfield13,
+            mdnb_textfield16,
+            mdnb_textfield23,
+            mdnb_textfield5,
+            mdnb_datefield: '2022-01-01'
           },
           pageSize: 1000
         }
@@ -695,32 +708,99 @@ let app = new Vue({
       });
     },
     // 左边穿透二级
-    leftPenetrateTwo (modelName, substraction) {
+    leftPenetrateTwo (mdnb_textfield12, mdnb_textfield19, mdnb_textfield15, mdnb_textfield17, mdnb_textfield20) {
       let that = this
+      console.log(mdnb_textfield12, mdnb_textfield19, mdnb_textfield15, mdnb_textfield17, mdnb_textfield20)
       return new Promise((resolve, err) => {
         let value = {
           access_token: this.access_token,
-          "request": {
-            isInsert: '0',
-            modelName,
-            substraction
+          "data": {
+            mdnb_combofield: 'A',
+            mdnb_datefield: '2022-03-03',
+            mdnb_textfield12,
+            mdnb_textfield19,
+            mdnb_textfield15,
+            mdnb_textfield17,
+            mdnb_textfield20
           },
           pageSize: 1000
         }
-        post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_middle/getTwoLevelData', 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 }
+        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);
         })
       });
     },
+    // 中间穿透一级
+    centerPenetrateOne (type, param) {
+      return new Promise((resolve, err) => {
+        let value = {
+          access_token: this.access_token,
+          mock: false,
+          presetYear: 2023,
+          type,
+          param: ''
+        }
+        common3 = []
+        get('/ierp/kapi/v2/mdnb/mdnb_pmba_ext/presetdata/getPenetrationLevel1', value).then(res => {
+          console.log(res.data.keyIndicators,'????????')
+          res.data.keyIndicators.forEach((item, index) => {
+            if (type == 'cyplanamount') {
+              common3.push(item.cyplanamount)
+            }
+            if (type == 'cyplancount') {
+              common3.push(item.cyplanamount)
+            }
+            if (type == 'szplanamount') {
+              common3.push(item.cyplanamount)
+            }
+            if (type == 'szplancount') {
+              common3.push(item.szplancount)
+            }
+            if (type == 'investamount') {
+              common3.push(item.investamount)
+            }
+            if (type == 'projectcount') {
+              common3.push(item.projectcount)
+            }
+            if (type == 'gdzcamount') {
+              common3.push(item.projectcount)
+            }
+            if (type == 'gqtzamount') {
+              common3.push(item.projectcount)
+            }
+            if (type == 'ceiamount') {
+              common3.push(item.ceiamount)
+            }
+            if (type == 'cpneiamount') {
+              common3.push(item.cpneiamount)
+            }
+            if (type == 'ccheiamount') {
+              common3.push(item.ccheiamount)
+            }
+            if (type == 'cdiamount') {
+              common3.push(item.cdiamount)
+            }
+            if (type == 'cciamount') {
+              common3.push(item.cciamount)
+            }
+          })
+          setTimeout(() => {
+            this.initChartLTip()
+          })
+          resolve(1);
+        })
+      });
+    },
     yellowMouse (index) {
       if (index % 2 == 0) {
         this.yellowCount = index
@@ -740,15 +820,8 @@ let app = new Vue({
     // 去项目看板
     goLookBoard (e) {
       console.log(e, '?????')
-    },
-    // 单个柱状图的弹窗
-    showChartLTipSingle (e) {
-      this.closeTap()
-      this.titleName = e
-      this.echartSingleTipShow = true
-      setTimeout(() => {
-        this.initChartLTip()
-      })
+      window.location.href = `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`
+
     },
     // 根据key分组
     classify (arr, k) {
@@ -773,19 +846,33 @@ let app = new Vue({
       return myArr
     },
     // 两个柱状图的弹窗
-    showChartLTipDouble (e, location) {
+    showChartLTipDouble (e, location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, mdnb_textfield5) {
       this.titleName = e
       this.closeTap()
       this.echartDoubleTipShow = true
       if (location == 'right') {
         this.rightPenetrateOne()
-        return
+      }
+      if (location == 'left') {
+        this.leftPenetrateOne(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, mdnb_textfield5)
       }
       setTimeout(() => {
         this.initChartLTip2()
         this.initChartLTip3()
       })
     },
+    // 单个柱状图的弹窗
+    showChartLTipSingle (e, location, type, param) {
+      this.closeTap()
+      this.titleName = e
+      this.echartSingleTipShow = true
+      if (location == 'center') {
+        this.centerPenetrateOne(type, param)
+      }
+      setTimeout(() => {
+        this.initChartLTip()
+      })
+    },
     initChartLTip () {
       this.myChartTip1 = echarts.init(document.getElementById("echartSingleTip"));
       let option = {
@@ -1094,7 +1181,7 @@ let app = new Vue({
       })
       let that = this
       that.myChartTip2.on('click', function (param) {
-        that.rightPenetrateTwo('', '',param.name)
+        that.rightPenetrateTwo('', '', param.name)
       })
       that.myChartTip2.setOption(option);
     },
@@ -1248,7 +1335,7 @@ let app = new Vue({
       })
       let that = this
       that.myChartTip3.on('click', function (param) {
-        that.rightPenetrateTwo('', '',param.name)
+        that.rightPenetrateTwo('', '', param.name)
       })
       that.myChartTip3.setOption(option);
     },
@@ -1375,7 +1462,6 @@ let app = new Vue({
     initChartBall () {
       let myChart = echarts.init(this.$refs['echartBall'])
       option = {
-        backgroundColor: "#042148",
         series: [
           {
             type: "liquidFill",
@@ -1640,7 +1726,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'left', '投资计划分析', e.point.name, '', '', '')
                         }
                       }
                     },
@@ -1661,8 +1747,7 @@ let app = new Vue({
                       point: {
                         events: {
                           click: function (e) {
-                            that.showTip3 = true
-                            that.showChartLTipDouble(e.point.name)
+                            that.showChartLTipDouble(e.point.name, 'left', '投资计划分析', e.point.name, '', '', '')
                           }
                         }
                       },
@@ -1752,7 +1837,7 @@ let app = new Vue({
           point: {
             events: {
               click: function (e) { //点击事件
-                that.showChartLTipDouble(e.point.name)
+                that.showChartLTipDouble(e.point.name, 'left', '投资计划分析', e.point.name, '', '', '')
               },
               mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
                 //console.log(e) 
@@ -1769,7 +1854,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'left', '投资计划分析', e.point.name, '', '', '')
                         }
                       }
                     },
@@ -1800,7 +1885,7 @@ let app = new Vue({
                       point: {
                         events: {
                           click: function (e) {
-                            that.showChartLTipDouble(e.point.name)
+                            that.showChartLTipDouble(e.point.name, 'left', '投资计划分析', e.point.name, '', '', '')
                           }
                         }
                       },
@@ -1821,7 +1906,7 @@ let app = new Vue({
                         point: {
                           events: {
                             click: function (e) {
-                              that.showChartLTipDouble(e.point.name)
+                              that.showChartLTipDouble(e.point.name, 'left', '投资计划分析', e.point.name, '', '', '')
                             }
                           }
                         },
@@ -1884,7 +1969,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'left')
                         }
                       }
                     },
@@ -1905,7 +1990,7 @@ let app = new Vue({
                       point: {
                         events: {
                           click: function (e) {
-                            that.showChartLTipDouble(e.point.name)
+                            that.showChartLTipDouble(e.point.name, 'left')
                           }
                         }
                       },
@@ -1916,7 +2001,7 @@ let app = new Vue({
               }, 2000);
             },
             legendItemClick: function (event) {
-              that.showChartLTipDouble(e.point.name)
+              that.showChartLTipDouble(e.point.name, 'left')
               return true;
             }
           }
@@ -1995,7 +2080,7 @@ let app = new Vue({
           point: {
             events: {
               click: function (e) { //点击事件
-                that.showChartLTipDouble(e.point.name)
+                that.showChartLTipDouble(e.point.name, 'left')
               },
               mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
                 //console.log(e) 
@@ -2012,7 +2097,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'left')
                         }
                       }
                     },
@@ -2043,7 +2128,7 @@ let app = new Vue({
                       point: {
                         events: {
                           click: function (e) {
-                            that.showChartLTipDouble(e.point.name)
+                            that.showChartLTipDouble(e.point.name, 'left')
                           }
                         }
                       },
@@ -2307,7 +2392,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'left')
                         }
                       }
                     },
@@ -2401,7 +2486,7 @@ let app = new Vue({
           point: {
             events: {
               click: function (e) { //点击事件
-                that.showChartLTipDouble(e.point.name)
+                that.showChartLTipDouble(e.point.name, 'left')
               },
               mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
                 //console.log(e) 
@@ -2418,7 +2503,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'left')
                         }
                       }
                     },
@@ -2449,7 +2534,7 @@ let app = new Vue({
                       point: {
                         events: {
                           click: function (e) {
-                            that.showChartLTipDouble(e.point.name)
+                            that.showChartLTipDouble(e.point.name, 'left')
                           }
                         }
                       },
@@ -2517,7 +2602,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'left')
                         }
                       }
                     },
@@ -2611,7 +2696,7 @@ let app = new Vue({
           point: {
             events: {
               click: function (e) { //点击事件
-                that.showChartLTipDouble(e.point.name)
+                that.showChartLTipDouble(e.point.name, 'left')
               },
               mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
                 //console.log(e) 
@@ -2628,7 +2713,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'left')
                         }
                       }
                     },
@@ -2659,7 +2744,7 @@ let app = new Vue({
                       point: {
                         events: {
                           click: function (e) {
-                            that.showChartLTipDouble(e.point.name)
+                            that.showChartLTipDouble(e.point.name, 'left')
                           }
                         }
                       },
@@ -2727,7 +2812,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'left')
                         }
                       }
                     },
@@ -2821,7 +2906,7 @@ let app = new Vue({
           point: {
             events: {
               click: function (e) { //点击事件
-                that.showChartLTipDouble(e.point.name)
+                that.showChartLTipDouble(e.point.name, 'left')
               },
               mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
                 //console.log(e) 
@@ -2838,7 +2923,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'left')
                         }
                       }
                     },
@@ -2869,7 +2954,7 @@ let app = new Vue({
                       point: {
                         events: {
                           click: function (e) {
-                            that.showChartLTipDouble(e.point.name)
+                            that.showChartLTipDouble(e.point.name, 'left')
                           }
                         }
                       },
@@ -2938,7 +3023,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'left')
                         }
                       }
                     },
@@ -3032,7 +3117,7 @@ let app = new Vue({
           point: {
             events: {
               click: function (e) { //点击事件
-                that.showChartLTipDouble(e.point.name)
+                that.showChartLTipDouble(e.point.name, 'left')
               },
               mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
                 //console.log(e) 
@@ -3049,7 +3134,7 @@ let app = new Vue({
                     point: {
                       events: {
                         click: function (e) {
-                          that.showChartLTipDouble(e.point.name)
+                          that.showChartLTipDouble(e.point.name, 'left')
                         }
                       }
                     },
@@ -3080,7 +3165,7 @@ let app = new Vue({
                       point: {
                         events: {
                           click: function (e) {
-                            that.showChartLTipDouble(e.point.name)
+                            that.showChartLTipDouble(e.point.name, 'left')
                           }
                         }
                       },
@@ -3248,10 +3333,10 @@ let app = new Vue({
       //   });
       // })
       this.chartCarousel.on('mouseover', (params) => {
-        that.$refs.aaa.handleHover(true, 1, 2, 3, 4)
+        that.$refs.indicator.handleHover(true, 1, 2, 3, 4)
       })
       this.chartCarousel.on('mouseout', (params) => {
-        that.$refs.aaa.handleHover(false, 1, 2, 3, 4)
+        that.$refs.indicator.handleHover(false, 1, 2, 3, 4)
       })
       this.chartCarousel.setOption(option)
       // tools.loopShowTooltip(myChart, option, {
@@ -3403,7 +3488,7 @@ let app = new Vue({
       }
       let that = this
       myChart.on('click', function (param) {
-        that.showChartLTipDouble('固定资产')
+        that.showChartLTipDouble('固定资产', 'left')
       })
       myChart.setOption(option)
       tools.loopShowTooltip(myChart, option, {
@@ -3554,7 +3639,7 @@ let app = new Vue({
       }
       let that = this
       myChart.on('click', function (param) {
-        that.showChartLTipDouble('股权类')
+        that.showChartLTipDouble('股权类', 'left')
       })
       myChart.setOption(option)
       tools.loopShowTooltip(myChart, option, {
@@ -4443,6 +4528,7 @@ let app = new Vue({
           },
         ],
       }
+      let that = this
       myChart.on('click', function (param) {
         that.projectListTipShow = true
       })
@@ -4957,7 +5043,7 @@ let app = new Vue({
         ],
       }
       myChart.on('click', function (param) {
-        that.rightPenetrateTwo(2, '',param.name)
+        that.rightPenetrateTwo(2, '', param.name)
       })
       myChart.setOption(option)
       tools.loopShowTooltip(myChart, option, {
@@ -5156,7 +5242,7 @@ let app = new Vue({
         ]
       }
       myChart.on('click', function (param) {
-        that.rightPenetrateTwo(1, param.seriesName == '正偏差' ? 1 : param.seriesName == '容差' ? 2 : 3,param.name)
+        that.rightPenetrateTwo(1, param.seriesName == '正偏差' ? 1 : param.seriesName == '容差' ? 2 : 3, param.name)
       })
       myChart.setOption(option)
       tools.loopShowTooltip(myChart, option, {
@@ -5389,7 +5475,7 @@ let app = new Vue({
         ],
       }
       myChart.on('click', function (param) {
-        that.rightPenetrateTwo('', '',param.name)
+        that.rightPenetrateTwo('', '', param.name)
       })
       myChart.setOption(option)
       tools.loopShowTooltip(myChart, option, {

+ 2 - 2
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
 })

+ 12 - 6
investmentPort/styles/investHomeGroup.css

@@ -747,9 +747,10 @@ tspan{
   height: 100%;
   display: grid;
   grid-template-rows: repeat(5, minmax(0, 1fr));
-  background-color: #04224c;
+  background-color: #092853;
   padding: 20px 20px;
   font-size: 30px;
+  border-radius: 15px;
 }
 .tip2-list > div {
   width: 100%;
@@ -769,12 +770,16 @@ tspan{
 .total {
   text-align: center;
   position: absolute;
-  left: calc(50% - 150px);
-  bottom: 15%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 350px;
+  bottom: 0;
   font-size: 30px;
   font-weight: bold;
   color: #69c0ff;
   z-index: 999;
+  width: 100%;
 }
 .productTip{
   /* height: ; */
@@ -1002,14 +1007,15 @@ i{
 }
 .arrow1{
  width: 100%;
- height: 100%;
+ height: 10%;
  z-index: 99999;
+ top:46%;
 }
 .arrow1>div:nth-child(1){
   width: 50px;
   height: 0px;
   border-bottom: 1px solid #fff;
-  top: 53.7%;
+  top: 75.7%;
   left: 5.5%;
 }
 .arrow1>i{
@@ -1031,7 +1037,7 @@ i{
   width: 50px;
   height: 0px;
   border-bottom: 1px solid #fff;
-  top: 53.7%;
+  top: 75.7%;
   left: 54.5%;
 }
 .arrow1>i:nth-child(6){