Merge remote-tracking branch 'remotes/origin/feature/tek-system-ui' into skill

source/vue/xzs-admin/src/router.js

@@ -172,19 +172,6 @@ const constantRoutes = [
     },
     alwaysShow: true,
     children: [
-      {
-        path: 'subject/list',
-        component: () => import('@/views/education/subject/list'),
-        name: 'EducationSubjectPage',
-        meta: { title: 'skill列表', noCache: true }
-      },
-      {
-        path: 'subject/edit',
-        component: () => import('@/views/education/subject/edit'),
-        name: 'EducationSubjectEditPage',
-        meta: { title: 'skill编辑', noCache: true, activeMenu: '/education/subject/list' },
-        hidden: true
-      },
       {
         path: 'industry/list',
         component: () => import('@/views/education/industry/list'),
@@ -197,6 +184,19 @@ const constantRoutes = [
         name: 'EducationIndustryEditPage',
         meta: { title: 'industry编辑', noCache: true, activeMenu: '/education/industry/list' },
         hidden: true
+      },
+      {
+        path: 'subject/list',
+        component: () => import('@/views/education/subject/list'),
+        name: 'EducationSubjectPage',
+        meta: { title: 'skill列表', noCache: true }
+      },
+      {
+        path: 'subject/edit',
+        component: () => import('@/views/education/subject/edit'),
+        name: 'EducationSubjectEditPage',
+        meta: { title: 'skill编辑', noCache: true, activeMenu: '/education/subject/list' },
+        hidden: true
       }
     ]
   },

source/vue/xzs-admin/src/views/education/industry/list.vue

@@ -34,7 +34,7 @@
   <script>
   import { mapGetters, mapState } from 'vuex'
   import Pagination from '@/components/Pagination'
-  import subjectApi from '@/api/subject'
+  import industryApi from '@/api/industry'
   
   export default {
     components: { Pagination },
@@ -56,7 +56,7 @@
     methods: {
       search () {
         this.listLoading = true
-        subjectApi.pageList(this.queryParam).then(data => {
+        industryApi.pageList(this.queryParam).then(data => {
           const re = data.response
           this.tableData = re.list
           this.total = re.total
@@ -70,7 +70,7 @@
       },
       delSubject (row) {
         let _this = this
-        subjectApi.deleteSubject(row.id).then(re => {
+        industryApi.deleteSubject(row.id).then(re => {
           if (re.code === 1) {
             _this.search()
             _this.$message.success(re.message)