1.28 完善主营业务模块表格，柱状图，饼状图

components/cwfx-view/cwfx-view.vue

@@ -8,7 +8,6 @@
 				<image src="/static/icon/home/conceptCenter/next.png" mode="widthFix"
 					style="width: 13rpx; height: 22rpx;"></image>
 			</view>
-	
 			<view style="display: grid; gap: 20rpx; grid-template-columns: repeat(4, 1fr); margin: 0 20rpx;">
 				<view
 					style="display: flex; align-items: center; justify-content: center; text-align: center; font-size: 20rpx; color: #999999; border: 1rpx solid #D2D2D2; padding: 3rpx 5rpx; box-sizing: border-box;"
@@ -18,14 +17,13 @@
 					{{item}}
 				</view>
 			</view>
-	
-			<view style="display: flex;align-items: center; padding: 20rpx; box-sizing: border-box;">
+			<view class="flex" style="padding: 20rpx; box-sizing: border-box;">
 				<view class="flex1" style="font-size: 28rpx;">查看详细数据</view>
 				<view
 					style="color: #F2C369; font-size: 22rpx; padding: 2rpx 10rpx; border-radius: 5rpx; border: 1rpx solid #F2C369; text-align: center; margin: 0 10rpx;">
 					单季度</view>
-				<view
-					style="display: flex; align-items: center; padding: 3rpx 10rpx; box-sizing: border-box; border: 1rpx solid #D2D2D2;">
+				<view class="flex"
+					style="padding: 3rpx 10rpx;border: 1rpx solid #D2D2D2;">
 					<image style="width: 23rpx; height: 23rpx;" src="/pagesStock/static/icon/all-icon.png"
 						mode="widthFix"></image>
 					<view style="margin: 0 10rpx; color: #999999; font-size: 22rpx;">全部</view>
@@ -34,9 +32,9 @@
 				</view>
 			</view>
 	
-			<view
-				style="height: 400rpx; display: flex; align-items: center; justify-content: center; background-color: red;">
-				柱状图占位 </view>
+			<view style="height: 500rpx;">
+				<l-echart ref="chartRef1"></l-echart>
+			</view>
 	
 		</view>
 	
@@ -73,10 +71,9 @@
 						mode="widthFix"></image>
 				</view>
 			</view>
-	
-			<view
-				style="height: 400rpx; display: flex; align-items: center; justify-content: center; background-color: blue;">
-				柱状图占位 </view>
+			<view style="height: 500rpx;">
+				<l-echart ref="chartRef2"></l-echart> 
+			</view>
 	
 		</view>
 	</view>
@@ -87,8 +84,74 @@
 		name:"cwfx-view",
 		data() {
 			return {
-				
+				option1:{
+					legend:{
+						show:true,
+						data:['ROE','同比(右)']
+					},
+					grid:{
+						left:'2%',
+						right:'2%',
+						top:'5%',
+						bottom:'30%'
+					},
+					xAxis: {
+					    type: 'category',
+					    data: [],
+						axisLabel:{
+							// interval:0
+						}
+					},
+					yAxis: [{
+							type: 'value',
+							name:'(%)',
+							position:'left',
+							alignTicks:true,
+							axisLine:{
+								onZero:false
+							}
+						},
+						{
+							type: 'value',
+							name:'(%)',
+							position:'right',
+							alignTicks:true,
+							axisLine:{
+							  onZero:false
+							}
+						}
+					],
+					dataZoom:[{
+						type:'slider'
+					}],
+					series: [
+					    {
+					      type: 'bar',
+						  name:'营业收入',
+					      data: [],
+						  yAxisIndex:0
+					    },
+						{
+						  type: 'line',
+						  name:'净利润',
+						  data: [],
+						  yAxisIndex:1
+						}
+					]
+				},
 			};
+		},
+		props: {
+			barCategoryList1:Array,
+			barList1:Array,
+			lineList:Array,		//折线图数据
+			barCategoryList1:Array,
+			barList1:Array,
+		},
+		methods:{
+			clickProfitabilityIndicators(item) {
+				
+			}
 		}
 	}
 </script>