finished

Author: zhongzhenlong

src/axios.js

@@ -2,6 +2,7 @@ import 'babel-polyfill'
 import axios from "axios";
 import auth from "./auth";
 import {getBaseUrl} from "./common/utils"
+import {MessageBox} from "element-ui";
 
 const instance = axios.create();
 
@@ -17,9 +18,9 @@ instance.interceptors.response.use(
   error => {
     if (error.response) {
       //全局ajax错误信息提示
-      //Element.MessageBox({type:"error",message:error.response.data,title:"温馨提示"});
+      //MessageBox({type:"error",message:error.response.data,title:"温馨提示",});
     }
-    return Promise.reject(error);
+    //return Promise.reject(error);
   });
 
 function plugin(Vue)

src/pages/layout/header.vue

@@ -27,7 +27,7 @@
         </el-dropdown>
         <el-dropdown trigger="click" class="navbar-dropdown">
           <div class="el-dropdown-link">
-            <img :src='userInfo.avatar' style="width: 25px;height: 25px;border-radius: 50%; vertical-align: middle;" alt="User Image">
+            <img :src='userInfo.avatar' style="width: 25px;height: 25px;border-radius: 50%; vertical-align: middle;" alt="U">
             {{userInfo.name}}
           </div>
           <el-dropdown-menu style="padding: 0px">
@@ -127,6 +127,15 @@
                 this.list = res.data;
             }
         })
+        .catch(err=>{
+          this.list = [{"id":"640000201501165883","type":0,"code":107,"timeLine":"2013031613","message":"阶期查音音南这认式给自来走事。手进全线引其质行族导深些。","title":"作几点内部重压示现或采候器日","createTime":"426050337874","senderName":"Hall","senderPic":"http://dummyimage.com/100x100/f2799f/757575.png&text=H"},
+            {"id":"15000019760303327X","type":1,"code":109,"timeLine":"1994030718","message":"听飞叫例感给其团南织主作什。","title":"府铁些以眼铁南单行办其被眼线","createTime":"612808881585","senderName":"Hall","senderPic":"http://dummyimage.com/100x100/79c3f2/757575.png&text=H"},
+            {"id":"530000198607165793","type":1,"code":106,"timeLine":"1990122503","message":"于学认气感很效效引需说报党。调应各近思常市美许自毛完容矿日增。","title":"整近律马造起米农员济解题自例识个","createTime":"234654265042","senderName":"Rodriguez","senderPic":"http://dummyimage.com/100x100/e6f279/757575.png&text=R"},
+            {"id":"320000200905032842","type":1,"code":103,"timeLine":"1980062104","message":"除年命却积同部去断权议党低二易过。","title":"消问料品把精是器话","createTime":"1194108860623","senderName":"Lewis","senderPic":"http://dummyimage.com/100x100/da79f2/757575.png&text=L"},
+            {"id":"210000198109172937","type":1,"code":104,"timeLine":"1993041210","message":"具都主部确特次取圆派不儿日和难力。","title":"导结计市色通证确高想","createTime":"374284498307","senderName":"Hernandez","senderPic":"http://dummyimage.com/100x100/79f2b7/757575.png&text=H"},
+            {"id":"410000200402164212","type":1,"code":108,"timeLine":"2015123015","message":"青矿地级质还进眼件每产它整区土容斯消。","title":"治龙工必近思空例东应","createTime":"626036503938","senderName":"Martinez","senderPic":"http://dummyimage.com/100x100/f29479/757575.png&text=M"}]
+          this.count = this.list.length;
+        })
     },
     mounted() {
       // document.addEventListener('click', this.autoHide, false)

src/pages/sys/default.js

@@ -76,9 +76,11 @@
   import selectTree from "../../components/selectTree.vue"
   import treeter from "../../components/treeter"
   import merge from 'element-ui/src/utils/merge';
+  import defaultValue from "./default";
 
   import * as api from "../../api"
 
+
   export default {
     mixins: [treeter],
     components: {
@@ -164,7 +166,6 @@
               this.load();
             }).catch(e => {
              this.$message('操作成功');
-            console.log(checkKeys);
             this.batchDeleteFromTree(this.menuTree, checkKeys);
           })
         });
@@ -184,7 +185,7 @@
                 this.maxId += 1;
                 this.$message('操作成功');
                 this.form.id = this.maxId;
