Browse Source

合并代码

zhangyaojie 1 year ago
parent
commit
a6edf2fda9
2 changed files with 13 additions and 230 deletions
  1. 7 33
      investmentNew/index.html
  2. 6 197
      investmentNew/js/index.js

+ 7 - 33
investmentNew/index.html

@@ -511,39 +511,13 @@
                     top: 60%;
                     left: 70%;
                     animation-delay: 1s;
-                  ">
-                <span style="font-size: 30px; font-weight: bold; color: #68bdff">153<span class="font28">个</span></span>
-                <span class="font28">项目数量</span>
-              </div>
-              <div class="absolute flex items-center justify-center flex-col bubble"
-                style="width: 175px; height: 175px; top: 65%; left: 15%">
-                <span style="font-size: 30px; font-weight: bold; color: #ebde27">113<span class="font28">个</span></span>
-                <span class="font28">项目数量</span>
-              </div>
-              <div class="absolute flex items-center justify-center flex-col bubble"
-                style="width: 190px; height: 190px; top: 35%; left: 50%">
-                <span style="font-size: 30px; font-weight: bold; color: #ebde27">168<span class="font28">亿</span></span>
-                <span class="font28">投资金额</span>
-              </div>
-            </div>
-          </div>
-          <div>
-            <div class="title">投资产业分布</div>
-            <div class="content">
-              <div ref="leftEcharts12" style="height: 100%;width: 100%;"></div>
-            </div>
-          </div>
-          <div>
-            <div class="title">投资执行情况</div>
-            <div class="content"></div>
-          </div>
-        </div>
-        <div class="center2">
-          <div>
-            <div class="flex justify-center flex-col">
-              <div>
-                <div style="font-size: 60px; color: #68bdff; font-weight: bold">
-                  17.09<span style="font-size: 28px">亿</span>
+                  "
+                >
+                  <span
+                    style="font-size: 30px; font-weight: bold; color: #68bdff"
+                    >153<span class="font28">个</span></span
+                  >
+                  <span class="font28">项目数量</span>
                 </div>
                 <div
                   class="absolute flex items-center justify-center flex-col bubble"

+ 6 - 197
investmentNew/js/index.js

