Commit 3a3cfcf2 authored by xinzhedeai's avatar xinzhedeai

修改密码 微震数据导出

parent 8da8ec9c
...@@ -95,7 +95,7 @@ export function updateUserPwd(oldPassword, newPassword) { ...@@ -95,7 +95,7 @@ export function updateUserPwd(oldPassword, newPassword) {
} }
return request({ return request({
url: '/system/user/profile/updatePwd', url: '/system/user/profile/updatePwd',
method: 'put', method: 'post',
params: data params: data
}) })
} }
......
...@@ -18,7 +18,7 @@ const service = axios.create({ ...@@ -18,7 +18,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项,表示请求URL公共部分 // axios中请求配置有baseURL选项,表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API, baseURL: process.env.VUE_APP_BASE_API,
// 超时 // 超时
timeout: 10000 timeout: 60000
}) })
// request拦截器 // request拦截器
......
...@@ -24,6 +24,13 @@ ...@@ -24,6 +24,13 @@
@click="see(scope.row)" @click="see(scope.row)"
>查看</el-button >查看</el-button
> >
<el-button
style="background-color: #fee504"
size="mini"
icon="el-icon-download"
@click="exportFile(scope.row)"
>导出</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -117,6 +124,15 @@ export default { ...@@ -117,6 +124,15 @@ export default {
this.allData(); this.allData();
}, },
methods: { methods: {
exportFile(item) {
this.download(
"/business/monBlasting/exportData",
{
eventcode : item.id
},
`${item.pointcode}_${item.blastingId}_${+new Date()}.xlsx`,
);
},
allData() { allData() {
var param = { var param = {
pageNum: this.queryParams.pageNum, pageNum: this.queryParams.pageNum,
......
...@@ -561,13 +561,16 @@ export default { ...@@ -561,13 +561,16 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
getUser().then(response => { // getUser().then(response => {
this.postOptions = response.posts; // this.postOptions = response.posts;
this.roleOptions = response.roles; // this.roleOptions = response.roles;
// this.open = true;
// this.title = "添加用户";
// this.form.password = this.initPassword;
// });
this.open = true; this.open = true;
this.title = "添加用户"; this.title = "添加用户";
this.form.password = this.initPassword; this.form.password = this.initPassword;
});
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
......
...@@ -34,8 +34,8 @@ module.exports = { ...@@ -34,8 +34,8 @@ module.exports = {
open: true, open: true,
proxy: { proxy: {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://192.168.0.103:8085/lswz`, // 线上内网 // target: `http://192.168.0.103:8085/lswz`, // 线上内网
// target: `http://192.168.3.188:8085/lswz`, target: `http://192.168.3.188:8085/lswz`,
//target: `http://192.168.3.37:8085/lswz`, //target: `http://192.168.3.37:8085/lswz`,
// target: `http://10.50.70.100:8085/lswz`, // target: `http://10.50.70.100:8085/lswz`,
changeOrigin: true, changeOrigin: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment