编辑项目完成

src/router/router.js

@@ -8,7 +8,6 @@ const createComponent = r => require.ensure([], () => r(require('../views/educat
 const roleManager = r => require.ensure([], () => r(require('../views/system/role.vue')),'role')
 const addManager = r => require.ensure([], () => r(require('../views/education/add-manager.vue')), 'add-manager')
 const itemRole = r => require.ensure([], () => r(require('../views/system/item-role.vue')), 'item-role')
-const tree = r => require.ensure([], () => r(require('../views/education/tree.vue')), 'tree')
 
 export default [{
     path: '/',
@@ -44,9 +43,6 @@ export default [{
         },{
             path: '/item-role',
             component: itemRole
-        },{
-            path: '/tree',
-            component: tree
         },
     ]
 }]
\ No newline at end of file

src/views/layout/slidebar.vue

@@ -57,11 +57,6 @@ export default {
                             icon: 'el-icon-setting',
                             index: 'item-manager'
                         },
-                        {
-                            title: '树',
-                            icon: 'el-icon-setting',
-                            index: 'tree'
-                        }
                     ]
                 },{
                     title: '系统管理',

src/views/system/item-role.vue

@@ -58,7 +58,6 @@
         </el-form>
       </el-row>
       <el-table
-        v-loading="loading"
         :data="tableData"
         :header-cell-style="{background:'#FAFAFA',color:'#000'}"
       >
@@ -133,6 +132,7 @@
 <script>
 import BreadCrumb from "../../components/breadcrumb.vue";
 import { create } from "domain";
+import { openLoading, closeLoading } from "../../utils/utils";
 let vm = null;
 export default {
   components: {
@@ -203,7 +203,6 @@ export default {
   methods: {
     //查询用户列表
     queryRoleList() {
-      this.loading = true;
       this.formInline.portalProjectId = vm.getUrlSearch(
         window.location.href,
         "portalProjectId"
@@ -213,11 +212,12 @@ export default {
       }
       let req = {};
       req = this.formInline;
+      openLoading(vm);
       vm.GET("portalProjectOrRole/queryRoleList", req).then(res => {
         if (res.code == "000000") {
+          closeLoading(vm);
           vm.tableData = res.data.projectRoleInfoModels;
           vm.totalRows = res.data.total;
-          this.loading = false;
 
           //this.roleList = setRoleList(res.data.roleList);
           this.organizationList = res.data.organizationList;

src/views/system/role.vue

@@ -29,7 +29,6 @@
         </el-form>
       </el-row>
       <el-table
-        v-loading="loading"
         :data="tableData"
         :header-cell-style="{background:'#FAFAFA',color:'#000'}"
       >
@@ -68,6 +67,7 @@
 <script>
 import BreadCrumb from "../../components/breadcrumb.vue";
 import { create } from "domain";
+import { openLoading, closeLoading } from "../../utils/utils";
 let vm = null;
 export default {
   components: {
@@ -125,11 +125,12 @@ export default {
       let req = {};
       console.log(this.formInline);
       req = this.setParam(this.formInline);
+      openLoading(vm);
       vm.GET("portalInfo/getProjectList", req).then(res => {
         if (res.code == "000000") {
+          closeLoading(vm);
           vm.tableData = res.data.data;
           vm.totalRows = res.data.totalRows;
-          this.loading = false;
         }
       });
     },