diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 9875096..8a79fd1 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -2,7 +2,7 @@ - + {{ generateTitle(item.meta.title) }} {{ generateTitle(item.meta.title) }} diff --git a/src/lang/en.js b/src/lang/en.js index 3e66d3d..21e9b79 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -25,22 +25,22 @@ export default { logIn: 'Login', register: 'Register', logCancel: 'Cancel', - username: 'UserName', + username: 'Username', password: 'Password', any: 'any', thirdparty: 'Or connect with', thirdpartyTips: - 'Can not be simulated on local, so please combine you own business simulation! ! !', + 'Can not be simulated on local, so please combine you own business simulation!', confirmLogout: 'Confirm Logout', loggedOut: 'You have been logged out, you can cancel to stay on this page or log in again!', toLogin: 'To Login', changePassword: 'Change Password', changePasswordTip: - 'Detected that the password is too weak or has expired. Please modify the password before logging in', + 'Detected that the password is too weak or has expired. Please modify the password before logging in.', changePasswordMsg: - 'Password expired, please modify the password before logging in!', - upDateMsg: 'Firmware is being upgraded, please wait for a while。' + 'Password expired, please modify the password before logging in.', + upDateMsg: 'Firmware is being updated, please wait for a while.' }, table: { productName: 'Product Name', @@ -51,20 +51,20 @@ export default { deviceIP: 'Terminal IP', gatewal: 'Gateway', suonetMask: 'Subnet Mask', - storageSpaces: 'Storage Spaces', + storageSpaces: 'Storage Capacity', serverIP: 'Server IP', - corverCommandDort: 'Server Command Port', - deviceCommandPort: 'Terminal Command Port', - deviceStreamPort: 'Terminal Code Stream Port', + corverCommandDort: 'Server Port', + deviceCommandPort: 'Terminal Port', + deviceStreamPort: 'Terminal Stream Port', macAddress: 'MAC Address', serverPort: 'Server Port', - isEmpty: ' cannot be empty', + isEmpty: ' cannot be empty.', isRight: ' is invalid.', isRight1: ' is out of range (10000-49999).', isRight2: ' is out of range (1000-9999).', isRight3: ' is out of range (1-9999).', open: 'Enable', - close: 'Disable', + close: 'Close', save: 'Save', submit: 'Submit', toTop: 'Back to top', @@ -77,8 +77,8 @@ export default { factorySettings: 'Restore Factory Settings', routerRestart: 'Reboot The Device', SIPserver: 'SIP Server IP', - SIPUserName: 'SIP UserName', - SIPPassword: 'SIP PassWord', + SIPUserName: 'SIP Username', + SIPPassword: 'SIP Password', programTip: 'Tip: the total size of uploaded files cannot exceed the capacity of the device storage space!', firmwareUpdateTip: @@ -86,12 +86,12 @@ export default { factoryTip: 'After returning to the factory setting, the configuration of the device will return to the factory state. Please use with caution!', routerRestartTips: - 'The device is about to reboot. Are you sure to continue！', - programDeteleTip: 'Confirm to delete this file！', - logDeteleTip: 'Confirm to delete this log！', - freeSpace: 'Free Space', + 'The device is about to reboot. Are you sure to continue!', + programDeteleTip: 'Confirm to delete this file!', + logDeteleTip: 'Confirm to delete this log!', + freeSpace: 'Available Space', chooseFile: 'Upgrade File', - microphoneSwitch: 'Microphone Switch', + microphoneSwitch: 'Microphone Input', factorySettingsTips: 'The default IP address of the device in the factory state is 192.168.1.108. After the restoration, you need to log in again.', fileUpload: 'File uploading...', @@ -141,14 +141,14 @@ export default { updateFileTypeTip: 'The uploaded file can only be in Bin format！', fileSurplusSizeTip: 'Insufficient remaining storage space！', upDateTip: 'Please select a file before upgrading!', - audio: 'AudioFormat', - playStatus: 'Playing status', + audio: 'Audio Format', + playStatus: 'Status', aoVol: 'Play Volume', aiVol: 'Recording Volume', auth: 'Authentication', - httpAuth: 'Http Authentication', + httpAuth: 'HTTP Authentication', warningTitle: 'Alarm File', warningFormTitle: 'AlarmIn', @@ -165,10 +165,10 @@ export default { sleCode: 'Login expired, please login again.', // 402code lllCode: 'The password is too weak, please change it.', // 600code llyCode: 'The firmware is being updated, please wait.', // 601code - lleCode: '用户登录名称/密码错误.', // 602code + lleCode: 'The username or password is incorrect.', // 602code llsCode: 'Too many failed login attempts, the account has been locked (30 minutes).', // 603code - llssCode: 'The account has been logged in elsewhere. Do you want to force logout?.', // 604code - lylCode: 'The old password is wrong.', // 610code + llssCode: 'The account has been logged in elsewhere. Do you want to force login?', // 604code + lylCode: 'The old password is incorrect.', // 610code lyyCode: 'The new password must be different from the old password.', // 611code lelCode: 'The file upload failed because it cannot be played.', // 620code leyCode: 'The file upload failed because a file with the same name already exists.', // 621code @@ -177,8 +177,8 @@ export default { lessCode: 'Failed to rename, please avoid using special characters.', // 624Code lewCode: 'Failed to delete, because the file is playing.', // 625Code - lslCode: '节目文件开始播放失败，节目已在播放中.', // 630code - lsyCode: '节目文件停止播放失败，节目未在播放中.', // 631code + lslCode: 'Failed to start playing, because the file is already playing.', // 630code + lsyCode: 'Failed to stop playing, because the file is not playing.', // 631code lsslCode: 'The firmware update has not started.', // 640code lssyCode: 'The firmware is being updated, please wait.', // 641code lsseCode: 'The firmware update completed, the device will reboot soon.', // 642code @@ -224,20 +224,20 @@ export default { password2: 'Confirm Password', update: 'Update', oldPassword: 'Please enter your old password！', - newPassword: 'Please enter a new password！', - newPassword2: 'Please enter the new password again！', - passwordDifferent: 'The two password entered is inconsistent！', + newPassword: 'Please enter a new password!', + newPassword2: 'Please enter the new password again!', + passwordDifferent: 'The two password entered is inconsistent!', newAndOldPassword: - 'Operation exception: the new password is the same as the old password', - updatePasswordSuccess: 'User password updated successfully', - passwordLengthError: 'Enter a password of at least 8 digits', + 'Operation exception: the new password is the same as the old password.', + updatePasswordSuccess: 'Password updated successfully.', + passwordLengthError: 'Enter a password of at least 8 digits.', passwordStrongError: 'The Password strength is insufficient. Please ensure that the length is at least 8 digits and at most 16 digits, and must contain at least three of numbers, Minuscule, uppercase letters, and special symbols!', confirmPassword: 'Confirm Password', - inputusername: 'Please enter your username!', - inputpassword: 'Please enter the password！', - inputpassword2: 'Please enter the password again！', - registerSuccess: 'User registration successful！', - gologin: 'Do you want to login？' + inputusername: 'Please enter the username!', + inputpassword: 'Please enter the password!', + inputpassword2: 'Please enter the password again!', + registerSuccess: 'User registration successful!', + gologin: 'Do you want to login?' } } diff --git a/src/lang/pt.js b/src/lang/pt.js index f58937f..a876c36 100644 --- a/src/lang/pt.js +++ b/src/lang/pt.js @@ -63,7 +63,7 @@ export default { isRight2: 'está fora do intervalo (1000-9999).', isRight3: 'está fora do intervalo (1-9999).', open: 'Ativar', - close: 'Desativar', + close: 'Fechar', save: 'Salvar', submit: 'Enviar', toTop: 'Voltar ao topo', diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index f87b70b..04c842d 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -56,6 +56,9 @@ export default { // TODO: refactor with render function this.onlyOneChild = null return {} + }, + mounted() { + }, methods: { hasOneShowingChild(children = [], parent) { diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 225e27a..862c778 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -12,7 +12,12 @@ :collapse-transition="false" mode="vertical" > - + @@ -26,11 +31,21 @@ import variables from '@/styles/variables.scss' export default { components: { SidebarItem, Logo }, + mounted(){ + console.log(this.permission_routes); + // if(this.alarmPage === 'off'){ + // + // } + }, computed: { ...mapGetters([ 'permission_routes', - 'sidebar' + 'sidebar', + 'alarmPage' ]), + filteredRoutes() { + return this.permission_routes + }, activeMenu() { const route = this.$route const { meta, path } = route diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index de91749..a237dc8 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -29,6 +29,7 @@ import ScrollPane from './ScrollPane' import { generateTitle } from '@/utils/i18n' import path from 'path' +import { mapGetters } from 'vuex' export default { components: { ScrollPane }, @@ -42,6 +43,9 @@ export default { } }, computed: { + ...mapGetters([ + 'alarmPage' + ]), visitedViews() { return this.$store.state.tagsView.visitedViews }, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index da6f9bc..94748de 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -20,7 +20,7 @@ const mutations = { }, SET_LOGIN_DATA: (state, data) => { state.loginData = data - console.log(state, data.udpPage) + console.log(state, data) setLoginData(data) }, SET_KEY: (state, key) => { @@ -56,7 +56,10 @@ const actions = { commit('SET_TOKEN', data.token) commit('SET_NAME', username) data.menuRole = 1 - if (data.alarmPage === 'off') data.menuRole = 2 + if (data.alarmPage !== 'off') { + data.menuRole = 2 + // console.log('data.alarmPage',data.alarmPage) + } commit('SET_LOGIN_DATA', data) if (response.code === 200) { resolve() diff --git a/vue.config.js b/vue.config.js index 1ea52e9..48170d6 100644 --- a/vue.config.js +++ b/vue.config.js @@ -87,7 +87,7 @@ module.exports = { // before: require('./mock/mock-server.js'), proxy: { '/dev-api': { - target: 'http://192.168.1.190:8080', // http://127.0.0.1:8080 + target: 'http://127.0.0.1:8080', // http://127.0.0.1:8080 secure: true, // 如果是https接口，需要配置这个参数 changeOrigin: true, // 如果接口跨域，需要进行这个参数配置 pathRewrite: { '^/dev-api': '' }