From 244d89b41c0e0e995d38f635a126a0959b9ba25b Mon Sep 17 00:00:00 2001
From: wjt <1797368093@qq.com>
Date: 星期二, 25 六月 2024 18:16:42 +0800
Subject: [PATCH] 问题处理

---
 policy/dataLook/dataLook.vue |   76 ++++++++++++++++++--------------------
 1 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/policy/dataLook/dataLook.vue b/policy/dataLook/dataLook.vue
index 3265eb7..a987964 100644
--- a/policy/dataLook/dataLook.vue
+++ b/policy/dataLook/dataLook.vue
@@ -1,10 +1,10 @@
 <template>
 	<view>
-		<u-navbar placeholder bgColor="#1171E0FF" leftIconColor="white" :autoBack="true">
+		<!-- <u-navbar placeholder bgColor="#1171E0FF" leftIconColor="white" :autoBack="true" >
 			<template slot="center">
 				<view style="color: white;">鏁版嵁鐪嬫澘</view>
 			</template>
-		</u-navbar>
+		</u-navbar> -->
 		<view class="donw-box"></view>
 		<view class="page-main">
 			<view class="box">
@@ -18,7 +18,7 @@
 					</view>
 					<view class="grid-item">
 						<view class="label">鎵ф硶鍗曚綅</view>
-						<view>{{infoData.enforceCompanyNum || 0}}</view>
+						<view>{{infoData.enforceDeptNum || 0}}</view>
 					</view>
 					<view class="grid-item">
 						<view class="label">鎵ф硶浜哄憳</view>
@@ -26,7 +26,7 @@
 					</view>
 					<view class="grid-item">
 						<view class="label">鎵ф硶鐢宠</view>
-						<view>{{infoData.enforceOrderNum || 0}}</view>
+						<view>{{infoData.enforceorderNum || 0}}</view>
 					</view>
 					<view class="grid-item">
 						<view class="label">宸插鎵�</view>
@@ -46,7 +46,7 @@
 				<view class="number">
 					<view class="date">{{pageQuerm.beginTimeStr1}} <text class="margin-text">鑷�</text> {{pageQuerm.endTimeStr1}}</view>
 					<view class="progress-box">
-						<qiun-data-charts  key="11" type="bar"
+						<qiun-data-charts v-if="!show" key="11" type="bar"
 							:opts="opts" :chartData="chartData" />
 					</view>
 				</view>
@@ -85,7 +85,7 @@
 				<view class="number">
 					<view class="date" style="margin-bottom: 20rpx;">{{pageQuerm.beginTimeStr3}} <text class="margin-text">鑷�</text> {{pageQuerm.endTimeStr3}}</view>
 					<view class="progress-box">
-						<qiun-data-charts type="rose"    tooltipFormat="tooltipDemo1"
+						<qiun-data-charts type="pie"   v-if="!show"  tooltipFormat="tooltipDemo1"
 
  key="22" :opts="opts1" :chartData="chartData1" />
 					</view>
@@ -94,6 +94,7 @@
 		</view>
 		    <u-datetime-picker
 		                :show="show"
+						@cancel="show = false"
 						:maxDate="new Date().getTime()"
 						v-model="currentValue"
 		                mode="year-month"
@@ -136,16 +137,20 @@
 					padding: [15, 30, 0, 5],
 					enableScroll: false,
 					legend: {
-						show: false
+						show: false,
+						
 					},
 					xAxis: {
 						boundaryGap: "justify",
 						disableGrid: false,
 						min: 0,
 						axisLine: false,
-						max: 40
+						max: 40,
+						gridColor: "#ededed"
 					},
-					yAxis: {},
+					yAxis: {
+						gridColor: "#ededed"
+					},
 					extra: {
 						bar: {
 							type: "group",
@@ -164,36 +169,28 @@
 				chartData1: {},
 				tooltipCustom: {},
 				opts1: {
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
-						"#ea7ccc"
-					],
-					tooltipFormat: function (item) {
-						return "456"
-					},
-					padding: [5, 5, 5, 5],
-					enableScroll: false,
-					legend: {
-						show: false,
-					},
-					extra: {
-						rose: {
-							type: "area",
-							minRadius: 50,
-							activeOpacity: 0.5,
-							activeRadius: 10,
-							offsetAngle: 0,
-							labelWidth: 15,
-							border: false,
-							borderWidth: 2,
-							borderColor: "#FFFFFF"
-						},
-						tooltip: {
-							// bgColor: "#fff",
-							// showArrow: false,
-							// fontColor: "#202D44",
-							// bgOpacity: 1,
-						}
-					}
+					color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
+					        padding: [5,5,5,5],
+					        enableScroll: false,
+							legend: {
+							    position: "bottom",
+							    lineHeight: 25,
+								width: '100%', // 璁剧疆鍥句緥瀹藉害
+								// itemWidth: 25, // 璁剧疆鍥句緥鏍囪瀹藉害
+								itemGap: 10, // 璁剧疆鍥句緥椤逛箣闂寸殑闂撮殧
+								float: 'left'
+							},
+					        extra: {
+					          pie: {
+					            activeOpacity: 0.5,
+					            activeRadius: 10,
+					            offsetAngle: 0,
+					            labelWidth: 10,
+					            border: false,
+					            borderWidth: 3,
+					            borderColor: "#FFFFFF"
+					          }
+					        }
 				}
 			}
 		},
@@ -298,7 +295,6 @@
 						return {
 							name: item.k,
 							value: item.v,
-							"labelText": item.k
 						}
 					})
 					let res = {

--
Gitblit v1.9.1