朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 5ee42f1b4e0641a0abba3797f9b30038bb2c3bf1 1 个父辈 367d26f8

http部分

内嵌 并排对比
正在显示 4 个修改的文件 包含 81 行增加 和 18 行删除
... ... @@ -29,8 +29,8 @@
"babel-core": "^6.22.1",
"babel-loader": "^6.2.10",
"babel-plugin-transform-runtime": "^6.22.0",
"babel-preset-env": "^1.2.1",
"babel-polyfill": "^6.16.0",
"babel-preset-env": "^1.2.1",
"babel-preset-es2015": "^6.0.0",
"babel-preset-stage-2": "^6.22.0",
"babel-register": "^6.22.0",
... ... @@ -46,13 +46,13 @@
"function-bind": "^1.0.2",
"html-webpack-plugin": "^2.28.0",
"http-proxy-middleware": "^0.17.3",
"webpack-bundle-analyzer": "^2.2.1",
"json-loader": "^0.5.4",
"mockjs": "^1.0.1-beta3",
"node-sass": "^4.5.0",
"opn": "^4.0.2",
"optimize-css-assets-webpack-plugin": "^1.3.0",
"ora": "^1.0.0",
"qs": "^6.7.0",
"rimraf": "^2.6.0",
"sass-loader": "^6.0.0",
"semver": "^5.3.0",
... ... @@ -62,6 +62,7 @@
"vue-style-loader": "^2.0.0",
"vue-template-compiler": "^2.2.4",
"webpack": "^2.2.1",
"webpack-bundle-analyzer": "^2.2.1",
"webpack-dev-middleware": "^1.10.0",
"webpack-hot-middleware": "^2.16.1",
"webpack-merge": "^2.6.1"
... ...
import axios from 'axios'
import Vue from 'vue'
import qs from 'qs'
// let base = 'http://127.0.0.1:7003';
axios.defaults.baseURL = 'http://localhost:8082/api';
Vue.prototype.$http = axios;
... ... @@ -9,16 +9,17 @@ export const requestLogin = params => {
return axios({
method: 'POST',
url: '/login',
data: params,
data: qs.stringify(params),
withCredentials: true,
transformRequest: [function (data) {
// Do whatever you want to transform the data
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
//下面转换成urlencode参数，也可以用QS包处理，qs.stringify(data)
// transformRequest: [function (data) {
// // Do whatever you want to transform the data
// let ret = ''
// for (let it in data) {
// ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
// }
// return ret
// }],
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
... ... @@ -48,7 +49,7 @@ export const removeUser = params => { return axios({
}
})};
export const batchRemoveUser = params => { return axios.get(`${base}/user/batchremove`, { params: params }); };
export const batchRemoveUser = params => { return axios.get(`/user/batchremove`, { params: params }); };
export const editUser = params => { return axios({
method: 'PUT',
... ...
import axios from 'axios'
axios.defaults.baseURL = 'http://localhost:8082/api';
let base = axios.defaults.baseURL+'/role';
axios.interceptors.request.use(config => {
// 这里可以加一些动作, 比如来个进度条开始动作,
return config
}, error => {
return Promise.reject(error)
});
axios.interceptors.response.use(response => response, error => Promise.resolve(error.response));
export default {
post(url, data) {
return axios({
method: 'post', // 请求协议
url: url, // 请求的地址
data: qs.stringify(data), // post 请求的数据
timeout: 30000, // 超时时间, 单位毫秒
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
},
get(url, params) {
return axios.get(`${base}/${url}`, { params: params });
},
put(url, params){
return axios({
method: 'PUT',
url: `${base}/${url}`,
data: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
},
del: (url,params) => {
return axios({
method: 'DELETE',
url: `${base}/${url}`,
data: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
}
// {
// // 服务器提供的响应
// data: {},
// // 服务器响应的HTTP状态代码
// status: 200,
// // 服务器响应的HTTP状态消息
// statusText: 'OK',
// // 服务器响应头
// headers: {},
// // axios 的配置
// config: {}
// }
\ No newline at end of file
... ...
... ... @@ -183,7 +183,7 @@
<script>
import util from '../../common/js/util'
import NProgress from 'nprogress'
import { getUserListPage, removeUser, batchRemoveUser, editUser, addUser, setUserRole } from '../../api/api';
import { getUserList, removeUser, batchRemoveUser, editUser, addUser, setUserRole } from '../../api/api';
import { getList} from '../../api/role_api';
import moment from 'moment'
export default {
... ... @@ -196,7 +196,7 @@
users: [],
total: 0,
pageNum: 1,
pageSize: 5,
pageSize: 10,
faceImageUrl: '',
listLoading: false,
sels: [],//列表选中列
... ... @@ -273,7 +273,7 @@
realname: this.filters.realname
};
this.listLoading = true;
getUserListPage(para).then((res) => {
getUserList(para).then((res) => {
this.total = res.data.total;
this.users = res.data.list;
this.listLoading = false;
... ... @@ -379,7 +379,6 @@
para.authorities = null;
para.permissions = null;
para.roles = null;
para.username=null;//后端不能也不接收针对username的更新
// para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');
/*
查询之后格式this.filters.column.create_start_date中日期发生变化;
... ... @@ -479,7 +478,7 @@
this.faceImageUrl = 'http://127.0.0.1:7003/'+response.data;
},
beforeAvatarUpload: function () {
}
},
mounted() {
... ...