-                var  ddd = {
+                var ddd = {
                   id: this.form.id,
                   name: this.form.name,
                   sort: this.form.sort,
@@ -196,7 +197,6 @@
                   desc: this.form.desc,
                   children:[]
                 }
-                console.log(ddd)
                 this.appendTreeNode(this.menuTree, ddd);
             this.menuTree.push({});
             this.menuTree.pop();
@@ -218,6 +218,7 @@
             this.menuTree = res.data;
           }).catch((error) => {
            console.log(error)
+           this.menuTree = defaultValue.menuList;
         })
       }
     },

src/pages/sys/menu.vue

@@ -70,6 +70,7 @@
   import selectTree from "../../components/selectTree.vue"
   import treeter from "../../components/treeter"
   import merge from 'element-ui/src/utils/merge';
+  import defaultValue from "./default";
 
   import * as api from "../../api"
 
@@ -204,6 +205,8 @@
             this.resourceTree.push(...res.data)
           }).catch((error) => {
           console.log(error)
+          this.resourceTree = [];
+          this.resourceTree.push(...defaultValue.resource)
         })
       }
     },

src/pages/sys/resource.vue

@@ -83,6 +83,7 @@
   import panel from "../../components/panel.vue"
   import selectTree from "../../components/selectTree.vue"
   import treeter from "../../components/treeter"
+  import defaultValue from "./default";
 
 
   import * as api from "../../api"
@@ -205,6 +206,8 @@
             this.roleTree.push(...res.data)
           }).catch((error) => {
           console.log(error)
+          this.roleTree = [];
+          this.roleTree.push(...defaultValue.roleList)
         })
       },
       renderContent(h, {node, data, store}) {
@@ -224,13 +227,15 @@
           this.dialogVisible = true;
           if(this.resourceTree==null||this.resourceTree.length<=0){
             this.dialogLoading = true;
-            this.$http.get(api.TEST_DATA)
+            this.$http.get(api.SYS_RESOURCE_LIST)
               .then(res => {
                 this.dialogLoading = false;
                 this.resourceTree = res.data.resourceList;
               }).catch((error) => {
                 console.log(error)
                 this.dialogLoading = false;
+              this.resourceTree = defaultValue.resource;
+
             })
           }
         this.$http.get(api.SYS_ROLE_RESOURCE + "?id=" + id)

src/pages/sys/role.vue

@@ -119,6 +119,7 @@
   import panel from "../../components/panel.vue"
   import * as api from "../../api"
   import testData from "../../../static/data/data.json"
+  import defaultValue from "./default";
 
   export default {
     components: {
@@ -159,10 +160,13 @@
         this.currentRow = row;
         this.dialogVisible = true;
         if (this.roleTree.length <= 0) {
-          this.$http.get( api.TEST_DATA + "?selectChildren=true")
+          this.$http.get( api.SYS_ROLE_LIST + "?selectChildren=true")
             .then(res => {
               this.roleTree = res.data.roleList
             })
+            .catch(err=>{
+              this.roleTree = defaultValue.roleList
+            })
         }
         this.$http.get(api.SYS_USER_ROLE + "?id=" + row.id)
           .then(res => {
@@ -194,16 +198,14 @@
         });
       },
       loadData(){
-//        var d = {"offset":0,"limit":2147483647,"total":1,"size":10,"pages":1,"current":1,"searchCount":true,"optimizeCount":false,"orderByField":null,"records":[
-//            {"id":1,"delFlag":0,"companyId":1,"officeId":2,"loginName":"admin","password":"",
-//              "no":"0001","name":"系统管理员","email":"[email protected]","phone":"731","mobile":"13769999998",
-//              "userType":"1","photo":null,"loginIp":"127.0.0.1","loginDate":1453188598000,"loginFlag":"1",
-//              "remarks":"最高管理员","status":1,"token":null}],"condition":{},"asc":true,"offsetCurrent":0};
-//        this.tableData.rows = d.records;
           this.$http.get(api.SYS_USER_PAGE + "?key=" + this.searchKey + "&pageSize=" + this.tableData.pagination.pageSize + "&pageNo=" + this.tableData.pagination.pageNo)
           .then(res => {
             this.tableData.rows = res.data.records;
             this.tableData.pagination.total = res.data.total;
+          }).catch(err=>{
+            debugger
+            this.tableData.rows = defaultValue.userList;
+            this.tableData.pagination.total = 99;
           });
       }
     },