Merge branch 'master' of http://121.37.208.192:3000/root/interlock_client

src/components/menu/index.js

@@ -82,8 +82,10 @@ export default {
       } else {
         /* IoT TPM相关 修改框架 */
         // 设置联锁添加页面高亮联锁总表
-        if(this.$route.path == '/interLock/summary/set'){
+        if(this.$route.path == '/interLock/summary/set' || this.$route.path == '/interLock/detail'){
           this.selectedKeys = ['/interLock/summary']
+        } else if (this.$route.path == '/interLock/history/detail'){
+          this.selectedKeys = ['/interLock/historyData']
         } else {
           this.selectedKeys = [routes.pop().path]
         }