diff --git a/src/api/disRevenue/resource.js b/src/api/disRevenue/resource.js
index 07a196f..ab0c2b7 100644
--- a/src/api/disRevenue/resource.js
+++ b/src/api/disRevenue/resource.js
@@ -720,7 +720,7 @@ export function getLogicalNode() {
     method: 'get',
   })
 }
-
+// 所有资源管理的列表
 export function getRegistList(query) {
   return request({
     url: '/system/registration/getRegistList',
diff --git a/src/api/menu.js b/src/api/menu.js
index 0e7f7ff..891e07d 100644
--- a/src/api/menu.js
+++ b/src/api/menu.js
@@ -24,3 +24,18 @@ export function getColumnList(data) {
     data: data
   })
 }
+// 点击菜单 计数
+export function clicMenuCount(data) {
+  return request({
+    url: '/system/sysMenuClick',
+    method: 'post',
+    data: data
+  })
+}
+// 获取最受欢迎的前八位菜单
+export function getMenuTopEight() {
+  return request({
+    url: '/system/sysMenuClick/getMenuListTopEight',
+    method: 'get'
+  })
+}
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 09e55e8..65e2878 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -369,6 +369,7 @@
           this.selectList = [];
           this.ids = [];
           if (tableInstance) {
+            console.log('rows===',rows);
             if (rows && rows.length > 0) {
               rows.forEach(row => {
                 tableInstance.toggleRowSelection(row, true);
@@ -380,6 +381,34 @@
             }
           }
         },
+        // 提供给父组件调用的方法：默认选中值 otherRow:新的回显方式，防止破坏原来rows判断的逻辑与回显
+        defaultSelectRows(rows,otherRow){
+          const tableInstance = this.config && this.config.tableKey ? this.$refs[`tableRef_${this.config.tableKey}`] : this.$refs.selChangeList;
+          this.selectList = [];
+          this.ids = [];
+          if (tableInstance) {
+            if (otherRow && otherRow.length > 0) {
+              otherRow.forEach(rowVal => {
+                this.tableList.some(tabVal => {
+                  if (rowVal.id === tabVal.id) {
+                    tableInstance.toggleRowSelection(tabVal, true);
+                    this.selectList.push(tabVal);
+                    this.ids.push(tabVal.id);
+                    return true;
+                  }
+                });
+              });
+            } else if (rows && rows.length > 0) {
+              rows.forEach(row => {
+                tableInstance.toggleRowSelection(row, true);
+                this.selectList.push(row);
+                this.ids.push(row.id);
+              });
+            } else {
+              tableInstance.clearSelection();
+            }
+          }
+        },
         renderList() {
           this.$emit("fnRenderList");
         },
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 53cc7b0..bddb65f 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,99 +1,99 @@
-<template>
-  <div v-if="!item.hidden">
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </app-link>
-    </template>
-
-    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
-      </template>
-      <sidebar-item
-        v-for="(child, index) in item.children"
-        :key="child.path + index"
-        :is-nest="true"
-        :item="child"
-        :base-path="resolvePath(child.path)"
-        class="nest-menu"
-      />
-    </el-submenu>
-  </div>
-</template>
-
-<script>
-import path from 'path'
-import { isExternal } from '@/utils/validate'
-import Item from './Item'
-import AppLink from './Link'
-import FixiOSBug from './FixiOSBug'
-
-export default {
-  name: 'SidebarItem',
-  components: { Item, AppLink },
-  mixins: [FixiOSBug],
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    this.onlyOneChild = null
-    return {}
-  },
-  methods: {
-    hasOneShowingChild(children = [], parent) {
-      if (!children) {
-        children = []
-      }
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        }
-        // Temp set(will be used if only has one showing child)
-        this.onlyOneChild = item
-        return true
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath, routeQuery) {
-      if (isExternal(routePath)) {
-        return routePath
-      }
-      if (isExternal(this.basePath)) {
-        return this.basePath
-      }
-      if (routeQuery) {
-        let query = JSON.parse(routeQuery)
-        return { path: path.resolve(this.basePath, routePath), query: query }
-      }
-      return path.resolve(this.basePath, routePath)
-    }
-  }
-}
-</script>
+<template>
+  <div v-if="!item.hidden">
+    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
+      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
+        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
+          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
+        </el-menu-item>
+      </app-link>
+    </template>
+
+    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+      <template slot="title">
+        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+      </template>
+      <sidebar-item
+        v-for="(child, index) in item.children"
+        :key="child.path + index"
+        :is-nest="true"
+        :item="child"
+        :base-path="resolvePath(child.path)"
+        class="nest-menu"
+      />
+    </el-submenu>
+  </div>
+</template>
+
+<script>
+import path from 'path'
+import { isExternal } from '@/utils/validate'
+import Item from './Item'
+import AppLink from './Link'
+import FixiOSBug from './FixiOSBug'
+
+export default {
+  name: 'SidebarItem',
+  components: { Item, AppLink },
+  mixins: [FixiOSBug],
+  props: {
+    // route object
+    item: {
+      type: Object,
+      required: true
+    },
+    isNest: {
+      type: Boolean,
+      default: false
+    },
+    basePath: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    this.onlyOneChild = null
+    return {}
+  },
+  methods: {
+    hasOneShowingChild(children = [], parent) {
+      if (!children) {
+        children = []
+      }
+      const showingChildren = children.filter(item => {
+        if (item.hidden) {
+          return false
+        }
+        // Temp set(will be used if only has one showing child)
+        this.onlyOneChild = item
+        return true
+      })
+
+      // When there is only one child router, the child router is displayed by default
+      if (showingChildren.length === 1) {
+        return true
+      }
+
+      // Show parent if there are no child router to display
+      if (showingChildren.length === 0) {
+        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
+        return true
+      }
+
+      return false
+    },
+    resolvePath(routePath, routeQuery) {
+      if (isExternal(routePath)) {
+        return routePath
+      }
+      if (isExternal(this.basePath)) {
+        return this.basePath
+      }
+      if (routeQuery) {
+        let query = JSON.parse(routeQuery)
+        return { path: path.resolve(this.basePath, routePath), query: query }
+      }
+      return path.resolve(this.basePath, routePath)
+    }
+  }
+}
+</script>
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index cd86ea6..26bf6e3 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -11,6 +11,7 @@
                 :active-text-color="settings.theme"
                 :collapse-transition="false"
                 mode="vertical"
