diff --git a/ALOps_sys_fe/alops-ui/.env.development b/ALOps_sys_fe/alops-ui/.env.development index 3f80ff7a..cc67cd89 100644 --- a/ALOps_sys_fe/alops-ui/.env.development +++ b/ALOps_sys_fe/alops-ui/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 智能运维系统 +VUE_APP_TITLE = 中国烟草 # 开发环境配置 ENV = 'development' diff --git a/ALOps_sys_fe/alops-ui/.env.production b/ALOps_sys_fe/alops-ui/.env.production index 56677e2f..d23f04e4 100644 --- a/ALOps_sys_fe/alops-ui/.env.production +++ b/ALOps_sys_fe/alops-ui/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 智能运维管理系统 +VUE_APP_TITLE = 中国烟草 # 生产环境配置 ENV = 'production' diff --git a/ALOps_sys_fe/alops-ui/.env.staging b/ALOps_sys_fe/alops-ui/.env.staging index db7c620f..f38170fe 100644 --- a/ALOps_sys_fe/alops-ui/.env.staging +++ b/ALOps_sys_fe/alops-ui/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 智能运维系统 +VUE_APP_TITLE = 中国烟草 BABEL_ENV = production diff --git a/ALOps_sys_fe/alops-ui/package.json b/ALOps_sys_fe/alops-ui/package.json index ff74bf5a..9d2ddabc 100644 --- a/ALOps_sys_fe/alops-ui/package.json +++ b/ALOps_sys_fe/alops-ui/package.json @@ -1,7 +1,7 @@ { "name": "ruoyi", "version": "3.9.0", - "description": "智能运维系统", + "description": "中国烟草", "author": "若依", "license": "MIT", "scripts": { @@ -70,4 +70,4 @@ "> 1%", "last 2 versions" ] -} \ No newline at end of file +} diff --git a/ALOps_sys_fe/alops-ui/src/api/device/deviceInformation.js b/ALOps_sys_fe/alops-ui/src/api/device/deviceInformation.js index 16227644..198c5a64 100644 --- a/ALOps_sys_fe/alops-ui/src/api/device/deviceInformation.js +++ b/ALOps_sys_fe/alops-ui/src/api/device/deviceInformation.js @@ -1,130 +1,38 @@ import request from '@/utils/request' import { parseStrEmpty } from "@/utils/ruoyi"; +const api = '/equipment/' -// 查询用户列表 -export function listUser(query) { +// 立即执行 +export function protoCollect() { return request({ - url: '/system/user/list', - method: 'get', - params: query + url: api + 'protoCollect', + method: 'post' }) } - -// 查询用户详细 -export function getUser(userId) { - return request({ - url: '/system/user/' + parseStrEmpty(userId), - method: 'get' - }) -} - -// 新增用户 -export function addUser(data) { +// 定时采集规则添加 +export function addTimerRule(data) { return request({ - url: '/system/user', + url: api + 'addTimerRule', method: 'post', data: data }) } - -// 修改用户 -export function updateUser(data) { - return request({ - url: '/system/user', - method: 'put', - data: data - }) -} - -// 删除用户 -export function delUser(userId) { - return request({ - url: '/system/user/' + userId, - method: 'delete' - }) -} - -// 用户密码重置 -export function resetUserPwd(userId, password) { - const data = { - userId, - password - } - return request({ - url: '/system/user/resetPwd', - method: 'put', - data: data - }) -} - -// 用户状态修改 -export function changeUserStatus(userId, status) { - const data = { - userId, - status - } +// 查询规则 +export function queryTimerRule(data) { return request({ - url: '/system/user/changeStatus', - method: 'put', - data: data - }) -} - -// 查询用户个人信息 -export function getUserProfile() { - return request({ - url: '/system/user/profile', - method: 'get' - }) -} - -// 修改用户个人信息 -export function updateUserProfile(data) { - return request({ - url: '/system/user/profile', - method: 'put', - data: data - }) -} - -// 用户密码重置 -export function updateUserPwd(oldPassword, newPassword) { - const data = { - oldPassword, - newPassword - } - return request({ - url: '/system/user/profile/updatePwd', - method: 'put', + url: api + 'queryTimerRule', + method: 'post', data: data }) } - -// 用户头像上传 -export function uploadAvatar(data) { +// 修改规则 +export function modifyTimerRule(data) { return request({ - url: '/system/user/profile/avatar', + url: api + 'modifyTimerRule', method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, data: data }) } -// 查询授权角色 -export function getAuthRole(userId) { - return request({ - url: '/system/user/authRole/' + userId, - method: 'get' - }) -} - -// 保存授权角色 -export function updateAuthRole(data) { - return request({ - url: '/system/user/authRole', - method: 'put', - params: data - }) -} diff --git a/ALOps_sys_fe/alops-ui/src/api/device/deviceManufacturer.js b/ALOps_sys_fe/alops-ui/src/api/device/deviceManufacturer.js index 16227644..26a36a5c 100644 --- a/ALOps_sys_fe/alops-ui/src/api/device/deviceManufacturer.js +++ b/ALOps_sys_fe/alops-ui/src/api/device/deviceManufacturer.js @@ -1,130 +1,50 @@ import request from '@/utils/request' import { parseStrEmpty } from "@/utils/ruoyi"; +const api = '/equManufacture/' -// 查询用户列表 -export function listUser(query) { +// 查询详细 +export function getDict() { return request({ - url: '/system/user/list', - method: 'get', - params: query + url: '/sys_dict', + method: 'get' }) } -// 查询用户详细 -export function getUser(userId) { +// 查询列表 +export function list(query) { return request({ - url: '/system/user/' + parseStrEmpty(userId), - method: 'get' + url: api + 'queryByVO', + method: 'get', + params: query }) } -// 新增用户 -export function addUser(data) { +// 新增 +export function add(data) { return request({ - url: '/system/user', + url: api + 'add', method: 'post', data: data }) } -// 修改用户 -export function updateUser(data) { +// 修改 +export function update(data) { return request({ - url: '/system/user', + url: api + 'modify', method: 'put', data: data }) } -// 删除用户 -export function delUser(userId) { +// 删除 +export function del(id) { return request({ - url: '/system/user/' + userId, + url: api + 'delete' + id, method: 'delete' }) } -// 用户密码重置 -export function resetUserPwd(userId, password) { - const data = { - userId, - password - } - return request({ - url: '/system/user/resetPwd', - method: 'put', - data: data - }) -} -// 用户状态修改 -export function changeUserStatus(userId, status) { - const data = { - userId, - status - } - return request({ - url: '/system/user/changeStatus', - method: 'put', - data: data - }) -} - -// 查询用户个人信息 -export function getUserProfile() { - return request({ - url: '/system/user/profile', - method: 'get' - }) -} - -// 修改用户个人信息 -export function updateUserProfile(data) { - return request({ - url: '/system/user/profile', - method: 'put', - data: data - }) -} - -// 用户密码重置 -export function updateUserPwd(oldPassword, newPassword) { - const data = { - oldPassword, - newPassword - } - return request({ - url: '/system/user/profile/updatePwd', - method: 'put', - data: data - }) -} - -// 用户头像上传 -export function uploadAvatar(data) { - return request({ - url: '/system/user/profile/avatar', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: data - }) -} - -// 查询授权角色 -export function getAuthRole(userId) { - return request({ - url: '/system/user/authRole/' + userId, - method: 'get' - }) -} - -// 保存授权角色 -export function updateAuthRole(data) { - return request({ - url: '/system/user/authRole', - method: 'put', - params: data - }) -} diff --git a/ALOps_sys_fe/alops-ui/src/api/device/deviceType.js b/ALOps_sys_fe/alops-ui/src/api/device/deviceType.js index 16227644..552dc24a 100644 --- a/ALOps_sys_fe/alops-ui/src/api/device/deviceType.js +++ b/ALOps_sys_fe/alops-ui/src/api/device/deviceType.js @@ -1,130 +1,50 @@ import request from '@/utils/request' import { parseStrEmpty } from "@/utils/ruoyi"; +const api = '/equipmentType/' -// 查询用户列表 -export function listUser(query) { +// 查询详细 +export function getDict() { return request({ - url: '/system/user/list', - method: 'get', - params: query + url: '/sys_dict', + method: 'get' }) } -// 查询用户详细 -export function getUser(userId) { +// 查询列表 +export function list(query) { return request({ - url: '/system/user/' + parseStrEmpty(userId), - method: 'get' + url: api + 'queryByVO', + method: 'get', + params: query }) } -// 新增用户 -export function addUser(data) { +// 新增 +export function add(data) { return request({ - url: '/system/user', + url: api + 'add', method: 'post', data: data }) } -// 修改用户 -export function updateUser(data) { +// 修改 +export function update(data) { return request({ - url: '/system/user', + url: api + 'modify', method: 'put', data: data }) } -// 删除用户 -export function delUser(userId) { +// 删除 +export function del(id) { return request({ - url: '/system/user/' + userId, + url: api + 'delete' + id, method: 'delete' }) } -// 用户密码重置 -export function resetUserPwd(userId, password) { - const data = { - userId, - password - } - return request({ - url: '/system/user/resetPwd', - method: 'put', - data: data - }) -} -// 用户状态修改 -export function changeUserStatus(userId, status) { - const data = { - userId, - status - } - return request({ - url: '/system/user/changeStatus', - method: 'put', - data: data - }) -} - -// 查询用户个人信息 -export function getUserProfile() { - return request({ - url: '/system/user/profile', - method: 'get' - }) -} - -// 修改用户个人信息 -export function updateUserProfile(data) { - return request({ - url: '/system/user/profile', - method: 'put', - data: data - }) -} - -// 用户密码重置 -export function updateUserPwd(oldPassword, newPassword) { - const data = { - oldPassword, - newPassword - } - return request({ - url: '/system/user/profile/updatePwd', - method: 'put', - data: data - }) -} - -// 用户头像上传 -export function uploadAvatar(data) { - return request({ - url: '/system/user/profile/avatar', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: data - }) -} - -// 查询授权角色 -export function getAuthRole(userId) { - return request({ - url: '/system/user/authRole/' + userId, - method: 'get' - }) -} - -// 保存授权角色 -export function updateAuthRole(data) { - return request({ - url: '/system/user/authRole', - method: 'put', - params: data - }) -} diff --git a/ALOps_sys_fe/alops-ui/src/api/device/files.js b/ALOps_sys_fe/alops-ui/src/api/device/files.js index 16227644..2d1afa91 100644 --- a/ALOps_sys_fe/alops-ui/src/api/device/files.js +++ b/ALOps_sys_fe/alops-ui/src/api/device/files.js @@ -1,130 +1,58 @@ import request from '@/utils/request' import { parseStrEmpty } from "@/utils/ruoyi"; +const api = '/equipment/' -// 查询用户列表 -export function listUser(query) { +// 查询详细 +export function getDict() { return request({ - url: '/system/user/list', - method: 'get', - params: query - }) -} - -// 查询用户详细 -export function getUser(userId) { - return request({ - url: '/system/user/' + parseStrEmpty(userId), + url: '/sys_dict', method: 'get' }) } -// 新增用户 -export function addUser(data) { - return request({ - url: '/system/user', - method: 'post', - data: data - }) -} - -// 修改用户 -export function updateUser(data) { - return request({ - url: '/system/user', - method: 'put', - data: data - }) -} - -// 删除用户 -export function delUser(userId) { - return request({ - url: '/system/user/' + userId, - method: 'delete' - }) -} - -// 用户密码重置 -export function resetUserPwd(userId, password) { - const data = { - userId, - password - } +// 查询列表 +export function list(query) { return request({ - url: '/system/user/resetPwd', - method: 'put', - data: data - }) -} - -// 用户状态修改 -export function changeUserStatus(userId, status) { - const data = { - userId, - status - } - return request({ - url: '/system/user/changeStatus', - method: 'put', - data: data + url: api + 'queryByVO', + method: 'get', + params: query }) } -// 查询用户个人信息 -export function getUserProfile() { +// 查询详细 +export function getInfo(id) { return request({ - url: '/system/user/profile', + url: api + '/queryById/' + parseStrEmpty(id), method: 'get' }) } -// 修改用户个人信息 -export function updateUserProfile(data) { +// 新增 +export function add(data) { return request({ - url: '/system/user/profile', - method: 'put', + url: api + 'add', + method: 'post', data: data }) } -// 用户密码重置 -export function updateUserPwd(oldPassword, newPassword) { - const data = { - oldPassword, - newPassword - } +// 修改 +export function update(data) { return request({ - url: '/system/user/profile/updatePwd', + url: api + 'modify', method: 'put', data: data }) } -// 用户头像上传 -export function uploadAvatar(data) { +// 删除 +export function del(id) { return request({ - url: '/system/user/profile/avatar', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: data + url: api + 'delete' + id, + method: 'delete' }) } -// 查询授权角色 -export function getAuthRole(userId) { - return request({ - url: '/system/user/authRole/' + userId, - method: 'get' - }) -} -// 保存授权角色 -export function updateAuthRole(data) { - return request({ - url: '/system/user/authRole', - method: 'put', - params: data - }) -} diff --git a/ALOps_sys_fe/alops-ui/src/api/inMonitoring/devicesState.js b/ALOps_sys_fe/alops-ui/src/api/inMonitoring/devicesState.js index 16227644..80023725 100644 --- a/ALOps_sys_fe/alops-ui/src/api/inMonitoring/devicesState.js +++ b/ALOps_sys_fe/alops-ui/src/api/inMonitoring/devicesState.js @@ -1,5 +1,72 @@ import request from '@/utils/request' import { parseStrEmpty } from "@/utils/ruoyi"; +const api = '/equipment/' + +// 查询多台设备列表 +export function list(query) { + return request({ + url: api + 'queryByVO', + method: 'get', + params: query + }) +} + +// 查询单台设备 +export function getInfo(id) { + return request({ + url: api + '/queryById/' + parseStrEmpty(id), + method: 'get' + }) +} + +// 查询设备历史预警 +export function historyQuery(query) { + return request({ + url: '/alarm/historyQuery', + method: 'get', + params: query + }) +} + +// 查询接口信息 +export function interfaceQuery(query) { + return request({ + url: '/interface/query', + method: 'get', + params: query + }) +} + +// 新增 +export function add(data) { + return request({ + url: api + 'add', + method: 'post', + data: data + }) +} + +// 修改 +export function update(data) { + return request({ + url: api + 'modify', + method: 'put', + data: data + }) +} + +// 删除 +export function del(id) { + return request({ + url: api + 'delete' + id, + method: 'delete' + }) +} + + +//隔离 + + // 查询用户列表 export function listUser(query) { @@ -126,5 +193,3 @@ export function updateAuthRole(data) { params: data }) } - - diff --git a/ALOps_sys_fe/alops-ui/src/assets/styles/index.scss b/ALOps_sys_fe/alops-ui/src/assets/styles/index.scss index bb87292c..87b5d122 100644 --- a/ALOps_sys_fe/alops-ui/src/assets/styles/index.scss +++ b/ALOps_sys_fe/alops-ui/src/assets/styles/index.scss @@ -11,6 +11,7 @@ body { -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; + color: #606266; } label { diff --git a/ALOps_sys_fe/alops-ui/src/assets/styles/ruoyi.scss b/ALOps_sys_fe/alops-ui/src/assets/styles/ruoyi.scss index ab4a1d2d..c7dac774 100644 --- a/ALOps_sys_fe/alops-ui/src/assets/styles/ruoyi.scss +++ b/ALOps_sys_fe/alops-ui/src/assets/styles/ruoyi.scss @@ -285,3 +285,22 @@ .splitpanes.default-theme .splitpanes__pane { background-color: #fff!important; } + + +.flex-center{ + display: flex; + justify-content: center; + align-items: center; +} +.flex{ + display: flex; +} +.justifyContent{ + justify-content: center; +} +.alignItems{ + align-items: center; +} +.gap10{ + gap: 10px; +} diff --git a/ALOps_sys_fe/alops-ui/src/layout/components/Navbar.vue b/ALOps_sys_fe/alops-ui/src/layout/components/Navbar.vue index 5c31196d..cbe7284d 100644 --- a/ALOps_sys_fe/alops-ui/src/layout/components/Navbar.vue +++ b/ALOps_sys_fe/alops-ui/src/layout/components/Navbar.vue @@ -9,20 +9,8 @@ diff --git a/ALOps_sys_fe/alops-ui/src/router/index.js b/ALOps_sys_fe/alops-ui/src/router/index.js index 14f088b7..175e7e6c 100644 --- a/ALOps_sys_fe/alops-ui/src/router/index.js +++ b/ALOps_sys_fe/alops-ui/src/router/index.js @@ -92,6 +92,20 @@ export const constantRoutes = [ // 动态路由,基于用户权限动态去加载 export const dynamicRoutes = [ + { + path: '/inMonitoring/devicesState-detail', + component: Layout, + hidden: true, + permissions: ['inMonitoring:devicesState:edit'], + children: [ + { + path: 'detail/:userId(\\d+)', + component: () => import('@/views/inMonitoring/devicesState/detail'), + name: 'DevicesStateDetail', + meta: { title: '设备详情', activeMenu: '/inMonitoring/devicesState-detail' } + } + ] + }, { path: '/system/user-auth', component: Layout, diff --git a/ALOps_sys_fe/alops-ui/src/views/device/deviceInformation/index.vue b/ALOps_sys_fe/alops-ui/src/views/device/deviceInformation/index.vue index dea501b6..b6b48861 100644 --- a/ALOps_sys_fe/alops-ui/src/views/device/deviceInformation/index.vue +++ b/ALOps_sys_fe/alops-ui/src/views/device/deviceInformation/index.vue @@ -2,12 +2,9 @@
- - - @@ -62,6 +59,7 @@ diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/cardItem.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/cardItem.vue index fc8b6de7..445debfc 100644 --- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/cardItem.vue +++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/cardItem.vue @@ -1,6 +1,6 @@