登录配置

src/config/getData2.js

@@ -12,13 +12,30 @@ export const parameterSetting = (num, word) => post('api/developer/parameterSett
   password: word
 })
 
-export const queryVehicleStatus = () => post('api/vehicle/queryVehicleStatus', {})
+// new
+// 登录
+export const authlogin = (username, password) => post('auth/login', {
+  username: username,
+  password: password
+})
+// 车辆状态
+// 1.1查询车辆状态
+export const queryVehicleStatus = (username, password) => post('api/vehicle/queryVehicleStatus', {
+})
+// 1.2查询传感器状态
 export const querrySensor = () => post('api/vehicle/querrySensor', {})
-
+// 1.3软启动
 export const softStart = () => post('api/vehicle/softStart', {})
+// 1.4跳过起点
 export const skipStartPoint = () => post('api/vehicle/skipStartPoint', {})
-export const ShutDown = () => post('api/vehicle/Shut_down', {})
+// 1.5关机，显示屏控制、TCS控制、RC控制、Joy控制
+export const ShutDown = (type, bool) => post('api/vehicle/Shut_down', {
+  type: type,
+  bool: bool
+})
+// 1.6查询初始化坐标
 export const queryRestPoint = () => post('api/vehicle/queryRestPoint', {})
+// 1.7初始化坐标确定
 export const restCoordinate = (code, name, x, y, t) => post('api/vehicle/restCoordinate', {
   point_code: code,
   point_name: name,
@@ -26,5 +43,36 @@ export const restCoordinate = (code, name, x, y, t) => post('api/vehicle/restCoo
   y: y,
   t: t
 })
+// 1.8查询agv的状态
 export const queryAgvStatus = () => post('api/vehicle/queryAgv_Status', {})
+// 1.9退出
 export const quitNow = () => post('api/vehicle/quitNow', {})
+
+// 系统管理
+// 1.1 用户列表
+export const usersQuery = (page, size) => post('api/users/query', {
+  page: page,
+  size: size
+})
+// 1.2 添加用户
+export const usersAdd = (username, personName, gender, phone, rolesIds, password) => post('api/users/add', {
+  username: username,
+  personName: personName,
+  gender: gender,
+  phone: phone,
+  rolesIds: rolesIds,
+  password: password
+})
+// 1.3 修改用户、重置密码
+export const usersEdit = (obj) => post('api/users/edit', obj)
+// 1.4 删除用户
+export const usersDelete = (userId) => post('api/users/delete', {
+  usersIds: userId
+})
+
+// 角色管理
+// 1.1 角色列表
+export const sysRoleQuery = (page, size) => post('api/sysRole/query', {
+  page: page,
+  size: size
+})

src/config/http.js

@@ -1,17 +1,17 @@
 import axios from 'axios'
-// import qs from 'qs'
 import { Dialog } from './utils.js'
-// import { Dialog, toast } from './utils.js'
 import store from '../vuex/store'
-// import router from './../router'
+import router from '@/router'
 
 axios.defaults.timeout = 50000
-// axios.defaults.retry = 5
-// axios.defaults.retryDelay = 10000
 axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'
-
 axios.interceptors.request.use(
   config => {
+    let token = ''
+    if (store.getters.userInfo !== '') {
+      token = JSON.parse(store.getters.userInfo).token
+    }
+    token && (config.headers.Authorization = token)
     if (config.method === 'post') {
       if (!config.data.flag) {
         config.data = config.data
@@ -32,46 +32,19 @@ axios.interceptors.response.use(
     return Promise.resolve(response)
   },
   error => {
-    // let condata = error.config.data.split('&')
-    // console.log('condata', condata)
-    // if (condata[1] === '_SRVMETHOD=queryProduceOrderReprot' || condata[1] === '_SRVMETHOD=queryQCRecord' || condata[1] === '_SRVMETHOD=queryEquipWorkTeam') {
-    //   toast(error.message)
-    //   setTimeout(() => {
-    //     router.replace({
-    //       path: '/login'
-    //     })
-    //   }, 10000)
-    // } else {
-    //   if (condata[1] === '_SRVMETHOD=queryEquip') {
-    //     toast(error.message)
-    //   } else {
-    //     Dialog(error.message)
-    //   }
-    //   // Dialog(error.message)
-    // }
-    // toast(error.message)
-    // - 20201215-x
-    // router.push({
-    //   path: '/500',
-    //   query: {redirect: router.currentRoute.fullPath}
-    // })
-    // - 20201215-x
-    return Promise.reject(error)
-    // let config = error.config
-    // if (!config || !config.retry) return Promise.reject(error)
-    // config.__retryCount = config.__retryCount || 0
-    // if (config.__retryCount >= config.retry) {
-    //   return Promise.reject(error)
-    // }
-    // config.__retryCount += 1
-    // let backoff = new Promise(resolve => {
-    //   setTimeout(() => {
-    //     resolve()
-    //   }, config.retryDelay || 1)
-    // })
-    // return backoff.then(() => {
-    //   return axios(config)
-    // })
+    if (error && error.response) {
+      switch (error.response.status) {
+        case 400:
+          break
+        case 401:
+          store.dispatch('setSignOut')
+          router.push('/login')
+          break
+      }
+      return Promise.reject(error.response.data)
+    } else {
+      return Promise.reject(error)
+    }
   }
 )
 
@@ -79,11 +52,9 @@ export const post = (sevmethod, params) => {
   return new Promise((resolve, reject) => {
     axios.post(`${store.getters.baseUrl}/` + sevmethod, params)
       .then(response => {
-        // if (response.data.code === '0') {
-        //   Dialog(response.data.desc)
-        // }
         resolve(response.data)
       }, error => {
+        Dialog(error.message)
         reject(error.message)
       })
       .catch((error) => {