+                @select="handleMenuSelect"
             >
                 <sidebar-item
                     v-for="(route, index) in sidebarRouters"
@@ -28,6 +29,7 @@ import { mapGetters, mapState } from "vuex"
 import Logo from "./Logo"
 import SidebarItem from "./SidebarItem"
 import variables from "@/assets/styles/variables.scss"
+import {clicMenuCount} from "@/api/menu";
 
 export default {
     components: { SidebarItem, Logo },
@@ -52,6 +54,39 @@ export default {
         isCollapse() {
             return !this.sidebar.opened
         }
-    }
+    },
+    data(){
+        return {
+          menuList: {}
+      }
+    },
+    created() {
+      this.menuHandle(this.sidebarRouters);
+    },
+    methods: {
+      // 点击菜单 计数
+      handleMenuSelect(index, indexPath) {
+        let params = {pageRoute: index, pageName: this.menuList[index]};
+        clicMenuCount(params).then(res => {});
+      },
+      // 处理菜单
+      menuHandle(menu) {
+        menu.forEach(item => {
+          if (!item.hidden) {
+            item.children.forEach(val => {
+              if (!val.hidden) {
+                if (val.children) {
+                  val.path = item.path + '/'  + val.path;
+                  this.menuHandle([val]);
+                } else {
+                  let link = item.path && item.path === '/' ? item.path + val.path : item.path + '/' + val.path;
+                  this.menuList[link] = val.meta.title;
+                }
+              }
+            });
+          }
+        });
+      },
+      }
 }
 </script>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index fa837fc..f0b0837 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -1,337 +1,337 @@
