@@ -507,7 +509,10 @@ const checkName = (_: any, value: any) =>
box-sizing: border-box;
width:300px;
height:100%;
- overflow-y: auto;
+ .tree{
+ max-height: 680px;
+ overflow-y: auto;
+ }
}
.right {
width: calc(100% - 280px);
diff --git a/src/views/system/NoticeRule/components/Save/components/NotifyWay.vue b/src/views/system/NoticeRule/components/Save/components/NotifyWay.vue
index 930f2e67..ff093d3b 100644
--- a/src/views/system/NoticeRule/components/Save/components/NotifyWay.vue
+++ b/src/views/system/NoticeRule/components/Save/components/NotifyWay.vue
@@ -73,6 +73,13 @@ onMounted(() => {
emit('update:value', options.value?.[0]?.value);
emit('update:name', options.value?.[0]?.label);
emit('change', {label: options.value?.[0]?.label, value: options.value?.[0]?.value});
+ }else{
+ options.value.find((item:any)=>{
+ if(item.value === props.value){
+ emit('update:name',item.label)
+ return true
+ }
+ })
}
}
loading.value = false;
From 566df47ce8c348ecee2b6fe555973e4a40d47f4e Mon Sep 17 00:00:00 2001
From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com>
Date: Wed, 20 Sep 2023 10:04:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=BE=B9=E7=BC=98=E7=AB=AF=E6=98=A0?=
=?UTF-8?q?=E5=B0=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix: 物联网卡首页图片加载失败
* fix: 边缘端映射bug
---
.../device/Instance/Detail/EdgeMap/index.vue | 84 ++++++++++---------
.../Detail/Info/components/Config/index.vue | 11 +--
src/views/device/Product/index.vue | 6 --
src/views/home/components/BootCardSmall.vue | 2 +-
.../system/DataSource/Management/index.vue | 3 +-
vite.config.ts | 3 +-
6 files changed, 54 insertions(+), 55 deletions(-)
diff --git a/src/views/device/Instance/Detail/EdgeMap/index.vue b/src/views/device/Instance/Detail/EdgeMap/index.vue
index 968f2ce2..1ab47757 100644
--- a/src/views/device/Instance/Detail/EdgeMap/index.vue
+++ b/src/views/device/Instance/Detail/EdgeMap/index.vue
@@ -210,6 +210,7 @@ import PatchMapping from './PatchMapping.vue';
import { onlyMessage } from '@/utils/comm';
import { cloneDeep } from 'lodash-es';
import { usePermissionStore } from '@/store/permission';
+import { dataTool } from 'echarts';
const columns = [
{
title: '名称',
@@ -250,6 +251,7 @@ const columns = [
const permissionStore = usePermissionStore();
+const data:any = ref([])
const isPermission = permissionStore.hasPermission('device/Instance:update');
const current = ref
(1);
@@ -260,10 +262,11 @@ const metadata = JSON.parse(instanceStore.current?.metadata || '{}');
const loading = ref(false);
const channelList = ref([]);
-const _properties = computed(() => {
- const _cur = current.value >= 1 ? current.value : 1;
- return metadata.properties?.slice((_cur - 1) * 10, _cur * 10) || [];
-});
+// const _properties = computed(() => {
+// const _cur = current.value >= 1 ? current.value : 1;
+// const _pageSize = pageSize.value
+// return metadata.properties?.slice((_cur - 1) * _pageSize, _cur * _pageSize) || [];
+// });
const modelRef = reactive<{
dataSource: any[];
@@ -287,14 +290,21 @@ const getChannel = async () => {
}
};
-const handleSearch = async (_array: any[]) => {
+const handleSearch = async () => {
loading.value = true;
- const _metadata: any[] = _array.map((item: any) => ({
- metadataId: item.id,
- metadataName: `${item.name}(${item.id})`,
- metadataType: 'property',
- name: item.name,
- }));
+ const _metadataMap = new Map ()
+ const _metadata: any[] = metadata.properties.map((item: any) => {
+ const value = {
+ metadataId: item.id,
+ metadataName: `${item.name}(${item.id})`,
+ metadataType: 'property',
+ name: item.name,
+ }
+ _metadataMap.set(item.id,value)
+ return value
+ });
+
+
if (_metadata && _metadata.length) {
const resp: any = await getEdgeMap(
instanceStore.current?.parentId || '',
@@ -307,32 +317,25 @@ const handleSearch = async (_array: any[]) => {
loading.value = false;
});
if (resp.status === 200) {
- const array = _metadata.map((item: any) => {
- const metadataId = resp.result?.[0].find((x: any) => x.metadataId === item.metadataId);
- Object.assign(item, metadataId);
- return item
- })
- resp.result?.[0].forEach((item:any)=>{
- const differ = array.every((i:any)=>{
- return item.metadataId !== i.metadataId
- })
- if(differ){
- array.push(item)
- }
- })
- // const array = resp.result?.[0].reduce((x: any, y: any) => {
- // const metadataId = _metadata.find(
- // (item: any) => item.metadataId === y.metadataId,
- // );
- // if (metadataId) {
- // Object.assign(metadataId, y);
- // } else {
- // x.push(y);
+ // const array = _metadata.map((item: any) => {
+ // const metadataId = resp.result?.[0].find((x: any) => x.metadataId === item.metadataId);
+ // Object.assign(item, metadataId);
+ // return item
+ // })
+ // resp.result?.[0].forEach((item:any)=>{
+ // const differ = array.every((i:any)=>{
+ // return item.metadataId !== i.metadataId
+ // })
+ // if(differ){
+ // array.push(item)
// }
- // return x;
- // }, _metadata);
- console.log(array)
- modelRef.dataSource = array;
+ // })
+
+ resp.result?.[0].forEach((item:any)=>{
+ _metadataMap.has(item.metadataId) ? _metadataMap.set(item.metadataId,Object.assign(_metadataMap.get(item.metadataId),item)) : _metadataMap.set(item.metadataId,item)
+ })
+ data.value = [..._metadataMap.values()]
+ onPageChange()
}
}
loading.value = false;
@@ -350,7 +353,7 @@ const unbind = async (id: string) => {
);
if (resp.status === 200) {
onlyMessage('操作成功!', 'success');
- handleSearch(_properties.value);
+ handleSearch();
}
}
};
@@ -371,11 +374,14 @@ const onChannelChange = (_index: number, type: 'collector' | 'channel') => {
onMounted(() => {
getChannel();
- handleSearch(_properties.value);
+ handleSearch();
});
const onPageChange = () => {
- handleSearch(_properties.value);
+ const _cur = current.value >= 1 ? current.value : 1;
+ const _pageSize = pageSize.value
+ const array = data.value.slice((_cur - 1) * _pageSize, _cur * _pageSize) || [];
+ modelRef.dataSource = array;
};
const onSave = () => {
diff --git a/src/views/device/Instance/Detail/Info/components/Config/index.vue b/src/views/device/Instance/Detail/Info/components/Config/index.vue
index 7de56f52..7fd6e1d2 100644
--- a/src/views/device/Instance/Detail/Info/components/Config/index.vue
+++ b/src/views/device/Instance/Detail/Info/components/Config/index.vue
@@ -69,11 +69,11 @@
>
{{
- item.type.elements?.filter((i)=>
+ item.type.elements?.find((i)=>
i.value === instanceStore.current?.configuration?.[
item.property
]
- )[0].text
+ )?.text || ''
}}
{{
- item.type.elements?.filter((i)=>
- i.value === instanceStore.current?.configuration?.[
- item.property
- ]
- )[0].text
+ instanceStore.current?.configuration?.[item.property] ||
+ ''
}}
{
onlyMessage('文件内容不能为空','error')
return false;
}
- try {
const data = JSON.parse(text);
// 设置导入的产品状态为未发布
data.state = 0;
-
if (Array.isArray(data)) {
onlyMessage('请上传正确格式文件', 'error');
return false;
@@ -418,10 +416,6 @@ const beforeUpload = (file: any) => {
tableRef.value?.reload();
}
return true;
- } catch(e) {
- onlyMessage('请上传正确格式文件', 'error');
- }
- return true;
};
return false;
};
diff --git a/src/views/home/components/BootCardSmall.vue b/src/views/home/components/BootCardSmall.vue
index 49995b67..52b6bc8f 100644
--- a/src/views/home/components/BootCardSmall.vue
+++ b/src/views/home/components/BootCardSmall.vue
@@ -17,7 +17,7 @@