中投接口对接 页面修改

investmentPort/investHomeGroup.html

@@ -6,12 +6,14 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <!-- 引入样式 -->
+  <link rel="stylesheet" href="./styles/element-ui@2.15.9.css" />
   <link rel="stylesheet" href="./styles/investHomeGroup.css" />
   <link rel="stylesheet" href="./styles/animate.css" />
   <!-- 引入js -->
   <script src="./libs/vue@2.7.10.js"></script>
   <script src="./libs/echarts.min2.js"></script>
   <script src="./libs/datav.map.vue.js"></script>
+  <script src="./libs/element-ui@2.15.9.js"></script>
   <script src="./libs/axios.min.js"></script>
   <script src="./js/request.js"></script>
   <script src="./js/map/china.json"></script>
@@ -54,11 +56,11 @@
                   <div class="item4-con">
                     <div class="item pointer" @click.stop="showChartLTipSingle('投资金额')">
                       <div class="text" >投资金额</div>
-                      <div class="title">{{numFormat(left4[1])}}<span>亿</span></div>
+                      <div class="title"><div>{{numFormat(left4[1])}}<span>亿</span></div></div>
                     </div>
                     <div class="item pointer" @click.stop="showChartLTipSingle('项目数量')">
                       <div class="text" >项目数量</div>
-                      <div class="title">{{numFormat(left4[2])}}<span>个</span></div>
+                      <div class="title"><div>{{numFormat(left4[2])}}<span>个</span></div></div>
                     </div>
                   </div>
                 </div>
@@ -69,11 +71,11 @@
                   <div class="item4-con">
                     <div class="item pointer" @click.stop="showChartLTipSingle('投资金额')">
                       <div class="text" >投资金额</div>
-                      <div class="title">{{numFormat(left4[3])}}<span>亿</span></div>
+                      <div class="title"><div>{{numFormat(left4[3])}}<span>亿</span></div></div>
                     </div>
                     <div class="item pointer" @click.stop="showChartLTipSingle('项目数量')">
                       <div class="text" >项目数量</div>
-                      <div class="title">{{numFormat(left4[4])}}<span>个</span></div>
+                      <div class="title"><div>{{numFormat(left4[4])}}<span>个</span></div></div>
                     </div>
                   </div>
                 </div>
@@ -147,7 +149,18 @@
           <div class="title">
             <span class="text">项目阶段分析</span>
           </div>
-          <div class="content left-rb">
+          <div class="content left-rb relative">
+            <!-- 左边的箭头 -->
+            <div class="absolute arrow1">
+              <div class="absolute"></div>
+              <i class="el-icon-right absolute"></i>
+              <i class="el-icon-right absolute"></i>
+              <i class="el-icon-right absolute"></i>
+              <div class="absolute"></div>
+              <i class="el-icon-right absolute"></i>
+              <i class="el-icon-right absolute"></i>
+              <i class="el-icon-right absolute"></i>
+            </div>
             <div id="echartL10" class="commonBack" style="width: 100%; height: 100%;"></div>
             <div id="echartL11" class="commonBack" style="width: 100%; height: 100%;"></div>
           </div>
@@ -177,20 +190,18 @@
             <div class="content">
               <div class="boxs">
                 <div class="numberTitle">产业转型</div>
-                <div class="pointer numberContent" @click.stop="showChartLTipSingle('投资总额')">
+                <div class="pointer numberContent" @click.stop="showChartLTipSingle('投资金额')">
                   <p>
                     <span class="name">投资金额</span>
-                    <i class="el-icon-more"></i>
                   </p>
                   <p>
                     <i style="width:100%;text-align: center;"><span class="num">{{numFormat(center4[0])}}</span><span
                         style="font-size: 26px;">亿</span></i>
                   </p>
                 </div>
-                <div class="pointer numberContent"  @click.stop="showChartLTipSingle('项目总数')">
+                <div class="pointer numberContent"  @click.stop="showChartLTipSingle('项目数量')">
                   <p>
                     <span class="name">项目数量</span>
-                    <i class="el-icon-more"></i>
                   </p>
                   <p>
                     <i style="width:100%;text-align: center;"><span class="num">{{numFormat(center4[1])}}</span><span
@@ -198,20 +209,18 @@
                   </p>
                 </div>
                 <div class="numberTitle">数字转型</div>
-                <div class="pointer numberContent" @click.stop="showChartLTipSingle('固定资产')">
+                <div class="pointer numberContent" @click.stop="showChartLTipSingle('投资金额')">
                   <p>
                     <span class="name">投资金额</span>
-                    <i class="el-icon-more"></i>
                   </p>
                   <p>
                     <i style="width:100%;text-align: center;"><span class="num">{{numFormat(center4[2])}}</span><span
                         style="font-size: 26px;">亿</span></i>
                   </p>
                 </div>
-                <div class="pointer numberContent" @click.stop="showChartLTipSingle('股权投资')">
+                <div class="pointer numberContent" @click.stop="showChartLTipSingle('项目数量')">
                   <p>
                     <span class="name">项目数量</span>
-                    <i class="el-icon-more"></i>
                   </p>
                   <p>
                     <i style="width:100%;text-align: center;"><span class="num">{{numFormat(center4[3])}}</span><span
@@ -283,12 +292,12 @@
             <div class="status animate__animated animate__fadeInUp">
               <p>项目状态</p>
               <ul style="padding-left: 30px; margin-bottom: 10px;">
-                <li>通过: <i>112</i></li>
-                <li>研究中: <i>14</i></li>
-                <li>退回: <i>15</i></li>
+                <li>通过: <i>{{proState.projectStatus1}}</i></li>
+                <li>研究中: <i>{{proState.projectStatus2}}</i></li>
+                <!-- <li>退回: <i>15</i></li>
                 <li>暂缓: <i>4</i></li>
-                <li>终止: <i>2</i></li>
-                <li>否决: <i>4</i></li>
+                <li>终止: <i>2</i></li> -->
+                <li>否决: <i>{{proState.projectStatus3}}</i></li>
               </ul>
             </div>
           </div>
@@ -362,12 +371,12 @@
         <div class="status2 animate__animated animate__fadeInUp" style="">
           <p>项目状态</p>
           <ul style="padding-left: 30px; margin-bottom: 10px;">
-            <li>通过: <i>112</i></li>
-            <li>研究中: <i>14</i></li>
-            <li>退回: <i>15</i></li>
+            <li>通过: <i>{{proState.projectStatus1}}</i></li>
+            <li>研究中: <i>{{proState.projectStatus2}}</i></li>
+            <!-- <li>退回: <i>15</i></li>
             <li>暂缓: <i>4</i></li>
-            <li>终止: <i>2</i></li>
-            <li>否决: <i>4</i></li>
+            <li>终止: <i>2</i></li> -->
+            <li>否决: <i>{{proState.projectStatus3}}</i></li>
           </ul>
         </div>
       </div>
@@ -506,12 +515,12 @@
             <div class="title">
               <span class="text">进度成本偏差概览</span>
             </div>
-            <div class="right-cl content">
+            <div class="right-cl content pointer" @click="showChartLTipDouble('进度成本偏差概览','right')">
               <div v-for="(item,index) in centerLeftList" :key="index" class="w-full h-full">
                 <div class="center-l-title flex items-center justify-center"><span
                     style="margin-right: 10px;color: #0FA9E2;">·</span>{{item.name}}<span
                     style="margin-left: 10px;color: #0FA9E2;">·</span></div>
-                <div class="text-center" style="font-size: 20px;color: #fff;margin-bottom: 10px;">{{item.explain}}</div>
+                <div class="text-center" style="font-size: 20px;color: #ffffff9e;margin-bottom: 10px;">{{item.explain}}</div>
                 <div class="center-l-list flex items-center justify-center flex-col" style="padding-left: 30%;">
                   <span style="color:#69c0ff;"><span
                       style="font-size:30px;font-weight: bold;">{{item.value}}</span><span

investmentPort/js/groupData.js

@@ -312,13 +312,13 @@ let center1 = [1324.08, 442, 1169.91, 154]
 // 左中
 let center2 = [
   {
-    name: '传统产业', value: 405.29, value2: '0.30', y: 405.29, num: 95, sliced: false, selected: false,
+    name: '传统产业', y: 405.29, num: 95, sliced: false, selected: false,
   },
   {
-    name: '战略新兴产业', value: 196.44, value2: '0.15', y: 196.44, num: 95, sliced: false, selected: false
+    name: '战略新兴产业', y: 196.44, num: 95, sliced: false, selected: false
   },
   {
-    name: '基础产业', value: 722.34, value2: '0.55', y: 722.34, num: 95, sliced: false, selected: false
+    name: '基础产业', y: 722.34, num: 95, sliced: false, selected: false
   }
 ]
 // 左下
