huoran
/
FE_judgmentPoint
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
master
yujialong 10 months ago
parent 32dec5cf8f
commit f22f3e58f5
5 changed files with 196 additions and 426 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/store/actions.js
  2. 129
      src/utils/api.js
  3. 438
      src/utils/http.js
  4. 1
      src/views/Home.vue
  5. 41
      src/views/Transaction.vue

9
src/store/actions.js
Unescape View File

@ -1,8 +1,6 @@
export default { export default {
sethtnameAsync: (context, payload) => { sethtnameAsync: (context, payload) => {
console.log('hhh');
setTimeout(() => { setTimeout(() => {
console.log('hahha');
context.commit('sethtname', payload) context.commit('sethtname', payload)
}, 3000); }, 3000);
console.log('lululu'); console.log('lululu');
@ -11,12 +9,7 @@ export default {
//vuex是不能被vue实例的 //vuex是不能被vue实例的
let that = payload.that; let that = payload.that;
let url = this.axios.urls.SYSTEM_USER_DOLOGIN; let url = this.axios.urls.SYSTEM_USER_DOLOGIN;
console.log(url);
that.axios.post(url, {}).then((res) => { that.axios.post(url, {}).then((res) => {
console.log('doAjax....'); }).catch((err) => {})
console.log(res);
}).catch((err) => {
console.log(err);
})
} }
} }

129
src/utils/api.js
Unescape View File

@ -1,92 +1,77 @@
let host = location.origin
const dev = process.env.NODE_ENV === 'development' // 本地
// 科大接口切换，参数里带host的为科大，否则就是职站中台
let isKd = /&host=(\d)/.exec(location.hash) //host：{1：测试环境，2：正式环境}
if(isKd){
host = isKd[1] == 1 ? 'http://122.9.154.146' : 'http://116.63.168.79'
}else{
let url = location.host;
// 职站中台接口切换
if (url.includes('124.71.12.62')) {
host = 'http://124.71.12.62:9000'; // 巢湖版
} else if (dev) {
host = 'http://121.37.12.51'; //线上
// host = 'http://192.168.31.217:9000';
}
}
let host1 = 'http://121.37.12.51:8080'; let host1 = 'http://121.37.12.51:8080';
export default { export default {
// 交易类（流程类） // 交易类（流程类）
getAllBusiness: `${host}/judgment/judgment/lcRecord/getAllBusiness`, // 获取流程记录列表(树) getAllBusiness: `/judgment/judgment/lcRecord/getAllBusiness`, // 获取流程记录列表(树)
getProcess: `${host}/judgment/judgment/lcRecord/getProcess`, // 获取流程记录列表(树) getProcess: `/judgment/judgment/lcRecord/getProcess`, // 获取流程记录列表(树)
// getAllBusinessSt: `${host}/nakadai/nakadai/customsPass/checkpointList`, // 获取流程记录列表(树) checkpointList: `/nakadai/nakadai/customsPass/checkpointList`, // 获取流程记录列表(树)
getProcessSt: `${host}/judgment/judgment/stRecord/getProcess`, // 获取流程记录列表(树) getProcessSt: `/judgment/judgment/stRecord/getProcess`, // 获取流程记录列表(树)
getAllBusinessSt: `${host}/judgment/judgment/stRecord/getAllBusiness`, // 获取流程记录列表(树) getAllBusinessSt: `/judgment/judgment/stRecord/getAllBusiness`, // 获取流程记录列表(树)
getSubjectInfoSt: `${host}/judgment/stSubject/getSubjectInfo`, // 根据题目id获取题目信息 getSubjectInfoSt: `/judgment/stSubject/getSubjectInfo`, // 根据题目id获取题目信息
queryJudgmentPointDetailsSt: `${host}/judgment/judgment/lcJudgmentPoint/queryJudgmentPointDetailsBySt`, // 获取判分点详细信息 queryJudgmentPointDetailsSt: `/judgment/judgment/lcJudgmentPoint/queryJudgmentPointDetailsBySt`, // 获取判分点详细信息
getSubjectInfo: `${host}/judgment/judgment/lcSubject/getSubjectInfo`, // 根据题目id获取题目信息 getSubjectInfo: `/judgment/judgment/lcSubject/getSubjectInfo`, // 根据题目id获取题目信息
addJudgmentRule: `${host}/judgment/judgment/lcJudgmentRule/addJudgmentRule`, // 添加判分点规则 addJudgmentRule: `/judgment/judgment/lcJudgmentRule/addJudgmentRule`, // 添加判分点规则
updateJudgmentRule: `${host}/judgment/judgment/lcJudgmentRule/updateJudgmentRule`, // 添加判分点规则 updateJudgmentRule: `/judgment/judgment/lcJudgmentRule/updateJudgmentRule`, // 添加判分点规则
deleteJudgmentRule: `${host}/judgment/judgment/lcJudgmentRule/deleteJudgmentRule`, // 批量删除判分点规则 deleteJudgmentRule: `/judgment/judgment/lcJudgmentRule/deleteJudgmentRule`, // 批量删除判分点规则
addJudgmentPoint: `${host}/judgment/judgment/lcJudgmentPoint/addJudgmentPoint`, // 新增判分点 addJudgmentPoint: `/judgment/judgment/lcJudgmentPoint/addJudgmentPoint`, // 新增判分点
updateJudgmentPoint: `${host}/judgment/judgment/lcJudgmentPoint/updateJudgmentPoint`, // 更新判分点 updateJudgmentPoint: `/judgment/judgment/lcJudgmentPoint/updateJudgmentPoint`, // 更新判分点
deleteJudgmentPoint: `${host}/judgment/judgment/lcJudgmentPoint/deleteJudgmentPoint`, // 批量删除判分点 deleteJudgmentPoint: `/judgment/judgment/lcJudgmentPoint/deleteJudgmentPoint`, // 批量删除判分点
calculate: `${host}/judgment/judgment/lcJudgmentPoint/calculate`, // 计算判分点规则 calculate: `/judgment/judgment/lcJudgmentPoint/calculate`, // 计算判分点规则
updateIsOpen: `${host}/judgment/judgment/lcJudgmentPoint/updateIsOpen`, // 更新开启状态 updateIsOpen: `/judgment/judgment/lcJudgmentPoint/updateIsOpen`, // 更新开启状态
queryNameIsExist: `${host}/judgment/judgment/lcJudgmentPoint/queryNameIsExist`, // 新增/编辑判分点名称判重 queryNameIsExist: `/judgment/judgment/lcJudgmentPoint/queryNameIsExist`, // 新增/编辑判分点名称判重
bandingProject: `${host}/judgment/judgment/lcJudgmentPoint/bandingProject`, // 绑定项目管理 bandingProject: `/judgment/judgment/lcJudgmentPoint/bandingProject`, // 绑定项目管理
queryAllJudgmentPoint: `${host}/judgment/judgment/lcJudgmentPoint/queryAllJudgmentPoint`, // 获取流程类判分点列表 queryAllJudgmentPoint: `/judgment/judgment/lcJudgmentPoint/queryAllJudgmentPoint`, // 获取流程类判分点列表
queryJudgmentPointDetails: `${host}/judgment/judgment/lcJudgmentPoint/queryJudgmentPointDetails`, // 获取判分点详细信息 queryJudgmentPointDetails: `/judgment/judgment/lcJudgmentPoint/queryJudgmentPointDetails`, // 获取判分点详细信息
// 编程类 // 编程类
getBcJudgmentPoint: `${host}/judgment/judgment/bcJudgmentPoint/getBcJudgmentPoint`, // 获取判分点列表(分页) getBcJudgmentPoint: `/judgment/judgment/bcJudgmentPoint/getBcJudgmentPoint`, // 获取判分点列表(分页)
queryBcJudgmentPointByBcId: `${host}/judgment/judgment/bcJudgmentPoint/queryBcJudgmentPointByBcId`, // 根据判分点id查询判分点详细信息 queryBcJudgmentPointByBcId: `/judgment/judgment/bcJudgmentPoint/queryBcJudgmentPointByBcId`, // 根据判分点id查询判分点详细信息
queryBcJudgmentByBcId: `${host}/judgment/judgment/bcJudgmentPoint/queryBcJudgmentByBcId`, // 根据判分点id查询判分点信息(不带规则) queryBcJudgmentByBcId: `/judgment/judgment/bcJudgmentPoint/queryBcJudgmentByBcId`, // 根据判分点id查询判分点信息(不带规则)
addBcJudgmentPoint: `${host}/judgment/judgment/bcJudgmentPoint/addBcJudgmentPoint`, // 添加判分点 addBcJudgmentPoint: `/judgment/judgment/bcJudgmentPoint/addBcJudgmentPoint`, // 添加判分点
updateBcJudgmentPoint: `${host}/judgment/judgment/bcJudgmentPoint/updateBcJudgmentPoint`, // 更新判分点 updateBcJudgmentPoint: `/judgment/judgment/bcJudgmentPoint/updateBcJudgmentPoint`, // 更新判分点
bcDeleteJudgmentPoint: `${host}/judgment/judgment/bcJudgmentPoint/deleteJudgmentPoint`, // 批量删除判分点 bcDeleteJudgmentPoint: `/judgment/judgment/bcJudgmentPoint/deleteJudgmentPoint`, // 批量删除判分点
bcQueryNameIsExist: `${host}/judgment/judgment/bcJudgmentPoint/queryNameIsExist`, // 新增/编辑判分点名称判重 bcQueryNameIsExist: `/judgment/judgment/bcJudgmentPoint/queryNameIsExist`, // 新增/编辑判分点名称判重
bcBandingProject: `${host}/judgment/judgment/bcJudgmentPoint/bcBandingProject`, // 绑定项目管理 bcBandingProject: `/judgment/judgment/bcJudgmentPoint/bcBandingProject`, // 绑定项目管理
bcUpdateIsOpen: `${host}/judgment/judgment/bcJudgmentPoint/updateIsOpen`, // 更新开启状态 bcUpdateIsOpen: `/judgment/judgment/bcJudgmentPoint/updateIsOpen`, // 更新开启状态
bcAddJudgmentRule: `${host}/judgment/judgment/bcJudgmentRule/addJudgmentRule`, // 添加判分点规则 bcAddJudgmentRule: `/judgment/judgment/bcJudgmentRule/addJudgmentRule`, // 添加判分点规则
bcUpdateJudgmentRule: `${host}/judgment/judgment/bcJudgmentRule/updateJudgmentRule`, // 更新判分点规则 bcUpdateJudgmentRule: `/judgment/judgment/bcJudgmentRule/updateJudgmentRule`, // 更新判分点规则
bcDeleteJudgmentRule: `${host}/judgment/judgment/bcJudgmentRule/deleteJudgmentRule`, // 批量删除判分点规则 bcDeleteJudgmentRule: `/judgment/judgment/bcJudgmentRule/deleteJudgmentRule`, // 批量删除判分点规则
// 职站 // 职站
QueryPointOfJudgement: `${host}/judgment/judgment/pointOfJudgement/queryPointOfJudgement`, //判分点列表查询 QueryPointOfJudgement: `/judgment/judgment/pointOfJudgement/queryPointOfJudgement`, //判分点列表查询
DeletePointOfJudgement: `${host}/judgment/judgment/pointOfJudgement/deletePointOfJudgement`, //判分点列表删除 DeletePointOfJudgement: `/judgment/judgment/pointOfJudgement/deletePointOfJudgement`, //判分点列表删除
QueryPfdInformation: `${host}/judgment/judgment/pointOfJudgement/queryPfdInformation`, //判分点详细信息 QueryPfdInformation: `/judgment/judgment/pointOfJudgement/queryPfdInformation`, //判分点详细信息
UpdatePointOfJudgement: `${host}/judgment/judgment/pointOfJudgement/updatePointOfJudgement`, //编辑判分点基本信息 UpdatePointOfJudgement: `/judgment/judgment/pointOfJudgement/updatePointOfJudgement`, //编辑判分点基本信息
UpdatePointOfJudgementRule: `${host}/judgment/judgment/pointOfJudgement/updatePointOfJudgementRule`, //编辑判分点规则 UpdatePointOfJudgementRule: `/judgment/judgment/pointOfJudgement/updatePointOfJudgementRule`, //编辑判分点规则
AddPfdgzInformation: `${host}/judgment/judgment/pointOfJudgement/addPfdgzInformation`, //新增判分规则 AddPfdgzInformation: `/judgment/judgment/pointOfJudgement/addPfdgzInformation`, //新增判分规则
AddPfdInformation: `${host}/judgment/judgment/pointOfJudgement/addPfdInformation`, //新增判分点基本信息 AddPfdInformation: `/judgment/judgment/pointOfJudgement/addPfdInformation`, //新增判分点基本信息
QueryPfdgzInformation: `${host}/judgment/judgment/pointOfJudgement/queryPfdgzInformation`, //判分点规则信息查询 QueryPfdgzInformation: `/judgment/judgment/pointOfJudgement/queryPfdgzInformation`, //判分点规则信息查询
QueryAddgz: `${host}/judgment/judgment/pointOfJudgement/queryAddgz`, //查询新增判分点规则新增的数据 QueryAddgz: `/judgment/judgment/pointOfJudgement/queryAddgz`, //查询新增判分点规则新增的数据
DeletePointOfJudgementRule: `${host}/judgment/judgment/pointOfJudgement/deletePointOfJudgementRule`, //删除判分点规则 DeletePointOfJudgementRule: `/judgment/judgment/pointOfJudgement/deletePointOfJudgementRule`, //删除判分点规则
JudgmentPointNameRepetition: `${host}/judgment/judgment/pointOfJudgement/JudgmentPointNameRepetition`, JudgmentPointNameRepetition: `/judgment/judgment/pointOfJudgement/JudgmentPointNameRepetition`,
UpdateIsOpen: `${host}/judgment/judgment/pointOfJudgement/updateIsOpen`, //修改判分点状态 UpdateIsOpen: `/judgment/judgment/pointOfJudgement/updateIsOpen`, //修改判分点状态
queryUserIds:`${host}/liuwanr/userInfo/queryUserIds`, queryUserIds:`/liuwanr/userInfo/queryUserIds`,
// 科大子系统 // 科大子系统
queryPoint: `${host}/kdSys/queryPoint`, queryPoint: `/kdSys/queryPoint`,
querySubject: `${host}/kdSys/querySubject`, querySubject: `/kdSys/querySubject`,
queryItem: `${host}/kdSys/queryItem`, queryItem: `/kdSys/queryItem`,
// 科大平台 // 科大平台
queryListTrading: `${host}/judgment/judgment/tradingJudgmentPoints/query`, queryListTrading: `/judgment/judgment/tradingJudgmentPoints/query`,
deleteTrading: `${host}/judgment/judgment/tradingJudgmentPoints/delete`, deleteTrading: `/judgment/judgment/tradingJudgmentPoints/delete`,
addTrading: `${host}/judgment/judgment/tradingJudgmentPoints/add`, addTrading: `/judgment/judgment/tradingJudgmentPoints/add`,
queryDetailsTrading: `${host}/judgment/judgment/tradingJudgmentPoints/queryDetails`, queryDetailsTrading: `/judgment/judgment/tradingJudgmentPoints/queryDetails`,
updateTrading: `${host}/judgment/judgment/tradingJudgmentPoints/update`, updateTrading: `/judgment/judgment/tradingJudgmentPoints/update`,
updateRuleTrading: `${host}/judgment/judgment/tradingJudgmentPoints/updateRule`, updateRuleTrading: `/judgment/judgment/tradingJudgmentPoints/updateRule`,
deleteRuleTrading: `${host}/judgment/judgment/tradingJudgmentPoints/deleteRule`, deleteRuleTrading: `/judgment/judgment/tradingJudgmentPoints/deleteRule`,
addRule: `${host}/judgment/judgment/tradingJudgmentPoints/addRule`, addRule: `/judgment/judgment/tradingJudgmentPoints/addRule`,
// 川大子系统 // 川大子系统
firstLevel: `${host1}/sichuan/point/firstLevel`, firstLevel: `${host1}/sichuan/point/firstLevel`,

438
src/utils/http.js
Unescape View File

@ -5,23 +5,36 @@ import { Message } from 'element-ui'
import router from '../router/index' import router from '../router/index'
import store from '@/store' import store from '@/store'
// 环境的切换 let host = location.origin
// if (process.env.NODE_ENV == 'development') { const dev = process.env.NODE_ENV === 'development' // 本地
// axios.defaults.baseURL = '/api'; // 科大接口切换，参数里带host的为科大，否则就是职站中台
// } else if (process.env.NODE_ENV == 'debug') { let isKd = /&host=(\d)/.exec(location.hash) //host：{1：测试环境，2：正式环境}
// axios.defaults.baseURL = ''; if(isKd){
// } else if (process.env.NODE_ENV == 'production') { host = isKd[1] == 1 ? 'http://122.9.154.146' : 'http://116.63.168.79'
// axios.defaults.baseURL = 'http://api.123dailu.com/'; }else{
// } let url = location.host;
// 职站中台接口切换
if (url.includes('124.71.12.62')) {
host = 'http://124.71.12.62:9000'; // 巢湖版
} else if (dev) {
host = 'http://121.37.12.51';
host = 'http://192.168.31.217:9000';
}
}
const service = axios.create({
baseURL: host,
timeout: 10000000
});
// 请求超时时间 // 请求超时时间
axios.defaults.timeout = 1000000000; service.defaults.timeout = 1000000000;
// post请求头 // post请求头
axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'; service.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8';
// 请求拦截器 // 请求拦截器
axios.interceptors.request.use(config => { service.interceptors.request.use(config => {
// if (sessionStorage.getItem('token')) { // if (sessionStorage.getItem('token')) {
// 存在将token写入 request header // 存在将token写入 request header
config.headers.token = store.state.token config.headers.token = store.state.token
@ -37,69 +50,57 @@ axios.interceptors.request.use(config => {
return Promise.reject(err); return Promise.reject(err);
}) })
// 响应拦截器 service.interceptors.response.use(
// axios.interceptors.response.use( response => {
// response => { const res = response.data;
// consol.log(response.status) if (res.status == 200 || res.status == 10000 || res.status == 30001) {
// if (response.status === 200) { return Promise.resolve(res).catch(e => {});
// return Promise.resolve(response); } else if (!res.status) {
// } else { return Promise.resolve(res).catch(e => {});
// return Promise.reject(response); } else {
// } Message.error(res.message);
// }, return Promise.reject(res)
// // 服务器状态码不是200的情况 // return Promise.resolve(res).catch(e => {});
// error => { }
// if (error.response.status) { },
// switch (error.response.status) { // 服务器状态码不是200的情况
// // 401: 未登录 error => {
// // 未登录则跳转登录页面，并携带当前页面的路径 if (error.response.status) {
// // 在登录成功后返回当前页面，这一步需要在登录页操作。 switch (error.response.status) {
// case 500: // 401: 未登录
// router.replace({ // 未登录则跳转登录页面，并携带当前页面的路径
// path: '/login', // 在登录成功后返回当前页面，这一步需要在登录页操作。
// // query: { redirect: router.currentRoute.fullPath } case 401:
// }); Message.error("登录过期，请重新登录");
// break; setTimeout(logouts,1500)
// // 403 token过期 break;
// // 登录过期对用户进行提示 case 500:
// // 清除本地token和清空vuex中token对象 Message.error("网络错误");
// // 跳转登录页面 break;
// case 403: // 403 token过期
// // Toast({ // 登录过期对用户进行提示
// // message: '登录过期，请重新登录', // 清除本地token和清空vuex中token对象
// // duration: 1000, // 跳转登录页面
// // forbidClick: true case 403:
// // }); Message.error("登录过期，请重新登录");
// // 清除token // 清除token
// sessionStorage.removeItem('token'); // store.commit('loginSuccess', null);
// store.commit('loginSuccess', null); // 跳转登录页面，并将要浏览的页面fullPath传过去，登录成功后跳转需要访问的页面
// // 跳转登录页面，并将要浏览的页面fullPath传过去，登录成功后跳转需要访问的页面 setTimeout(logouts,1500)
// setTimeout(() => { break;
// router.replace({ // 404请求不存在
// path: '/login', case 404:
// query: { Message.error("网络请求不存在!");
// redirect: router.currentRoute.fullPath break;
// } // 其他错误，直接抛出错误提示
// }); default:
// }, 1000); Message.error(error.response.data.message);
// break; Promise.reject(res);
// // 404请求不存在 }
// case 404: return Promise.reject(error.response);
// router.replace({ }
// path: '/404', }
// }); );
// break;
// // 其他错误，直接抛出错误提示
// default:
// router.replace({
// path: '/500',
// });
// }
// return Promise.reject(error.response);
// }
// }
// );
function logouts(){ function logouts(){
let referrer = store.state.referrer let referrer = store.state.referrer
@ -111,262 +112,47 @@ let tokenStatus = {
0: '用户未登录，请登录后操作！', 0: '用户未登录，请登录后操作！',
1: 'token错误，请重新登录！' 1: 'token错误，请重新登录！'
} }
/**
* get方法，对应get请求
*/
export function get(url, params){
return new Promise((resolve, reject) =>{
axios.get(url, {
params: params
})
.then(res => {
if(typeof res.data == 'number'){
this.$message.error(tokenStatus[res.data])
setTimeout(logouts,1500)
return false
}
if (res.data.status) {
switch (res.data.status) {
case 200:
resolve(res.data);
break;
case 10000:
resolve(res.data);
break;
case 500:
this.$message.error(
res.data.errmessage || res.data.message
);
break;
case 404:
this.$message.error(
res.data.errmessage
);
break;
case 403:
this.$message.error(
res.data.errmessage
);
break;
case 401:
Message.error("token失效,请重新登录");
sessionStorage.removeItem('token');
router.replace('/login')
break;
case 405:
this.$message.error(
res.data.errmessage
);
break;
case 406:
this.$message.error(
res.data.errmessage
);
reject(res.data)
break;
}
}
}) function get(url, params) {
.catch(err => { return new Promise((resolve, reject) => {
reject(err.data) service.get(url, { params: params }).then(res => {
this.$message({ resolve(res);
showClose: true, }).catch(err => {
message: '请求失败，请刷新页面重新进行请求', reject(err);
type: 'error' });
}); });
})
});
}
/**
* post方法，对应post请求
*/
export function post(url, params) {
return new Promise((resolve, reject) => {
axios.post(url,params)
.then(res => {
if(typeof res.data == 'number'){
this.$message.error(tokenStatus[res.data])
setTimeout(logouts,1500)
return false
}
if (res.data.status) {
switch (res.data.status) {
case 200:
resolve(res.data);
break;
case 500:
resolve(res.data);
// this.$message.error(res.data.errmessage || res.data.message);
break;
case 404:
this.$message.error(
res.data.errmessage
);
break;
case 403:
this.$message.error(
res.data.errmessage
);
break;
case 401:
Message.error("token失效,请重新登录");
sessionStorage.removeItem('token');
router.replace('/login')
break;
case 405:
this.$message.error(
res.data.errmessage
);
break;
case 406:
this.$message.error(
res.data.errmessage
);
break;
}
} else {
resolve(res.data)
}
})
.catch(err => {
reject(err.data)
this.$message({
showClose: true,
message: '请求失败，请刷新页面重新进行请求',
type: 'error'
});
})
});
} }
/** function post(url, params) {
* delete方法，对应delete请求 return new Promise((resolve, reject) => {
*/ service.post(url, params).then(res => {
export function del(url, params){ resolve(res);
return new Promise((resolve, reject) =>{ }).catch(err => {
axios.delete(url, { reject(err.data);
params: params });
}) });
.then(res => {
if(typeof res.data == 'number'){
this.$message.error(tokenStatus[res.data])
setTimeout(logouts,1500)
return false
}
if (res.data.status) {
switch (res.data.status) {
case 200:
resolve(res.data);
break;
case 500:
this.$message.error(
res.data.errmessage
);
break;
case 404:
this.$message.error(
res.data.errmessage
);
router.replace({
path: '/404',
});
break;
case 403:
this.$message.error(
res.data.errmessage
);
break;
case 401:
Message.error("token失效,请重新登录");
sessionStorage.removeItem('token');
router.replace('/login')
break;
case 405:
this.$message.error(
res.data.errmessage
);
break;
case 406:
this.$message.error(
res.data.errmessage
);
break;
}
}
})
.catch(err => {
reject(err.data)
this.$message({
showClose: true,
message: '请求失败，请刷新页面重新进行请求',
type: 'error'
});
})
});
} }
/** function del(url, params) {
* put修改 return new Promise((resolve, reject) => {
* @param {} url service.delete(url, {
* @param {*} params params
*/ }).then(res => {
export function put(url, params){ resolve(res);
return new Promise((resolve, reject) =>{ }).catch(err => {
axios.put(url, params) reject(err.data);
.then(res => { });
if(typeof res.data == 'number'){ });
this.$message.error(tokenStatus[res.data]) }
setTimeout(logouts,1500)
return false
}
if (res.data.status) {
switch (res.data.status) {
case 200:
resolve(res.data);
break;
case 500:
this.$message.error(
res.data.errmessage
);
break;
case 404:
this.$message.error(
res.data.errmessage
);
break;
case 403:
this.$message.error(
res.data.errmessage
);
break;
case 401:
Message.error("token失效,请重新登录");
sessionStorage.removeItem('token');
router.replace('/login')
break;
case 405:
this.$message.error(
res.data.errmessage
);
break;
case 406:
this.$message.error(
res.data.errmessage
);
break;
}
}
}) function put(url, params) {
.catch(err => { return new Promise((resolve, reject) => {
reject(err.data) service.put(url, params).then(res => {
this.$message({ resolve(res);
showClose: true, }).catch(err => {
message: '请求失败，请刷新页面重新进行请求', reject(err.data);
type: 'error' });
}); });
})
});
} }
export { get, post, del, put };

