Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
This commit is contained in:
commit
c3ae0e5bdb
|
@ -130,8 +130,7 @@ export default {
|
||||||
watch: {
|
watch: {
|
||||||
$route: {
|
$route: {
|
||||||
handler: function (val, oldVal) {
|
handler: function (val, oldVal) {
|
||||||
console.log(val)
|
if (val.name.search('alarm') != -1) {
|
||||||
if (val.name === 'abnormal-alarm') {
|
|
||||||
this.currSlecteKey = []
|
this.currSlecteKey = []
|
||||||
this.currSlecteKey.push(val.path)
|
this.currSlecteKey.push(val.path)
|
||||||
window.sessionStorage.setItem('currMenu_alarm', val.path)
|
window.sessionStorage.setItem('currMenu_alarm', val.path)
|
||||||
|
|
|
@ -173,6 +173,7 @@ export default {
|
||||||
},
|
},
|
||||||
onDbChange(val) {
|
onDbChange(val) {
|
||||||
this.name = val
|
this.name = val
|
||||||
|
this.dbName = undefined
|
||||||
this.getDbNameList()
|
this.getDbNameList()
|
||||||
},
|
},
|
||||||
ondbNameChange(val) {
|
ondbNameChange(val) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user