From 4d66be55fd739ba13dae9c0207467f9d75cea142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E9=BE=99?= <web_2021@163.com>
Date: Thu, 16 Nov 2023 17:30:53 +0800
Subject: [PATCH] update

---
 src/views/home/Home.vue             |  2 +-
 src/views/home/bcp/BCP.vue          |  1 +
 src/views/home/csr/CSRContent22.vue | 26 +++++++++++++++++-----
 src/views/home/csr/CSRDatas.ts      | 34 +++++++++++++++++++----------
 4 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/views/home/Home.vue b/src/views/home/Home.vue
index e42cb5f..5b2a39a 100644
--- a/src/views/home/Home.vue
+++ b/src/views/home/Home.vue
@@ -368,7 +368,7 @@ const thisSelect = (e) => {
               <th>交涉</th>
               <td :rowspan="disList[0].budget ==disList[1].budget?'2':''">{{disList[0].budget}}%</td>
               <td :rowspan="disList[0].monthOne ==disList[1].monthOne?'2':''">{{disList[0].monthOne}}%</td>
-              <td :rowspan="disList[0].budget ==disList[1].budget?'2':''">{{disList[0].monthTwo}}%</td>
+              <td :rowspan="disList[0].monthTwo ==disList[1].monthTwo?'2':''">{{disList[0].monthTwo}}%</td>
             </tr>
             <tr>
               <th>THEME</th>
diff --git a/src/views/home/bcp/BCP.vue b/src/views/home/bcp/BCP.vue
index 9957ea7..46fd35f 100644
--- a/src/views/home/bcp/BCP.vue
+++ b/src/views/home/bcp/BCP.vue
@@ -28,6 +28,7 @@ const dataB = ref([])
 const dataD = ref([])
 const dataC = ref([])
 const dataE = ref([])
+const SCMData = ref([])
 onMounted(async () => {
 	getData()
 })
diff --git a/src/views/home/csr/CSRContent22.vue b/src/views/home/csr/CSRContent22.vue
index df40eda..dfffb1b 100644
--- a/src/views/home/csr/CSRContent22.vue
+++ b/src/views/home/csr/CSRContent22.vue
@@ -11,6 +11,7 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 const { chartRef, option } = charData()
 const { chartRef: chartRef1, option: option1 } = charData2()
 const { chartRef: chartRefP1, option: optionP1 } = pieData1()
+import { NNumberAnimation } from "naive-ui";
 
 const locale = computed(() => zhCn)
 const YearTime1 = ref('2020')
@@ -129,16 +130,31 @@ const cardsClick = (it) => {
 					</div>
 					<div class="m20px h-100px bg-#F5F8FF p10px">
 						<div class="py5px">
+								<!-- <n-number-animation show-separator :from="0" :to="10700"/>吨，碳排放量159,158吨-->
 							<span class="text-18px font-bold text-#3164BF">铝</span
-							><span class="ml5px">使用量0.000吨，碳排放量0.000吨</span>
+							>
+							<span class="ml5px">使用量
+								<n-number-animation show-separator :from="0" :duration="0" :to="10700"/>吨，碳排放量
+								<n-number-animation show-separator :from="0" :duration="0" :to="159158"/>吨
+							</span>
 						</div>
 						<div class="py5px">
-							<span class="text-18px font-bold text-#3164BF">铝</span
-							><span class="ml5px">使用量0.000吨，碳排放量0.000吨</span>
+							<span class="text-18px font-bold text-#3164BF">铁</span
+							>
+							<!-- <span class="ml5px">使用量72,645吨，碳排放量165,731吨</span> -->
+							<span class="ml5px">使用量
+								<n-number-animation show-separator :from="0" :duration="0" :to="72645"/>吨，碳排放量
+								<n-number-animation show-separator :from="0" :duration="0" :to="165731"/>吨
+							</span>
 						</div>
 						<div class="py5px">
-							<span class="text-18px font-bold text-#3164BF">铝</span
-							><span class="ml5px">使用量0.000吨，碳排放量0.000吨</span>
+							<span class="text-18px font-bold text-#3164BF">铜</span
+							>
+							<!-- <span class="ml5px">使用量0.000吨，碳排放量0.000吨</span> -->
+							<span class="ml5px">使用量
+								<n-number-animation show-separator :from="0" :duration="0" :to="14682"/>吨，碳排放量
+								<n-number-animation show-separator :from="0" :duration="0" :to="78942"/>吨
+							</span>
 						</div>
 					</div>
 				</div>
diff --git a/src/views/home/csr/CSRDatas.ts b/src/views/home/csr/CSRDatas.ts
index 152507d..eee12d4 100644
--- a/src/views/home/csr/CSRDatas.ts
+++ b/src/views/home/csr/CSRDatas.ts
@@ -342,15 +342,16 @@ export function pieData1() {
 			containLabel: true
 		},
 		// legend: {
-		//   orient: 'vertical',
-		//   left: 'left'
+		// 	// orient: 'vertical',
+		// 	left: 'left',
+		// 	padding: [30, 0, 0, 20]
 		// },
 		series: [
 			{
-				name: 'Access From',
+				name: '',
 				type: 'pie',
 				selectedMode: 'single',
-				radius: [0, '30%'],
+				radius: [0, '50%'],
 				label: {
 					position: 'inner',
 					fontSize: 14
@@ -360,19 +361,24 @@ export function pieData1() {
 				},
 				data: [
 					{
-						value: 1548,
+						value: 159158,
 						name: '铝',
 						label: { color: '#fff', fontSize: '16px', fontWeight: 'bold' }
 					},
 					{
-						value: 775,
+						value: 165731,
 						name: '铁',
 						label: { color: '#fff', fontSize: '16px', fontWeight: 'bold' }
 					},
 					{
-						value: 679,
+						value: 78942,
 						name: '铜',
-						selected: true,
+						// selected: true,
+						label: { color: '#fff', fontSize: '16px', fontWeight: 'bold' }
+					},
+					{
+						value: 10000,
+						name: '树脂',
 						label: { color: '#fff', fontSize: '16px', fontWeight: 'bold' }
 					}
 				],
@@ -386,14 +392,19 @@ export function pieData1() {
 					normal: {
 						// 自定义每个扇形的颜色
 						color: function (params) {
-							const colorList = ['#3EC22B', '#3EC22B', '#3EC22B']
+							const colorList = ['#3EC22B', '#3EC22B', '#3EC22B', '#3EC22B']
 							return colorList[params.dataIndex]
 						}
 					}
+				},
+				hoverOffset: 0,
+				hoverAnimation: false,
+				emphasis: {
+					scale: false
 				}
 			},
 			{
-				name: 'Access From',
+				name: '',
 				type: 'pie',
 				radius: ['45%', '60%'],
 				avoidLabelOverlap: false,
@@ -441,7 +452,8 @@ export function pieData1() {
 				data: [
 					{ value: 0.0, name: '铝' },
 					{ value: 0.0, name: '铁' },
-					{ value: 0.0, name: '铜' }
+					{ value: 0.0, name: '铜' },
+					{ value: 0.0, name: '树脂' }
 				]
 				// 自定义颜色
 				//  itemStyle: {