From 35957e7b7d22ec5e47e2c600c60d8d75ca2b76ae Mon Sep 17 00:00:00 2001
From: Bunny <1319900154@qq.com>
Date: Sun, 27 Oct 2024 00:17:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/utils/columns.ts        |   2 +
 .../components/{charts => }/ChartLine.vue     |   0
 .../components/{charts => }/ChartRound.vue    |   0
 .../welcome/components/charts/ChartBar.vue    | 107 ------------------
 src/views/welcome/components/charts/index.ts  |   3 -
 .../welcome/components/server-read-me.vue     |   2 +-
 src/views/welcome/components/web-read-me.vue  |   2 +-
 src/views/welcome/index.vue                   |  17 +--
 src/views/welcome/utils/data.ts               |  15 +--
 src/views/welcome/utils/hooks.ts              |   8 +-
 src/views/welcome/{ => utils}/utils.ts        |   0
 11 files changed, 18 insertions(+), 138 deletions(-)
 rename src/views/welcome/components/{charts => }/ChartLine.vue (100%)
 rename src/views/welcome/components/{charts => }/ChartRound.vue (100%)
 delete mode 100644 src/views/welcome/components/charts/ChartBar.vue
 delete mode 100644 src/views/welcome/components/charts/index.ts
 rename src/views/welcome/{ => utils}/utils.ts (100%)

