From b10d1d59e30a678d0d4e1e6e81abc97c1a26bf12 Mon Sep 17 00:00:00 2001 From: yoe Date: Tue, 3 Nov 2020 11:02:17 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=92=89=E9=92=89=E5=85=8D=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 ++ src/api/config.js | 4 ---- src/api/login.js | 6 +++--- src/api/report.js | 11 ++++++----- src/api/toDo.js | 4 ++-- src/main.js | 15 ++++++++++----- src/utils/request.js | 3 ++- src/views/login/dingTalkLogin.vue | 13 +++++++------ 8 files changed, 32 insertions(+), 26 deletions(-) delete mode 100644 src/api/config.js diff --git a/package.json b/package.json index a2b4df8..b4953d1 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,8 @@ "style-loader": "^2.0.0", "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/api/config.js b/src/api/config.js deleted file mode 100644 index 0347d98..0000000 --- a/src/api/config.js +++ /dev/null @@ -1,4 +0,0 @@ -const basUrk = { - baseUrl: 'https://tlzmanagement.ldxinyong.com' -} -export default basUrk diff --git a/src/api/login.js b/src/api/login.js index a099445..42683ab 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,10 +1,10 @@ -import requestFuc from '@/utils/request' +import request from '@/utils/request' // 钉钉免登录 export function apiDingtalkLogin (query) { - return requestFuc({ + return request({ url: '/lz_management/dtlg/login', method: 'post', - params: query + data: query }) } diff --git a/src/api/report.js b/src/api/report.js index b08b85b..7519195 100644 --- a/src/api/report.js +++ b/src/api/report.js @@ -1,8 +1,8 @@ -import requestFuc from '@/utils/request' +import request from '@/utils/request' // 获取考核组列表 export function getChartData (query) { - return requestFuc({ + return request({ url: '/lz_management/performance/chart/result', method: 'get', params: query @@ -11,15 +11,16 @@ export function getChartData (query) { // 获取绩效排名 export function getStartsData (query) { - return requestFuc({ + return request({ url: '/lz_management/performance/chart/starts', method: 'POST', data: query }) } + // 获取绩效排名详情 export function getChartDetail (query) { - return requestFuc({ + return request({ url: '/lz_management/performance/chart/detail', method: 'POST', data: query @@ -28,7 +29,7 @@ export function getChartDetail (query) { // 获取部门信息 export function getDepList (query) { - return requestFuc({ + return request({ url: '/lz_management/staff/structure/deplist', method: 'GET', params: query diff --git a/src/api/toDo.js b/src/api/toDo.js index 3dae5d5..d06f1c3 100644 --- a/src/api/toDo.js +++ b/src/api/toDo.js @@ -1,8 +1,8 @@ -import requestFuc from '@/utils/request' +import request from '@/utils/request' // 获取考核组列表 export function apiGetWaitList (query) { - return requestFuc({ + return request({ url: '/lz_management/performance/task/list', method: 'POST', data: query diff --git a/src/main.js b/src/main.js index 40475cf..442af09 100644 --- a/src/main.js +++ b/src/main.js @@ -7,13 +7,18 @@ import store from './store' import './utils/elementConfig' import './utils/permission' import './style/index.less' -import {debounce, departGetForm, personlGetForm, handleInput} from '@/utils/common' import '@/icons' -import { - format -} from '@/utils/dateFormat' +import VConsole from 'vconsole' +import VueCookie from 'vue-cookie' +import {debounce, departGetForm, personlGetForm, handleInput} from '@/utils/common' +import { format } from '@/utils/dateFormat' -console.log('store: ', store) +let hostList = ['lzmanagement.ldxinyong.com'] +if (!hostList.includes(window.location.host)) { + var vConsole = new VConsole() +} + +Vue.use(VueCookie) Vue.config.productionTip = false Vue.prototype.$format = format Vue.prototype.debounce = debounce diff --git a/src/utils/request.js b/src/utils/request.js index ec8e507..d5198e4 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -31,6 +31,7 @@ const options = { // request拦截器 service.interceptors.request.use(config => { + console.log(`request.config=>`, config) Loading.service(options) // 是否需要设置 token // const isToken = (config.headers || {}).isToken === false @@ -45,7 +46,7 @@ service.interceptors.request.use(config => { // 响应拦截器 service.interceptors.response.use(res => { - console.log('res: ', res) + console.log(`response.res=>`, res) const id = setTimeout(() => { Loading.service(options).close() clearTimeout(id) diff --git a/src/views/login/dingTalkLogin.vue b/src/views/login/dingTalkLogin.vue index 7e88886..d82d397 100644 --- a/src/views/login/dingTalkLogin.vue +++ b/src/views/login/dingTalkLogin.vue @@ -24,26 +24,27 @@ export default { methods: { // 获取钉钉鉴权码 handleGetDingtalkCode () { + let _this = this dd.runtime.permission.requestAuthCode({ corpId: 'ding267474e759bbca1c35c2f4657eb6378f', onSuccess (res) { console.log('result===', res) - this.dingCode = res - this.handleDingtalkLogin(res) + _this.handleDingtalkLogin(res) + _this.dingCode = res }, onFail (err) { console.log('err===', err) - this.dingCode = err + _this.dingCode = err } }) }, // 钉钉免登录 - handleDingtalkLogin (res) { - apiDingtalkLogin(res).then(res => { + handleDingtalkLogin (val) { + apiDingtalkLogin(val).then(res => { if (res && res.code === 0) { this.$cookie.set('token', res.token) this.dataForm.verify = '登录成功，跳转中...' - window.open(window.location.protocol + '//' + window.location.host + '/kpi/workbench/home&code=' + this.dingCode.code, '_blank') + window.open(window.location.protocol + '//' + window.location.host + '/digitization/kpi/workbench/home?code=' + this.dingCode.code) } else { this.dataForm.verify = '身份验证失败' + res.msg this.$message.error(this.dataForm.verify)