Przeglądaj źródła

投资执行情况接口对接

zhbyyy 2 lat temu
rodzic
commit
bda0db4e33
2 zmienionych plików z 21 dodań i 142 usunięć
  1. 0 1
      investmentNew/index.html
  2. 21 141
      investmentNew/js/index.js

+ 0 - 1
investmentNew/index.html

@@ -405,7 +405,6 @@
             <div class="title">投资产业分布</div>
             <div class="content relative">
               <div style="width: 100%;height: 100%;" ref="leftEcharts12"></div>
-              <div style="width: 100%;height: 100%;top: 0;left: 0;" class="absolute" ref="leftEcharts17"></div>
               <div class="absolute flex flex-col items-center justify-center" style="top: 40%;left: 36.5%;">
                 <span style="color: #58E6F7;font-size: 50px;font-weight: bold;">{{stageTitle3}}</span>
                 <span class="font28 text-center" style="width: 180px;">{{stageTitle4}}</span>

+ 21 - 141
investmentNew/js/index.js

@@ -27,7 +27,6 @@ let app = new Vue({
       changeLine: true, //双柱状图弹窗上边是折线还是柱状
       rightAdd: {},// 左边新增筛选参数
       lineCommonCompany: [], //双柱状图弹窗上面的折线图x轴
-      leftEcharts17: '', //投资产业分布中间的水球图
       leftEcharts18: '', //单个柱状图弹窗
       tipShow1: false, // 标题弹窗显示
       tipShow2: false, // 单柱状图弹窗 
@@ -569,9 +568,8 @@ let app = new Vue({
       this.getAppToken()
       setTimeout(() => {
         if (that.mapShow) {
-          that.leftEcharts17Fun()
           // that.leftEcharts12Fun()
-          that.leftEcharts14Fun()
+          // that.leftEcharts14Fun()
           that.leftEcharts9Fun()
           that.leftEcharts15Fun()
           that.leftEcharts13Fun()
@@ -1006,6 +1004,8 @@ let app = new Vue({
             center3[index].value = that.yuanChange(item.plan)
             center3[index].value2 = that.yuanChange(item.reality)
           })
+          center3.sort(that.compare('value'))
+          that.leftEcharts14Fun()
           // 五个一体化
           res.data.five.forEach((item, index) => {
             center6[index] = { name: item.type, value: that.yuanChange(item.amount), typeno: item.typeno }
@@ -4310,7 +4310,6 @@ let app = new Vue({
           that.mapShow = true
           setTimeout(() => {
             that.leftEcharts12Fun()
-            that.leftEcharts17Fun()
             that.leftEcharts14Fun()
             that.leftEcharts9Fun()
             that.leftEcharts15Fun()
@@ -4759,8 +4758,6 @@ let app = new Vue({
         tooltip: {
           show: true,
           formatter: function (params) {
-            that.leftEcharts17.dispose()
-            that.leftEcharts17Fun()
             left2[0] = that.numDiv(params.percent + 3.2, 100)
             if (params.seriesIndex === 2) {
               return null; // 隐藏部分2的tooltip
@@ -4783,7 +4780,7 @@ let app = new Vue({
         legend: {
           icon: "circle",
           orient: 'vertical',
-          data:totalData.map(item=>item.name),
+          data: totalData.map(item => item.name),
           left: '5%',
           bottom: 0,
           align: 'left',
@@ -4849,6 +4846,9 @@ let app = new Vue({
         return dataArr
 
       }
+      that.leftEcharts12.on('click', (params) => {
+        that.showChartLTipDouble(params.name, 'center', '', '', '', '', 'distribution', center2.filter(item => item.name == params.name)[0].typeno, 'industry', center2.filter(item => item.name == params.name)[0].typeno, 1, 112)
+      })
       //轮播
       tools.loopShowTooltip(that.leftEcharts12, option, {
         interval: 1000,
@@ -4857,135 +4857,6 @@ let app = new Vue({
       //注册
       that.leftEcharts12.setOption(option);
     },
-    leftEcharts17Fun () {
-      let that = this;
-      this.leftEcharts17 = echarts.init(this.$refs["leftEcharts17"]);
-      return
-      var seriesOption = [
-        {
-          type: "liquidFill",
-          radius: "40%",
-          tooltip: {
-            show: false
-          },
-          data: [left2[0]],
-          center: [350, 260],
-          backgroundStyle: {
-            color: {
-              type: "radial",
-              x: 0.5,
-              y: 0.5,
-              r: 0.5,
-              // 水球体颜色
-              colorStops: [
-                {
-                  offset: 0,
-                  color: "#010a11",
-                },
-                {
-                  offset: 0.75,
-                  // color: "#203852",
-                  color: "#1a2f45",
-                },
-                {
-                  offset: 1,
-                  // color: "#354e6d",
-                  color: "#2b405a",
-                  // color: "#314967",
-                },
-              ],
-              globalCoord: false,
-            },
-          },
-          outline: {
-            borderDistance: 0,
-            itemStyle: {
-              borderWidth: 0,
-              borderColor: {
-                type: "linear",
-                x: 0,
-                y: 0,
-                x2: 0,
-                y2: 1,
-                colorStops: [
-                ],
-                globalCoord: false,
-              },
-            },
-          },
-          color: [
-            {
-              x: 0,
-              y: 0,
-              x2: 0,
-              y2: 1,
-              colorStops: [{
-                offset: 0,
-                color: '#237386',
-              },
-              {
-                offset: 1,
-                color: '#0078C8',
-              },],
-            },
-            {
-              x: 0,
-              y: 0,
-              x2: 0,
-              y2: 1,
-              colorStops: [{
-                offset: 0,
-                color: '#2F97A9',
-              },
-              {
-                offset: 1,
-                color: '#0078C8',
-              },],
-            },
-            {
-              x: 0,
-              y: 0,
-              x2: 0,
-              y2: 1,
-              colorStops: [{
-                offset: 0,
-                color: '#48E0ED',
-              },
-              {
-                offset: 1,
-                color: '#0078C8',
-              },],
-            }
-          ],
-          label: {
-            normal: {
-              textStyle: {
-                fontSize: '50',
-                color: "#58E6F7", // x轴文字颜色
-              },
-            },
-          },
-        },
-      ];
-      option = {
-        color: commonColor,
-        title: {
-          show: false,
-          text: '',
-          top: '48%',
-          textAlign: "center",
-          left: "49%",
-          textStyle: {
-            color: '#fff',
-            fontSize: 18,
-            fontWeight: '400'
-          }
-        },
-        series: seriesOption
-      }
-      //注册
-      that.leftEcharts17.setOption(option);
-    },
     leftEcharts13Fun () {
       let that = this;
       this.leftEcharts13 = echarts.init(this.$refs["leftEcharts13"]);
@@ -5202,8 +5073,6 @@ let app = new Vue({
       let option = {
         dataZoom: [
           {
-            // start: 9,//默认为@
-            // end: 100,//黑认认为1@0
             type: "slider",
             show: false,
             yAxisIndex: 0,
@@ -5328,13 +5197,13 @@ let app = new Vue({
             fontSize: 20,
             fontFamily: 'Microsoft YaHei'
           },
-          data: that.riskData1.x
+          data: (center3.map(item => item.name).reverse())
         },
         series: [
           {
             name: '实际投资',
             type: 'bar',
-            data: that.riskData1.y1,
+            data: (center3.map(item => item.value)).reverse(),
             barGap: '-145%',
             barWidth: "15",
             zlevel: 10,
@@ -5356,7 +5225,7 @@ let app = new Vue({
           {
             name: '计划投资',
             type: 'bar',
-            data: that.riskData1.y2,
+            data: (center3.map(item => item.value2)).reverse(),
             barWidth: "30",
             itemStyle: {
               barBorderRadius: [0, 50, 50, 0],
@@ -5376,6 +5245,10 @@ let app = new Vue({
           }
         ]
       };
+      that.leftEcharts14.on('click', (params) => {
+        params.seriesName == '计划投资' ? that.projectNum = 1131 : that.projectNum = 1132
+        that.centerPenetrateTwo('', '', that.findCode(params.name), params.seriesName == '计划投资' ? 2 : 1)
+      })
       //轮播
       tools.loopShowTooltip(that.leftEcharts14, option, {
         interval: 2000,
@@ -6697,6 +6570,13 @@ let app = new Vue({
         loopSeries: true,
       })
     },
+    // 找企业编码
+    findCode (code) {
+      let a = this.commonCompanyAll.find((item, index) => {
+        return item.simplename == code
+      })
+      return a ? a.number.slice(0, 4) : ''
+    },
     // 根据key分组
     classify (arr, k) {
       let map = {};