登录

package.json

@@ -16,6 +16,7 @@
     "echarts": "^4.2.0-rc.2",
     "fetch-jsonp": "^1.1.3",
     "jquery": "^3.3.1",
+    "jsencrypt": "^3.2.1",
     "lodash": "^4.17.11",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",

src/assets/js/getData2.js

@@ -1,7 +1,7 @@
 import {post} from '@js/http.js'
 
 /** 登陆 */
-export const screenLogin = (user, password) => post('api/bigScreenScreen/login', {
+export const screenLogin = (user, password) => post('api/pda/handlogin', {
   user: user,
   password: password
 })

src/assets/js/http.js

@@ -8,6 +8,11 @@ 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
@@ -40,10 +45,8 @@ axios.interceptors.response.use(
           router.push('/login')
           break
       }
-      return Promise.reject(error.response.data)
-    } else {
-      return Promise.reject(error)
     }
+    return Promise.reject(error)
   }
 )
 
@@ -61,18 +64,3 @@ export const post = (sevmethod, params) => {
       })
   })
 }
-
-export const post1 = (sevmethod, params) => {
-  return new Promise((resolve, reject) => {
-    axios.post(sevmethod, params)
-      .then(response => {
-        resolve(response.data)
-      }, error => {
-        Dialog(error.message)
-        reject(error.message)
-      })
-      .catch((error) => {
-        reject(error)
-      })
-  })
-}

src/main.js

@@ -9,10 +9,11 @@ import '@css/layout.styl'
 // import '@js/rem.js'
 import filter from '@js/filter.js'
 import { Dialog, toast } from '@js/mUtils.js'
-import {post} from '@fetch/api.js'
+// import {post} from '@fetch/api.js'
 import echarts from 'echarts'
 import VueParticles from 'vue-particles'
 import scroll from 'vue-seamless-scroll'
