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

fix: 运行状态修改

This commit is contained in:
100011797 2023-06-05 11:29:10 +08:00
parent 89458dbf96
commit a02e4efa51
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,6 +251,7 @@ const subscribeProperty = () => {
}; };
const getDashboard = async () => { const getDashboard = async () => {
if(!dataSource.value?.length) return
const param = [ const param = [
{ {
dashboard: 'device', dashboard: 'device',
@ -302,9 +303,10 @@ const query = (params: Record<string, any>) =>
}); });
arr = _.cloneDeep(li); arr = _.cloneDeep(li);
} }
dataSource.value = arr.slice(_from, _to)
resolve({ resolve({
result: { result: {
data: arr.slice(_from, _to), data: dataSource.value,
pageIndex: params.pageIndex || 0, pageIndex: params.pageIndex || 0,
pageSize: params.pageSize || 12, pageSize: params.pageSize || 12,
total: arr.length, total: arr.length,

2
src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
View File

@ -274,7 +274,7 @@ const getUser = async (_source: string, _triggerType: string) => {
children: relationResp.result.map((item: any) => { children: relationResp.result.map((item: any) => {
const obj = { const obj = {
...item, ...item,
value: item.id, value: item.relation,
key: item.id, key: item.id,
title: item.name, title: item.name,
isRelation: true, isRelation: true,