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

fix: bug#15968

This commit is contained in:
XieYongHong 2023-07-15 18:58:54 +08:00
parent 635fd513fc
commit e985249876
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/device/Instance/Import/file.vue
View File

@ -118,12 +118,12 @@ const beforeUpload = (_file: any) => {
const isXlsx =
_file.type ===
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
if (!isCsv) {
onlyMessage('请上传.csv格式文件', 'warning');
}
if (!isXlsx) {
onlyMessage('请上传.xlsx格式文件', 'warning');
if (!isCsv && !isXlsx) {
onlyMessage('请上传.xlsx或.csv格式文件', 'warning');
}
// if (!isXlsx) {
// onlyMessage('请上传.xlsx格式文件', 'warning');
// }
// return (isCsv && fileType !== 'xlsx') || (isXlsx && fileType !== 'csv');
return isCsv || isXlsx;
};

15
src/views/init-home/data/baseMenu.ts
View File

@ -973,10 +973,6 @@ export default [
permission: 'gb28181-cascade',
actions: ['query'],
},
{
permission: 'plugin-driver',
actions: ['query'],
},
],
},
{
@ -1019,10 +1015,6 @@ export default [
permission: 'gb28181-cascade',
actions: ['query'],
},
{
permission: 'plugin-driver',
actions: ['query'],
},
],
},
],
@ -1437,7 +1429,12 @@ export default [
url: '/iot/link/plugin',
icon: 'BoxPlotOutlined',
showPage: ['plugin-driver'],
permissions: [],
permissions: [
{
permission: 'plugin-driver',
actions: ['query'],
},
],
buttons: [
{
id: 'view',

4
yarn.lock
View File

@ -3837,8 +3837,8 @@ jetlinks-ui-components@^1.0.23:
jetlinks-ui-components@^1.0.24:
version "1.0.24"
resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#a1262b3a735a01cd1fd9801406d16291b5070367"
integrity sha512-P4aolPQb1/wq4edN0AZ6WSavVAvQ+KEOEFzAarL/0dy6Oz3tTVemZmtgu20TsGbrNnEe/LheMu0QpvmkOq+3dg==
resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#e15551fb114e4cb8752db962423b3ca17d9389c1"
integrity sha512-TGyQ9SmdkoNkZScfYvfBF1/P1oBzXkxMuzR+DiNnof6CbSlYfPrkRsJIpOIZUjqg2o/6dyKLDK8gOxbxWm8wjA==
dependencies:
"@vueuse/core" "^9.12.0"
"@vueuse/router" "^9.13.0"