接口对接

investmentNewPort/index.html

@@ -45,7 +45,7 @@
                 <div></div>
                 <div style="font-size: 50px; color: #68bdff; font-weight: bold" class="pointer"
                   @click.stop="showChartLTipSingle('投资金额','left','','','投资计划分析','固定资产投资金额','','','','','',2141)">
-                  1,608.69<span style="font-size: 28px">亿</span>
+                  {{numFormat(yuanChange(left4[1]))}}<span style="font-size: 28px">亿</span>
                 </div>
                 <div style="
                       font-size: 50px;
@@ -53,7 +53,7 @@
                       font-weight: bold;
                       justify-self: center;
                     ">
-                  350<span style="font-size: 28px">个</span>
+                  {{numFormat(left4[2])}}<span style="font-size: 28px">个</span>
                 </div>
                 <div style="font-size: 28px">投资金额</div>
                 <div style="font-size: 28px; justify-self: center">
@@ -64,7 +64,7 @@
                 <div style="font-size: 28px">股权类项目</div>
                 <div></div>
                 <div style="font-size: 50px; color: #68bdff; font-weight: bold">
-                  159.56<span style="font-size: 28px">亿</span>
+                  {{numFormat(yuanChange(left4[3]))}}<span style="font-size: 28px">亿</span>
                 </div>
                 <div style="
                       font-size: 50px;
@@ -72,7 +72,7 @@
                       font-weight: bold;
                       justify-self: center;
                     ">
-                  250<span style="font-size: 28px">个</span>
+                  {{numFormat(left4[4])}}<span style="font-size: 28px">个</span>
                 </div>
                 <div style="font-size: 28px">投资金额</div>
                 <div style="font-size: 28px; justify-self: center">
@@ -97,7 +97,7 @@
               </svg>
               <div class="flex items-center justify-center flex-col relative" style="padding-bottom: 10%;">
                 <div style="font-size: 72px; color: #ffe036; font-weight: bold">
-                  1,768.60<span style="font-size: 28px">亿</span>
+                  {{numFormat(yuanChange(left4[0]))}}<span style="font-size: 28px">亿</span>
                 </div>
                 <div style="font-size: 28px">年度投资计划总额</div>
               </div>
@@ -120,7 +120,7 @@
                     <div class="flex items-center font28">
                       <img src="./img/title-icon.png" style="width: 32px; height: 52px" alt="" />
                       <span style="margin: 0 10px">{{industryProportion==1?'主业':'特别监管类'}}</span>
-                      <span style="color: #68bdff">{{industryProportion==1?713:168}}个</span>
+                      <span style="color: #68bdff">{{industryProportion==1?left5[1].num:left6[0].num}}个</span>
                     </div>
                     <div ref="leftEcharts2" style="height: 50%; width: 100%"></div>
                   </div>
@@ -131,7 +131,7 @@
                     <div class="flex items-center font28">
                       <img src="./img/title-icon.png" style="width: 32px; height: 52px" alt="" />
                       <span style="margin: 0 10px">{{industryProportion==1?'辅业':'备案类'}}</span>
-                      <span style="color: #68bdff">{{industryProportion==1?84:465}}个</span>
+                      <span style="color: #68bdff">{{industryProportion==1?left5[0].num:left6[1].num}}个</span>
                     </div>
                     <div ref="leftEcharts4" style="height: 50%; width: 100%"></div>
                   </div>
@@ -616,8 +616,8 @@
       <div class="bottom-tip" @click="backChina"></div>
     </div>
     <!-- 标题状图弹窗 -->
-    <div class="absolute  backBlack" v-if="tipShow1 || tipShow2 || tipShow3">
-      <div class="tip-box1" v-show="tipShow1">
+    <div class="absolute  backBlack" v-if="tipShow1 || tipShow2 || projectListTipShow">
+      <div class="tip-box1" v-if="tipShow1">
         <img src="./img/close.png" style="width: 40px;height: 40px;top: 30px;right: 30px;" class="absolute pointer"
           alt="" @click="closeTap()">
         <div class="pop-title1">{{titleName}}</div>
@@ -628,7 +628,7 @@
         </div>
       </div>
       <!-- 单个柱状图弹窗 -->
