diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index 07474112..a81b7ac9 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -351,7 +351,9 @@ module.exports = { growthStage: "Growth Stage", operations: "Operations", edit: "Edit", - delete: "Delete" + delete: "Delete", + + role:'Role', }, dialog: { title: "Edit", @@ -454,6 +456,7 @@ module.exports = { nickname: "Nickname", phone: "Phone Number", changePassword: "Change Password", + role:'Role', }, dialogs: { diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js index 8fe0e09c..29c27309 100644 --- a/src/i18n/lang/zh.js +++ b/src/i18n/lang/zh.js @@ -360,7 +360,8 @@ module.exports = { growthStage: "生长阶段", operations: "操作", edit: "编辑", - delete: "删除" + delete: "删除", + role:'角色', }, dialog: { title: "编辑", @@ -464,6 +465,7 @@ module.exports = { changePassword: "修改密码", deviceCode: "设备code码", deviceType: "设备类型", + role:'角色', }, dialogs: { diff --git a/src/views/manage/deviceManage.vue b/src/views/manage/deviceManage.vue index cb1cd159..988e1537 100644 --- a/src/views/manage/deviceManage.vue +++ b/src/views/manage/deviceManage.vue @@ -232,7 +232,6 @@ export default { }, deviceType: "", - deviceSel: [], }; }, computed:{ diff --git a/src/views/manage/userInfoControl.vue b/src/views/manage/userInfoControl.vue index 237e21cb..8b64c9fe 100644 --- a/src/views/manage/userInfoControl.vue +++ b/src/views/manage/userInfoControl.vue @@ -225,10 +225,7 @@ export default { "id": '' }, confirmPwd: '', - typeSelList: [], - deviceType:'', - deviceSel: [], } }, computed:{ diff --git a/vue.config.js b/vue.config.js index 6cfc47b0..5ced73b8 100644 --- a/vue.config.js +++ b/vue.config.js @@ -44,9 +44,9 @@ module.exports = { }, proxy: { "/api": { - // target: 'https://api.lihe-control.com', //地址 + target: 'https://api.lihe-control.com', //地址 // target: 'http://jiaxingtest.a1.luyouxia.net:21114', //地址 - target: 'http://jiaxingtest.e1.luyouxia.top:19159', //地址 + // target: 'http://jiaxingtest.e1.luyouxia.top:19159', //地址 // target: 'http://jiaxingtest.a1.luyouxia.net:25762', //地址 changeOrigin: true, pathRewrite: {