diff --git a/mock/system/user.js b/mock/system/user.js index d4d3161..efab279 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -107,6 +107,7 @@ { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '告警等级配置', 'num': 0, 'parentId': '1184010804933668866', 'resourceType': '03', 'url': '/alarmLevel' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '告警内容配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/alarmContent' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '项目配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/tenantConfig' }, + { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '报警配置', 'num': 0, 'parentId': '1184010804943668867', 'resourceType': '03', 'url': '/alarmConfig' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' }, { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' }, diff --git a/mock/system/user.js b/mock/system/user.js index d4d3161..efab279 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -107,6 +107,7 @@ { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '告警等级配置', 'num': 0, 'parentId': '1184010804933668866', 'resourceType': '03', 'url': '/alarmLevel' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '告警内容配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/alarmContent' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '项目配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/tenantConfig' }, + { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '报警配置', 'num': 0, 'parentId': '1184010804943668867', 'resourceType': '03', 'url': '/alarmConfig' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' }, { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' }, diff --git a/public/config/project.config.json b/public/config/project.config.json index 87492f9..9091be3 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,7 +2,7 @@ "title": "智能窨井管理系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11304/", + "baseUrl": "http://111.198.10.15:11309/", "mainPage": "http://111.198.10.15:11404/dcms/#", "singleSys": true, "refreshType":"websocket", diff --git a/mock/system/user.js b/mock/system/user.js index d4d3161..efab279 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -107,6 +107,7 @@ { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '告警等级配置', 'num': 0, 'parentId': '1184010804933668866', 'resourceType': '03', 'url': '/alarmLevel' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '告警内容配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/alarmContent' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '项目配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/tenantConfig' }, + { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '报警配置', 'num': 0, 'parentId': '1184010804943668867', 'resourceType': '03', 'url': '/alarmConfig' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' }, { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' }, diff --git a/public/config/project.config.json b/public/config/project.config.json index 87492f9..9091be3 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,7 +2,7 @@ "title": "智能窨井管理系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11304/", + "baseUrl": "http://111.198.10.15:11309/", "mainPage": "http://111.198.10.15:11404/dcms/#", "singleSys": true, "refreshType":"websocket", diff --git a/src/router/modules/config.js b/src/router/modules/config.js index 31a7f6c..22ad5cb 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -19,6 +19,12 @@ meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } }, { + path: '/alarmConfig', + name: 'AlarmConfig', + component: () => import('@/views/systemConfig/alarmConfig/listAlarmConfig'), + meta: { title: '报警配置', icon: 'function', permission: ['/alarmConfig'] } + }, + { path: '/viewsConfig', name: 'ViewsConfig', component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'), diff --git a/mock/system/user.js b/mock/system/user.js index d4d3161..efab279 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -107,6 +107,7 @@ { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '告警等级配置', 'num': 0, 'parentId': '1184010804933668866', 'resourceType': '03', 'url': '/alarmLevel' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '告警内容配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/alarmContent' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '项目配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/tenantConfig' }, + { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '报警配置', 'num': 0, 'parentId': '1184010804943668867', 'resourceType': '03', 'url': '/alarmConfig' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' }, { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' }, diff --git a/public/config/project.config.json b/public/config/project.config.json index 87492f9..9091be3 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,7 +2,7 @@ "title": "智能窨井管理系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11304/", + "baseUrl": "http://111.198.10.15:11309/", "mainPage": "http://111.198.10.15:11404/dcms/#", "singleSys": true, "refreshType":"websocket", diff --git a/src/router/modules/config.js b/src/router/modules/config.js index 31a7f6c..22ad5cb 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -19,6 +19,12 @@ meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } }, { + path: '/alarmConfig', + name: 'AlarmConfig', + component: () => import('@/views/systemConfig/alarmConfig/listAlarmConfig'), + meta: { title: '报警配置', icon: 'function', permission: ['/alarmConfig'] } + }, + { path: '/viewsConfig', name: 'ViewsConfig', component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'), diff --git a/src/utils/request.js b/src/utils/request.js index 9ce2ab2..74b96ed 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -40,19 +40,19 @@ // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { // 开发完页面以后下面的这个注释需要打开 - // MessageBox.confirm( - // '你已被登出，可以取消继续留在该页面，或者重新登录', - // '确定登出', - // { - // confirmButtonText: '重新登录', - // cancelButtonText: '取消', - // type: 'warning' - // } - // ).then(() => { - // store.dispatch('FedLogOut').then(() => { - // location.reload() // 为了重新实例化vue-router对象 避免bug - // }) - // }) + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) + }) } else { Message({ showClose: true, diff --git a/mock/system/user.js b/mock/system/user.js index d4d3161..efab279 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -107,6 +107,7 @@ { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '告警等级配置', 'num': 0, 'parentId': '1184010804933668866', 'resourceType': '03', 'url': '/alarmLevel' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '告警内容配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/alarmContent' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '项目配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/tenantConfig' }, + { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '报警配置', 'num': 0, 'parentId': '1184010804943668867', 'resourceType': '03', 'url': '/alarmConfig' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' }, { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' }, diff --git a/public/config/project.config.json b/public/config/project.config.json index 87492f9..9091be3 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,7 +2,7 @@ "title": "智能窨井管理系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11304/", + "baseUrl": "http://111.198.10.15:11309/", "mainPage": "http://111.198.10.15:11404/dcms/#", "singleSys": true, "refreshType":"websocket", diff --git a/src/router/modules/config.js b/src/router/modules/config.js index 31a7f6c..22ad5cb 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -19,6 +19,12 @@ meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } }, { + path: '/alarmConfig', + name: 'AlarmConfig', + component: () => import('@/views/systemConfig/alarmConfig/listAlarmConfig'), + meta: { title: '报警配置', icon: 'function', permission: ['/alarmConfig'] } + }, + { path: '/viewsConfig', name: 'ViewsConfig', component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'), diff --git a/src/utils/request.js b/src/utils/request.js index 9ce2ab2..74b96ed 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -40,19 +40,19 @@ // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { // 开发完页面以后下面的这个注释需要打开 - // MessageBox.confirm( - // '你已被登出，可以取消继续留在该页面，或者重新登录', - // '确定登出', - // { - // confirmButtonText: '重新登录', - // cancelButtonText: '取消', - // type: 'warning' - // } - // ).then(() => { - // store.dispatch('FedLogOut').then(() => { - // location.reload() // 为了重新实例化vue-router对象 避免bug - // }) - // }) + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) + }) } else { Message({ showClose: true, diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index c9902e4..94e04bb 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -2,7 +2,7 @@
- +
@@ -22,6 +22,7 @@ dataGroup: [ { title: '井总数量', + flags: '', context: '--', icon: 'icon-well', color: '#40c9c6', @@ -30,6 +31,7 @@ }, { title: '设备数量', + flags: '', context: '--', icon: 'icon-device', color: '#36a3f7', @@ -38,6 +40,7 @@ }, { title: '当前报警数', + flags: '', context: '--', icon: 'icon-alarm', color: '#f4516c', @@ -46,6 +49,7 @@ }, { title: '未完成工单数', + flags: '', context: '--', icon: 'icon-order', color: '#f4516c', diff --git a/mock/system/user.js b/mock/system/user.js index d4d3161..efab279 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -107,6 +107,7 @@ { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '告警等级配置', 'num': 0, 'parentId': '1184010804933668866', 'resourceType': '03', 'url': '/alarmLevel' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '告警内容配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/alarmContent' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '项目配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/tenantConfig' }, + { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '报警配置', 'num': 0, 'parentId': '1184010804943668867', 'resourceType': '03', 'url': '/alarmConfig' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700966', 'ismenu': '1', 'levels': 2, 'name': '外观配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/viewsConfig' }, { 'code': 'alarm_level', 'icon': '', 'id': '1184011664241700866', 'ismenu': '1', 'levels': 2, 'name': '组织权限配置', 'num': 0, 'parentId': '1184010804933668867', 'resourceType': '03', 'url': '/deptPermission' }, { 'code': 'digdata_list', 'icon': '', 'id': '1177452534332784642', 'ismenu': '0', 'levels': 2, 'name': '开挖数据列表', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/digdata/list' }, diff --git a/public/config/project.config.json b/public/config/project.config.json index 87492f9..9091be3 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,7 +2,7 @@ "title": "智能窨井管理系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://111.198.10.15:11304/", + "baseUrl": "http://111.198.10.15:11309/", "mainPage": "http://111.198.10.15:11404/dcms/#", "singleSys": true, "refreshType":"websocket", diff --git a/src/router/modules/config.js b/src/router/modules/config.js index 31a7f6c..22ad5cb 100644 --- a/src/router/modules/config.js +++ b/src/router/modules/config.js @@ -19,6 +19,12 @@ meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] } }, { + path: '/alarmConfig', + name: 'AlarmConfig', + component: () => import('@/views/systemConfig/alarmConfig/listAlarmConfig'), + meta: { title: '报警配置', icon: 'function', permission: ['/alarmConfig'] } + }, + { path: '/viewsConfig', name: 'ViewsConfig', component: () => import('@/views/systemConfig//viewsConfig/viewsConfig'), diff --git a/src/utils/request.js b/src/utils/request.js index 9ce2ab2..74b96ed 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -40,19 +40,19 @@ // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; if (res.code === 401 || res.code === 50012 || res.code === 50014) { // 开发完页面以后下面的这个注释需要打开 - // MessageBox.confirm( - // '你已被登出，可以取消继续留在该页面，或者重新登录', - // '确定登出', - // { - // confirmButtonText: '重新登录', - // cancelButtonText: '取消', - // type: 'warning' - // } - // ).then(() => { - // store.dispatch('FedLogOut').then(() => { - // location.reload() // 为了重新实例化vue-router对象 避免bug - // }) - // }) + MessageBox.confirm( + '你已被登出，可以取消继续留在该页面，或者重新登录', + '确定登出', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + store.dispatch('FedLogOut').then(() => { + location.reload() // 为了重新实例化vue-router对象 避免bug + }) + }) } else { Message({ showClose: true, diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index c9902e4..94e04bb 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -2,7 +2,7 @@
- +
@@ -22,6 +22,7 @@ dataGroup: [ { title: '井总数量', + flags: '', context: '--', icon: 'icon-well', color: '#40c9c6', @@ -30,6 +31,7 @@ }, { title: '设备数量', + flags: '', context: '--', icon: 'icon-device', color: '#36a3f7', @@ -38,6 +40,7 @@ }, { title: '当前报警数', + flags: '', context: '--', icon: 'icon-alarm', color: '#f4516c', @@ -46,6 +49,7 @@ }, { title: '未完成工单数', + flags: '', context: '--', icon: 'icon-order', color: '#f4516c', diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 7a90f88..bf4f3af 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,41 +1,41 @@