Browse Source

0110 14:09

提测tab栏
mo 5 years ago
parent
commit
0566c4ecbf

+ 3 - 3
src/layout/components/TagsView.vue

@@ -10,8 +10,8 @@
                    :key="index"
                    @contextmenu.prevent.native="openMenu(tag,$event)">
         {{generateTitle(tag.title)}}
+        <!-- v-if="index == Array.from(visitedViews).length -1" -->
         <span class='el-icon-close'
-              v-if="index == Array.from(visitedViews).length -1"
               @click.prevent.stop='closeSelectedTag(tag)'></span>
       </router-link>
     </scroll-pane>
@@ -210,8 +210,8 @@ export default {
         vertical-align: -3px;
       }
       &:hover {
-        background-color: #b4bccc;
-        color: #fff;
+        // background-color: #fff;
+        color: #b4bccc;
       }
     }
   }

+ 9 - 2
src/views/categroyManager/insideSetting/adminManager.vue

@@ -56,13 +56,20 @@ export default {
     }
   },
   created () {
-    this.$route.query.page ? this.pageInfo.page = parseInt(this.$route.query.page) : this.pageInfo.page = 1
+    this.init()
+  },
+  activated () {
+    this.init()
   },
   mounted () {
 
-    this.getList()
+
   },
   methods: {
+    init () {
+      this.$route.query.page ? this.pageInfo.page = parseInt(this.$route.query.page) : this.pageInfo.page = 1
+      this.getList()
+    },
     getList () {
       roleQueryPage({
         rows: this.pageInfo.limit,

+ 26 - 19
src/views/categroyManager/vipActiveList.vue

@@ -358,27 +358,13 @@ export default {
     }
   },
   created () {
-    if (this.$route.query.searchForm) {
-      this.$route.query.searchForm instanceof Object ? this.searchForm = this.$route.query.searchForm : this.searchForm = JSON.parse(this.$route.query.searchForm);
-    }
-    if (this.$route.query.rules) {
-      this.$route.query.rules instanceof Object ? this.rules = this.$route.query.rules : this.rules = JSON.parse(this.$route.query.rules);
-    }
+    this.init();
+  },
+  activated () {
+    this.init();
   },
   mounted () {
-    getEmployeeOrgan().then(res => {
-      if (res.code == 200) {
-        this.organList = res.data;
-      }
-    })
-    this.getList();
-    // 首先获取课程形式
-    // 获取分部id
-    vipGroupCategory().then(res => {
-      if (res.code == 200) {
-        this.courseStatusList = res.data;
-      }
-    })
+
   },
   filters: {
     onlinePip (val) {
@@ -478,6 +464,27 @@ export default {
     }
   },
   methods: {
+    init () {
+      if (this.$route.query.searchForm) {
+        this.$route.query.searchForm instanceof Object ? this.searchForm = this.$route.query.searchForm : this.searchForm = JSON.parse(this.$route.query.searchForm);
+      }
+      if (this.$route.query.rules) {
+        this.$route.query.rules instanceof Object ? this.rules = this.$route.query.rules : this.rules = JSON.parse(this.$route.query.rules);
+      }
+      getEmployeeOrgan().then(res => {
+        if (res.code == 200) {
+          this.organList = res.data;
+        }
+      })
+      this.getList();
+      // 首先获取课程形式
+      // 获取分部id
+      vipGroupCategory().then(res => {
+        if (res.code == 200) {
+          this.courseStatusList = res.data;
+        }
+      })
+    },
     onCheckAllBranch () {
       // 适用所有分部
       this.resetForm.organ = []