From 8f24377b0da710bc78e3689e7fdebea9c2d37995 Mon Sep 17 00:00:00 2001 From: douyage Date: Thu, 22 Oct 2026 10:08:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9A=84=E6=89=80=E6=9C=89=E4=BF=AE=E6=94=B9=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE=E5=92=8C=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91=E7=9A=84=E9=80=8F=E6=98=8E?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/config.js | 10 +- src/api/system/dept.js | 8 +- src/api/system/dict/data.js | 8 +- src/api/system/dict/type.js | 10 +- src/api/system/menu.js | 10 +- src/api/system/notice.js | 8 +- src/api/system/post.js | 8 +- src/api/system/role.js | 20 +-- src/api/system/user.js | 22 +-- src/assets/styles/ruoyi.scss | 11 +- .../portal/components/PortalDeviceTree.vue | 5 +- src/views/portal/index.vue | 157 +++++++++++++++--- src/views/system/user/index.vue | 11 ++ 13 files changed, 213 insertions(+), 75 deletions(-) diff --git a/src/api/system/config.js b/src/api/system/config.js index 32f509c..cf8c8f7 100644 --- a/src/api/system/config.js +++ b/src/api/system/config.js @@ -37,8 +37,8 @@ export function addConfig(data) { // 修改参数配置 export function updateConfig(data) { return request({ - url: '/system/config', - method: 'put', + url: '/system/config/edit', + method: 'post', data: data }) } @@ -46,8 +46,8 @@ export function updateConfig(data) { // 删除参数配置 export function delConfig(configId) { return request({ - url: '/system/config/' + configId, - method: 'delete' + url: '/system/config/remove/' + configId, + method: 'post' }) } @@ -55,7 +55,7 @@ export function delConfig(configId) { export function refreshCache() { return request({ url: '/system/config/refreshCache', - method: 'delete' + method: 'post' }) } // 批量获取参数配置 diff --git a/src/api/system/dept.js b/src/api/system/dept.js index fc943cd..c773877 100644 --- a/src/api/system/dept.js +++ b/src/api/system/dept.js @@ -37,8 +37,8 @@ export function addDept(data) { // 修改部门 export function updateDept(data) { return request({ - url: '/system/dept', - method: 'put', + url: '/system/dept/edit', + method: 'post', data: data }) } @@ -46,7 +46,7 @@ export function updateDept(data) { // 删除部门 export function delDept(deptId) { return request({ - url: '/system/dept/' + deptId, - method: 'delete' + url: '/system/dept/remove/' + deptId, + method: 'post' }) } \ No newline at end of file diff --git a/src/api/system/dict/data.js b/src/api/system/dict/data.js index 6c9eb79..7787104 100644 --- a/src/api/system/dict/data.js +++ b/src/api/system/dict/data.js @@ -37,8 +37,8 @@ export function addData(data) { // 修改字典数据 export function updateData(data) { return request({ - url: '/system/dict/data', - method: 'put', + url: '/system/dict/data/edit', + method: 'post', data: data }) } @@ -46,7 +46,7 @@ export function updateData(data) { // 删除字典数据 export function delData(dictCode) { return request({ - url: '/system/dict/data/' + dictCode, - method: 'delete' + url: '/system/dict/data/remove/' + dictCode, + method: 'post' }) } diff --git a/src/api/system/dict/type.js b/src/api/system/dict/type.js index a7a6e01..70e9b69 100644 --- a/src/api/system/dict/type.js +++ b/src/api/system/dict/type.js @@ -29,8 +29,8 @@ export function addType(data) { // 修改字典类型 export function updateType(data) { return request({ - url: '/system/dict/type', - method: 'put', + url: '/system/dict/type/edit', + method: 'post', data: data }) } @@ -38,8 +38,8 @@ export function updateType(data) { // 删除字典类型 export function delType(dictId) { return request({ - url: '/system/dict/type/' + dictId, - method: 'delete' + url: '/system/dict/type/remove/' + dictId, + method: 'post' }) } @@ -47,7 +47,7 @@ export function delType(dictId) { export function refreshCache() { return request({ url: '/system/dict/type/refreshCache', - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/menu.js b/src/api/system/menu.js index f6415c6..446e6a3 100644 --- a/src/api/system/menu.js +++ b/src/api/system/menu.js @@ -20,7 +20,7 @@ export function getMenu(menuId) { // 查询菜单下拉树结构 export function treeselect() { return request({ - url: '/system/menu/treeselect', + url: '/system/menu/filterTreeselect', method: 'get' }) } @@ -45,8 +45,8 @@ export function addMenu(data) { // 修改菜单 export function updateMenu(data) { return request({ - url: '/system/menu', - method: 'put', + url: '/system/menu/edit', + method: 'post', data: data }) } @@ -54,7 +54,7 @@ export function updateMenu(data) { // 删除菜单 export function delMenu(menuId) { return request({ - url: '/system/menu/' + menuId, - method: 'delete' + url: '/system/menu/remove/' + menuId, + method: 'post' }) } \ No newline at end of file diff --git a/src/api/system/notice.js b/src/api/system/notice.js index c274ea5..a5486be 100644 --- a/src/api/system/notice.js +++ b/src/api/system/notice.js @@ -29,8 +29,8 @@ export function addNotice(data) { // 修改公告 export function updateNotice(data) { return request({ - url: '/system/notice', - method: 'put', + url: '/system/notice/edit', + method: 'post', data: data }) } @@ -38,7 +38,7 @@ export function updateNotice(data) { // 删除公告 export function delNotice(noticeId) { return request({ - url: '/system/notice/' + noticeId, - method: 'delete' + url: '/system/notice/remove/' + noticeId, + method: 'post' }) } \ No newline at end of file diff --git a/src/api/system/post.js b/src/api/system/post.js index 1a8e9ca..3794cd7 100644 --- a/src/api/system/post.js +++ b/src/api/system/post.js @@ -29,8 +29,8 @@ export function addPost(data) { // 修改岗位 export function updatePost(data) { return request({ - url: '/system/post', - method: 'put', + url: '/system/post/edit', + method: 'post', data: data }) } @@ -38,7 +38,7 @@ export function updatePost(data) { // 删除岗位 export function delPost(postId) { return request({ - url: '/system/post/' + postId, - method: 'delete' + url: '/system/post/remove/' + postId, + method: 'post' }) } diff --git a/src/api/system/role.js b/src/api/system/role.js index f13e6f4..2b28b4b 100644 --- a/src/api/system/role.js +++ b/src/api/system/role.js @@ -29,8 +29,8 @@ export function addRole(data) { // 修改角色 export function updateRole(data) { return request({ - url: '/system/role', - method: 'put', + url: '/system/role/edit', + method: 'post', data: data }) } @@ -39,7 +39,7 @@ export function updateRole(data) { export function dataScope(data) { return request({ url: '/system/role/dataScope', - method: 'put', + method: 'post', data: data }) } @@ -52,7 +52,7 @@ export function changeRoleStatus(roleId, status) { } return request({ url: '/system/role/changeStatus', - method: 'put', + method: 'post', data: data }) } @@ -60,8 +60,8 @@ export function changeRoleStatus(roleId, status) { // 删除角色 export function delRole(roleId) { return request({ - url: '/system/role/' + roleId, - method: 'delete' + url: '/system/role/remove/' + roleId, + method: 'post' }) } @@ -87,7 +87,7 @@ export function unallocatedUserList(query) { export function authUserCancel(data) { return request({ url: '/system/role/authUser/cancel', - method: 'put', + method: 'post', data: data }) } @@ -96,7 +96,7 @@ export function authUserCancel(data) { export function authUserCancelAll(data) { return request({ url: '/system/role/authUser/cancelAll', - method: 'put', + method: 'post', params: data }) } @@ -105,7 +105,7 @@ export function authUserCancelAll(data) { export function authUserSelectAll(data) { return request({ url: '/system/role/authUser/selectAll', - method: 'put', + method: 'post', params: data }) } @@ -113,7 +113,7 @@ export function authUserSelectAll(data) { // 根据角色ID查询部门树结构 export function deptTreeSelect(roleId) { return request({ - url: '/system/role/deptTree/' + roleId, + url: '/system/dept/roleDeptTreeselect/' + roleId, method: 'get' }) } diff --git a/src/api/system/user.js b/src/api/system/user.js index b5e3edd..8ab2739 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -30,8 +30,8 @@ export function addUser(data) { // 修改用户 export function updateUser(data) { return request({ - url: '/system/user', - method: 'put', + url: '/system/user/edit', + method: 'post', data: data }) } @@ -39,8 +39,8 @@ export function updateUser(data) { // 删除用户 export function delUser(userId) { return request({ - url: '/system/user/' + userId, - method: 'delete' + url: '/system/user/remove/' + userId, + method: 'post' }) } @@ -52,7 +52,7 @@ export function resetUserPwd(userId, password) { } return request({ url: '/system/user/resetPwd', - method: 'put', + method: 'post', data: data }) } @@ -65,7 +65,7 @@ export function changeUserStatus(userId, status) { } return request({ url: '/system/user/changeStatus', - method: 'put', + method: 'post', data: data }) } @@ -82,7 +82,7 @@ export function getUserProfile() { export function updateUserProfile(data) { return request({ url: '/system/user/profile', - method: 'put', + method: 'post', data: data }) } @@ -95,8 +95,8 @@ export function updateUserPwd(oldPassword, newPassword) { } return request({ url: '/system/user/profile/updatePwd', - method: 'put', - data: data + method: 'post', + params: data }) } @@ -122,7 +122,7 @@ export function getAuthRole(userId) { export function updateAuthRole(data) { return request({ url: '/system/user/authRole', - method: 'put', + method: 'post', params: data }) } @@ -130,7 +130,7 @@ export function updateAuthRole(data) { // 查询部门下拉树结构 export function deptTreeSelect() { return request({ - url: '/system/user/deptTree', + url: '/system/dept/treeselect', method: 'get' }) } diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 300b84a..7999230 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -670,7 +670,7 @@ table tbody tr > td { .el-tree { color: #dcecff; - // background-color: #0F124A !important; + background-color: transparent !important; } .el-tree-node__content { @@ -1353,6 +1353,15 @@ body .el-table .el-button:active { color: #43c0ff !important; } +body .el-table .el-button.el-button--text, +body .el-table .el-button.el-button--text:hover, +body .el-table .el-button.el-button--text:focus, +body .el-table .el-button.el-button--text:active { + background: transparent !important; + background-image: none !important; + border-color: transparent !important; +} + body .el-button.el-button--primary:not(:has(.el-icon-search)):hover, body .el-button.el-button--primary:not(:has(.el-icon-search)):focus, body .el-button.el-button--primary:not(:has(.el-icon-search)):active, diff --git a/src/views/portal/components/PortalDeviceTree.vue b/src/views/portal/components/PortalDeviceTree.vue index 6e5d2af..9fafbf5 100644 --- a/src/views/portal/components/PortalDeviceTree.vue +++ b/src/views/portal/components/PortalDeviceTree.vue @@ -81,7 +81,9 @@ export default { props: { selectedCode: { type: String, default: "" }, // 只跟首页场站选择，不吃动环巡检右上角的站 - stationCode: { type: String, default: "" } + stationCode: { type: String, default: "" }, + // 摄像头来源：动环 / 消防 / 安防；空表示不按来源过滤 + deviceSource: { type: String, default: "" } }, data() { return { @@ -127,6 +129,7 @@ export default { try { const query = { onlineStatus: this.onlineStatus, patroldeviceTypeFlag: "ipc" }; if (this.stationCode) query.stationCode = this.stationCode; + if (this.deviceSource) query.deviceSource = this.deviceSource; const response = await getChannelTree(query, { skipWorkspaceStation: true }); if (requestId !== this.treeRequestId) return; const nodes = Array.isArray(response && response.data) ? response.data : []; diff --git a/src/views/portal/index.vue b/src/views/portal/index.vue index 0fc6e98..94c382a 100644 --- a/src/views/portal/index.vue +++ b/src/views/portal/index.vue @@ -189,7 +189,13 @@
-
+
{{ item.value }}
@@ -245,9 +251,10 @@