diff --git a/src/js/request.js b/src/js/request.js index ffa1796..9e02d3a 100644 --- a/src/js/request.js +++ b/src/js/request.js @@ -602,22 +602,38 @@ const getTagsProjectList = () =>{ * @param token * 获取项目的所有子系统 */ -const projectWorkGet = (data,token) => { +// const projectWorkGet = (data,token) => { +// return axios({ +// url:api + "/project/work/get", +// method:"get", +// data:data, +// headers:{ +// 'Authorization':'Bearer '+token, +// 'content-type': 'application/json;charset=utf-8', +// 'Timestamp': getCurrentTimestamp() +// } +// }) +// } + +const projectWorkGet = (data,token) =>{ + const tags = data.tags + const isFinish = data.isFinish + const encodedTags = tags.map(tag => encodeURIComponent(tag)); + const encodedIsFinish = isFinish.map(is => encodeURIComponent(is)) + const queryTags = `tags=${encodedTags.join('&tags=')}`; + const queryIsFinish = `isFinish=${encodedIsFinish.join('&isFinish=')}`; return axios({ - url:api + "/project/work/get", - method:"get", - data:data, + url:`${api}/project/work/get?${queryTags}&${queryIsFinish}`, + method: "get", headers:{ - 'Authorization':'Bearer '+token, 'content-type': 'application/json;charset=utf-8', + 'Authorization':'Bearer '+token, 'Timestamp': getCurrentTimestamp() } }) } - - export default { login, diff --git a/src/views/ProjectPage/MainMessageCustom.vue b/src/views/ProjectPage/MainMessageCustom.vue index 7fab2b4..29cd038 100644 --- a/src/views/ProjectPage/MainMessageCustom.vue +++ b/src/views/ProjectPage/MainMessageCustom.vue @@ -28,7 +28,7 @@ const project = reactive({ }) onMounted(()=>{ - +console.log('id的值',id) request.projectGetCustom(data).then((res)=>{ // console.log(res) // Project.data= res.data.data.data @@ -38,7 +38,7 @@ onMounted(()=>{ // console.log("projects.value:",projects.value) // console.log("projects.value[0].id:",projects.value[0].id) project.data = projects.value[0]; - console.log("project.data:",project.data) + console.log("project.data:00000",project.data) }) }) diff --git a/src/views/ProjectPage/ProjectCard.vue b/src/views/ProjectPage/ProjectCard.vue index afb0f11..f46d6f5 100644 --- a/src/views/ProjectPage/ProjectCard.vue +++ b/src/views/ProjectPage/ProjectCard.vue @@ -1,6 +1,6 @@