+import JSEncrypt from 'jsencrypt'
 
 for (let k in filter) {
   Vue.filter(k, filter[k])
@@ -21,10 +22,21 @@ window._ = _
 Vue.prototype.$echarts = echarts
 Vue.prototype.Dialog = Dialog
 Vue.prototype.toast = toast
-Vue.prototype.$post = post
+// Vue.prototype.$post = post
 Vue.use(VueParticles)
 Vue.use(scroll)
 Vue.config.productionTip = false
+
+const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD\n' +
+  '2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ=='
+
+// 加密
+export function encrypt (txt) {
+  const encryptor = new JSEncrypt()
+  encryptor.setPublicKey(publicKey) // 设置公钥
+  return encryptor.encrypt(txt) // 对需要加密的数据进行加密
+}
+
 /* eslint-disable no-new */
 new Vue({
   el: '#app',

src/pages/Login.vue

@@ -85,6 +85,7 @@
 
 <script>
 import {screenLogin} from '@js/getData2.js'
+import {encrypt} from '../main.js'
 export default {
   name: 'Login',
   data () {
@@ -125,9 +126,9 @@ export default {
         this.toast('密码不能为空')
         return
       }
-      let res = await screenLogin(this.loginname, this.password)
+      let res = await screenLogin(this.loginname, encrypt(this.password))
       if (res.code === '1') {
-        this.$store.dispatch('setUserInfo', res.result)
+        this.$store.dispatch('userInfo', JSON.stringify(res.result))
         if (this.equipId === 1) {
           this.$router.push('/workshop')
         } else {

src/router/index.js

@@ -9,15 +9,15 @@ import Router from 'vue-router'
 const Login = r => require.ensure([], () => r(require('@page/Login')), 'Login')
 // const WorkShop = r => require.ensure([], () => r(require('@page/MonitorCenter2/WorkShop')), 'WorkShop')
 const WorkShop = r => require.ensure([], () => r(require('@page/WorkShop')), 'WorkShop')
-const Monitor = r => require.ensure([], () => r(require('@page/Monitor')), 'Monitor')
+// const Monitor = r => require.ensure([], () => r(require('@page/Monitor')), 'Monitor')
 const Animation = r => require.ensure([], () => r(require('@page/Animation')), 'Animation')
-const DeviceIntro = r => require.ensure([], () => r(require('@page/DeviceIntro')), 'DeviceIntro')
+// const DeviceIntro = r => require.ensure([], () => r(require('@page/DeviceIntro')), 'DeviceIntro')
-const ProduceData = r => require.ensure([], () => r(require('@page/ProduceData')), 'ProduceData')
+// const ProduceData = r => require.ensure([], () => r(require('@page/ProduceData')), 'ProduceData')
-const StorageTank = r => require.ensure([], () => r(require('@page/StorageTank')), 'StorageTank')
+// const StorageTank = r => require.ensure([], () => r(require('@page/StorageTank')), 'StorageTank')
-const Fault = r => require.ensure([], () => r(require('@page/Fault')), 'Fault')
+// const Fault = r => require.ensure([], () => r(require('@page/Fault')), 'Fault')
-const StorageData = r => require.ensure([], () => r(require('@page/StorageData')), 'StorageData')
+// const StorageData = r => require.ensure([], () => r(require('@page/StorageData')), 'StorageData')
 const Kanban = r => require.ensure([], () => r(require('@page/Kanban')), 'Kanban')
-const KanbanSelect = r => require.ensure([], () => r(require('@page/KanbanSelect')), 'KanbanSelect')
+// const KanbanSelect = r => require.ensure([], () => r(require('@page/KanbanSelect')), 'KanbanSelect')
 Vue.use(Router)
 
 export default new Router({
@@ -32,55 +32,55 @@ export default new Router({
       name: 'Login',
       component: Login
     },
-    {
+    // {
-      path: '/fault',
+    //   path: '/fault',
-      name: 'Fault',
+    //   name: 'Fault',
-      component: Fault
+    //   component: Fault
-    },
+    // },
     {
       path: '/workshop',
       name: 'WorkShop',
       component: WorkShop
     },
-    {
+    // {
-      path: '/monitor',
+    //   path: '/monitor',
-      name: 'Monitor',
+    //   name: 'Monitor',
-      component: Monitor
+    //   component: Monitor
-    },
+    // },
     {
       path: '/animation',
       name: 'Animation',
       component: Animation
     },
-    {
+    // {
-      path: '/deviceintro',
+    //   path: '/deviceintro',
-      name: 'DeviceIntro',
+    //   name: 'DeviceIntro',
-      component: DeviceIntro
+    //   component: DeviceIntro
-    },
+    // },
-    {
+    // {
-      path: '/producedata',
+    //   path: '/producedata',
-      name: 'producedata',
+    //   name: 'producedata',
-      component: ProduceData
+    //   component: ProduceData
-    },
+    // },
-    {
+    // {
-      path: '/storagetank',
+    //   path: '/storagetank',
-      name: 'storagetank',
+    //   name: 'storagetank',
-      component: StorageTank
+    //   component: StorageTank
-    },
+    // },
-    {
+    // {
-      path: '/storageData',
+    //   path: '/storageData',
-      name: 'StorageData',
+    //   name: 'StorageData',
-      component: StorageData
+    //   component: StorageData
-    },
+    // },
     {
       path: '/kanban',
       name: 'Kanban',
       component: Kanban
-    },
-    {
-      path: '/kanbanSelect',
-      name: 'KanbanSelect',
-      component: KanbanSelect
     }
+    // {
+    //   path: '/kanbanSelect',
+    //   name: 'KanbanSelect',
+    //   component: KanbanSelect
+    // }
   ]
 })

src/vuex/modules/user.js

@@ -5,14 +5,16 @@ const state = {
   accountId: getStore('accountId') || '',
   accountName: getStore('accountName') || '',
   userName: getStore('userName') || '',
-  deptUuid: getStore('deptUuid') || ''
+  deptUuid: getStore('deptUuid') || '',
+  userInfo: localStorage.getItem('userInfo') || '' // 用户信息
 }
 
 const getters = {
   accountId: state => state.accountId,
   accountName: state => state.accountName,
   userName: state => state.userName,
-  deptUuid: state => state.deptUuid
+  deptUuid: state => state.deptUuid,
+  userInfo: state => state.userInfo
 }
 
 const actions = {
@@ -23,11 +25,12 @@ const actions = {
     setStore('deptUuid', res.dept_uuid)
     commit(types.SET_USER_INFO, res)
   },
+  userInfo ({ commit }, res) {
+    localStorage.setItem('userInfo', res)
+    commit(types.SET_USER_INFO, res)
+  },
   setSignOut ({ commit }) {
-    localStorage.removeItem('accountId')
+    localStorage.removeItem('userInfo')
-    localStorage.removeItem('userName')
-    localStorage.removeItem('accountName')
-    localStorage.removeItem('deptUuid')
     commit(types.SET_SIGN_OUT)
   }
 }
@@ -39,6 +42,9 @@ const mutations = {
     state.userName = res.user_name
     state.memberName = res.member_name
   },
+  [types.SET_USER_INFO] (state, res) {
+    state.userInfo = res
+  },
   [types.SET_SIGN_OUT] (state) {
     state.accountId = ''
   }

yarn.lock

@@ -4030,6 +4030,11 @@ js-yaml@~3.7.0:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
+jsencrypt@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jsencrypt/-/jsencrypt-3.2.1.tgz#09766983cc760088ff26b12fe7e574252af97727"
+  integrity sha512-k1sD5QV0KPn+D8uG9AdGzTQuamt82QZ3A3l6f7TRwMU6Oi2Vg0BsL+wZIQBONcraO1pc78ExMdvmBBJ8WhNYUA==
+
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "http://registry.npm.taobao.org/jsesc/download/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"