1 year ago · 79c4f1f834
--- a/index.html
+++ b/index.html
@@ -8,6 +8,11 @@
 
				     <meta name="renderer" content="webkit">
			
 
				     <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no">
			
 
				   </head>
			
 
				+  <style>
			
 
				+    a{
			
 
				+      font-size: 100px;
			
 
				+    }
			
 
				+  </style>
			
 
				   <body>
			
 
				     <a href="./cokingCoal/cokingCoalD.html">大屏1</a>
			
 
				     <a href="./investment/investHome.html">大屏2</a>
			
--- a/investmentNew/img/3D/shanxiMap.png
+++ b/investmentNew/img/3D/shanxiMap.png
--- a/investmentNew/img/shanxi/0.png
+++ b/investmentNew/img/shanxi/0.png
--- a/investmentNew/img/shanxi/1.png
+++ b/investmentNew/img/shanxi/1.png
--- a/investmentNew/img/shanxi/10.png
+++ b/investmentNew/img/shanxi/10.png
--- a/investmentNew/img/shanxi/2.png
+++ b/investmentNew/img/shanxi/2.png
--- a/investmentNew/img/shanxi/3.png
+++ b/investmentNew/img/shanxi/3.png
--- a/investmentNew/img/shanxi/4.png
+++ b/investmentNew/img/shanxi/4.png
--- a/investmentNew/img/shanxi/5.png
+++ b/investmentNew/img/shanxi/5.png
--- a/investmentNew/img/shanxi/6.png
+++ b/investmentNew/img/shanxi/6.png
--- a/investmentNew/img/shanxi/7.png
+++ b/investmentNew/img/shanxi/7.png
--- a/investmentNew/img/shanxi/8.png
+++ b/investmentNew/img/shanxi/8.png
--- a/investmentNew/img/shanxi/9.png
+++ b/investmentNew/img/shanxi/9.png
--- a/investmentNew/index.html
+++ b/investmentNew/index.html
@@ -51,7 +51,7 @@
 
				               <div class="child">
			
 
				                 <div style="font-size: 28px">固定资产类项目</div>
			
 
				                 <div></div>
			
 
				-                <div style="font-size: 52px; color: rgb(104, 189, 255); font-weight: bold;#68bdff; font-weight: bold" class="pointer"
			
 
				+                <div style="font-size: 52px; color: rgb(104, 189, 255); font-weight: bold;" class="pointer"
			
 
				                   @click.stop="showChartLTipSingle('投资金额','left','','','投资计划分析','固定资产投资金额','','','','','',2141)">
			
 
				                   {{numFormat(yuanChange(left4[1]))}}<span style="font-size: 28px">亿</span>
			
 
				                 </div>
			
@@ -60,7 +60,7 @@
 
				                       color: #68bdff;
			
 
				                       font-weight: bold;
			
 
				                       justify-self: center;
			
 
				-                    " @click.stop="showChartLTipSingle('投资金额','left','','','投资计划分析','固定资产投资金额','','','','','',2141)">
			
 
				+                    " @click.stop="showChartLTipSingle('项目数量','left','','','投资计划分析','固定资产项目数量','','','','','',2141)">
			
 
				                   {{numFormat(left4[2])}}<span style="font-size: 28px">个</span>
			
 
				                 </div>
			
 
				                 <div style="font-size: 26px">投资金额</div>
			
@@ -717,11 +717,11 @@
 
				         <div class="pop-title1" style="padding-top: 20px;">项目列表</div>
			
 
				         <img alt="" src="./img/popLine.png" style="width: 70%;height: 40px;margin-left: 15%;">
			
 
				         <div class="pop-content2 text-center">
			
 
				-          <dv-scroll-board :config='config6' @click="goLookBoard" style="width:90%;height:100%;margin: 0 auto;" />
			
 
				+          <dv-scroll-board :config='config6' @click="goLookBoard" style="width:95%;height:100%;margin: 0 auto;" />
			
 
				         </div>
			
 
				       </div>
			
 
				       <!-- 项目看板专属弹窗 -->
			
 
				-      <div class="productTip" v-if="boardTipShow">
			
 
				+      <div class="productTipBoard" v-if="boardTipShow">
			
 
				         <img src="./img/close.png" style="width: 40px;height: 40px;top: 30px;right: 30px;" class="absolute pointer"
			
 
				           alt="" @click="boardTipShow = false">
			
 
				         <div class="pop-title1" style="padding-top: 20px;">项目看板</div>
			
