diff --git a/xiuosiot-frontend/src/api/rule/ruleManage.js b/xiuosiot-frontend/src/api/rule/ruleManage.js new file mode 100644 index 0000000..a14e772 --- /dev/null +++ b/xiuosiot-frontend/src/api/rule/ruleManage.js @@ -0,0 +1,33 @@ +import request from '@/utils/request' + +export function getList(data) { + return request({ + url: '/alarmRule/selectAll', + method: 'get', + data + }) +} + +export function remove(data) { + return request({ + url: '/alarmRule/delete', + method: 'post', + data + }) +} + +export function add(data) { + return request({ + url: '/alarmRule/add', + method: 'post', + data + }) +} + +export function update(data) { + return request({ + url: '/alarmRule/update', + method: 'post', + data + }) +} diff --git a/xiuosiot-frontend/src/assets/images/add_border.png b/xiuosiot-frontend/src/assets/images/add_border.png new file mode 100644 index 0000000..af08d82 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/add_border.png differ diff --git a/xiuosiot-frontend/src/assets/images/bg_green.png b/xiuosiot-frontend/src/assets/images/bg_green.png new file mode 100644 index 0000000..78f523f Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/bg_green.png differ diff --git a/xiuosiot-frontend/src/icons/svg/alarm.svg b/xiuosiot-frontend/src/icons/svg/alarm.svg new file mode 100644 index 0000000..f554887 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/alarm.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/edit.svg b/xiuosiot-frontend/src/icons/svg/edit.svg new file mode 100644 index 0000000..7bc113d --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/edit.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/more.svg b/xiuosiot-frontend/src/icons/svg/more.svg new file mode 100644 index 0000000..655e9ba --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/more.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/remove.svg b/xiuosiot-frontend/src/icons/svg/remove.svg new file mode 100644 index 0000000..dfd4d36 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/remove.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/rule_msg_type.svg b/xiuosiot-frontend/src/icons/svg/rule_msg_type.svg new file mode 100644 index 0000000..1066593 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/rule_msg_type.svg @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/rule_name.svg b/xiuosiot-frontend/src/icons/svg/rule_name.svg new file mode 100644 index 0000000..f1f7071 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/rule_name.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/rule_status.svg b/xiuosiot-frontend/src/icons/svg/rule_status.svg new file mode 100644 index 0000000..0f746c5 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/rule_status.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/rule_terminal_no.svg b/xiuosiot-frontend/src/icons/svg/rule_terminal_no.svg new file mode 100644 index 0000000..8980cd9 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/rule_terminal_no.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/start.svg b/xiuosiot-frontend/src/icons/svg/start.svg new file mode 100644 index 0000000..3f9167e --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/start.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/stop.svg b/xiuosiot-frontend/src/icons/svg/stop.svg new file mode 100644 index 0000000..98abbc2 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/stop.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/view.svg b/xiuosiot-frontend/src/icons/svg/view.svg new file mode 100644 index 0000000..000c276 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/view.svg @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/xiuosiot-frontend/src/router/index.js b/xiuosiot-frontend/src/router/index.js index 4f97b0f..ec0a666 100644 --- a/xiuosiot-frontend/src/router/index.js +++ b/xiuosiot-frontend/src/router/index.js @@ -181,19 +181,19 @@ export const constantRoutes = [ path: '/rule', component: Layout, name: 'Rule', - meta: { title: '规则引擎', icon: 'rule', disabled: true }, + meta: { title: '规则引擎', icon: 'rule' }, children: [ { path: 'manage', name: 'Manage', - // component: () => import(''), - meta: { title: '规则管理', disabled: true } + component: () => import('@/views/rule/ruleManage/index'), + meta: { title: '规则管理' } }, { path: 'message', name: 'Message', // component: () => import('@/views/terminal/add/index'), - meta: { title: '消息推送', disabled: true } + meta: { title: '数据转发', disabled: true } } ] }, diff --git a/xiuosiot-frontend/src/store/getters.js b/xiuosiot-frontend/src/store/getters.js index 1f42a78..bb8cbea 100644 --- a/xiuosiot-frontend/src/store/getters.js +++ b/xiuosiot-frontend/src/store/getters.js @@ -4,6 +4,7 @@ const getters = { token: state => state.user.token, avatar: state => state.user.avatar, name: state => state.user.name, + org: state => state.user.org, corpName: state => state.user.corpName, abbrCorpName: state => state.user.abbrCorpName, asyncRouters: state => state.user.asyncRouters, diff --git a/xiuosiot-frontend/src/store/modules/user.js b/xiuosiot-frontend/src/store/modules/user.js index b9de07a..701f421 100644 --- a/xiuosiot-frontend/src/store/modules/user.js +++ b/xiuosiot-frontend/src/store/modules/user.js @@ -2,7 +2,7 @@ * @Author: 龚祖望 573413756@qq.com * @Date: 2022-05-16 09:16:41 * @LastEditors: 龚祖望 573413756@qq.com - * @LastEditTime: 2022-10-09 15:39:05 + * @LastEditTime: 2022-11-07 15:47:20 * @FilePath: \dashengda\src\store\modules\user.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -64,6 +64,9 @@ const mutations = { SET_AVATAR: (state, avatar) => { state.avatar = avatar }, + SET_ORG: (state, org) => { + state.org = org + }, SET_CORPNAME: (state, corpName) => { state.corpName = corpName }, @@ -110,6 +113,7 @@ const actions = { } // const { name, avatar } = data + commit('SET_ORG', data.org) commit('SET_CORPNAME', data.corpname) commit('SET_ABBRCORPNAME', data.abbrcorpname) commit('SET_PERMISSIONS', [data.permissions]) diff --git a/xiuosiot-frontend/src/views/rule/ruleManage/index.vue b/xiuosiot-frontend/src/views/rule/ruleManage/index.vue new file mode 100644 index 0000000..58a6cc4 --- /dev/null +++ b/xiuosiot-frontend/src/views/rule/ruleManage/index.vue @@ -0,0 +1,659 @@ + + + + + 告警规则 + {{ date }} + + 新增规则 + + + + + + {{ '告警级别 '+getLevelDesc(item.alarmLevel) }} + + + + + + 告警名称 + {{ item.alarmName }} + + + 适用设备序列号 + {{ item.deviceNo }} + + + 推送方式 + 邮件 + + + 生效状态 + {{ ruleStatusList[item.ruleStatus] }} + + + + + + + + + + {{ getTitle(type) }} + X + + + + + + + + {{ form.alarmName }} + + + + + + + + {{ getLevelDesc(form.alarmLevel) }} + + + + + + + + {{ form.deviceNo }} + + + + + + + {{ '触发器'+(index+1) }} + x + + + + + + + + + {{ getParamDesc(triger.param) }} + + + + + + + 大于 + 小于 + + + + + {{ triger.value }} + + + + + + + 触发器 + + + + + + + 邮件 + + + {{ form.noticeAddress }} + + + + + + {{ form.noticeContent }} + + + + + + + + + + + + + + diff --git a/xiuosiot-frontend/src/views/terminal/monitor/index.vue b/xiuosiot-frontend/src/views/terminal/monitor/index.vue index 05c1a2f..34f5617 100644 --- a/xiuosiot-frontend/src/views/terminal/monitor/index.vue +++ b/xiuosiot-frontend/src/views/terminal/monitor/index.vue @@ -79,7 +79,7 @@ - +
+ 告警名称 + {{ item.alarmName }} +
+ 适用设备序列号 + {{ item.deviceNo }} +
+ 推送方式 + 邮件 +
+ 生效状态 + {{ ruleStatusList[item.ruleStatus] }} +
{{ getTitle(type) }}