no message

common/chart/ring_chart.vue

@@ -123,7 +123,7 @@
 			this.opts.color = this.bgChartColor
 		},
 		onReady() {
-			this.getServerData();
+			// this.getServerData();
 		},
 		methods: {
 			getServerData() {
@@ -144,6 +144,17 @@
 					this.chartData = JSON.parse(JSON.stringify(res));
 				}, 500);
 			},
+      setServerData(data){
+        setTimeout(() => {
+          //模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
+          let res = {
+            series: [{
+              data:data
+            }]
+          };
+          this.chartData = JSON.parse(JSON.stringify(res));
+        }, 50);
+      },
 			setNoData() {
 				this.chartData = {};
 				this.errorMessage = '暂无数据'
@@ -158,4 +169,4 @@
 		width: 100%;
 		height: 300px;
 	}
-</style>
+</style>

components/en-from/en-upload/en-upload.vue

@@ -436,7 +436,6 @@
 					maxDuration: 60,
 					success: (res) => {
 						this.showUploadingImg(false)
-						console.log(res)
 						this.uploadingFile(res.tempFile);
 					}
 				});
@@ -668,4 +667,4 @@
 		padding: 0;
 		border: none;
 	}
-</style>
+</style>

pages/statistics/components/general_stat.vue

@@ -4,12 +4,9 @@
 		<stat_finance_chart :money-data="moneyData"></stat_finance_chart>
 		<stat-finance ref="financeObj" :date-type-obj="dateTypeObj"></stat-finance>
 		<view class="sys-background-fff r-30">
-			<StatCapital :leftColor="0" :rightColor="1" :leftText="'任务资金汇总'" :tabulate-data="sysPassageData">
-			</StatCapital>
+			<StatCapital :leftColor="0" ref="passageObj" :rightColor="1" :leftText="'任务资金汇总'" :tabulate-data="sysPassageData"></StatCapital>
 			<view class="view_line"></view>
-			<StatCapital :leftColor="1" :rightColor="2" :bgChartColor="['#2B7DFA','#ED9A2C']" :leftText="'在途资金汇总'"
-				:tabulate-data="sysCapitalMoney">
-			</StatCapital>
+			<StatCapital :leftColor="1"  ref="capitalObj" :rightColor="2" :bgChartColor="['#2B7DFA','#ED9A2C']" :leftText="'在途资金汇总'"	:tabulate-data="sysCapitalMoney"></StatCapital>
 		</view>
 		<stat-industry ref="industryRef" :industry-list="industryList"></stat-industry>
 		<stat-age-chart ref="ageRef"></stat-age-chart>
@@ -218,4 +215,4 @@
 </script>
 
 <style>
-</style>
+</style>

pages/statistics/module/stat_capital.vue

@@ -106,10 +106,13 @@
 			}
 		},
 		methods: {
+
 			initData() {
 				if ((this.tabulateData.consume_ratio * 1 + this.tabulateData.pledge_ratio * 1) > 0) {
-					// this.$refs.tabulateObj.setServerData(this.tabulateData.consume_ratio)
-				}
+					this.$refs.tabulateObj.setServerData(this.tabulateData.list)
+				}else {
+          this.$refs.tabulateObj.setNoData()
+        }
 			},
 		},
 	}
@@ -120,4 +123,4 @@
 		width: 200rpx;
 		text-align: left;
 	}
-</style>
+</style>

pages/statistics/module/stat_industry.vue

@@ -61,8 +61,6 @@
         }else {
           this.$refs.roseChart.setNoData()
         }
-
-
 			}
 		}
 	}
@@ -101,4 +99,4 @@
 
 		}
 	}
-</style>
+</style>