Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test

src/views/configManage/systemconfiguration/groupConfiguration.vue

@@ -122,8 +122,9 @@
 </template>
 
 <script>
-import topBar from '@/components/topBar'
+import topBar from '@/components/topBar/checked.vue'
 import { topList } from './mixins'
+import { getRouters } from '@/api/settle'
 import { getGroupConfigurationList, addGroupConfiguration, updateGroupConfiguration, deleteGroupConfiguration } from '@/api/systemconfiguration'
 export default {
   name: 'Txpz',
@@ -156,8 +157,21 @@ export default {
   },
   created() {
     this.getGroupConfigurationList()
+    this.getUserRoute()
   },
   methods: {
+    getUserRoute() {
+      getRouters().then((res) => {
+        console.log(res.data, 'res.data', this.topList)
+        res.data.forEach((item) => {
+          this.topList.forEach((items) => {
+            if (item.routeName == items.url) {
+              this.$set(items, 'changed', true)
+            }
+          })
+        })
+      })
+    },
     reset() {
       this.queryParams.pageNum = 1
       this.queryParams.name = ''

src/views/configManage/systemconfiguration/index.vue

@@ -232,7 +232,7 @@
 </template>
 
 <script>
-import topBar from '@/components/topBar'
+import topBar from '@/components/topBar/checked.vue'
 import {
   getvertexList,
   deleteVertex,
@@ -244,6 +244,7 @@ import {
   getGroupConfigurationList
 } from '@/api/systemconfiguration'
 import { updateVertexs } from '@/api/settle'
+import { getRouters } from '@/api/settle'
 import { topList } from './mixins'
 export default {
   name: 'Txpz',
@@ -294,8 +295,21 @@ export default {
     this.getvertexList()
     this.getData()
     this.getGroupList()
+    this.getUserRoute()
   },
   methods: {
+    getUserRoute() {
+      getRouters().then((res) => {
+        console.log(res.data, 'res.data', this.topList)
+        res.data.forEach((item) => {
+          this.topList.forEach((items) => {
+            if (item.routeName == items.url) {
+              this.$set(items, 'changed', true)
+            }
+          })
+        })
+      })
+    },
     getData() {
       findVertex().then((res) => {
         this.vertexList = res.data

src/views/configManage/systemconfiguration/mixins.js

@@ -1,10 +1,12 @@
 export const topList = [
   {
     name: '体系配置',
-    path: 'txpz'
+    path: 'txpz',
+    url: 'Systemconfiguration'
   },
   {
     name: '区域体系分组',
-    path: 'groupConfiguration'
+    path: 'groupConfiguration',
+    url: 'GroupConfigurationList'
   }
 ]