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 c4b54f15..86516c7d 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 @@ -65,10 +65,12 @@ const handleOptions = computed(() => { { label: _item.trueText || true, value: _item.trueValue || true, + id: _item.trueValue || true, }, { label: _item.falseText || false, value: _item.falseValue || false, + id: _item.falseValue || false, }, ]; } @@ -77,6 +79,7 @@ const handleOptions = computed(() => { return { label: i.text, value: i.value, + id: i.value, }; }); } 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 e47a0b77..66e79d5f 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 @@ -136,10 +136,12 @@ const handleOptions = computed(() => { { label: _item.trueText || true, value: _item.trueValue || true, + id: _item.trueValue || true, }, { label: _item.falseText || false, value: _item.falseValue || false, + id: _item.falseValue || false, }, ]; } @@ -148,6 +150,7 @@ const handleOptions = computed(() => { return { label: i.text, value: i.value, + id: i.value, }; }); } 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 c8a0429c..caf8b729 100644 --- a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue +++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue @@ -62,7 +62,7 @@ const handleBoolean = (key: string) => { const click = (e: any) => { const _key = ['true', 'false'].includes(e.key) ? handleBoolean(e.key) : e.key const option = getOption(myOptions.value, _key, props.valueName) - myValue.value = _key + myValue.value = e.key emit('update:value', _key) emit('click', _key, { key: _key, @@ -71,7 +71,7 @@ const click = (e: any) => { } watch(() => props.value, () => { - myValue.value = props.value + myValue.value = isBoolean(props.value) ? String(props.value) : props.value }, { immediate: true}) diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue index 69b522a8..34042720 100644 --- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue +++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue @@ -162,6 +162,7 @@ watchEffect(() => { const option = getOption(_options, props.value as string, props.valueName) // 回显label值 myValue.value = props.value mySource.value = props.source + console.log(option, _options, props.valueName) if (option) { label.value = option[props.labelName] || option.name treeOpenKeys.value = openKeysByTree(_options, props.value, props.valueName) diff --git a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue index 5d6663fb..d88a5072 100644 --- a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue +++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue @@ -177,8 +177,8 @@ const handOptionByColumn = (option: any) => { if (option.dataType === 'boolean') { valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [ - { label: '是', value: true }, - { label: '否', value: false }, + { label: '是', value: true, id: true }, + { label: '否', value: false, id: false }, ] } else if(option.dataType === 'enum') { valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [] diff --git a/vite.config.ts b/vite.config.ts index 1b248650..a55d7960 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.33.22:8800', // 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/, '')