From c79004c91bdb98606e8a278dc11b5960831f9ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=99=AE=E5=BB=BA?= <450837357@qq.com>
Date: Wed, 23 Apr 2025 09:23:21 +0800
Subject: [PATCH] first

---
 src/composables/router.ts                     | 15 ++++++----
 src/layouts/common/setting-drawer/index.vue   |  2 +-
 .../board/kanBan/compents/leftMiddle.vue      |  2 +-
 src/views/board/kanBan/compents/midMidBot.vue |  4 +--
 src/views/board/kanBan/index.vue              | 28 +++++++++++--------
 src/views/home/components/data-card/index.vue |  4 +--
 6 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/composables/router.ts b/src/composables/router.ts
index 7b11a1d..9df5c78 100644
--- a/src/composables/router.ts
+++ b/src/composables/router.ts
@@ -16,11 +16,16 @@ export function useRouterPush(inSetup = true) {
    * @param newTab - 是否在新的浏览器Tab标签打开
    */
   function routerPush(to: RouteLocationRaw, newTab = false) {
-    if (typeof to === 'string' && to?.indexOf('/board/kanBan') > -1) {
-      router.push({ name: 'board_kanBan' });
-      // window.open('/board/kanBan', '_blank');
-      return Promise.resolve();
-    }
+    // if (typeof to === 'string' && to?.indexOf('/board/kanBan') > -1) {
+    //   router.push({ name: 'board_kanBan' });
+    //   // window.open('/board/kanBan', '_blank');
+    //   return Promise.resolve();
+    // }
+		console.log('to', to);
+		if (typeof to === 'string' && to?.indexOf('/board/kanBan') > -1) {
+			window.open('/board/kanBan', '_blank');
+			return Promise.resolve();
+		}
     if (newTab) {
       const routerData = router.resolve(to);
       window.open(routerData.href, '_blank');
diff --git a/src/layouts/common/setting-drawer/index.vue b/src/layouts/common/setting-drawer/index.vue
index 7136da0..934650d 100644
--- a/src/layouts/common/setting-drawer/index.vue
+++ b/src/layouts/common/setting-drawer/index.vue
@@ -21,7 +21,7 @@ defineOptions({ name: 'SettingDrawer' });
 
 const app = useAppStore();
 
-const showButton = import.meta.env.DEV || import.meta.env.VITE_VERCEL === 'Y';
+const showButton = import.meta.env.DEV;
 </script>
 
 <style scoped></style>
diff --git a/src/views/board/kanBan/compents/leftMiddle.vue b/src/views/board/kanBan/compents/leftMiddle.vue
index 7cb9c24..4b77d0c 100644
--- a/src/views/board/kanBan/compents/leftMiddle.vue
+++ b/src/views/board/kanBan/compents/leftMiddle.vue
@@ -21,7 +21,7 @@ export default defineComponent({
     },
     height: {
       type: String,
-      default: '200px'
+      default: '300px'
     },
 		productionData : {
 			type : Object,
diff --git a/src/views/board/kanBan/compents/midMidBot.vue b/src/views/board/kanBan/compents/midMidBot.vue
index 575ec2b..0849049 100644
--- a/src/views/board/kanBan/compents/midMidBot.vue
+++ b/src/views/board/kanBan/compents/midMidBot.vue
@@ -1,6 +1,6 @@
 <template>
 <!--	<div :style="{ height: height, width: width }" />-->
-	<dv-scroll-board :config="config" style="width:900px;height:240px" />
+	<dv-scroll-board :config="config" style="width:900px;height:380px" />
 </template>
 
 <script>
@@ -36,7 +36,7 @@ export default defineComponent({
 		return {
 			config: {
 				header: ['工单类型', '机台', '订单编号', '报工数量','报工时间','报工人'],
-				headerBGC: 'transparent',
+				headerBGC: '#0E6EA1',
 				oddRowBGC: '#011B42',
 				evenRowBGC: '#020D29',
 				data: [
diff --git a/src/views/board/kanBan/index.vue b/src/views/board/kanBan/index.vue
index 10bc7ca..2794334 100644
--- a/src/views/board/kanBan/index.vue
+++ b/src/views/board/kanBan/index.vue
@@ -28,7 +28,7 @@
 							:year="year"
 							:production-data="productionData"
 							width="450px"
-							height="210px"
+							height="300px"
 						/>
 					</div>
 				</div>
@@ -378,7 +378,7 @@
 								ref="leftBot"
 								:year="year"
 								width="200px"
-								:device-count="25"
+								:device-count="10"
 								height="160px"
 								@endLoading="endLoading"
 							/>
@@ -391,7 +391,7 @@
 							<right-middle
 								v-show="!loading5"
 								ref="leftBot"
-								:device-count="9"
+								:device-count="15"
 								:year="year"
 								width="200px"
 								height="160px"
@@ -641,6 +641,9 @@ export default defineComponent({
 			const app = useAppStore();
 			app.setContentFull(this.fullScreen);
 		},
+		jumpPage(routerName){
+			this.router.push({name : routerName})
+		},
 		// 防抖函数
 		debounce(func, wait = 100) {
 			let timeout;
@@ -653,7 +656,7 @@ export default defineComponent({
 		},
 		handleScreenAuto() {
 			const designDraftWidth = 2280; // 设计稿的宽度
-			const designDraftHeight = 1080; // 设计稿的高度
+			const designDraftHeight = 1280; // 设计稿的高度
 			// 根据屏幕的变化适配的比例
 			const scale =
 				document.documentElement.clientWidth / document.documentElement.clientHeight <
@@ -765,11 +768,12 @@ export default defineComponent({
 }
 .screen {
 	width: 2280px;
-	height: 1080px;
+	height: 1280px;
 	transform-origin: 0 0;
 	position: relative;
 	background: url(../../../assets/img/pageBg.png) no-repeat;
-	background-size: cover;
+	background-size: contain;
+	background-size: 2280px 1280px;
 	left: 50%;
 	top: 50%;
 }
@@ -851,7 +855,7 @@ export default defineComponent({
 	height: 285px;
 	background: url(../../../assets/img/board/left_mid_bg.png) no-repeat center center;
 	background-size: cover;
-	top: 360px;
+	top: 392px;
 }
 .alltitle {
 	font-size: 18px;
@@ -866,7 +870,7 @@ export default defineComponent({
 .left_bot_area {
 	width: 505px;
 	height: 300px;
-	top: 700px;
+	top: 800px;
 }
 
 .left_bot_area .top_title,
@@ -1023,7 +1027,7 @@ export default defineComponent({
 .right_mid_bot_area {
 	width: 500px;
 	height: 230px;
-	top: 540px;
+	top: 580px;
 }
 .right_mid_bot_area .bar_area {
 	width: 565px;
@@ -1097,7 +1101,7 @@ export default defineComponent({
 .right_bot_area {
 	width: 600px;
 	height: 230px;
-	top: 805px;
+	top: 910px;
 }
 
 .mid_area {
@@ -1244,7 +1248,7 @@ export default defineComponent({
 	width: 900px;
 	height: 180px;
 	left: 630px;
-	top: 633px;
+	top: 680px;
 	background: url(../../../assets/img/board/left_mid_bg.png) no-repeat center center;
 	background-size: cover;
 }
@@ -1410,4 +1414,6 @@ li {
 		Arial Narrow Bold,
 		sans-serif;
 }
+
+
 </style>
diff --git a/src/views/home/components/data-card/index.vue b/src/views/home/components/data-card/index.vue
index 4a08ca0..5c9fbf5 100644
--- a/src/views/home/components/data-card/index.vue
+++ b/src/views/home/components/data-card/index.vue
@@ -45,7 +45,7 @@ const cardData: CardData[] = [
   {
     id: 'amount',
     title: '运行中',
-    value: 9,
+    value: 10,
     unit: '$',
     colors: ['#865ec0', '#5144b4'],
     icon: 'ant-design:money-collect-outlined'
@@ -53,7 +53,7 @@ const cardData: CardData[] = [
   {
     id: 'download',
     title: '待机',
-    value: 10,
+    value: 15,
     unit: '',
     colors: ['#56cdf3', '#719de3'],
     icon: 'carbon:document-download'