From f58414195019dac134ae6cdc71dae3e2335d49c4 Mon Sep 17 00:00:00 2001 From: JiangQiming <291854119@qq.com> Date: Tue, 14 Mar 2023 10:47:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?update:=20=E7=BB=84=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/media/Device/Save/SaveProduct.vue | 97 ++++++++++++--------- 1 file changed, 56 insertions(+), 41 deletions(-) diff --git a/src/views/media/Device/Save/SaveProduct.vue b/src/views/media/Device/Save/SaveProduct.vue index 298c1b49..9b86961e 100644 --- a/src/views/media/Device/Save/SaveProduct.vue +++ b/src/views/media/Device/Save/SaveProduct.vue @@ -9,32 +9,50 @@ :confirmLoading="btnLoading" width="660px" > - - + + - From 351e4f35ab51c6a6cfa3de0b663e7e341f91bd5e Mon Sep 17 00:00:00 2001 From: JiangQiming <291854119@qq.com> Date: Tue, 14 Mar 2023 11:38:21 +0800 Subject: [PATCH 2/8] =?UTF-8?q?update:=20=E7=BB=84=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/notice/Template/Debug/index.vue | 92 +++++++++++++++------- src/views/notice/Template/Detail/index.vue | 14 ++-- 2 files changed, 73 insertions(+), 33 deletions(-) diff --git a/src/views/notice/Template/Debug/index.vue b/src/views/notice/Template/Debug/index.vue index ae42fee7..767e1e67 100644 --- a/src/views/notice/Template/Debug/index.vue +++ b/src/views/notice/Template/Debug/index.vue @@ -50,34 +50,50 @@ @@ -100,6 +116,8 @@ import { message } from 'ant-design-vue'; import ToUser from '../Detail/components/ToUser.vue'; import ToOrg from '../Detail/components/ToOrg.vue'; import ToTag from '../Detail/components/ToTag.vue'; +import type { Rule } from 'ant-design-vue/es/form'; +import { phoneRegEx } from '@/utils/validate'; type Emits = { (e: 'update:visible', data: boolean): void; @@ -156,6 +174,26 @@ const getTemplateDetail = async () => { ...m, type: m.expands ? m.expands.businessType : m.type, value: undefined, + // 电话字段校验 + otherRules: + m.id === 'calledNumber' + ? [ + { + max: 64, + message: '最多可输入64个字符', + trigger: 'change', + }, + { + trigger: 'change', + validator(_rule: Rule, value: string) { + if (!value) return Promise.resolve(); + if (!phoneRegEx(value)) + return Promise.reject('请输入有效号码'); + return Promise.resolve(); + }, + }, + ] + : '', }), ); }; diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue index 3d371d45..5afbf687 100644 --- a/src/views/notice/Template/Detail/index.vue +++ b/src/views/notice/Template/Detail/index.vue @@ -85,7 +85,7 @@ > @@ -664,7 +664,6 @@ 自定义 Date: Tue, 14 Mar 2023 13:39:49 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E5=91=8A=E8=AD=A6=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9B=BF=E6=8D=A2=E5=8F=8A=E8=87=AA=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Alarm/Configuration/Save/Base/index.vue | 50 ++++---- .../Configuration/Save/Scene/Save/index.vue | 8 +- .../Alarm/Configuration/Save/Scene/index.vue | 4 +- .../Alarm/Configuration/Save/index.vue | 38 +++--- .../rule-engine/Alarm/Configuration/index.vue | 22 ++-- .../rule-engine/Alarm/Log/Detail/index.vue | 8 +- .../rule-engine/Alarm/Log/Detail/info.vue | 38 +++--- .../Alarm/Log/SolveComponent/index.vue | 17 +-- .../rule-engine/Alarm/Log/SolveLog/index.vue | 8 +- .../Alarm/Log/TabComponent/indev.vue | 111 +++++++++--------- src/views/rule-engine/Instance/Save/index.vue | 20 ++-- src/views/rule-engine/Instance/index.vue | 18 +-- 12 files changed, 172 insertions(+), 170 deletions(-) diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue index dc755f54..27d4ca36 100644 --- a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue +++ b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue @@ -1,27 +1,27 @@ @@ -178,7 +178,7 @@ const handleSave = async () => { const res = await save(form); loading.value = false; if (res.status === 200) { - message.success('操作成功'); + message.success('操作成功,请配置关联的场景联动'); menuStory.jumpPage( 'rule-engine/Alarm/Configuration/Save', {}, diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/index.vue index 1b1445fd..d604f853 100644 --- a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/index.vue +++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/index.vue @@ -1,5 +1,5 @@ diff --git a/src/views/rule-engine/Instance/Save/index.vue b/src/views/rule-engine/Instance/Save/index.vue index 2d55cf41..dac57c93 100644 --- a/src/views/rule-engine/Instance/Save/index.vue +++ b/src/views/rule-engine/Instance/Save/index.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue index 007c1813..54f908da 100644 --- a/src/views/device/Instance/index.vue +++ b/src/views/device/Instance/index.vue @@ -289,7 +289,6 @@ import { queryTree } from '@/api/device/category'; import { useMenuStore } from '@/store/menu'; import type { ActionsType } from './typings'; import dayjs from 'dayjs'; -import { throttle } from 'lodash-es'; const instanceRef = ref>({}); const params = ref>({}); diff --git a/src/views/edge/Device/Save/index.vue b/src/views/edge/Device/Save/index.vue new file mode 100644 index 00000000..0ce6c922 --- /dev/null +++ b/src/views/edge/Device/Save/index.vue @@ -0,0 +1,260 @@ + + + \ No newline at end of file diff --git a/src/views/edge/Device/index.vue b/src/views/edge/Device/index.vue new file mode 100644 index 00000000..86fcfcf0 --- /dev/null +++ b/src/views/edge/Device/index.vue @@ -0,0 +1,438 @@ + + + + + \ No newline at end of file diff --git a/src/views/edge/Resource/Issue/Result.vue b/src/views/edge/Resource/Issue/Result.vue new file mode 100644 index 00000000..52589e13 --- /dev/null +++ b/src/views/edge/Resource/Issue/Result.vue @@ -0,0 +1,132 @@ + + + + + \ No newline at end of file diff --git a/src/views/edge/Resource/Issue/index.vue b/src/views/edge/Resource/Issue/index.vue new file mode 100644 index 00000000..5bab28ac --- /dev/null +++ b/src/views/edge/Resource/Issue/index.vue @@ -0,0 +1,181 @@ + + + + + \ No newline at end of file diff --git a/src/views/edge/Resource/Save/index.vue b/src/views/edge/Resource/Save/index.vue new file mode 100644 index 00000000..9a695f10 --- /dev/null +++ b/src/views/edge/Resource/Save/index.vue @@ -0,0 +1,45 @@ + + + + + \ No newline at end of file diff --git a/src/views/edge/Resource/index.vue b/src/views/edge/Resource/index.vue new file mode 100644 index 00000000..4e5128eb --- /dev/null +++ b/src/views/edge/Resource/index.vue @@ -0,0 +1,383 @@ + + + + + \ No newline at end of file diff --git a/src/views/media/Device/Save/SaveProduct.vue b/src/views/media/Device/Save/SaveProduct.vue index 298c1b49..2b169905 100644 --- a/src/views/media/Device/Save/SaveProduct.vue +++ b/src/views/media/Device/Save/SaveProduct.vue @@ -133,6 +133,7 @@ type Emits = { (e: 'update:visible', data: boolean): void; (e: 'update:productId', data: string): void; (e: 'close'): void; + (e: 'save', ): void; }; const emit = defineEmits(); @@ -140,6 +141,7 @@ const props = defineProps({ visible: { type: Boolean, default: false }, productId: { type: String, default: '' }, channel: { type: String, default: '' }, + deviceType: { type: String, default: 'device' } }); const _vis = computed({ @@ -171,12 +173,12 @@ const handleClick = async (e: any) => { formData.value.accessId = e.id; formData.value.accessName = e.name; formData.value.accessProvider = e.provider; - formData.value.messageProtocol = e.provider; + formData.value.messageProtocol = e.protocolDetail.id; formData.value.protocolName = e.protocolDetail.name; formData.value.transportProtocol = e.transport; const { result } = await DeviceApi.getConfiguration( - props.channel, + e.protocol, e.transport, ); console.log('result: ', result); @@ -206,7 +208,7 @@ const formData = ref({ access_pwd: '', stream_mode: 'UDP', }, - deviceType: 'device', + deviceType: props.deviceType, messageProtocol: '', name: '', protocolName: '', diff --git a/yarn.lock b/yarn.lock index c1d0ad47..3a663ae9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3695,8 +3695,8 @@ jetlinks-store@^0.0.3: jetlinks-ui-components@^1.0.5: version "1.0.5" - resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#30de07a15481f13ea86ebc817baaab3c99034403" - integrity sha512-ULgSPU0xY6xUky3beeHVvpHyAHmT6xHsO5eS5m7a3h7AmCoxA3oTWyF20vC+K1zTJBQ7LFCouySqRRz6GimAPg== + resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#360e87e3cba4d025ec4665943098a88b0d9ff59a" + integrity sha512-lYe7kx65XCvZzf7esQRTm/ljlQi5kMtv00yotnSmvMILR6tohx57fA5Ga895i63DrySSmJlqBUsniMtjQVzqqQ== dependencies: "@vueuse/core" "^9.12.0" ant-design-vue "^3.2.15" From b66d48e6263b503e9d4e4207526d17266ba461df Mon Sep 17 00:00:00 2001 From: JiangQiming <291854119@qq.com> Date: Tue, 14 Mar 2023 14:32:48 +0800 Subject: [PATCH 5/8] =?UTF-8?q?update:=20=E7=BB=84=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/notice/Config/index.vue | 25 +++++++++++++++++++++++++ src/views/notice/Template/index.vue | 18 ++++++++++++------ src/views/notice/const.ts | 2 +- 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/src/views/notice/Config/index.vue b/src/views/notice/Config/index.vue index 5a9b56df..7e815933 100644 --- a/src/views/notice/Config/index.vue +++ b/src/views/notice/Config/index.vue @@ -147,6 +147,19 @@ + + + -