Merge branch 'main' of https://git.sxidc.com/kingdee_large_screen/pc_kingdee_large_screen

investment/investHome.html

@@ -69,7 +69,7 @@
                       <i class="el-icon-more"></i>
                     </p>
                     <p>
-                      <i><span class="num">{{numFormat(1169.91)}}</span>亿</i>
+                      <i><span class="num">1,169.91</span>亿</i>
                       <!-- <span class="change up"><img src="./images/up.png" /> 12.1%</span> -->
                     </p>
                   </div>
@@ -114,11 +114,11 @@
               <div class="flex b">
                 <div>
                   <p>总投资额</p>
-                  <p style="color:#40A9FF"><span>470.95</span>亿</p>
+                  <p style="color:#40A9FF"><span>619.30</span>亿</p>
                 </div>
                 <div>
                   <p>项目数量</p>
-                  <p style="color:#40A9FF"><span>140</span>个</p>
+                  <p style="color:#40A9FF"><span>150</span>个</p>
                 </div>
               </div>
             </div>
@@ -130,11 +130,11 @@
               <div class="flex b">
                 <div>
                   <p>投资金额</p>
-                  <p style="color:#40A9FF"><span>77.7</span>亿</p>
+                  <p style="color:#40A9FF"><span>79.26</span>亿</p>
                 </div>
                 <div>
                   <p>项目数量</p>
-                  <p style="color:#40A9FF"><span>103</span>个</p>
+                  <p style="color:#40A9FF"><span>113</span>个</p>
                 </div>
               </div>
             </div>

investment/js/data.js

@@ -98,8 +98,8 @@ let industryList = [
 ]
 
 let chartDateR2 = [
-  { name: '新建', value: 204, value2: '137.42' },
-  { name: '续建', value: 385, value2: '87.73' },
+  { name: '新建', value: 204, value2: '345.53' },
+  { name: '续建', value: 385, value2: '978.55' },
 ]
 
 let amountList = [

investment/js/investHome.js

@@ -574,7 +574,6 @@ let app = new Vue({
       }
       let that = this
       myChart.on('click', function (params) {
-        console.log(params)
         if (params.name == '太原市') {
           that.showTip = true
         }
@@ -1597,7 +1596,6 @@ let app = new Vue({
       }
       let that = this
       myChart.on('click', function (param) {
-        console.log(param)
         if (param.name == '战略新兴产业') {
           that.tipTitle2 = param.name
           that.showTip2 = true
@@ -1614,8 +1612,7 @@ let app = new Vue({
       let myChart = echarts.init(this.$refs['echartL2'])
       let option = {
         tooltip: {
-          formatter: data => {
-            console.log(data)
+          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}亿`
           },
           trigger: 'axis',