diff --git a/src/components/gachaRecord/gro-dataview.vue b/src/components/gachaRecord/gro-dataview.vue
new file mode 100644
index 00000000..0fb00056
--- /dev/null
+++ b/src/components/gachaRecord/gro-dataview.vue
@@ -0,0 +1,265 @@
+<template>
+  <div v-if="!loading" class="gro-dv-container">
+    <div class="gro-dvt-title">
+      <span>{{ title }}</span>
+      <span>{{ props.dataVal.length }}</span>
+    </div>
+    <div class="gro-dvt-subtitle">{{ startDate }} ~ {{ endDate }}</div>
+    <div class="gro-mid-list">
+      <div class="gro-ml-item">
+        <span>4☆已垫</span>
+        <span>{{ reset4count }}</span>
+      </div>
+      <div class="gro-ml-item">
+        <span>5☆已垫</span>
+        <span>{{ reset5count }}</span>
+      </div>
+      <div class="gro-ml-item">
+        <span>5☆平均</span>
+        <span>{{ star5avg }}</span>
+      </div>
+    </div>
+    <div class="gro-mid-list">
+      <div class="gro-ml-item">
+        <span>5☆统计</span>
+        <span>{{ getTitle("5") }}</span>
+      </div>
+      <div class="gro-ml-item">
+        <span>4☆统计</span>
+        <span>{{ getTitle("4") }}</span>
+      </div>
+    </div>
+    <!-- 这边放具体物品的列表 -->
+    <div class="gro-bottom">
+      <v-tabs v-model="tab">
+        <v-tab value="5">5☆</v-tab>
+        <v-tab value="4">4☆</v-tab>
+      </v-tabs>
+      <v-window v-model="tab">
+        <v-window-item value="5" class="gro-b-window-item">
+          <div v-for="(item, index) in star5List" :key="index" class="gro-bwi-item">
+            <div class="gro-bwi-icon">
+              <img :src="item.icon" alt="icon" />
+            </div>
+            <div class="gro-bwi-data" :title="item.time">
+              <span>{{ item.name }}</span>
+              <span>{{ item.gachaCount }}</span>
+            </div>
+          </div>
+        </v-window-item>
+        <v-window-item value="4" class="gro-b-window-item">
+          <div v-for="(item, index) in star4List" :key="index" class="gro-bwi-item">
+            <div class="gro-bwi-icon">
+              <img :src="item.icon" alt="icon" />
+            </div>
+            <div class="gro-bwi-data" :title="item.time">
+              <span>{{ item.name }}</span>
+              <span>{{ item.gachaCount }}</span>
+            </div>
+          </div>
+        </v-window-item>
+      </v-window>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+// vue
+import { onMounted, ref } from "vue";
+
+interface GachaDataViewProps {
+  dataType: "new" | "avatar" | "weapon" | "normal";
+  dataVal: TGApp.Sqlite.GachaRecords.SingleTable[];
+}
+
+const props = defineProps<GachaDataViewProps>();
+
+// 单个祈愿物品
+interface renderGachaItem extends TGApp.Sqlite.GachaRecords.SingleTable {
+  // 第几抽出的
+  gachaCount: number;
+  // 图标
+  icon: string;
+}
+
+// data
+const loading = ref<boolean>(true); // 是否加载完
+const title = ref<string>(""); // 卡片标题
+const startDate = ref<string>(""); // 最早的时间
+const endDate = ref<string>(""); // 最晚的时间
+const star5List = ref<renderGachaItem[]>([]); // 5星物品数据
+const star4List = ref<renderGachaItem[]>([]); // 4星物品数据
+const reset5count = ref<number>(0); // 5星垫抽数量
+const reset4count = ref<number>(0); // 4星垫抽数量
+const star3count = ref<number>(0); // 3星物品数量
+const star5avg = ref<string>(""); // 5星平均抽数
+const tab = ref<string>("5"); // tab
+
+onMounted(() => {
+  loadData();
+  loading.value = false;
+});
+
+function loadData(): void {
+  title.value = getTitle("top");
+  const tempData = props.dataVal;
+  // 按照 id 升序
+  tempData
+    .sort((a, b) => Number(a.id) - Number(b.id))
+    .forEach((item) => {
+      // 处理时间
+      if (startDate.value === "" || item.time < startDate.value) startDate.value = item.time;
+      if (endDate.value === "" || item.time > endDate.value) endDate.value = item.time;
+      // 处理物品星级
+      if (item.rank === "3") {
+        reset4count.value++;
+        reset5count.value++;
+        star3count.value++;
+      } else if (item.rank === "4") {
+        reset5count.value++;
+        star4List.value.push({
+          ...item,
+          gachaCount: reset4count.value,
+          icon: getIcon(item.itemId, item.type),
+        });
+        reset4count.value = 0;
+      } else if (item.rank === "5") {
+        reset4count.value++;
+        star5List.value.push({
+          ...item,
+          gachaCount: reset5count.value,
+          icon: getIcon(item.itemId, item.type),
+        });
+        reset5count.value = 0;
+      }
+    });
+  star5avg.value = getStar5Avg();
+  // 两个列表反序
+  star5List.value.reverse();
+  star4List.value.reverse();
+}
+
+// 获取标题
+function getTitle(type: "top" | "5" | "4" | "3"): string {
+  if (type === "top") {
+    if (props.dataType === "new") return "新手祈愿";
+    if (props.dataType === "avatar") return "角色祈愿";
+    if (props.dataType === "weapon") return "武器祈愿";
+    if (props.dataType === "normal") return "常驻祈愿";
+    return "";
+  } else if (type === "5") {
+    // 5星物品统计
+    return `${star5List.value.length} [${(star5List.value.length / props.dataVal.length).toFixed(
+      2,
+    )}%]`;
+  } else if (type === "4") {
+    // 4星物品统计
+    return `${star4List.value.length} [${(star4List.value.length / props.dataVal.length).toFixed(
+      2,
+    )}%]`;
+  } else {
+    // 3星物品统计
+    return `${star3count.value} [${(star3count.value / props.dataVal.length).toFixed(2)}%]`;
+  }
+}
+
+// 获取5星平均抽数
+function getStar5Avg(): string {
+  const resetList = star5List.value.map((item) => item.gachaCount);
+  const total = resetList.reduce((a, b) => a + b);
+  return (total / star5List.value.length).toFixed(2);
+}
+
+// 获取物品图标
+function getIcon(itemId: string, type: string): string {
+  if (type === "角色") {
+    return "/WIKI/character/icon/" + itemId + ".webp";
+  } else {
+    return "/WIKI/weapon/icon/" + itemId + ".webp";
+  }
+}
+</script>
+<style lang="css" scoped>
+.gro-dv-container {
+  height: 100%;
+  padding: 10px;
+  border-radius: 5px;
+  background: var(--common-shadow-2);
+}
+
+.gro-dvt-title {
+  display: flex;
+  width: 100%;
+  align-items: center;
+  justify-content: space-between;
+  color: var(--common-text-title);
+  font-family: var(--font-title);
+  font-size: 20px;
+}
+
+.gro-dvt-subtitle {
+  width: 100%;
+  color: var(--common-text-quote);
+  font-family: var(--font-text);
+  font-size: 12px;
+}
+
+.gro-mid-list {
+  padding-top: 5px;
+  padding-bottom: 5px;
+  border-top: 1px solid var(--common-shadow-4);
+  color: var(--common-text-content);
+}
+
+.gro-ml-item {
+  display: flex;
+  width: 100%;
+  align-items: center;
+  justify-content: space-between;
+  font-family: var(--font-title);
+  font-size: 14px;
+}
+
+.gro-bottom {
+  width: 100%;
+}
+
+.gro-b-window-item {
+  display: flex;
+  max-height: calc(100vh - 400px);
+  flex-direction: column;
+  margin-top: 10px;
+  gap: 5px;
+  overflow-y: auto;
+}
+
+.gro-bwi-item {
+  display: flex;
+  width: 100%;
+  height: 30px;
+  gap: 10px;
+}
+
+.gro-bwi-icon {
+  display: flex;
+  width: 30px;
+  height: 30px;
+  align-items: center;
+  justify-content: center;
+}
+
+.gro-bwi-icon img {
+  width: 100%;
+  height: 100%;
+}
+
+.gro-bwi-data {
+  display: flex;
+  width: calc(100% - 50px);
+  height: 100%;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 10px;
+  border-radius: 5px;
+  background: var(--common-shadow-2);
+}
+</style>
diff --git a/src/components/gachaRecord/gro-echarts.vue b/src/components/gachaRecord/gro-echarts.vue
index c46f43c7..fbbcb08f 100644
--- a/src/components/gachaRecord/gro-echarts.vue
+++ b/src/components/gachaRecord/gro-echarts.vue
@@ -48,7 +48,7 @@ onMounted(async () => {
 const defaultOptions = <EChartsOption>{
   title: [
     {
-      text: "数据概览",
+      text: ">> 祈愿系统大数据分析 <<",
       left: "center",
       top: "5%",
     },
diff --git a/src/components/gachaRecord/gro-overview.vue b/src/components/gachaRecord/gro-overview.vue
index bf2bad80..19af4bd3 100644
--- a/src/components/gachaRecord/gro-overview.vue
+++ b/src/components/gachaRecord/gro-overview.vue
@@ -1,22 +1,34 @@
 <template>
   <div class="gro-o-container">
-    <!-- 这里放三列 -->
+    <gro-dataview v-if="newData.length > 0" :data-val="newData" data-type="new" />
+    <gro-dataview :data-val="normalData" data-type="normal" />
+    <gro-dataview :data-val="avatarData" data-type="avatar" />
+    <gro-dataview :data-val="weaponData" data-type="weapon" />
   </div>
 </template>
 <script lang="ts" setup>
+// vue
+import GroDataview from "./gro-dataview.vue";
+
 interface GachaOverviewProps {
   modelValue: TGApp.Sqlite.GachaRecords.SingleTable[];
 }
 
 const props = defineProps<GachaOverviewProps>();
 
-console.log(props.modelValue);
+// data
+const newData = props.modelValue.filter((item) => item.uigfType === "100");
+const normalData = props.modelValue.filter((item) => item.uigfType === "200");
+const avatarData = props.modelValue.filter((item) => item.uigfType === "301");
+const weaponData = props.modelValue.filter((item) => item.uigfType === "302");
+const getColNum = newData.length === 0 ? 3 : 4;
 </script>
 <style lang="css" scoped>
 .gro-o-container {
+  display: grid;
   width: 100%;
   height: 100%;
-  border-radius: 5px;
-  background: var(--common-shadow-2);
+  grid-gap: 10px;
+  grid-template-columns: repeat(v-bind(getColNum), 1fr);
 }
 </style>
diff --git a/src/pages/User/Gacha.vue b/src/pages/User/Gacha.vue
index 19ab0f4d..406bb23a 100644
--- a/src/pages/User/Gacha.vue
+++ b/src/pages/User/Gacha.vue
@@ -9,9 +9,6 @@
     </template>
     <v-spacer />
     <template #append>
-      <v-btn prepend-icon="mdi-share-variant" class="gacha-top-btn" @click="handleShareBtn">
-        分享
-      </v-btn>
       <v-btn prepend-icon="mdi-import" class="gacha-top-btn" @click="handleImportBtn"> 导入</v-btn>
       <v-btn prepend-icon="mdi-export" class="gacha-top-btn" @click="handleExportBtn"> 导出</v-btn>
     </template>
@@ -77,14 +74,6 @@ function isLogin(): boolean {
   return user?.gameUid !== undefined;
 }
 
-// 分享按钮点击事件
-async function handleShareBtn(): Promise<void> {
-  showSnackbar({
-    color: "grey",
-    text: `暂未开放`,
-  });
-}
-
 // 导入按钮点击事件
 async function handleImportBtn(): Promise<void> {
   const selectedFile = await dialog.open({