-      <div class="tip-box1" v-show="tipShow2">
+      <div class="tip-box1" v-if="tipShow2">
         <img src="./img/close.png" style="width: 40px;height: 40px;top: 30px;right: 30px;" class="absolute pointer"
           alt="" @click="closeTap()">
         <div class="pop-title1">{{titleName}}</div>
@@ -636,13 +636,13 @@
           <div class="h-full w-full" id="leftEcharts18" ref="leftEcharts18"></div>
         </div>
       </div>
-      <!-- 项目看板专属弹窗 -->
-      <div class="tip-box1" v-show="tipShow3">
+      <!-- 项目列表专属弹窗 -->
+      <div class="productTip" v-if="projectListTipShow">
         <img src="./img/close.png" style="width: 40px;height: 40px;top: 30px;right: 30px;" class="absolute pointer"
-          alt="" @click="closeTap()">
-        <div class="pop-title1">{{titleName}}</div>
+          alt="" @click="projectListTipShow = false">
+        <div class="pop-title1">项目列表</div>
         <div class="pop-content1 text-center">
-          <!-- <div class="h-full w-full" id="leftEcharts18" ref="leftEcharts18"></div> -->
+          <dv-scroll-board :config='config6' @click="goLookBoard" style="width:90%;height:100%;margin: 0 auto;" />
         </div>
       </div>
     </div>

investmentNewPort/js/Data.js

