Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

src/views/abnormalAlarm/RouteView.vue

@@ -130,8 +130,7 @@ export default {
   watch: {
     $route: {
       handler: function (val, oldVal) {
-        console.log(val)
-        if (val.name === 'abnormal-alarm') {
+        if (val.name.search('alarm') != -1) {
           this.currSlecteKey = []
           this.currSlecteKey.push(val.path)
           window.sessionStorage.setItem('currMenu_alarm', val.path)

src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue

@@ -173,6 +173,7 @@ export default {
     },
     onDbChange(val) {
       this.name = val
+      this.dbName = undefined
       this.getDbNameList()
     },
     ondbNameChange(val) {