diff --git a/.env.development b/.env.development index a60aba1..b50304d 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.105:9040' +VUE_APP_BASE_API = 'http://192.168.0.106:9040' # VUE_APP_BASE_API = 'http://39.101.188.84:9040' # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api' diff --git a/package.json b/package.json index 945187b..fc1c42d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202407041438", + "version": "1.0.202407051036", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/api/jin_ji_hu/enterList/index.js b/src/api/jin_ji_hu/enterList/index.js index 74f9af6..4e9c2a5 100644 --- a/src/api/jin_ji_hu/enterList/index.js +++ b/src/api/jin_ji_hu/enterList/index.js @@ -21,8 +21,8 @@ export function enterpriseBasicInfoNew(data) { // 修改企业基础信息 export function enterpriseBasicInfoChange(data) { return request({ - url: "/system/enterpriseBasicInfo", - method: "put", + url: "/system/enterpriseBasicInfo/edit", + method: "post", data }) } @@ -39,7 +39,7 @@ export function enterpriseBasicInfoId(id) { export function enterpriseBasicInfoDel(params) { return request({ url: "/system/enterpriseBasicInfo" + id, - method: "delete", + method: "post", params }) } diff --git a/src/api/jin_ji_hu/infoMaintain/index.js b/src/api/jin_ji_hu/infoMaintain/index.js index 3815a65..27f31ce 100644 --- a/src/api/jin_ji_hu/infoMaintain/index.js +++ b/src/api/jin_ji_hu/infoMaintain/index.js @@ -21,8 +21,8 @@ export function jEnterpriseContactNew(data) { // 删除企业联系人 export function jEnterpriseContactChange(data) { return request({ - url: "/jjh/jEnterpriseContact", - method: "put", + url: "/jjh/jEnterpriseContact/edit", + method: "post", data }) } @@ -39,7 +39,7 @@ export function jEnterpriseContactId(id) { export function jEnterpriseContactDel(params) { return request({ url: "/jjh/jEnterpriseContact", - method: "delete", + method: "post", params }) } \ No newline at end of file diff --git a/src/api/jin_ji_hu/intelligentReminder/index.js b/src/api/jin_ji_hu/intelligentReminder/index.js index 49f3b37..8e36018 100644 --- a/src/api/jin_ji_hu/intelligentReminder/index.js +++ b/src/api/jin_ji_hu/intelligentReminder/index.js @@ -22,7 +22,7 @@ export function jSmartRemindersNew(data) { export function updateNdqChange(data) { return request({ url: "/jjh/jSmartReminders/updateNdq", - method: "put", + method: "post", data }) } @@ -31,7 +31,7 @@ export function updateNdqChange(data) { export function updateDqChange(data) { return request({ url: "/jjh/jSmartReminders/updateDq", - method: "put", + method: "post", data }) } @@ -48,7 +48,7 @@ export function jSmartRemindersId(id) { export function jSmartRemindersDel(params) { return request({ url: "/jjh/jSmartReminders", - method: "delete", + method: "post", params }) } diff --git a/src/api/jin_ji_hu/policyDocument/index.js b/src/api/jin_ji_hu/policyDocument/index.js index ab4e172..19e81c4 100644 --- a/src/api/jin_ji_hu/policyDocument/index.js +++ b/src/api/jin_ji_hu/policyDocument/index.js @@ -21,8 +21,8 @@ export function jPolicyFileNew(data) { // 修改政策文件 export function jPolicyFileChange(data) { return request({ - url: "/jjh/jPolicyFile", - method: "put", + url: "/jjh/jPolicyFile/edit", + method: "post", data }) } @@ -39,7 +39,7 @@ export function jPolicyFileId(id) { export function jPolicyFileDel(params) { return request({ url: "/jjh/jPolicyFile", - method: "delete", + method: "post", params }) } \ No newline at end of file diff --git a/src/api/jin_ji_hu/project/index.js b/src/api/jin_ji_hu/project/index.js index 91ef48e..b0f5b5c 100644 --- a/src/api/jin_ji_hu/project/index.js +++ b/src/api/jin_ji_hu/project/index.js @@ -19,7 +19,7 @@ export function jProjectId(id) { export function jProjectDel(params) { return request({ url: "/jjh/jProject", - method: "delete", + method: "post", params }) } @@ -71,17 +71,16 @@ export function postJMemorandum(data) { // 修改备忘录 export function putJMemorandum(data) { return request({ - url: "/jjh/jMemorandum", - method: "put", + url: "/jjh/jMemorandum/edit", + method: "post", data }) } // 删除备忘录 -export function delJMemorandum(params) { +export function delJMemorandum(id) { return request({ - url: "/jjh/jMemorandum", - method: "delete", - params + url: "/jjh/jMemorandum" + id, + method: "post", }) } diff --git a/src/api/monitor/cache.js b/src/api/monitor/cache.js index 72c5f6a..e73e3fd 100644 --- a/src/api/monitor/cache.js +++ b/src/api/monitor/cache.js @@ -36,7 +36,7 @@ export function getCacheValue(cacheName, cacheKey) { export function clearCacheName(cacheName) { return request({ url: '/monitor/cache/clearCacheName/' + cacheName, - method: 'delete' + method: 'post' }) } @@ -44,7 +44,7 @@ export function clearCacheName(cacheName) { export function clearCacheKey(cacheKey) { return request({ url: '/monitor/cache/clearCacheKey/' + cacheKey, - method: 'delete' + method: 'post' }) } @@ -52,6 +52,6 @@ export function clearCacheKey(cacheKey) { export function clearCacheAll() { return request({ url: '/monitor/cache/clearCacheAll', - method: 'delete' + method: 'post' }) } diff --git a/src/api/monitor/job.js b/src/api/monitor/job.js index 3815569..aaf90c0 100644 --- a/src/api/monitor/job.js +++ b/src/api/monitor/job.js @@ -29,8 +29,8 @@ export function addJob(data) { // 修改定时任务调度 export function updateJob(data) { return request({ - url: '/monitor/job', - method: 'put', + url: '/monitor/job/edit', + method: 'post', data: data }) } @@ -39,7 +39,7 @@ export function updateJob(data) { export function delJob(jobId) { return request({ url: '/monitor/job/' + jobId, - method: 'delete' + method: 'post' }) } @@ -51,7 +51,7 @@ export function changeJobStatus(jobId, status) { } return request({ url: '/monitor/job/changeStatus', - method: 'put', + method: 'post', data: data }) } @@ -65,7 +65,7 @@ export function runJob(jobId, jobGroup) { } return request({ url: '/monitor/job/run', - method: 'put', + method: 'post', data: data }) } \ No newline at end of file diff --git a/src/api/monitor/jobLog.js b/src/api/monitor/jobLog.js index 6e0be61..7909baa 100644 --- a/src/api/monitor/jobLog.js +++ b/src/api/monitor/jobLog.js @@ -13,7 +13,7 @@ export function listJobLog(query) { export function delJobLog(jobLogId) { return request({ url: '/monitor/jobLog/' + jobLogId, - method: 'delete' + method: 'post' }) } @@ -21,6 +21,6 @@ export function delJobLog(jobLogId) { export function cleanJobLog() { return request({ url: '/monitor/jobLog/clean', - method: 'delete' + method: 'post' }) } diff --git a/src/api/monitor/logininfor.js b/src/api/monitor/logininfor.js index 4d112b7..6135a13 100644 --- a/src/api/monitor/logininfor.js +++ b/src/api/monitor/logininfor.js @@ -13,7 +13,7 @@ export function list(query) { export function delLogininfor(infoId) { return request({ url: '/monitor/logininfor/' + infoId, - method: 'delete' + method: 'post' }) } @@ -29,6 +29,6 @@ export function unlockLogininfor(userName) { export function cleanLogininfor() { return request({ url: '/monitor/logininfor/clean', - method: 'delete' + method: 'post' }) } diff --git a/src/api/monitor/online.js b/src/api/monitor/online.js index bd22137..5cc55ab 100644 --- a/src/api/monitor/online.js +++ b/src/api/monitor/online.js @@ -13,6 +13,6 @@ export function list(query) { export function forceLogout(tokenId) { return request({ url: '/monitor/online/' + tokenId, - method: 'delete' + method: 'post' }) } diff --git a/src/api/monitor/operlog.js b/src/api/monitor/operlog.js index a04bca8..b8c2fda 100644 --- a/src/api/monitor/operlog.js +++ b/src/api/monitor/operlog.js @@ -13,7 +13,7 @@ export function list(query) { export function delOperlog(operId) { return request({ url: '/monitor/operlog/' + operId, - method: 'delete' + method: 'post' }) } @@ -21,6 +21,6 @@ export function delOperlog(operId) { export function cleanOperlog() { return request({ url: '/monitor/operlog/clean', - method: 'delete' + method: 'post' }) } diff --git a/src/api/onlineDeclartion/declareAddContent.js b/src/api/onlineDeclartion/declareAddContent.js index a832815..800ab61 100644 --- a/src/api/onlineDeclartion/declareAddContent.js +++ b/src/api/onlineDeclartion/declareAddContent.js @@ -103,8 +103,8 @@ export function addProjectSettlementAward(data) { // 编辑-项目落户奖补-1 export function putProjectSettlementAward(data) { return request({ - url: '/system/projectSettlementAward', - method: 'put', + url: '/system/projectSettlementAward/edit', + method: 'post', data: data }) } @@ -121,8 +121,8 @@ export function addBigStrongAward(data) { // 编辑-做大做强奖补-2 export function putBigStrongAward(data) { return request({ - url: '/system/bigStrongAward', - method: 'put', + url: '/system/bigStrongAward/edit', + method: 'post', data: data }) } @@ -139,8 +139,8 @@ export function addCarrierConstructionAward(data) { // 编辑-载体建设奖补-3 export function putCarrierConstructionAward(data) { return request({ - url: '/system/carrierConstructionAward', - method: 'put', + url: '/system/carrierConstructionAward/edit', + method: 'post', data: data }) } @@ -157,8 +157,8 @@ export function addPlatformConstructionAward(data) { // 编辑-平台建设奖补-4 export function putPlatformConstructionAward(data) { return request({ - url: '/system/platformConstructionAward', - method: 'put', + url: '/system/platformConstructionAward/edit', + method: 'post', data: data }) } @@ -175,8 +175,8 @@ export function addBrandingAward(data) { // 编辑-品牌打造奖补-5 export function putBrandingAward(data) { return request({ - url: '/system/brandingAward', - method: 'put', + url: '/system/brandingAward/edit', + method: 'post', data: data }) } @@ -193,8 +193,8 @@ export function addSceneOpeningAward(data) { // 编辑-场景开放奖补-6 export function putSceneOpeningAward(data) { return request({ - url: '/system/sceneOpeningAward', - method: 'put', + url: '/system/sceneOpeningAward/edit', + method: 'post', data: data }) } @@ -211,8 +211,8 @@ export function addCreditManagement(data) { // 编辑-信用管理奖补-7 export function putCreditManagement(data) { return request({ - url: '/system/creditManagement', - method: 'put', + url: '/system/creditManagement/edit', + method: 'post', data: data }) } @@ -229,8 +229,8 @@ export function addIndustrialInternetAward(data) { // 编辑-5G+工业互联网奖补-8 export function putIndustrialInternetAward(data) { return request({ - url: '/system/industrialInternetAward', - method: 'put', + url: '/system/industrialInternetAward/edit', + method: 'post', data: data }) } @@ -247,8 +247,8 @@ export function addManufacturingServicesAward(data) { // 编辑-制造服务业有效投入奖补-9 export function putManufacturingServicesAward(data) { return request({ - url: '/system/manufacturingServicesAward', - method: 'put', + url: '/system/manufacturingServicesAward/edit', + method: 'post', data: data }) } @@ -265,8 +265,8 @@ export function addLogisticsDevelopmentAward(data) { // 编辑-物流发展奖补-10 export function putLogisticsDevelopmentAward(data) { return request({ - url: '/system/logisticsDevelopmentAward', - method: 'put', + url: '/system/logisticsDevelopmentAward/edit', + method: 'post', data: data }) } @@ -283,8 +283,8 @@ export function addIntegrationIndustries(data) { // 编辑-两业融合奖补-11 export function putIntegrationIndustries(data) { return request({ - url: '/system/integrationIndustries', - method: 'put', + url: '/system/integrationIndustries/edit', + method: 'post', data: data }) } @@ -301,8 +301,8 @@ export function addOutQuitProducts(data) { // 编辑-2024年度淘汰落后和退出低端低效产能装备清单模板-12 export function putOutQuitProducts(data) { return request({ - url: '/system/outQuitProducts', - method: 'put', + url: '/system/outQuitProducts/edit', + method: 'post', data: data }) } @@ -313,7 +313,7 @@ export function putOutQuitProducts(data) { export function templateOneUpdata(data){ return request({ url: '/system/projectSettlementAward/update', - method: 'put', + method: 'post', data: data }) } @@ -322,7 +322,7 @@ export function templateOneUpdata(data){ export function templateTwoUpdata(data){ return request({ url: '/system/bigStrongAward/update', - method: 'put', + method: 'post', data: data }) } @@ -331,7 +331,7 @@ export function templateTwoUpdata(data){ export function templateThreeUpdata(data){ return request({ url: '/system/carrierConstructionAward/update', - method: 'put', + method: 'post', data: data }) } @@ -340,7 +340,7 @@ export function templateThreeUpdata(data){ export function templateFourUpdata(data){ return request({ url: '/system/platformConstructionAward/update', - method: 'put', + method: 'post', data: data }) } @@ -349,7 +349,7 @@ export function templateFourUpdata(data){ export function templateFiveUpdata(data){ return request({ url: '/system/brandingAward/update', - method: 'put', + method: 'post', data: data }) } @@ -358,7 +358,7 @@ export function templateFiveUpdata(data){ export function templateSixUpdata(data){ return request({ url: '/system/sceneOpeningAward/update', - method: 'put', + method: 'post', data: data }) } @@ -367,7 +367,7 @@ export function templateSixUpdata(data){ export function templateSevenUpdata(data){ return request({ url: '/system/creditManagement/update', - method: 'put', + method: 'post', data: data }) } @@ -376,7 +376,7 @@ export function templateSevenUpdata(data){ export function templateEightUpdata(data){ return request({ url: '/system/industrialInternetAward/update', - method: 'put', + method: 'post', data: data }) } @@ -385,7 +385,7 @@ export function templateEightUpdata(data){ export function templateNineUpdata(data){ return request({ url: '/system/manufacturingServicesAward/update', - method: 'put', + method: 'post', data: data }) } @@ -394,7 +394,7 @@ export function templateNineUpdata(data){ export function templateTenUpdata(data){ return request({ url: '/system/logisticsDevelopmentAward/update', - method: 'put', + method: 'post', data: data }) } @@ -403,7 +403,7 @@ export function templateTenUpdata(data){ export function templateElevenUpdata(data){ return request({ url: '/system/integrationIndustries/update', - method: 'put', + method: 'post', data: data }) } @@ -412,7 +412,7 @@ export function templateElevenUpdata(data){ export function templateProductsUpdata(data){ return request({ url: '/system/outQuitProducts/update', - method: 'put', + method: 'post', data: data }) } diff --git a/src/api/onlineDeclartion/enterpriseDirectory.js b/src/api/onlineDeclartion/enterpriseDirectory.js index 20f1938..414fefc 100644 --- a/src/api/onlineDeclartion/enterpriseDirectory.js +++ b/src/api/onlineDeclartion/enterpriseDirectory.js @@ -49,8 +49,8 @@ export function addTemplateRecord(data) { // 编辑企业名录 export function putTemplateRecord(data) { return request({ - url: '/system/templateRecord', - method: 'put', + url: '/system/templateRecord/edit', + method: 'post', data: data }) } diff --git a/src/api/onlineDeclartion/pendingReview.js b/src/api/onlineDeclartion/pendingReview.js index 7a14f02..aebe50e 100644 --- a/src/api/onlineDeclartion/pendingReview.js +++ b/src/api/onlineDeclartion/pendingReview.js @@ -40,7 +40,7 @@ export function addTemplateRecord(data) { export function approvalEdit(data) { return request({ url: '/system/declarationRecords/approvalEdit', - method: 'put', + method: 'post', data: data }) } diff --git a/src/api/onlineDeclartion/records.js b/src/api/onlineDeclartion/records.js index 32642f8..1dab9c8 100644 --- a/src/api/onlineDeclartion/records.js +++ b/src/api/onlineDeclartion/records.js @@ -63,7 +63,7 @@ export function uploadFile(data) { export function putMunicipalBureauReview(data) { return request({ url: '/system/declarationRecords/municipalReviewNew', - method: 'put', + method: 'post', data: data }) } diff --git a/src/api/system/bigStrongAward.js b/src/api/system/bigStrongAward.js index 564c17d..7af40c1 100644 --- a/src/api/system/bigStrongAward.js +++ b/src/api/system/bigStrongAward.js @@ -29,8 +29,8 @@ export function addBigStrongAward(data) { // 修改做大做强奖详情 export function updateBigStrongAward(data) { return request({ - url: '/system/bigStrongAward', - method: 'put', + url: '/system/bigStrongAward/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updateBigStrongAward(data) { export function delBigStrongAward(id) { return request({ url: '/system/bigStrongAward/' + id, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/brandingAward.js b/src/api/system/brandingAward.js index 592e7f6..369e5aa 100644 --- a/src/api/system/brandingAward.js +++ b/src/api/system/brandingAward.js @@ -29,8 +29,8 @@ export function addBrandingAward(data) { // 修改品牌打造奖补 export function updateBrandingAward(data) { return request({ - url: '/system/brandingAward', - method: 'put', + url: '/system/brandingAward/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updateBrandingAward(data) { export function delBrandingAward(id) { return request({ url: '/system/brandingAward/' + id, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/carrierConstructionAward.js b/src/api/system/carrierConstructionAward.js index a189c95..816da6a 100644 --- a/src/api/system/carrierConstructionAward.js +++ b/src/api/system/carrierConstructionAward.js @@ -29,8 +29,8 @@ export function addCarrierConstructionAward(data) { // 修改载体建设奖补 export function updateCarrierConstructionAward(data) { return request({ - url: '/system/carrierConstructionAward', - method: 'put', + url: '/system/carrierConstructionAward/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updateCarrierConstructionAward(data) { export function delCarrierConstructionAward(id) { return request({ url: '/system/carrierConstructionAward/' + id, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/config.js b/src/api/system/config.js index a404d82..1f46ed9 100644 --- a/src/api/system/config.js +++ b/src/api/system/config.js @@ -37,8 +37,8 @@ export function addConfig(data) { // 修改参数配置 export function updateConfig(data) { return request({ - url: '/system/config', - method: 'put', + url: '/system/config/edit', + method: 'post', data: data }) } @@ -47,7 +47,7 @@ export function updateConfig(data) { export function delConfig(configId) { return request({ url: '/system/config/' + configId, - method: 'delete' + method: ' post' }) } @@ -55,6 +55,6 @@ export function delConfig(configId) { export function refreshCache() { return request({ url: '/system/config/refreshCache', - method: 'delete' + method: ' post' }) } diff --git a/src/api/system/dept.js b/src/api/system/dept.js index fc943cd..1013027 100644 --- a/src/api/system/dept.js +++ b/src/api/system/dept.js @@ -37,8 +37,8 @@ export function addDept(data) { // 修改部门 export function updateDept(data) { return request({ - url: '/system/dept', - method: 'put', + url: '/system/dept/edit', + method: 'post', data: data }) } @@ -47,6 +47,6 @@ export function updateDept(data) { export function delDept(deptId) { return request({ url: '/system/dept/' + deptId, - method: 'delete' + method: 'post' }) } \ No newline at end of file diff --git a/src/api/system/dict/data.js b/src/api/system/dict/data.js index 6c9eb79..9e6c2b5 100644 --- a/src/api/system/dict/data.js +++ b/src/api/system/dict/data.js @@ -37,8 +37,8 @@ export function addData(data) { // 修改字典数据 export function updateData(data) { return request({ - url: '/system/dict/data', - method: 'put', + url: '/system/dict/data/edit', + method: 'post', data: data }) } @@ -47,6 +47,6 @@ export function updateData(data) { export function delData(dictCode) { return request({ url: '/system/dict/data/' + dictCode, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/dict/type.js b/src/api/system/dict/type.js index a7a6e01..5b07d5d 100644 --- a/src/api/system/dict/type.js +++ b/src/api/system/dict/type.js @@ -29,8 +29,8 @@ export function addType(data) { // 修改字典类型 export function updateType(data) { return request({ - url: '/system/dict/type', - method: 'put', + url: '/system/dict/type/edit', + method: 'post', data: data }) } @@ -39,7 +39,7 @@ export function updateType(data) { export function delType(dictId) { return request({ url: '/system/dict/type/' + dictId, - method: 'delete' + method: 'post' }) } @@ -47,7 +47,7 @@ export function delType(dictId) { export function refreshCache() { return request({ url: '/system/dict/type/refreshCache', - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/enterpriseBasicInfo.js b/src/api/system/enterpriseBasicInfo.js index ffd8f16..b1d2d96 100644 --- a/src/api/system/enterpriseBasicInfo.js +++ b/src/api/system/enterpriseBasicInfo.js @@ -29,8 +29,8 @@ export function addEnterpriseBasicInfo(data) { // 修改企业基础信息 export function updateEnterpriseBasicInfo(data) { return request({ - url: '/system/enterpriseBasicInfo', - method: 'put', + url: '/system/enterpriseBasicInfo/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updateEnterpriseBasicInfo(data) { export function delEnterpriseBasicInfo(id) { return request({ url: '/system/enterpriseBasicInfo/' + id, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/fundingInfo.js b/src/api/system/fundingInfo.js index b3f518c..3944306 100644 --- a/src/api/system/fundingInfo.js +++ b/src/api/system/fundingInfo.js @@ -29,8 +29,8 @@ export function addFundingInfo(data) { // 修改资金信息 export function updateFundingInfo(data) { return request({ - url: '/system/fundingInfo', - method: 'put', + url: '/system/fundingInfo/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updateFundingInfo(data) { export function delFundingInfo(id) { return request({ url: '/system/fundingInfo/' + id, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/industrialInternetAward.js b/src/api/system/industrialInternetAward.js index 0d2225b..042c5fb 100644 --- a/src/api/system/industrialInternetAward.js +++ b/src/api/system/industrialInternetAward.js @@ -29,8 +29,8 @@ export function addIndustrialInternetAward(data) { // 修改5G+工业互联网奖补 export function updateIndustrialInternetAward(data) { return request({ - url: '/system/industrialInternetAward', - method: 'put', + url: '/system/industrialInternetAward/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updateIndustrialInternetAward(data) { export function delIndustrialInternetAward(id) { return request({ url: '/system/industrialInternetAward/' + id, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/logininfor.js b/src/api/system/logininfor.js index e010dc3..41bafac 100644 --- a/src/api/system/logininfor.js +++ b/src/api/system/logininfor.js @@ -13,7 +13,7 @@ export function list(query) { export function delLogininfor(infoId) { return request({ url: '/system/logininfor/' + infoId, - method: 'delete' + method: 'post' }) } @@ -28,6 +28,6 @@ export function unlockLogininfor(userName) { export function cleanLogininfor() { return request({ url: '/system/logininfor/clean', - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/logisticsDevelopmentAward.js b/src/api/system/logisticsDevelopmentAward.js index 9daddec..1497f28 100644 --- a/src/api/system/logisticsDevelopmentAward.js +++ b/src/api/system/logisticsDevelopmentAward.js @@ -29,8 +29,8 @@ export function addLogisticsDevelopmentAward(data) { // 修改物流发展奖补 export function updateLogisticsDevelopmentAward(data) { return request({ - url: '/system/logisticsDevelopmentAward', - method: 'put', + url: '/system/logisticsDevelopmentAward/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updateLogisticsDevelopmentAward(data) { export function delLogisticsDevelopmentAward(id) { return request({ url: '/system/logisticsDevelopmentAward/' + id, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/manufacturingServicesAward.js b/src/api/system/manufacturingServicesAward.js index e4f8b28..ac2f9e6 100644 --- a/src/api/system/manufacturingServicesAward.js +++ b/src/api/system/manufacturingServicesAward.js @@ -29,8 +29,8 @@ export function addManufacturingServicesAward(data) { // 修改制造服务业有效投入奖补 export function updateManufacturingServicesAward(data) { return request({ - url: '/system/manufacturingServicesAward', - method: 'put', + url: '/system/manufacturingServicesAward/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updateManufacturingServicesAward(data) { export function delManufacturingServicesAward(id) { return request({ url: '/system/manufacturingServicesAward/' + id, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/menu.js b/src/api/system/menu.js index f6415c6..cba6607 100644 --- a/src/api/system/menu.js +++ b/src/api/system/menu.js @@ -46,7 +46,7 @@ export function addMenu(data) { export function updateMenu(data) { return request({ url: '/system/menu', - method: 'put', + method: 'post/edit', data: data }) } @@ -55,6 +55,6 @@ export function updateMenu(data) { export function delMenu(menuId) { return request({ url: '/system/menu/' + menuId, - method: 'delete' + method: 'post' }) } \ No newline at end of file diff --git a/src/api/system/notice.js b/src/api/system/notice.js index c274ea5..74c06e2 100644 --- a/src/api/system/notice.js +++ b/src/api/system/notice.js @@ -29,8 +29,8 @@ export function addNotice(data) { // 修改公告 export function updateNotice(data) { return request({ - url: '/system/notice', - method: 'put', + url: '/system/notice/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updateNotice(data) { export function delNotice(noticeId) { return request({ url: '/system/notice/' + noticeId, - method: 'delete' + method: 'post' }) } \ No newline at end of file diff --git a/src/api/system/operlog.js b/src/api/system/operlog.js index 51a4cc3..7d5b487 100644 --- a/src/api/system/operlog.js +++ b/src/api/system/operlog.js @@ -13,7 +13,7 @@ export function list(query) { export function delOperlog(operId) { return request({ url: '/system/operlog/' + operId, - method: 'delete' + method: 'post' }) } @@ -21,6 +21,6 @@ export function delOperlog(operId) { export function cleanOperlog() { return request({ url: '/system/operlog/clean', - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/platformConstructionAward.js b/src/api/system/platformConstructionAward.js index ec478e0..6b85c8a 100644 --- a/src/api/system/platformConstructionAward.js +++ b/src/api/system/platformConstructionAward.js @@ -29,8 +29,8 @@ export function addPlatformConstructionAward(data) { // 修改平台建设奖补 export function updatePlatformConstructionAward(data) { return request({ - url: '/system/platformConstructionAward', - method: 'put', + url: '/system/platformConstructionAward/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updatePlatformConstructionAward(data) { export function delPlatformConstructionAward(id) { return request({ url: '/system/platformConstructionAward/' + id, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/post.js b/src/api/system/post.js index 1a8e9ca..38f439f 100644 --- a/src/api/system/post.js +++ b/src/api/system/post.js @@ -29,8 +29,8 @@ export function addPost(data) { // 修改岗位 export function updatePost(data) { return request({ - url: '/system/post', - method: 'put', + url: '/system/post/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updatePost(data) { export function delPost(postId) { return request({ url: '/system/post/' + postId, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/projectSettlementAward.js b/src/api/system/projectSettlementAward.js index dbd5ba3..f9d124c 100644 --- a/src/api/system/projectSettlementAward.js +++ b/src/api/system/projectSettlementAward.js @@ -29,8 +29,8 @@ export function addProjectSettlementAward(data) { // 修改项目落户奖补 export function updateProjectSettlementAward(data) { return request({ - url: '/system/projectSettlementAward', - method: 'put', + url: '/system/projectSettlementAward/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updateProjectSettlementAward(data) { export function delProjectSettlementAward(id) { return request({ url: '/system/projectSettlementAward/' + id, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/role.js b/src/api/system/role.js index f13e6f4..2adc4c4 100644 --- a/src/api/system/role.js +++ b/src/api/system/role.js @@ -29,8 +29,8 @@ export function addRole(data) { // 修改角色 export function updateRole(data) { return request({ - url: '/system/role', - method: 'put', + url: '/system/role/edit', + method: 'post', data: data }) } @@ -39,7 +39,7 @@ export function updateRole(data) { export function dataScope(data) { return request({ url: '/system/role/dataScope', - method: 'put', + method: 'post', data: data }) } @@ -52,7 +52,7 @@ export function changeRoleStatus(roleId, status) { } return request({ url: '/system/role/changeStatus', - method: 'put', + method: 'post', data: data }) } @@ -61,7 +61,7 @@ export function changeRoleStatus(roleId, status) { export function delRole(roleId) { return request({ url: '/system/role/' + roleId, - method: 'delete' + method: 'post' }) } @@ -87,7 +87,7 @@ export function unallocatedUserList(query) { export function authUserCancel(data) { return request({ url: '/system/role/authUser/cancel', - method: 'put', + method: 'post', data: data }) } @@ -96,7 +96,7 @@ export function authUserCancel(data) { export function authUserCancelAll(data) { return request({ url: '/system/role/authUser/cancelAll', - method: 'put', + method: 'post', params: data }) } @@ -105,7 +105,7 @@ export function authUserCancelAll(data) { export function authUserSelectAll(data) { return request({ url: '/system/role/authUser/selectAll', - method: 'put', + method: 'post', params: data }) } diff --git a/src/api/system/sceneOpeningAward.js b/src/api/system/sceneOpeningAward.js index 2217501..87d1ef3 100644 --- a/src/api/system/sceneOpeningAward.js +++ b/src/api/system/sceneOpeningAward.js @@ -29,8 +29,8 @@ export function addSceneOpeningAward(data) { // 修改场景开放奖补 export function updateSceneOpeningAward(data) { return request({ - url: '/system/sceneOpeningAward', - method: 'put', + url: '/system/sceneOpeningAward/edit', + method: 'post', data: data }) } @@ -39,6 +39,6 @@ export function updateSceneOpeningAward(data) { export function delSceneOpeningAward(id) { return request({ url: '/system/sceneOpeningAward/' + id, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/templateInfo.js b/src/api/system/templateInfo.js index 16b57d9..85ccbea 100644 --- a/src/api/system/templateInfo.js +++ b/src/api/system/templateInfo.js @@ -29,8 +29,8 @@ export function addTemplateInfo(data) { // 修改申报模板信息 export function updateTemplateInfo(data) { return request({ - url: '/system/templateInfo', - method: 'put', + url: '/system/templateInfo/edit', + method: 'psot', data: data }) } @@ -39,6 +39,6 @@ export function updateTemplateInfo(data) { export function delTemplateInfo(id) { return request({ url: '/system/templateInfo/' + id, - method: 'delete' + method: 'post' }) } diff --git a/src/api/system/user.js b/src/api/system/user.js index f2f76ef..f581c29 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -30,8 +30,8 @@ export function addUser(data) { // 修改用户 export function updateUser(data) { return request({ - url: '/system/user', - method: 'put', + url: '/system/user/edit', + method: 'post', data: data }) } @@ -40,7 +40,7 @@ export function updateUser(data) { export function delUser(userId) { return request({ url: '/system/user/' + userId, - method: 'delete' + method: 'post' }) } @@ -52,7 +52,7 @@ export function resetUserPwd(userId, password) { } return request({ url: '/system/user/resetPwd', - method: 'put', + method: 'post', data: data }) } @@ -65,7 +65,7 @@ export function changeUserStatus(userId, status) { } return request({ url: '/system/user/changeStatus', - method: 'put', + method: 'post', data: data }) } @@ -82,7 +82,7 @@ export function getUserProfile() { export function updateUserProfile(data) { return request({ url: '/system/user/profile', - method: 'put', + method: 'psot', data: data }) } @@ -95,7 +95,7 @@ export function updateUserPwd(oldPassword, newPassword) { } return request({ url: '/system/user/profile/updatePwd', - method: 'put', + method: 'post', params: data }) } @@ -121,7 +121,7 @@ export function getAuthRole(userId) { export function updateAuthRole(data) { return request({ url: '/system/user/authRole', - method: 'put', + method: 'psot', params: data }) } diff --git a/src/api/tool/gen.js b/src/api/tool/gen.js index 2075677..7fd6e66 100644 --- a/src/api/tool/gen.js +++ b/src/api/tool/gen.js @@ -28,8 +28,8 @@ export function getGenTable(tableId) { // 修改代码生成信息 export function updateGenTable(data) { return request({ - url: '/tool/gen', - method: 'put', + url: '/tool/gen/edit', + method: 'post', data: data }) } @@ -64,7 +64,7 @@ export function previewTable(tableId) { export function delTable(tableId) { return request({ url: '/tool/gen/' + tableId, - method: 'delete' + method: ' post' }) } diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 87d3982..d5aa41e 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -622,12 +622,38 @@ height: 100%; background-color: #fff; padding: 27px 24px 0 27px; + .el-step__head.is-process { + color: #192a92; + } + .el-step__line { + background-color: #192a92; + } + .el-step__icon{ + border: 2px solid #192A92; + } + .el-tabs--border-card { + border: none; + box-shadow: none; + -webkit-box-shadow: none; + height: 100%; + } + .el-step__title { + font-size: 12px; + color: #192a92; + border-color: none; + } .projectProgress-title { // font-family: PingFang-SC, PingFang-SC; font-weight: bold; font-size: 14px; color: #333333; - margin-bottom: 47px; + // margin-bottom: 47px; + } + .left_title { + height: 77px; + padding-top: 20px; + background-color: #fff; + margin-bottom: 4px; } .schedule-timeline { overflow-y: scroll; diff --git a/src/permission.js b/src/permission.js index 8e5533f..7b785fd 100644 --- a/src/permission.js +++ b/src/permission.js @@ -57,7 +57,11 @@ router.beforeEach((to, from, next) => { // } store.dispatch("LogOut").then(() => { - Message.error(err); + // Message.error(err); + // let url = window.location.href; + // var modifiedUrl = url.replace(/(\?appid&clienttoken=)[^&#]+/, ''); + // // console.log(modifiedUrl,'modifiedUrl'); + // window.location.href = modifiedUrl; next({ path: "/" }); }); // store.dispatch("LogOut").then(() => { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 36a8fb5..023c099 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -170,7 +170,14 @@ const user = { // 退出系统 LogOut({ commit, state }) { - if(state.userType == "01") { + if(!state.token && state.clientToken) { + enterpriseLogout({clienttoken: state.clientToken}).then(()=>{ + commit('SET_CLIENTTOKEN', '') + removeClientToken() + }).catch(error => { + reject(error) + }) + } else if(state.userType == "01") { return new Promise((resolve, reject) => { enterpriseLogout({clienttoken: state.clientToken}).then(()=>{ commit('SET_CLIENTTOKEN', '') diff --git a/src/views/enterpriselibrary/enterInfo/components/tabFour/index.vue b/src/views/enterpriselibrary/enterInfo/components/tabFour/index.vue index 8b92698..d50b990 100644 --- a/src/views/enterpriselibrary/enterInfo/components/tabFour/index.vue +++ b/src/views/enterpriselibrary/enterInfo/components/tabFour/index.vue @@ -279,7 +279,7 @@ export default { type: "warning", }) .then(() => { - delJMemorandum({ id: row.id }).then((res) => { + delJMemorandum(row.id).then((res) => { this.getList(); this.$message({ type: "success", diff --git a/src/views/onlineDeclaration/declareDetailContent/index.vue b/src/views/onlineDeclaration/declareDetailContent/index.vue index abfe085..bf2d847 100644 --- a/src/views/onlineDeclaration/declareDetailContent/index.vue +++ b/src/views/onlineDeclaration/declareDetailContent/index.vue @@ -3276,10 +3276,13 @@ >
-
{{ item.approvalByName }}
+
{{ item.approvalByName }}
审核意见:{{ item.approvalOpinions }}
+
+ 企业名称:{{ item.enterpriseName }} +
附件
diff --git a/src/views/project/projectInfo/components/projectProgress/index.vue b/src/views/project/projectInfo/components/projectProgress/index.vue index 46fe7f8..9a4b8f1 100644 --- a/src/views/project/projectInfo/components/projectProgress/index.vue +++ b/src/views/project/projectInfo/components/projectProgress/index.vue @@ -1,73 +1,88 @@