diff --git a/src/views/system/dept/utils/columns.ts b/src/views/system/dept/utils/columns.ts
index 46a5688..0a4157c 100644
--- a/src/views/system/dept/utils/columns.ts
+++ b/src/views/system/dept/utils/columns.ts
@@ -20,6 +20,8 @@ export const columns: TableColumnList = [
 
 // 添加规则
 export const rules = reactive({
+	// 管理员
+	manager: [{ required: true, message: `${$t('input')}${$t('dept_manager')}`, trigger: 'blur' }],
 	// 部门名称
 	deptName: [{ required: true, message: `${$t('input')}${$t('dept_deptName')}`, trigger: 'blur' }],
 	// 部门简介
diff --git a/src/views/welcome/components/charts/ChartLine.vue b/src/views/welcome/components/ChartLine.vue
similarity index 100%
rename from src/views/welcome/components/charts/ChartLine.vue
rename to src/views/welcome/components/ChartLine.vue
diff --git a/src/views/welcome/components/charts/ChartRound.vue b/src/views/welcome/components/ChartRound.vue
similarity index 100%
rename from src/views/welcome/components/charts/ChartRound.vue
rename to src/views/welcome/components/ChartRound.vue
diff --git a/src/views/welcome/components/charts/ChartBar.vue b/src/views/welcome/components/charts/ChartBar.vue
deleted file mode 100644
index 3d8df4f..0000000
--- a/src/views/welcome/components/charts/ChartBar.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<script lang="ts" setup>
-import { useDark, useECharts } from '@pureadmin/utils';
-import { computed, nextTick, type PropType, ref, watch } from 'vue';
-
-const props = defineProps({
-	requireData: {
-		type: Array as PropType<Array<number>>,
-		default: () => [],
-	},
-	questionData: {
-		type: Array as PropType<Array<number>>,
-		default: () => [],
-	},
-});
-
-const { isDark } = useDark();
-
-const theme = computed(() => (isDark.value ? 'dark' : 'light'));
-
-const chartRef = ref();
-const { setOptions } = useECharts(chartRef, {
-	theme,
-});
-
-watch(
-	() => props,
-	async () => {
-		await nextTick(); // 确保DOM更新完成后再执行
-		setOptions({
-			container: '.bar-card',
-			color: ['#41b6ff', '#e85f33'],
-			tooltip: {
-				trigger: 'axis',
-				axisPointer: {
-					type: 'none',
-				},
-			},
-			grid: {
-				top: '20px',
-				right: 0,
-			},
-			legend: {
-				data: ['需求人数', '提问数量'],
-				textStyle: {
-					color: '#606266',
-					fontSize: '0.875rem',
-				},
-				bottom: 0,
-			},
-			xAxis: [
-				{
-					type: 'category',
-					data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
-					axisLabel: {
-						fontSize: '0.875rem',
-					},
-					axisPointer: {
-						type: 'shadow',
-					},
-				},
-			],
-			yAxis: [
-				{
-					type: 'value',
-					axisLabel: {
-						fontSize: '0.875rem',
-					},
-					splitLine: {
-						show: false, // 去网格线
-					},
-					// name: "单位: 个"
-				},
-			],
-			series: [
-				{
-					name: '需求人数',
-					type: 'bar',
-					barWidth: 10,
-					itemStyle: {
-						color: '#41b6ff',
-						borderRadius: [10, 10, 0, 0],
-					},
-					data: props.requireData,
-				},
-				{
-					name: '提问数量',
-					type: 'bar',
-					barWidth: 10,
-					itemStyle: {
-						color: '#e86033ce',
-						borderRadius: [10, 10, 0, 0],
-					},
-					data: props.questionData,
-				},
-			],
-		});
-	},
-	{
-		deep: true,
-		immediate: true,
-	},
-);
-</script>
-
-<template>
-	<div ref="chartRef" style="width: 100%; height: 365px" />
-</template>
diff --git a/src/views/welcome/components/charts/index.ts b/src/views/welcome/components/charts/index.ts
deleted file mode 100644
index a4f89eb..0000000
--- a/src/views/welcome/components/charts/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as ChartBar } from './ChartBar.vue';
-export { default as ChartLine } from './ChartLine.vue';
-export { default as ChartRound } from './ChartRound.vue';
diff --git a/src/views/welcome/components/server-read-me.vue b/src/views/welcome/components/server-read-me.vue
index 69ee763..4ca43ee 100644
--- a/src/views/welcome/components/server-read-me.vue
+++ b/src/views/welcome/components/server-read-me.vue
@@ -7,7 +7,7 @@ const content = ref();
 
 /** 获取文档信息 */
 const onSearch = async () => {
-	const response = await fetch('https://gitee.com/api/v5/repos/BunnyBoss/bunny-admin-server/contents/ReadMe.md?access_token=1dc76ba34226aea3eca52c1121c51617');
+	const response = await fetch('http://129.211.31.58:3000/api/v1/repos/auth/auth-server-java/contents/ReadMe.md');
 	const json = await response.json();
 	content.value = decode(json.content);
 };
diff --git a/src/views/welcome/components/web-read-me.vue b/src/views/welcome/components/web-read-me.vue
index b53cddc..7de7818 100644
--- a/src/views/welcome/components/web-read-me.vue
+++ b/src/views/welcome/components/web-read-me.vue
@@ -7,7 +7,7 @@ const content = ref();
 
 /** 获取文档信息 */
 const onSearch = async () => {
-	const response = await fetch('https://gitee.com/api/v5/repos/BunnyBoss/bunny-admin-web/contents/ReadMe.md?access_token=1dc76ba34226aea3eca52c1121c51617');
+	const response = await fetch('http://129.211.31.58:3000/api/v1/repos/auth/auth-web/contents/ReadMe.md');
 	const json = await response.json();
 	content.value = decode(json.content);
 };
diff --git a/src/views/welcome/index.vue b/src/views/welcome/index.vue
index 0bf222d..8eedc08 100644
--- a/src/views/welcome/index.vue
+++ b/src/views/welcome/index.vue
@@ -1,9 +1,10 @@
 <script lang="ts" setup>
 import { onMounted, ref } from 'vue';
 import ReCol from '@/components/MyCol';
-import { useDark } from './utils';
+import { useDark } from './utils/utils';
 import { ReNormalCountTo } from '@/components/CountTo';
-import { ChartLine, ChartRound } from './components/charts';
+import ChartLine from '@/views/welcome/components/ChartLine.vue';
+import ChartRound from '@/views/welcome/components/ChartRound.vue';
 import { chartData } from './utils/data';
 import { getServerCommitList, getWebCommitList, serverCommitList, webCommitList } from '@/views/welcome/utils/hooks';
 import WebReadMe from '@/views/welcome/components/web-read-me.vue';
@@ -78,7 +79,7 @@ onMounted(() => {
 				<re-col v-motion :enter="{ opacity: 1, y: 0, transition: { delay: 640 } }" :initial="{ opacity: 0, y: 100 }" :lg="8" :sm="24" :xl="6" :xs="24">
 					<el-card class="mb-[18px]" shadow="never">
 						<div class="flex justify-between">
-							<span class="text-md font-medium">前端代码近期20次更改</span>
+							<span class="text-md font-medium">前端git近期20次更改</span>
 						</div>
 						<el-scrollbar class="mt-3" max-height="504">
 							<el-timeline>
@@ -87,9 +88,9 @@ onMounted(() => {
 										<el-link :href="item.html_url" :title="item.message" :underline="false" target="_blank">
 											{{ `提交信息：${item.message}，提交用户：` }}
 										</el-link>
-										<el-link :href="item.url" :title="item.name" :underline="false" target="_blank">
+										<el-link :href="item.url" :title="item.username" :underline="false" target="_blank">
 											<el-avatar :size="16" :src="item.avatar_url" class="align-middle" />
-											{{ `${item.name}` }}
+											{{ ` ${item.username}` }}
 										</el-link>
 									</p>
 								</el-timeline-item>
@@ -99,7 +100,7 @@ onMounted(() => {
 
 					<el-card shadow="never">
 						<div class="flex justify-between">
-							<span class="text-md font-medium">后端代码近期20次更改</span>
+							<span class="text-md font-medium">后端git近期20次更改</span>
 						</div>
 						<el-scrollbar class="mt-3" max-height="504">
 							<el-timeline>
@@ -108,9 +109,9 @@ onMounted(() => {
 										<el-link :href="item.html_url" :title="item.message" :underline="false" target="_blank">
 											{{ `提交信息：${item.message}，提交用户：` }}
 										</el-link>
-										<el-link :href="item.url" :title="item.name" :underline="false" target="_blank">
+										<el-link :href="item.url" :title="item.username" :underline="false" target="_blank">
 											<el-avatar :size="16" :src="item.avatar_url" class="align-middle" />
-											{{ `${item.name}` }}
+											{{ ` ${item.username}` }}
 										</el-link>
 									</p>
 								</el-timeline-item>
diff --git a/src/views/welcome/utils/data.ts b/src/views/welcome/utils/data.ts
index b992beb..06e75ae 100644
--- a/src/views/welcome/utils/data.ts
+++ b/src/views/welcome/utils/data.ts
@@ -1,4 +1,3 @@
-import { dayjs, getRandomIntBetween } from '../utils';
 import GroupLine from '@iconify-icons/ri/group-line';
 import Question from '@iconify-icons/ri/question-answer-line';
 import CheckLine from '@iconify-icons/ri/chat-check-line';
@@ -48,16 +47,4 @@ const chartData = [
 	},
 ];
 
-/** 数据统计 */
-const tableData = Array.from({ length: 30 }).map((_, index) => {
-	return {
-		id: index + 1,
-		requiredNumber: getRandomIntBetween(13500, 19999),
-		questionNumber: getRandomIntBetween(12600, 16999),
-		resolveNumber: getRandomIntBetween(13500, 17999),
-		satisfaction: getRandomIntBetween(95, 100),
-		date: dayjs().subtract(index, 'day').format('YYYY-MM-DD'),
-	};
-});
-
-export { chartData, tableData };
+export { chartData };
diff --git a/src/views/welcome/utils/hooks.ts b/src/views/welcome/utils/hooks.ts
index cd9a5ec..be703eb 100644
--- a/src/views/welcome/utils/hooks.ts
+++ b/src/views/welcome/utils/hooks.ts
@@ -8,12 +8,12 @@ export const serverCommitList = ref([]);
 
 /** 获取web代码提交记录 */
 export const getWebCommitList = async () => {
-	const response = await fetch('https://gitee.com/api/v5/repos/BunnyBoss/bunny-admin-web/commits?access_token=1dc76ba34226aea3eca52c1121c51617&page=1&per_page=20');
+	const response = await fetch('http://129.211.31.58:3000/api/v1/repos/auth/auth-web/commits?page=1&limit=20');
 	const json = await response.json();
 	webCommitList.value = json.map(item => ({
 		date: dayjs(item?.commit?.committer?.date).format('YYYY-MM-DD HH:mm:ss'),
 		url: item?.committer?.html_url,
-		name: item?.committer?.name,
+		username: item?.committer?.username,
 		avatar_url: item?.committer?.avatar_url,
 		message: item?.commit?.message,
 		html_url: item?.html_url,
@@ -21,12 +21,12 @@ export const getWebCommitList = async () => {
 };
 /** 获取后端代码提交记录 */
 export const getServerCommitList = async () => {
-	const response = await fetch('https://gitee.com/api/v5/repos/BunnyBoss/bunny-admin-server/commits?access_token=1dc76ba34226aea3eca52c1121c51617&page=1&per_page=20');
+	const response = await fetch('http://129.211.31.58:3000/api/v1/repos/auth/auth-server-java/commits?page=1&limit=20');
 	const json = await response.json();
 	serverCommitList.value = json.map(item => ({
 		date: dayjs(item?.commit?.committer?.date).format('YYYY-MM-DD HH:mm:ss'),
 		url: item?.committer?.html_url,
-		name: item?.committer?.name,
+		username: item?.committer?.username,
 		avatar_url: item?.committer?.avatar_url,
 		message: item?.commit?.message,
 		html_url: item?.html_url,
diff --git a/src/views/welcome/utils.ts b/src/views/welcome/utils/utils.ts
similarity index 100%
rename from src/views/welcome/utils.ts
rename to src/views/welcome/utils/utils.ts