Browse Source

中投修改

zhbyyy 2 years ago
parent
commit
814af316dd

+ 18 - 18
investmentPort/investHomeGroup.html

@@ -29,7 +29,7 @@
   <div id="app" class="w-full h-full" >
     <div class="LeftBox">
       <header class="my-header">
-        <span class="pointer" @click.stop="showTitlePop('2.png','投资业务管理')">投资业务管理</span>
+        <span class="pointer" @click.stop="showTitlePop('2.png','投前管理')">投前管理</span>
       </header>
       <div class="main">
         <div class="card left-rt">
@@ -39,7 +39,7 @@
           <div class="content">
             <div>
               <div class="item3 commonBack pointer" @click.stop="showChartLTipSingle('年度投资计划总额')">
-                <div class="item3-title">{{numFormat(left4[0])}}<span>亿</span></div>
+                <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="">
                 </div>
@@ -48,31 +48,31 @@
                   <div>(企业上报)</div>
                 </div>
               </div>
-              <div class="commonBack flex items-center justify-center">
+              <div class="commonBack">
                 <div class="item4">
                   <div class="item4-title">固定资产类项目</div>
                   <div class="item4-con">
                     <div class="item pointer" @click.stop="showChartLTipSingle('投资金额')">
-                      <div class="text" style="margin-top: 10px;">投资金额</div>
+                      <div class="text" >投资金额</div>
                       <div class="title">{{numFormat(left4[1])}}<span>亿</span></div>
                     </div>
                     <div class="item pointer" @click.stop="showChartLTipSingle('项目数量')">
-                      <div class="text" style="margin-top: 10px;">项目数量</div>
+                      <div class="text" >项目数量</div>
                       <div class="title">{{numFormat(left4[2])}}<span>个</span></div>
                     </div>
                   </div>
                 </div>
               </div>
-              <div class="commonBack flex items-center justify-center">
+              <div class="commonBack">
                 <div class="item4">
                   <div class="item4-title">股权类项目</div>
                   <div class="item4-con">
                     <div class="item pointer" @click.stop="showChartLTipSingle('投资金额')">
-                      <div class="text" style="margin-top: 10px;">投资金额</div>
+                      <div class="text" >投资金额</div>
                       <div class="title">{{numFormat(left4[3])}}<span>亿</span></div>
                     </div>
                     <div class="item pointer" @click.stop="showChartLTipSingle('项目数量')">
-                      <div class="text" style="margin-top: 10px;">项目数量</div>
+                      <div class="text" >项目数量</div>
                       <div class="title">{{numFormat(left4[4])}}<span>个</span></div>
                     </div>
                   </div>
@@ -157,7 +157,7 @@
             <span class="text">重点项目两线指标</span>
           </div>
           <div class="content left-lb">
-            <dv-scroll-board :config="storageRecordConfig" @scroll-change="scrollChange"
+            <dv-scroll-board ref="aaa" :config="storageRecordConfig" @scroll-change="scrollChange"
               class="commonBack"></dv-scroll-board>
             <div id="echartL9" class="commonBack" style="width: 100%; height: 100%;"></div>
           </div>
@@ -172,7 +172,7 @@
         <div class="h-full w-full center-l animate__animated animate__fadeInLeft">
           <div class="card">
             <div class="title">
-              <span class="text ">投资收益总览</span>
+              <span class="text ">投资总览</span>
             </div>
             <div class="content">
               <div class="boxs">
@@ -285,7 +285,7 @@
                 <li>研究中: <i>14</i></li>
                 <li>退回: <i>15</i></li>
                 <li>暂缓: <i>4</i></li>
-                <li>终止 <i>2</i></li>
+                <li>终止: <i>2</i></li>
                 <li>否决: <i>4</i></li>
               </ul>
             </div>
@@ -364,7 +364,7 @@
             <li>研究中: <i>14</i></li>
             <li>退回: <i>15</i></li>
             <li>暂缓: <i>4</i></li>
-            <li>终止 <i>2</i></li>
+            <li>终止: <i>2</i></li>
             <li>否决: <i>4</i></li>
           </ul>
         </div>
@@ -408,7 +408,7 @@
                     style="font-size: 20px;font-weight: bold;font-size: 40px;">{{numFormat(common1[1])}}</span>亿</span>
               </div>
               <div>