@@ -1194,3 +1194,15 @@ let common3 = [29, 0.9, 117.65, 148.96, 34.84, 17.79, 26.15, 26.18, 16.83, 0.00,
 // 双柱状图弹窗
 let common4 = [359.91, 400.49, 117.65, 148.96, 34.84, 17.79, 26.15, 26.18, 16.83, 0.00, 43.49, 0.00, 43.39, 76.53, 5.05, 8.59, 0.00, 0.28]
 let common5 = [359.91, 400.49, 117.65, 148.96, 34.84, 17.79, 26.15, 26.18, 16.83, 0.00, 43.49, 0.00, 43.39, 76.53, 5.05, 8.59, 0.00, 0.28]
+// 项目列表弹窗
+let listPop = {
+  rowNum: 15,
+  waitTime: 1000,
+  headerHeight: '100',
+  header: ["项目名称", "所属组织", '实施主体', '产业类别I级', '产业类别II级', '年投资完成额（亿）'],
+  data: [],
+  align: ["center", "center", "center", "center", "center", "center", "center", "center", "center", "center"],
+  headerBGC: "#153A62",
+  oddRowBGC: "#061F42",
+  evenRowBGC: "#0C284A",
+}

investmentNewPort/js/index.js

@@ -8,10 +8,10 @@ let app = new Vue({
       mapShow: false, // false为中国地图 true为山西地图
       titleUrl: '',// 标题弹窗显示的内容
       titleName: '', // 弹窗的名字显示
-      leftEcharts1: "",
-      leftEcharts2: "",
-      leftEcharts3: "",
-      leftEcharts4: "",
+      leftEcharts1: "", // 投资计划分析上边的饼图
+      leftEcharts2: "", // 投资计划分析上边的柱状图
+      leftEcharts3: "", // 投资计划分析下边的饼图
+      leftEcharts4: "", // 投资计划分析下边的柱状图
       leftEcharts5: "",
       leftEcharts6: "",
       leftEcharts7: "",
@@ -27,7 +27,7 @@ let app = new Vue({
       leftEcharts18: '', //弹窗单个柱状图
       tipShow1: false, // 标题弹窗显示
       tipShow2: false, // 单柱状图弹窗显示
-      tipShow3:false, // 项目列表弹窗显示
+      projectListTipShow: false,// 项目列表弹窗显示
       stageTitle: '', // 投资阶段分析圆环图内容
       stageTitle2: '', // 投资阶段分析圆环图内容
       echartR2Fd: true, // 投后进度成本偏差防抖
@@ -48,6 +48,7 @@ let app = new Vue({
       year: '', // 选择的年份
       pollList: [], // 选择年分列表
       boardType: '', // 哪边的项目看板
+      config6: listPop,
       projecList: [ //项目阶段分析内容距离
         [
           { name: '特别监管', value: '14', value2: '12.05' },
@@ -561,10 +562,10 @@ let app = new Vue({
           that.chinaEchartsFun()
           that.leftEcharts16Fun() // 中国地图背景地球
         }
-        this.leftEcharts1Fun();
-        this.leftEcharts2Fun();
-        this.leftEcharts3Fun();
-        this.leftEcharts4Fun();
+        // this.leftEcharts1Fun();
+        // this.leftEcharts2Fun();
+        // this.leftEcharts3Fun();
+        // this.leftEcharts4Fun();
         this.leftEcharts5Fun();
         this.leftEcharts6Fun();
         this.leftEcharts7Fun();
@@ -751,8 +752,12 @@ let app = new Vue({
             left6[0].num = dataList.mdnb_integerfield16
             left6[1].y = that.yuanChange(dataList.mdnb_amountfield16)
             left6[1].num = dataList.mdnb_integerfield17
-            // that.initChartL2()
-            // that.initChartL3()
+            console.log(left5, '??????????????zhufuye')
+            console.log(left6, '??????????????zhufuye')
+            that.leftEcharts1Fun()
+            that.leftEcharts2Fun()
+            that.leftEcharts3Fun()
+            that.leftEcharts4Fun()
           }
           resolve(1);
         })
@@ -1197,6 +1202,189 @@ let app = new Vue({
         })
       });
     },
+    // 左边穿透二级
+    leftPenetrateTwo (mdnb_textfield12, mdnb_textfield19, mdnb_textfield15, mdnb_textfield17, mdnb_textfield20, num) {
+      num && (this.projectNum = num)
+      this.boardType = 'left'
+      let that = this
+      return new Promise((resolve, err) => {
+        let value = {
+          access_token: this.access_token,
+          "data": {
+            mdnb_combofield: this.mockData ? 'B' : 'A',
+            mdnb_datefield: this.year + '-01-01',
+            mdnb_textfield12,
+            mdnb_textfield19,
+            mdnb_textfield15,
+            mdnb_textfield17,
+            mdnb_textfield20
+          },
+          pageSize: 1000
+        }
+        if (mdnb_textfield20) {
+          post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/ejct', value).then(res => {
+            that.config6.data = []
+            if (res.data.rows.length > 0) {
+              that.originalConfig6 = res.data.rows[0].mdnb_entryentity11
+              that.config6.data = []
+              if (this.projectNum == 211 || this.projectNum == 212) {
+                that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '已占用额度（万元）']
+                res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
+                  that.config6.data[index] = []
+                  that.config6.data[index][0] = item.mdnb_textfield7
+                  that.config6.data[index][1] = item.mdnb_textfield6
+                  that.config6.data[index][2] = item.mdnb_textfield8
+                  that.config6.data[index][3] = item.mdnb_textfield25
+                  that.config6.data[index][4] = item.mdnb_textfield26
+                  that.config6.data[index][5] = that.numFormat(item.mdnb_amountfield22 / 10000)
+                })
+              } else if (this.projectNum == 2141) {
+                that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '本年度计划投资额（万元）']
+                res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
+                  that.config6.data[index] = []
+                  that.config6.data[index][0] = item.mdnb_textfield7
+                  that.config6.data[index][1] = item.mdnb_textfield6
+                  that.config6.data[index][2] = item.mdnb_textfield8
+                  that.config6.data[index][3] = item.mdnb_textfield25
+                  that.config6.data[index][4] = item.mdnb_textfield26
+                  that.config6.data[index][5] = that.numFormat(item.mdnb_amountfield22 / 10000)
+                })
+              } else if (this.projectNum == 2142) {
+                that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '是否主业', '本年度计划投资额（万元）']
+                res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
+                  that.config6.data[index] = []
+                  that.config6.data[index][0] = item.mdnb_textfield7
+                  that.config6.data[index][1] = item.mdnb_textfield6
+                  that.config6.data[index][2] = item.mdnb_textfield8
+                  that.config6.data[index][3] = item.mdnb_textfield25
+                  that.config6.data[index][4] = item.mdnb_textfield26
+                  that.config6.data[index][5] = item.mdnb_textfield21
+                  that.config6.data[index][6] = that.numFormat(item.mdnb_amountfield22 / 10000)
+                })
+              } else if (this.projectNum == 2143) {
+                that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '项目管理类型', '本年度计划投资额（万元）']
+                res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
+                  that.config6.data[index] = []
+                  that.config6.data[index][0] = item.mdnb_textfield7
+                  that.config6.data[index][1] = item.mdnb_textfield6
+                  that.config6.data[index][2] = item.mdnb_textfield8
+                  that.config6.data[index][3] = item.mdnb_textfield25
+                  that.config6.data[index][4] = item.mdnb_textfield26
+                  that.config6.data[index][5] = item.mdnb_textfield22
+                  that.config6.data[index][6] = that.numFormat(item.mdnb_amountfield22 / 10000)
+                })
+              } else if (this.projectNum == 215) {
+                that.config6.header = ["所属集团", "项目名称", '投资主体', '产业类别I级', '产业类别II级', '本年度计划投资额（万元）']
+                res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
+                  that.config6.data[index] = []
+                  that.config6.data[index][0] = item.mdnb_textfield7
+                  that.config6.data[index][1] = item.mdnb_textfield6
+                  that.config6.data[index][2] = item.mdnb_textfield8
+                  that.config6.data[index][3] = item.mdnb_textfield9
+                  that.config6.data[index][4] = item.mdnb_textfield10
+                  that.config6.data[index][5] = that.numFormat(item.mdnb_amountfield22 / 10000)
+                })
+              } else if (this.projectNum == 216) {
+                that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '项目阶段', '投资总额（万元）']
+                res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
+                  that.config6.data[index] = []
+                  that.config6.data[index][0] = item.mdnb_textfield7
+                  that.config6.data[index][1] = item.mdnb_textfield6
+                  that.config6.data[index][2] = item.mdnb_textfield8
+                  that.config6.data[index][3] = item.mdnb_textfield25
+                  that.config6.data[index][4] = item.mdnb_textfield26
+                  that.config6.data[index][5] = item.mdnb_textfield24
+                  that.config6.data[index][6] = that.numFormat(item.mdnb_amountfield22 / 10000)
+                })
+              }
+            }
+            that.config6 = { ...that.config6 }
+            that.projectListTipShow = true
+            resolve(1);
+          })
+        } else {
+          post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/tzedfxzed', value).then(res => {
+            if (res.data.rows.length > 0) {
+              that.originalConfig6 = res.data.rows[0].mdnb_entryentity11
+              that.config6.data = []
+              if (this.projectNum == 211 || this.projectNum == 212) {
+                that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '已占用额度（万元）']
+                res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
+                  that.config6.data[index] = []
+                  that.config6.data[index][0] = item.mdnb_textfield7
+                  that.config6.data[index][1] = item.mdnb_textfield6
+                  that.config6.data[index][2] = item.mdnb_textfield8
+                  that.config6.data[index][3] = item.mdnb_textfield25
+                  that.config6.data[index][4] = item.mdnb_textfield26
+                  that.config6.data[index][5] = that.numFormat(item.mdnb_amountfield22 / 10000)
+                })
+              } else if (this.projectNum == 2141) {
+                that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '本年度计划投资额（万元）']
+                res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
+                  that.config6.data[index] = []
+                  that.config6.data[index][0] = item.mdnb_textfield7
+                  that.config6.data[index][1] = item.mdnb_textfield6
+                  that.config6.data[index][2] = item.mdnb_textfield8
+                  that.config6.data[index][3] = item.mdnb_textfield25
+                  that.config6.data[index][4] = item.mdnb_textfield26
+                  that.config6.data[index][5] = that.numFormat(item.mdnb_amountfield22 / 10000)
+                })
+              } else if (this.projectNum == 2142) {
+                that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '是否主业', '本年度计划投资额（万元）']
+                res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
+                  that.config6.data[index] = []
+                  that.config6.data[index][0] = item.mdnb_textfield7
+                  that.config6.data[index][1] = item.mdnb_textfield6
+                  that.config6.data[index][2] = item.mdnb_textfield8
+                  that.config6.data[index][3] = item.mdnb_textfield25
+                  that.config6.data[index][4] = item.mdnb_textfield26
+                  that.config6.data[index][5] = item.mdnb_textfield21
+                  that.config6.data[index][6] = that.numFormat(item.mdnb_amountfield22 / 10000)
+                })
+              } else if (this.projectNum == 2143) {
+                that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '项目管理类型', '本年度计划投资额（万元）']
+                res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
+                  that.config6.data[index] = []
+                  that.config6.data[index][0] = item.mdnb_textfield7
+                  that.config6.data[index][1] = item.mdnb_textfield6
+                  that.config6.data[index][2] = item.mdnb_textfield8
+                  that.config6.data[index][3] = item.mdnb_textfield25
+                  that.config6.data[index][4] = item.mdnb_textfield26
+                  that.config6.data[index][5] = item.mdnb_textfield22
+                  that.config6.data[index][6] = that.numFormat(item.mdnb_amountfield22 / 10000)
+                })
+              } else if (this.projectNum == 215) {
+                that.config6.header = ["所属集团", "项目名称", '投资主体', '产业类别I级', '产业类别II级', '本年度计划投资额（万元）']
+                res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
+                  that.config6.data[index] = []
+                  that.config6.data[index][0] = item.mdnb_textfield7
+                  that.config6.data[index][1] = item.mdnb_textfield6
+                  that.config6.data[index][2] = item.mdnb_textfield8
+                  that.config6.data[index][3] = item.mdnb_textfield9
+                  that.config6.data[index][4] = item.mdnb_textfield10
+                  that.config6.data[index][5] = that.numFormat(item.mdnb_amountfield22 / 10000)
+                })
+              } else if (this.projectNum == 216) {
+                that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '项目阶段', '本年度计划投资额（万元）']
+                res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
+                  that.config6.data[index] = []
+                  that.config6.data[index][0] = item.mdnb_textfield7
+                  that.config6.data[index][1] = item.mdnb_textfield6
+                  that.config6.data[index][2] = item.mdnb_textfield8
+                  that.config6.data[index][3] = item.mdnb_textfield25
+                  that.config6.data[index][4] = item.mdnb_textfield26
+                  that.config6.data[index][5] = item.mdnb_textfield24
+                  that.config6.data[index][6] = that.numFormat(item.mdnb_amountfield22 / 10000)
+                })
+              }
+              that.config6 = { ...that.config6 }
+              that.projectListTipShow = true
+            }
+            resolve(1);
+          })
+        }
+      });
+    },
     // 解决除法是去精度
     numDiv (num1, num2) {
       var baseNum1 = 0, baseNum2 = 0;
@@ -2401,12 +2589,16 @@ let app = new Vue({
         return intPartFormat;
       }
     },
+    // 计算百分比
+    sumPercent (a, b) {
+      return (a / (a + b) * 100).toFixed(2) + '%'
+    },
     leftEcharts1Fun () {
       let that = this;
       this.leftEcharts1 = echarts.init(this.$refs["leftEcharts1"]);
       option = {
         title: {
-          text: that.industryProportion == 1 ? "94.4%" : "46.62%",
+          text: that.industryProportion == 1 ? that.sumPercent(left5[1].y, left5[0].y) : that.sumPercent(left6[0].y, left6[1].y),
           x: "center",
           y: "center",
           textStyle: {
@@ -2435,7 +2627,7 @@ let app = new Vue({
             hoverAnimation: false,
             data: [
               {
-                value: 80,
+                value: that.industryProportion == 1 ? left5[1].y : left6[0].y,
                 name: "01",
                 itemStyle: {
                   normal: {
@@ -2450,7 +2642,7 @@ let app = new Vue({
               },
               {
                 name: "02",
-                value: 20,
+                value: that.industryProportion == 1 ? left5[0].y : left6[1].y,
               },
             ],
           },
@@ -2468,8 +2660,8 @@ let app = new Vue({
       let that = this;
       this.leftEcharts2 = echarts.init(this.$refs["leftEcharts2"]);
       let nameList = ["a"];
-      let valueList = that.industryProportion == 1 ? [1287.5] : [635.84];
-      let total = 1363.88; // 数据总数
+      let valueList = that.industryProportion == 1 ? [left5[1].y] : [left6[0].y];
+      let total = that.industryProportion == 1 ? left5[1].y + left5[0].y : left6[0].y + left6[1].y
       var category = nameList.map((item, index) => {
         return {
           value: valueList[index],
@@ -2535,7 +2727,7 @@ let app = new Vue({
         grid: {
           left: "0%",
           top: "15%", // 设置条形图的边距
-          right: "15%",
+          right: "19%",
           bottom: "5%",
         },
         yAxis: [
@@ -2561,19 +2753,6 @@ let app = new Vue({
             barWidth: 16,
             barGap: "20%",
             silent: true,
-            // label: {
-            //     normal: {
-            //         formatter: (item) => {
-            //             return `${item['name']}：${item['value']} `;
-            //         },
-            //         textStyle: {
-            //             color: 'rgba(105, 120, 136, 1)',
-            //             fontSize: 14,
-            //         },
-            //         position: [0, '-25px'],
-            //         show: true,
-            //     },
-            // },
             data: category,
             z: 1,
             itemStyle: {
@@ -2633,7 +2812,7 @@ let app = new Vue({
               normal: {
                 formatter: (params) => {
                   var text;
-                  text = `${((params["data"] * 100) / total).toFixed(2)}亿`;
+                  text = `${params.value}亿`;
                   return text;
                 },
                 textStyle: {
@@ -2683,7 +2862,7 @@ let app = new Vue({
       this.leftEcharts3 = echarts.init(this.$refs["leftEcharts3"]);
       option = {
         title: {
-          text: that.industryProportion == 1 ? "5.6%" : "53.38%",
+          text: that.industryProportion == 1 ? that.sumPercent(left5[0].y, left5[1].y) : that.sumPercent(left6[1].y, left6[0].y),
           x: "center",
           y: "center",
           textStyle: {
@@ -2712,7 +2891,7 @@ let app = new Vue({
             hoverAnimation: false,
             data: [
               {
-                value: 80,
+                value: that.industryProportion == 1 ? left5[0].y : left6[1].y,
                 name: "01",
                 itemStyle: {
                   normal: {
@@ -2727,7 +2906,7 @@ let app = new Vue({
               },
               {
                 name: "02",
-                value: 20,
+                value: that.industryProportion == 1 ? left5[1].y : left6[0].y,
               },
             ],
           },
@@ -2745,8 +2924,8 @@ let app = new Vue({
       let that = this;
       this.leftEcharts4 = echarts.init(this.$refs["leftEcharts4"]);
       let nameList = ["a"];
-      let valueList = that.industryProportion == 1 ? [76.38] : [728.04];
-      let total = 1363.88; // 数据总数
+      let valueList = that.industryProportion == 1 ? [left5[0].y] : [left6[1].y];
+      let total = that.industryProportion == 1 ? (left5[1].y + left5[0].y) : (left6[0].y + left6[1].y)
       var category = nameList.map((item, index) => {
         return {
           value: valueList[index],
@@ -2812,7 +2991,7 @@ let app = new Vue({
         grid: {
           left: "0%",
           top: "15%", // 设置条形图的边距
-          right: "15%",
+          right: "19%",
           bottom: "5%",
         },
         yAxis: [
@@ -2910,7 +3089,7 @@ let app = new Vue({
               normal: {
                 formatter: (params) => {
                   var text;
-                  text = `${((params["data"] * 100) / total).toFixed(2)}亿`;
+                  text = `${params.value}亿`;
                   return text;
                 },
                 textStyle: {
@@ -4522,6 +4701,7 @@ let app = new Vue({
     leftEcharts9Fun () {
       let that = this;
       this.leftEcharts9 = echarts.init(this.$refs["leftEcharts9"]);
+      return
       // var ROOT_PATH = 'https://echarts.apache.org/examples';
       let option = {
         backgroundColor: "#00000000",
@@ -5737,6 +5917,7 @@ let app = new Vue({
     leftEcharts16Fun () {
       let that = this;
       this.leftEcharts16 = echarts.init(this.$refs["leftEcharts16"]);
+      return
       // var ROOT_PATH = 'https://echarts.apache.org/examples';
       let option = {
         backgroundColor: "#00000000",
@@ -5793,6 +5974,7 @@ let app = new Vue({
     closeTap () {
       this.tipShow1 = false
       this.tipShow2 = false
+      this.projectListTipShow = false
     },
     //点击弹窗左半部分
     popLeftClick () {
@@ -5863,7 +6045,8 @@ let app = new Vue({
     },
     // 单个柱状图的弹窗
     leftEcharts18Fun (location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, typeCTwo, paramCTwo, portType) {
-      this.myChartTip1 = echarts.init(document.getElementById("leftEcharts18"));
+      let that = this
+      this.leftEcharts18 = echarts.init(document.getElementById("leftEcharts18"));
       if (!(this.titleName == '项目数量' || this.titleName == '项目总数')) {
         common3 = common3.map((item) => Number(item) + 1)
       }
@@ -6010,21 +6193,25 @@ let app = new Vue({
         interval: 2000,
         loopSeries: true,
       })
-      let that = this
       that.leftEcharts18.on('click', function (param) {
-        if (that.versions) {
-          if (location == 'right') {
-            that.rightPenetrateTwo(that.rightPenetrateTwo.modelName, '', that.findCode(param.name))
-          } else if (location == 'left') {
-            that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, param.name, that.projectNum)
-          } else if (location == 'center') {
-            that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name), portType)
-          }
-        } else {
-          that.projectListTipShow = true
+        if (location == 'right') {
+          that.rightPenetrateTwo(that.rightPenetrateTwo.modelName, '', that.findCode(param.name))
+        } else if (location == 'left') {
+          that.leftPenetrateTwo(mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, param.name, that.projectNum)
+        } else if (location == 'center') {
+          that.centerPenetrateTwo(typeCTwo, paramCTwo, that.findCode(param.name), portType)
         }
       })
       that.leftEcharts18.setOption(option);
     },
+    // 去项目看板
+    goLookBoard (e, f) {
+      if (f) {
+        this.boardType = f
+      }
+      this.boardUrl = `http://${this.goUrl}/ierp/accessTokenLogin.do?access_token=${this.access_token}&redirect=http://${this.goUrl}/ierp/index.html?formId=mdnb_threetoproject&prj=${this.findProjectCode(e.row[0], e.row[1], this.boardType, e)}`
+      this.boardTipShow = true
+      console.log(this.boardUrl, '跳转去的项目看板地址')
+    },
   },
 });

investmentNewPort/styles/index.css

@@ -141,7 +141,7 @@ a {
   width: 100%;
   height: calc(100% - 80px);
   overflow: hidden;
-  padding: 1% 1% 0 1%; 
+  padding: 1% 1% 0 1%;
 }
 .left1 {
   display: grid;
@@ -452,7 +452,7 @@ a {
   background-color: rgba(0, 5, 16, 0.7);
   z-index: 999999999;
 }
-.tip-box1{
+.tip-box1 {
   position: absolute;
   width: 2300px !important;
   height: 1500px !important;
@@ -463,7 +463,7 @@ a {
   padding: 0px 100px 100px 100px;
   border-radius: 55px;
 }
-.pop-title1{
+.pop-title1 {
   width: 100%;
   height: 160px;
   line-height: 160px;
@@ -473,9 +473,9 @@ a {
   -webkit-background-clip: text;
   -webkit-text-fill-color: transparent;
 }
-.pop-content1{
+.pop-content1 {
   width: 100%;
-  height: calc( 100% - 260px );
+  height: calc(100% - 260px);
 }
 .titleImg {
   width: auto;
@@ -490,6 +490,23 @@ a {
 .popright {
   right: 5%;
 }
+.productTip {
+  position: absolute;
+  height: 1900px !important;
+  /* width: calc(700px / 9 * 16 + 200px) !important; */
+  width: 2900px;
+  top: calc(50% - 750px);
+  left: calc(50% - 2900px/2);
+  z-index: 99999999999 !important;
+  background: url('../img/pop.png') no-repeat center;
+  background-size: 100% auto;
+}
+.iframeCss {
+  /* transform: scale(1.4); */
+  position: absolute;
+  left: calc(50% - 750px);
+  top: calc(50% - 470px);
+}
 /* 公共css */
 /* 宽高纵横比 */
 .font28 {