From 35c60892f9b5c73caef01cc12b542111c77d757c Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期二, 08 九月 2026 15:29:29 +0800
Subject: [PATCH] feat: 更新报告模块配置和页面
---
src/config/proxy.ts | 4 ++++
src/modules/report/views/screen/index.vue | 4 ++--
src/modules/report/data/screen-demo.ts | 5 -----
package.json | 2 +-
src/modules/report/data/screen.ts | 14 +++++++-------
5 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/package.json b/package.json
index dc5106f..1cf9f6d 100644
--- a/package.json
+++ b/package.json
@@ -75,5 +75,5 @@
"vite-plugin-vue-devtools": "^7.7.1",
"vue-tsc": "^2.2.0"
},
- "packageManager": "pnpm@11.12.0+sha512.820a6fbd0d9f04c226638002aead1e45340a9139dd5dc077c1d83ef44aa2481c8eb6637b4c9aa696a3c7e35ba818e49cf27213e5f2b91138d09b7a3e26e898ba"
+ "packageManager": "pnpm@11.24.0"
}
\ No newline at end of file
diff --git a/src/config/proxy.ts b/src/config/proxy.ts
index 4f4e5db..5602664 100644
--- a/src/config/proxy.ts
+++ b/src/config/proxy.ts
@@ -9,6 +9,10 @@
target: 'https://show.cool-admin.com',
changeOrigin: true,
rewrite: (path: string) => path.replace(/^\/prod/, '/api')
+ },
+ '/upload/': {
+ target: 'http://127.0.0.1:8001',
+ changeOrigin: true
}
};
diff --git a/src/modules/report/data/screen-demo.ts b/src/modules/report/data/screen-demo.ts
index 7674f46..097ccf2 100644
--- a/src/modules/report/data/screen-demo.ts
+++ b/src/modules/report/data/screen-demo.ts
@@ -193,11 +193,6 @@
],
vehicles: [
{ no: '娌狝路8K126', km: 86.4, idle: 12, overspeed: 0, status: '鍦ㄧ嚎' },
- { no: '娌狝路6D882', km: 72.1, idle: 8, overspeed: 1, status: '鍦ㄧ嚎' },
- { no: '娌狝路3F559', km: 64.8, idle: 18, overspeed: 0, status: '鍦ㄧ嚎' },
- { no: '娌狝路2H903', km: 58.2, idle: 6, overspeed: 0, status: '鍦ㄧ嚎' },
- { no: '娌狝路9M217', km: 46.5, idle: 22, overspeed: 2, status: '鍦ㄧ嚎' },
- { no: '娌狝路5P668', km: 38.6, idle: 0, overspeed: 0, status: '绂荤嚎' },
{ no: '娌狝路1R441', km: 24.3, idle: 0, overspeed: 0, status: '绂荤嚎' }
],
sites: [
diff --git a/src/modules/report/data/screen.ts b/src/modules/report/data/screen.ts
index 8b74804..6c6bde9 100644
--- a/src/modules/report/data/screen.ts
+++ b/src/modules/report/data/screen.ts
@@ -6,17 +6,17 @@
export const SCREEN_HOME_PATH = '/report/screen/index';
export const SCREEN_NAV: { key: ScreenKey; index: string; label: string; audience: string }[] = [
- { key: 'overview', index: '01', label: '缁胯壊鏍″洯鎬昏', audience: '鏍￠瀵�' },
- { key: 'resource', index: '02', label: '鍨冨溇璧勬簮鍖栧垎鏋�', audience: '鍚庡嫟 / 鐜繚' },
- { key: 'carbon', index: '03', label: '纰冲噺鎺掍笌缁胯壊璐＄尞', audience: '鍙岀⒊ / ESG' },
- { key: 'participation', index: '04', label: '甯堢敓鍙備笌涓庣⒊绉垎', audience: '瀛﹀伐 / 鍥㈠' },
- { key: 'operation', index: '05', label: '鍥炴敹杩愯惀鐩戞帶', audience: '杩愯惀鍏徃' },
- { key: 'map', index: '06', label: '鍦扮悊淇℃伅鎬昏', audience: '鎸囨尌涓績' }
+ { key: 'map', index: '01', label: '鍦扮悊淇℃伅鎬昏', audience: '鎸囨尌涓績' },
+ { key: 'overview', index: '02', label: '缁胯壊鏍″洯鎬昏', audience: '鏍￠瀵�' },
+ { key: 'resource', index: '03', label: '鍨冨溇璧勬簮鍖栧垎鏋�', audience: '鍚庡嫟 / 鐜繚' },
+ { key: 'carbon', index: '04', label: '纰冲噺鎺掍笌缁胯壊璐＄尞', audience: '鍙岀⒊ / ESG' },
+ { key: 'participation', index: '05', label: '甯堢敓鍙備笌涓庣⒊绉垎', audience: '瀛﹀伐 / 鍥㈠' },
+ { key: 'operation', index: '06', label: '鍥炴敹杩愯惀鐩戞帶', audience: '杩愯惀鍏徃' }
];
/** 浠庤矾鐢辫В鏋愬綋鍓嶅ぇ灞忓瓙椤碉紱index / 绌� / 闈炴硶鍊煎潎鍥炶惤鍒� overview */
export function resolveScreenKey(page?: string | string[] | null, queryPage?: string | string[] | null): ScreenKey {
- const raw = String(queryPage || page || 'overview');
+ const raw = String(queryPage || page || 'map');
if (raw === 'index') return 'map'; //if (raw === 'index') return 'overview';
return SCREEN_NAV.some(e => e.key === raw) ? (raw as ScreenKey) : 'map';
//return SCREEN_NAV.some(e => e.key === raw) ? (raw as ScreenKey) : 'overview';
diff --git a/src/modules/report/views/screen/index.vue b/src/modules/report/views/screen/index.vue
index 2bda8a0..ad8f86f 100644
--- a/src/modules/report/views/screen/index.vue
+++ b/src/modules/report/views/screen/index.vue
@@ -26,12 +26,12 @@
const route = useRoute();
const pageMap = {
+ map: Map,
overview: Overview,
resource: Resource,
carbon: Carbon,
participation: Participation,
- operation: Operation,
- map: Map
+ operation: Operation
};
/** 鍋滅暀鍦� /report/screen/index锛岀敤 query.page锛堟垨鍔ㄦ�佽矾鐢� :page锛夊垏鎹㈠瓙椤碉紝涓嶅啀寮哄埗璺宠蛋 */
--
Gitblit v1.9.1