bug修复

investmentPort/investHome.html

@@ -637,7 +637,7 @@
             </div>
             <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)">
+                @click="showChartLTipDouble('进度成本偏差概览','right','','','','','','','','','',312,1,item.projectStepCode,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: '项目执行进度大于成本执行进度', type: 1 },
-  { name: '容差内', value: '28', value2: '264', explain: '项目执行进度与成本执行进度相符', type: 2 },
-  { name: '负偏差', value: '103', value2: '182', explain: '成本执行进度大于项目执行进度', type: 3 }
+  { name: '正偏差', value: '160', value2: '500', explain: '项目执行进度大于成本执行进度', type: 1 ,projectStepCode:'09'},
+  { name: '容差内', value: '28', value2: '264', explain: '项目执行进度与成本执行进度相符', type: 2 ,projectStepCode:'10'},
+  { name: '负偏差', value: '103', value2: '182', explain: '成本执行进度大于项目执行进度', type: 3 ,projectStepCode:'11'}
 ]
 // 中间右边
 let right4 = [

investmentPort/js/investHomeGroup.js

@@ -51,6 +51,8 @@ let app = new Vue({
       pieTime4: '', // 饼图轮播专用
       pieTime5: '', // 饼图轮播专用
       pieTime6: '', // 饼图轮播专用
+      pieTime7: '', // 饼图轮播专用
+      pieTime8: '', // 饼图轮播专用
       center1: center1,
       showTip2: false,
       showTip3: false,
@@ -179,6 +181,7 @@ let app = new Vue({
     },
     chooseTime (value) {
       let that = this
+      this.backChina()
       this.year = value
       that.fling = false
       that.destroyCharts()
@@ -195,6 +198,8 @@ let app = new Vue({
       this.pieTime4 && clearInterval(this.pieTime4);
       this.pieTime5 && clearInterval(this.pieTime5);
       this.pieTime6 && clearInterval(this.pieTime6);
+      this.pieTime7 && clearInterval(this.pieTime7);
+      this.pieTime8 && clearInterval(this.pieTime8);
       this.left10Chart ? this.left10Chart.dispose() : ''
       this.left1Chart ? (this.left1Chart.destroy(), this.left1Chart = '') : ''
       this.left2Chart ? (this.left2Chart.destroy(), this.left2Chart = '') : ''
@@ -215,12 +220,12 @@ let app = new Vue({
       this.right3Chart ? this.right3Chart.dispose() : ''
       this.echartR4Chart ? this.echartR4Chart.dispose() : ''
       this.echartR5Chart ? this.echartR5Chart.dispose() : ''
-      // this.center1Chart ? this.center1Chart.destroy() : ''
-      this.center1Chart ? this.center1Chart.dispose() : ''
+      this.center1Chart ? (this.center1Chart.destroy(), this.center1Chart = '') : ''
+      // this.center1Chart ? this.center1Chart.dispose() : ''
       this.center2Chart ? this.center2Chart.dispose() : ''
       this.center3Chart ? this.center3Chart.dispose() : ''
-      // this.center4Chart ? this.center4Chart.destroy() : ''
-      this.center4Chart ? this.center4Chart.dispose() : ''
+      this.center4Chart ? (this.center4Chart.destroy(), this.center4Chart = '') : ''
+      // this.center4Chart ? this.center4Chart.dispose() : ''
       this.mapChart ? this.mapChart.dispose() : ''
     },
     // 获取token
@@ -343,8 +348,8 @@ let app = new Vue({
             left4[0] = dataList.mdnb_amountfield7
             left4[1] = dataList.mdnb_amountfield13
             left4[2] = dataList.mdnb_amountfield23
-            left4[3] = dataList.mdnb_amountfield43
-            left4[4] = dataList.mdnb_integerfield14
+            left4[3] = dataList.mdnb_amountfield33
+            left4[4] = dataList.mdnb_integerfield
             left5[0].y = that.yuanChange(dataList.mdnb_amountfield9)
             left5[0].num = dataList.mdnb_integerfield15
             left5[1].y = that.yuanChange(dataList.mdnb_amountfield43)
@@ -790,7 +795,8 @@ let app = new Vue({
         let value = {
           access_token: this.access_token,
           "request": {
-            isInsert: this.mockData ? '1' : '0'
+            isInsert: this.mockData ? '1' : '0',
+            projectStepCode: this.rightAdd.projectStepCode,
           },
           pageSize: 1000
         }
@@ -834,7 +840,7 @@ let app = new Vue({
               that.config6.data[index][1] = item.mdnb_project_name
               that.config6.data[index][2] = item.mdnb_implement_org
               that.config6.data[index][3] = item.mdnb_projectstep_mid
-              that.config6.data[index][4] = item.mdnb_investment_money / 10000
+              that.config6.data[index][4] = that.numFormat(item.mdnb_investment_money / 10000)
             })
           } else if (this.projectNum == 312 || this.projectNum == 313) {
             that.config6.header = ["所属集团", "项目名称", '实施主体', '容差百分比', '投资总额（万元）']
@@ -844,7 +850,7 @@ let app = new Vue({
               that.config6.data[index][1] = item.mdnb_project_name
               that.config6.data[index][2] = item.mdnb_implement_org
               that.config6.data[index][3] = item.mdnb_percentagetolerance
-              that.config6.data[index][4] = item.mdnb_investment_money / 10000
+              that.config6.data[index][4] = that.numFormat(item.mdnb_investment_money / 10000)
             })
           } else if (this.projectNum == 314) {
             that.config6.header = ["所属集团", "项目名称", '实施主体', '预算额（万元）', '已签订合同额（万元）', '产值认定额（万元）', '结算额（万元）', '付款申请额（万元）', '实际付款额（万元）']
@@ -853,12 +859,12 @@ let app = new Vue({
               that.config6.data[index][0] = item.mdnb_unitcompany
               that.config6.data[index][1] = item.mdnb_project_name
               that.config6.data[index][2] = item.mdnb_implement_org
-              that.config6.data[index][3] = item.mdnb_budgetamount / 10000
-              that.config6.data[index][4] = item.mdnb_contractamount / 10000
-              that.config6.data[index][5] = item.mdnb_outputamount / 10000
-              that.config6.data[index][6] = item.mdnb_settlementamount / 10000
-              that.config6.data[index][7] = item.mdnb_paymentamount / 10000
-              that.config6.data[index][8] = item.mdnb_actualpayamount / 10000
+              that.config6.data[index][3] = that.numFormat(item.mdnb_budgetamount / 10000)
+              that.config6.data[index][4] = that.numFormat(item.mdnb_contractamount / 10000)
+              that.config6.data[index][5] = that.numFormat(item.mdnb_outputamount / 10000)
+              that.config6.data[index][6] = that.numFormat(item.mdnb_settlementamount / 10000)
+              that.config6.data[index][7] = that.numFormat(item.mdnb_paymentamount / 10000)
+              that.config6.data[index][8] = that.numFormat(item.mdnb_actualpayamount / 10000)
             })
           } else if (this.projectNum == 315) {
             that.config6.header = ["所属集团", "项目名称", '实施主体', '高风险项', '中风险项', '低风险项', '投资总额（万元）']
@@ -870,7 +876,7 @@ let app = new Vue({
               that.config6.data[index][3] = item.mdnb_heigtdanger
               that.config6.data[index][4] = item.mdnb_middledanger
               that.config6.data[index][5] = item.mdnb_lowdanger
-              that.config6.data[index][6] = item.mdnb_investment_money / 10000
+              that.config6.data[index][6] = that.numFormat(item.mdnb_investment_money / 10000)
             })
           }
           that.config6 = { ...that.config6 }
@@ -891,12 +897,11 @@ let app = new Vue({
             mdnb_textfield13,
             mdnb_textfield16,
             mdnb_textfield23,
-            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/yjct', value).then(res => {
-          console.log(res.data.rows, '??????????')
           if (res.data.rows.length > 0) {
             if (typeNum == 2) {
               common4 = []
@@ -932,7 +937,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',
               mdnb_textfield12,
               mdnb_textfield19,
               mdnb_textfield15,
@@ -947,7 +952,6 @@ let app = new Vue({
               if (res.data.rows.length > 0) {
                 that.originalConfig6 = res.data.rows[0].mdnb_entryentity11
                 that.config6.data = []
-                console.log(this.projectNum, res.data.rows, '???????????')
                 if (this.projectNum == 211 || this.projectNum == 212) {
                   that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '已占用额度（万元）']
                   res.data.rows[0].mdnb_entryentity11.forEach((item, index) => {
@@ -957,7 +961,7 @@ let app = new Vue({
                     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_amountfield22 / 10000
+                    that.config6.data[index][5] = that.numFormat(item.mdnb_amountfield22 / 10000)
                   })
                 } else if (this.projectNum == 2141) {
                   that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '本年度计划投资额（万元）']
@@ -968,7 +972,7 @@ let app = new Vue({
                     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_amountfield22 / 10000
+                    that.config6.data[index][5] = that.numFormat(item.mdnb_amountfield22 / 10000)
                   })
                 } else if (this.projectNum == 2142) {
                   that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '是否主业', '本年度计划投资额（万元）']
@@ -980,7 +984,7 @@ let app = new Vue({
                     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] = item.mdnb_amountfield22 / 10000
+                    that.config6.data[index][6] = that.numFormat(item.mdnb_amountfield22 / 10000)
                   })
                 } else if (this.projectNum == 2143) {
                   that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '项目管理类型', '本年度计划投资额（万元）']
@@ -992,7 +996,7 @@ let app = new Vue({
                     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] = item.mdnb_amountfield22 / 10000
+                    that.config6.data[index][6] = that.numFormat(item.mdnb_amountfield22 / 10000)
                   })
                 } else if (this.projectNum == 215) {
                   that.config6.header = ["所属集团", "项目名称", '投资主体', '产业类别I级', '产业类别II级', '本年度计划投资额（万元）']
@@ -1003,7 +1007,7 @@ let app = new Vue({
                     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] = item.mdnb_amountfield22 / 10000
+                    that.config6.data[index][5] = that.numFormat(item.mdnb_amountfield22 / 10000)
                   })
                 } else if (this.projectNum == 216) {
                   that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '项目阶段', '本年度计划投资额（万元）']
@@ -1015,7 +1019,7 @@ let app = new Vue({
                     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] = item.mdnb_amountfield22 / 10000
+                    that.config6.data[index][6] = that.numFormat(item.mdnb_amountfield22 / 10000)
                   })
                 }
               }
@@ -1037,7 +1041,7 @@ let app = new Vue({
                     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_amountfield22 / 10000
+                    that.config6.data[index][5] = that.numFormat(item.mdnb_amountfield22 / 10000)
                   })
                 } else if (this.projectNum == 2141) {
                   that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '本年度计划投资额（万元）']
@@ -1048,7 +1052,7 @@ let app = new Vue({
                     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_amountfield22 / 10000
+                    that.config6.data[index][5] = that.numFormat(item.mdnb_amountfield22 / 10000)
                   })
                 } else if (this.projectNum == 2142) {
                   that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '是否主业', '本年度计划投资额（万元）']
@@ -1060,7 +1064,7 @@ let app = new Vue({
                     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] = item.mdnb_amountfield22 / 10000
+                    that.config6.data[index][6] = that.numFormat(item.mdnb_amountfield22 / 10000)
                   })
                 } else if (this.projectNum == 2143) {
                   that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '项目管理类型', '本年度计划投资额（万元）']
@@ -1072,7 +1076,7 @@ let app = new Vue({
                     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] = item.mdnb_amountfield22 / 10000
+                    that.config6.data[index][6] = that.numFormat(item.mdnb_amountfield22 / 10000)
                   })
                 } else if (this.projectNum == 215) {
                   that.config6.header = ["所属集团", "项目名称", '投资主体', '产业类别I级', '产业类别II级', '本年度计划投资额（万元）']
@@ -1083,7 +1087,7 @@ let app = new Vue({
                     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] = item.mdnb_amountfield22 / 10000
+                    that.config6.data[index][5] = that.numFormat(item.mdnb_amountfield22 / 10000)
                   })
                 } else if (this.projectNum == 216) {
                   that.config6.header = ["所属集团", "项目名称", '投资主体', '项目类型', '项目性质', '项目阶段', '本年度计划投资额（万元）']
@@ -1095,7 +1099,7 @@ let app = new Vue({
                     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] = item.mdnb_amountfield22 / 10000
+                    that.config6.data[index][6] = that.numFormat(item.mdnb_amountfield22 / 10000)
                   })
                 }
                 that.config6 = { ...that.config6 }
@@ -1240,7 +1244,7 @@ let app = new Vue({
                 that.config6.data[index][2] = item.tzzt
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
-                that.config6.data[index][5] = item.amount / 10000
+                that.config6.data[index][5] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 112) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "产业类别I级", "产业类别II级", "投资完成额（万元）"]
@@ -1251,7 +1255,7 @@ let app = new Vue({
                 that.config6.data[index][2] = item.tzzt
                 that.config6.data[index][3] = item.cylb
                 that.config6.data[index][4] = item.cylb2
-                that.config6.data[index][5] = item.amount / 10000
+                that.config6.data[index][5] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 1131) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "项目类型", "项目性质", "本年度计划投资额（万元）"]
@@ -1262,7 +1266,7 @@ let app = new Vue({
                 that.config6.data[index][2] = item.tzzt
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
-                that.config6.data[index][5] = item.amount / 10000
+                that.config6.data[index][5] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 1132) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "项目类型", "项目性质", "投资完成额 (万元)"]
@@ -1273,7 +1277,7 @@ let app = new Vue({
                 that.config6.data[index][2] = item.tzzt
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
-                that.config6.data[index][5] = item.amount / 10000
+                that.config6.data[index][5] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 114) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "项目类型", "项目性质", "是否“两个转型”", "本年度计划投资额 (万元)"]
@@ -1285,7 +1289,7 @@ let app = new Vue({
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
                 that.config6.data[index][5] = item.lgz
-                that.config6.data[index][6] = item.amount / 10000
+                that.config6.data[index][6] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 115) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "项目类型", "项目性质", "是否“五个一体化”", "本年度计划投资额 (万元)"]
@@ -1297,7 +1301,7 @@ let app = new Vue({
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
                 that.config6.data[index][5] = item.wgy
-                that.config6.data[index][6] = item.amount / 10000
+                that.config6.data[index][6] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 116) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "项目类型", "项目性质", "建设阶段", "投资完成额 (万元)"]
@@ -1309,7 +1313,7 @@ let app = new Vue({
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
                 that.config6.data[index][5] = item.mdnb_quality
-                that.config6.data[index][6] = item.amount / 10000
+                that.config6.data[index][6] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 118) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "项目类型", "项目性质", "建设地点", "投资完成额 (万元)"]
@@ -1321,7 +1325,7 @@ let app = new Vue({
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
                 that.config6.data[index][5] = item.buildaddr
-                that.config6.data[index][6] = item.amount / 10000
+                that.config6.data[index][6] = that.numFormat(item.amount / 10000)
               })
             }
             that.config6 = { ...that.config6 }
@@ -1341,7 +1345,7 @@ let app = new Vue({
                 that.config6.data[index][2] = item.tzzt
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
-                that.config6.data[index][5] = item.amount / 10000
+                that.config6.data[index][5] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 112) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "产业类别I级", "产业类别II级", "投资完成额（万元）"]
@@ -1352,7 +1356,7 @@ let app = new Vue({
                 that.config6.data[index][2] = item.tzzt
                 that.config6.data[index][3] = item.cylb
                 that.config6.data[index][4] = item.cylb2
-                that.config6.data[index][5] = item.amount / 10000
+                that.config6.data[index][5] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 1131) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "项目类型", "项目性质", "本年度计划投资额（万元）"]
@@ -1363,7 +1367,7 @@ let app = new Vue({
                 that.config6.data[index][2] = item.tzzt
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
-                that.config6.data[index][5] = item.amount / 10000
+                that.config6.data[index][5] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 1132) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "项目类型", "项目性质", "投资完成额 (万元)"]
@@ -1374,7 +1378,7 @@ let app = new Vue({
                 that.config6.data[index][2] = item.tzzt
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
-                that.config6.data[index][5] = item.amount / 10000
+                that.config6.data[index][5] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 114) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "项目类型", "项目性质", "是否“两个转型”", "本年度计划投资额 (万元)"]
@@ -1386,7 +1390,7 @@ let app = new Vue({
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
                 that.config6.data[index][5] = item.lgz
-                that.config6.data[index][6] = item.amount / 10000
+                that.config6.data[index][6] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 115) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "项目类型", "项目性质", "是否“五个一体化”", "本年度计划投资额 (万元)"]
@@ -1398,7 +1402,7 @@ let app = new Vue({
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
                 that.config6.data[index][5] = item.wgy
-                that.config6.data[index][6] = item.amount / 10000
+                that.config6.data[index][6] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 116) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "项目类型", "项目性质", "建设阶段", "投资完成额 (万元)"]
@@ -1410,7 +1414,7 @@ let app = new Vue({
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
                 that.config6.data[index][5] = item.mdnb_quality
-                that.config6.data[index][6] = item.amount / 10000
+                that.config6.data[index][6] = that.numFormat(item.amount / 10000)
               })
             } else if (this.projectNum == 118) {
               that.config6.header = ["所属集团", "项目名称", "投资主体", "项目类型", "项目性质", "建设地点", "投资完成额 (万元)"]
@@ -1422,7 +1426,7 @@ let app = new Vue({
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
                 that.config6.data[index][5] = item.buildaddr
-                that.config6.data[index][6] = item.amount / 10000
+                that.config6.data[index][6] = that.numFormat(item.amount / 10000)
               })
             }
             that.config6 = { ...that.config6 }
