Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
7581d373 1 parent 7bb9089a

接口增加逻辑增加

Expand all
Inline Side-by-side
Showing 11 changed files with 45 additions and 256 deletions
......@@ -8,28 +8,6 @@ export function fclInit() {
});
}
// 获取用户详细信息
export function getInfo() {
return request({
url: "/manager-server/user/getUser",
method: "get",
});
}
// 登录界面查询用户，可用不要token
export function getUserNotoken() {
return request({
url: "/icleartw/auth/getUser",
method: "get",
});
}
// 根据账号获取用户信息
export function getUserByAccNo(data) {
return request({
url: "/icleartw/auth/getUserByAccNo/" + data,
method: "get",
});
}
// 退出
export function logout() {
return request({
......@@ -37,46 +15,3 @@ export function logout() {
method: "post",
});
}
\ No newline at end of file
// 注册账号
export function addUser(data) {
return request({
url: "/icleartw/auth/addUser",
method: "post",
data: data,
});
}
// 登录
export function userLogin(accNo, password, rememberMe) {
const data = {
accNo,
password,
rememberMe,
};
return request({
url: "/icleartw/auth/login",
method: "post",
data: data,
});
}
// 根据用户账号发送修改密码邮件
export function updPwd(data) {
return request({
url: "/icleartw/auth/updPwd/" + data,
method: "get",
});
}
// 重置密碼
export function resetPwd(data) {
return request({
url: "/icleartw/auth/resetPwd",
method: "post",
data: data,
});
}
// 根据用户账号发送修改密码邮件
export function verifyResetPwd(data) {
return request({
url: "/icleartw/auth/verifyResetPwd/" + data,
method: "get",
});
}
\ No newline at end of file
......
import request from '@/utils/request'
// 上传状态
/**
*/
export function getUploadStatus() {
return request({
url: "/manager-server/dicEntries/getConsStatus",
method: "get",
});
}
......
import request from '@/utils/request'
import { praseStrEmpty } from "@/utils/FedEx";
// 查询用户列表
/**
* @param page 页码 *
* @param size 数据长度 *
* @param isValid 用户状态
* @param username 用户名
* @param phone 手机号码
*/
export function listUser(data) {
return request({
url: '/sysUser/getUserList',
method: 'post',
data: data
})
}
// 查询用户详细
/**
* @param id 用户id *
*/
export function detailUser(userId) {
return request({
url: '/sysUser/detailUser?id=' + praseStrEmpty(userId),
method: 'get'
})
}
// 新增用户
/**
* @param loginName 员工号 *
* @param username 用户姓名 *
* @param phone 手机号
* @param email 电子邮箱
* @param portName 所属口岸 *
* @param roleIds 所属角色 *
* @param remark 备注
*/
export function addOrUpdateUser(data) {
return request({
url: '/sysUser/addOrUpdateUser',
method: 'post',
data: data
})
}
// 修改用户状态
/**
* @param id 用户id *
* @param loginName 员工号 *
* @param username 用户姓名 *
* @param phone 手机号
* @param email 电子邮箱
* @param portName 所属口岸 *
* @param roleIds 所属角色 *
* @param remark 备注
*/
export function updateUserStatus(data) {
return request({
url: '/sysUser/updateUserStatus',
method: 'post',
data: data
})
}
//菜单信息
/**
* @param
*/
export function getAllAuth() {
return request({
url: '/sysMenu/getAllAuth',
method: 'get'
})
}
//菜单开启关闭
/**
* @param id 菜单id *
* @param status 菜单状态 *
*/
export function updateStatus(data) {
return request({
url: '/sysMenu/updateStatus',
method: 'post',
data: data
})
}
//角色列表
/**
* @param name 角色名称
* @param size 数据长度 *
* @param page 页码 *
* @param createStart 创建开始时间
* @param createEnd 创建结束时间
* @param valid 角色状态
*/
export function getRoleList(data) {
// 获取用户详细信息
export function getInfo() {
return request({
url: '/role/getRoleList',
method: 'post',
data: data
})
}
//角色详情
/**
* @param id 角色id *
*/
export function detailRole(id) {
return request({
url: '/role/detailRole?id=' + id,
method: 'get',
})
}
//新增修改角色
/**
* @param id 角色id *
* @param name 角色名 *
* @param remark 角色描述
* @param menuIds 角色权限
* @param valid 角色状态
*/
export function addOrUpdateRole(data) {
return request({
url: '/role/addOrUpdateRole',
method: 'post',
data: data
})
}
//角色状态修改
/**
* @param id 角色id *
* @param valid 角色状态 *
*/
export function updateRoleStatus(data) {
return request({
url: '/role/updateRoleStatus',
method: 'post',
data: data
})
}
//口岸列表
/**
* @param
*/
export function portNameList() {
return request({
url: '/dictionary/port',
method: 'get',
})
}
//口岸变更
/**
* @param
*/
export function changeCurrentPort(data) {
return request({
url: '/sysUser/changeCurrentPort',
method: 'post',
data: data
})
}
//获取用户设置表头
/**
* @param tableName 表名 *
*/
export function getHeaderOrder(data) {
return request({
url: '/table/getHeaderOrder?' + data,
method: 'get',
})
url: "/manager-server/user/getUser",
method: "get",
});
}
//保存用户设置表头
// 修改用户提示状态
/**
* @param tableName 表名 *
* @param idList 显示表头集合 *
* @param addFlag1 * 标致1
* @param addFlag2 * 标志2
*/
export function saveTableHeader(data) {
export function uploadUserTipFlag(data) {
return request({
url: '/table/saveTableHeader',
url: '/manager-server/user/updateAddFlag',
method: 'post',
data: data
})
......
import request from "@/utils/request";
// 运单查询
/**
* @param createTimeFrom
* @param createTimeTo
* @param consignmentCode
* @param sort
* @param curPage * 页数
* @param pageSize * 页长
*/
export function getwaybillData(data) {
return request({
url: "/biz-customer/consignment/query/list",
method: "post",
data: data
});
}
......@@ -86,7 +86,7 @@ export default {
onlineDeclare: "線上申報平臺帳號登錄",
registerNumber: "register a fedex.com account",
userInfo: "用戶信息維護",
logOut: "log out",
logOut: "logout",
logOutDia: "Are you sure to log out and exit the system?",
},
// 申报输入
......
......@@ -43,7 +43,7 @@ import tableHeaders from "@/assets/languages/tableHeaders";
import dictLabels from "@/assets/languages/dictLabels.js";
import settings from "./settings.js";
import * as filters from "./utils/filters.js";
import { toHead, numberRound, base64ConvertFile, b64ToBlob, titleCase } from "@/utils/index";
import { toHead, numberRound, base64ConvertFile, b64ToBlob, titleCase, formatDate } from "@/utils/index";
// 全局方法挂载
Vue.prototype.parseTime = parseTime;
......@@ -66,6 +66,7 @@ Vue.prototype.numberRound = numberRound
Vue.prototype.base64ConvertFile = base64ConvertFile
Vue.prototype.b64ToBlob = b64ToBlob
Vue.prototype.titleCase = titleCase
Vue.prototype.formatDate = formatDate
Vue.prototype.msgSuccess = function (msg) {
this.$message({ showClose: true, message: msg, type: "success" });
};
......
......@@ -46,7 +46,6 @@ const permission = {
return new Promise((resolve) => {
// 向后端请求路由数据
getRouters().then((res) => {
console.log(res);
const sdata = JSON.parse(JSON.stringify(routeItemInfo(res.data)));
const rdata = JSON.parse(JSON.stringify(routeItemInfo(res.data)));
const sidebarRoutes = filterAsyncRouter(sdata);
......
import { userLogin, logout, getInfo } from "@/api/login";
import { userLogin, logout } from "@/api/login";
import { getInfo } from "@/api/system/user.js"
import { getToken, setToken, removeToken } from "@/utils/auth";
import { MessageBox } from "element-ui";
......
......@@ -58,7 +58,7 @@ service.interceptors.response.use(
const code = Number(res.data.code) || 200;
// 获取错误信息
const msg = errorCode[code] || res.data.msg || errorCode["default"];
if (code === 301) {
if (code === 10004) {
MessageBox.alert(
"The login status has expired. You can continue to stay on this page or log in again.",
"System prompt",
......
This diff is collapsed. Click to expand it.
......@@ -96,7 +96,6 @@
v-else
style="width: 100%; height: calc(100% - 75px); background-color: #fff"
>
<loginForm :loginType="loginType"></loginForm>
</div>
<div class="footer" v-if="!login">
<span>FedEx Online Declaration Platform</span>
......@@ -113,7 +112,6 @@
<script>
import { Navbar } from "@/layout/components";
import loginForm from "./fedexLogin/loginForm.vue";
import { getToken, setToken, removeToken } from "@/utils/auth";
import { fclInit } from "@/api/login.js";
......@@ -121,7 +119,6 @@ export default {
name: "Login",
components: {
Navbar,
loginForm,
},
data() {
return {
......@@ -246,7 +243,7 @@ export default {
localStorage.setItem("impPreHost", location.origin);
this.fclLoginAddr = `http://192.168.1.251/time.html?replaceUrl=${
location.origin
}/ImpPer/#/redjrectLogin&loginUrl=/icleartw/auth/login&d=${new Date().getTime()}`;
}&loginUrl=/manager-server/auth/wlgnForward&d=${new Date().getTime()}`;
} else {
this.fclLoginAddr = res.data;
}
......