diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/assets/overview_images/tg/green1.png b/src/assets/overview_images/tg/green1.png new file mode 100644 index 0000000..03c880d --- /dev/null +++ b/src/assets/overview_images/tg/green1.png Binary files differ diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/assets/overview_images/tg/green1.png b/src/assets/overview_images/tg/green1.png new file mode 100644 index 0000000..03c880d --- /dev/null +++ b/src/assets/overview_images/tg/green1.png Binary files differ diff --git a/src/assets/overview_images/tg/green2.png b/src/assets/overview_images/tg/green2.png new file mode 100644 index 0000000..27e3dd8 --- /dev/null +++ b/src/assets/overview_images/tg/green2.png Binary files differ diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/assets/overview_images/tg/green1.png b/src/assets/overview_images/tg/green1.png new file mode 100644 index 0000000..03c880d --- /dev/null +++ b/src/assets/overview_images/tg/green1.png Binary files differ diff --git a/src/assets/overview_images/tg/green2.png b/src/assets/overview_images/tg/green2.png new file mode 100644 index 0000000..27e3dd8 --- /dev/null +++ b/src/assets/overview_images/tg/green2.png Binary files differ diff --git a/src/assets/overview_images/tg/green3.png b/src/assets/overview_images/tg/green3.png new file mode 100644 index 0000000..74f6080 --- /dev/null +++ b/src/assets/overview_images/tg/green3.png Binary files differ diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/assets/overview_images/tg/green1.png b/src/assets/overview_images/tg/green1.png new file mode 100644 index 0000000..03c880d --- /dev/null +++ b/src/assets/overview_images/tg/green1.png Binary files differ diff --git a/src/assets/overview_images/tg/green2.png b/src/assets/overview_images/tg/green2.png new file mode 100644 index 0000000..27e3dd8 --- /dev/null +++ b/src/assets/overview_images/tg/green2.png Binary files differ diff --git a/src/assets/overview_images/tg/green3.png b/src/assets/overview_images/tg/green3.png new file mode 100644 index 0000000..74f6080 --- /dev/null +++ b/src/assets/overview_images/tg/green3.png Binary files differ diff --git a/src/assets/overview_images/tg/green4.png b/src/assets/overview_images/tg/green4.png new file mode 100644 index 0000000..dfdd870 --- /dev/null +++ b/src/assets/overview_images/tg/green4.png Binary files differ diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/assets/overview_images/tg/green1.png b/src/assets/overview_images/tg/green1.png new file mode 100644 index 0000000..03c880d --- /dev/null +++ b/src/assets/overview_images/tg/green1.png Binary files differ diff --git a/src/assets/overview_images/tg/green2.png b/src/assets/overview_images/tg/green2.png new file mode 100644 index 0000000..27e3dd8 --- /dev/null +++ b/src/assets/overview_images/tg/green2.png Binary files differ diff --git a/src/assets/overview_images/tg/green3.png b/src/assets/overview_images/tg/green3.png new file mode 100644 index 0000000..74f6080 --- /dev/null +++ b/src/assets/overview_images/tg/green3.png Binary files differ diff --git a/src/assets/overview_images/tg/green4.png b/src/assets/overview_images/tg/green4.png new file mode 100644 index 0000000..dfdd870 --- /dev/null +++ b/src/assets/overview_images/tg/green4.png Binary files differ diff --git a/src/assets/overview_images/tg/red1.png b/src/assets/overview_images/tg/red1.png new file mode 100644 index 0000000..ee80b95 --- /dev/null +++ b/src/assets/overview_images/tg/red1.png Binary files differ diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/assets/overview_images/tg/green1.png b/src/assets/overview_images/tg/green1.png new file mode 100644 index 0000000..03c880d --- /dev/null +++ b/src/assets/overview_images/tg/green1.png Binary files differ diff --git a/src/assets/overview_images/tg/green2.png b/src/assets/overview_images/tg/green2.png new file mode 100644 index 0000000..27e3dd8 --- /dev/null +++ b/src/assets/overview_images/tg/green2.png Binary files differ diff --git a/src/assets/overview_images/tg/green3.png b/src/assets/overview_images/tg/green3.png new file mode 100644 index 0000000..74f6080 --- /dev/null +++ b/src/assets/overview_images/tg/green3.png Binary files differ diff --git a/src/assets/overview_images/tg/green4.png b/src/assets/overview_images/tg/green4.png new file mode 100644 index 0000000..dfdd870 --- /dev/null +++ b/src/assets/overview_images/tg/green4.png Binary files differ diff --git a/src/assets/overview_images/tg/red1.png b/src/assets/overview_images/tg/red1.png new file mode 100644 index 0000000..ee80b95 --- /dev/null +++ b/src/assets/overview_images/tg/red1.png Binary files differ diff --git a/src/assets/overview_images/tg/red2.png b/src/assets/overview_images/tg/red2.png new file mode 100644 index 0000000..9fae604 --- /dev/null +++ b/src/assets/overview_images/tg/red2.png Binary files differ diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/assets/overview_images/tg/green1.png b/src/assets/overview_images/tg/green1.png new file mode 100644 index 0000000..03c880d --- /dev/null +++ b/src/assets/overview_images/tg/green1.png Binary files differ diff --git a/src/assets/overview_images/tg/green2.png b/src/assets/overview_images/tg/green2.png new file mode 100644 index 0000000..27e3dd8 --- /dev/null +++ b/src/assets/overview_images/tg/green2.png Binary files differ diff --git a/src/assets/overview_images/tg/green3.png b/src/assets/overview_images/tg/green3.png new file mode 100644 index 0000000..74f6080 --- /dev/null +++ b/src/assets/overview_images/tg/green3.png Binary files differ diff --git a/src/assets/overview_images/tg/green4.png b/src/assets/overview_images/tg/green4.png new file mode 100644 index 0000000..dfdd870 --- /dev/null +++ b/src/assets/overview_images/tg/green4.png Binary files differ diff --git a/src/assets/overview_images/tg/red1.png b/src/assets/overview_images/tg/red1.png new file mode 100644 index 0000000..ee80b95 --- /dev/null +++ b/src/assets/overview_images/tg/red1.png Binary files differ diff --git a/src/assets/overview_images/tg/red2.png b/src/assets/overview_images/tg/red2.png new file mode 100644 index 0000000..9fae604 --- /dev/null +++ b/src/assets/overview_images/tg/red2.png Binary files differ diff --git a/src/assets/overview_images/tg/red3.png b/src/assets/overview_images/tg/red3.png new file mode 100644 index 0000000..7d8bc02 --- /dev/null +++ b/src/assets/overview_images/tg/red3.png Binary files differ diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/assets/overview_images/tg/green1.png b/src/assets/overview_images/tg/green1.png new file mode 100644 index 0000000..03c880d --- /dev/null +++ b/src/assets/overview_images/tg/green1.png Binary files differ diff --git a/src/assets/overview_images/tg/green2.png b/src/assets/overview_images/tg/green2.png new file mode 100644 index 0000000..27e3dd8 --- /dev/null +++ b/src/assets/overview_images/tg/green2.png Binary files differ diff --git a/src/assets/overview_images/tg/green3.png b/src/assets/overview_images/tg/green3.png new file mode 100644 index 0000000..74f6080 --- /dev/null +++ b/src/assets/overview_images/tg/green3.png Binary files differ diff --git a/src/assets/overview_images/tg/green4.png b/src/assets/overview_images/tg/green4.png new file mode 100644 index 0000000..dfdd870 --- /dev/null +++ b/src/assets/overview_images/tg/green4.png Binary files differ diff --git a/src/assets/overview_images/tg/red1.png b/src/assets/overview_images/tg/red1.png new file mode 100644 index 0000000..ee80b95 --- /dev/null +++ b/src/assets/overview_images/tg/red1.png Binary files differ diff --git a/src/assets/overview_images/tg/red2.png b/src/assets/overview_images/tg/red2.png new file mode 100644 index 0000000..9fae604 --- /dev/null +++ b/src/assets/overview_images/tg/red2.png Binary files differ diff --git a/src/assets/overview_images/tg/red3.png b/src/assets/overview_images/tg/red3.png new file mode 100644 index 0000000..7d8bc02 --- /dev/null +++ b/src/assets/overview_images/tg/red3.png Binary files differ diff --git a/src/assets/overview_images/tg/red4.png b/src/assets/overview_images/tg/red4.png new file mode 100644 index 0000000..2bd0f84 --- /dev/null +++ b/src/assets/overview_images/tg/red4.png Binary files differ diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/assets/overview_images/tg/green1.png b/src/assets/overview_images/tg/green1.png new file mode 100644 index 0000000..03c880d --- /dev/null +++ b/src/assets/overview_images/tg/green1.png Binary files differ diff --git a/src/assets/overview_images/tg/green2.png b/src/assets/overview_images/tg/green2.png new file mode 100644 index 0000000..27e3dd8 --- /dev/null +++ b/src/assets/overview_images/tg/green2.png Binary files differ diff --git a/src/assets/overview_images/tg/green3.png b/src/assets/overview_images/tg/green3.png new file mode 100644 index 0000000..74f6080 --- /dev/null +++ b/src/assets/overview_images/tg/green3.png Binary files differ diff --git a/src/assets/overview_images/tg/green4.png b/src/assets/overview_images/tg/green4.png new file mode 100644 index 0000000..dfdd870 --- /dev/null +++ b/src/assets/overview_images/tg/green4.png Binary files differ diff --git a/src/assets/overview_images/tg/red1.png b/src/assets/overview_images/tg/red1.png new file mode 100644 index 0000000..ee80b95 --- /dev/null +++ b/src/assets/overview_images/tg/red1.png Binary files differ diff --git a/src/assets/overview_images/tg/red2.png b/src/assets/overview_images/tg/red2.png new file mode 100644 index 0000000..9fae604 --- /dev/null +++ b/src/assets/overview_images/tg/red2.png Binary files differ diff --git a/src/assets/overview_images/tg/red3.png b/src/assets/overview_images/tg/red3.png new file mode 100644 index 0000000..7d8bc02 --- /dev/null +++ b/src/assets/overview_images/tg/red3.png Binary files differ diff --git a/src/assets/overview_images/tg/red4.png b/src/assets/overview_images/tg/red4.png new file mode 100644 index 0000000..2bd0f84 --- /dev/null +++ b/src/assets/overview_images/tg/red4.png Binary files differ diff --git a/src/store/getters.js b/src/store/getters.js index c33a49d..a28c9f9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,6 +10,7 @@ changeFlag: state => state.app.changeFlag, // 切换子系统标志 token: state => state.user.token, // token name: state => state.user.name, // 姓名 + id: state => state.user.id, // id roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/assets/overview_images/tg/green1.png b/src/assets/overview_images/tg/green1.png new file mode 100644 index 0000000..03c880d --- /dev/null +++ b/src/assets/overview_images/tg/green1.png Binary files differ diff --git a/src/assets/overview_images/tg/green2.png b/src/assets/overview_images/tg/green2.png new file mode 100644 index 0000000..27e3dd8 --- /dev/null +++ b/src/assets/overview_images/tg/green2.png Binary files differ diff --git a/src/assets/overview_images/tg/green3.png b/src/assets/overview_images/tg/green3.png new file mode 100644 index 0000000..74f6080 --- /dev/null +++ b/src/assets/overview_images/tg/green3.png Binary files differ diff --git a/src/assets/overview_images/tg/green4.png b/src/assets/overview_images/tg/green4.png new file mode 100644 index 0000000..dfdd870 --- /dev/null +++ b/src/assets/overview_images/tg/green4.png Binary files differ diff --git a/src/assets/overview_images/tg/red1.png b/src/assets/overview_images/tg/red1.png new file mode 100644 index 0000000..ee80b95 --- /dev/null +++ b/src/assets/overview_images/tg/red1.png Binary files differ diff --git a/src/assets/overview_images/tg/red2.png b/src/assets/overview_images/tg/red2.png new file mode 100644 index 0000000..9fae604 --- /dev/null +++ b/src/assets/overview_images/tg/red2.png Binary files differ diff --git a/src/assets/overview_images/tg/red3.png b/src/assets/overview_images/tg/red3.png new file mode 100644 index 0000000..7d8bc02 --- /dev/null +++ b/src/assets/overview_images/tg/red3.png Binary files differ diff --git a/src/assets/overview_images/tg/red4.png b/src/assets/overview_images/tg/red4.png new file mode 100644 index 0000000..2bd0f84 --- /dev/null +++ b/src/assets/overview_images/tg/red4.png Binary files differ diff --git a/src/store/getters.js b/src/store/getters.js index c33a49d..a28c9f9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,6 +10,7 @@ changeFlag: state => state.app.changeFlag, // 切换子系统标志 token: state => state.user.token, // token name: state => state.user.name, // 姓名 + id: state => state.user.id, // id roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 28149ed..e0b64b1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -5,6 +5,7 @@ state: { token: getToken(), name: '', // 姓名 + id: '', deptId: '', // 部门编号 deptName: '', // 部门名称 roleList: [], // 角色编号集合 @@ -19,6 +20,9 @@ SET_TOKEN: (state, token) => { state.token = token }, + SET_ID: (state, id) => { + state.id = id + }, SET_NAME: (state, name) => { state.name = name }, @@ -58,6 +62,7 @@ login(userInfo).then(response => { if (response.code === 200) { const data = response.data + console.log(data) setToken(data.token) commit('SET_TOKEN', data.token) resolve() @@ -75,6 +80,7 @@ return new Promise((resolve, reject) => { getInfo().then(response => { const data = response.data + commit('SET_ID', data.id) if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组 commit('SET_ROLELIST', data.roleList) commit('SET_ROLENAMES', data.roleNames) diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/assets/overview_images/tg/green1.png b/src/assets/overview_images/tg/green1.png new file mode 100644 index 0000000..03c880d --- /dev/null +++ b/src/assets/overview_images/tg/green1.png Binary files differ diff --git a/src/assets/overview_images/tg/green2.png b/src/assets/overview_images/tg/green2.png new file mode 100644 index 0000000..27e3dd8 --- /dev/null +++ b/src/assets/overview_images/tg/green2.png Binary files differ diff --git a/src/assets/overview_images/tg/green3.png b/src/assets/overview_images/tg/green3.png new file mode 100644 index 0000000..74f6080 --- /dev/null +++ b/src/assets/overview_images/tg/green3.png Binary files differ diff --git a/src/assets/overview_images/tg/green4.png b/src/assets/overview_images/tg/green4.png new file mode 100644 index 0000000..dfdd870 --- /dev/null +++ b/src/assets/overview_images/tg/green4.png Binary files differ diff --git a/src/assets/overview_images/tg/red1.png b/src/assets/overview_images/tg/red1.png new file mode 100644 index 0000000..ee80b95 --- /dev/null +++ b/src/assets/overview_images/tg/red1.png Binary files differ diff --git a/src/assets/overview_images/tg/red2.png b/src/assets/overview_images/tg/red2.png new file mode 100644 index 0000000..9fae604 --- /dev/null +++ b/src/assets/overview_images/tg/red2.png Binary files differ diff --git a/src/assets/overview_images/tg/red3.png b/src/assets/overview_images/tg/red3.png new file mode 100644 index 0000000..7d8bc02 --- /dev/null +++ b/src/assets/overview_images/tg/red3.png Binary files differ diff --git a/src/assets/overview_images/tg/red4.png b/src/assets/overview_images/tg/red4.png new file mode 100644 index 0000000..2bd0f84 --- /dev/null +++ b/src/assets/overview_images/tg/red4.png Binary files differ diff --git a/src/store/getters.js b/src/store/getters.js index c33a49d..a28c9f9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,6 +10,7 @@ changeFlag: state => state.app.changeFlag, // 切换子系统标志 token: state => state.user.token, // token name: state => state.user.name, // 姓名 + id: state => state.user.id, // id roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 28149ed..e0b64b1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -5,6 +5,7 @@ state: { token: getToken(), name: '', // 姓名 + id: '', deptId: '', // 部门编号 deptName: '', // 部门名称 roleList: [], // 角色编号集合 @@ -19,6 +20,9 @@ SET_TOKEN: (state, token) => { state.token = token }, + SET_ID: (state, id) => { + state.id = id + }, SET_NAME: (state, name) => { state.name = name }, @@ -58,6 +62,7 @@ login(userInfo).then(response => { if (response.code === 200) { const data = response.data + console.log(data) setToken(data.token) commit('SET_TOKEN', data.token) resolve() @@ -75,6 +80,7 @@ return new Promise((resolve, reject) => { getInfo().then(response => { const data = response.data + commit('SET_ID', data.id) if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组 commit('SET_ROLELIST', data.roleList) commit('SET_ROLENAMES', data.roleNames) diff --git a/src/views/alarm/alarmDetail.vue b/src/views/alarm/alarmDetail.vue index 63c852a..2c94629 100644 --- a/src/views/alarm/alarmDetail.vue +++ b/src/views/alarm/alarmDetail.vue @@ -95,6 +95,7 @@ valid: '', // 报警状态 validStr: '', // 报警状态中文 areaPosition: '', // 区域名称 + areaType: '', alarmContent: '', // 报警内容 alarmValue: '', // 报警值 alarmValueStr: '', // 报警值格式化 @@ -130,12 +131,13 @@ alarmCode: response.data.alarmCode, alarmTime: response.data.alarmTimeFmt, areaPosition: response.data.areaPosition, + areaType: response.data.areaType, alarmContent: response.data.alarmContent, alarmValue: response.data.alarmValue, valid: response.data.valid, devcode: response.data.devcode, devName: response.data.devName, - reason: response.data.reson, + reason: response.data.reason, remark: response.data.remark } diff --git a/src/api/device.js b/src/api/device.js index 65d109b..a1c7007 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -50,3 +50,13 @@ params }) } + +export function getDeviceType(areaType) { + return request({ + url: '/device/getDeviceTypeByAreaType', + method: 'get', + params:{ + areaType: areaType + } + }) +} diff --git a/src/assets/overview_images/tg/green1.png b/src/assets/overview_images/tg/green1.png new file mode 100644 index 0000000..03c880d --- /dev/null +++ b/src/assets/overview_images/tg/green1.png Binary files differ diff --git a/src/assets/overview_images/tg/green2.png b/src/assets/overview_images/tg/green2.png new file mode 100644 index 0000000..27e3dd8 --- /dev/null +++ b/src/assets/overview_images/tg/green2.png Binary files differ diff --git a/src/assets/overview_images/tg/green3.png b/src/assets/overview_images/tg/green3.png new file mode 100644 index 0000000..74f6080 --- /dev/null +++ b/src/assets/overview_images/tg/green3.png Binary files differ diff --git a/src/assets/overview_images/tg/green4.png b/src/assets/overview_images/tg/green4.png new file mode 100644 index 0000000..dfdd870 --- /dev/null +++ b/src/assets/overview_images/tg/green4.png Binary files differ diff --git a/src/assets/overview_images/tg/red1.png b/src/assets/overview_images/tg/red1.png new file mode 100644 index 0000000..ee80b95 --- /dev/null +++ b/src/assets/overview_images/tg/red1.png Binary files differ diff --git a/src/assets/overview_images/tg/red2.png b/src/assets/overview_images/tg/red2.png new file mode 100644 index 0000000..9fae604 --- /dev/null +++ b/src/assets/overview_images/tg/red2.png Binary files differ diff --git a/src/assets/overview_images/tg/red3.png b/src/assets/overview_images/tg/red3.png new file mode 100644 index 0000000..7d8bc02 --- /dev/null +++ b/src/assets/overview_images/tg/red3.png Binary files differ diff --git a/src/assets/overview_images/tg/red4.png b/src/assets/overview_images/tg/red4.png new file mode 100644 index 0000000..2bd0f84 --- /dev/null +++ b/src/assets/overview_images/tg/red4.png Binary files differ diff --git a/src/store/getters.js b/src/store/getters.js index c33a49d..a28c9f9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,6 +10,7 @@ changeFlag: state => state.app.changeFlag, // 切换子系统标志 token: state => state.user.token, // token name: state => state.user.name, // 姓名 + id: state => state.user.id, // id roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 28149ed..e0b64b1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -5,6 +5,7 @@ state: { token: getToken(), name: '', // 姓名 + id: '', deptId: '', // 部门编号 deptName: '', // 部门名称 roleList: [], // 角色编号集合 @@ -19,6 +20,9 @@ SET_TOKEN: (state, token) => { state.token = token }, + SET_ID: (state, id) => { + state.id = id + }, SET_NAME: (state, name) => { state.name = name }, @@ -58,6 +62,7 @@ login(userInfo).then(response => { if (response.code === 200) { const data = response.data + console.log(data) setToken(data.token) commit('SET_TOKEN', data.token) resolve() @@ -75,6 +80,7 @@ return new Promise((resolve, reject) => { getInfo().then(response => { const data = response.data + commit('SET_ID', data.id) if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组 commit('SET_ROLELIST', data.roleList) commit('SET_ROLENAMES', data.roleNames) diff --git a/src/views/alarm/alarmDetail.vue b/src/views/alarm/alarmDetail.vue index 63c852a..2c94629 100644 --- a/src/views/alarm/alarmDetail.vue +++ b/src/views/alarm/alarmDetail.vue @@ -95,6 +95,7 @@ valid: '', // 报警状态 validStr: '', // 报警状态中文 areaPosition: '', // 区域名称 + areaType: '', alarmContent: '', // 报警内容 alarmValue: '', // 报警值 alarmValueStr: '', // 报警值格式化 @@ -130,12 +131,13 @@ alarmCode: response.data.alarmCode, alarmTime: response.data.alarmTimeFmt, areaPosition: response.data.areaPosition, + areaType: response.data.areaType, alarmContent: response.data.alarmContent, alarmValue: response.data.alarmValue, valid: response.data.valid, devcode: response.data.devcode, devName: response.data.devName, - reason: response.data.reson, + reason: response.data.reason, remark: response.data.remark } diff --git a/src/views/alarm/alarmMonitor.vue b/src/views/alarm/alarmMonitor.vue index fe1f4d7..3fd8173 100644 --- a/src/views/alarm/alarmMonitor.vue +++ b/src/views/alarm/alarmMonitor.vue @@ -4,14 +4,15 @@
- - + +