@@ -368,8 +368,8 @@ let center6 = [
 ]
 // 右中
 let center7 = [
-  { name: '新建', value: 204, value2: 345.53, y: 345.53, num: 204, sliced: false, selected: false },
-  { name: '续建', value: 385, value2: 978.55, y: 978.55, num: 385, sliced: false, selected: false },
+  { name: '新建', value: 204, value2: 345.53, sliced: false, selected: false },
+  { name: '续建', value: 385, value2: 978.55, sliced: false, selected: false },
 ]
 // 右下
 let center8 = [
@@ -421,6 +421,12 @@ let center9 = {
   align: ['center', 'center', 'center'],
   data: [],
 }
+// 项目状态
+let proState = {
+  projectStatus1: 1,
+  projectStatus2: 2,
+  projectStatus3: 3
+}
 // 右边大屏
 // 上面
 let right1 = [

investmentPort/js/investHomeGroup.js

@@ -2,7 +2,7 @@ let app = new Vue({
   el: '#app',
   data () {
     return {
-      versions: false,
+      versions: true,
       app_token: '',
       centerShow: false, // 中间内容显示
       echartR4Chart: '',// 倒数第二个专用
@@ -198,12 +198,12 @@ let app = new Vue({
         get('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_middle/getOrgName', value).then(res => {
           commonCompany = res.data.map(item => item.simplename)
           // 左边
-          this.getDate1()
-          this.getDate2()
-          this.getDate3()
-          this.getDate4()
-          this.getDate5()
-          this.getDate6()
+          // this.getDate1()
+          // this.getDate2()
+          // this.getDate3()
+          // this.getDate4()
+          // this.getDate5()
+          // this.getDate6()
 
           // 右边
           // this.getDate7()
@@ -212,6 +212,9 @@ let app = new Vue({
           // this.getDate10()
           // // this.getDate11() // 右下A
           // this.getDate12()  // 右下B
+
+          // 中间
+          this.getDate14()
           resolve(1);
         })
       });
@@ -286,7 +289,7 @@ let app = new Vue({
         }
         post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/tqcebjfx', value).then(res => {
           let dataList = this.classify(res.data.rows[0].mdnb_entryentity, 'mdnb_textfield1')
-          console.log('看看分组情况', dataList, res.data.rows[0].mdnb_entryentity)
+          // console.log('看看分组情况', dataList, res.data.rows[0].mdnb_entryentity)
           // 传统产业分析
           dataList[0].data.forEach((item, index) => {
             left7[index].num = item.mdnb_integerfield13
@@ -566,6 +569,52 @@ let app = new Vue({
           presetYear: 2023
         }
         get('/ierp/kapi/v2/mdnb/mdnb_pmba_ext/presetdata/getKeyData', value).then(res => {
+          console.log(res.data, '????????')
+          // 头部指标
+          center4[0] = res.data.transformations.estateAmount
+          center4[1] = res.data.transformations.estateNum
+          center4[2] = res.data.transformations.figureAmount
+          center4[3] = res.data.transformations.figureNum
+          // 左投部指标
+          center1[0] = res.data.keyIndicators.totalSum
+          center1[1] = res.data.keyIndicators.total
+          center1[2] = res.data.keyIndicators.property
+          center1[3] = res.data.keyIndicators.invest
+          // 投资产业分布
+          res.data.distribution.forEach((item, index) => {
+            center2[index] = { name: item.type, y: item.amount, num: item.count }
+          })
+          // 投资执行情况
+          res.data.implementationStatus.forEach((item, index) => {
+            center3[index].value = item.plan
+            center3[index].value2 = item.reality
+          })
+          // 五个一体化
+          center6[0].value = res.data.five.amount1
+          center6[1].value = res.data.five.amount2
+          center6[2].value = res.data.five.amount3
+          center6[3].value = res.data.five.amount4
+          center6[4].value = res.data.five.amount5
+          // 投资阶段分析
+          center7[0].value = res.data.investmentStage.newnum
+          center7[0].value2 = res.data.investmentStage.newamount
+          center7[1].value = res.data.investmentStage.renewnum
+          center7[1].value2 = res.data.investmentStage.renewamount
+          // 重点项目监控
+          center8 = []
+          res.data.projectMonitoring.forEach((item, index) => {
+            center8.push({ value: item.amount, name: item.name, office: item.group })
+          })
+          console.log(center8,'??????????')
+          // 山西地图
+          center5 = []
+          res.data.investmentMap.forEach((item, index) => {
+            center5.push({ name: item.address, value: item.amount, value2: item.value2 })
+          })
+          // 项目状态
+          proState.projectStatus1 = res.data.projectStatus.projectStatus1
+          proState.projectStatus2 = res.data.projectStatus.projectStatus2
+          proState.projectStatus3 = res.data.projectStatus.projectStatus3
           resolve(1);
         })
       });
@@ -1329,8 +1378,9 @@ let app = new Vue({
           {
             type: "liquidFill",
             radius: "80%",
-            data: [common2[0], common2[0] + 0.05, common2[0] - 0.05],
-            waveLength: '50%', //波浪长度
+            data: [left2[0], left2[0] + 0.02, left2[0] - 0.02],
+            amplitude: '4%',
+            waveLength: '20%', //波浪长度
             // data: [
             //   {}
             // ],
@@ -1438,10 +1488,10 @@ let app = new Vue({
           {
             type: "liquidFill",
             radius: "80%",
-            data: [left2[0], left2[0] + 0.05, left2[0] - 0.05],
-            // amplitude:'15%',
+            data: [left2[0], left2[0] + 0.02, left2[0] - 0.02],
+            amplitude: '4%',
             // period:'1500',
-            waveLength: '50%', //波浪长度
+            waveLength: '20%', //波浪长度
             // data: [
             //   {}
             // ],
@@ -1553,7 +1603,7 @@ let app = new Vue({
       let that = this
 
       var option = {
-        colors: ['#a79c57', '#cc8c29','#034a39', '#383062',  '#91a65f', '#e1d7da', '#b48494', '#85868b'],
+        colors: ['#a79c57', '#cc8c29', '#034a39', '#383062', '#91a65f', '#e1d7da', '#b48494', '#85868b'],
         chart: {
           type: 'pie',
           backgroundColor: 'rgba(0,0,0,0)',
@@ -3948,19 +3998,7 @@ let app = new Vue({
       return res
     },
     initProvinceChart () {
-      var data = [
-        { name: '大同市', value: 60.35, value2: 28 },
-        { name: '朔州市', value: 33.61, value2: 13 },
-        { name: '忻州市', value: 73.35, value2: 25 },
-        { name: '吕梁市', value: 109.04, value2: 45 },
-        { name: '太原市', value: 251.67, value2: 113 },
-        { name: '阳泉市', value: 25.12, value2: 28 },
-        { name: '晋中市', value: 148.57, value2: 52 },
-        { name: '临汾市', value: 130.55, value2: 30 },
-        { name: '长治市', value: 103.00, value2: 23 },
-        { name: '运城市', value: 41.06, value2: 23 },
-        { name: '晋城市', value: 45.43, value2: 31 }
-      ]
+      var data = center5
       this.geoCoordMap = []
       /*获取地图数据*/
       this.mapChart = echarts.init(this.$refs['echarts-map'])

investmentPort/js/request.js

@@ -3,9 +3,9 @@
  * 请求拦截、相应拦截、错误统一处理
  */
 const httpRequest = axios.create({
-  baseURL: 'http://192.168.2.155:8080', // 李瑞投前
+  // baseURL: 'http://192.168.2.155:8080', // 李瑞投前
   // baseURL: 'http://192.168.2.111:8080', // 苏文投后
-  // baseURL: 'http://192.168.2.147:8080', // 旭东中间大屏
+  baseURL: 'http://192.168.2.147:8080', // 旭东中间大屏
   timeout: 3 * 60 * 1000, // 3分钟等待
   withCredentials: true, // 携带cookie
 })

investmentPort/styles/investHomeGroup.css

@@ -1000,7 +1000,52 @@ i{
 .overflow-y-auto {
   overflow-y: auto;
 }
-
+.arrow1{
+ width: 100%;
+ height: 100%;
+ z-index: 99999;
+}
+.arrow1>div:nth-child(1){
+  width: 50px;
+  height: 0px;
+  border-bottom: 1px solid #fff;
+  top: 53.7%;
+  left: 5.5%;
+}
+.arrow1>i{
+  font-size: 30px;
+}
+.arrow1>i:nth-child(2){
+  top: 51.1%;
+  left: 17%;
+}
+.arrow1>i:nth-child(3){
+  top: 51.1%;
+  left: 27%;
+}
+.arrow1>i:nth-child(4){
+  top: 51.1%;
+  left: 36.5%;
+}
+.arrow1>div:nth-child(5){
+  width: 50px;
+  height: 0px;
+  border-bottom: 1px solid #fff;
+  top: 53.7%;
+  left: 54.5%;
+}
+.arrow1>i:nth-child(6){
+  top: 51.1%;
+  left: 66.2%;
+}
+.arrow1>i:nth-child(7){
+  top: 51.1%;
+  left: 76%;
+}
+.arrow1>i:nth-child(8){
+  top: 51.1%;
+  left: 85.5%;
+}
 /* 定位 */
 .fixed {
   position: fixed;