Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/api/admin_user.js

@@ -173,6 +173,20 @@ export function GetFunctionRoleInfo(params){
 
 
 
+export function GetAllRole(){
+  return request({
+    url:'/m/api/role',
+    method:'get',
+  })
+}
+
+
+
+
+
+
+
+
 
 
 

src/pages/console/managementConsole/staff_role/addStaff/index.vue

@@ -7,12 +7,7 @@
     </div>
     <div class="editStaffTip">必填</div>
     <div class="staffBox">
-      <van-field
-        v-model="name"
-        label="姓名"
-        clearable
-        placeholder="请输入姓名"
-      />
+      <van-field v-model="name" label="姓名" clearable placeholder="请输入姓名" />
       <van-field
         v-model="tel"
         type="tel"
@@ -27,13 +22,33 @@
           <span class="custom-title">角色</span>
           <div style="width:76%;margin-left:3.3rem">
             <van-checkbox-group v-model="role_ids">
-              <van-checkbox style="width: 30%;" :name="item.id" shape="square" v-for="(item, index) in roles" :key="index"
-                >{{item.name}}</van-checkbox
-              >
+              <van-checkbox
+                style="width: 30%;"
+                :name="item.id"
+                shape="square"
+                v-for="(item, index) in roles"
+                :key="index"
+              >{{item.name}}</van-checkbox>
             </van-checkbox-group>
           </div>
         </template>
       </van-cell>
+      <van-cell class="newCell">
+        <!-- 使用 title 插槽来自定义标题 -->
+        <template slot="title">
+          <span class="custom-title" style="width:90px">职称</span>
+          <div style="display:flex;">
+            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show1 = true">
+              <span>请选择</span>
+              <van-icon name="arrow-down" />
+            </div>
+            <div style="margin-right:2rem;display: flex;align-items: center;">
+              <span>请选择</span>
+              <van-icon name="arrow-down" />
+            </div>
+          </div>
+        </template>
+      </van-cell>
     </div>
     <div class="editStaffTip">选填</div>
     <div class="staffBox">
@@ -43,43 +58,51 @@
       <van-icon class="addIcon" name="add" />
       <p>保存并继续新增员工</p>
     </div>
+    <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
+      <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+    </van-popup>
+    <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
+      <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+    </van-popup>
   </div>
 </template>
 
 <script>
-  import { AdminInitData,CreateAdminUser } from "@/api/admin_user";
-  import { checkMobile } from "@/utils/tools";
-  import { setRem } from "@/libs/functionRem";
-
+import { AdminInitData, CreateAdminUser } from "@/api/admin_user";
+import { checkMobile } from "@/utils/tools";
+import { setRem } from "@/libs/functionRem";
 
 export default {
   data() {
     return {
-      name:"",
-      tel:"",
+      name: "",
+      tel: "",
       role_ids: [],
-      title:"",
+      title: "",
       value1: "",
-      roles:[],
+      roles: [],
+      show1: false,
+      show2: false,
+      columns: ["杭州", "宁波", "温州", "嘉兴", "湖州"]
     };
-  },methods:{
-    GetAdminUserInitData(){
+  },
+  methods: {
+    GetAdminUserInitData() {
       AdminInitData().then(response => {
         if (response.data.state === 1) {
-          for (let i =0; i < response.data.data.roles.length; i++){
-            if(!response.data.data.roles[i].is_super_admin){
-              this.roles.push(response.data.data.roles[i])
+          for (let i = 0; i < response.data.data.roles.length; i++) {
+            if (!response.data.data.roles[i].is_super_admin) {
+              this.roles.push(response.data.data.roles[i]);
             }
           }
-
         } else {
           this.$toast({
             message: response.data.msg
           });
         }
       });
-    },save(type){
-
+    },
+    save(type) {
       if (this.name.trim().length == 0) {
         this.$toast({
           message: "姓名不能为空!"
@@ -100,22 +123,22 @@ export default {
       }
 
       let params = {
-        name:this.name,
+        name: this.name,
         mobile: this.tel,
-        role_ids:  this.role_ids.join(","),
-        title : this.title,
-      }
-      console.log(params)
+        role_ids: this.role_ids.join(","),
+        title: this.title
+      };
+      console.log(params);
       CreateAdminUser(params).then(response => {
         if (response.data.state === 1) {
-          this.$toast({message: "新增成功"});
-          if(type == 1) {
-            this.$router.go(-1)
-          }else{
-            this.name = ""
-            this.mobile = ""
-            this.role_ids = []
-            this.title = ""
+          this.$toast({ message: "新增成功" });
+          if (type == 1) {
+            this.$router.go(-1);
+          } else {
+            this.name = "";
+            this.mobile = "";
+            this.role_ids = [];
+            this.title = "";
           }
         } else {
           this.$toast({
@@ -124,13 +147,10 @@ export default {
         }
       });
     }
-
-  },created(){
-    this.GetAdminUserInitData()
-    setRem()
-
-
-
+  },
+  created() {
+    this.GetAdminUserInitData();
+    setRem();
   }
 };
 </script>

src/pages/console/managementConsole/staff_role/editRole/index.vue

@@ -40,7 +40,8 @@
 
 <script>
   import {setRem} from "@/libs/functionRem";
-  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo,EditPurview} from "@/api/admin_user";
+  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo,EditPurview,GetAllRole} from "@/api/admin_user";
+  import {Dialog} from "vant";
 
   export default {
     data() {
@@ -64,7 +65,7 @@
         let purview_ids  = ""
         let type = 0
         if (value.pid == 0){ //当前页面只存在pid为0的数据，而且会出现开关按钮的情况只会是拥有一个子节点
-          console.log(value.sub_purview)
+
           if(value.sub_purview.length > 0) {
 
             purview_ids = value.id + "," + value.sub_purview[0].id
@@ -117,24 +118,27 @@
 
       },
       del(){
-        let params = {
-          role_id: this.$route.query.id,
-          enable:false,
-        }
-        DeleteRoleInfo(params).then(response => {
-          if (response.data.state === 1) {
-            this.$toast({
-              message: "删除成功"
-            });
-            this.$router.go(-1)
-          } else {
-            this.$toast({
-              message: response.data.msg
-            });
+        Dialog.confirm({
+          message: "是否删除该角色？"
+        }).then(() => {
+          let params = {
+            role_id: this.$route.query.id,
+            enable:false,
           }
-        });
-
+          DeleteRoleInfo(params).then(response => {
+            if (response.data.state === 1) {
+              this.$toast({
+                message: "删除成功"
+              });
+              this.$router.go(-1)
+            } else {
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
 
+        });
       },
       editRole(){
         let params = {

src/pages/console/managementConsole/staff_role/employeeList/index.vue

@@ -16,7 +16,7 @@
         @change="onChange"
       >
         <div class="checkOne" v-for="(item, index) in admin_user" :key="index">
-          <van-checkbox :name="item.id"></van-checkbox>
+          <van-checkbox :name="item.id" @change="onChange"></van-checkbox>
           <div class="checkUserBox">
             <img v-if="item.avatar.length > 0" :src="item.avatar" alt="" />
             <img
@@ -45,6 +45,13 @@ export default {
   },
   methods: {
     save() {
+      if(this.result.length == 0){
+        this.$toast({
+          message: "至少选择一个用户"
+        });
+        return
+      }
+
       let params = {
         id: this.$route.query.id,
         ids: this.result.join(",")
@@ -89,7 +96,7 @@ export default {
     checkAll() {
       if (this.allChecked == false) {
         for (let i = 0; i < this.admin_user.length; i++) {
-          this.result.push(this.admin_user[i].user_id);
+          this.result.push(this.admin_user[i].id);
         }
         this.allChecked = true;
       } else {
@@ -97,12 +104,10 @@ export default {
       }
     },
     onChange() {
-      if (this.result.length == this.list.length) {
+      if (this.result.length == this.admin_user.length) {
         this.allChecked = true;
-        this.$refs.checkboxes.toggle();
       } else {
         this.allChecked = false;
-        this.$refs.checkboxes.toggle();
       }
     }
   },

src/pages/console/managementConsole/staff_role/privilegeManagement/index.vue

@@ -52,7 +52,7 @@
 
 <script>
   // import "../libs/rem.js";
-  import {AdminInitData} from "@/api/admin_user";
+  import {GetAllRole} from "@/api/admin_user";
   import {setRem} from "@/libs/functionRem";
 
   export default {
@@ -63,7 +63,7 @@
     },
     methods: {
       GetInitRoles() {
-        AdminInitData().then(response => {
+        GetAllRole().then(response => {
           if (response.data.state === 1) {
             console.log(response.data.data.roles.length)
             for (let i = 0; i < response.data.data.roles.length; i++) {

src/pages/main/RecordPage.vue

@@ -158,6 +158,14 @@
         @clear_search_keyword="clearKeyword"
       ></dialysis-area>
     </div>
+    <div class="fixedBox">
+      <div @click="goMonitoring" style="margin-bottom:0.375rem">
+        <img src="../../assets/images/monitoring.png" alt />
+      </div>
+      <div @click="goAdvice">
+        <img src="../../assets/images/advice.png" alt />
+      </div>
+    </div>
   </div>
 </template>
 
@@ -413,6 +421,16 @@ export default {
     vertical-align: middle;
   }
 }
+
+.fixedBox {
+  position: fixed;
+  bottom: 0.625rem;
+  right: 0.625rem;
+  img {
+    width: 1.875rem;
+    height: 1.875rem;
+  }
+}
 </style>
 <style lang="scss">
 .newinput {

src/pages/my/invite.vue

@@ -0,0 +1,45 @@
+<template>
+  <div class="page_invite">
+    <div class="inviteTitle">
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
+      <span class="titleName">邀请好友</span>
+    </div>
+    <div class="imgBox">
+      <img src="../../assets/images/pad.png" alt />
+    </div>
+    <div class="imgBox">
+      <img src="../../assets/images/App.png" alt />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.page_invite {
+  height: 100%;
+  overflow-y: auto;
+  background: #fafafa;
+  .inviteTitle {
+    background: #fff;
+    padding: 0 1.125rem;
+    height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 7rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .imgBox {
+    img {
+      width: 9.375rem;
+      margin: 3.125rem auto 1.25rem;
+      display: block;
+    }
+  }
+}
+</style>

src/pages/my/modifyPassword.vue

@@ -15,6 +15,7 @@
               v-model="forgetForm.phone"
               v-on:input="watchNum"
               maxlength="11"
+              readonly
               @input="change(forgetForm.phone)"
             ></el-input>
           </div>

src/permission.js

@@ -1,8 +1,8 @@
-import router from './router'
-import store from './store'
-import isLogin from '@/api/login'
+import router from "./router";
+import store from "./store";
+import  isLogin  from "@/api/login";
 
-const loginWhiteList = ['/', '/login', '/privacy', '/forgetPassword', '/userAgreement', '/nopassword', '/forget', '/register', '/setname', '/join', '/createorg'] // 登录验证白名单
+const loginWhiteList = ["/", "/login", "/privacy", "/forgetPassword", "/userAgreement","/nopassword","/forget","/register","/setname",'/join','/createorg']; // 登录验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释
@@ -10,13 +10,11 @@ router.beforeEach((to, from, next) => {
   //   return
   if (store.getters.user.admin == null) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
-      next()
+      next();
     } else {
-      next({
-        path: '/'
-      })
+      next({ path: "/" });
     }
   } else {
-    next()
+    next();
   }
-})
+});

src/router/index.js

@@ -1,140 +1,148 @@
-import Vue from 'vue'
-import Router from 'vue-router'
+import Vue from "vue";
+import Router from "vue-router";
 
-Vue.use(Router)
+Vue.use(Router);
 
 export default new Router({
-  routes: [{
-      path: '/',
-      name: 'Home',
-      component: () => import('@/pages/home/verifyToken')
+  routes: [
+    {
+      path: "/",
+      name: "Home",
+      component: () => import("@/pages/home/verifyToken")
     },
     {
-      path: '/login',
-      name: 'Home',
-      component: () => import('@/pages/home/login')
+      path: "/login",
+      name: "Home",
+      component: () => import("@/pages/home/login")
     },
     {
-      path: '/nopassword',
-      name: 'Home',
-      component: () => import('@/pages/home/noPassword')
+      path: "/nopassword",
+      name: "Home",
+      component: () => import("@/pages/home/noPassword")
     },
     {
-      path: '/setname',
-      name: 'Home',
-      component: () => import('@/pages/home/register/name')
+      path: "/setname",
+      name: "Home",
+      component: () => import("@/pages/home/register/name")
     },
     {
-      path: '/register',
-      name: 'Home',
-      component: () => import('@/pages/home/register/register')
+      path: "/register",
+      name: "Home",
+      component: () => import("@/pages/home/register/register")
     },
     {
-      path: '/join',
-      name: 'Home',
-      component: () => import('@/pages/home/noJoinedGroup')
+      path: "/join",
+      name: "Home",
+      component: () => import("@/pages/home/noJoinedGroup")
     },
     {
-      path: '/forget',
-      name: 'Home',
-      component: () => import('@/pages/home/forgetPassword')
+      path: "/forget",
+      name: "Home",
+      component: () => import("@/pages/home/forgetPassword")
     },
     {
-      path: '/createorg',
-      name: 'Home',
-      component: () => import('@/pages/home/createOrg')
+      path: "/createorg",
+      name: "Home",
+      component: () => import("@/pages/home/createOrg")
     },
     // 首页
     {
-      path: '/myIndex',
-      name: 'myIndex',
-      component: () => import('@/pages/home/index'),
-      children: [{
-          path: '/homeIndex',
-          component: () => import('@/pages/homeIndex/index.vue'),
+      path: "/myIndex",
+      name: "myIndex",
+      component: () => import("@/pages/home/index"),
+      children: [
+        {
+          path: "/homeIndex",
+          component: () => import("@/pages/homeIndex/index.vue"),
           meta: {
             noCache: true // 不会被 <keep-alive> 缓存
           }
         },
         // 我的
         {
-          path: '/newMy',
-          name: 'newMy',
-          component: () => import('@/pages/my/index')
+          path: "/newMy",
+          name: "newMy",
+          component: () => import("@/pages/my/index")
         },
         // 商城
         {
-          path: '/shop',
-          name: 'shop',
-          component: () => import('@/pages/shop/index')
+          path: "/shop",
+          name: "shop",
+          component: () => import("@/pages/shop/index")
         }
       ]
     },
 
     {
-      path: '/perfectOrg',
-      component: () => import('@/pages/org'),
+      path: "/perfectOrg",
+      component: () => import("@/pages/org"),
       meta: {
         noCache: true // 不会被 <keep-alive> 缓存
       }
     },
     {
-      path: '/manageconsole',
-      name: 'console',
-      component: () => import('@/pages/console/managementConsole')
+      path: "/manageconsole",
+      name: "console",
+      component: () => import("@/pages/console/managementConsole")
     },
     {
-      path: '/manageconsole/staff',
-      name: 'staff',
+      path: "/manageconsole/staff",
+      name: "staff",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/staffManagement')
+        import("@/pages/console/managementConsole/staff_role/staffManagement")
     },
     {
-      path: '/staff/editstaff',
-      name: 'editstaff',
+      path: "/staff/editstaff",
+      name: "editstaff",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/editStaff')
-    }, {
-      path: '/staff/addstaff',
-      name: 'addstaff',
+        import("@/pages/console/managementConsole/staff_role/editStaff")
+    },
+    {
+      path: "/staff/addstaff",
+      name: "addstaff",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/addStaff')
+        import("@/pages/console/managementConsole/staff_role/addStaff")
     },
 
     {
-      path: '/manageconsole/role',
-      name: 'role',
+      path: "/manageconsole/role",
+      name: "role",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/privilegeManagement')
+        import(
+          "@/pages/console/managementConsole/staff_role/privilegeManagement"
+        )
     },
 
     {
-      path: '/role/user',
-      name: 'user',
+      path: "/role/user",
+      name: "user",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/newUser')
+        import("@/pages/console/managementConsole/staff_role/newUser")
     },
 
     {
-      path: '/role/addnewuser',
-      name: 'user',
+      path: "/role/addnewuser",
+      name: "user",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/newAddStaff')
-    }, {
-      path: '/role/stafflist',
-      name: 'user',
+        import("@/pages/console/managementConsole/staff_role/newAddStaff")
+    },
+    {
+      path: "/role/stafflist",
+      name: "user",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/employeeList')
-    }, {
-      path: '/role/usermanage',
-      name: 'user',
+        import("@/pages/console/managementConsole/staff_role/employeeList")
+    },
+    {
+      path: "/role/usermanage",
+      name: "user",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/userManage')
-    }, {
-      path: '/role/addrole',
-      name: 'add_role',
+        import("@/pages/console/managementConsole/staff_role/userManage")
+    },
+    {
+      path: "/role/addrole",
+      name: "add_role",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/newAddRole')
+        import("@/pages/console/managementConsole/staff_role/newAddRole")
     },
 
     //
@@ -146,149 +154,156 @@ export default new Router({
     // },
 
     {
-      path: '/role/editrole',
-      name: 'editrole',
+      path: "/role/editrole",
+      name: "editrole",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/editRole')
+        import("@/pages/console/managementConsole/staff_role/editRole")
     },
     {
-      path: '/role/subpurview',
-      name: 'purview',
+      path: "/role/subpurview",
+      name: "purview",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/subPurview')
+        import("@/pages/console/managementConsole/staff_role/subPurview")
     },
     {
-      path: '/role/otherpurview',
-      name: 'purview',
+      path: "/role/otherpurview",
+      name: "purview",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/otherPurview')
-    }, {
-      path: '/role/functionpurview',
-      name: 'purview',
+        import("@/pages/console/managementConsole/staff_role/otherPurview")
+    },
+    {
+      path: "/role/functionpurview",
+      name: "purview",
       component: () =>
-        import('@/pages/console/managementConsole/staff_role/functionPurview')
+        import("@/pages/console/managementConsole/staff_role/functionPurview")
     },
     // 患者中心
     {
-      path: '/patients',
-      name: 'patients',
-      component: () => import('@/pages/patientManagement/patientManagement')
+      path: "/patients",
+      name: "patients",
+      component: () => import("@/pages/patientManagement/patientManagement")
     },
     // 新增病人
     {
-      path: '/addPatints',
-      name: 'addpatients',
-      component: () => import('@/pages/patients/addPatient')
+      path: "/addPatints",
+      name: "addpatients",
+      component: () => import("@/pages/patients/addPatient")
     },
     // 全部病程
     {
-      path: '/coursedetail',
-      name: 'coursedetail',
-      component: () => import('@/pages/allCourseManagement/index')
+      path: "/coursedetail",
+      name: "coursedetail",
+      component: () => import("@/pages/allCourseManagement/index")
     },
     // 全部干体重
     {
-      path: '/dryweight',
-      name: 'dryweight',
-      component: () => import('@/pages/allDryWeight/index')
+      path: "/dryweight",
+      name: "dryweight",
+      component: () => import("@/pages/allDryWeight/index")
     },
     // 基本信息
     {
-      path: '/editPatient',
-      name: 'editPatient',
-      component: () => import('@/pages/patients/editPatient')
+      path: "/editPatient",
+      name: "editPatient",
+      component: () => import("@/pages/patients/editPatient")
     },
     // 全部排班
     {
-      path: '/editScheduling',
-      name: 'editscheduling',
-      component: () => import('@/pages/allScheduling/index')
+      path: "/editScheduling",
+      name: "editscheduling",
+      component: () => import("@/pages/allScheduling/index")
     },
     // 全部透后宣教
     {
-      path: '/editEducation',
-      name: 'editeducation',
-      component: () => import('@/pages/allEducation/index')
+      path: "/editEducation",
+      name: "editeducation",
+      component: () => import("@/pages/allEducation/index")
     },
     // 全部抢救记录
     {
-      path: '/rescuerecord',
-      name: 'rescuerecord',
-      component: () => import('@/pages/allRescue/index')
+      path: "/rescuerecord",
+      name: "rescuerecord",
+      component: () => import("@/pages/allRescue/index")
     },
     //
     {
-      path: '/patientdetail',
-      name: 'patientdetail',
-      component: () => import('@/pages/doctorAdvice/index')
+      path: "/patientdetail",
+      name: "patientdetail",
+      component: () => import("@/pages/doctorAdvice/index")
     },
     // 搜索
     {
-      path: '/search',
-      name: 'search',
-      component: () => import('@/pages/search/index')
+      path: "/search",
+      name: "search",
+      component: () => import("@/pages/search/index")
     },
     // 我的信息
     {
-      path: '/myInfo',
-      name: 'myInfo',
-      component: () => import('@/pages/my/myInfo')
+      path: "/myInfo",
+      name: "myInfo",
+      component: () => import("@/pages/my/myInfo")
     },
     // 意见反馈
     {
-      path: '/feedBack',
-      name: 'feedBack',
-      component: () => import('@/pages/my/feedBack')
+      path: "/feedBack",
+      name: "feedBack",
+      component: () => import("@/pages/my/feedBack")
     },
     // 关于我们
     {
-      path: '/about',
-      name: 'about',
-      component: () => import('@/pages/my/aboutUs')
+      path: "/about",
+      name: "about",
+      component: () => import("@/pages/my/aboutUs")
     },
     // 公司介绍
     {
-      path: '/introduce',
-      name: 'introduce',
-      component: () => import('@/pages/my/companyIntroduction')
+      path: "/introduce",
+      name: "introduce",
+      component: () => import("@/pages/my/companyIntroduction")
     },
     // 更改名字
     {
-      path: '/editname',
-      name: 'editname',
-      component: () => import('@/pages/my/modifyingName')
+      path: "/editname",
+      name: "editname",
+      component: () => import("@/pages/my/modifyingName")
     },
     // 更改名字
     {
-      path: '/personalsign',
-      name: 'personalsign',
-      component: () => import('@/pages/my/personalSign')
+      path: "/personalsign",
+      name: "personalsign",
+      component: () => import("@/pages/my/personalSign")
+    },
+    // 邀请好友
+    {
+      path: "/invite",
+      name: "invite",
+      component: () => import("@/pages/my/invite")
     },
 
     // 全部长期透析记录
 
     {
-      path: '/alllongdialysis',
-      name: 'longdialysis',
-      component: () => import('@/pages/allLongDialysis/index')
+      path: "/alllongdialysis",
+      name: "longdialysis",
+      component: () => import("@/pages/allLongDialysis/index")
     },
     //, 
     {
-      path: '/alldoctoradvice',
-      name: '/alldoctoradvice',
-      component: () => import('@/pages/allDoctorAdvice/index')
+      path: "/alldoctoradvice",
+      name: "/alldoctoradvice",
+      component: () => import("@/pages/allDoctorAdvice/index")
     },
     // 配置中心
     {
-      path: '/configurecenter',
-      name: 'configurecenter',
-      component: () => import('@/pages/configureCenter/index')
+      path: "/configurecenter",
+      name: "configurecenter",
+      component: () => import("@/pages/configureCenter/index")
     },
     // 新增分区
     {
-      path: '/addpartition',
-      name: '/addpartition',
-      component: () => import('@/pages/configureCenter/newPartition')
+      path: "/addpartition",
+      name: "/addpartition",
+      component: () => import("@/pages/configureCenter/newPartition")
     },
     // 编辑分区
     {
@@ -305,15 +320,15 @@ export default new Router({
     },
     // 新增分组
     {
-      path: '/addgroup',
-      name: '/addgroup',
-      component: () => import('@/pages/configureCenter/newGrouping')
+      path: "/addgroup",
+      name: "/addgroup",
+      component: () => import("@/pages/configureCenter/newGrouping")
     },
     // 新增床位号
     {
-      path: '/addbed',
-      name: '/addbed',
-      component: () => import('@/pages/configureCenter/newBed')
+      path: "/addbed",
+      name: "/addbed",
+      component: () => import("@/pages/configureCenter/newBed")
     },
     // 编辑床位号
     {
@@ -330,101 +345,102 @@ export default new Router({
     },
     // 我的页面管理
     {
-      path: '/editorg',
-      name: '/editorg',
-      component: () => import('@/pages/patientCenter/editOrg/index')
+      path: "/editorg",
+      name: "/editorg",
+      component: () => import("@/pages/patientCenter/editOrg/index")
     },
     {
-      path: '/organizationinfo',
-      name: '/organizationinfo',
-      component: () => import('@/pages/my/organizationInfo')
+      path: "/organizationinfo",
+      name: "/organizationinfo",
+      component: () => import("@/pages/my/organizationInfo")
     },
     {
-      path: '/main',
-      name: 'main',
-      component: () => import('@/pages/main/index'),
+      path: "/main",
+      name: "main",
+      component: () => import("@/pages/main/index"),
       meta: {
         noCache: true // 不会被 <keep-alive> 缓存
       }
     },
     {
-      path: '/product',
-      name: 'Product',
-      component: () => import('@/pages/product/index')
+      path: "/product",
+      name: "Product",
+      component: () => import("@/pages/product/index")
+    },
+    {
+      path: "/monitoring",
+      name: "monitorPage",
+      component: () => import("@/pages/monitoring/index")
     },
     {
-      path: '/monitoring',
-      name: 'monitorPage',
-      component: () => import('@/pages/monitoring/index')
+      path: "/details",
+      name: "details",
+      component: () => import("@/pages/main/DetailsPage")
     },
     {
-      path: '/details',
-      name: 'details',
-      component: () => import('@/pages/main/DetailsPage')
+      path: "/monitoring",
+      name: "monitorPage",
+      component: () => import("@/pages/monitoring/index")
     },
     {
-      path: '/monitoring',
-      name: 'monitorPage',
-      component: () => import('@/pages/monitoring/index')
+      path: "/my",
+      name: "my",
+      component: () => import("@/pages/personal/index")
     },
     {
-      path: '/my',
-      name: 'my',
-      component: () => import('@/pages/personal/index')
+      path: "/advice",
+      name: "doctorAdvice",
+      component: () => import("@/pages/advice/index")
     },
     {
-      path: '/advice',
-      name: 'doctorAdvice',
-      component: () => import('@/pages/advice/index')
+      path: "/EditPersonal",
+      name: "EditPersonal",
+      component: () => import("@/pages/personal/EditPersonal")
     },
     {
-      path: '/EditPersonal',
-      name: 'EditPersonal',
-      component: () => import('@/pages/personal/EditPersonal')
+      path: "/ElectronicSignature",
+      name: "ElectronicSignature",
+      component: () => import("@/pages/personal/ElectronicSignature")
     },
     {
-      path: '/ElectronicSignature',
-      name: 'ElectronicSignature',
-      component: () => import('@/pages/personal/ElectronicSignature')
+      path: "/Print",
+      name: "Print",
+      component: () => import("@/pages/main/PrintIndex")
     },
     {
-      path: '/Print',
-      name: 'Print',
-      component: () => import('@/pages/main/PrintIndex')
+      path: "/add_urgent_schedule",
+      name: "AddUrgentSchedule",
+      component: () => import("@/pages/main/add_urgent_schedule")
     },
     {
-      path: '/add_urgent_schedule',
-      name: 'AddUrgentSchedule',
-      component: () => import('@/pages/main/add_urgent_schedule')
+      path: "/Prints",
+      name: "Prints",
+      component: () => import("@/pages/main/Print")
     },
     {
-      path: '/Prints',
-      name: 'Prints',
-      component: () => import('@/pages/main/Print')
+      path: "/forgetPassword",
+      name: "forgetPassword",
+      component: () => import("@/pages/personal/ForgetPassword")
     },
     {
-      path: '/forgetPassword',
-      name: 'forgetPassword',
-      component: () => import('@/pages/personal/ForgetPassword')
+      path: "/changePassword",
+      name: "changePassword",
+      component: () => import("@/pages/personal/ChangePassword")
     },
     {
-      path: '/changePassword',
-      name: 'changePassword',
-      component: () => import('@/pages/personal/ChangePassword')
+      path: "/privacy",
+      name: "privacy",
+      component: () => import("@/pages/privacy/index")
     },
     {
-      path: '/privacy',
-      name: 'privacy',
-      component: () => import('@/pages/privacy/index')
+      path: "/userAgreement",
+      name: "userAgreement",
+      component: () => import("@/pages/userAgreement/index")
     },
     {
-      path: '/userAgreement',
-      name: 'userAgreement',
-      component: () => import('@/pages/userAgreement/index')
-    }, {
-      path: '/modifypsw',
-      name: 'modifyPassword',
-      component: () => import('@/pages/my/modifyPassword')
+      path: "/modifypsw",
+      name: "modifyPassword",
+      component: () => import("@/pages/my/modifyPassword")
     }
   ]
-})
+});

src/utils/request.js

@@ -36,8 +36,6 @@ service.interceptors.response.use(
     }
   },
   error => {
-    console.log(error);
-    Toast(error);
     if (error.message.includes("timeout")) {
       // 判断请求异常信息中是否含有超时timeout字符串
       return Promise.reject(error); // reject这个错误信息