diff --git a/src/views/alarmGroup/components/addUser.vue b/src/views/alarmGroup/components/addUser.vue index ff34176..42c473e 100644 --- a/src/views/alarmGroup/components/addUser.vue +++ b/src/views/alarmGroup/components/addUser.vue @@ -68,7 +68,7 @@ endTime: '', deptid: '', offset: 1, - limit: 5, + limit: 10, sort: 'id' }, form: { // 表单 diff --git a/src/views/alarmGroup/components/addUser.vue b/src/views/alarmGroup/components/addUser.vue index ff34176..42c473e 100644 --- a/src/views/alarmGroup/components/addUser.vue +++ b/src/views/alarmGroup/components/addUser.vue @@ -68,7 +68,7 @@ endTime: '', deptid: '', offset: 1, - limit: 5, + limit: 10, sort: 'id' }, form: { // 表单 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index f0dd07e..e817322 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -73,7 +73,7 @@ endTime: '', deptid: '', offset: 1, - limit: 5, + limit: 10, sort: 'id' }, form: { // 表单 diff --git a/src/views/alarmGroup/components/addUser.vue b/src/views/alarmGroup/components/addUser.vue index ff34176..42c473e 100644 --- a/src/views/alarmGroup/components/addUser.vue +++ b/src/views/alarmGroup/components/addUser.vue @@ -68,7 +68,7 @@ endTime: '', deptid: '', offset: 1, - limit: 5, + limit: 10, sort: 'id' }, form: { // 表单 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index f0dd07e..e817322 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -73,7 +73,7 @@ endTime: '', deptid: '', offset: 1, - limit: 5, + limit: 10, sort: 'id' }, form: { // 表单 diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue index 5a66680..304a4fd 100644 --- a/src/views/layout/components/Sidebar/SidebarItem.vue +++ b/src/views/layout/components/Sidebar/SidebarItem.vue @@ -74,7 +74,6 @@ return true } }) - // When there is only one child router, the child router is displayed by default if (showingChildren.length === 1) { return true diff --git a/src/views/alarmGroup/components/addUser.vue b/src/views/alarmGroup/components/addUser.vue index ff34176..42c473e 100644 --- a/src/views/alarmGroup/components/addUser.vue +++ b/src/views/alarmGroup/components/addUser.vue @@ -68,7 +68,7 @@ endTime: '', deptid: '', offset: 1, - limit: 5, + limit: 10, sort: 'id' }, form: { // 表单 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index f0dd07e..e817322 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -73,7 +73,7 @@ endTime: '', deptid: '', offset: 1, - limit: 5, + limit: 10, sort: 'id' }, form: { // 表单 diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue index 5a66680..304a4fd 100644 --- a/src/views/layout/components/Sidebar/SidebarItem.vue +++ b/src/views/layout/components/Sidebar/SidebarItem.vue @@ -74,7 +74,6 @@ return true } }) - // When there is only one child router, the child router is displayed by default if (showingChildren.length === 1) { return true diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue index 0d1364e..ef41306 100644 --- a/src/views/overview/overviewBdOffline.vue +++ b/src/views/overview/overviewBdOffline.vue @@ -445,7 +445,8 @@ // 获取token保存到vuex中的用户信息，此处仅适用于本项目，注意删除或修改 // 实例化socket，这里我把用户名传给了后台，使后台能判断要把消息发给哪个用户，其实也可以后台直接获取用户IP来判断并推送 // const socketUrl = 'ws://192.168.0.203:9100/army/webSocket/' + this.$store.getters.username - const socketUrl = 'ws://111.198.10.15:11707/army/webSocket/' + this.$store.getters.username + // const socketUrl = 'ws://111.198.10.15:11707/army/webSocket/' + this.$store.getters.username + const socketUrl = 'ws://10.9.39.8:8080/army/webSocket/' + this.$store.getters.username // const socketUrl = 'ws://127.0.0.1:8090/ws/' + this.$store.getters.username console.log(socketUrl) this.socket = new WebSocket(socketUrl) diff --git a/src/views/alarmGroup/components/addUser.vue b/src/views/alarmGroup/components/addUser.vue index ff34176..42c473e 100644 --- a/src/views/alarmGroup/components/addUser.vue +++ b/src/views/alarmGroup/components/addUser.vue @@ -68,7 +68,7 @@ endTime: '', deptid: '', offset: 1, - limit: 5, + limit: 10, sort: 'id' }, form: { // 表单 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index f0dd07e..e817322 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -73,7 +73,7 @@ endTime: '', deptid: '', offset: 1, - limit: 5, + limit: 10, sort: 'id' }, form: { // 表单 diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue index 5a66680..304a4fd 100644 --- a/src/views/layout/components/Sidebar/SidebarItem.vue +++ b/src/views/layout/components/Sidebar/SidebarItem.vue @@ -74,7 +74,6 @@ return true } }) - // When there is only one child router, the child router is displayed by default if (showingChildren.length === 1) { return true diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue index 0d1364e..ef41306 100644 --- a/src/views/overview/overviewBdOffline.vue +++ b/src/views/overview/overviewBdOffline.vue @@ -445,7 +445,8 @@ // 获取token保存到vuex中的用户信息，此处仅适用于本项目，注意删除或修改 // 实例化socket，这里我把用户名传给了后台，使后台能判断要把消息发给哪个用户，其实也可以后台直接获取用户IP来判断并推送 // const socketUrl = 'ws://192.168.0.203:9100/army/webSocket/' + this.$store.getters.username - const socketUrl = 'ws://111.198.10.15:11707/army/webSocket/' + this.$store.getters.username + // const socketUrl = 'ws://111.198.10.15:11707/army/webSocket/' + this.$store.getters.username + const socketUrl = 'ws://10.9.39.8:8080/army/webSocket/' + this.$store.getters.username // const socketUrl = 'ws://127.0.0.1:8090/ws/' + this.$store.getters.username console.log(socketUrl) this.socket = new WebSocket(socketUrl) diff --git a/src/views/system/role/functionPerm.vue b/src/views/system/role/functionPerm.vue index cdc85b5..28bc936 100644 --- a/src/views/system/role/functionPerm.vue +++ b/src/views/system/role/functionPerm.vue @@ -76,7 +76,7 @@ funcAuthor(this.roleId, this.ids).then(response => { if (response.code === 200) { this.dialogLoading = false - this.$message.success('权限配置成功') + this.$message.success('功能权限配置成功') this.dialogFormVisible = false } })