浏览代码

右边接口对接完成

zhbyyy 2 年之前
父节点
当前提交
fe59c3e55c
共有 2 个文件被更改,包括 20 次插入15 次删除
  1. 18 13
      investmentPort/js/investHomeGroup.js
  2. 2 2
      investmentPort/js/request.js

+ 18 - 13
investmentPort/js/investHomeGroup.js

@@ -206,15 +206,15 @@ let app = new Vue({
           // this.getDate6()
 
           // 右边
-          // this.getDate7()
-          // this.getDate8()
-          // this.getDate9()
-          // this.getDate10()
-          // // this.getDate11() // 右下A
-          // this.getDate12()  // 右下B
+          this.getDate7()
+          this.getDate8()
+          this.getDate9()
+          this.getDate10()
+          // this.getDate11() // 右下A
+          this.getDate12()  // 右下B
 
           // 中间
-          this.getDate14()
+          // this.getDate14()
           resolve(1);
         })
       });
@@ -643,7 +643,7 @@ let app = new Vue({
       });
     },
     // 右边穿透二级
-    rightPenetrateTwo (modelName, substraction) {
+    rightPenetrateTwo (modelName, substraction,name) {
       let that = this
       return new Promise((resolve, err) => {
         let value = {
@@ -651,11 +651,13 @@ let app = new Vue({
           "request": {
             isInsert: '0',
             modelName,
-            substraction
+            substraction,
+            orgName:name
           },
           pageSize: 1000
         }
         post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_middle/getTwoLevelData', value).then(res => {
+          that.config6.data = []
           res.data.forEach((item, index) => {
             that.config6.data[index] = []
             that.config6.data[index][0] = item.mdnb_project_name
@@ -1092,7 +1094,7 @@ let app = new Vue({
       })
       let that = this
       that.myChartTip2.on('click', function (param) {
-        that.rightPenetrateTwo('', '')
+        that.rightPenetrateTwo('', '',param.name)
       })
       that.myChartTip2.setOption(option);
     },
@@ -1246,7 +1248,7 @@ let app = new Vue({
       })
       let that = this
       that.myChartTip3.on('click', function (param) {
-        that.rightPenetrateTwo('', '')
+        that.rightPenetrateTwo('', '',param.name)
       })
       that.myChartTip3.setOption(option);
     },
@@ -4955,7 +4957,7 @@ let app = new Vue({
         ],
       }
       myChart.on('click', function (param) {
-        that.rightPenetrateTwo(2, '')
+        that.rightPenetrateTwo(2, '',param.name)
       })
       myChart.setOption(option)
       tools.loopShowTooltip(myChart, option, {
@@ -5154,7 +5156,7 @@ let app = new Vue({
         ]
       }
       myChart.on('click', function (param) {
-        that.rightPenetrateTwo(1, param.seriesName == '正偏差' ? 1 : param.seriesName == '容差' ? 2 : 3)
+        that.rightPenetrateTwo(1, param.seriesName == '正偏差' ? 1 : param.seriesName == '容差' ? 2 : 3,param.name)
       })
       myChart.setOption(option)
       tools.loopShowTooltip(myChart, option, {
@@ -5386,6 +5388,9 @@ let app = new Vue({
           },
         ],
       }
+      myChart.on('click', function (param) {
+        that.rightPenetrateTwo('', '',param.name)
+      })
       myChart.setOption(option)
       tools.loopShowTooltip(myChart, option, {
         interval: 8000,

+ 2 - 2
investmentPort/js/request.js

@@ -4,8 +4,8 @@
  */
 const httpRequest = axios.create({
   // 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.111:8080', // 苏文投后
+  // baseURL: 'http://192.168.2.147:8080', // 旭东中间大屏
   timeout: 3 * 60 * 1000, // 3分钟等待
   withCredentials: true, // 携带cookie
 })