1
src/views/Home.vue
Unescape View File

@ -334,6 +334,7 @@ export default {
this.$message.error(res.message); this.$message.error(res.message);
} }
}).catch(err => { }).catch(err => {
row.isOpen = row.isOpen ? 0 : 1
console.log(err); console.log(err);
}); });
} else { } else {

41
src/views/Transaction.vue
Unescape View File

@ -660,20 +660,25 @@ export default {
}, },
// 获取业务 // 获取业务
getBusiness () { getBusiness () {
// if (this.isSt) { if (this.isSt) {
// this.$post(this.api.getAllBusinessSt, { this.$post(this.api.checkpointList, {
// platformId: 3, platformId: 3,
// }).then(({ data }) => { isEnable: 1
// this.businessList = data }).then(({ data }) => {
// }).catch(res => { }) data.forEach(e => {
// } else { e.name = e.customsPassName
// this.$post(`${this.api.getAllBusiness}?systemId=${this.systemId}`).then(({ stRecords, lcRecords }) => { e.id = e.checkpointId
// this.businessList = this.isSt ? stRecords : lcRecords })
// }).catch(res => { }) this.businessList = data
// } }).catch(res => { })
this.$post(`${this.api[this.isSt ? 'getAllBusinessSt' : 'getAllBusiness']}?systemId=${this.systemId}`).then(({ stRecords, lcRecords }) => { } else {
this.businessList = this.isSt ? stRecords : lcRecords this.$post(`${this.api.getAllBusiness}?systemId=${this.systemId}`).then(({ stRecords, lcRecords }) => {
}).catch(res => { }) this.businessList = lcRecords
}).catch(res => { })
}
// this.$post(`${this.api[this.isSt ? 'getAllBusinessSt' : 'getAllBusiness']}?systemId=${this.systemId}`).then(({ stRecords, lcRecords }) => {
// this.businessList = this.isSt ? stRecords : lcRecords
// }).catch(res => { })
}, },
handleSelectionChange (val) { handleSelectionChange (val) {
this.multipleSelection = val this.multipleSelection = val
@ -777,9 +782,9 @@ export default {
const temp = item.emptyTwo.split('~') const temp = item.emptyTwo.split('~')
if (temp.length) { if (temp.length) {
const symbol = temp[0].match(/[<>=]+/g) const symbol = temp[0].match(/[<>=]+/g)
const num = temp[0].match(/[\d.]+/g) const num = temp[0].match(/[^<>=]+/g)
const symbol1 = temp.length > 1 ? temp[1].match(/[<>=]+/g) : '' const symbol1 = temp.length > 1 ? temp[1].match(/[<>=]+/g) : ''
const num1 = temp.length > 1 ? temp[1].match(/[\d.]+/g) : '' const num1 = temp.length > 1 ? temp[1].match(/[^<>=]+/g) : ''
obj.value2 = symbol ? symbol[0] : '' obj.value2 = symbol ? symbol[0] : ''
obj.value3 = num ? num[0] : '' obj.value3 = num ? num[0] : ''
obj.value4 = num1 ? num1[0] : '' obj.value4 = num1 ? num1[0] : ''
@ -841,9 +846,9 @@ export default {
const temp = item.emptyTwo.split('~') const temp = item.emptyTwo.split('~')
if (temp.length) { if (temp.length) {
const symbol = temp[0].match(/[<>=]+/g) const symbol = temp[0].match(/[<>=]+/g)
const num = temp[0].match(/[\d.]+/g) const num = temp[0].match(/[^<>=]+/g)
const symbol1 = temp.length > 1 ? temp[1].match(/[<>=]+/g) : '' const symbol1 = temp.length > 1 ? temp[1].match(/[<>=]+/g) : ''
const num1 = temp.length > 1 ? temp[1].match(/[\d.]+/g) : '' const num1 = temp.length > 1 ? temp[1].match(/[^<>=]+/g) : ''
obj.value2 = symbol ? symbol[0] : '' obj.value2 = symbol ? symbol[0] : ''
obj.value3 = num ? num[0] : '' obj.value3 = num ? num[0] : ''
obj.value4 = num1 ? num1[0] : '' obj.value4 = num1 ? num1[0] : ''

Write Preview
Loading…
Cancel
Save