From c3b2d6d35b77d11ff86d45926501493b7fc8886e Mon Sep 17 00:00:00 2001
From: wjt <1797368093@qq.com>
Date: 星期二, 23 七月 2024 10:30:20 +0800
Subject: [PATCH] 新功能添加

---
 policy/dataLook/dataLook.vue |   49 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/policy/dataLook/dataLook.vue b/policy/dataLook/dataLook.vue
index 426dd7c..4e4efc1 100644
--- a/policy/dataLook/dataLook.vue
+++ b/policy/dataLook/dataLook.vue
@@ -43,11 +43,22 @@
 					<text>鎵ф硶鍗曚綅鎵ф硶娆℃暟</text>
 					<u-icon name="calendar" size="24" @click="openDate(1)"></u-icon>
 				</view>
-				<view class="number">
+				<view class="number set-height">
 					<view class="date">{{pageQuerm.beginTimeStr1}} <text class="margin-text">鑷�</text> {{pageQuerm.endTimeStr1}}</view>
-					<view class="progress-box">
-						<qiun-data-charts v-if="!show" key="11" type="bar"
-							:opts="opts" :chartData="chartData" />
+					<view class="progress-box"  style="margin-top: 20rpx;">
+						<!-- <qiun-data-charts v-if="!show" key="11" type="bar"
+							:opts="opts" :chartData="chartData" /> -->
+							<view v-for="(item,index) in likeData" style="margin-bottom: 20rpx;" class="set-flex-progress">
+								<view class="name">{{item.k}}</view> 
+								<view class="progress">
+									<u-line-progress activeColor="#1890FF"  :percentage="item.progress" height="20">
+										<template slot="default">
+											{{item.v}}
+										</template>
+									</u-line-progress>
+								</view>
+							</view>
+							<!-- <echarts ref="echarts" :option="option" canvasId="echarts"></echarts> -->
 					</view>
 				</view>
 			</view>
@@ -110,9 +121,12 @@
 		getCompanyCount,
 		getEnforceTypeCount
 	} from '@/api/data.js'
+	
 	export default {
 		data() {
 			return {
+				likeData: {},
+				option: {},
 				typeItem: '',
 				currentValue: '',
 				show: false,
@@ -138,31 +152,29 @@
 					enableScroll: false,
 					legend: {
 						show: false,
-						
 					},
 					xAxis: {
 						boundaryGap: "justify",
 						disableGrid: false,
 						min: 0,
 						axisLine: false,
-						max: 40,
-						gridColor: "#ededed"
+						gridColor: "#ededed",
 					},
 					yAxis: {
-						gridColor: "#ededed"
+						gridColor: "#ededed",
 					},
 					extra: {
 						bar: {
 							type: "group",
-							width: 10,
+							width: 15,
 							meterBorde: 1,
 							meterFillColor: "#FFFFFF",
 							activeBgColor: "#000000",
 							activeBgOpacity: 0.08,
 							linearType: "custom",
 							barBorderCircle: true,
-							seriesGap: 2,
-							categoryGap: 2
+							seriesGap: 20,
+							categoryGap: 20
 						}
 					}
 				},
@@ -207,6 +219,7 @@
 			this.getCompanyCount()
 			this.getServerData();
 			this.getServerData1()
+			
 		},
 		methods: {
 			confirmDate(e) {
@@ -262,8 +275,20 @@
 			// 鎵ф硶娆℃暟閮ㄩ棬
 			getServerData() {
 				getDeptCount(this.pageQuerm).then(val => {
+					
+					
 					const value = val.data.data
-					const label = value.map(item => item.k)
+					const label = value.map(item => {
+						return item.k
+					})
+					const max = Math.max(value)
+					this.likeData = val.data.data.map(item => {
+						const progress = (item / max).toFixed(2)
+						return {
+							...item,
+							progress
+						}
+					})
 					const data = value.map(item => item.v)
 					let res = {
 						categories: label,

--
Gitblit v1.9.1