diff --git a/Caddyfile b/Caddyfile index 1cfa33e..f738dae 100644 --- a/Caddyfile +++ b/Caddyfile @@ -4,11 +4,11 @@ #} :4173 { - handle_path /api/* { - reverse_proxy http://101.34.131.16:1618 + handle /api/* { + reverse_proxy http://101.34.251.155 } handle { - root * "/Volumes/iMac Doc/WebstormProjects/cas_cloud_admin/dist" + root * "/Volumes/iMac Doc/WebstormProjects/cas_cloud_admin_i18n/dist" file_server try_files {path} / } diff --git a/src/api/dataApproval/achivement.js b/src/api/dataApproval/achivement.js index b6d5f36..f8f79c6 100644 --- a/src/api/dataApproval/achivement.js +++ b/src/api/dataApproval/achivement.js @@ -2,42 +2,48 @@ import request from "@/utils/request"; // 获取成果审核列表 export const expertAchievementList = (params) => - request({ - url: "/business/dataReview/expertAchievementList", - method: "get", - params, - }); + request({ + url: "/business/dataReview/expertAchievementList", + method: "get", + params, + }); // 获取成果详情 export const expertAchievementInfo = (params) => - request({ - url: "/business/dataReview/expertAchievementInfo", - method: "get", - params, - }); + request({ + url: "/business/dataReview/expertAchievementInfo", + method: "get", + params, + }); // 修改成果 export const updateExpertAchievement = (data) => - request({ - url: "/business/dataReview/updateExpertAchievement", - method: "put", - data, - }); + request({ + url: "/business/dataReview/updateExpertAchievement", + method: "put", + data, + }); + +/** + * 批量审核成果 + * @param ids + * @param status 1->通过|2->驳回 + * @returns {*} + */ +export const batchAchievement = (ids, status) => + request({ + url: `/business/dataReview/batchAchievement/${status}`, + method: "put", + data: { + ids, + }, + }); -// 批量审核成果 -export const batchAchievement = (ids) => - request({ - url: `/business/dataReview/batchAchievement`, - method: "put", - data: { - ids, - }, - }); // 批量删除成果 export const deleteAchievementByIds = (ids) => - request({ - url: `/business/dataReview/deleteAchievementByIds`, - method: "DELETE", - data: { - ids, - }, - }); + request({ + url: `/business/dataReview/deleteAchievementByIds`, + method: "DELETE", + data: { + ids, + }, + }); diff --git a/src/api/dataApproval/enterpriseTechnologyDemand.js b/src/api/dataApproval/enterpriseTechnologyDemand.js index 5e3cdd1..e1ddc03 100644 --- a/src/api/dataApproval/enterpriseTechnologyDemand.js +++ b/src/api/dataApproval/enterpriseTechnologyDemand.js @@ -2,25 +2,25 @@ import request from "@/utils/request"; // 修改企业技术需求审核 export const updateTechnologyDemand = (data) => - request({ - url: "/business/dataReview/updateTechnologyDemand", - method: "POST", - data, - }); + request({ + url: "/business/dataReview/updateTechnologyDemand", + method: "POST", + data, + }); // 批量审核企业技术需求 -export const batchTechnologyDemand = (ids) => - request({ - url: `/business/dataReview/batchTechnologyDemand/${ids}`, - method: "PUT", - }); +export const batchTechnologyDemand = (ids, status) => + request({ + url: `/business/dataReview/batchTechnologyDemand/${ids}/${status}`, + method: "PUT", + }); // 批量删除企业技术需求 export const deleteTechnologyDemand = (ids) => - request({ - url: `/business/dataReview/deleteTechnologyDemand/${ids}`, - method: "DELETE", - }); + request({ + url: `/business/dataReview/deleteTechnologyDemand/${ids}`, + method: "DELETE", + }); /** * 企业技术需求指派经纪人 @@ -30,11 +30,11 @@ export const deleteTechnologyDemand = (ids) => * @return {*} */ export const dataReviewAppointBroker = ( - demandId, // 企业技术需求id - brokerId, // 经纪人id - brokerName // 经纪人姓名 // 获取企业技术需求详情 + demandId, // 企业技术需求id + brokerId, // 经纪人id + brokerName // 经纪人姓名 // 获取企业技术需求详情 ) => - request({ - url: `/business/dataReview/appointBroker/${demandId}/${brokerId}/${brokerName}`, - method: "POST", - }); + request({ + url: `/business/dataReview/appointBroker/${demandId}/${brokerId}/${brokerName}`, + method: "POST", + }); diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 4550d45..210c82b 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -1,23 +1,25 @@