From 025c80a1f4c34cad4650a986d720b415503567b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=96=E5=A7=90?= <2981176548@qq.com>
Date: Fri, 15 Mar 2024 19:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9projectwork?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/request.js                           | 30 +++++++++++++----
 src/views/ProjectPage/MainMessageCustom.vue |  4 +--
 src/views/ProjectPage/ProjectCard.vue       |  6 ++--
 src/views/WorkLoadPage/PersonalProject.vue  | 36 ++++++++++-----------
 4 files changed, 45 insertions(+), 31 deletions(-)

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 @@
 <template>
     <a-spin  :spinning="false"  tip="Loading..." >
-    <div class="relative h-full bg-gray-50 flex w-full  overflow-x-hidden">
+    <div class="relative  bg-gray-50 flex w-full  overflow-x-hidden">
         <div class="mt-0">
             <div class="flex flex-row justify-between">
                     <div class="ml-3">
@@ -32,9 +32,9 @@
                 </div>
             </template>
             <template v-else>
-            <div class="flex flex-wrap justify-between  mt-5 w-full">
+            <div class="flex flex-wrap justify-start   mt-5 w-full">
                 <template v-for="(project, index) in projects" :key="index">
-                    <a-card class="transition-transform transform-gpu hover:scale-105 relative w-[24vw]  h-60 mb-4 rounded-none bg-cover bg-center bg-[url('@/assert/images/img12.jpg')]" @mouseleave="showButton[index]=false" @mouseover="showButton[index]=true">
+                    <a-card class=" mr-2.5 transition-transform transform-gpu hover:scale-105 relative w-[24vw]  h-60 mb-4 rounded-none bg-cover bg-center bg-[url('@/assert/images/img12.jpg')]" @mouseleave="showButton[index]=false" @mouseover="showButton[index]=true">
                         <div class="flex absolute left-0 bottom-0 min-h-[30%] w-full bg-white">
                             <p class="ml-6 mt-4 text-lg font-bold tracking-tight text-gray-900">{{ project.name }}</p>
                             <div class="ml-auto mr-10">
diff --git a/src/views/WorkLoadPage/PersonalProject.vue b/src/views/WorkLoadPage/PersonalProject.vue
index b29052b..af716c8 100644
--- a/src/views/WorkLoadPage/PersonalProject.vue
+++ b/src/views/WorkLoadPage/PersonalProject.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="relative h-full bg-gray-50 flex flex-col ">
+  <div class="relative  bg-gray-50 flex flex-col ">
       <a-breadcrumb class="ml-[3vw]">
           <a-breadcrumb-item>我的项目</a-breadcrumb-item>
       </a-breadcrumb>
@@ -27,24 +27,22 @@
                 <a-checkbox-group v-model:value="data.isFinish" :options="options" class="mr-3" />
             </div>
         </div>
-
-        <div class="flex space-x-9 ml-16 mt-12">
-          <template v-for="(project, index) in projects" :key="index">
-              <a-card class="transition-transform transform-gpu hover:scale-105 relative w-[24vw]  h-60 mb-4 rounded-none bg-cover bg-center bg-[url('@/assert/images/img26.jpg')]" @mouseleave="showButton[index]=false" @mouseover="showButton[index]=true">
-                  <div class="flex absolute left-0 bottom-0 min-h-[30%] w-full bg-white">
-                      <p class="ml-6 mt-4 text-lg font-bold tracking-tight text-gray-900">{{ project.name }}</p>
-                      <div class="ml-auto mr-10">
-                          <button v-if="showButton[index]" class="mt-8 w-6 h-6 flex items-center justify-center bg-green-400 text-black rounded-full transition duration-300 ease-in-out transform hover:scale-105" @click="MainMessage(project)">
-                              <svg aria-hidden="true" class="rtl:rotate-180 w-4 h-4 text-white" fill="none" viewBox="0 0 14 10" xmlns="http://www.w3.org/2000/svg">
-                                  <path d="M1 5h12m0 0L9 1m4 4L9 9" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
-                              </svg>
-                          </button>
-                      </div>
-                  </div>
-              </a-card>
-          </template>
-
-      </div>
+        <div class="flex flex-wrap justify-start   mt-5 w-full">
+            <template v-for="(project, index) in projects" :key="index">
+                <a-card class=" mr-2.5 transition-transform transform-gpu hover:scale-105 relative w-[24vw]  h-60 mb-4 rounded-none bg-cover bg-center bg-[url('@/assert/images/img26.jpg')]" @mouseleave="showButton[index]=false" @mouseover="showButton[index]=true">
+                    <div class="flex absolute left-0 bottom-0 min-h-[30%] w-full bg-white">
+                        <p class="ml-6 mt-4 text-lg font-bold tracking-tight text-gray-900">{{ project.name }}</p>
+                        <div class="ml-auto mr-10">
+                            <button v-if="showButton[index]" class="mt-8 w-6 h-6 flex items-center justify-center bg-green-400 text-black rounded-full transition duration-300 ease-in-out transform hover:scale-105" @click="MainMessage(project)">
+                                <svg aria-hidden="true" class="rtl:rotate-180 w-4 h-4 text-white" fill="none" viewBox="0 0 14 10" xmlns="http://www.w3.org/2000/svg">
+                                    <path d="M1 5h12m0 0L9 1m4 4L9 9" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+                </a-card>
+            </template>
+        </div>
     </div>
 
   </div>