@@ -1433,7 +1437,7 @@ let app = new Vue({
           value = {
             access_token: this.access_token,
             mock: this.mockData,
-            presetYear: this.year,
+            presetYear: this.year - 1,
             type: 'investmentMap',
             param: '太原市',
             orgNum
@@ -1451,7 +1455,7 @@ let app = new Vue({
                 that.config6.data[index][3] = item.projectkind
                 that.config6.data[index][4] = item.projectkinddetail
                 that.config6.data[index][5] = item.buildaddr
-                that.config6.data[index][6] = item.amount / 10000
+                that.config6.data[index][6] = that.numFormat(item.amount / 10000)
               })
             }
             that.config6 = { ...that.config6 }
@@ -1514,10 +1518,8 @@ let app = new Vue({
       console.log(e, f, '看看E')
       if (f) {
         this.boardType = f
-        this.boardUrl = `http://172.21.3.68:8081/ierp/accessTokenLogin.do?access_token=${this.access_token}&redirect=http://172.21.3.68:8081/ierp/index.html?formId=mdnb_threetoproject&prj=${this.findProjectCode(e.row[0], e.row[1], this.boardType)}`
-      } else {
-        this.boardUrl = `http://172.21.3.68:8081/ierp/accessTokenLogin.do?access_token=${this.access_token}&redirect=http://172.21.3.68:8081/ierp/index.html?formId=mdnb_threetoproject&prj=${this.findProjectCode(e.row[0], e.row[1], f)}`
       }
+      this.boardUrl = `http://172.21.3.68:8081/ierp/accessTokenLogin.do?access_token=${this.access_token}&redirect=http://172.21.3.68:8081/ierp/index.html?formId=mdnb_threetoproject&prj=${this.findProjectCode(e.row[0], e.row[1], this.boardType)}`
       // this.findProjectCode(e.row[0],e.row[2])
       // 当前页面打开
       // window.location.href = `http://192.168.2.111:8080/ierp/accessTokenLogin.do?access_token=${this.access_token}&redirect=http://192.168.2.111:8080/ierp/index.html?formId=mdnb_threetoproject&prj=PL_ZZGY_0_2023_000036`
@@ -2096,26 +2098,6 @@ let app = new Vue({
         this.yellowCount += 2
       }
     },
-    numFormat (value) {
-      if (!value) return '0'
-      // var intPart = Number(value).toFixed(0) // 获取整数部分
-      var intPart = parseInt(value)// 获取整数部分
-      var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
-      var floatPart = '.00' // 预定义小数部分
-      var value2Array = value.toString().split('.')
-      // =2表示数据有小数位
-      if (value2Array.length === 2) {
-        floatPart = value2Array[1].toString() // 拿到小数部分
-        if (floatPart.length === 1) {
-          // 补0
-          return intPartFormat + '.' + floatPart + '0'
-        } else {
-          return intPartFormat + '.' + floatPart
-        }
-      } else {
-        return intPartFormat
-      }
-    },
     changeTopColor () {
       this.list = document.getElementsByClassName('row-item')
       for (var i = 0; i < this.list.length; i++) {
@@ -4136,7 +4118,7 @@ let app = new Vue({
             type: 'scatter',
             symbol: 'circle',//'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'
             symbolSize: function (data) {
-              return Math.sqrt(data[2]) * 5;
+              return Math.sqrt(Math.sqrt(data[2])) * 5;
             },
             // label: {
             //   emphasis: {
@@ -4159,7 +4141,7 @@ let app = new Vue({
             type: 'scatter',
             symbol: 'circle',//'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'
             symbolSize: function (data) {
-              return Math.sqrt(data[2]) * 5;
+              return Math.sqrt(Math.sqrt(data[2])) * 5;
             },
             // label: {
             //   emphasis: {
@@ -4287,7 +4269,7 @@ let app = new Vue({
             type: 'scatter',
             symbol: 'circle',
             symbolSize: function (data) {
-              return Math.sqrt(data[2]) * 5;
+              return Math.sqrt(Math.sqrt(data[2])) * 5;
             },
             // label: {
             //   emphasis: {
@@ -4310,7 +4292,7 @@ let app = new Vue({
             type: 'scatter',
             symbol: 'circle',
             symbolSize: function (data) {
-              return Math.sqrt(data[2]) * 5;
+              return Math.sqrt(Math.sqrt(data[2])) * 5;
             },
             // label: {
             //   emphasis: {
@@ -4345,7 +4327,6 @@ let app = new Vue({
       if (this.centerType) {
         //3D饼图
         var chartData = center2
-        var timer = null;
         var i = 0;
         let that = this
         var option = {
@@ -4366,8 +4347,8 @@ let app = new Vue({
                 var points = chart.series[0].points;
                 var len = points.length;
 
-                timer && clearInterval(timer);
-                timer = setInterval(function () {
+                that.pieTime7 && clearInterval(that.pieTime7);
+                that.pieTime7 = setInterval(function () {
                   autoTooltip(points[i]);
                   chartData.forEach((item, index) => {
                     item.sliced = false
@@ -4492,14 +4473,14 @@ let app = new Vue({
                       data: chartData
                     }]
                   })
-                  timer && clearInterval(timer);
+                  that.pieTime7 && clearInterval(that.pieTime7);
                 },
                 mouseOut: function () { // 鼠标移出后需要继续执行轮播
                   var points = that.center1Chart.series[0].points;
                   var len = points.length;
 
-                  timer && clearInterval(timer);
-                  timer = setInterval(function () {
+                  that.pieTime7 && clearInterval(that.pieTime7);
+                  that.pieTime7 = setInterval(function () {
                     autoTooltip(points[i]);
                     chartData.forEach((item, index) => {
                       item.sliced = false
@@ -4544,7 +4525,6 @@ let app = new Vue({
         let that = this
         that.center1Chart = echarts.init(this.$refs['echartC1'])
         data = center2
-        console.log(data, '??????????????????')
         arrName = getArrayValue(data, "name");
         arrValue = getArrayValue(data, "value");
         sumValue = eval(arrValue.join("+"));
@@ -5048,6 +5028,7 @@ let app = new Vue({
           // 补0
           return intPartFormat + '.' + floatPart + '0'
         } else {
+          floatPart = floatPart.slice(0,2)
           return intPartFormat + '.' + floatPart
         }
       } else {
@@ -5497,7 +5478,6 @@ let app = new Vue({
       if (this.centerType) {
         // 3D饼图
         var chartData = []
-        var timer = null;
         var timer2 = null;
         var i = 0;
         center7.forEach((item, index) => {
@@ -5512,7 +5492,6 @@ let app = new Vue({
           }
           chartData.push(obj)
         })
-        let that = this
         that.center4Chart = Highcharts.chart('echartC4', {
           chart: {
             type: 'pie',
@@ -5530,8 +5509,8 @@ let app = new Vue({
                 var points = chart.series[0].points;
                 var len = points.length;
 
-                timer && clearInterval(timer);
-                timer = setInterval(function () {
+                that.pieTime8 && clearInterval(that.pieTime8);
+                that.pieTime8 = setInterval(function () {
                   autoTooltip(points[i]);
                   chartData.forEach((item, index) => {
                     item.sliced = false
@@ -5671,14 +5650,14 @@ let app = new Vue({
                       data: chartData
                     }]
                   })
-                  timer && clearInterval(timer);
+                  that.pieTime8 && clearInterval(that.pieTime8);
                 },
                 mouseOut: function () { // 鼠标移出后需要继续执行轮播
                   var points = that.center4Chart.series[0].points;
                   var len = points.length;
 
-                  timer && clearInterval(timer);
-                  timer = setInterval(function () {
+                  that.pieTime8 && clearInterval(that.pieTime8);
+                  that.pieTime8 = setInterval(function () {
                     autoTooltip(points[i]);
                     chartData.forEach((item, index) => {
                       item.sliced = false
@@ -6291,7 +6270,7 @@ let app = new Vue({
             itemStyle: itemStyle,
             data: right5[0],
             symbolSize: function (data) {
-              return Math.sqrt(Math.abs(data[2])) * 200;
+              return Math.sqrt(Math.sqrt(Math.abs(data[2]))) * 40;
             },
           },
           {
@@ -6300,7 +6279,7 @@ let app = new Vue({
             itemStyle: itemStyle,
             data: right5[1],
             symbolSize: function (data) {
-              return Math.sqrt(Math.abs(data[2])) * 200;
+              return Math.sqrt(Math.sqrt(Math.abs(data[2]))) * 40;
             },
           },
           {
@@ -6309,7 +6288,7 @@ let app = new Vue({
             itemStyle: itemStyle,
             data: right5[2],
             symbolSize: function (data) {
-              return Math.sqrt(Math.abs(data[2])) * 200;
+              return Math.sqrt(Math.sqrt(Math.abs(data[2]))) * 40;
             },
           }
         ]