diff --git a/spug_web/src/menus.js b/spug_web/src/menus.js index 9fc7454..3ed9f50 100644 --- a/spug_web/src/menus.js +++ b/spug_web/src/menus.js @@ -21,12 +21,12 @@ export default [ {title: '应用配置', auth: 'config.app.view', path: '/config/app'}, ] }, - {icon: 'monitor', title: '监控中心', path: '/monitor'}, + {icon: 'monitor', title: '监控中心', auth: 'monitor.monitor.view', path: '/monitor'}, { - icon: 'alert', title: '报警中心', child: [ - {title: '报警历史', path: '/alarm/alarm'}, - {title: '报警联系人', path: '/alarm/contact'}, - {title: '报警联系组', path: '/alarm/group'}, + icon: 'alert', title: '报警中心', auth: 'alarm.alarm.view|alarm.contact.view|alarm.group.view', child: [ + {title: '报警历史', auth: 'alarm.alarm.view', path: '/alarm/alarm'}, + {title: '报警联系人', auth: 'alarm.contact.view', path: '/alarm/contact'}, + {title: '报警联系组', auth: 'alarm.group.view', path: '/alarm/group'}, ] }, { diff --git a/spug_web/src/pages/alarm/contact/Table.js b/spug_web/src/pages/alarm/contact/Table.js index 91195ab..5429891 100644 --- a/spug_web/src/pages/alarm/contact/Table.js +++ b/spug_web/src/pages/alarm/contact/Table.js @@ -35,9 +35,9 @@ class ComTable extends React.Component { title: '操作', render: info => ( - store.showForm(info)}>编辑 + store.showForm(info)}>编辑 - this.handleDelete(info)}>删除 + this.handleDelete(info)}>删除 ) }]; diff --git a/spug_web/src/pages/alarm/contact/index.js b/spug_web/src/pages/alarm/contact/index.js index d3da9ab..6653331 100644 --- a/spug_web/src/pages/alarm/contact/index.js +++ b/spug_web/src/pages/alarm/contact/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { observer } from 'mobx-react'; import { Card, Input, Button } from 'antd'; -import { SearchForm } from 'components'; +import { SearchForm, AuthDiv } from 'components'; import ComTable from './Table'; import store from './store'; @@ -16,9 +16,9 @@ export default observer(function () { -
+ -
+ ) diff --git a/spug_web/src/pages/alarm/group/Table.js b/spug_web/src/pages/alarm/group/Table.js index bb036ef..73b5265 100644 --- a/spug_web/src/pages/alarm/group/Table.js +++ b/spug_web/src/pages/alarm/group/Table.js @@ -55,9 +55,9 @@ class ComTable extends React.Component { title: '操作', render: info => ( - store.showForm(info)}>编辑 + store.showForm(info)}>编辑 - this.handleDelete(info)}>删除 + this.handleDelete(info)}>删除 ) }]; diff --git a/spug_web/src/pages/alarm/group/index.js b/spug_web/src/pages/alarm/group/index.js index 341b145..bdb2441 100644 --- a/spug_web/src/pages/alarm/group/index.js +++ b/spug_web/src/pages/alarm/group/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { observer } from 'mobx-react'; import { Card, Input, Button } from 'antd'; -import { SearchForm } from 'components'; +import { SearchForm, AuthDiv } from 'components'; import ComTable from './Table'; import store from './store'; @@ -16,9 +16,9 @@ export default observer(function () { -
+ -
+ ) diff --git a/spug_web/src/pages/config/environment/Table.js b/spug_web/src/pages/config/environment/Table.js index d722c7e..0cd813a 100644 --- a/spug_web/src/pages/config/environment/Table.js +++ b/spug_web/src/pages/config/environment/Table.js @@ -31,9 +31,9 @@ class ComTable extends React.Component { title: '操作', render: info => ( - store.showForm(info)}>编辑 + store.showForm(info)}>编辑 - this.handleDelete(info)}>删除 + this.handleDelete(info)}>删除 ) }]; diff --git a/spug_web/src/pages/config/environment/index.js b/spug_web/src/pages/config/environment/index.js index ed3e06c..68f55d9 100644 --- a/spug_web/src/pages/config/environment/index.js +++ b/spug_web/src/pages/config/environment/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { observer } from 'mobx-react'; import { Card, Input, Button } from 'antd'; -import { SearchForm } from 'components'; +import { SearchForm, AuthDiv } from 'components'; import ComTable from './Table'; import store from './store'; @@ -16,9 +16,9 @@ export default observer(function () { -
+ -
+ ) diff --git a/spug_web/src/pages/config/service/Table.js b/spug_web/src/pages/config/service/Table.js index 549a523..d096e3d 100644 --- a/spug_web/src/pages/config/service/Table.js +++ b/spug_web/src/pages/config/service/Table.js @@ -1,11 +1,10 @@ import React from 'react'; import { observer } from 'mobx-react'; -import { Link } from 'react-router-dom'; import { Table, Divider, Modal, message } from 'antd'; import ComForm from './Form'; import http from 'libs/http'; import store from './store'; -import { LinkButton } from "components"; +import { LinkButton, AuthLink } from "components"; @observer class ComTable extends React.Component { @@ -32,11 +31,11 @@ class ComTable extends React.Component { title: '操作', render: info => ( - store.showForm(info)}>编辑 + store.showForm(info)}>编辑 - this.handleDelete(info)}>删除 + this.handleDelete(info)}>删除 - 配置 + 配置 ) }]; diff --git a/spug_web/src/pages/config/service/index.js b/spug_web/src/pages/config/service/index.js index 7dc025d..ef6f156 100644 --- a/spug_web/src/pages/config/service/index.js +++ b/spug_web/src/pages/config/service/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { observer } from 'mobx-react'; import { Card, Input, Button } from 'antd'; -import { SearchForm } from 'components'; +import { SearchForm, AuthDiv } from 'components'; import ComTable from './Table'; import store from './store'; @@ -16,9 +16,9 @@ export default observer(function () { -
+ -
+ ) diff --git a/spug_web/src/pages/monitor/Table.js b/spug_web/src/pages/monitor/Table.js index df90dbf..2f1ad24 100644 --- a/spug_web/src/pages/monitor/Table.js +++ b/spug_web/src/pages/monitor/Table.js @@ -85,11 +85,11 @@ class ComTable extends React.Component { title: '操作', render: info => ( - this.handleActive(info)}>{info['is_active'] ? '禁用' : '启用'} + this.handleActive(info)}>{info['is_active'] ? '禁用' : '启用'} - store.showForm(info)}>编辑 + store.showForm(info)}>编辑 - this.handleDelete(info)}>删除 + this.handleDelete(info)}>删除 ), width: 180 diff --git a/spug_web/src/pages/monitor/index.js b/spug_web/src/pages/monitor/index.js index cf3af30..a25e762 100644 --- a/spug_web/src/pages/monitor/index.js +++ b/spug_web/src/pages/monitor/index.js @@ -1,6 +1,6 @@ import React from 'react'; import { Card, Input, Select, Button } from 'antd'; -import { SearchForm } from 'components'; +import { SearchForm, AuthDiv } from 'components'; import ComTable from './Table'; import store from './store'; @@ -24,9 +24,9 @@ export default function () { -
+ -
+ ) diff --git a/spug_web/src/pages/system/role/codes.js b/spug_web/src/pages/system/role/codes.js index e10b413..1fe4095 100644 --- a/spug_web/src/pages/system/role/codes.js +++ b/spug_web/src/pages/system/role/codes.js @@ -107,7 +107,7 @@ export default [{ key: 'monitor', label: '监控中心', pages: [{ - key: '监控中心', + key: 'monitor', label: '监控中心', perms: [ {key: 'view', label: '查看监控'},