Commit 588e5abd authored by co_dengxiongwen's avatar co_dengxiongwen

tj

parent 6bba51f2
...@@ -149,7 +149,6 @@ export default { ...@@ -149,7 +149,6 @@ export default {
isRouterAlive: true, isRouterAlive: true,
queryDetailVisible: false, queryDetailVisible: false,
urlPath: window.CONFIG.urlPath, urlPath: window.CONFIG.urlPath,
paramsList: [],
showList: [], showList: [],
takeoverInfo: '' takeoverInfo: ''
} }
...@@ -174,8 +173,6 @@ export default { ...@@ -174,8 +173,6 @@ export default {
this.initWebSocket() this.initWebSocket()
this.initWebSocket2() this.initWebSocket2()
this.getDateList() this.getDateList()
let paramsList = JSON.parse(sessionStorage.getItem('paramsList'))
this.$store.dispatch('d2admin/paramsList/set', paramsList)
}, },
destroyed: function () { destroyed: function () {
this.websocketclose() this.websocketclose()
...@@ -199,7 +196,8 @@ export default { ...@@ -199,7 +196,8 @@ export default {
let webpath = '' let webpath = ''
//wsuri.substring(0, wsuri.indexOf(':')) //wsuri.substring(0, wsuri.indexOf(':'))
if (wsuri != null && wsuri.indexOf(':') <= -1) { if (wsuri != null && wsuri.indexOf(':') <= -1) {
webpath = 'ws://59.110.43.122:8091/websocket/1001' // webpath = 'ws://59.110.43.122:8091/websocket/1001'
webpath = 'ws://10.20.72.31:8091/websocket/1001'
} else { } else {
webpath = webpath =
'ws:' + 'ws:' +
...@@ -230,7 +228,6 @@ export default { ...@@ -230,7 +228,6 @@ export default {
) { ) {
var paramsInfo = JSON.parse(e.data) var paramsInfo = JSON.parse(e.data)
console.log('paramsInfo:', paramsInfo) console.log('paramsInfo:', paramsInfo)
sessionStorage.setItem('paramsList', JSON.stringify(paramsInfo))
this.$store.dispatch('d2admin/paramsList/set', paramsInfo) this.$store.dispatch('d2admin/paramsList/set', paramsInfo)
} }
}, },
...@@ -256,7 +253,8 @@ export default { ...@@ -256,7 +253,8 @@ export default {
let webpath = '' let webpath = ''
//wsuri.substring(0, wsuri.indexOf(':')) //wsuri.substring(0, wsuri.indexOf(':'))
if (wsuri != null && wsuri.indexOf(':') <= -1) { if (wsuri != null && wsuri.indexOf(':') <= -1) {
webpath = 'ws://59.110.43.122:8091/websocket/1002' // webpath = 'ws://59.110.43.122:8091/websocket/1002'
webpath = 'ws://10.20.72.31:8091/websocket/1002'
} else { } else {
webpath = webpath =
'ws:' + 'ws:' +
...@@ -420,13 +418,8 @@ export default { ...@@ -420,13 +418,8 @@ export default {
params: this.$http.adornParams({}) params: this.$http.adornParams({})
}).then((data) => { }).then((data) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.paramsList = data.bean console.log('paramsList:', data.bean)
sessionStorage.setItem( this.$store.dispatch('d2admin/paramsList/set', data.bean)
'paramsList',
JSON.stringify(this.paramsList)
)
console.log('paramsList:', this.paramsList)
this.$store.dispatch('d2admin/paramsList/set', this.paramsList)
} }
}) })
} else { } else {
......
...@@ -137,6 +137,7 @@ export default { ...@@ -137,6 +137,7 @@ export default {
this.captchaPath = this.$http.adornUrl( this.captchaPath = this.$http.adornUrl(
`/captcha.jpg?uuid=${this.formLogin.uuid}` `/captcha.jpg?uuid=${this.formLogin.uuid}`
) )
this.$parent.getDateList()
}, },
/** /**
* @description 接收选择一个用户快速登录的事件 * @description 接收选择一个用户快速登录的事件
......
...@@ -230,6 +230,7 @@ service.interceptors.response.use( ...@@ -230,6 +230,7 @@ service.interceptors.response.use(
sessionStorage.removeItem('token') sessionStorage.removeItem('token')
sessionStorage.removeItem('uuid') sessionStorage.removeItem('uuid')
if (this) { if (this) {
this.$parent.getDateList()
//清空接管提示框 //清空接管提示框
this.$store.dispatch('d2admin/takeover/setTakeover', null) this.$store.dispatch('d2admin/takeover/setTakeover', null)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment