0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#11218

This commit is contained in:
xieyonghong 2023-03-30 13:37:31 +08:00
parent 9b7b78fe33
commit 947f34bed5
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
View File

@ -65,10 +65,12 @@ const handleOptions = computed(() => {
{ {
label: _item.trueText || true, label: _item.trueText || true,
value: _item.trueValue || true, value: _item.trueValue || true,
id: _item.trueValue || true,
}, },
{ {
label: _item.falseText || false, label: _item.falseText || false,
value: _item.falseValue || false, value: _item.falseValue || false,
id: _item.falseValue || false,
}, },
]; ];
} }
@ -77,6 +79,7 @@ const handleOptions = computed(() => {
return { return {
label: i.text, label: i.text,
value: i.value, value: i.value,
id: i.value,
}; };
}); });
} }

3
src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
View File

@ -136,10 +136,12 @@ const handleOptions = computed(() => {
{ {
label: _item.trueText || true, label: _item.trueText || true,
value: _item.trueValue || true, value: _item.trueValue || true,
id: _item.trueValue || true,
}, },
{ {
label: _item.falseText || false, label: _item.falseText || false,
value: _item.falseValue || false, value: _item.falseValue || false,
id: _item.falseValue || false,
}, },
]; ];
} }
@ -148,6 +150,7 @@ const handleOptions = computed(() => {
return { return {
label: i.text, label: i.text,
value: i.value, value: i.value,
id: i.value,
}; };
}); });
} }

4
src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
View File

@ -62,7 +62,7 @@ const handleBoolean = (key: string) => {
const click = (e: any) => { const click = (e: any) => {
const _key = ['true', 'false'].includes(e.key) ? handleBoolean(e.key) : e.key const _key = ['true', 'false'].includes(e.key) ? handleBoolean(e.key) : e.key
const option = getOption(myOptions.value, _key, props.valueName) const option = getOption(myOptions.value, _key, props.valueName)
myValue.value = _key myValue.value = e.key
emit('update:value', _key) emit('update:value', _key)
emit('click', _key, { emit('click', _key, {
key: _key, key: _key,
@ -71,7 +71,7 @@ const click = (e: any) => {
} }
watch(() => props.value, () => { watch(() => props.value, () => {
myValue.value = props.value myValue.value = isBoolean(props.value) ? String(props.value) : props.value
}, { immediate: true}) }, { immediate: true})
</script> </script>

1
src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
View File

@ -162,6 +162,7 @@ watchEffect(() => {
const option = getOption(_options, props.value as string, props.valueName) // 回显label值 const option = getOption(_options, props.value as string, props.valueName) // 回显label值
myValue.value = props.value myValue.value = props.value
mySource.value = props.source mySource.value = props.source
console.log(option, _options, props.valueName)
if (option) { if (option) {
label.value = option[props.labelName] || option.name label.value = option[props.labelName] || option.name
treeOpenKeys.value = openKeysByTree(_options, props.value, props.valueName) treeOpenKeys.value = openKeysByTree(_options, props.value, props.valueName)

4
src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
View File

@ -177,8 +177,8 @@ const handOptionByColumn = (option: any) => {
if (option.dataType === 'boolean') { if (option.dataType === 'boolean') {
valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [ valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [
{ label: '是', value: true }, { label: '是', value: true, id: true },
{ label: '否', value: false }, { label: '否', value: false, id: false },
] ]
} else if(option.dataType === 'enum') { } else if(option.dataType === 'enum') {
valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [] valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || []

4
vite.config.ts
View File

@ -92,8 +92,8 @@ export default defineConfig(({ mode}) => {
[env.VITE_APP_BASE_API]: { [env.VITE_APP_BASE_API]: {
// target: 'http://192.168.33.22:8800', // target: 'http://192.168.33.22:8800',
// target: 'http://192.168.32.244:8881', // target: 'http://192.168.32.244:8881',
target: 'http://120.77.179.54:8844', // 120测试 // target: 'http://120.77.179.54:8844', // 120测试
// target: 'http://192.168.33.46:8844', // 本地开发环境 target: 'http://192.168.33.46:8844', // 本地开发环境
ws: 'ws://192.168.33.46:8844', ws: 'ws://192.168.33.46:8844',
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '') rewrite: (path) => path.replace(/^\/api/, '')