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 0c832ba9..8dd1f30b 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
@@ -551,9 +551,9 @@ const onPropsCancel = () => {
const rules = [{
validator(_: any, v?: ActionsType) {
- console.log('validator',v)
+ console.log('validator-action-item',v)
if (v?.executor === 'device') {
- if(!v.device?.productId || !v.device?.selectorValues) {
+ if(v?.device?.source === 'fixed' && (!v.device?.productId || !v.device?.selectorValues)) {
return Promise.reject(new Error('该数据已发生变更,请重新配置'))
}
}
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/List.vue b/src/views/rule-engine/Scene/Save/action/ListItem/List.vue
index 229b8464..1d15c422 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/List.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/List.vue
@@ -73,19 +73,6 @@ const thenName = computed(() => {
return _data.value.branches![props.branchesName].then.findIndex(item => item.parallel === props.parallel)
})
-
-const rules = [{
- validator(_: any, v?: ActionsType) {
- console.log('validator',v)
- if (v?.executor === 'device') {
- if(!v.device?.productId || !v.device?.selectorValues) {
- return Promise.reject(new Error('该数据已发生变更,请重新配置'))
- }
- }
- return Promise.resolve()
- }
-}]
-
const onAdd = () => {
visible.value = true;
};
diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue
index 62fa0745..cba40b5d 100644
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@@ -49,7 +49,7 @@
>
-
+
diff --git a/vite.config.ts b/vite.config.ts
index 19022606..42794316 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -92,8 +92,8 @@ export default defineConfig(({ mode}) => {
[env.VITE_APP_BASE_API]: {
// target: 'http://192.168.32.226:8844',
// target: 'http://192.168.32.244:8881',
- // target: 'http://120.77.179.54:8844', // 120测试
- target: 'http://192.168.33.46:8844', // 本地开发环境
+ target: 'http://120.77.179.54:8844', // 120测试
+ // target: 'http://192.168.33.46:8844', // 本地开发环境
ws: 'ws://192.168.33.46:8844',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '')