From 1f0e81ca7fe71d38fb5b8c0cfefe09e74c9c0487 Mon Sep 17 00:00:00 2001 From: Free-sss <630042479@qq.com> Date: Thu, 28 Aug 2025 11:46:21 +0800 Subject: [PATCH] =?UTF-8?q?feat=20:=20=E5=AE=8C=E5=96=84=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfinedSpace/AlarmNowList/config.ts | 2 +- .../Charts/ConfinedSpace/Map/index.vue | 5 ++ .../ConfinedSpace/PieCircleCommen/config.ts | 2 +- .../ConfinedSpace/SmallBorder01Co/index.vue | 2 +- .../Charts/ConfinedSpace/yushiVideo/config.ts | 16 ++++- .../Charts/ConfinedSpace/yushiVideo/index.vue | 59 ++++++++++++------- 6 files changed, 60 insertions(+), 26 deletions(-) diff --git a/src/packages/components/Charts/ConfinedSpace/AlarmNowList/config.ts b/src/packages/components/Charts/ConfinedSpace/AlarmNowList/config.ts index f9bf8fc..b091b16 100644 --- a/src/packages/components/Charts/ConfinedSpace/AlarmNowList/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/AlarmNowList/config.ts @@ -14,7 +14,7 @@ export const styleConfig = { fontFamily: 'CustomFont', }, headerOption: { - paddingLeft: 30, + paddingLeft: 0, paddingRight: 0, paddingTop: 0, paddingBottom: 0 diff --git a/src/packages/components/Charts/ConfinedSpace/Map/index.vue b/src/packages/components/Charts/ConfinedSpace/Map/index.vue index 9363499..5f7d2dd 100644 --- a/src/packages/components/Charts/ConfinedSpace/Map/index.vue +++ b/src/packages/components/Charts/ConfinedSpace/Map/index.vue @@ -43,6 +43,10 @@ onMounted(() => { console.error("无法访问 iframe 内的 g.active3d 对象。"); } }; + // 禁止聚焦，免得柱图消失 + setTimeout(() => { + callIframeMethod("setProvinceFocusable", false) + }, 3000) } }); @@ -55,6 +59,7 @@ watchEffect(() => { // 增加延迟，确保iframe内方法准备就绪 setTimeout(() => { + BarOptionsData.value.forEach(barConfig => { // console.log(" Drawing bar with config:", barConfig); callIframeMethod("createBar", barConfig); diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts index d05a03b..a7b3ebd 100644 --- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts @@ -52,7 +52,7 @@ const otherConfig = { fontFamily: 'CustomFont', }, headerOption: { - paddingLeft: 30, + paddingLeft: 0, paddingRight: 0, paddingTop: 0, paddingBottom: 0 diff --git a/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue index 8cca9bf..135f453 100644 --- a/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue +++ b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue @@ -224,7 +224,7 @@ + :select-style-config="selectStyleConfig" />
diff --git a/src/packages/components/Charts/ConfinedSpace/yushiVideo/config.ts b/src/packages/components/Charts/ConfinedSpace/yushiVideo/config.ts index 3170587..390e1ef 100644 --- a/src/packages/components/Charts/ConfinedSpace/yushiVideo/config.ts +++ b/src/packages/components/Charts/ConfinedSpace/yushiVideo/config.ts @@ -25,7 +25,21 @@ export const option = { /** 外层css缩放比例 */ sca: 1, showBtn: true, - isOldStyle: true + isOldStyle: true, + titleText: '实时报警', + titleOption: { + color: '#ffffff', + fontSize: '17px', + fontStyle: 'normal', + fontWeight: 'normal', + fontFamily: 'CustomFont', + }, + headerOption: { + paddingLeft: 0, + paddingRight: 0, + paddingTop: 0, + paddingBottom: 0 + } } export default class Config extends PublicConfigClass implements CreateComponentType { diff --git a/src/packages/components/Charts/ConfinedSpace/yushiVideo/index.vue b/src/packages/components/Charts/ConfinedSpace/yushiVideo/index.vue index b4e8172..bdd1c8f 100644 --- a/src/packages/components/Charts/ConfinedSpace/yushiVideo/index.vue +++ b/src/packages/components/Charts/ConfinedSpace/yushiVideo/index.vue @@ -1,28 +1,33 @@ @@ -39,6 +44,7 @@ import { PageEnum } from '@/enums/pageEnum' import axios from 'axios' import { getUUID, isPreview } from '@/utils' import { useYushiVideoStore } from '@/store/modules/yushiVideoStore/yushiVideoStore' +import SmallBaorder01 from '../SmallBorder01Co/index.vue' const yushiStore = useYushiVideoStore() let selectedList = [] @@ -524,7 +530,7 @@ const fetchCameraTree = async () => { const res = await axios.get('/dev/api/camera/tree'); if (res.status === 200 && res.data && res.data.state) { console.log("API 响应数据 (Camera Tree):", res.data.value); - return res.data.value; + return res.data.value; } else { console.warn('API 返回非预期数据结构或空数据:', res); return []; @@ -594,6 +600,8 @@ const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (n margin: 4px 0; } + + .videoChangBtn { padding: 4px 4px; border: 1px solid rgb(24, 160, 219); @@ -607,6 +615,13 @@ const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, (n background-repeat: no-repeat; background-image: url('data:image/png;base64,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'); } + +.button { + background-color: #1E5676; + border: 1px solid #2E6E89; + padding: 12px 10px; + margin-right: 20px; +}