@@ -13,10 +13,9 @@ let app = new Vue({
       leftEcharts6: "",
       leftEcharts7: "",
       leftEcharts8: "",
-      leftEcharts9: '',
-      leftEcharts10: '',
-      leftEcharts11: '',
-      leftEcharts12: '',
+      leftEcharts9: "",
+      leftEcharts10: "",
+      leftEcharts11: "",
       shanxiMap: "", // 山西地图
       industryProportion: 1, // 主辅业占比轮播
       industryLayout: 0, //产业布局分析
@@ -404,7 +403,6 @@ let app = new Vue({
       this.leftEcharts9Fun();
       this.leftEcharts10Fun();
       this.leftEcharts11Fun();
-      this.leftEcharts12Fun();
       this.chinaEchartsFun();
       this.initChartR1();
       this.initChartR2();
@@ -3145,14 +3143,9 @@ let app = new Vue({
             coordinateSystem: "geo",
             data: [
               {
-                "name": "太原市",
-                "value": [
-                  112.53,
-                  37.87,
-                  25167,
-                  113
-                ]
-              }
+                name: "太原市",
+                value: [112.53, 37.87, 25167],
+              },
             ],
             symbolSize: function (val) {
               return Math.max(val[2] / 500, 8);
@@ -3436,14 +3429,6 @@ let app = new Vue({
           axisPointer: {
             type: "shadow",
           },
-          backgroundColor: "rgba(50,50,50,0.7)", // 提示框浮层的背景颜色
-          borderColor: "rgba(50,50,50,0.7)",
-          textStyle: {
-            color: "#fff",
-            fontStyle: "normal", // 文字字体的风格('normal',无样式;'italic',斜体;'oblique',倾斜字体)
-            fontWeight: "normal", // 文字字体的粗细('normal',无样式;'bold',加粗;'bolder',加粗的基础上再加粗;'lighter',变细;数字定义粗细也可以,取值范围100至700)
-            fontSize: "28", // 文字字体大小
-          },
         },
         grid: {
           top: "10%",
@@ -3583,181 +3568,5 @@ let app = new Vue({
       //注册
       that.leftEcharts11.setOption(option);
     },
-    leftEcharts12Fun () {
-      let that = this;
-      this.leftEcharts12 = echarts.init(this.$refs["leftEcharts12"]);
-      var totalData = [{
-        name: '传统产业',
-        value: 12,
-        radio: 0.13
-      }, {
-        name: '公共基础产业',
-        value: 52,
-        radio: 0.01
-      }, {
-        name: '战略性新兴产业',
-        value: 15,
-        radio: 3.9
-      }, {
-        name: '特色优势产业',
-        value: 56,
-        radio: 10.5
-      }];
-
-      var data = [];
-      for (var i = 0; i < totalData.length; i++) {
-        data.push({
-          value: totalData[i].value,
-          name: totalData[i].name,
-          itemStyle: {
-            normal: {
-              borderWidth: 8,
-              shadowBlur: 0,
-              borderColor: commonColor[i],
-              shadowColor: commonColor[i]
-            }
-          }
-        },
-          {
-            value: 5,
-            name: '',
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false
-                },
-                labelLine: {
-                  show: false
-                },
-                color: 'rgba(0, 0, 0, 0)',
-                borderColor: 'rgba(0, 0, 0, 0)',
-                borderWidth: 0
-              }
-            }
-          }
-        );
-      }
-      var seriesOption = [{
-        name: '',
-        type: 'pie',
-        clockWise: false,
-        radius: [170, 160],
-        center: [260, 250],
-        hoverAnimation: false,
-        itemStyle: {
-          normal: {
-            label: {
-              show: false,
-            }
-          }
-        },
-        data: data
-      },
-      {
-        type: 'pie',
-        radius: [120, 120],
-        center: [260, 250],
-        zlevel: 3,
-        silent: true,
-        label: {
-          normal: {
-            show: false
-          },
-        },
-        labelLine: {
-          normal: {
-            show: false
-          }
-        },
-        data: _pie3()
-      },
-      ];
-      option = {
-        color: commonColor,
-        title: {
-          show: false,
-          text: '风险类型123',
-          top: '48%',
-          textAlign: "center",
-          left: "49%",
-          textStyle: {
-            color: '#fff',
-            fontSize: 18,
-            fontWeight: '400'
-          }
-        },
-        tooltip: {
-          show: false
-        },
-        legend: {
-          icon: "circle",
-          orient: 'vertical',
-          formatter: function (name) {
-            let num
-            for (let i = 0; i < totalData.length; i++) {
-              if (totalData[i].name === name) {
-                num = name + ':' + totalData[i].value + '(' + totalData[i].radio + '%' + ')'
-              }
-            }
-            return num
-          },
-          data: ['传统产业', '公共基础产业', '战略性新兴产业', '特色优势产业'],
-          right: 0,
-          bottom: 0,
-          align: 'left',
-          textStyle: {
-            color: '#FFF',     // 文字的颜色
-            fontSize: '20',    // 文字字体大小
-            fontFamily: 'Microsoft YaHei'
-          },
-          itemGap: 20
-        },
-        toolbox: {
-          show: false
-        },
-        series: seriesOption
-      }
-
-      function _pie3 () {
-        let dataArr = [];
-        for (var i = 0; i < 100; i++) {
-          if (i % 2 === 0) {
-            dataArr.push({
-              name: (i + 1).toString(),
-              value: 25,
-              itemStyle: {
-                normal: {
-                  color: "#5A5DE0",
-                  borderWidth: 1,
-                  borderColor: "#5A5DE0"
-                }
-              }
-            })
-          } else {
-            dataArr.push({
-              name: (i + 1).toString(),
-              value: 20,
-              itemStyle: {
-                normal: {
-                  color: "rgba(0,0,0,0)",
-                  borderWidth: 0,
-                  borderColor: "rgba(0,0,0,0)"
-                }
-              }
-            })
-          }
-
-        }
-        return dataArr
-
-      }
-      //轮播
-      tools.loopShowTooltip(that.leftEcharts12, option, {
-        interval: 2000,
-        loopSeries: true,
-      });
-      //注册
-      that.leftEcharts12.setOption(option);
-    },
   },
 });