-                <span>预计压降带息负债</span>
+                <span>预计带息负债压降</span>
                 <span style="color:#69c0ff"><span
                     style="font-size: 20px;font-weight: bold;font-size: 40px;">{{numFormat(common1[2])}}</span>亿</span>
               </div>
@@ -436,7 +436,7 @@
     </div>
     <div class="RightBox">
       <header class="my-header">
-        <span class="pointer" @click.stop="showTitlePop('7.png','投资项目管理')">投资项目管理</span>
+        <span class="pointer" @click.stop="showTitlePop('7.png','投中、投后管理')">投中、投后管理</span>
         <span class="right">{{time}}</span>
       </header>
       <div class="main">
@@ -496,20 +496,20 @@
           </div>
           <!-- 悬浮窗 -->
           <div class="flotage absolute" :style="{left:(yellowPosition + 'px')}" v-if="yellowCount % 2 ==0">
-            <span>项目数量:{{numFormat(right2[yellowCount][0])}}</span>
             <span>项目金额:{{numFormat(right2[yellowCount][1])}}</span>
           </div>
         </div>
         <div class="right-c">
           <div class="centerBack center-l ">
             <div class="title">
-              <span class="text">这里少个名字</span>
+              <span class="text">进度成本偏差概览</span>
             </div>
             <div class="right-cl content">
               <div v-for="(item,index) in centerLeftList" :key="index" class="w-full h-full">
                 <div class="center-l-title flex items-center justify-center"><span
                     style="margin-right: 10px;color: #0FA9E2;">·</span>{{item.name}}<span
                     style="margin-left: 10px;color: #0FA9E2;">·</span></div>
+                <div class="text-center" style="font-size: 20px;color: #fff;margin-bottom: 10px;">{{item.explain}}</div>
                 <div class="center-l-list flex items-center justify-center flex-col" style="padding-left: 30%;">
                   <span style="color:#69c0ff;"><span
                       style="font-size:30px;font-weight: bold;">{{item.value}}</span><span
@@ -527,7 +527,7 @@
           </div>
           <div>
             <div class="title">
-              <span class="text">这里少个名字</span>
+              <span class="text">投资预算执行</span>
             </div>
             <div class="content">
               <div ref="echartR1" class="w-full h-full" @mouseenter="echartR1Fd = false" @mouseout="echartR1Fd = true">
@@ -538,7 +538,7 @@
         <div class="right-b">
           <div>
             <div class="title">
-              <span class="text">进度成本偏差</span>
+              <span class="text">进度成本偏差分析</span>
             </div>
             <div class="content" style="padding:0">
               <div ref="echartR2" class="w-full h-full" @mouseenter="echartR2Fd = false" @mouseout="echartR2Fd = true">

+ 22 - 22
investmentPort/js/groupData.js

