diff --git a/src/utils/request.ts b/src/utils/request.ts
index 1bf7ad8a..2b8d2cb7 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -122,7 +122,7 @@ const showNotification = (message: string, description: string, key?: string, sh
if (show) {
Notification.error({
key,
- message,
+ message: '',
description
})
}
diff --git a/src/views/init-home/data/baseMenu.ts b/src/views/init-home/data/baseMenu.ts
index d3a1628a..f8635ef7 100644
--- a/src/views/init-home/data/baseMenu.ts
+++ b/src/views/init-home/data/baseMenu.ts
@@ -1688,7 +1688,7 @@ export default [
],
accessSupport: { text: "支持", value: "support" },
supportDataAccess: true,
- assetType: 'ataCollectCollector'
+ assetType: 'dataCollectCollector'
},
],
},
diff --git a/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue b/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
index 5e2e3cfa..f0246cb2 100644
--- a/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
+++ b/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
@@ -114,7 +114,6 @@ const functionData = computed(() => {
const rules = [{
validator(_: string, value: any) {
console.log(value)
- debugger
if (!value?.length && functionData.value.length) {
return Promise.reject('请输入功能值')
} else {
@@ -137,6 +136,7 @@ const onSelect = (v: string, item: any) => {
}
const callDataChange = (v: any[]) => {
+ console.log('callDataChange',v)
emit('update:functionParameters', v)
}
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue b/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
index 47e1c542..2ea815b5 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
@@ -35,7 +35,10 @@ const rules = [{
validator(_: any, v?: ActionsType) {
console.log('validator',v)
if (v?.executor === 'device') {
- if(!v.device?.productId || !v.device?.selectorValues) {
+ if(
+ !v.device?.productId || // 产品已删除
+ !v.device?.selectorValues // 设备已删除
+ ) {
return Promise.reject(new Error('该数据已发生变更,请重新配置'))
}
}
@@ -53,12 +56,13 @@ const formTouchOff = () => {
const checkDeviceDelete = async () => {
const item = _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device
const proResp = await queryProductList({ terms: [{ terms: [{ column: 'id', termType: 'eq', value: item!.productId }]}]})
- if (proResp.success && (proResp.result as any)?.total === 0) { // 产品已删除
+ if (proResp.success && (proResp.result as any)?.total === 0 && item && item.productId) { // 产品已删除
_data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.productId = undefined
formTouchOff()
return
}
if (item?.selector === 'fixed') {
+ console.log(item)
const deviceList = item!.selectorValues?.map(item => item.value) || []
const deviceResp = await deviceQuery({ terms: [{ terms: [{ column: 'id', termType: 'in', value: deviceList.toString() }]}]})
if (deviceResp.success && (deviceResp.result as any)?.total < (item!.selectorValues?.length || 0)) { // 某一个设备被删除
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
index 8516c14a..c8a0429c 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
@@ -1,9 +1,11 @@
diff --git a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
index 27249071..accd5e7b 100644
--- a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
+++ b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
@@ -8,7 +8,9 @@
>
- {{ record.name }}
+
+ {{ record.name }}
+
{{ record.type }}
@@ -29,12 +31,14 @@
-
+
+
+
@@ -42,7 +46,6 @@