修改封三折一前

investmentPort/investHome.html

@@ -148,7 +148,7 @@
               @click="leftPenetrateTwo('投资额度分析','总额度','','','',211)">
               <div class="total">总额度<span>{{numFormat(yuanChange(left2[1]))}}<span
                     style="font-size: 20px;">亿</span></span></div>
-              <img src="./groupImg/light2.png" class="absolute ballLight" alt="">
+              <img src="./groupImg/light2.png" class="absolute ballLight" alt="" v-if="fling">
               <div ref="echartL1" style="width: 90%; height: 90%;margin: auto;"></div>
             </div>
           </div>

investmentPort/js/investHomeGroup.js

@@ -2,6 +2,7 @@ let app = new Vue({
   el: '#app',
   data () {
     return {
+      fling:false, //水球光泽
       centerOriginalConfig6: '',
       rightAdd: {},// 左边新增筛选参数
       projectNum: '', // 项目列表弹窗顶部类目筛选条件
@@ -179,7 +180,9 @@ let app = new Vue({
     chooseTime (value) {
       let that = this
       this.year = value
+      that.fling = false
       that.destroyCharts()
+      that.closeTap()
       this.pullShow = false
       setTimeout(item => {
         that.comeIn()
@@ -299,7 +302,7 @@ let app = new Vue({
           access_token: this.access_token,
           "data": {
             "mdnb_combofield": this.mockData ? 'B' : 'A',
-            "mdnb_datefield": this.year - 1 + '-01-01',
+            "mdnb_datefield": this.year + '-01-01',
           },
           pageSize: 1000
         }
@@ -329,7 +332,7 @@ let app = new Vue({
           access_token: this.access_token,
           "data": {
             "mdnb_combofield": this.mockData ? 'B' : 'A',
-            "mdnb_datefield": this.year - 1 + '-01-01',
+            "mdnb_datefield": this.year + '-01-01',
           },
           pageSize: 1000
         }
@@ -366,7 +369,7 @@ let app = new Vue({
           access_token: this.access_token,
           "data": {
             "mdnb_combofield": this.mockData ? 'B' : 'A',
-            "mdnb_datefield": this.year - 1 + '-01-01',
+            "mdnb_datefield": this.year + '-01-01',
           },
           pageSize: 1000
         }
@@ -387,6 +390,7 @@ let app = new Vue({
               left7[i].y = item.mdnb_amountfield8
               left7[i].name = item.mdnb_textfield2
             })
+            console.log(left7,'?????????????')
             this.initChartL5()
             // 战略性新兴产业
             // if (dataList[1].data.length > left8.length || dataList[1].data.length == left8.length) {
@@ -439,7 +443,7 @@ let app = new Vue({
           access_token: this.access_token,
           "data": {
             "mdnb_combofield": this.mockData ? 'B' : 'A',
-            "mdnb_datefield": this.year - 1 + '-01-01',
+            "mdnb_datefield": this.year + '-01-01',
           },
           pageSize: 1000
         }
@@ -499,13 +503,14 @@ let app = new Vue({
           access_token: this.access_token,
           "data": {
             "mdnb_combofield": this.mockData ? 'B' : 'A',
-            "mdnb_datefield": this.year - 1 + '-01-01',
+            "mdnb_datefield": this.year + '-01-01',
           },
           pageSize: 1000
         }
         post('/ierp/kapi/v2/mdnb/mdnb_xmkb/mdnb_manager_preinvest/tqtzedfx', value).then(res => {
           if (res.data.rows.length > 0) {
             let dataList = res.data.rows[0]
+            that.fling = true
             left1[0] = dataList.mdnb_amountfield
             left1[1] = dataList.mdnb_amountfield1
             left1[2] = dataList.mdnb_amountfield2
@@ -525,7 +530,7 @@ let app = new Vue({
           access_token: this.access_token,
           "data": {
             "mdnb_combofield": this.mockData ? 'B' : 'A',
-            "mdnb_datefield": this.year - 1 + '-01-01',
+            "mdnb_datefield": this.year + '-01-01',
           },
           pageSize: 1000
         }
@@ -702,7 +707,7 @@ let app = new Vue({
         let value = {
           access_token: this.access_token,
           mock: this.mockData,
-          presetYear: this.year
+          presetYear: this.year - 1
         }
         get('/ierp/kapi/v2/mdnb/mdnb_xmkb/presetdata/getKeyData', value).then(res => {
           console.log(res.data, '???????????')
@@ -1094,7 +1099,7 @@ let app = new Vue({
         let value = {
           access_token: this.access_token,
           mock: this.mockData,
-          presetYear: this.year,
+          presetYear: this.year - 1 ,
           type,
           param
         }
@@ -1109,7 +1114,7 @@ let app = new Vue({
                 common3.push(item.cyplanamount)
               }
               if (param == 'szplanamount') {
-                common3.push(item.cyplanamount)
+                common3.push(item.szplanamount)
               }
               if (param == 'szplancount') {
                 common3.push(item.szplancount)
@@ -1197,7 +1202,7 @@ let app = new Vue({
         let value = {
           access_token: this.access_token,
           mock: this.mockData,
-          presetYear: this.year,
+          presetYear: this.year - 1,
           type,
           param,
           orgNum
@@ -2157,7 +2162,7 @@ let app = new Vue({
                 type: "radial",
                 x: 0.5,
                 y: 0.5,
-                r: 0.5,
+                r: 0.7,
                 // 水球体颜色
                 colorStops: [
                   {
@@ -2268,7 +2273,7 @@ let app = new Vue({
                 type: "radial",
                 x: 0.5,
                 y: 0.5,
-                r: 0.5,
+                r: 0.7,
                 // 水球体颜色
                 colorStops: [
                   {
@@ -3144,7 +3149,7 @@ let app = new Vue({
             //console.log(this)
             let num = chartData[this.colorIndex].num
             this.percentage = this.percentage.toFixed(2) //Math.round(this.percentage)
-            return `${this.key}：<b>${this.percentage}%</b><br/><b>${this.y}</b>亿，<b>${num}个</b>`
+            return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.yuanChange(this.y)}</b>亿，<b>${num}个</b>`
           },
           //pointFormat: 
         },
@@ -3356,7 +3361,7 @@ let app = new Vue({
             //console.log(this)
             let num = chartData[this.colorIndex].num
             this.percentage = this.percentage.toFixed(2) //Math.round(this.percentage)
-            return `${this.key}：<b>${this.percentage}%</b><br/><b>${this.y}</b>亿，<b>${num}个</b>`
+            return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.yuanChange(this.y)}</b>亿，<b>${num}个</b>`
           },
           //pointFormat: 
         },
@@ -3565,7 +3570,7 @@ let app = new Vue({
             //console.log(this)
             let num = chartData[this.colorIndex].num
             this.percentage = this.percentage.toFixed(2) //Math.round(this.percentage)
-            return `${this.key}：<b>${this.percentage}%</b><br/><b>${this.y}</b>亿，<b>${num}个</b>`
+            return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.yuanChange(this.y)}</b>亿，<b>${num}个</b>`
           },
           //pointFormat: 
         },
@@ -3775,7 +3780,7 @@ let app = new Vue({
             //console.log(this)
             let num = chartData[this.colorIndex].num
             this.percentage = this.percentage.toFixed(2) //Math.round(this.percentage)
-            return `${this.key}：<b>${this.percentage}%</b><br/><b>${this.y}</b>亿，<b>${num}个</b>`
+            return `${this.key}：<b>${this.percentage}%</b><br/><b>${that.yuanChange(this.y)}</b>亿，<b>${num}个</b>`
           },
           //pointFormat: 
         },