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

fix: bug#15871、#16254、#16317

This commit is contained in:
haodd 2023-07-13 14:02:45 +08:00
parent 8240776b24
commit d1bbdef021
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Search/Search.vue
View File

@ -4,7 +4,7 @@
:type='type' :type='type'
:request='(data) => saveSearchHistory(data, target)' :request='(data) => saveSearchHistory(data, target)'
:historyRequest='() => getSearchHistory(target)' :historyRequest='() => getSearchHistory(target)'
:deleteRequest='deleteSearchHistory' :deleteRequest='(_target: string, id: string) => deleteSearchHistory(target, id)'
:columns='columns' :columns='columns'
:class='props.class' :class='props.class'
style='padding-top: 18px; padding-bottom: 18px;' style='padding-top: 18px; padding-bottom: 18px;'

2
src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<j-spin :spinning="loading" v-if="_metadata.length"> <j-spin :spinning="loading" v-if="_metadata?.length">
<j-card :bordered="false"> <j-card :bordered="false">
<template #title> <template #title>
<TitleComponent data="点位映射"></TitleComponent> <TitleComponent data="点位映射"></TitleComponent>

2
src/views/device/Instance/Detail/ChildDevice/SaveChild/index.vue
View File

@ -146,7 +146,7 @@ const selectChange = (e: any) => {
visible.value = true; visible.value = true;
} }
const item = productList.value.filter((i: any) => i.id === e)[0]; const item = productList.value.filter((i: any) => i.id === e)[0];
const array = JSON.parse(item.metadata || [])?.properties?.map( const array = JSON.parse(item.metadata || '{}')?.properties?.map(
(i: any) => ({ (i: any) => ({
metadataType: 'property', metadataType: 'property',
metadataName: `${i.name}(${i.id})`, metadataName: `${i.name}(${i.id})`,

4
src/views/device/Instance/Detail/EdgeMap/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<j-spin :spinning="loading" v-if="metadata.properties.length"> <j-spin :spinning="loading" v-if="metadata.properties?.length">
<j-card :bordered="false" style="padding: 0"> <j-card :bordered="false" style="padding: 0">
<template #extra> <template #extra>
<j-space> <j-space>
@ -263,7 +263,7 @@ const channelList = ref<any[]>([]);
const _properties = computed(() => { const _properties = computed(() => {
const _cur = current.value >= 1 ? current.value : 1; const _cur = current.value >= 1 ? current.value : 1;
return metadata.properties.slice((_cur - 1) * 10, _cur * 10); return metadata.properties?.slice((_cur - 1) * 10, _cur * 10) || [];
}); });
const modelRef = reactive<{ const modelRef = reactive<{

2
src/views/edge/Device/Save/index.vue
View File

@ -13,7 +13,7 @@
<j-row type="flex"> <j-row type="flex">
<j-col flex="180px"> <j-col flex="180px">
<j-form-item name="photoUrl"> <j-form-item name="photoUrl">
<JProUpload accept="image/jpeg,image/png" v-model="modelRef.photoUrl" /> <JProUpload accept="image/jpeg,image/png" v-model="modelRef.photoUrl" :size="4"/>
</j-form-item> </j-form-item>
</j-col> </j-col>
<j-col flex="auto"> <j-col flex="auto">