--- a/investmentNew/js/index.js
+++ b/investmentNew/js/index.js
@@ -3196,7 +3196,7 @@ let app = new Vue({
 
				         tooltip: {
			
 
				           trigger: "item",
			
 
				           formatter: function (e) {
			
 
				-            return `<span style="display:inline-block;margin-right:10px;border-radius:10px;width:20px;height:20px;background-color:${e.borderColor};"></span>${e.name} ${e.percent}%<br>${e.value}亿 ${left1[that.industryLayout][e.seriesIndex].num}个`;
			
 
				+            return `<span style="display:inline-block;margin-right:10px;border-radius:10px;width:20px;height:20px;background-color:${e.borderColor};"></span>${e.name} ${e.percent}%<br>${e.value}亿 ${left1[that.industryLayout][e.dataIndex].num}个`;
			
 
				           },
			
 
				           backgroundColor: "rgba(50,50,50,0.7)", // 提示框浮层的背景颜色
			
 
				           borderColor: '#135C8A00',
			
@@ -4005,11 +4005,11 @@ let app = new Vue({
 
				                 colorStops: [
			
 
				                   {
			
 
				                     offset: 0,
			
 
				-                    color: "#468ff8", // 0% 处的颜色
			
 
				+                    color: "#468ff800", // 0% 处的颜色
			
 
				                   },
			
 
				                   {
			
 
				                     offset: 1,
			
 
				-                    color: "#0a2c6d", // 100% 处的颜色
			
 
				+                    color: "#0a2c6d00", // 100% 处的颜色
			
 
				                   },
			
 
				                 ],
			
 
				                 globalCoord: false, // 缺省为 false
			
@@ -4180,6 +4180,18 @@ let app = new Vue({
 
				           },
			
 
				           data: categoryData,
			
 
				         },
			
 
				+        // 配置图片相关
			
 
				+        graphic: {
			
 
				+          elements: [{
			
 
				+            type: 'image',//需要填充图片,配置image,如果不需要图片可以配置其他的, text, circle, sector, ring, polygon, polyline, rect, line, bezierCurve, arc, group,
			
 
				+            style: {
			
 
				+              image: './img/3D/shanxiMap.png', //这里添加图片地址
			
 
				+              width: 835,
			
 
				+            },
			
 
				+            left: '9.5%',
			
 
				+            top: '20' //配置图片居中
			
 
				+          }]
			
 
				+        },
			
 
				         series: [
			
 
				           {
			
 
				             type: "effectScatter",
			
@@ -5243,7 +5255,7 @@ let app = new Vue({
 
				             } else {
			
 
				               that.stageTitle4 = params.name
			
 
				               that.stageTitle3 = params.percent + '%'
			
 
				-              return `<span style="display:inline-block;border-radius:50%;margin-right:10px;width:20px;height:20px;background-color:${params.color}"></span>${params.name}：<br/>金额：<b>${totalData[params.seriesIndex].num}</b>亿<br/>数量：<b>${params.value}</b>个`
			
 
				+              return `<span style="display:inline-block;border-radius:50%;margin-right:10px;width:20px;height:20px;background-color:${params.color}"></span>${params.name}：<br/>金额：${params.value}亿<br/>数量：${(totalData.find(item=>item.name == params.name)).num}个`
			
 
				             }
			
 
				           },
			
 
				           confine: true,
			
--- a/investmentNew/styles/index.css
+++ b/investmentNew/styles/index.css
@@ -324,7 +324,7 @@ a {
 
				   margin-left: 10%;
			
 
				   background-size: 70% 100% !important;
			
 
				   overflow: hidden;
			
 
				-  padding-left: 40%;
			
 
				+  padding-left: 30%;
			
 
				 }
			
 
				 .center2 > div:nth-child(1) > div:nth-child(1) {
			
 
				   background: url('../img/centerTop1.png') no-repeat center left; /*图标路径*/
			
@@ -522,6 +522,16 @@ a {
 
				   font-family: 'Microsoft YaHei';
			
 
				 }
			
 
				 .productTip {
			
 
				+  position: absolute;
			
 
				+  height: 1780px !important;
			
 
				+  width: 4000px;
			
 
				+  top: calc(50% - 850px);
			
 
				+  left: calc(50% - 4000px/2);
			
 
				+  z-index: 99999999999 !important;
			
 
				+  background: url('../img/pop2.png') no-repeat center;
			
 
				+  background-size: 100% 100%;
			
 
				+}
			
 
				+.productTipBoard {
			
 
				   position: absolute;
			
 
				   height: 1780px !important;
			
 
				   width: 2900px;
			
@@ -566,13 +576,6 @@ a {
 
				   border-top: 1px solid #69c0ff;
			
 
				   border-bottom: 1px solid #69c0ff;
			
 
				 }
			
 
				-.productTipBoard {
			
 
				-  height: 1900px !important;
			
 
				-  width: calc(1500px / 9 * 16 + 100px) !important;
			
 
				-  top: calc(50% - 900px);
			
 
				-  left: calc(50% - (1500px / 9 * 16 + 70px) / 2);
			
 
				-  z-index: 99999999999 !important;
			
 
				-}
			
 
				 .total {
			
 
				   text-align: center;
			
 
				   position: absolute;