From 63ec13e49bd43f676ee66c6d765e01a9cc4c8021 Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Fri, 31 Mar 2023 14:27:28 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E8=A7=86=E9=A2=91=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=BF=AB=E9=80=9F=E6=8E=A5=E5=85=A5?= =?UTF-8?q?=E7=BD=91=E5=85=B3=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8tab=E5=85=B3=E9=97=AD=E6=97=B6=E7=9A=84=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/link/AccessConfig/components/Media/GB28181.vue | 2 +- src/views/media/Device/Save/SaveProduct.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/link/AccessConfig/components/Media/GB28181.vue b/src/views/link/AccessConfig/components/Media/GB28181.vue index b2897766..9d1466e4 100644 --- a/src/views/link/AccessConfig/components/Media/GB28181.vue +++ b/src/views/link/AccessConfig/components/Media/GB28181.vue @@ -654,7 +654,7 @@ const saveData = () => { onlyMessage('操作成功', 'success'); if (route.query.save) { // @ts-ignore - window?.onTabSaveSuccess(resp.result); + window?.onTabSaveSuccess(resp); window.close(); } else { history.back(); diff --git a/src/views/media/Device/Save/SaveProduct.vue b/src/views/media/Device/Save/SaveProduct.vue index 0ef6920a..6ca9552b 100644 --- a/src/views/media/Device/Save/SaveProduct.vue +++ b/src/views/media/Device/Save/SaveProduct.vue @@ -319,9 +319,9 @@ const handleAdd = () => { const tab: any = window.open( `${origin}/#/iot/link/accessConfig/detail/:id?save=true&view=false&type=${props.channel}`, ); - tab.onTabSaveSuccess = async (value: string) => { + tab.onTabSaveSuccess = async (value: any) => { await getGatewayList(); - handleClick(value); + handleClick(value?.result); }; }; From 11cf92b90e93e42a663fddff855784f48de2fbcc Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Fri, 31 Mar 2023 14:33:58 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20bug#11233=E3=80=8111276?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataCollect/Collector/Point/index.vue | 15 ++--------- .../DataCollect/Collector/Tree/Save/index.vue | 25 ++++++++++++------- src/views/link/Type/Detail/index.vue | 5 +--- 3 files changed, 19 insertions(+), 26 deletions(-) diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue index 70af667b..266e91bb 100644 --- a/src/views/DataCollect/Collector/Point/index.vue +++ b/src/views/DataCollect/Collector/Point/index.vue @@ -334,7 +334,7 @@ import SaveModBus from './Save/SaveModBus.vue'; import SaveOPCUA from './Save/SaveOPCUA.vue'; import Scan from './Scan/index.vue'; import { colorMap } from '../data.ts'; -import { cloneDeep, isNumber } from 'lodash-es'; +import { cloneDeep, isNumber, throttle } from 'lodash-es'; import { getWebSocket } from '@/utils/websocket'; import { map } from 'rxjs/operators'; import dayjs from 'dayjs'; @@ -616,17 +616,6 @@ const handleClick = (dt: any) => { } }; -//节流 -let timer: any = null; -function throttle(fn: any, delay = 1000) { - if (timer == null) { - timer = setTimeout(() => { - fn(); - clearTimeout(timer); - timer = null; - }, delay); - } -} const subscribeProperty = (value: any) => { const list = value.map((item: any) => item.id); const id = `collector-${props.data?.channelId || 'channel'}-${ @@ -643,7 +632,7 @@ const subscribeProperty = (value: any) => { //防止刷新过快 throttle(() => { propertyValue.value.set(payload.pointId, payload); - }); + }, 1000); }); }; diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue index 0c8782fb..7f325ae7 100644 --- a/src/views/DataCollect/Collector/Tree/Save/index.vue +++ b/src/views/DataCollect/Collector/Tree/Save/index.vue @@ -107,11 +107,7 @@ />
-

- 当前内存布局:{{ - endianMap.get(formData.configuration.endian) - }}{{ endianMap.get(formData.configuration.endianIn) }} -

+

当前内存布局: {{ endianData }}

只有4字节数据类型(int32、ieee754 float) 具有4种内存布局，其它只有ABCD、DCBA两种内存布局(以双字配置为准) @@ -182,10 +178,21 @@ const emit = defineEmits(['change']); const id = props.data.id; const formRef = ref(); -const endianMap = new Map([ - ['BIG', 'AB'], - ['LITTLE', 'BA'], -]); + +const endianData = computed(() => { + const { endian, endianIn } = formData.value.configuration; + if (endian) { + if (endianIn) { + if (endian === 'BIG') { + return endianIn === 'BIG' ? 'ABCD' : 'BADC'; + } else { + return endianIn === 'BIG' ? 'CDBA' : 'DCBA'; + } + } else { + return endian === 'BIG' ? 'ABCD' : 'DCBA'; + } + } +}); const formData = ref({ channelId: undefined, diff --git a/src/views/link/Type/Detail/index.vue b/src/views/link/Type/Detail/index.vue index cd2f8a18..7204ba69 100644 --- a/src/views/link/Type/Detail/index.vue +++ b/src/views/link/Type/Detail/index.vue @@ -1366,10 +1366,7 @@ const getDetail = () => { ...configuration, }; } else { - dynamicValidateForm.cluster = { - ...cloneDeep(FormStates2), //同上 - ...cluster, - }; + dynamicValidateForm.cluster = cluster; } if (dynamicValidateForm.cluster.length === 1) { From 0ec07a4d731d3d31f3571fc17498cf40f882a84a Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Fri, 31 Mar 2023 15:55:12 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20bug#10847=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/Menu/Detail/BasicInfo.vue | 1 - src/views/system/Menu/Detail/ButtonMange.vue | 22 +- .../Menu/components/ChooseIconDialog.vue | 34 +-- src/views/system/Menu/components/fields.ts | 246 ++++++++++++++++++ src/views/system/Menu/index.vue | 14 +- 5 files changed, 275 insertions(+), 42 deletions(-) create mode 100644 src/views/system/Menu/components/fields.ts diff --git a/src/views/system/Menu/Detail/BasicInfo.vue b/src/views/system/Menu/Detail/BasicInfo.vue index 025a1d92..8c4ebeb4 100644 --- a/src/views/system/Menu/Detail/BasicInfo.vue +++ b/src/views/system/Menu/Detail/BasicInfo.vue @@ -258,7 +258,6 @@