zhaobao 2 gadi atpakaļ
vecāks
revīzija
1e40660e41
5 mainītis faili ar 40 papildinājumiem un 17 dzēšanām
  1. 9 0
      src/api/index.js
  2. 9 3
      src/components/Layouts/Map.vue
  3. 5 1
      src/config/index.js
  4. 11 8
      src/utils/index.js
  5. 6 5
      src/utils/request.js

+ 9 - 0
src/api/index.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+// 登入
+export function login(data) {
+    return request({
+      url: '/login',
+      method: 'POST',
+      data
+    })
+  }

+ 9 - 3
src/components/Layouts/Map.vue

@@ -4,7 +4,8 @@
     import request from'@/utils/request'
     import mapUrl from '@/assets/images/layout_cont.png'
     import mixins  from '@/mixins/mqtt.js'
-    import {Uint8ArrayToString} from'@/utils'
+    import {Uint8ArrayToString,setToken} from'@/utils'
+    import { login  } from '@/api'
     export default{
         mixins:[mixins],
         data(){
@@ -17,8 +18,13 @@
             this.init()
         },
         methods:{
-            init(){
-                this.$nextTick(()=>{
+            async init(){
+                const f = new FormData()
+                f.append('username', "supershow001")
+                f.append('password', "888888" )
+                const {data}=await login(f)
+                setToken(data.accessToken)
+                await this.$nextTick(()=>{
                     this.initMap()
                     this.initMqtt({
                         mqttResponse:this.mqttResponse

+ 5 - 1
src/config/index.js

@@ -1,5 +1,9 @@
 export default {
     dev:"http://192.168.3.5:8080",
     pro:"http://192.168.3.5:8080",
-    mqttUrl:"ws://1.15.92.205:8083/mqtt" 
+    mqttUrl:"ws://1.15.92.205:8083/mqtt",
+    appID: '10001',
+    appKey: '82a8bf439373e305',
+    appSecret: '82a8bf439373e305',
+    permitTplId: 7,
 }

+ 11 - 8
src/utils/index.js

@@ -1,11 +1,14 @@
 export function getToken() {
     return localStorage.getItem('token');
-  }
-  export function Uint8ArrayToString(fileData){
-      var dataString = "";
-      for (var i = 0; i < fileData.length; i++) {
+}
+export function setToken(token) {
+    return localStorage.setItem('token',token);
+}
+export function Uint8ArrayToString(fileData){
+    var dataString = "";
+    for (var i = 0; i < fileData.length; i++) {
         dataString += String.fromCharCode(fileData[i]);
-      }
-     
-      return dataString
-  }
+    }
+    
+    return dataString
+}

+ 6 - 5
src/utils/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 import Dialog from '@/components/Dialog'
 import { getToken } from '@/utils'
-import config from '@/config'
-const baseURL = process.env.NODE_ENV === 'development' ? config.dev : config.pro
+import sysConfig from '@/config'
+const baseURL = process.env.NODE_ENV === 'development' ? sysConfig.dev : sysConfig.pro
 // create an axios instance
 const service = axios.create({
   baseURL: baseURL, // url = base url + request url
@@ -15,9 +15,10 @@ const service = axios.create({
 // request interceptor
 service.interceptors.request.use(
   config => {
-    if (getToken()) {
-      config.headers['Authorization'] = 'Bearer ' + getToken()
-    }
+    config.headers['Authorization'] = 'Bearer ' + getToken()
+    config.headers['AppID'] = sysConfig.appID
+    config.headers['AppKey'] =  sysConfig.appKey
+    config.headers['AppSecret'] =  sysConfig.appSecret
     return config
   },
   error => {