From e2b4e1a03b96bf2d48f6b207ca1f815e2ccdca1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= Date: Thu, 5 Nov 2020 11:39:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- src/App.vue | 38 +++++++++++++++-- src/api/data.js | 18 +++++++++ src/main.js | 16 ++++---- src/utils/request.js | 3 +- src/views/kpi/workbench/home/index.vue | 1 + src/views/kpi/workbench/index.vue | 56 ++++++++++++++++++++++++-- 7 files changed, 117 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 7a2ecfe..ba13e00 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "svg-sprite-loader": "^5.0.0", "vconsole": "^3.3.4", "vue": "^2.5.2", - "vue-cookie": "^1.1.4", + "vue-cookies": "^1.7.4", "vue-router": "^3.0.1", "vuedraggable": "^2.24.2", "vuex": "^3.5.1" @@ -85,7 +85,6 @@ "uglifyjs-webpack-plugin": "^1.1.1", "url-loader": "^0.5.8", "vconsole": "^3.3.4", - "vue-cookie": "^1.1.4", "vue-jest": "^1.0.2", "vue-loader": "^13.3.0", "vue-style-loader": "^3.0.1", diff --git a/src/App.vue b/src/App.vue index cc495a9..cc00004 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,7 +6,8 @@ diff --git a/src/api/data.js b/src/api/data.js index f85b4cc..ed3de2e 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -16,3 +16,21 @@ export function getDimensions (quer = {}) { method: 'get' }) } + +// 登陆 +export function apiLogin (query = {}) { + return request({ + url: '/lz_management/sys/login', + method: 'post', + data: query + }) +} + +// 发送验证码 +export function apiSendSMS (query = {}) { + return request({ + url: 'lz_management/sys/sendSMS', + method: 'post', + data: query + }) +} diff --git a/src/main.js b/src/main.js index 881bf01..34d93a5 100644 --- a/src/main.js +++ b/src/main.js @@ -9,17 +9,17 @@ import './utils/permission' import './style/index.less' import '@/icons' import VConsole from 'vconsole' -import VueCookie from 'vue-cookie' +import VueCookie from 'vue-cookies' import {debounce, departGetForm, personlGetForm, handleInput} from '@/utils/common' import { format } from '@/utils/dateFormat' -let hostList = ['lzmanagement.ldxinyong.com'] -if (!hostList.includes(window.location.host)) { - var vConsole = new VConsole({ - vConsole_switch_x: 0, - vConsole_switch_y: 0 - }) -} +// let hostList = ['lzmanagement.ldxinyong.com'] +// if (!hostList.includes(window.location.host)) { +var vConsole = new VConsole({ + vConsole_switch_x: 0, + vConsole_switch_y: 0 +}) +// } Vue.use(VueCookie) Vue.config.productionTip = false diff --git a/src/utils/request.js b/src/utils/request.js index 44154f3..53f4a11 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -38,7 +38,8 @@ service.interceptors.request.use(config => { // if (getToken() && !isToken) { // config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 // } - config.headers['token'] = Vue.cookie.get('token') || '' + console.log(' Vue.cookies: ', Vue.$cookies) + config.headers['token'] = Vue.$cookies.get('token') || '' return config }, error => { console.log(error) diff --git a/src/views/kpi/workbench/home/index.vue b/src/views/kpi/workbench/home/index.vue index 66a9f08..c66e2dd 100644 --- a/src/views/kpi/workbench/home/index.vue +++ b/src/views/kpi/workbench/home/index.vue @@ -34,6 +34,7 @@ import report from './report' import tableItem from '../todo/tableItem' import { apiGetWaitList } from '@/api/toDo' + export default { data () { return { diff --git a/src/views/kpi/workbench/index.vue b/src/views/kpi/workbench/index.vue index bf07fcd..75bc538 100644 --- a/src/views/kpi/workbench/index.vue +++ b/src/views/kpi/workbench/index.vue @@ -2,26 +2,74 @@ -