@@ -217,7 +217,7 @@ let left10 = [
 ]
 // 左下
 let left11 = {
-  // waitTime: '30000',
+  waitTime: '2000',
   hoverPause: true,
   header: ['企业集团', '项目名 ', '投资总额'],
   headerHeight: 80,
@@ -444,9 +444,9 @@ let right1 = [
 let right2 = [[120, 3423094], [], [121, 3423094], [], [122, 3423094], [], [123, 3423094], [], [124, 3423094], [], [125, 3423094], [], [126, 3423094], [], [127, 3423094]]
 // 中间左边
 let right3 = [
-  { name: '正偏差', value: '160', value2: '500' },
-  { name: '容差内', value: '28', value2: '264' },
-  { name: '负偏差', value: '103', value2: '182' }
+  { name: '正偏差', value: '160', value2: '500', explain: '项目执行进度大于成本执行进度' },
+  { name: '容差内', value: '28', value2: '264', explain: '项目执行进度与成本执行进度相符' },
+  { name: '负偏差', value: '103', value2: '182', explain: '成本执行进度大于项目执行进度' }
 ]
 // 中间右边
 let right4 = [
@@ -512,24 +512,24 @@ let right5 = [
     ['神农科技', 35.6]
   ],
   [
-    ['山西焦煤', 15.8],
-    ['晋能控股', 15.8],
-    ['华阳新材', 8],
-    ['潞安化工', 17.8],
-    ['华新燃气', 18],
-    ['太重集团', 18],
-    ['国际能源', 8],
-    ['华远陆港', 5.8],
-    ['万家寨水控', 5.8],
-    ['文旅集团', 2.8],
-    ['山西交控', 5.8],
-    ['航产集团', 12.2],
-    ['山西建投', 13.6],
-    ['汾酒集团', 16.65],
-    ['大地控股', 15.6],
-    ['云时代', 13.9],
-    ['华舰体育', 18.6],
-    ['神农科技', 15.6]
+    ['山西焦煤', -15.8],
+    ['晋能控股', -15.8],
+    ['华阳新材', -8],
+    ['潞安化工', -17.8],
+    ['华新燃气', -18],
+    ['太重集团', -18],
+    ['国际能源', -8],
+    ['华远陆港', -5.8],
+    ['万家寨水控', -5.8],
+    ['文旅集团', -2.8],
+    ['山西交控', -5.8],
+    ['航产集团', -12.2],
+    ['山西建投', -13.6],
+    ['汾酒集团', -16.65],
+    ['大地控股', -15.6],
+    ['云时代', -13.9],
+    ['华舰体育', -18.6],
+    ['神农科技', -15.6]
   ]
 ]
 // 右边下面

+ 146 - 101
investmentPort/js/investHomeGroup.js

@@ -2,8 +2,8 @@ let app = new Vue({
   el: '#app',
   data () {
     return {
+      versions: false,
       app_token: '',
-
       centerShow: false, // 中间内容显示
       echartR4Chart: '',// 倒数第二个专用
       echartR5Chart: '', // 倒是第一个专用
@@ -125,37 +125,40 @@ let app = new Vue({
     }
   },
   mounted () {
-    // 假数据版
-    // setTimeout(() => {
-    //   this.initChartL1()
-    //   this.initChartL2()
-    //   this.initChartL3()
-    //   this.initChartL4()
-    //   this.initChartL5()
-    //   this.initChartL6()
-    //   this.initChartL7()
-    //   this.initChartL8()
-    //   this.initChartL10()
-    //   this.initChartL11()
-    //   this.changeTopColor()
-    //   // 大屏二
-    //   this.initChinaChart()
-    //   // 大屏三
-    //   this.initChartR1()
-    //   this.initChartR2()
-    //   this.initChartR3()
-    //   this.changeYellow()
-    // })
-    // 接口版
-    this.getAppToken()
-    setTimeout(() => {
-      this.changeTopColor()
-      // 大屏二
-      this.initChinaChart()
-      // 大屏三
-      this.initChartR5()
-      this.changeYellow()
-    })
+    if (this.versions) {
+      // 接口版
+      this.getAppToken()
+      setTimeout(() => {
+        this.changeTopColor()
+        // 大屏二
+        this.initChinaChart()
+        // 大屏三
+        this.initChartR5()
+        this.changeYellow()
+      })
+    } else {
+      // 假数据版
+      setTimeout(() => {
+        this.initChartL1()
+        this.initChartL2()
+        this.initChartL3()
+        this.initChartL4()
+        this.initChartL5()
+        this.initChartL6()
+        this.initChartL7()
+        this.initChartL8()
+        this.initChartL10()
+        this.initChartL11()
+        this.changeTopColor()
+        // 大屏二
+        this.initChinaChart()
+        // 大屏三
+        this.initChartR1()
+        this.initChartR2()
+        this.initChartR3()
+        this.changeYellow()
+      })
+    }
   },
   methods: {
     // 获取token
@@ -563,7 +566,6 @@ let app = new Vue({
           presetYear: 2023
         }
         get('/ierp/kapi/v2/mdnb/mdnb_pmba_ext/presetdata/getKeyData', value).then(res => {
-          console.log(res, '?????????')
           resolve(1);
         })
       });
@@ -780,7 +782,7 @@ let app = new Vue({
           },
         },
         yAxis: {
-          name: '亿',
+          name: '亿',
           nameTextStyle: {//y轴上方单位的颜色
             color: '#fff',
             fontSize: '20',
@@ -1092,7 +1094,7 @@ let app = new Vue({
           },
         },
         yAxis: {
-          name: '亿',
+          name: '亿',
           nameTextStyle: {//y轴上方单位的颜色
             color: '#fff',
             fontSize: '20',
@@ -1328,6 +1330,7 @@ let app = new Vue({
             type: "liquidFill",
             radius: "80%",
             data: [common2[0], common2[0] + 0.05, common2[0] - 0.05],
+            waveLength :'50%', //波浪长度
             // data: [
             //   {}
             // ],
@@ -1344,7 +1347,7 @@ let app = new Vue({
                     color: "#010a11",
                   },
                   {
-                    offset: 0.75,
+                    offset: 0.9,
                     color: "#1a2f45",
                   },
                   {
@@ -1437,6 +1440,9 @@ let app = new Vue({
             type: "liquidFill",
             radius: "80%",
             data: [left2[0], left2[0] + 0.05, left2[0] - 0.05],
+            // amplitude:'15%',
+            // period:'1500',
+            waveLength :'50%', //波浪长度
             // data: [
             //   {}
             // ],
@@ -1453,7 +1459,7 @@ let app = new Vue({
                     color: "#010a11",
                   },
                   {
-                    offset: 0.75,
+                    offset: 0.9,
                     // color: "#203852",
                     color: "#1a2f45",
                   },
@@ -1548,7 +1554,7 @@ let app = new Vue({
       let that = this
 
       var option = {
-        colors: ['#74a55d', '#cea446', '#b84b4b', '#5593ab', '#2a7652', '#c3643c', '#714585', '#b75d9f'],
+        colors: ['#a79c57', '#cc8c29', '#91a65f', '#e1d7da', '#383062', '#034a39','#b48494','#85868b'],
         chart: {
           type: 'pie',
           backgroundColor: 'rgba(0,0,0,0)',
@@ -1572,8 +1578,8 @@ let app = new Vue({
                   item.sliced = false
                   item.selected = false
                   if (index == i) {
-                    item.sliced = true
-                    item.selected = true
+                    // item.sliced = true
+                    // item.selected = true
                   }
                 })
                 chart.update({
@@ -1594,8 +1600,8 @@ let app = new Vue({
                 if (i === len) {
                   i = 0;
                   chartData.forEach((item, index) => {
-                    item.sliced = false
-                    item.selected = false
+                    // item.sliced = false
+                    // item.selected = false
                   })
                   chart.update({
                     series: [{
@@ -1700,11 +1706,11 @@ let app = new Vue({
               mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
                 //console.log(e) 
                 chartData.forEach((item, index) => {
-                  item.sliced = false
-                  item.selected = false
+                  // item.sliced = false
+                  // item.selected = false
                 })
-                chartData[e.target.index].sliced = true
-                chartData[e.target.index].selected = true
+                // chartData[e.target.index].sliced = true
+                // chartData[e.target.index].selected = true
                 chart.update({
                   series: [{
                     type: 'pie',
@@ -1729,11 +1735,11 @@ let app = new Vue({
                 timer = setInterval(function () {
                   autoTooltip(points[i]);
                   chartData.forEach((item, index) => {
-                    item.sliced = false
-                    item.selected = false
+                    // item.sliced = false
+                    // item.selected = false
                     if (index == i) {
-                      item.sliced = true
-                      item.selected = true
+                      // item.sliced = true
+                      // item.selected = true
                     }
                   })
                   chart.update({
@@ -1792,7 +1798,7 @@ let app = new Vue({
 
       let that = this
       var chart = Highcharts.chart('echartL3', {
-        colors: ['#74a55d', '#cea446', '#b84b4b', '#5593ab', '#2a7652', '#c3643c', '#714585', '#b75d9f'],
+        colors: ['#a79c57', '#cc8c29', '#91a65f', '#e1d7da', '#383062', '#034a39','#b48494','#85868b'],
         chart: {
           type: 'pie',
           backgroundColor: 'rgba(0,0,0,0)',
@@ -1816,8 +1822,8 @@ let app = new Vue({
                   item.sliced = false
                   item.selected = false
                   if (index == i) {
-                    item.sliced = true
-                    item.selected = true
+                    // item.sliced = true
+                    // item.selected = true
                   }
                 })
                 chart.update({
@@ -1838,8 +1844,8 @@ let app = new Vue({
                 if (i === len) {
                   i = 0;
                   chartData.forEach((item, index) => {
-                    item.sliced = false
-                    item.selected = false
+                    // item.sliced = false
+                    // item.selected = false
                   })
                   chart.update({
                     series: [{
@@ -1943,11 +1949,11 @@ let app = new Vue({
               mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
                 //console.log(e) 
                 chartData.forEach((item, index) => {
-                  item.sliced = false
-                  item.selected = false
+                  // item.sliced = false
+                  // item.selected = false
                 })
-                chartData[e.target.index].sliced = true
-                chartData[e.target.index].selected = true
+                // chartData[e.target.index].sliced = true
+                // chartData[e.target.index].selected = true
                 chart.update({
                   series: [{
                     type: 'pie',
@@ -1972,8 +1978,8 @@ let app = new Vue({
                 timer = setInterval(function () {
                   autoTooltip(points[i]);
                   chartData.forEach((item, index) => {
-                    item.sliced = false
-                    item.selected = false
+                    // item.sliced = false
+                    // item.selected = false
                     if (index == i) {
                       item.sliced = true
                       item.selected = true
@@ -1997,8 +2003,8 @@ let app = new Vue({
                   if (i === len) {
                     i = 0;
                     chartData.forEach((item, index) => {
-                      item.sliced = false
-                      item.selected = false
+                      // item.sliced = false
+                      // item.selected = false
                     })
                     chart.update({
                       series: [{
@@ -2039,6 +2045,9 @@ let app = new Vue({
         tooltip: {
           show: true,
           trigger: "axis",
+          formatter: data => {
+            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}:${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}:${data[1].value}亿`
+          },
           axisPointer: {
             // 坐标轴指示器,坐标轴触发有效
             type: "shadow", // 默认为直线,可选为:'line' | 'shadow'
@@ -2074,7 +2083,7 @@ let app = new Vue({
           },
         },
         yAxis: {
-          name: '亿',
+          name: '亿',
           axisTick: {
             lineStyle: {
               color: "#18416F",
@@ -2116,7 +2125,8 @@ let app = new Vue({
             name: "2023年额度",
             type: "bar",
             data: left3[0],
-            showBackground: true,
+            stack: 'Ad',
+            showBackground: false,
             backgroundStyle: {
               color: "#18416F",
             },
@@ -2136,6 +2146,30 @@ let app = new Vue({
               ]),
             },
           },
+          {
+            name: "总额度",
+            type: "bar",
+            data: left3[0],
+            stack: 'Ad',
+            showBackground: false,
+            backgroundStyle: {
+              color: "#18416F",
+            },
+            barWidth: "20",
+            itemStyle: {
+              // barBorderRadius: [10, 10, 0, 0],
+              color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+     {
+                  offset: 0,
+                  color: '#69c0ff',
+                },
+                {
+                  offset: 1,
+                  color: '#69c0ff',
+                },
+              ]),
+            },
+          },
         ],
         legend: {
           // data: ["2022年额度", "2023年额度"],
@@ -2160,16 +2194,19 @@ let app = new Vue({
       myChart.on('click', function (param) {
         that.titleName = param.name
         that.echartEnterpriseShow = true
-        let findData = dataList.find(item => {
-          return item.mdnb_textfield == param.name
-        })
-        common1[0] = findData.mdnb_amountfield18
-        common1[1] = findData.mdnb_amountfield20
-        common1[2] = findData.mdnb_amountfield19
-        common1[3] = findData.mdnb_amountfield26
-        common1[4] = findData.mdnb_amountfield27
-        common1[5] = findData.mdnb_amountfield25
-        common2[0] = findData.mdnb_decimalfield6
+        // 如果是接口版数据版
+        if(that.versions){
+          let findData = dataList.find(item => {
+            return item.mdnb_textfield == param.name
+          })
+          common1[0] = findData.mdnb_amountfield18
+          common1[1] = findData.mdnb_amountfield20
+          common1[2] = findData.mdnb_amountfield19
+          common1[3] = findData.mdnb_amountfield26
+          common1[4] = findData.mdnb_amountfield27
+          common1[5] = findData.mdnb_amountfield25
+          common2[0] = findData.mdnb_decimalfield6
+        }
         setTimeout(() => {
           that.initChartBall()
         });
@@ -2184,7 +2221,7 @@ let app = new Vue({
       let that = this
 
       var option = {
-        colors: ['#74a55d', '#cea446', '#b84b4b', '#5593ab', '#2a7652', '#c3643c', '#714585', '#b75d9f'],
+        colors: ['#a79c57', '#cc8c29', '#91a65f', '#e1d7da', '#383062', '#034a39','#b48494','#85868b'],
         chart: {
           type: 'pie',
           backgroundColor: 'rgba(0,0,0,0)',
@@ -2394,7 +2431,7 @@ let app = new Vue({
       let that = this
 
       var option = {
-        colors: ['#74a55d', '#cea446', '#b84b4b', '#5593ab', '#2a7652', '#c3643c', '#714585', '#b75d9f'],
+        colors: ['#a79c57', '#cc8c29', '#91a65f', '#e1d7da', '#383062', '#034a39','#b48494','#85868b'],
         chart: {
           type: 'pie',
           backgroundColor: 'rgba(0,0,0,0)',
@@ -2604,7 +2641,7 @@ let app = new Vue({
       let that = this
 
       var option = {
-        colors: ['#74a55d', '#cea446', '#b84b4b', '#5593ab', '#2a7652', '#c3643c', '#714585', '#b75d9f'],
+        colors: ['#a79c57', '#cc8c29', '#91a65f', '#e1d7da', '#383062', '#034a39','#b48494','#85868b'],
         chart: {
           type: 'pie',
           backgroundColor: 'rgba(0,0,0,0)',
@@ -2815,7 +2852,7 @@ let app = new Vue({
       let that = this
 
       var option = {
-        colors: ['#74a55d', '#cea446', '#b84b4b', '#5593ab', '#2a7652', '#c3643c', '#714585', '#b75d9f'],
+        colors: ['#a79c57', '#cc8c29', '#91a65f', '#e1d7da', '#383062', '#034a39','#b48494','#85868b'],
         chart: {
           type: 'pie',
           backgroundColor: 'rgba(0,0,0,0)',
@@ -3152,13 +3189,19 @@ let app = new Vue({
         ],
       }
       let that = this
-      this.chartCarousel.on('click', function (param) {
-        that.titleName = param.name
-        that.echartSingleTipShow = true
-        setTimeout(() => {
-          that.initChartLTip()
-        });
+      // this.chartCarousel.on('click', function (param) {
+      //   that.titleName = param.name
+      //   that.echartSingleTipShow = true
+      //   setTimeout(() => {
+      //     that.initChartLTip()
+      //   });
+      // })
+      this.chartCarousel.on('mouseover', (params) => {
+       that.$refs.aaa.handleHover(true,1,2,3,4)
       })
+      this.chartCarousel.on('mouseout', (params) => {
+        that.$refs.aaa.handleHover(false,1,2,3,4)
+       })
       this.chartCarousel.setOption(option)
       // tools.loopShowTooltip(myChart, option, {
       //   nterval: 2000,
@@ -3185,7 +3228,7 @@ let app = new Vue({
         tooltip: {
           trigger: "axis",
           formatter: function (params) {
-            var tip = params[0].axisValue + '<br/>' + params[0].marker + params[0].data[1] + ':' + params[0].data[2] + '个,' + params[0].data[3] + '亿' + '<br/>' + params[1].marker + params[1].data[1] + ':' + params[1].data[2] + '个,' + params[1].data[3] + '亿';
+            var tip = params[0].axisValue + '<br/>' + params[0].marker + params[0].data[1] + ':' + params[0].data[2] + '个,' + params[0].data[3] + '亿' + '<br/>' + params[1].marker + params[1].data[1] + ':' + params[1].data[2] + '个,' + params[1].data[3] + '亿';
             return tip
           },
           textStyle: {
@@ -3337,7 +3380,7 @@ let app = new Vue({
         tooltip: {
           trigger: "axis",
           formatter: function (params) {
-            var tip = params[0].axisValue + '<br/>' + params[0].marker + params[0].data[1] + ':' + params[0].data[2] + '个,' + params[0].data[3] + '亿' + '<br/>' + params[1].marker + params[1].data[1] + ':' + params[1].data[2] + '个,' + params[1].data[3] + '亿';
+            var tip = params[0].axisValue + '<br/>' + params[0].marker + params[0].data[1] + ':' + params[0].data[2] + '个,' + params[0].data[3] + '亿' + '<br/>' + params[1].marker + params[1].data[1] + ':' + params[1].data[2] + '个,' + params[1].data[3] + '亿';
             return tip
           },
           textStyle: {
@@ -3477,7 +3520,7 @@ let app = new Vue({
       let that = this
 
       var option = {
-        colors: ['#74a55d', '#cea446', '#b84b4b', '#5593ab', '#2a7652', '#c3643c', '#714585', '#b75d9f'],
+        colors: ['#a79c57', '#cc8c29', '#91a65f', '#e1d7da', '#383062', '#034a39','#b48494','#85868b'],
         chart: {
           type: 'pie',
           backgroundColor: 'rgba(0,0,0,0)',
@@ -3568,7 +3611,8 @@ let app = new Vue({
             showInLegend: true, // 图例
             cursor: 'pointer',
             size: 500,
-            innerSize: 330, //环形图中间空白,0为饼图
+            // innerSize: 330, //环形图中间空白,0为饼图
+            innerSize: 0, //环形图中间空白,0为饼图
             depth: 75, //立体高度
             slicedOffset: 40, //动画距离
             dataLabels: {
@@ -3784,7 +3828,7 @@ let app = new Vue({
         yAxis: [
           {
             type: 'value',
-            name: '亿',
+            name: '亿',
             splitLine: {
               show: true,
               lineStyle: {
@@ -4245,7 +4289,7 @@ let app = new Vue({
       let option = {
         tooltip: {
           trigger: 'axis',
-          formatter: '{a0}:{c0}' + '亿',  //+ '<br/>'+ '{a1}:{c1}' + '%',
+          formatter: '{a0}:{c0}' + '亿',  //+ '<br/>'+ '{a1}:{c1}' + '%',
           axisPointer: {
             // type: 'cross',',
           },
@@ -4292,7 +4336,7 @@ let app = new Vue({
         yAxis: [
           {
             type: 'value',
-            name: '亿',
+            name: '亿',
             splitLine: {
               show: true,
               lineStyle: {
@@ -4383,7 +4427,7 @@ let app = new Vue({
           num: item.value,
           sliced: false,
           selected: false,
-          color: index == 0 ? '#74a55d' : '#cea446'
+          color: index == 0 ? '#a79c57' : '#cc8c29'
         }
         chartData.push(obj)
 
@@ -4505,7 +4549,8 @@ let app = new Vue({
             showInLegend: true, // 图例
             cursor: 'pointer',
             size: 500,
-            innerSize: 330, //环形图中间空白,0为饼图
+            // innerSize: 330, //环形图中间空白,0为饼图
+            innerSize: 0, //环形图中间空白,0为饼图
             depth: 75, //立体高度
             slicedOffset: 40, //动画距离
             dataLabels: {
@@ -4737,7 +4782,7 @@ let app = new Vue({
         yAxis: [
           {
             type: 'value',
-            name: '亿',
+            name: '亿',
             nameTextStyle: {
               color: 'rgba(255,255,255,0.6)',
             },
@@ -4985,7 +5030,7 @@ let app = new Vue({
           bottom: '5%',
         },
         yAxis: {
-          name: '亿',
+          name: '亿',
           splitLine: {
             show: true,
             lineStyle: {
@@ -5048,7 +5093,7 @@ let app = new Vue({
             itemStyle: itemStyle,
             data: right5[0],
             symbolSize: function (data) {
-              return Math.sqrt(data[1]) * 9;
+              return Math.sqrt(Math.abs(data[1])) * 9;
             },
           },
           {
@@ -5057,7 +5102,7 @@ let app = new Vue({
             itemStyle: itemStyle,
             data: right5[1],
             symbolSize: function (data) {
-              return Math.sqrt(data[1]) * 8;
+              return Math.sqrt(Math.abs(data[1])) * 8;
             },
           },
           {
@@ -5066,7 +5111,7 @@ let app = new Vue({
             itemStyle: itemStyle,
             data: right5[2],
             symbolSize: function (data) {
-              return Math.sqrt(data[1]) * 7;
+              return Math.sqrt(Math.abs(data[1])) * 7;
             },
           }
         ]
@@ -5206,7 +5251,7 @@ let app = new Vue({
         yAxis: [
           {
             type: 'value',
-            name: '亿',
+            name: '亿',
             nameTextStyle: {
               color: 'rgba(255,255,255,0.6)',
             },
@@ -5465,7 +5510,7 @@ let app = new Vue({
         yAxis: [
           {
             type: 'value',
-            name: '亿',
+            name: '亿',
             nameTextStyle: {
               color: 'rgba(255,255,255,0.6)',
             },

+ 35 - 25
investmentPort/styles/investHomeGroup.css

@@ -162,7 +162,7 @@ div {
   height: 100%;
 }
 .LeftBox .item2 {
-  width: 50%;
+  width: 80%;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -182,7 +182,7 @@ div {
 }
 .LeftBox .item2 .item2-text {
   color: #fff;
-  font-size: 20px;
+  font-size: 30px;
 }
 .LeftBox .content-left-top {
   width: 100%;
@@ -228,12 +228,14 @@ div {
   display: flex;
   flex-direction: column;
   align-items: center;
-  justify-content: center;
 }
 .LeftBox .left-rt .item3 .item3-title {
   font-weight: bold;
   font-size: 30px;
   color: #69c0ff;
+  display: flex;
+  align-items: center;
+  height: 30%;
 }
 .LeftBox .left-rt .item3 .item3-title span {
   font-size: 20px;
@@ -242,8 +244,7 @@ div {
 .left-rt .item3 .item3-img {
   margin-top: -20px;
   width: 100px;
-  height: 102px;
-  margin-bottom: 18px;
+  height: 100px;
 }
 .LeftBox .left-rt .item3 .item3-text {
   font-size: 14px;
@@ -251,16 +252,22 @@ div {
 }
 .LeftBox .left-rt .item4-text {
   font-size: 20px;
+  height: calc( 70% - 80px );
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  justify-content: center;
 }
 .LeftBox .left-rt .item4 .item4-title {
   position: relative;
-  padding-left: 10px;
   color: #69c0ff;
-  margin-left: 10px;
-  margin-top: 5px;
   font-size: 30px;
+  display: flex;
+  align-items: center;
+  height: 30%;
+  justify-content: center;
 }
-.LeftBox .left-rt .item4 .item4-title::before {
+/* .LeftBox .left-rt .item4 .item4-title::before {
   content: '';
   position: absolute;
   left: 0;
@@ -270,29 +277,27 @@ div {
   height: 5px;
   border-radius: 50%;
   background-color: #69c0ff;
+} */
+.item4{
+  height: 100%;
 }
-
 .LeftBox .left-rt .item4 .item4-con {
   display: flex;
   align-items: center;
   justify-content: space-around;
-  height: 100%;
-  margin-top: 20px;
+  height: 70%;
 }
 .LeftBox .left-rt .item4 .item4-con .item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  margin: 0 30px;
+  height: 100%;
 }
 .LeftBox .left-rt .item4 .item4-con .item .title {
   color: #69c0ff;
   font-weight: bold;
   font-size: 30px;
-  height: 30px !important;
-  line-height: 30px !important;
-  margin-top: 10px;
+  height: calc( 100% - 100px );
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .LeftBox .left-rt .item4 .item4-con .item .title span {
   font-weight: bold;
@@ -301,6 +306,11 @@ div {
 .LeftBox .left-rt .item4 .item4-con .item .text {
   font-size: 30px;
   color: #fff;
+  height: 100px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: -10px;
 }
 .LeftBox .left-rtb {
   display: grid;
@@ -620,14 +630,14 @@ tspan{
 }
 .RightBox .center-l-title {
   width: 100%;
-  height: 15%;
-  margin-top: 10%;
+  height: 17%;
+  margin-top: 3%;
   font-size: 30px;
   font-weight: bold;
 }
 .RightBox .center-l-list {
   height: 30%;
-  margin: 10% 0;
+  margin: 8% 0;
   background: url('../groupImg/project.png') no-repeat center;
   background-size: 100% auto;
   font-size: 26px;
@@ -650,14 +660,14 @@ tspan{
 }
 .RightBox .flotage {
   width: 220px;
-  height: 100px;
+  height: 50px;
   background-color: rgba(54, 60, 67, 0.4);
   display: flex;
   flex-direction: column;
   justify-content: space-around;
   padding: 10px;
   /* border: 1px solid #557e81; */
-  top: 15px;
+  top: 60px;
   border-radius: 5px;
   transition: all 0.2s;
 }