From 6290f2cc3ac6e0f1e680f1fb0f47935728c782d5 Mon Sep 17 00:00:00 2001 From: Free-sss <630042479@qq.com> Date: Thu, 28 Aug 2025 19:45:19 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=20=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Charts/ConfinedSpace/AlarmNowList/index.vue | 5 +++-- .../components/Charts/ConfinedSpace/Map/config.ts | 4 ++-- .../components/Charts/ConfinedSpace/Map/data.json | 10 +++++----- .../components/Charts/ConfinedSpace/Map/index.vue | 9 +++++++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/packages/components/Charts/ConfinedSpace/AlarmNowList/index.vue b/src/packages/components/Charts/ConfinedSpace/AlarmNowList/index.vue index 17fa169..232ba72 100644 --- a/src/packages/components/Charts/ConfinedSpace/AlarmNowList/index.vue +++ b/src/packages/components/Charts/ConfinedSpace/AlarmNowList/index.vue @@ -420,7 +420,7 @@ onUnmounted(() => { } .item_header { - margin-left: 20px; + margin-left: 10px; flex: 1; width: fit-content; max-width: 450px; @@ -445,7 +445,8 @@ onUnmounted(() => { } .item_time { - margin-right: 40px; + // margin-right: 70px; + padding-right: 30px; font-size: 18px; color: #7E8990; } diff --git a/src/packages/components/Charts/ConfinedSpace/Map/config.ts b/src/packages/components/Charts/ConfinedSpace/Map/config.ts index 710fc3b..bbb985a 100644 --- a/src/packages/components/Charts/ConfinedSpace/Map/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/Map/config.ts @@ -6,8 +6,8 @@ import cloneDeep from 'lodash/cloneDeep' import dataJson from './data.json' export const includes = [] const BAR_ITEM_DEFAULT_COLORS = [ - { color: "#61DDAA", wfColor: "#8F7830" }, - { color: "#AF380E", wfColor: "#BD1408" }, + { color: "#23B2D3", wfColor: "#8F7830" }, + { color: "#9B7E2D", wfColor: "#BD1408" }, { color: "#047DB0", wfColor: "#02BBD1" }, { color: "#01E5A9", wfColor: "#01C97F" }, ]; diff --git a/src/packages/components/Charts/ConfinedSpace/Map/data.json b/src/packages/components/Charts/ConfinedSpace/Map/data.json index 3f3ba6a..df26543 100644 --- a/src/packages/components/Charts/ConfinedSpace/Map/data.json +++ b/src/packages/components/Charts/ConfinedSpace/Map/data.json @@ -1,10 +1,10 @@ { "barOptions": [ - {"location": "河北省.唐山市", "items":[{"tall":100}]}, - {"location": "辽宁省.大连市", "items":[{"tall":100}]}, - {"location": "江苏省.常州市", "items":[{"tall":200}]}, - {"location": "江苏省.南京市", "items":[{"tall":200}]}, - {"location": "吉林省.长春市", "items":[{"tall":100}]} + {"location": "河北省.唐山市", "items":[{"tall":100},{"tall":40}]}, + {"location": "辽宁省.大连市", "items":[{"tall":100},{"tall":40}]}, + {"location": "江苏省.常州市", "items":[{"tall":200},{"tall":40}]}, + {"location": "江苏省.南京市", "items":[{"tall":200},{"tall":40}]}, + {"location": "吉林省.长春市", "items":[{"tall":100},{"tall":40}]} ] } diff --git a/src/packages/components/Charts/ConfinedSpace/Map/index.vue b/src/packages/components/Charts/ConfinedSpace/Map/index.vue index ea22a70..77c5251 100644 --- a/src/packages/components/Charts/ConfinedSpace/Map/index.vue +++ b/src/packages/components/Charts/ConfinedSpace/Map/index.vue @@ -54,9 +54,9 @@ const selectButton = (id: number) => { const updateChartData = async (buttonId: number) => { let dataToRender: BarOption[] = []; if (buttonId === 1) { - dataToRender = await fetchData('/spaceMap'); + dataToRender = await fetchData('/spaceMapMock'); } else if (buttonId === 2) { - dataToRender = await fetchData('/dayMap'); + dataToRender = await fetchData('/dayMapMock'); } else { console.warn(`未知的按钮ID: ${buttonId},将使用默认数据。`); } @@ -65,6 +65,11 @@ const updateChartData = async (buttonId: number) => { console.log(`已为按钮 ${buttonId} 加载 ${dataToRender.length} 条数据。`); }; const fetchData = async (url: string) => { + if (url == '/spaceMapMock') { + return dataJson.barOptions; + } else if (url == '/dayMapMock') { + return [{ "location": "四川省.成都市", "items": [{ "tall": 120, "color": "#ff4757" }, { "tall": 50, "color": "#3A86FF" }] }, { "location": "广东省.深圳市", "items": [{ "tall": 90, "color": "#5352ed" }, { "tall": 40, "color": "#5352ed" }] }, { "location": "浙江省.杭州市", "items": [{ "tall": 150, "color": "#ff4757" }, { "tall": 70, "color": "#4ECDC4" }] }, { "location": "江苏省.南京市", "items": [{ "tall": 100, "color": "#ff4757" }, { "tall": 45, "color": "#FFD166" }] }, { "location": "湖北省.武汉市", "items": [{ "tall": 110, "color": "#ff4757" }, { "tall": 52, "color": "#6A0572" }] }, { "location": "陕西省.西安市", "items": [{ "tall": 85, "color": "#ff4757" }, { "tall": 38, "color": "#1A535C" }] }, { "location": "山东省.青岛市", "items": [{ "tall": 130, "color": "#ff4757" }, { "tall": 60, "color": "#FF8C42" }] }, { "location": "河南省.郑州市", "items": [{ "tall": 95, "color": "#ff4757" }, { "tall": 43, "color": "#7209B7" }] }, { "location": "福建省.厦门市", "items": [{ "tall": 140, "color": "#ff4757" }, { "tall": 65, "color": "#06D6A0" }] }, { "location": "辽宁省.大连市", "items": [{ "tall": 88, "color": "#ff4757" }, { "tall": 41, "color": "#118AB2" }] }] + } try { const response = await axios.get(`/dev${url}`); if (response.data.state === true && response.data.value && response.data.value.length > 0) {