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

investment/investHome.html

@@ -114,11 +114,11 @@
               <div class="flex b">
                 <div>
                   <p>总投资额</p>
-                  <p><span>470.95</span>亿</p>
+                  <p style="color:#40A9FF"><span>470.95</span>亿</p>
                 </div>
                 <div>
                   <p>项目数量</p>
-                  <p><span>140</span>个</p>
+                  <p style="color:#40A9FF"><span>140</span>个</p>
                 </div>
               </div>
             </div>
@@ -130,11 +130,11 @@
               <div class="flex b">
                 <div>
                   <p>投资金额</p>
-                  <p><span>77.7</span>亿</p>
+                  <p style="color:#40A9FF"><span>77.7</span>亿</p>
                 </div>
                 <div>
                   <p>项目数量</p>
-                  <p><span>103</span>个</p>
+                  <p style="color:#40A9FF"><span>103</span>个</p>
                 </div>
               </div>
             </div>

investment/js/data.js

@@ -5,11 +5,11 @@ let info = [
   { name: '股权投资', value: 154.17 },
 ]
 let statusList = [
-  { name: '煤炭和煤电一体化', value: 8.6 },
-  { name: '煤炭和新能源一体化', value: 10.6993 },
-  { name: '煤炭和化工一体化', value: 7.1763 },
-  { name: '煤炭和数字一体化', value: 14.9128 },
-  { name: '煤炭和降碳一体化', value: 6.079607 },
+  { name: '煤炭和煤电', value: 8.6 },
+  { name: '煤炭和新能源', value: 10.6993 },
+  { name: '煤炭和化工', value: 7.1763 },
+  { name: '煤炭和数字', value: 14.9128 },
+  { name: '煤炭和降碳', value: 6.079607 },
 ]
 let executeList = [
   { name: '山西焦煤', value: 189.07, value2: 121.59 },
@@ -24,7 +24,7 @@ let executeList = [
   { name: '文旅集团', value: 26.79, value2: 9.64 },
   { name: '山西交控', value: 346.36, value2: 335.91 },
   { name: '航产集团', value: 41.09, value2: 42.67 },
-  { name: '山西建设', value: 218.35, value2: 143.84 },
+  { name: '山西建投', value: 218.35, value2: 143.84 },
   { name: '汾酒集团', value: 14.03, value2: 7.69 },
   { name: '大地控股', value: 47.05, value2: 23.93 },
   { name: '云时代', value: 63.45, value2: 32.60 },
@@ -92,11 +92,16 @@ let tipBottomData = [
 ]
 
 let industryList = [
-  { name: '传统产业投资', value: 405.29, value2: '0.30' },
-  { name: '战略新兴产业投资', value: 196.44, value2: '0.15' },
-  { name: '基础产业投资', value: 722.34, value2: '0.55' }
+  { name: '传统产业', value: 405.29, value2: '0.30' },
+  { name: '战略新兴产业', value: 196.44, value2: '0.15' },
+  { name: '基础产业', value: 722.34, value2: '0.55' }
+]
 
+let chartDateR2 = [
+  { name: '新建', value: 204, value2: '137.42' },
+  { name: '续建', value: 385, value2: '87.73' },
 ]
+
 let amountList = [
   { value: 283.42, name: '山西焦煤' },
   { value: 622.16, name: '晋能控股' },

investment/js/investHome.js

@@ -1812,15 +1812,15 @@ let app = new Vue({
           trigger: 'item',
           position: ['65%', '42%'],
           formatter: params => {
-            return `<span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${params.color}"></span> ${params.name}：${params.value} <br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${params.color}"></span> 投资占比：${params.percent}%`
+            return `<span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${params.color}"></span> 项目数量：${params.value}个 <br/><span style="display:inline-block;border-radius:50%; width:7px;height:7px;background-color:${params.color}"></span> 投资完成额：${params.data.value2}亿`
           },  //+ '<br/>'+ '{a1}：{c1}' + '%',
           axisPointer: {
             type: 'cross',
           },
         },
-        color: ['#6682f5', '#69c0ff', '#43ede3', '#8ba2ff'],
+        color: [ '#43ede3', '#8ba2ff'],
         legend: {
-          left: '2%',
+          left: '5%',
           bottom: '2%',
           orient: 'vertical',
           //right: '2%',
@@ -1829,30 +1829,6 @@ let app = new Vue({
           },
         },
         series: [
-
-          // {
-          //   hoverOffset: 0,
-          //   startAngle: 90,
-          //   type: "pie",
-          //   radius: [48, 55],
-          //   center: ["50%", "50%"],
-          //   itemStyle: {
-          //     normal: {
-          //         borderColor: 'rgba(1,31,6,0.7)',
-          //         borderWidth: 4
-          //     }
-          //   },
-          //   tooltip: {
-          //     show: false
-          //   },
-          //   labelLine: {
-          //     show: false
-          //   },
-          //   label: {
-          //     show: false
-          //   },
-          //   data: industryList
-          // },
           {
             name: '',
             type: 'pie',
@@ -1870,24 +1846,10 @@ let app = new Vue({
             labelLine: {
               show: false,
             },
-            data: industryList,
+            data: chartDateR2,
           },
         ],
       }
-      let that = this
-      myChart.on('click', function (param) {
-        console.log(param)
-        if (param.name == '战略新兴产业投资') {
-          that.tipTitle2 = param.name
-          that.showTip2 = true
-        }
-
-      })
-      myChart.setOption(option)
-      tools.loopShowTooltip(myChart, option, {
-        nterval: 2000,
-        loopSeries: true,
-      })
       myChart.setOption(option)
       tools.loopShowTooltip(myChart, option, {
         nterval: 2000,