-<template>
-  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="{ 'active': isActive(tag), 'has-icon': tagsIcon }"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        :style="activeStyle(tag)"
-        @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-      >
-        <svg-icon v-if="tagsIcon && tag.meta && tag.meta.icon && tag.meta.icon !== '#'" :icon-class="tag.meta.icon" />
-        {{ tag.title }}
-        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-      </router-link>
-    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li>
-      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 关闭当前</li>
-      <li @click="closeOthersTags"><i class="el-icon-circle-close"></i> 关闭其他</li>
-      <li v-if="!isFirstView()" @click="closeLeftTags"><i class="el-icon-back"></i> 关闭左侧</li>
-      <li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 关闭右侧</li>
-      <li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 全部关闭</li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-
-export default {
-  components: { ScrollPane },
-  data() {
-    return {
-      visible: false,
-      top: 0,
-      left: 0,
-      selectedTag: {},
-      affixTags: []
-    }
-  },
-  computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    },
-    routes() {
-      return this.$store.state.permission.routes
-    },
-    theme() {
-      return this.$store.state.settings.theme
-    },
-    tagsIcon() {
-      return this.$store.state.settings.tagsIcon
-    }
-  },
-  watch: {
-    $route() {
-      this.addTags()
-      this.moveToCurrentTag()
-    },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
-      } else {
-        document.body.removeEventListener('click', this.closeMenu)
-      }
-    }
-  },
-  mounted() {
-    this.initTags()
-    this.addTags()
-  },
-  methods: {
-    isActive(route) {
-      return route.path === this.$route.path
-    },
-    activeStyle(tag) {
-      if (!this.isActive(tag)) return {}
-      return {
-        "background-color": this.theme,
-        "border-color": this.theme
-      }
-    },
-    isAffix(tag) {
-      return tag.meta && tag.meta.affix
-    },
-    isFirstView() {
-      try {
-        return this.selectedTag.fullPath === '/index' || this.selectedTag.fullPath === this.visitedViews[1].fullPath
-      } catch (err) {
-        return false
-      }
-    },
-    isLastView() {
-      try {
-        return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
-      } catch (err) {
-        return false
-      }
-    },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
-        if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
-          tags.push({
-            fullPath: tagPath,
-            path: tagPath,
-            name: route.name,
-            meta: { ...route.meta }
-          })
-        }
-        if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
-          if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
-          }
-        }
-      })
-      return tags
-    },
-    initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
-      for (const tag of affixTags) {
-        // Must have tag name
-        if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
-        }
-      }
-    },
-    addTags() {
-      const { name } = this.$route
-      if (name) {
-        this.$store.dispatch('tagsView/addView', this.$route)
-      }
-    },
-    moveToCurrentTag() {
-      const tags = this.$refs.tag
-      this.$nextTick(() => {
-        for (const tag of tags) {
-          if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
-            // when query is different then update
-            if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-            }
-            break
-          }
-        }
-      })
-    },
-    refreshSelectedTag(view) {
-      this.$tab.refreshPage(view)
-      if (this.$route.meta.link) {
-        this.$store.dispatch('tagsView/delIframeView', this.$route)
-      }
-    },
-    closeSelectedTag(view) {
-      this.$tab.closePage(view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
-    },
-    closeRightTags() {
-      this.$tab.closeRightPage(this.selectedTag).then(visitedViews => {
-        if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
-          this.toLastView(visitedViews)
-        }
-      })
-    },
-    closeLeftTags() {
-      this.$tab.closeLeftPage(this.selectedTag).then(visitedViews => {
-        if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
-          this.toLastView(visitedViews)
-        }
-      })
-    },
-    closeOthersTags() {
-      this.$router.push(this.selectedTag.fullPath).catch(()=>{})
-      this.$tab.closeOtherPage(this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
-    },
-    closeAllTags(view) {
-      this.$tab.closeAllPage().then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === this.$route.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
-      })
-    },
-    toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
-      if (latestView) {
-        this.$router.push(latestView.fullPath)
-      } else {
-        // now the default is to redirect to the home page if there is no tags-view,
-        // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
-          // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
-        } else {
-          this.$router.push('/')
-        }
-      }
-    },
-    openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
-
-      if (left > maxLeft) {
-        this.left = maxLeft
-      } else {
-        this.left = left
-      }
-
-      this.top = e.clientY
-      this.visible = true
-      this.selectedTag = tag
-    },
-    closeMenu() {
-      this.visible = false
-    },
-    handleScroll() {
-      this.closeMenu()
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.tags-view-container {
-  height: 34px;
-  width: 100%;
-  background: #fff;
-  border-bottom: 1px solid #d8dce5;
-  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-  .tags-view-wrapper {
-    .tags-view-item {
-      display: inline-block;
-      position: relative;
-      cursor: pointer;
-      height: 26px;
-      line-height: 26px;
-      border: 1px solid #d8dce5;
-      color: #495060;
-      background: #fff;
-      padding: 0 8px;
-      font-size: 12px;
-      margin-left: 5px;
-      margin-top: 4px;
-      &:first-of-type {
-        margin-left: 15px;
-      }
-      &:last-of-type {
-        margin-right: 15px;
-      }
-      &.active {
-        background-color: #42b983;
-        color: #fff;
-        border-color: #42b983;
-        &::before {
-          content: '';
-          background: #fff;
-          display: inline-block;
-          width: 8px;
-          height: 8px;
-          border-radius: 50%;
-          position: relative;
-          margin-right: 2px;
-        }
-      }
-    }
-  }
-
-  .tags-view-item.active.has-icon::before {
-    content: none !important;
-  }
-
-  .contextmenu {
-    margin: 0;
-    background: #fff;
-    z-index: 3000;
-    position: absolute;
-    list-style-type: none;
-    padding: 5px 0;
-    border-radius: 4px;
-    font-size: 12px;
-    font-weight: 400;
-    color: #333;
-    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-    li {
-      margin: 0;
-      padding: 7px 16px;
-      cursor: pointer;
-      &:hover {
-        background: #eee;
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-//reset element css of el-icon-close
-.tags-view-wrapper {
-  .tags-view-item {
-    .el-icon-close {
-      width: 16px;
-      height: 16px;
-      vertical-align: 2px;
-      border-radius: 50%;
-      text-align: center;
-      transition: all .3s cubic-bezier(.645, .045, .355, 1);
-      transform-origin: 100% 50%;
-      &:before {
-        transform: scale(.6);
-        display: inline-block;
-        vertical-align: -3px;
-      }
-      &:hover {
-        background-color: #b4bccc;
-        color: #fff;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div id="tags-view-container" class="tags-view-container">
+    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
+      <router-link
+        v-for="tag in visitedViews"
+        ref="tag"
+        :key="tag.path"
+        :class="{ 'active': isActive(tag), 'has-icon': tagsIcon }"
+        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
+        tag="span"
+        class="tags-view-item"
+        :style="activeStyle(tag)"
+        @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
+        @contextmenu.prevent.native="openMenu(tag,$event)"
+      >
+        <svg-icon v-if="tagsIcon && tag.meta && tag.meta.icon && tag.meta.icon !== '#'" :icon-class="tag.meta.icon" />
+        {{ tag.title }}
+        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+      </router-link>
+    </scroll-pane>
+    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
+      <li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li>
+      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 关闭当前</li>
+      <li @click="closeOthersTags"><i class="el-icon-circle-close"></i> 关闭其他</li>
+      <li v-if="!isFirstView()" @click="closeLeftTags"><i class="el-icon-back"></i> 关闭左侧</li>
+      <li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 关闭右侧</li>
+      <li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 全部关闭</li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import ScrollPane from './ScrollPane'
+import path from 'path'
+
+export default {
+  components: { ScrollPane },
+  data() {
+    return {
+      visible: false,
+      top: 0,
+      left: 0,
+      selectedTag: {},
+      affixTags: []
+    }
+  },
+  computed: {
+    visitedViews() {
+      return this.$store.state.tagsView.visitedViews
+    },
+    routes() {
+      return this.$store.state.permission.routes
+    },
+    theme() {
+      return this.$store.state.settings.theme
+    },
+    tagsIcon() {
+      return this.$store.state.settings.tagsIcon
+    }
+  },
+  watch: {
+    $route() {
+      this.addTags()
+      this.moveToCurrentTag()
+    },
+    visible(value) {
+      if (value) {
+        document.body.addEventListener('click', this.closeMenu)
+      } else {
+        document.body.removeEventListener('click', this.closeMenu)
+      }
+    }
+  },
+  mounted() {
+    this.initTags()
+    this.addTags()
+  },
+  methods: {
+    isActive(route) {
+      return route.path === this.$route.path
+    },
+    activeStyle(tag) {
+      if (!this.isActive(tag)) return {}
+      return {
+        "background-color": this.theme,
+        "border-color": this.theme
+      }
+    },
+    isAffix(tag) {
+      return tag.meta && tag.meta.affix
+    },
+    isFirstView() {
+      try {
+        return this.selectedTag.fullPath === '/index' || this.selectedTag.fullPath === this.visitedViews[1].fullPath
+      } catch (err) {
+        return false
+      }
+    },
+    isLastView() {
+      try {
+        return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
+      } catch (err) {
+        return false
+      }
+    },
+    filterAffixTags(routes, basePath = '/') {
+      let tags = []
+      routes.forEach(route => {
+        if (route.meta && route.meta.affix) {
+          const tagPath = path.resolve(basePath, route.path)
+          tags.push({
+            fullPath: tagPath,
+            path: tagPath,
+            name: route.name,
+            meta: { ...route.meta }
+          })
+        }
+        if (route.children) {
+          const tempTags = this.filterAffixTags(route.children, route.path)
+          if (tempTags.length >= 1) {
+            tags = [...tags, ...tempTags]
+          }
+        }
+      })
+      return tags
+    },
+    initTags() {
+      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
+      for (const tag of affixTags) {
+        // Must have tag name
+        if (tag.name) {
+          this.$store.dispatch('tagsView/addVisitedView', tag)
+        }
+      }
+    },
+    addTags() {
+      const { name } = this.$route
+      if (name) {
+        this.$store.dispatch('tagsView/addView', this.$route)
+      }
+    },
+    moveToCurrentTag() {
+      const tags = this.$refs.tag
+      this.$nextTick(() => {
+        for (const tag of tags) {
+          if (tag.to.path === this.$route.path) {
+            this.$refs.scrollPane.moveToTarget(tag)
+            // when query is different then update
+            if (tag.to.fullPath !== this.$route.fullPath) {
+              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
+            }
+            break
+          }
+        }
+      })
+    },
+    refreshSelectedTag(view) {
+      this.$tab.refreshPage(view)
+      if (this.$route.meta.link) {
+        this.$store.dispatch('tagsView/delIframeView', this.$route)
+      }
+    },
+    closeSelectedTag(view) {
+      this.$tab.closePage(view).then(({ visitedViews }) => {
+        if (this.isActive(view)) {
+          this.toLastView(visitedViews, view)
+        }
+      })
+    },
+    closeRightTags() {
+      this.$tab.closeRightPage(this.selectedTag).then(visitedViews => {
+        if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
+          this.toLastView(visitedViews)
+        }
+      })
+    },
+    closeLeftTags() {
+      this.$tab.closeLeftPage(this.selectedTag).then(visitedViews => {
+        if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
+          this.toLastView(visitedViews)
+        }
+      })
+    },
+    closeOthersTags() {
+      this.$router.push(this.selectedTag.fullPath).catch(()=>{})
+      this.$tab.closeOtherPage(this.selectedTag).then(() => {
+        this.moveToCurrentTag()
+      })
+    },
+    closeAllTags(view) {
+      this.$tab.closeAllPage().then(({ visitedViews }) => {
+        if (this.affixTags.some(tag => tag.path === this.$route.path)) {
+          return
+        }
+        this.toLastView(visitedViews, view)
+      })
+    },
+    toLastView(visitedViews, view) {
+      const latestView = visitedViews.slice(-1)[0]
+      if (latestView) {
+        this.$router.push(latestView.fullPath)
+      } else {
+        // now the default is to redirect to the home page if there is no tags-view,
+        // you can adjust it according to your needs.
+        if (view.name === 'Dashboard') {
+          // to reload home page
+          this.$router.replace({ path: '/redirect' + view.fullPath })
+        } else {
+          this.$router.push('/')
+        }
+      }
+    },
+    openMenu(tag, e) {
+      const menuMinWidth = 105
+      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
+      const offsetWidth = this.$el.offsetWidth // container width
+      const maxLeft = offsetWidth - menuMinWidth // left boundary
+      const left = e.clientX - offsetLeft + 15 // 15: margin right
+
+      if (left > maxLeft) {
+        this.left = maxLeft
+      } else {
+        this.left = left
+      }
+
+      this.top = e.clientY
+      this.visible = true
+      this.selectedTag = tag
+    },
+    closeMenu() {
+      this.visible = false
+    },
+    handleScroll() {
+      this.closeMenu()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.tags-view-container {
+  height: 34px;
+  width: 100%;
+  background: #fff;
+  border-bottom: 1px solid #d8dce5;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+  .tags-view-wrapper {
+    .tags-view-item {
+      display: inline-block;
+      position: relative;
+      cursor: pointer;
+      height: 26px;
+      line-height: 26px;
+      border: 1px solid #d8dce5;
+      color: #495060;
+      background: #fff;
+      padding: 0 8px;
+      font-size: 12px;
+      margin-left: 5px;
+      margin-top: 4px;
+      &:first-of-type {
+        margin-left: 15px;
+      }
+      &:last-of-type {
+        margin-right: 15px;
+      }
+      &.active {
+        background-color: #42b983;
+        color: #fff;
+        border-color: #42b983;
+        &::before {
+          content: '';
+          background: #fff;
+          display: inline-block;
+          width: 8px;
+          height: 8px;
+          border-radius: 50%;
+          position: relative;
+          margin-right: 2px;
+        }
+      }
+    }
+  }
+
+  .tags-view-item.active.has-icon::before {
+    content: none !important;
+  }
+
+  .contextmenu {
+    margin: 0;
+    background: #fff;
+    z-index: 3000;
+    position: absolute;
+    list-style-type: none;
+    padding: 5px 0;
+    border-radius: 4px;
+    font-size: 12px;
+    font-weight: 400;
+    color: #333;
+    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+    li {
+      margin: 0;
+      padding: 7px 16px;
+      cursor: pointer;
+      &:hover {
+        background: #eee;
+      }
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+//reset element css of el-icon-close
+.tags-view-wrapper {
+  .tags-view-item {
+    .el-icon-close {
+      width: 16px;
+      height: 16px;
+      vertical-align: 2px;
+      border-radius: 50%;
+      text-align: center;
+      transition: all .3s cubic-bezier(.645, .045, .355, 1);
+      transform-origin: 100% 50%;
+      &:before {
+        transform: scale(.6);
+        display: inline-block;
+        vertical-align: -3px;
+      }
+      &:hover {
+        background-color: #b4bccc;
+        color: #fff;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 51642cc..ffd4d0c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,6 +6,7 @@ Vue.use(Router)
 /* Layout */
 import Layout from '@/layout'
 import DialogView from '@/views/earnManage/server/dialogView.vue'
+import Welcome from '@/views/welcome.vue'
 
 /**
  * Note: 路由配置项
@@ -62,19 +63,12 @@ export const constantRoutes = [
     component: () => import('@/views/error/401'),
     hidden: true
   },
-  // {
-  //   path: '',
-  //   component: Layout,
-  //   redirect: 'index',
-  //   children: [
-  //     {
-  //       path: 'index',
-  //       component: () => import('@/views/index'),
-  //       name: 'Index',
-  //       meta: { title: '首页', icon: 'dashboard', affix: true }
-  //     }
-  //   ]
-  // },
+  {
+    path: '',
+    component: Welcome,
+    hidden: true,
+    name: 'Welcome'
+  },
   {
     path: '/user',
     component: Layout,
diff --git a/src/views/earnManage/busValueCount/details.vue b/src/views/earnManage/busValueCount/details.vue
index 39e0d79..5e95995 100644
--- a/src/views/earnManage/busValueCount/details.vue
+++ b/src/views/earnManage/busValueCount/details.vue
@@ -2,22 +2,24 @@
   <div class="app-container">
     <Form :formList="formList" :ruleFormData="ruleForm" @fnClick="callback"></Form>
     <!--    弹窗  -->
-    <el-dialog title="选择包含资源" :visible.sync="open" width="900px" height="300px" append-to-body>
+    <el-dialog title="选择包含资源" :visible.sync="open" width="1000px" height="300px" append-to-body>
       <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="按业务名称选择" name="first">用户管理</el-tab-pane>
-        <el-tab-pane label="按逻辑节点标识选择" name="second">配置管理</el-tab-pane>
+        <el-tab-pane label="按业务名称选择" name="first"></el-tab-pane>
+        <el-tab-pane label="按逻辑节点标识选择" name="second"></el-tab-pane>
       </el-tabs>
       <el-row :gutter="20">
         <splitpanes :horizontal="this.$store.getters.device === 'mobile'" class="default-theme">
-          <pane size="16">
+          <pane size="20">
             <el-col>
               <div class="head-container">
-                <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
+                <el-tree :data="deptOptions" :props="defaultProps" :current-node-key="currentNodeKey" :expand-on-click-node="false" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
               </div>
             </el-col>
           </pane>
-          <pane size="84">
-            <TableList ref="tabRef" :columns="columns" :config="{colHiddenCheck: true, colTopHiddenIcon: true, currentSel: true}" :queryParams="{total: 0}" :tableList="tableList" @fnClick="callback"></TableList>
+          <pane size="80">
+            <div class="block" style="max-height: calc(100vh - 290px);overflow: auto;">
+              <TableList ref="tabRef" :columns="columns" :config="{colTopHiddenIcon: true}" :queryParams="{total: 0}" :tableList="tableList" @fnClick="callback"></TableList>
+            </div>
           </pane>
         </splitpanes>
       </el-row>
@@ -32,10 +34,9 @@
 <script setup>
   import Form from '@/components/form/index.vue';
   import TableList from "@/components/table/index.vue"
-  import {deptTreeSelect } from "@/api/system/user"
   import { Splitpanes, Pane } from "splitpanes"
   import {listAllBusinessList, addTaskStatic, switchNameTree} from "@/api/disRevenue/earnManage"
-  import {listAllSwitchName, getRegistList} from "@/api/disRevenue/resource"
+  import {getLogicalNode, getRegistList} from "@/api/disRevenue/resource"
   import "splitpanes/dist/splitpanes.css"
   export default {
     name: 'busValueCount_Details',
@@ -56,6 +57,11 @@
         paramsData: {},
         busNameList: {},
         open: false,
+        busNameListData: [],
+        logicalNodeList: [],
+        currentNodeKey: '',
+        tableColChange: {},
+        changeName: null,
         tableList: [],
         // 列显隐信息
         columns: {
@@ -70,22 +76,59 @@
       this.paramsData = this.$route && this.$route.query;
       this.fnFormList();
       this.switchList();
-      this.getDeptTree();
+      this.fnLogicalNode();
     },
     methods: {
       handleClick(tab, event) {
-        console.log(tab, event);
+        if (this.changeName) {
+          this.tableColChange[this.changeName] = this.tableColChange[this.changeName] ? this.tableColChange[this.changeName].concat(this.$refs.tabRef.selectList) : this.$refs.tabRef.selectList;
+        }
+        this.deptOptions = [];
+        this.currentNodeKey = null;
+        if (this.activeName === 'first') {
+          this.deptOptions = this.busNameListData;
+        } else {
+          this.deptOptions = this.logicalNodeList;
+        }
+        if (this.deptOptions.length > 1) {
+          this.changeName = null;
+          this.handleNodeClick(this.deptOptions[0]);
+        }
       },
-      /** 查询部门下拉树结构 */
-      getDeptTree() {
-        deptTreeSelect().then(response => {
-          this.deptOptions = response.data;
-        })
+      // 逻辑节点标识
+      fnLogicalNode() {
+        getLogicalNode().then(val => {
+          this.logicalNodeList = val && val.map(item => {
+            return Object.assign({}, item,{label: item.logicalNodeId, id: item.logicalNodeId});
+          });
+        });
       },
       // 节点单击事件
       handleNodeClick(data) {
-        // this.queryParams.deptId = data.id;
-        // this.handleQuery();
+        this.currentNodeKey = data.id;
+        if (this.changeName) {
+          this.tableColChange[this.changeName] = this.tableColChange[this.changeName] ? this.tableColChange[this.changeName].concat(this.$refs.tabRef.selectList) : this.$refs.tabRef.selectList;
+        }
+        let params = {logicalNodeId: data.id};
+        if (this.activeName === 'first') {
+          params = {businessName: data.id};
+        }
+        this.changeName = data.id;
+        this.getList(params,data.id);
+      },
+      getList(val,changeVal) {
+        this.$modal.loading();
+        getRegistList(Object.assign({}, {resourceType: 1}, val)).then(val => {
+          this.tableList = val && val.data || [];
+          if (this.tableColChange[changeVal] && this.tableColChange[changeVal].length > 0) {
+            setTimeout(() => {
+              this.$refs.tabRef.defaultSelectRows(null, this.tableColChange[changeVal]);
+            },500);
+          }
+          this.$modal.closeLoading();
+        }).catch(() => {
+          this.$modal.closeLoading();
+        });
       },
       // formList集合
       fnFormList(objVal) {
@@ -96,7 +139,7 @@
             taskName: {label: '任务名称', span: 18, type: 'input',required: true},
             businessName: {label: '业务名称', span: 18, type: 'select', options:[]},
             resourceType: {label: '包含资源类型', span: 18, type: 'select', eventName: 'change', options: this.dict.type.resource_type, required: true},
-            includedResourcesTree: {label: '包含资源', span: 18, type: 'treeSelect', options: [], searchable: true, multiple: true, required: true, hidden: this.ruleForm.resourceType && this.ruleForm.resourceType === '1' ? false : true},
+            includedResourcesTree: {label: '包含资源', span: 18, type: 'input', required: true, hidden: this.ruleForm.resourceType && this.ruleForm.resourceType === '1' ? false : true},
             changeClientId: {label: '选择ClientID', span: 3, type: 'button', eventName: 'change', hidden: this.ruleForm.resourceType && this.ruleForm.resourceType === '1' ? false : true},
             includedResources: {label: '包含资源', span: 18, type: 'cascader', options: [], required: true, hidden: this.ruleForm.resourceType && this.ruleForm.resourceType === '2' ? false : true},
             calculationType: {label: '计算类型', span: 18, type: 'select', options: this.dict.type.caculate_type, eventName: 'change', required: true},
@@ -108,6 +151,7 @@
       switchList() {
         listAllBusinessList().then(val => {
           this.formList[0].controls.businessName['options'] = val && val.data.map(item => {
+            this.busNameListData.push(Object.assign({}, item, {id: item.businessName, label: item.businessName}));
             this.busNameList[item.businessName] = item;
             return Object.assign({label: item.businessName, value: item.businessName});
           });
@@ -133,8 +177,16 @@
         }
       },
       submitPubilc() {
+        this.tableColChange[this.changeName] = this.tableColChange[this.changeName] ? this.tableColChange[this.changeName].concat(this.$refs.tabRef.selectList) : this.$refs.tabRef.selectList;
         this.open = false;
-        this.getFormDataList(this.currentDataList.id, 'btnGain');
+        console.log('tableColChange===',this.tableColChange);
+        let valList = [];
+        Object.keys(this.tableColChange).forEach(key => {
+          if (this.tableColChange[key] && this.tableColChange[key].length > 0) {
+            valList = valList.concat(this.tableColChange[key].map(item => item.clientId));
+          }
+        });
+        console.log('valList==',valList);
       },
       // 监听事件
       callback(result, dataVal, formVal) {
@@ -150,7 +202,7 @@
                   this.formList[0].controls.includedResources['hidden'] = false;
                   this.formList[0].controls.includedResourcesTree['hidden'] = true;
                 }
-                this.includeDataList(dataVal);
+                // this.includeDataList(dataVal);
               } else {
                 this.formList[0].controls.includedResourcesTree['hidden'] = true;
                 this.formList[0].controls.changeClientId['hidden'] = true;
@@ -175,6 +227,8 @@
               break;
             case 'changeClientId':
               this.open = true;
+              this.tableColChange = {};
+              this.handleClick();
               break;
             case 'submit':
               dataVal['calculationMode'] = this.paramsData.calculationMode;
diff --git a/src/views/earnManage/server/serverTabs.vue b/src/views/earnManage/server/serverTabs.vue
index cf4d324..f274871 100644
--- a/src/views/earnManage/server/serverTabs.vue
+++ b/src/views/earnManage/server/serverTabs.vue
@@ -161,7 +161,6 @@
       activeName: {
         handler(val) {
           this.getList();
-          this.busList();
         },
         deep: true,
         immediate: true
@@ -225,11 +224,10 @@
         busNameList: []
       }
     },
-    // created() {
-    //   this.$nextTick(() => {
-    //     this.getList(1);
-    //   });
-    // },
+    created() {
+      // this.getList(1);
+      this.busList();
+    },
     // activated() {
     //   this.$nextTick(() => {
     //     this.getList();
diff --git a/src/views/login.vue b/src/views/login.vue
index 5188f3e..900b9ed 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -143,7 +143,8 @@ export default {
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
             // 默认指向知识库页面
-            this.$router.push('/problemRecord').catch(()=>{})
+            // this.$router.push('/problemRecord').catch(()=>{})
+            this.$router.push('/').catch(()=>{})
             // this.$router.push({ path: this.redirect || "/" }).catch(()=>{})
           }).catch(() => {
             this.loading = false
diff --git a/src/views/resource/switchMonitorStrat/monitorStrategy.vue b/src/views/resource/switchMonitorStrat/monitorStrategy.vue
index f353d3c..f18dd7f 100644
--- a/src/views/resource/switchMonitorStrat/monitorStrategy.vue
+++ b/src/views/resource/switchMonitorStrat/monitorStrategy.vue
@@ -260,7 +260,7 @@
         getMonitorPolicy(id).then(val => {
           if (val && val.data) {
             if (val.data && val.data.policy) {
-              val.data.policy['policyName'] = btnGain && btnGain ? val.data.policy['policyName'] + '-引用' : val.data.policy['policyName'];
+              val.data.policy['policyName'] = btnGain && btnGain ? val.data.policy['policyName'] + '-' + Date.now() : val.data.policy['policyName'];
               val.data.policy['deployDevice'] = val.data.policy.deployDevice.split('\n');
               // val.data.policy['status'] = Number(val.data.policy.status);
               this.ruleFormData = val.data.policy;
@@ -358,8 +358,16 @@
           // 3. 操作form（如验证）
           formValid.validate((valid) => {
             if (valid) {
-              formValid.model.deployDevice = formValid.model.deployDevice.join('\n');
-              this.ruleFormData = formValid.model;
+              let newModel = {};
+              let newForm = JSON.parse(JSON.stringify(formValid.model));
+              this.formList.forEach(formCol => {
+                Object.keys(formCol.controls).forEach(colVal => {
+                  if (!formCol.controls[colVal].hidden && colVal !== 'id') {
+                    newModel[colVal] = newForm[colVal];
+                  }
+                });
+              });
+              this.ruleFormData = newModel;
               resolve(true);
             } else {
               resolve(false);
@@ -393,6 +401,7 @@
 
         let paramsList = idsList.concat(autoIds);
         let params = Object.assign(this.ruleFormData, {resourceType: 'switch'},{collectionAndIdList: paramsList});
+        params.deployDevice = params.deployDevice.join('\n');
         let fnType = addResourcePolicy;
         if (this.paramsData && this.paramsData.id) {
           fnType = updateResourcePolicy;
diff --git a/src/views/welcome.vue b/src/views/welcome.vue
index adf657f..dac428a 100644
--- a/src/views/welcome.vue
+++ b/src/views/welcome.vue
@@ -21,7 +21,7 @@
     <div class="w100 plr-20">
       <div class="menu-container">
         <div v-for="menuItem of menuList" @click="menuRouter(menuItem)" class="menu-item">
-          <div class="menu-item-content">{{menuItem.name}}</div>
+          <div class="menu-item-content">{{menuItem.pageName}}</div>
         </div>
       </div>
     </div>
@@ -29,6 +29,7 @@
 </template>
 
 <script>
+  import {clicMenuCount, getMenuTopEight} from "@/api/menu";
   export default {
     name: "welcome",
     data() {
@@ -56,25 +57,32 @@
     methods: {
       // 处理菜单
       menuHandle(menu) {
-        menu.forEach(item => {
-          if (!item.hidden) {
-            item.children.forEach(val => {
-              if (!val.hidden) {
-                if (val.children) {
-                  val.path = item.path + '/'  + val.path;
-                  this.menuHandle([val]);
-                } else {
-                  this.menuList.push({name: val.meta.title, link: item.path && item.path === '/' ? item.path + val.path : item.path + '/' + val.path});
-                }
-              }
-            });
+        // menu.forEach(item => {
+        //   if (!item.hidden) {
+        //     item.children.forEach(val => {
+        //       if (!val.hidden) {
+        //         if (val.children) {
+        //           val.path = item.path + '/'  + val.path;
+        //           this.menuHandle([val]);
+        //         } else {
+        //           this.menuList.push({name: val.meta.title, link: item.path && item.path === '/' ? item.path + val.path : item.path + '/' + val.path});
+        //         }
+        //       }
+        //     });
+        //   }
+        // });
+        getMenuTopEight().then(res => {
+          if (res && res.data) {
+            this.menuList = res.data
           }
         });
       },
       // 菜单跳转
       menuRouter(menuLink) {
+        let params = {pageRoute: menuLink.pageRoute, pageName: menuLink.pageName};
+        clicMenuCount(params).then(res => {});
         this.$router.push({
-          path: menuLink.link
+          path: menuLink.pageRoute
         });
       }
     }