From 674fc59d30c08bbc95dfc2e9b64ff7ef202687f6 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 8 Nov 2024 10:37:46 +0800
Subject: [PATCH] fix

---
 src/component/Administrator/TestClickData.vue | 26 +++++++-
 src/component/Administrator/allUser.vue       |  2 +-
 .../Administrator/recentActiveChart.vue       |  2 +-
 .../Administrator/recentActiveUser.vue        |  2 +-
 .../Administrator/recentActiveUserChart.vue   |  2 +-
 src/component/Administrator/recentNewUser.vue |  2 +-
 .../Administrator/recentNewUserChart.vue      |  2 +-
 src/component/Administrator/trialAllUser.vue  |  2 +-
 .../trialUserConversionRateChart.vue          | 65 +++++++++++++++++--
 .../Administrator/trialUserCountry.vue        | 60 +++++++++++++++--
 10 files changed, 145 insertions(+), 20 deletions(-)

diff --git a/src/component/Administrator/TestClickData.vue b/src/component/Administrator/TestClickData.vue
index 97a42376..d71ed1bf 100644
--- a/src/component/Administrator/TestClickData.vue
+++ b/src/component/Administrator/TestClickData.vue
@@ -92,9 +92,10 @@ export default defineComponent({
                 {
                     title: 'Email',
                     align: "center",
-                    ellipsis: true,
                     dataIndex: "userEmail",
                     key: "userEmail",
+					width:200,
+                    fixed: "left",
                 },
 				{
                     title: 'User Id',
@@ -102,6 +103,7 @@ export default defineComponent({
                     ellipsis: true,
                     dataIndex: "accountId",
                     key: "accountId",
+					width:100,
                 },
                 {
                     title: 'User Name',
@@ -109,6 +111,7 @@ export default defineComponent({
                     ellipsis: 200,
                     dataIndex: "userName",
                     key: "userName",
+					width:100,
                     // customRender: (record: any) => {
                     //     let time = formatTime(
                     //         record.text / 1000,
@@ -123,6 +126,7 @@ export default defineComponent({
                     ellipsis: true,
                     dataIndex: "isTrial",
                     key: "isTrial",
+					width:100,
 					   customRender: (record: any) => {
                         let str
 						if(record.value == 1){
@@ -139,6 +143,7 @@ export default defineComponent({
                     ellipsis: true,
                     dataIndex: "designTimes",
                     key: "designTimes",
+					width:100,
                 },
 				{
                     title: 'Country',
@@ -146,6 +151,7 @@ export default defineComponent({
                     ellipsis: true,
                     dataIndex: "country",
                     key: "country",
+					width:200,
                 },
 				{
                     title: 'Title',
@@ -153,6 +159,7 @@ export default defineComponent({
                     ellipsis: true,
                     dataIndex: "title",
                     key: "title",
+					width:100,
                 },
 				{
                     title: 'Surname',
@@ -160,6 +167,7 @@ export default defineComponent({
                     ellipsis: true,
                     dataIndex: "surname",
                     key: "surname",
+					width:150,
                 },
 				{
                     title: 'Given Name',
@@ -167,6 +175,7 @@ export default defineComponent({
                     ellipsis: true,
                     dataIndex: "givenName",
                     key: "givenName",
+					width:100,
                 },
 				{
                     title: 'Create Time',
@@ -178,6 +187,19 @@ export default defineComponent({
 					// resizable: true,
                     dataIndex: "createTime",
                     key: "createTime",
+					width:200,
+                },
+				{
+                    title: 'Credits',
+                    align: "center",
+                    ellipsis: true,
+					// width: 150,
+					// minWidth: 100,
+        			// maxWidth: 200,
+					// resizable: true,
+                    dataIndex: "credits",
+                    key: "credits",
+					width:100,
                 },
 				{
                     title: 'Occupation',
@@ -189,6 +211,7 @@ export default defineComponent({
 					// resizable: true,
                     dataIndex: "occupation",
                     key: "occupation",
+					width:100,
                 },
 				{
                     title: 'Trial Order Id',
@@ -198,6 +221,7 @@ export default defineComponent({
 					// resizable: true,
                     dataIndex: "trialOrderId",
                     key: "trialOrderId",
+					width:100,
                 },
             ];
         });
diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue
index 4c7c520c..dd06e151 100644
--- a/src/component/Administrator/allUser.vue
+++ b/src/component/Administrator/allUser.vue
@@ -88,7 +88,7 @@
                     class="admin_state_list_item"
                     @click="lastGeTrialList('year')"
                 >
-                    Last year
+                    Nearly a year
                 </div>
                 <div
                     class="admin_state_list_item"
diff --git a/src/component/Administrator/recentActiveChart.vue b/src/component/Administrator/recentActiveChart.vue
index d0c866e1..3400ef0f 100644
--- a/src/component/Administrator/recentActiveChart.vue
+++ b/src/component/Administrator/recentActiveChart.vue
@@ -41,7 +41,7 @@
 				<div class="admin_search_item" @click="searchHistoryList">Search</div>
 			</div>
 			<div class="admin_state_list">
-				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Last year</div>
+				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Nearly a year</div>
 				<div class="admin_state_list_item" @click="lastGeTrialList('month')">Last month</div>
 				<div class="admin_state_list_item" @click="lastGeTrialList('week')">Last week</div>
 			</div>
diff --git a/src/component/Administrator/recentActiveUser.vue b/src/component/Administrator/recentActiveUser.vue
index b4687e9f..a966b01f 100644
--- a/src/component/Administrator/recentActiveUser.vue
+++ b/src/component/Administrator/recentActiveUser.vue
@@ -28,7 +28,7 @@
 				<div class="admin_search_item" @click="searchHistoryList">Search</div>
 			</div>
 			<div class="admin_state_list">
-				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Last year</div>
+				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Nearly a year</div>
 				<div class="admin_state_list_item" @click="lastGeTrialList('month')">Last month</div>
 				<div class="admin_state_list_item" @click="lastGeTrialList('week')">Last week</div>
 			</div>
diff --git a/src/component/Administrator/recentActiveUserChart.vue b/src/component/Administrator/recentActiveUserChart.vue
index 1ad7890d..1e51d5c9 100644
--- a/src/component/Administrator/recentActiveUserChart.vue
+++ b/src/component/Administrator/recentActiveUserChart.vue
@@ -29,7 +29,7 @@
 				<div class="admin_search_item" @click="searchHistoryList">Search</div>
 			</div>
 			<div class="admin_state_list">
-				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Last year</div>
+				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Nearly a year</div>
 				<div class="admin_state_list_item" @click="lastGeTrialList('month')">Last month</div>
 				<div class="admin_state_list_item" @click="lastGeTrialList('week')">Last week</div>
 			</div>
diff --git a/src/component/Administrator/recentNewUser.vue b/src/component/Administrator/recentNewUser.vue
index 5ffeb3c8..dc8ba4b8 100644
--- a/src/component/Administrator/recentNewUser.vue
+++ b/src/component/Administrator/recentNewUser.vue
@@ -32,7 +32,7 @@
 				<div class="admin_search_item" @click="searchHistoryList">Search</div>
 			</div>
 			<div class="admin_state_list">
-				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Last year</div>
+				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Nearly a year</div>
 				<div class="admin_state_list_item" @click="lastGeTrialList('month')">Last month</div>
 				<div class="admin_state_list_item" @click="lastGeTrialList('week')">Last week</div>
 			</div>
diff --git a/src/component/Administrator/recentNewUserChart.vue b/src/component/Administrator/recentNewUserChart.vue
index 9138ff1d..d29c6d9e 100644
--- a/src/component/Administrator/recentNewUserChart.vue
+++ b/src/component/Administrator/recentNewUserChart.vue
@@ -32,7 +32,7 @@
 				<div class="admin_search_item" @click="searchHistoryList">Search</div>
 			</div>
 			<div class="admin_state_list">
-				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Last year</div>
+				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Nearly a year</div>
 				<div class="admin_state_list_item" @click="lastGeTrialList('month')">Last month</div>
 				<div class="admin_state_list_item" @click="lastGeTrialList('week')">Last week</div>
 			</div>
diff --git a/src/component/Administrator/trialAllUser.vue b/src/component/Administrator/trialAllUser.vue
index 1148a6c3..af72598b 100644
--- a/src/component/Administrator/trialAllUser.vue
+++ b/src/component/Administrator/trialAllUser.vue
@@ -63,7 +63,7 @@
 				<div class="admin_search_item" @click="searchHistoryList">Search</div>
 			</div>
 			<div class="admin_state_list">
-				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Last year</div>
+				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Nearly a year</div>
 				<div class="admin_state_list_item" @click="lastGeTrialList('month')">Last month</div>
 				<div class="admin_state_list_item" @click="lastGeTrialList('week')">Last week</div>
 			</div>
diff --git a/src/component/Administrator/trialUserConversionRateChart.vue b/src/component/Administrator/trialUserConversionRateChart.vue
index 4fa3ce00..302e1473 100644
--- a/src/component/Administrator/trialUserConversionRateChart.vue
+++ b/src/component/Administrator/trialUserConversionRateChart.vue
@@ -2,10 +2,34 @@
     <div class="recentNewUserChart admin_page">
         <div class="admin_table_search">
             <div class="admin_state">
+				<div class="admin_state_item">
+					<span>Select Time:</span>
+					<a-range-picker
+						style="width:250px"
+						class="range_picker"
+						v-model:value="rangePickerValue"
+						:placeholder="[
+							$t('HistoryPage.StartDate'),
+							$t('HistoryPage.EndDate'),
+						]"
+						valueFormat="YYYY-MM-DD"
+					>
+						<template #suffixIcon>
+							<span
+								class="icon iconfont range_picker_icon icon-rili"
+							></span>
+						</template>
+					</a-range-picker>
+				</div>
             </div>
-            <div class="admin_search">
-               
-            </div>
+			<div class="admin_search">
+				<div class="admin_search_item" @click="searchHistoryList">Search</div>
+			</div>
+			<div class="admin_state_list">
+				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Nearly a year</div>
+				<div class="admin_state_list_item" @click="lastGeTrialList('month')">Last month</div>
+				<div class="admin_state_list_item" @click="lastGeTrialList('week')">Last week</div>
+			</div>
         </div>
 
         <div class="admin_table_content" ref="pageChartDom"></div>
@@ -43,9 +67,34 @@ export default defineComponent({
         let searchHistoryList = () => {
             gettrialList();
         };
+		let lastGeTrialList = (str:string)=>{
+			let currentDate = new Date();
+			let currentTimestamp = Math.floor(currentDate.getTime()  / 1000);
+			// 计算30天前的时间戳
+			let thirtyDaysAgoTimestamp
+			if(str == 'year'){
+				thirtyDaysAgoTimestamp = currentTimestamp - (360 * 24 * 60 * 60);
+			}else if(str == 'month'){
+				thirtyDaysAgoTimestamp = currentTimestamp - (30 * 24 * 60 * 60);
+			}else if(str == 'week'){
+				thirtyDaysAgoTimestamp = currentTimestamp - (7 * 24 * 60 * 60);
+			}
+			filterData.rangePickerValue = [formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD'),formatTime(currentTimestamp,'YYYY-MM-DD')]
+			gettrialList();
+		}
         //获取列表
         let gettrialList = async () => {
-            Https.axiosGet(Https.httpUrls.conversionRate).then((rv: any) => {
+			let startDate: any = filterData.rangePickerValue?.[0]
+                ? filterData.rangePickerValue[0]+' '+'00:00:00'
+                : "";
+            let endDate: any = filterData.rangePickerValue?.[1]
+                ? filterData.rangePickerValue[1]+' '+'00:00:00'
+                : "";
+			let data = {
+				endTime:endDate,
+				startTime:startDate,
+			}
+            Https.axiosGet(Https.httpUrls.conversionRate,{params:data}).then((rv: any) => {
                 if (rv) {
 					let entries:any = Object.entries(rv);
                     let data: any = [];
@@ -99,7 +148,8 @@ export default defineComponent({
                     },
 					legend: {
 						top: '10%',
-						left: 'center'
+						left: 'center',
+						// formatter: '{a} <br/>{b}'
 					},
                     series: [
 						{
@@ -120,10 +170,10 @@ export default defineComponent({
 								show: true,
 								fontSize: 30,
 								fontWeight: 'bold'
-								}
+								},
 							},
 							labelLine: {
-								show: false
+								show: false,
 							},
 							data: data
 						}
@@ -141,6 +191,7 @@ export default defineComponent({
         return {
             ...toRefs(filter),
             ...toRefs(filterData),
+			lastGeTrialList,
             searchHistoryList,
             gettrialList,
             pageChartDom,
diff --git a/src/component/Administrator/trialUserCountry.vue b/src/component/Administrator/trialUserCountry.vue
index 191b434c..9b29b426 100644
--- a/src/component/Administrator/trialUserCountry.vue
+++ b/src/component/Administrator/trialUserCountry.vue
@@ -1,11 +1,35 @@
 <template>
     <div class="recentNewUserChart admin_page">
         <div class="admin_table_search">
-            <div class="admin_state">
-            </div>
-            <div class="admin_search">
-               
+			<div class="admin_state">
+				<div class="admin_state_item">
+					<span>Select Time:</span>
+					<a-range-picker
+						style="width:250px"
+						class="range_picker"
+						v-model:value="rangePickerValue"
+						:placeholder="[
+							$t('HistoryPage.StartDate'),
+							$t('HistoryPage.EndDate'),
+						]"
+						valueFormat="YYYY-MM-DD"
+					>
+						<template #suffixIcon>
+							<span
+								class="icon iconfont range_picker_icon icon-rili"
+							></span>
+						</template>
+					</a-range-picker>
+				</div>
             </div>
+			<div class="admin_search">
+				<div class="admin_search_item" @click="searchHistoryList">Search</div>
+			</div>
+			<div class="admin_state_list">
+				<div class="admin_state_list_item" @click="lastGeTrialList('year')">Nearly a year</div>
+				<div class="admin_state_list_item" @click="lastGeTrialList('month')">Last month</div>
+				<div class="admin_state_list_item" @click="lastGeTrialList('week')">Last week</div>
+			</div>
         </div>
 
         <div class="admin_table_content" ref="pageChartDom"></div>
@@ -61,9 +85,34 @@ export default defineComponent({
         let searchHistoryList = () => {
             gettrialList();
         };
+		let lastGeTrialList = (str:string)=>{
+			let currentDate = new Date();
+			let currentTimestamp = Math.floor(currentDate.getTime()  / 1000);
+			// 计算30天前的时间戳
+			let thirtyDaysAgoTimestamp
+			if(str == 'year'){
+				thirtyDaysAgoTimestamp = currentTimestamp - (360 * 24 * 60 * 60);
+			}else if(str == 'month'){
+				thirtyDaysAgoTimestamp = currentTimestamp - (30 * 24 * 60 * 60);
+			}else if(str == 'week'){
+				thirtyDaysAgoTimestamp = currentTimestamp - (7 * 24 * 60 * 60);
+			}
+			filterData.rangePickerValue = [formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD'),formatTime(currentTimestamp,'YYYY-MM-DD')]
+			gettrialList();
+		}
         //获取列表
         let gettrialList = async () => {
-            Https.axiosGet(Https.httpUrls.trialUserCountry).then((rv: any) => {
+			let startDate: any = filterData.rangePickerValue?.[0]
+                ? filterData.rangePickerValue[0]+' '+'00:00:00'
+                : "";
+            let endDate: any = filterData.rangePickerValue?.[1]
+                ? filterData.rangePickerValue[1]+' '+'00:00:00'
+                : "";
+			let data = {
+				endTime:endDate,
+				startTime:startDate,
+			}
+            Https.axiosGet(Https.httpUrls.trialUserCountry,{params:data}).then((rv: any) => {
                 if (rv) {
                     let data: any = [];
                     rv.names.forEach((item: any, index: number) => {
@@ -137,6 +186,7 @@ export default defineComponent({
         return {
             ...toRefs(filter),
             ...toRefs(filterData),
+			lastGeTrialList,
             state,
             searchHistoryList,
             gettrialList,