投中弹窗对接完成

investmentPort/investHomeGroup.html

@@ -505,7 +505,7 @@
             </div>
             <div class="content top-lb">
               <div v-for="(item,index) in titleList.slice(0,11)" :key="index" @mouseenter="yellowMouse(index)"
-                @mouseleave="yellowType=true" @click="showChartLTipDouble(item.name,'right','','','','','','','','','',311,4,item.projectStepCode)"
+                @mouseleave="yellowType=true" @click="showChartLTipDouble(item.name,'right','','','','','','','','','',311,4,item.projectStepCode,'')"
                 class="topCard flex items-center justify-center flex-col  overflow-hidden pointer">
                 <div class="flex items-center justify-center shrink-0"
                   :class="(item.type==1&&item.name)?'titleBackBlue':(item.type==2&&item.name)?'titleBackYellow':''">
@@ -526,7 +526,7 @@
             </div>
             <div class="content top-rb">
               <div class="topCard flex items-center justify-center flex-col  overflow-hidden pointer"
-                @mouseenter="yellowMouse(12)" @click="showChartLTipDouble(titleList[12].name,'right','','','','','','','','','',311,4,titleList[12].projectStepCode)">
+                @mouseenter="yellowMouse(12)" @click="showChartLTipDouble(titleList[12].name,'right','','','','','','','','','',311,4,titleList[12].projectStepCode,'')">
                 <div class="flex items-center justify-center shrink-0"
                   :class="(titleList[12].type==1)?'titleBackBlue':'titleBackYellow'"><span
                     class="flex items-center justify-center"
@@ -541,7 +541,7 @@
                 </div>
               </div>
               <div class="topCard flex items-center justify-center flex-col pointer" @mouseenter="yellowMouse(14)"
-                @click="showChartLTipDouble(titleList[14].name,'right','','','','','','','','','',311,4,titleList[14].projectStepCode)">
+                @click="showChartLTipDouble(titleList[14].name,'right','','','','','','','','','',311,4,titleList[14].projectStepCode,'')">
                 <div class="flex items-center justify-center shrink-0"
                   :class="(titleList[14].type==1)?'titleBackBlue':'titleBackYellow'"><span
                     class="flex items-center justify-center"
@@ -563,8 +563,8 @@
             <div class="title">
               <span class="text">进度成本偏差概览</span>
             </div>
-            <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="right-cl content pointer">
+              <div v-for="(item,index) in centerLeftList" :key="index" class="w-full h-full" @click="showChartLTipDouble('进度成本偏差概览','right','','','','','','','','','',312,1,'',item.type)">
                 <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>

investmentPort/js/groupData.js

@@ -542,9 +542,9 @@ let right1 = [
 let right2 = [[120, 3423094], [], [121, 3423094], [], [122, 3423094], [], [123, 3423094], [], [124, 3423094], [], [125, 3423094], [], [126, 3423094], [], [127, 3423094]]
 // 中间左边
 let right3 = [
-  { name: '正偏差', value: '160', value2: '500', explain: '项目执行进度大于成本执行进度' },
-  { name: '容差内', value: '28', value2: '264', explain: '项目执行进度与成本执行进度相符' },
-  { name: '负偏差', value: '103', value2: '182', explain: '成本执行进度大于项目执行进度' }
+  { name: '正偏差', value: '160', value2: '500', explain: '项目执行进度大于成本执行进度', type: 1 },
+  { name: '容差内', value: '28', value2: '264', explain: '项目执行进度与成本执行进度相符', type: 2 },
+  { name: '负偏差', value: '103', value2: '182', explain: '成本执行进度大于项目执行进度', type: 3 }
 ]
 // 中间右边
 let right4 = [

investmentPort/js/investHomeGroup.js

@@ -756,7 +756,7 @@ let app = new Vue({
             isInsert: this.mockData ? '1' : '0',
             modelName: this.rightAdd.modelName,
             projectStepCode: this.rightAdd.projectStepCode,
-            substraction,
+            substraction:this.rightAdd.substraction,
             orgName
           },
           pageSize: 1000
@@ -1300,9 +1300,10 @@ let app = new Vue({
       return myArr
     },
     // 两个柱状图的弹窗
-    showChartLTipDouble (e, location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param, typeCTwo, paramCTwo, portType, num, modelName, projectStepCode) {
+    showChartLTipDouble (e, location, mdnb_textfield11, mdnb_textfield13, mdnb_textfield16, mdnb_textfield23, type, param, typeCTwo, paramCTwo, portType, num, modelName, projectStepCode,substraction) {
       modelName ? this.rightAdd.modelName = modelName : this.rightAdd.modelName = ''
       projectStepCode ? this.rightAdd.projectStepCode = projectStepCode : this.rightAdd.projectStepCode = ''
+      substraction ? this.rightAdd.substraction = substraction : this.rightAdd.substraction = ''
       num && (this.projectNum = num)
       this.titleName = e
       this.closeTap()
@@ -6010,6 +6011,10 @@ let app = new Vue({
       }
       that.right1Chart.on('click', function (param) {
         if (that.versions) {
+          that.rightAdd.modelName = 2
+          that.rightAdd.substraction = ''
+          that.rightAdd.projectStepCode = ''
+          that.projectNum = 314
           that.rightPenetrateTwo(2, '', that.findCode(param.name), 'right')
         } else {
           that.projectListTipShow = true
@@ -6214,6 +6219,10 @@ let app = new Vue({
       }
       that.right2Chart.on('click', function (param) {
         if (that.versions) {
+          that.rightAdd.modelName = 1
+          that.rightAdd.substraction = param.seriesName == '正偏差' ? 1 : param.seriesName == '容差' ? 2 : 3
+          that.rightAdd.projectStepCode = ''
+          that.projectNum = 313
           that.rightPenetrateTwo(1, param.seriesName == '正偏差' ? 1 : param.seriesName == '容差' ? 2 : 3, that.findCode(param.name), 'right')
         } else {
           that.projectListTipShow = true
@@ -6452,6 +6461,10 @@ let app = new Vue({
       }
       that.right3Chart.on('click', function (param) {
         if (that.versions) {
+          that.rightAdd.modelName = 3
+          that.rightAdd.substraction = ''
+          that.rightAdd.projectStepCode = ''
+          that.projectNum = 315
           that.rightPenetrateTwo(that.rightPenetrateTwo.modelName, '', that.findCode(param.name), 'right')
         } else {
           that.projectListTipShow = true

investmentPort/styles/investHomeGroup.css

@@ -832,11 +832,15 @@ tspan {
   top:calc( 50% - 470px );
 }
 .productTip {
-  /* height: ; */
-  height: 1800px !important;
+  /* height: 1800px !important;
   width: calc( 1500px / 9 * 16 + 200px) !important;
   top: calc(50% - 900px);
   left: calc(50% - ( 1500px / 9 * 16 + 200px) / 2);
+  z-index: 99999999999 !important; */
+  height: 1800px !important;
+  width: calc( 2200px / 9 * 16 + 200px) !important;
+  top: calc(50% - 900px);
+  left: calc(50% - ( 2200px / 9 * 16 + 200px) / 2);
   z-index: 99999999999 !important;
 }
 /* .productTip .header-item,