diff --git a/jianshui-ui/dist.zip b/jianshui-ui/dist.zip index f6bde63..de54b09 100644 Binary files a/jianshui-ui/dist.zip and b/jianshui-ui/dist.zip differ diff --git a/jianshui-ui/package.json b/jianshui-ui/package.json index 5059077..3c6271d 100644 --- a/jianshui-ui/package.json +++ b/jianshui-ui/package.json @@ -8,6 +8,7 @@ "dev": "vue-cli-service serve", "build:prod": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", + "build": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src" }, diff --git a/jianshui-ui/src/api/breaker/request.js b/jianshui-ui/src/api/breaker/request.js index edcc74a..84c330a 100644 --- a/jianshui-ui/src/api/breaker/request.js +++ b/jianshui-ui/src/api/breaker/request.js @@ -1,8 +1,8 @@ import request from '@/utils/request' -export function jianShuiLicense(data) { +export function jianShuiLicense (data) { return request({ - url: '/dev-api/breaker/jianShuiLicense', + url: '/breaker/jianShuiLicense', method: 'post', data: data }) diff --git a/jianshui-ui/src/api/digital/registered.js b/jianshui-ui/src/api/digital/registered.js index def31b5..26da245 100644 --- a/jianshui-ui/src/api/digital/registered.js +++ b/jianshui-ui/src/api/digital/registered.js @@ -1,82 +1,82 @@ import request from '@/utils/request' // 查询金四-用户登记列表 -export function listInvoiceallyhdj(query) { +export function listInvoiceallyhdj (query) { return request({ - url: '/dev-api/invoiceall/invoiceallyhdj/list', + url: '/invoiceall/invoiceallyhdj/list', method: 'get', params: query }) } // 查询金四-用户登记详细 -export function getInvoiceallyhdj(id) { +export function getInvoiceallyhdj (id) { return request({ - url: '/dev-api/invoiceall/invoiceallyhdj/' + id, + url: '/invoiceall/invoiceallyhdj/' + id, method: 'get' }) } //用户登记 -export function registeredMethod(registeredParams,identity) { +export function registeredMethod (registeredParams, identity) { return request({ - url: '/api/invoice_all/v1/registed?identity=' + identity+"&order="+registeredParams, + url: '/api/invoice_all/v1/registed?identity=' + identity + "&order=" + registeredParams, method: 'post', }) } //人脸识别 -export function qrcodeMethod(qrcodeParams,identity) { +export function qrcodeMethod (qrcodeParams, identity) { return request({ - url: '/api/invoice_all/v1/loginVerificated?identity=' + identity+"&order="+qrcodeParams, + url: '/api/invoice_all/v1/loginVerificated?identity=' + identity + "&order=" + qrcodeParams, method: 'post', }) } // 新增金四-用户登记 -export function addInvoiceallyhdj(data) { +export function addInvoiceallyhdj (data) { return request({ - url: '/dev-api/invoiceall/invoiceallyhdj', + url: '/invoiceall/invoiceallyhdj', method: 'post', data: data }) } // 修改金四-用户登记 -export function updateInvoiceallyhdj(data) { +export function updateInvoiceallyhdj (data) { return request({ - url: '/dev-api/invoiceall/invoiceallyhdj', + url: '/invoiceall/invoiceallyhdj', method: 'put', data: data }) } // 删除金四-用户登记 -export function delInvoiceallyhdj(id) { +export function delInvoiceallyhdj (id) { return request({ - url: '/dev-api/invoiceall/invoiceallyhdj/' + id, + url: '/invoiceall/invoiceallyhdj/' + id, method: 'delete' }) } -export function encrypt(data) { +export function encrypt (data) { return request({ - url: '/dev-api/sandbox/encrypt', + url: '/sandbox/encrypt', method: 'post', data: data }) } -export function obtainLoginStatus(data,identity) { +export function obtainLoginStatus (data, identity) { return request({ - url: '/dev-api/invoice_all/obtainLoginStatus?identity=' + identity+"&order="+data, + url: '/invoice_all/obtainLoginStatus?identity=' + identity + "&order=" + data, method: 'post' }) } -export function getCompanyservice(companyid) { +export function getCompanyservice (companyid) { return request({ - url: '/dev-api/system/companyservice/' + companyid, + url: '/system/companyservice/' + companyid, method: 'get' }) } diff --git a/jianshui-ui/src/api/invoice/billinfo.js b/jianshui-ui/src/api/invoice/billinfo.js index 3a83007..6514168 100644 --- a/jianshui-ui/src/api/invoice/billinfo.js +++ b/jianshui-ui/src/api/invoice/billinfo.js @@ -1,52 +1,52 @@ import request from '@/utils/request' // 查询开票信息列表 -export function listBillinfo(query) { +export function listBillinfo (query) { return request({ - url: '/dev-api/invoice/billinfo/list', + url: '/invoice/billinfo/list', method: 'get', params: query }) } // 查询开票信息详细 -export function getBillinfo(id) { +export function getBillinfo (id) { return request({ - url: '/dev-api/invoice/billinfo/' + id, + url: '/invoice/billinfo/' + id, method: 'get' }) } // 新增开票信息 -export function addBillinfo(data) { +export function addBillinfo (data) { return request({ - url: '/dev-api/invoice/billinfo', + url: '/invoice/billinfo', method: 'post', data: data }) } // 修改开票信息 -export function updateBillinfo(data) { +export function updateBillinfo (data) { return request({ - url: '/dev-api/invoice/billinfo', + url: '/invoice/billinfo', method: 'put', data: data }) } // 删除开票信息 -export function delBillinfo(id) { +export function delBillinfo (id) { return request({ - url: '/dev-api/invoice/billinfo/' + id, + url: '/invoice/billinfo/' + id, method: 'delete' }) } // 重新推送开票明细 -export function pushBillinfo(id) { +export function pushBillinfo (id) { return request({ - url: '/dev-api/invoice/billinfo/push/' + id, + url: '/invoice/billinfo/push/' + id, method: 'get' }) } diff --git a/jianshui-ui/src/api/login.js b/jianshui-ui/src/api/login.js index 41c935f..53ccd65 100644 --- a/jianshui-ui/src/api/login.js +++ b/jianshui-ui/src/api/login.js @@ -1,7 +1,7 @@ import request from '@/utils/request' // 登录方法 -export function login(username, password, code, uuid) { +export function login (username, password, code, uuid) { const data = { username, password, @@ -9,7 +9,7 @@ export function login(username, password, code, uuid) { uuid } return request({ - url: '/dev-api/login', + url: '/login', headers: { isToken: false }, @@ -19,9 +19,9 @@ export function login(username, password, code, uuid) { } // 注册方法 -export function register(data) { +export function register (data) { return request({ - url: '/dev-api/register', + url: '/register', headers: { isToken: false }, @@ -31,25 +31,25 @@ export function register(data) { } // 获取用户详细信息 -export function getInfo() { +export function getInfo () { return request({ - url: '/dev-api/getInfo', + url: '/getInfo', method: 'get' }) } // 退出方法 -export function logout() { +export function logout () { return request({ - url: '/dev-api/logout', + url: '/logout', method: 'post' }) } // 获取验证码 -export function getCodeImg() { +export function getCodeImg () { return request({ - url: '/dev-api/captchaImage', + url: '/captchaImage', headers: { isToken: false }, diff --git a/jianshui-ui/src/api/menu.js b/jianshui-ui/src/api/menu.js index a5ab5d1..95aaa17 100644 --- a/jianshui-ui/src/api/menu.js +++ b/jianshui-ui/src/api/menu.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取路由 export const getRouters = () => { return request({ - url: '/dev-api/getRouters', + url: '/getRouters', method: 'get' }) } diff --git a/jianshui-ui/src/api/monitor/cache.js b/jianshui-ui/src/api/monitor/cache.js index 5c205db..4609104 100644 --- a/jianshui-ui/src/api/monitor/cache.js +++ b/jianshui-ui/src/api/monitor/cache.js @@ -1,9 +1,9 @@ import request from '@/utils/request' // 查询缓存详细 -export function getCache() { +export function getCache () { return request({ - url: '/dev-api/monitor/cache', + url: '/monitor/cache', method: 'get' }) } diff --git a/jianshui-ui/src/api/monitor/job.js b/jianshui-ui/src/api/monitor/job.js index 1f55adf..4e2a579 100644 --- a/jianshui-ui/src/api/monitor/job.js +++ b/jianshui-ui/src/api/monitor/job.js @@ -1,56 +1,56 @@ import request from '@/utils/request' // 查询定时任务调度列表 -export function listJob(query) { +export function listJob (query) { return request({ - url: '/dev-api/monitor/job/list', + url: '/monitor/job/list', method: 'get', params: query }) } // 查询定时任务调度详细 -export function getJob(jobId) { +export function getJob (jobId) { return request({ - url: '/dev-api/monitor/job/' + jobId, + url: '/monitor/job/' + jobId, method: 'get' }) } // 新增定时任务调度 -export function addJob(data) { +export function addJob (data) { return request({ - url: '/dev-api/monitor/job', + url: '/monitor/job', method: 'post', data: data }) } // 修改定时任务调度 -export function updateJob(data) { +export function updateJob (data) { return request({ - url: '/dev-api/monitor/job', + url: '/monitor/job', method: 'put', data: data }) } // 删除定时任务调度 -export function delJob(jobId) { +export function delJob (jobId) { return request({ - url: '/dev-api/monitor/job/' + jobId, + url: '/monitor/job/' + jobId, method: 'delete' }) } // 任务状态修改 -export function changeJobStatus(jobId, status) { +export function changeJobStatus (jobId, status) { const data = { jobId, status } return request({ - url: '/dev-api/monitor/job/changeStatus', + url: '/monitor/job/changeStatus', method: 'put', data: data }) @@ -58,13 +58,13 @@ export function changeJobStatus(jobId, status) { // 定时任务立即执行一次 -export function runJob(jobId, jobGroup) { +export function runJob (jobId, jobGroup) { const data = { jobId, jobGroup } return request({ - url: '/dev-api/monitor/job/run', + url: '/monitor/job/run', method: 'put', data: data }) diff --git a/jianshui-ui/src/api/monitor/jobLog.js b/jianshui-ui/src/api/monitor/jobLog.js index dbb94d8..f3eef56 100644 --- a/jianshui-ui/src/api/monitor/jobLog.js +++ b/jianshui-ui/src/api/monitor/jobLog.js @@ -1,26 +1,26 @@ import request from '@/utils/request' // 查询调度日志列表 -export function listJobLog(query) { +export function listJobLog (query) { return request({ - url: '/dev-api/monitor/jobLog/list', + url: '/monitor/jobLog/list', method: 'get', params: query }) } // 删除调度日志 -export function delJobLog(jobLogId) { +export function delJobLog (jobLogId) { return request({ - url: '/dev-api/monitor/jobLog/' + jobLogId, + url: '/monitor/jobLog/' + jobLogId, method: 'delete' }) } // 清空调度日志 -export function cleanJobLog() { +export function cleanJobLog () { return request({ - url: '/dev-api/monitor/jobLog/clean', + url: '/monitor/jobLog/clean', method: 'delete' }) } diff --git a/jianshui-ui/src/api/monitor/logininfor.js b/jianshui-ui/src/api/monitor/logininfor.js index 82c8e47..a20f283 100644 --- a/jianshui-ui/src/api/monitor/logininfor.js +++ b/jianshui-ui/src/api/monitor/logininfor.js @@ -1,26 +1,26 @@ import request from '@/utils/request' // 查询登录日志列表 -export function list(query) { +export function list (query) { return request({ - url: '/dev-api/monitor/logininfor/list', + url: '/monitor/logininfor/list', method: 'get', params: query }) } // 删除登录日志 -export function delLogininfor(infoId) { +export function delLogininfor (infoId) { return request({ - url: '/dev-api/monitor/logininfor/' + infoId, + url: '/monitor/logininfor/' + infoId, method: 'delete' }) } // 清空登录日志 -export function cleanLogininfor() { +export function cleanLogininfor () { return request({ - url: '/dev-api/monitor/logininfor/clean', + url: '/monitor/logininfor/clean', method: 'delete' }) } diff --git a/jianshui-ui/src/api/monitor/online.js b/jianshui-ui/src/api/monitor/online.js index 7675f8c..76da959 100644 --- a/jianshui-ui/src/api/monitor/online.js +++ b/jianshui-ui/src/api/monitor/online.js @@ -1,18 +1,18 @@ import request from '@/utils/request' // 查询在线用户列表 -export function list(query) { +export function list (query) { return request({ - url: '/dev-api/monitor/online/list', + url: '/monitor/online/list', method: 'get', params: query }) } // 强退用户 -export function forceLogout(tokenId) { +export function forceLogout (tokenId) { return request({ - url: '/dev-api/monitor/online/' + tokenId, + url: '/monitor/online/' + tokenId, method: 'delete' }) } diff --git a/jianshui-ui/src/api/monitor/operlog.js b/jianshui-ui/src/api/monitor/operlog.js index 2b33ec9..c7fae8c 100644 --- a/jianshui-ui/src/api/monitor/operlog.js +++ b/jianshui-ui/src/api/monitor/operlog.js @@ -1,26 +1,26 @@ import request from '@/utils/request' // 查询操作日志列表 -export function list(query) { +export function list (query) { return request({ - url: '/dev-api/monitor/operlog/list', + url: '/monitor/operlog/list', method: 'get', params: query }) } // 删除操作日志 -export function delOperlog(operId) { +export function delOperlog (operId) { return request({ - url: '/dev-api/monitor/operlog/' + operId, + url: '/monitor/operlog/' + operId, method: 'delete' }) } // 清空操作日志 -export function cleanOperlog() { +export function cleanOperlog () { return request({ - url: '/dev-api/monitor/operlog/clean', + url: '/monitor/operlog/clean', method: 'delete' }) } diff --git a/jianshui-ui/src/api/monitor/server.js b/jianshui-ui/src/api/monitor/server.js index 2268504..8512d81 100644 --- a/jianshui-ui/src/api/monitor/server.js +++ b/jianshui-ui/src/api/monitor/server.js @@ -1,9 +1,9 @@ import request from '@/utils/request' // 获取服务信息 -export function getServer() { +export function getServer () { return request({ - url: '/dev-api/monitor/server', + url: '/monitor/server', method: 'get' }) } diff --git a/jianshui-ui/src/api/platform/exportmanage.js b/jianshui-ui/src/api/platform/exportmanage.js index 5fdd6ac..efbf1b2 100644 --- a/jianshui-ui/src/api/platform/exportmanage.js +++ b/jianshui-ui/src/api/platform/exportmanage.js @@ -1,44 +1,44 @@ import request from '@/utils/request' // 查询导入设置列表 -export function listExportmanage(query) { +export function listExportmanage (query) { return request({ - url: '/dev-api/platform/exportmanage/list', + url: '/platform/exportmanage/list', method: 'get', params: query }) } // 查询导入设置详细 -export function getExportmanage(id) { +export function getExportmanage (id) { return request({ - url: '/dev-api/platform/exportmanage/' + id, + url: '/platform/exportmanage/' + id, method: 'get' }) } // 新增导入设置 -export function addExportmanage(data) { +export function addExportmanage (data) { return request({ - url: '/dev-api/platform/exportmanage', + url: '/platform/exportmanage', method: 'post', data: data }) } // 修改导入设置 -export function updateExportmanage(data) { +export function updateExportmanage (data) { return request({ - url: '/dev-api/platform/exportmanage', + url: '/platform/exportmanage', method: 'put', data: data }) } // 删除导入设置 -export function delExportmanage(id) { +export function delExportmanage (id) { return request({ - url: '/dev-api/platform/exportmanage/' + id, + url: '/platform/exportmanage/' + id, method: 'delete' }) } diff --git a/jianshui-ui/src/api/platform/exportsetting.js b/jianshui-ui/src/api/platform/exportsetting.js index f926c79..76d916a 100644 --- a/jianshui-ui/src/api/platform/exportsetting.js +++ b/jianshui-ui/src/api/platform/exportsetting.js @@ -1,36 +1,36 @@ import request from '@/utils/request' //查询单个记录 -export function oneExportmanage() { +export function oneExportmanage () { return request({ - url: '/dev-api/platform/exportmanage/findByName', + url: '/platform/exportmanage/findByName', method: 'get' }) } // 新增导入设置 -export function addExportmanage(data) { +export function addExportmanage (data) { return request({ - url: '/dev-api/platform/exportmanage', + url: '/platform/exportmanage', method: 'post', data: data }) } // 修改导入设置 -export function updateExportmanage(data) { +export function updateExportmanage (data) { return request({ - url: '/dev-api/platform/exportmanage', + url: '/platform/exportmanage', method: 'put', data: data }) } // 删除导入设置 -export function delExportmanage(id) { +export function delExportmanage (id) { return request({ - url: '/dev-api/platform/exportmanage/' + id, + url: '/platform/exportmanage/' + id, method: 'delete' }) } diff --git a/jianshui-ui/src/api/platform/product_info.js b/jianshui-ui/src/api/platform/product_info.js index 24ae4ef..2a7fd70 100644 --- a/jianshui-ui/src/api/platform/product_info.js +++ b/jianshui-ui/src/api/platform/product_info.js @@ -1,44 +1,44 @@ import request from '@/utils/request' // 查询商品信息列表 -export function listProduct_info(query) { +export function listProduct_info (query) { return request({ - url: '/dev-api/platform/product_info/list', + url: '/platform/product_info/list', method: 'get', params: query }) } // 查询商品信息详细 -export function getProduct_info(id) { +export function getProduct_info (id) { return request({ - url: '/dev-api/platform/product_info/' + id, + url: '/platform/product_info/' + id, method: 'get' }) } // 新增商品信息 -export function addProduct_info(data) { +export function addProduct_info (data) { return request({ - url: '/dev-api/platform/product_info', + url: '/platform/product_info', method: 'post', data: data }) } // 修改商品信息 -export function updateProduct_info(data) { +export function updateProduct_info (data) { return request({ - url: '/dev-api/platform/product_info', + url: '/platform/product_info', method: 'put', data: data }) } // 删除商品信息 -export function delProduct_info(id) { +export function delProduct_info (id) { return request({ - url: '/dev-api/platform/product_info/' + id, + url: '/platform/product_info/' + id, method: 'delete' }) } diff --git a/jianshui-ui/src/api/platform/vehiclecode.js b/jianshui-ui/src/api/platform/vehiclecode.js index b81e6df..ef4badf 100644 --- a/jianshui-ui/src/api/platform/vehiclecode.js +++ b/jianshui-ui/src/api/platform/vehiclecode.js @@ -1,44 +1,44 @@ import request from '@/utils/request' // 查询车辆编码列表 -export function listVehiclecode(query) { +export function listVehiclecode (query) { return request({ - url: '/dev-api/platform/vehiclecode/list', + url: '/platform/vehiclecode/list', method: 'get', params: query }) } // 查询车辆编码详细 -export function getVehiclecode(id) { +export function getVehiclecode (id) { return request({ - url: '/dev-api/platform/vehiclecode/' + id, + url: '/platform/vehiclecode/' + id, method: 'get' }) } // 新增车辆编码 -export function addVehiclecode(data) { +export function addVehiclecode (data) { return request({ - url: '/dev-api/platform/vehiclecode', + url: '/platform/vehiclecode', method: 'post', data: data }) } // 修改车辆编码 -export function updateVehiclecode(data) { +export function updateVehiclecode (data) { return request({ - url: '/dev-api/platform/vehiclecode', + url: '/platform/vehiclecode', method: 'put', data: data }) } // 删除车辆编码 -export function delVehiclecode(id) { +export function delVehiclecode (id) { return request({ - url: '/dev-api/platform/vehiclecode/' + id, + url: '/platform/vehiclecode/' + id, method: 'delete' }) } diff --git a/jianshui-ui/src/api/sandbox/encrypt.js b/jianshui-ui/src/api/sandbox/encrypt.js index d1c6532..e401ab2 100644 --- a/jianshui-ui/src/api/sandbox/encrypt.js +++ b/jianshui-ui/src/api/sandbox/encrypt.js @@ -1,8 +1,8 @@ import request from '@/utils/request' -export function encrypt(data) { +export function encrypt (data) { return request({ - url: '/dev-api/sandbox/encrypt', + url: '/sandbox/encrypt', method: 'post', data: data }) diff --git a/jianshui-ui/src/api/sdInvoicefile/sdinvoicefile.js b/jianshui-ui/src/api/sdInvoicefile/sdinvoicefile.js index 32b09dc..ce06a92 100644 --- a/jianshui-ui/src/api/sdInvoicefile/sdinvoicefile.js +++ b/jianshui-ui/src/api/sdInvoicefile/sdinvoicefile.js @@ -1,18 +1,18 @@ import request from '@/utils/request' // 查询导入设置列表 -export function getFilePreview(data) { +export function getFilePreview (data) { return request({ - url: '/dev-api/invoice/filePreview', + url: '/invoice/filePreview', method: 'post', data: data }) } // 下载文件 -export function downloadFile(data) { +export function downloadFile (data) { return request({ - url: '/dev-api/invoice/QuerySdInvoiceFileDownload', + url: '/invoice/QuerySdInvoiceFileDownload', method: 'post', data: data }) diff --git a/jianshui-ui/src/api/system/companyservice.js b/jianshui-ui/src/api/system/companyservice.js index 450ccfb..579a110 100644 --- a/jianshui-ui/src/api/system/companyservice.js +++ b/jianshui-ui/src/api/system/companyservice.js @@ -1,44 +1,44 @@ import request from '@/utils/request' // 查询销方信息列表 -export function listCompanyservice(query) { +export function listCompanyservice (query) { return request({ - url: '/dev-api/system/companyservice/list', + url: '/system/companyservice/list', method: 'get', params: query }) } // 查询销方信息详细 -export function getCompanyservice(companyid) { +export function getCompanyservice (companyid) { return request({ - url: '/dev-api/system/companyservice/' + companyid, + url: '/system/companyservice/' + companyid, method: 'get' }) } // 新增销方信息 -export function addCompanyservice(data) { +export function addCompanyservice (data) { return request({ - url: '/dev-api/system/companyservice', + url: '/system/companyservice', method: 'post', data: data }) } // 修改销方信息 -export function updateCompanyservice(data) { +export function updateCompanyservice (data) { return request({ - url: '/dev-api/system/companyservice', + url: '/system/companyservice', method: 'put', data: data }) } // 删除销方信息 -export function delCompanyservice(companyid) { +export function delCompanyservice (companyid) { return request({ - url: '/dev-api/system/companyservice/' + companyid, + url: '/system/companyservice/' + companyid, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/companyservice_detail.js b/jianshui-ui/src/api/system/companyservice_detail.js index 4ea3180..7c7b5ae 100644 --- a/jianshui-ui/src/api/system/companyservice_detail.js +++ b/jianshui-ui/src/api/system/companyservice_detail.js @@ -1,44 +1,44 @@ import request from '@/utils/request' // 查询销方详情列表 -export function listCompanyservice_detail(query) { +export function listCompanyservice_detail (query) { return request({ - url: '/dev-api/system/companyservice_detail/list', + url: '/system/companyservice_detail/list', method: 'get', params: query }) } // 查询销方详情详细 -export function getCompanyservice_detail(id) { +export function getCompanyservice_detail (id) { return request({ - url: '/dev-api/system/companyservice_detail/' + id, + url: '/system/companyservice_detail/' + id, method: 'get' }) } // 新增销方详情 -export function addCompanyservice_detail(data) { +export function addCompanyservice_detail (data) { return request({ - url: '/dev-api/system/companyservice_detail', + url: '/system/companyservice_detail', method: 'post', data: data }) } // 修改销方详情 -export function updateCompanyservice_detail(data) { +export function updateCompanyservice_detail (data) { return request({ - url: '/dev-api/system/companyservice_detail', + url: '/system/companyservice_detail', method: 'put', data: data }) } // 删除销方详情 -export function delCompanyservice_detail(id) { +export function delCompanyservice_detail (id) { return request({ - url: '/dev-api/system/companyservice_detail/' + id, + url: '/system/companyservice_detail/' + id, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/config.js b/jianshui-ui/src/api/system/config.js index f9a6e15..699ad4c 100644 --- a/jianshui-ui/src/api/system/config.js +++ b/jianshui-ui/src/api/system/config.js @@ -1,60 +1,60 @@ import request from '@/utils/request' // 查询参数列表 -export function listConfig(query) { +export function listConfig (query) { return request({ - url: '/dev-api/system/config/list', + url: '/system/config/list', method: 'get', params: query }) } // 查询参数详细 -export function getConfig(configId) { +export function getConfig (configId) { return request({ - url: '/dev-api/system/config/' + configId, + url: '/system/config/' + configId, method: 'get' }) } // 根据参数键名查询参数值 -export function getConfigKey(configKey) { +export function getConfigKey (configKey) { return request({ - url: '/dev-api/system/config/configKey/' + configKey, + url: '/system/config/configKey/' + configKey, method: 'get' }) } // 新增参数配置 -export function addConfig(data) { +export function addConfig (data) { return request({ - url: '/dev-api/system/config', + url: '/system/config', method: 'post', data: data }) } // 修改参数配置 -export function updateConfig(data) { +export function updateConfig (data) { return request({ - url: '/dev-api/system/config', + url: '/system/config', method: 'put', data: data }) } // 删除参数配置 -export function delConfig(configId) { +export function delConfig (configId) { return request({ - url: '/dev-api/system/config/' + configId, + url: '/system/config/' + configId, method: 'delete' }) } // 刷新参数缓存 -export function refreshCache() { +export function refreshCache () { return request({ - url: '/dev-api/system/config/refreshCache', + url: '/system/config/refreshCache', method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/dept.js b/jianshui-ui/src/api/system/dept.js index 608715b..0dac690 100644 --- a/jianshui-ui/src/api/system/dept.js +++ b/jianshui-ui/src/api/system/dept.js @@ -1,68 +1,68 @@ import request from '@/utils/request' // 查询部门列表 -export function listDept(query) { +export function listDept (query) { return request({ - url: '/dev-api/system/dept/list', + url: '/system/dept/list', method: 'get', params: query }) } // 查询部门列表(排除节点) -export function listDeptExcludeChild(deptId) { +export function listDeptExcludeChild (deptId) { return request({ - url: '/dev-api/system/dept/list/exclude/' + deptId, + url: '/system/dept/list/exclude/' + deptId, method: 'get' }) } // 查询部门详细 -export function getDept(deptId) { +export function getDept (deptId) { return request({ - url: '/dev-api/system/dept/' + deptId, + url: '/system/dept/' + deptId, method: 'get' }) } // 查询部门下拉树结构 -export function treeselect() { +export function treeselect () { return request({ - url: '/dev-api/system/dept/treeselect', + url: '/system/dept/treeselect', method: 'get' }) } // 根据角色ID查询部门树结构 -export function roleDeptTreeselect(roleId) { +export function roleDeptTreeselect (roleId) { return request({ - url: '/dev-api/system/dept/roleDeptTreeselect/' + roleId, + url: '/system/dept/roleDeptTreeselect/' + roleId, method: 'get' }) } // 新增部门 -export function addDept(data) { +export function addDept (data) { return request({ - url: '/dev-api/system/dept', + url: '/system/dept', method: 'post', data: data }) } // 修改部门 -export function updateDept(data) { +export function updateDept (data) { return request({ - url: '/dev-api/system/dept', + url: '/system/dept', method: 'put', data: data }) } // 删除部门 -export function delDept(deptId) { +export function delDept (deptId) { return request({ - url: '/dev-api/system/dept/' + deptId, + url: '/system/dept/' + deptId, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/dict/data.js b/jianshui-ui/src/api/system/dict/data.js index 0c5ad60..e4fbc90 100644 --- a/jianshui-ui/src/api/system/dict/data.js +++ b/jianshui-ui/src/api/system/dict/data.js @@ -1,52 +1,52 @@ import request from '@/utils/request' // 查询字典数据列表 -export function listData(query) { +export function listData (query) { return request({ - url: '/dev-api/system/dict/data/list', + url: '/system/dict/data/list', method: 'get', params: query }) } // 查询字典数据详细 -export function getData(dictCode) { +export function getData (dictCode) { return request({ - url: '/dev-api/system/dict/data/' + dictCode, + url: '/system/dict/data/' + dictCode, method: 'get' }) } // 根据字典类型查询字典数据信息 -export function getDicts(dictType) { +export function getDicts (dictType) { return request({ - url: '/dev-api/system/dict/data/type/' + dictType, + url: '/system/dict/data/type/' + dictType, method: 'get' }) } // 新增字典数据 -export function addData(data) { +export function addData (data) { return request({ - url: '/dev-api/system/dict/data', + url: '/system/dict/data', method: 'post', data: data }) } // 修改字典数据 -export function updateData(data) { +export function updateData (data) { return request({ - url: '/dev-api/system/dict/data', + url: '/system/dict/data', method: 'put', data: data }) } // 删除字典数据 -export function delData(dictCode) { +export function delData (dictCode) { return request({ - url: '/dev-api/system/dict/data/' + dictCode, + url: '/system/dict/data/' + dictCode, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/dict/type.js b/jianshui-ui/src/api/system/dict/type.js index 4c7c204..f0a45b6 100644 --- a/jianshui-ui/src/api/system/dict/type.js +++ b/jianshui-ui/src/api/system/dict/type.js @@ -1,60 +1,60 @@ import request from '@/utils/request' // 查询字典类型列表 -export function listType(query) { +export function listType (query) { return request({ - url: '/dev-api/system/dict/type/list', + url: '/system/dict/type/list', method: 'get', params: query }) } // 查询字典类型详细 -export function getType(dictId) { +export function getType (dictId) { return request({ - url: '/dev-api/system/dict/type/' + dictId, + url: '/system/dict/type/' + dictId, method: 'get' }) } // 新增字典类型 -export function addType(data) { +export function addType (data) { return request({ - url: '/dev-api/system/dict/type', + url: '/system/dict/type', method: 'post', data: data }) } // 修改字典类型 -export function updateType(data) { +export function updateType (data) { return request({ - url: '/dev-api/system/dict/type', + url: '/system/dict/type', method: 'put', data: data }) } // 删除字典类型 -export function delType(dictId) { +export function delType (dictId) { return request({ - url: '/dev-api/system/dict/type/' + dictId, + url: '/system/dict/type/' + dictId, method: 'delete' }) } // 刷新字典缓存 -export function refreshCache() { +export function refreshCache () { return request({ - url: '/dev-api/system/dict/type/refreshCache', + url: '/system/dict/type/refreshCache', method: 'delete' }) } // 获取字典选择框列表 -export function optionselect() { +export function optionselect () { return request({ - url: '/dev-api/system/dict/type/optionselect', + url: '/system/dict/type/optionselect', method: 'get' }) } diff --git a/jianshui-ui/src/api/system/manageservices.js b/jianshui-ui/src/api/system/manageservices.js index 7a9a8aa..1fe1c9b 100644 --- a/jianshui-ui/src/api/system/manageservices.js +++ b/jianshui-ui/src/api/system/manageservices.js @@ -1,44 +1,44 @@ import request from '@/utils/request' // 查询服务管理列表 -export function listManageservices(query) { +export function listManageservices (query) { return request({ - url: '/dev-api/system/manageservices/list', + url: '/system/manageservices/list', method: 'get', params: query }) } // 查询服务管理详细 -export function getManageservices(id) { +export function getManageservices (id) { return request({ - url: '/dev-api/system/manageservices/' + id, + url: '/system/manageservices/' + id, method: 'get' }) } // 新增服务管理 -export function addManageservices(data) { +export function addManageservices (data) { return request({ - url: '/dev-api/system/manageservices', + url: '/system/manageservices', method: 'post', data: data }) } // 修改服务管理 -export function updateManageservices(data) { +export function updateManageservices (data) { return request({ - url: '/dev-api/system/manageservices', + url: '/system/manageservices', method: 'put', data: data }) } // 删除服务管理 -export function delManageservices(id) { +export function delManageservices (id) { return request({ - url: '/dev-api/system/manageservices/' + id, + url: '/system/manageservices/' + id, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/menu.js b/jianshui-ui/src/api/system/menu.js index 1902fb5..6f82014 100644 --- a/jianshui-ui/src/api/system/menu.js +++ b/jianshui-ui/src/api/system/menu.js @@ -1,60 +1,60 @@ import request from '@/utils/request' // 查询菜单列表 -export function listMenu(query) { +export function listMenu (query) { return request({ - url: '/dev-api/system/menu/list', + url: '/system/menu/list', method: 'get', params: query }) } // 查询菜单详细 -export function getMenu(menuId) { +export function getMenu (menuId) { return request({ - url: '/dev-api/system/menu/' + menuId, + url: '/system/menu/' + menuId, method: 'get' }) } // 查询菜单下拉树结构 -export function treeselect() { +export function treeselect () { return request({ - url: '/dev-api/system/menu/treeselect', + url: '/system/menu/treeselect', method: 'get' }) } // 根据角色ID查询菜单下拉树结构 -export function roleMenuTreeselect(roleId) { +export function roleMenuTreeselect (roleId) { return request({ - url: '/dev-api/system/menu/roleMenuTreeselect/' + roleId, + url: '/system/menu/roleMenuTreeselect/' + roleId, method: 'get' }) } // 新增菜单 -export function addMenu(data) { +export function addMenu (data) { return request({ - url: '/dev-api/system/menu', + url: '/system/menu', method: 'post', data: data }) } // 修改菜单 -export function updateMenu(data) { +export function updateMenu (data) { return request({ - url: '/dev-api/system/menu', + url: '/system/menu', method: 'put', data: data }) } // 删除菜单 -export function delMenu(menuId) { +export function delMenu (menuId) { return request({ - url: '/dev-api/system/menu/' + menuId, + url: '/system/menu/' + menuId, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/notice.js b/jianshui-ui/src/api/system/notice.js index 4ae6276..99b3d7b 100644 --- a/jianshui-ui/src/api/system/notice.js +++ b/jianshui-ui/src/api/system/notice.js @@ -1,44 +1,44 @@ import request from '@/utils/request' // 查询公告列表 -export function listNotice(query) { +export function listNotice (query) { return request({ - url: '/dev-api/system/notice/list', + url: '/system/notice/list', method: 'get', params: query }) } // 查询公告详细 -export function getNotice(noticeId) { +export function getNotice (noticeId) { return request({ - url: '/dev-api/system/notice/' + noticeId, + url: '/system/notice/' + noticeId, method: 'get' }) } // 新增公告 -export function addNotice(data) { +export function addNotice (data) { return request({ - url: '/dev-api/system/notice', + url: '/system/notice', method: 'post', data: data }) } // 修改公告 -export function updateNotice(data) { +export function updateNotice (data) { return request({ - url: '/dev-api/system/notice', + url: '/system/notice', method: 'put', data: data }) } // 删除公告 -export function delNotice(noticeId) { +export function delNotice (noticeId) { return request({ - url: '/dev-api/system/notice/' + noticeId, + url: '/system/notice/' + noticeId, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/post.js b/jianshui-ui/src/api/system/post.js index 71f13aa..36faaf9 100644 --- a/jianshui-ui/src/api/system/post.js +++ b/jianshui-ui/src/api/system/post.js @@ -1,44 +1,44 @@ import request from '@/utils/request' // 查询岗位列表 -export function listPost(query) { +export function listPost (query) { return request({ - url: '/dev-api/system/post/list', + url: '/system/post/list', method: 'get', params: query }) } // 查询岗位详细 -export function getPost(postId) { +export function getPost (postId) { return request({ - url: '/dev-api/system/post/' + postId, + url: '/system/post/' + postId, method: 'get' }) } // 新增岗位 -export function addPost(data) { +export function addPost (data) { return request({ - url: '/dev-api/system/post', + url: '/system/post', method: 'post', data: data }) } // 修改岗位 -export function updatePost(data) { +export function updatePost (data) { return request({ - url: '/dev-api/system/post', + url: '/system/post', method: 'put', data: data }) } // 删除岗位 -export function delPost(postId) { +export function delPost (postId) { return request({ - url: '/dev-api/system/post/' + postId, + url: '/system/post/' + postId, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/prop.js b/jianshui-ui/src/api/system/prop.js index 99be657..e573a27 100644 --- a/jianshui-ui/src/api/system/prop.js +++ b/jianshui-ui/src/api/system/prop.js @@ -1,52 +1,52 @@ import request from '@/utils/request' // 查询企业扩展属性,包括大象key等列表 -export function listProp(query) { +export function listProp (query) { return request({ - url: '/dev-api/system/prop/list', + url: '/system/prop/list', method: 'get', params: query }) } // 查询企业扩展属性,包括大象key等详细 -export function getProp(companyid) { +export function getProp (companyid) { return request({ - url: '/dev-api/system/prop/' + companyid, + url: '/system/prop/' + companyid, method: 'get' }) } // 新增企业扩展属性,包括大象key等 -export function addProp(data) { +export function addProp (data) { return request({ - url: '/dev-api/system/prop', + url: '/system/prop', method: 'post', data: data }) } // 修改企业扩展属性,包括大象key等 -export function updateProp(data) { +export function updateProp (data) { return request({ - url: '/dev-api/system/prop', + url: '/system/prop', method: 'put', data: data }) } // 删除企业扩展属性,包括大象key等 -export function delProp(companyid) { +export function delProp (companyid) { return request({ - url: '/dev-api/system/prop/' + companyid, + url: '/system/prop/' + companyid, method: 'delete' }) } // 初始化销方prop -export function initProp(companyid) { +export function initProp (companyid) { return request({ - url: '/dev-api/system/prop/init/' + companyid, + url: '/system/prop/init/' + companyid, method: 'get' }) } diff --git a/jianshui-ui/src/api/system/role.js b/jianshui-ui/src/api/system/role.js index e186c13..9039253 100644 --- a/jianshui-ui/src/api/system/role.js +++ b/jianshui-ui/src/api/system/role.js @@ -1,110 +1,110 @@ import request from '@/utils/request' // 查询角色列表 -export function listRole(query) { +export function listRole (query) { return request({ - url: '/dev-api/system/role/list', + url: '/system/role/list', method: 'get', params: query }) } // 查询角色详细 -export function getRole(roleId) { +export function getRole (roleId) { return request({ - url: '/dev-api/system/role/' + roleId, + url: '/system/role/' + roleId, method: 'get' }) } // 新增角色 -export function addRole(data) { +export function addRole (data) { return request({ - url: '/dev-api/system/role', + url: '/system/role', method: 'post', data: data }) } // 修改角色 -export function updateRole(data) { +export function updateRole (data) { return request({ - url: '/dev-api/system/role', + url: '/system/role', method: 'put', data: data }) } // 角色数据权限 -export function dataScope(data) { +export function dataScope (data) { return request({ - url: '/dev-api/system/role/dataScope', + url: '/system/role/dataScope', method: 'put', data: data }) } // 角色状态修改 -export function changeRoleStatus(roleId, status) { +export function changeRoleStatus (roleId, status) { const data = { roleId, status } return request({ - url: '/dev-api/system/role/changeStatus', + url: '/system/role/changeStatus', method: 'put', data: data }) } // 删除角色 -export function delRole(roleId) { +export function delRole (roleId) { return request({ - url: '/dev-api/system/role/' + roleId, + url: '/system/role/' + roleId, method: 'delete' }) } // 查询角色已授权用户列表 -export function allocatedUserList(query) { +export function allocatedUserList (query) { return request({ - url: '/dev-api/system/role/authUser/allocatedList', + url: '/system/role/authUser/allocatedList', method: 'get', params: query }) } // 查询角色未授权用户列表 -export function unallocatedUserList(query) { +export function unallocatedUserList (query) { return request({ - url: '/dev-api/system/role/authUser/unallocatedList', + url: '/system/role/authUser/unallocatedList', method: 'get', params: query }) } // 取消用户授权角色 -export function authUserCancel(data) { +export function authUserCancel (data) { return request({ - url: '/dev-api/system/role/authUser/cancel', + url: '/system/role/authUser/cancel', method: 'put', data: data }) } // 批量取消用户授权角色 -export function authUserCancelAll(data) { +export function authUserCancelAll (data) { return request({ - url: '/dev-api/system/role/authUser/cancelAll', + url: '/system/role/authUser/cancelAll', method: 'put', params: data }) } // 授权用户选择 -export function authUserSelectAll(data) { +export function authUserSelectAll (data) { return request({ - url: '/dev-api/system/role/authUser/selectAll', + url: '/system/role/authUser/selectAll', method: 'put', params: data }) diff --git a/jianshui-ui/src/api/system/user.js b/jianshui-ui/src/api/system/user.js index 45a7355..9e7fc9f 100644 --- a/jianshui-ui/src/api/system/user.js +++ b/jianshui-ui/src/api/system/user.js @@ -2,125 +2,125 @@ import request from '@/utils/request' import { praseStrEmpty } from "@/utils/jianshui"; // 查询用户列表 -export function listUser(query) { +export function listUser (query) { return request({ - url: '/dev-api/system/user/list', + url: '/system/user/list', method: 'get', params: query }) } // 查询用户详细 -export function getUser(userId) { +export function getUser (userId) { return request({ - url: '/dev-api/system/user/' + praseStrEmpty(userId), + url: '/system/user/' + praseStrEmpty(userId), method: 'get' }) } // 新增用户 -export function addUser(data) { +export function addUser (data) { return request({ - url: '/dev-api/system/user', + url: '/system/user', method: 'post', data: data }) } // 修改用户 -export function updateUser(data) { +export function updateUser (data) { return request({ - url: '/dev-api/system/user', + url: '/system/user', method: 'put', data: data }) } // 删除用户 -export function delUser(userId) { +export function delUser (userId) { return request({ - url: '/dev-api/system/user/' + userId, + url: '/system/user/' + userId, method: 'delete' }) } // 用户密码重置 -export function resetUserPwd(userId, password) { +export function resetUserPwd (userId, password) { const data = { userId, password } return request({ - url: '/dev-api/system/user/resetPwd', + url: '/system/user/resetPwd', method: 'put', data: data }) } // 用户状态修改 -export function changeUserStatus(userId, status) { +export function changeUserStatus (userId, status) { const data = { userId, status } return request({ - url: '/dev-api/system/user/changeStatus', + url: '/system/user/changeStatus', method: 'put', data: data }) } // 查询用户个人信息 -export function getUserProfile() { +export function getUserProfile () { return request({ - url: '/dev-api/system/user/profile', + url: '/system/user/profile', method: 'get' }) } // 修改用户个人信息 -export function updateUserProfile(data) { +export function updateUserProfile (data) { return request({ - url: '/dev-api/system/user/profile', + url: '/system/user/profile', method: 'put', data: data }) } // 用户密码重置 -export function updateUserPwd(oldPassword, newPassword) { +export function updateUserPwd (oldPassword, newPassword) { const data = { oldPassword, newPassword } return request({ - url: '/dev-api/system/user/profile/updatePwd', + url: '/system/user/profile/updatePwd', method: 'put', params: data }) } // 用户头像上传 -export function uploadAvatar(data) { +export function uploadAvatar (data) { return request({ - url: '/dev-api/system/user/profile/avatar', + url: '/system/user/profile/avatar', method: 'post', data: data }) } // 查询授权角色 -export function getAuthRole(userId) { +export function getAuthRole (userId) { return request({ - url: '/dev-api/system/user/authRole/' + userId, + url: '/system/user/authRole/' + userId, method: 'get' }) } // 保存授权角色 -export function updateAuthRole(data) { +export function updateAuthRole (data) { return request({ - url: '/dev-api/system/user/authRole', + url: '/system/user/authRole', method: 'put', params: data }) diff --git a/jianshui-ui/src/api/tool/gen.js b/jianshui-ui/src/api/tool/gen.js index 775feff..5024f0f 100644 --- a/jianshui-ui/src/api/tool/gen.js +++ b/jianshui-ui/src/api/tool/gen.js @@ -1,76 +1,76 @@ import request from '@/utils/request' // 查询生成表数据 -export function listTable(query) { +export function listTable (query) { return request({ - url: '/dev-api/tool/gen/list', + url: '/tool/gen/list', method: 'get', params: query }) } // 查询db数据库列表 -export function listDbTable(query) { +export function listDbTable (query) { return request({ - url: '/dev-api/tool/gen/db/list', + url: '/tool/gen/db/list', method: 'get', params: query }) } // 查询表详细信息 -export function getGenTable(tableId) { +export function getGenTable (tableId) { return request({ - url: '/dev-api/tool/gen/' + tableId, + url: '/tool/gen/' + tableId, method: 'get' }) } // 修改代码生成信息 -export function updateGenTable(data) { +export function updateGenTable (data) { return request({ - url: '/dev-api/tool/gen', + url: '/tool/gen', method: 'put', data: data }) } // 导入表 -export function importTable(data) { +export function importTable (data) { return request({ - url: '/dev-api/tool/gen/importTable', + url: '/tool/gen/importTable', method: 'post', params: data }) } // 预览生成代码 -export function previewTable(tableId) { +export function previewTable (tableId) { return request({ - url: '/dev-api/tool/gen/preview/' + tableId, + url: '/tool/gen/preview/' + tableId, method: 'get' }) } // 删除表数据 -export function delTable(tableId) { +export function delTable (tableId) { return request({ - url: '/dev-api/tool/gen/' + tableId, + url: '/tool/gen/' + tableId, method: 'delete' }) } // 生成代码(自定义路径) -export function genCode(tableName) { +export function genCode (tableName) { return request({ - url: '/dev-api/tool/gen/genCode/' + tableName, + url: '/tool/gen/genCode/' + tableName, method: 'get' }) } // 同步数据库 -export function synchDb(tableName) { +export function synchDb (tableName) { return request({ - url: '/dev-api/tool/gen/synchDb/' + tableName, + url: '/tool/gen/synchDb/' + tableName, method: 'get' }) } diff --git a/jianshui-ui/src/permission.js b/jianshui-ui/src/permission.js index 7784af8..f1080b2 100644 --- a/jianshui-ui/src/permission.js +++ b/jianshui-ui/src/permission.js @@ -7,8 +7,8 @@ import { getToken } from '@/utils/auth' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/auth-redirect', '/bind', '/digital/taxBureauLogin' - , '/register','/auth','/XA','/sdFile/*'] +const whiteList = ['/login', '/auth-redirect', '/bind', '/taxBureauLogin' + , '/register', '/auth', '/XA', '/sdFile/*'] router.beforeEach((to, from, next) => { NProgress.start() @@ -28,11 +28,11 @@ router.beforeEach((to, from, next) => { next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 }) }).catch(err => { - store.dispatch('LogOut').then(() => { - Message.error(err) - next({ path: '/' }) - }) + store.dispatch('LogOut').then(() => { + Message.error(err) + next({ path: '/' }) }) + }) } else { next() } diff --git a/jianshui-ui/src/router/index.js b/jianshui-ui/src/router/index.js index 3430a03..7c321e6 100644 --- a/jianshui-ui/src/router/index.js +++ b/jianshui-ui/src/router/index.js @@ -46,17 +46,17 @@ export const constantRoutes = [ }, { path: '/auth', - component: resolve => require(['@/views/freedom/login'],resolve), + component: resolve => require(['@/views/freedom/login'], resolve), hidden: true }, { path: '/authNew', - component: resolve => require(['@/views/freedom/loginNew'],resolve), + component: resolve => require(['@/views/freedom/loginNew'], resolve), hidden: true }, { path: '/XA', - component: resolve => require(['@/views/freedom/XA'],resolve), + component: resolve => require(['@/views/freedom/XA'], resolve), hidden: true }, { @@ -64,9 +64,14 @@ export const constantRoutes = [ component: (resolve) => require(['@/views/register'], resolve), hidden: true }, + { + path: '/taxBureauLogin', + component: (resolve) => require(['@/views/freedom/taxBureauLogin/index'], resolve), + hidden: true + }, { path: '/sdFile/:id', - component: resolve => require(['@/views/sdinvoicefile/index'],resolve), + component: resolve => require(['@/views/sdinvoicefile/index'], resolve), hidden: true }, { diff --git a/jianshui-ui/src/store/modules/user.js b/jianshui-ui/src/store/modules/user.js index bdb2d0e..9174e84 100644 --- a/jianshui-ui/src/store/modules/user.js +++ b/jianshui-ui/src/store/modules/user.js @@ -8,7 +8,7 @@ const user = { avatar: '', roles: [], permissions: [], - authStatus:{}, + authStatus: {}, }, mutations: { @@ -33,7 +33,7 @@ const user = { }, actions: { // 登录 - Login({ commit }, userInfo) { + Login ({ commit }, userInfo) { const username = userInfo.username.trim() const password = userInfo.password const code = userInfo.code @@ -50,7 +50,8 @@ const user = { }, // 获取用户信息 - GetInfo({ commit, state }) { + GetInfo ({ commit, state }) { + debugger return new Promise((resolve, reject) => { getInfo().then(res => { const user = res.user @@ -71,7 +72,7 @@ const user = { }, // 退出系统 - LogOut({ commit, state }) { + LogOut ({ commit, state }) { return new Promise((resolve, reject) => { logout(state.token).then(() => { commit('SET_TOKEN', '') @@ -86,7 +87,7 @@ const user = { }, // 前端 登出 - FedLogOut({ commit }) { + FedLogOut ({ commit }) { return new Promise(resolve => { commit('SET_TOKEN', '') removeToken() diff --git a/jianshui-ui/src/utils/request.js b/jianshui-ui/src/utils/request.js index a1a792f..7f258ca 100644 --- a/jianshui-ui/src/utils/request.js +++ b/jianshui-ui/src/utils/request.js @@ -12,7 +12,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // 创建axios实例 const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 - // baseURL: '/api', + baseURL: process.env.VUE_APP_BASE_API, // 超时 timeout: 1000 * 60 * 2 }) @@ -32,51 +32,51 @@ service.interceptors.request.use(config => { config.params = {}; config.url = url; } - console.log(config,'config') + console.log(config, 'config') return config }, error => { - console.log(error) - Promise.reject(error) + console.log(error) + Promise.reject(error) }) // 响应拦截器 service.interceptors.response.use(res => { - // 未设置状态码则默认成功状态 - const code = res.data.code || 200; - // 获取错误信息 - const msg = errorCode[code] || res.data.msg || errorCode['default'] - // 二进制数据则直接返回 - if(res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer'){ - return res.data + // 未设置状态码则默认成功状态 + const code = res.data.code || 200; + // 获取错误信息 + const msg = errorCode[code] || res.data.msg || errorCode['default'] + // 二进制数据则直接返回 + if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { + return res.data + } + if (code === 401) { + MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' } - if (code === 401) { - MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - } - ).then(() => { - store.dispatch('LogOut').then(() => { - location.href = '/index'; - }) - }).catch(() => {}); - return Promise.reject('无效的会话,或者会话已过期,请重新登录。') - } else if (code === 500) { - Message({ - message: msg, - type: 'error' - }) - return Promise.reject(new Error(msg)) - } else if (code !== 200) { - Notification.error({ - title: msg + ).then(() => { + store.dispatch('LogOut').then(() => { + location.href = '/index'; }) - return Promise.reject('error') - } else { - return res.data - } - }, + }).catch(() => { }); + return Promise.reject('无效的会话,或者会话已过期,请重新登录。') + } else if (code === 500) { + Message({ + message: msg, + type: 'error' + }) + return Promise.reject(new Error(msg)) + } else if (code !== 200) { + Notification.error({ + title: msg + }) + return Promise.reject('error') + } else { + return res.data + } +}, error => { console.log('err' + error) let { message } = error; @@ -99,7 +99,7 @@ service.interceptors.response.use(res => { ) // 通用下载方法 -export function download(url, params, filename) { +export function download (url, params, filename) { downloadLoadingInstance = Loading.service({ text: "正在下载数据,请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", }) return service.post(url, params, { transformRequest: [(params) => { return tansParams(params) }], diff --git a/jianshui-ui/src/views/digital/taxBureauLogin/index.vue b/jianshui-ui/src/views/digital/taxBureauLogin/index.vue index 2242951..f355e2b 100644 --- a/jianshui-ui/src/views/digital/taxBureauLogin/index.vue +++ b/jianshui-ui/src/views/digital/taxBureauLogin/index.vue @@ -224,6 +224,7 @@ export default { getQrCodeBtn(){ this.getQrCodeBtnloading = true; getRpaQrCodeApi({yhm: this.formQr.name.yhm}).then(({data})=>{ + this.$refs.qrCodeUrl.innerHTML = ''; let qrcode = new QRCode(this.$refs.qrCodeUrl, { text: data.ewm, width: 150, @@ -244,6 +245,7 @@ export default { window.clearInterval(this.timer); this.timer = null if(data.slzt === '1' ){ + this.timer = window.setInterval( ()=>{ this.polling() },3000) } if(data.slzt === '2' ){ @@ -253,6 +255,10 @@ export default { message: '当前账号已认证通过', type: 'success' }); + this.$nextTick(()=>{ + this.$refs.qrCodeUrl.innerHTML = ''; + this.qrcodeShow = false; + }) } if(data.slzt === '3' ){ this.$message({ diff --git a/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue b/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue new file mode 100644 index 0000000..163e9a8 --- /dev/null +++ b/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue @@ -0,0 +1,408 @@ + + + + 账号登录 + 身份认证 + + + + + 电子税局登录 + + + + + + + + + + + + + 重新登录 + + + + + 请使用税务APP扫描下方二维码进行身份验证 + + 电子税局用户名 + + + + + + 获取认证二维码 + + + 可将二维码图片发给认证人员进行身份认证,手机端完成认证后自动同步认证结果,开展后续数电业务操作。 + + + + + + + + 为了您的账号安全和信用安全,请进行安全验证。验证码将以短信形式发送至电子税务局绑定的手机号。 + + + 数电账号:{{this.smsFrom.zh}} + + 验证码: + + 获取验证码 + + + + 取 消 + 确 定 + + + + + + + + + + + + + + + + 取 消 + 确 定 + + + + + + + diff --git a/jianshui-ui/vue.config.js b/jianshui-ui/vue.config.js index a686c37..4996cda 100644 --- a/jianshui-ui/vue.config.js +++ b/jianshui-ui/vue.config.js @@ -1,17 +1,17 @@ 'use strict' const path = require('path') -function resolve(dir) { +function resolve (dir) { return path.join(__dirname, dir) } // let portUrl = 'http://58.87.71.213:8082'//测试环境 - const name = process.env.VUE_APP_TITLE || '简税平台管理系统' // 网页标题 const port = process.env.port || process.env.npm_config_port || 8088 // 端口 +// 'http://dev.goldentaxcloud.com:8081' -// const url = process.env.NODE_ENV === 'development' ? portUrl : portUrl +const url = process.env.NODE_ENV === 'development' ? 'http://dev.goldentaxcloud.com:8081' : 'http://dev.goldentaxcloud.com:8081' // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions @@ -36,21 +36,30 @@ module.exports = { open: true, // logLevel: 'debug', proxy: { - '/api/invoice/front/v1': { - target: 'http://58.87.71.213:8082/api/invoice/front/v1', // 测试环境 - changeOrigin: true, - pathRewrite: { - '^/api/invoice/front/v1': '' - } - }, - '/dev-api': { - target: 'http://58.87.71.213:8082', // 测试环境 + // '/api/invoice/front/v1': { + // target: 'http://58.87.71.213:8082/api/invoice/front/v1', // 测试环境 + // changeOrigin: true, + // pathRewrite: { + // '^/api/invoice/front/v1': '' + // } + // }, + [process.env.VUE_APP_BASE_API]: { + target: url, // 测试环境 changeOrigin: true, pathRewrite: { - '^/dev-api':'' + ['^' + process.env.VUE_APP_BASE_API]: '' } }, }, + // proxy: { + // [process.env.VUE_APP_BASE_API]: { + // target: 'http://localhost:8081', + // changeOrigin: true, + // pathRewrite: { + // ['^' + process.env.VUE_APP_BASE_API +]: '' + // } + // } + // }, disableHostCheck: true }, configureWebpack: { @@ -61,7 +70,7 @@ module.exports = { } } }, - chainWebpack(config) { + chainWebpack (config) { config.plugins.delete('preload') // TODO: need test config.plugins.delete('prefetch') // TODO: need test @@ -95,33 +104,33 @@ module.exports = { .end() config .optimization.splitChunks({ - chunks: 'all', - cacheGroups: { - libs: { - name: 'chunk-libs', - test: /[\\/]node_modules[\\/]/, - priority: 10, - chunks: 'initial' // only package third parties that are initially dependent - }, - elementUI: { - name: 'chunk-elementUI', // split elementUI into a single package - priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app - test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm - }, - commons: { - name: 'chunk-commons', - test: resolve('src/components'), // can customize your rules - minChunks: 3, // minimum common number - priority: 5, - reuseExistingChunk: true + chunks: 'all', + cacheGroups: { + libs: { + name: 'chunk-libs', + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: 'initial' // only package third parties that are initially dependent + }, + elementUI: { + name: 'chunk-elementUI', // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm + }, + commons: { + name: 'chunk-commons', + test: resolve('src/components'), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true + } } - } - }) + }) config.optimization.runtimeChunk('single'), - { - from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 - to: './' //到根目录下 - } + { + from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 + to: './' //到根目录下 + } } ) }