- webhook是一个接收HTTP请求的URL（本平台默认只支持HTTP
- POST请求），实现了Webhook的第三方系统可以基于该URL订阅本平台系统信息，本平台按配置把特定的事件结果推送到指定的地址，便于系统做后续处理。
+ WebHook是一个接收HTTP请求的URL（本平台默认只支持HTTP
+ POST请求），实现了WebHook的第三方系统可以基于该URL订阅本平台系统信息，本平台按配置把特定的事件结果推送到指定的地址，便于系统做后续处理。
diff --git a/src/views/notice/Config/Detail/index.vue b/src/views/notice/Config/Detail/index.vue
index 18f1e73b..7245ca1c 100644
--- a/src/views/notice/Config/Detail/index.vue
+++ b/src/views/notice/Config/Detail/index.vue
@@ -80,7 +80,7 @@
"
>
@@ -88,7 +88,7 @@
v-model:value="
formData.configuration.url
"
- placeholder="请输入webHook"
+ placeholder="请输入WebHook"
/>
@@ -278,12 +278,12 @@
@@ -447,7 +447,7 @@ const formRules = ref({
],
// webhook
'configuration.url': [
- { required: true, message: '请输入Webhook', trigger: 'blur' },
+ { required: true, message: '请输入WebHook', trigger: 'blur' },
// {
// pattern:
// /^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{0,63}[^!@#$%^&*?.\s])?\.)+[j-z]{2,6}\/?/,
diff --git a/src/views/notice/const.ts b/src/views/notice/const.ts
index fb42d5d2..11facc06 100644
--- a/src/views/notice/const.ts
+++ b/src/views/notice/const.ts
@@ -28,7 +28,7 @@ export const NOTICE_METHOD: INoticeMethod[] = [
value: 'sms',
},
{
- label: 'webhook',
+ label: 'WebHook',
value: 'webhook',
},
];
@@ -75,7 +75,7 @@ export const MSG_TYPE = {
],
webhook: [
{
- label: 'webhook',
+ label: 'WebHook',
value: 'http',
logo: getImage('/notice/webhook.png'),
},
diff --git a/src/views/rule-engine/Alarm/Config/Io/index.vue b/src/views/rule-engine/Alarm/Config/Io/index.vue
index 4586c557..c521d7bb 100644
--- a/src/views/rule-engine/Alarm/Config/Io/index.vue
+++ b/src/views/rule-engine/Alarm/Config/Io/index.vue
@@ -141,7 +141,7 @@
1、平台支持将告警数据输出到kafka，第三方系统可订阅kafka中的告警数据，进行业务处理。
- 输出参数
+ 推送参数
new Promise((resolve) => {
getTreeData_api({ paging: false }).then((resp: any) => {
const formatValue = (list: any[]) => {
@@ -260,4 +266,4 @@ const handleClick = (detail: any) => {
padding-right: 0px;
padding-left: 0px;
}
-
\ No newline at end of file
+
diff --git a/src/views/rule-engine/Scene/Save/action/Device/Product.vue b/src/views/rule-engine/Scene/Save/action/Device/Product.vue
index ecfcfe0d..80006026 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/Product.vue
@@ -208,10 +208,17 @@ const columns = [
},
{
dataIndex: 'id$dim-assets',
+ key: 'id$dim-assets',
title: '所属组织',
hideInTable: true,
search: {
type: 'treeSelect',
+ componentProps: {
+ fieldNames: {
+ label: 'name',
+ value: 'value',
+ },
+ },
options: () =>
new Promise((resolve) => {
getTreeData_api({ paging: false }).then((resp: any) => {
@@ -289,4 +296,4 @@ onMounted(() => {
padding-right: 0px;
padding-left: 0px;
}
-
\ No newline at end of file
+
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
index cc5fe7d2..64dd0f80 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
@@ -109,13 +109,17 @@ const upperOptions = computed(() => {
});
const onChange = () => {
+ const objValue: any = { source: _source.value, value: _value.value }
+ if (_source.value === 'upper') {
+ objValue.upperKey = _value.value
+ }
emit('update:value', _value.value);
emit('update:source', _source.value);
- emit('change', { source: _source.value, value: _value.value });
+ emit('change', objValue);
};
watchEffect(() => {
_value.value = props.value;
_source.value = props.source || 'fixed';
});
-
\ No newline at end of file
+
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
index b744e408..7c1d621c 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
@@ -173,11 +173,18 @@ const onChange = () => {
const onValueChange = (val: any, label: string) => {
const optionColumn = isObject(val) && (val as any).metadata ? [(val as any).column] : []
+
+ const objectValue: any = {
+ value: propertyModelRef?.propertiesValue,
+ source: propertyModelRef?.source,
+ }
+
+ if (propertyModelRef?.source === 'upper') {
+ objectValue.upperKey = propertyModelRef?.propertiesValue
+ }
+
const obj = {
- [`${propertyModelRef.properties}`]: {
- value: propertyModelRef?.propertiesValue,
- source: propertyModelRef?.source,
- },
+ [`${propertyModelRef.properties}`]: objectValue
};
emit('update:value', obj);
emit('change', label || val, optionColumn)
@@ -212,4 +219,4 @@ const onSave = () => {
};
defineExpose({ onSave });
-
\ No newline at end of file
+
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
index 6b35851e..078ac2fa 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
@@ -220,7 +220,7 @@
)
"
/>
- webhook
+ WebHook
发送
{{
diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue
index 7d47f61d..7d3ca1bf 100644
--- a/src/views/system/Apply/Save/components/EditForm.vue
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -144,12 +144,7 @@
@@ -1397,12 +1392,20 @@
+
@@ -1420,6 +1423,7 @@ import {
import FormLabel from './FormLabel.vue';
import RequestTable from './RequestTable.vue';
import MenuDialog from '../../componenets/MenuDialog.vue';
+import ThirdMenu from '../../componenets/ThirdMenu.vue';
import { getImage, onlyMessage } from '@/utils/comm';
import type { formType, dictType, optionsType, applyType } from '../typing';
import { getRoleList_api } from '@/api/system/user';
@@ -1573,7 +1577,7 @@ const getType = async () => {
typeOptions.value = arr;
}
}
-
+
onMounted(async () => {
await getType();
getRoleIdList();
diff --git a/src/views/system/Apply/componenets/ThirdMenu.vue b/src/views/system/Apply/componenets/ThirdMenu.vue
new file mode 100644
index 00000000..31993ef6
--- /dev/null
+++ b/src/views/system/Apply/componenets/ThirdMenu.vue
@@ -0,0 +1,150 @@
+
+
+
+ 当前集成菜单
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/Apply/componenets/util.ts b/src/views/system/Apply/componenets/util.ts
new file mode 100644
index 00000000..fa561e8c
--- /dev/null
+++ b/src/views/system/Apply/componenets/util.ts
@@ -0,0 +1,27 @@
+export const getCheckByTree = (data: any[]): string[] => {
+ let keys: string[] = []
+ if (data.length) {
+ data.forEach(item => {
+ if (item.children) {
+ keys = [...getCheckByTree(item.children), ...keys]
+ } else {
+ keys.push(item.code)
+ }
+ })
+ }
+ return keys
+}
+
+export const filterTree = (data: any[], ids: string[]) => {
+ return data?.filter(item => {
+ delete item.id
+ item.options = {show: true}
+ if (ids.includes(item.code)) {
+ return true
+ } else if (item.children) {
+ item.children = filterTree(item.children, ids)
+ return item.children.length >0
+ }
+ return false
+ }) || []
+}
diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue
index bff39a0c..486a395c 100644
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@@ -183,12 +183,19 @@