From 93a5a0fcca76081ea7267f93f8d59a4ae970b5a3 Mon Sep 17 00:00:00 2001 From: huanghao1412 Date: Fri, 12 Jul 2024 17:27:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E7=BB=84=E4=BB=B6=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 +-- .../DeviceRunningState/index.vue | 20 +++++++-------- .../Informations/Mores/Video/config.vue | 25 +++++++++++-------- .../components/Informations/Mores/index.ts | 2 +- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/.env b/.env index 33bd863f..fd20c63d 100644 --- a/.env +++ b/.env @@ -3,9 +3,9 @@ VITE_DEV_PORT = '8080' # development path # VITE_DEV_PATH = 'http://192.168.0.34:11887' -VITE_DEV_PATH = 'http://192.168.0.34:8022' +VITE_DEV_PATH = 'http://192.168.0.34:8102' # VITE_DEV_PATH = 'http://192.168.0.120:3001' -VITE_DEV_TOKEN = '1f19219c-e6a2-4c51-b442-e8607d1571ed' +VITE_DEV_TOKEN = 'dd23c593-c823-4eb3-86d0-54ec77c99880' # production path VITE_PRO_PATH = 'http://192.168.0.235:8177' diff --git a/src/packages/components/CustomComponents/CustomComponents/DeviceRunningState/index.vue b/src/packages/components/CustomComponents/CustomComponents/DeviceRunningState/index.vue index 6ee63fb9..95b45b98 100644 --- a/src/packages/components/CustomComponents/CustomComponents/DeviceRunningState/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/DeviceRunningState/index.vue @@ -62,8 +62,8 @@ const deepGetAllDeviceCodes = (treeData: any):any => { } let systemDatas:Ref = ref([]) -const originStore = useOriginStore() -const systemConfig = originStore.getOriginStore.user.systemConfig +// const originStore = useOriginStore() +// const systemConfig = originStore.getOriginStore.user.systemConfig const getData = async() => { try { @@ -100,15 +100,15 @@ const getData = async() => { space_complete_id: '', device_codes: systemDatas.value.map((e: any) => e.device_code) } - publicInterface('/dcim/dems/device', 'count_num_and_alarm_num_by_type', params).then((res: any) => { - if (res.data && res.data.length) { - for (const i in res.data) { - const item = systemDatas.value.find((e: any) => e.device_code === res.data[i].device_code) + publicInterface('/dcim/dems/device', 'count_num_and_alarm_num_by_type', params).then((res1: any) => { + if (res1.data && res1.data.length) { + for (const i in res1.data) { + const item = systemDatas.value.find((e: any) => e.device_code === res1.data[i].device_code) if (item) { - item.all = res.data[i].all - item.online_num = res.data[i].all - res.data[i].alarm_num - res.data[i].offline_num - item.alarm_num = res.data[i].alarm_num - item.offline_num = res.data[i].offline_num + item.all = res1.data[i].all + item.online_num = res1.data[i].all - res1.data[i].alarm_num - res1.data[i].offline_num + item.alarm_num = res1.data[i].alarm_num + item.offline_num = res1.data[i].offline_num } } } diff --git a/src/packages/components/Informations/Mores/Video/config.vue b/src/packages/components/Informations/Mores/Video/config.vue index 5501f31c..4e28194c 100644 --- a/src/packages/components/Informations/Mores/Video/config.vue +++ b/src/packages/components/Informations/Mores/Video/config.vue @@ -14,16 +14,21 @@ - - - - - - - - - - + + + + + + + + + + + + + + + 循环播放 diff --git a/src/packages/components/Informations/Mores/index.ts b/src/packages/components/Informations/Mores/index.ts index bd485288..787ad6d9 100644 --- a/src/packages/components/Informations/Mores/index.ts +++ b/src/packages/components/Informations/Mores/index.ts @@ -5,4 +5,4 @@ import { VideoConfig } from './Video/index' import { WordCloudConfig } from './WordCloud/index' // export default [VideoConfig] -export default [IframeConfig] +export default [IframeConfig, VideoConfig]