From b22d8d095e43627646a09bef04cfdd77d39cb744 Mon Sep 17 00:00:00 2001 From: yanzili <978387851@qq.com> Date: Thu, 24 Jun 2021 15:07:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-ui/src/api/axios.js | 2 +- report-ui/src/api/dict-data.js | 8 ++++---- report-ui/src/api/login.js | 1 + report-ui/src/assets/styles/sidebar.scss | 2 +- report-ui/src/utils/dic.json | 0 report-ui/src/views/login.vue | 1 - 6 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 report-ui/src/utils/dic.json diff --git a/report-ui/src/api/axios.js b/report-ui/src/api/axios.js index 4911708b..a7728adb 100644 --- a/report-ui/src/api/axios.js +++ b/report-ui/src/api/axios.js @@ -17,7 +17,7 @@ service.interceptors.request.use( config => { // 在发送请求之前做些什么 var token = getItem('token'); - config.data = signUtil.sign(token, deepClone(config.data)); + config = signUtil.sign(token, deepClone(config)); // console.log(config, 'config') return config }, diff --git a/report-ui/src/api/dict-data.js b/report-ui/src/api/dict-data.js index 703f74ff..1e800783 100644 --- a/report-ui/src/api/dict-data.js +++ b/report-ui/src/api/dict-data.js @@ -12,13 +12,13 @@ import request from '@/utils/request' * type参数 类型 String * type参数 格式 'type' */ -export function getDictList(type) { +export function getDictList (type) { return request({ url: `/gaeaDict/select/${type}`, method: 'get', }) } -export function getDictCodes(project) { +export function getDictCodes (project) { return request({ url: `/gaeaDict/selectAll/${project}`, method: 'get', @@ -30,7 +30,7 @@ export function getDictCodes(project) { * typeList参数 类型 Array * typeList参数 格式 ['type1','type2',...] */ -export function getMultipleDictList(typeList) { +export function getMultipleDictList (typeList) { const types = typeList + '' return request({ url: `/v1/dict/types`, @@ -44,7 +44,7 @@ export function getMultipleDictList(typeList) { * typeList参数 类型 Array * typeList参数 格式 ['type1','type2',...] */ -export function getBaseDataList(typeList) { +export function getBaseDataList (typeList) { const types = typeList + '' return request({ url: `/v1/master/types`, diff --git a/report-ui/src/api/login.js b/report-ui/src/api/login.js index 52c354ca..77622a07 100644 --- a/report-ui/src/api/login.js +++ b/report-ui/src/api/login.js @@ -1,6 +1,7 @@ import request from './axios' export function login (data) { + console.log(data) return request({ url: '/login', method: 'post', diff --git a/report-ui/src/assets/styles/sidebar.scss b/report-ui/src/assets/styles/sidebar.scss index e7837561..250572aa 100644 --- a/report-ui/src/assets/styles/sidebar.scss +++ b/report-ui/src/assets/styles/sidebar.scss @@ -18,7 +18,7 @@ left: 0; z-index: 1001; overflow: hidden; - box-shadow: 1px 1px 4px #e6e6e6; + box-shadow: 1px 1px 4px #e7eeff; //reset element-ui css .horizontal-collapse-transition { transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; diff --git a/report-ui/src/utils/dic.json b/report-ui/src/utils/dic.json new file mode 100644 index 00000000..e69de29b diff --git a/report-ui/src/views/login.vue b/report-ui/src/views/login.vue index f0eebacd..62687292 100644 --- a/report-ui/src/views/login.vue +++ b/report-ui/src/views/login.vue @@ -227,7 +227,6 @@ export default { } const { code, data } = await login(obj) if (code != '200') return - console.log(code, data) setItem("token", data.token) this.loading = false // 选中记住密码时 把密码存到cookie里,时效15天