hanzhengzheng/screenFront
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/645deca397d94d909e439238/iotplatform_sourcecode/screenFront into dismap

Browse Source
This commit is contained in:
hzz 2023-05-23 18:46:50 +08:00
commit 0f9feb98df
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/electronicControl/childContent/left.vue
View File

@ -73,7 +73,7 @@ let tabledata = reactive({
t('messages.DevName'), t('messages.DevName'),
t('messages.type'), t('messages.type'),
t('messages.DevStatus'), t('messages.DevStatus'),
t('messages.RunTime'), `${t('messages.RunTime')}`,
// "设备信号", // "设备信号",
], ],
data: [], data: [],
@ -120,7 +120,7 @@ function changedevlist(val: any) {
res.name, res.name,
res.devType, res.devType,
JSON.parse(res.devstatus) ? t('messages.onLine') : t('messages.offline'), JSON.parse(res.devstatus) ? t('messages.onLine') : t('messages.offline'),
'1' `${res.runTime}min`
]); ]);
}); });
@ -128,7 +128,7 @@ function changedevlist(val: any) {
tabledata.data.rowNum = val.length < 10 ? val.length : 10; tabledata.data.rowNum = val.length < 10 ? val.length : 10;
tabledata.data.waitTime = 3000; tabledata.data.waitTime = 3000;
// tabledata.data.columnWidth=[90,115,115,115,115] // tabledata.data.columnWidth=[90,115,115,115,115]
listWH.width ? tabledata.data.columnWidth = [listWH.width * 0.12, listWH.width * 0.30, listWH.width * 0.15, listWH.width * 0.21] : '' listWH.width ? tabledata.data.columnWidth = [listWH.width * 0.12, listWH.width * 0.30, listWH.width * 0.15, listWH.width * 0.18] : ''
tableref.value.changeData(tabledata.data); tableref.value.changeData(tabledata.data);
} }
function setDataList(val: any) { function setDataList(val: any) {

2
src/views/index.vue
View File

@ -19,7 +19,7 @@
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item :class="'简体中文' == lang?'select':'' " command="简体中文">简体中文</el-dropdown-item> <el-dropdown-item :class="'简体中文' == lang?'select':'' " command="简体中文">简体中文</el-dropdown-item>
<el-dropdown-item :class="'English/USD' == lang?'select':'' " command="English/USD">English/USD</el-dropdown-item> <el-dropdown-item :class="'English/USD' == lang?'select':'' " command="English/USD">English</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</template> </template>
</el-dropdown> </el-dropdown>