整理1

2024-03-17 09:20:49 +08:00 · 2024-03-17 09:20:49 +08:00 · cb4d8513e1
commit cb4d8513e1
parent 52bebd6e42
6 changed files with 111 additions and 14 deletions
--- a/src/js/request.js
+++ b/src/js/request.js
@ -694,7 +694,7 @@ const moduleGetByProjectId = (projectId, token) => {
 */
 const moduleGetBySysId = (sysId, token) => {
    return axios({
-        url: api + "module/get/min?sysId=" + sysId,
+        url: api + "/module/get/min?sysId=" + sysId,
        methods:"get",
        headers: {
            'Authorization':'Bearer '+token,
@ -734,6 +734,28 @@ const moduleDelete = (id ,token) =>{
        }
    })
 }
+
+/**
+ * 获取模块信息
+ * @param id
+ * @param token
+ * @returns {Promise<axios.AxiosResponse<any>> | *}
+ */
+const getModuleInfo = (id, token) => {
+    return axios({
+        url: api + "/project/getwork/id",
+        method: 'get',
+        params: {
+            id: id
+        },
+        headers: {
+            'Authorization':'Bearer '+token,
+            // 'Content-Type': 'application/json;charset=utf-8',
+            'Timestamp': getCurrentTimestamp()
+        }
+    })
+}
+
 export default {

    login,
@ -779,6 +801,7 @@ export default {
    moduleGetByProjectId,
    moduleGetBySysId,
    moduleDelete,
+    getModuleInfo,

    messageGet,

--- a/src/router/index.js
+++ b/src/router/index.js
@ -99,6 +99,11 @@ const router = createRouter({
                            path: '/WorkLoad/I_Manage/Childsystem',
                            name: 'WorkLoad/I_Manage/ChildSystem',
                            component: () => import('@/views/WorkLoadPage/Childsystem.vue')
+                        },
+                        {
+                            path: '/WorkLoad/I_Manage/ModuleInfo/:id',
+                            name: 'WorkLoad/I_Manage/ModuleInfo',
+                            component: () => import('@/views/WorkLoadPage/ModuleInfo.vue')
                        }
                    ]
                },
--- a/src/views/HomePage/IndexView.vue
+++ b/src/views/HomePage/IndexView.vue
@ -70,11 +70,6 @@ import NavBar from "@/components/HomeComponents/NavBar.vue";

 import Icp from "@/components/HomeComponents/Icp.vue";
 import More from "@/components/HomeComponents/More.vue";
-import NewProfile from "@/components/HomeComponents/NewProfile.vue";
-import ProjectList from "@/components/HomeComponents/ProjectList.vue";
-import TeamProfile from "@/components/HomeComponents/TeamProfile.vue";
-import ExcellentMember from "@/components/HomeComponents/ExcellentMember.vue";
-import ProjectCard from "@/views/ProjectPage/MainMessage/ProjectCard.vue";

 </script>

--- a/src/views/ProjectPage/ProjectList.vue
+++ b/src/views/ProjectPage/ProjectList.vue
@ -108,8 +108,6 @@
                                <schedule-two-tone two-tone-color="pink"/>
                                <div style="font-size: 60%; margin-left: 0.3vw">周期：{{ project.cycle }}天</div>
                            </div>
-
-
                        </div>

                    </div>
--- a/src/views/WorkLoadPage/ChildModule.vue
+++ b/src/views/WorkLoadPage/ChildModule.vue
@ -22,11 +22,11 @@
      </div>
    </div>

-    <div v-for="(ChildModule, index) in ChildModules" :key="index"  class="flex space-x-9">
+    <div v-for="(ChildModule, index) in ChildModules" :key="index"  class="flex space-x-9" >
      <a-card class="relative bg-blue-400 w-72 h-36 text-white rounded-xl">
        <div class="flex space-x-9">
          <p class="absolute left-4 top-4">{{ChildModule.name}}</p>
-          <p class="absolute right-4 top-4">负责人: 无</p>
+          <p class="absolute right-4 top-4">负责人: {{ChildModule.principalId }}</p>
        </div>
        <div class="flex flex-col mt-8">
          <p class="text-green-100">剩余 3 天</p>
@ -35,13 +35,16 @@
        <div class="left-0 absolute bottom-0 h-[35%] w-full bg-white flex justify-center items-center space-x-3">
          <div class="text-blue-400 flex absolute left-5">
            <CheckOutlined class="mt-1"/>
-            <p >进行中</p>
+            <p v-if="ChildModule.isFinish === 2">进行中</p>
+            <p v-if="ChildModule.isFinish === 1">已完成</p>
+            <p v-if="ChildModule.isFinish === 0">未开始</p>
+            <p v-if="ChildModule.isFinish === -1">暂停中</p>
          </div>
          <div class="flex absolute right-16">
-            <p class="text-blue-400 font-bold text-2xl">2</p>
+            <p class="text-blue-400 font-bold text-2xl">{{ChildModule.workLoad}}</p>
            <p class="text-blue-400 mt-2">人/天</p>
          </div>
-          <button class="absolute right-8 w-6 h-6 flex items-center justify-center bg-blue-400 text-black rounded-full transition duration-300 ease-in-out transform hover:scale-105" @click="$router.push('/WorkLoad/I_Manage/LoginRegisterModule')">
+          <button class="absolute right-8 w-6 h-6 flex items-center justify-center bg-blue-400 text-black rounded-full transition duration-300 ease-in-out transform hover:scale-105" @click="$router.push('/WorkLoad/I_Manage/ModuleInfo/'+ChildModule.id)">
            <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>
@ -99,8 +102,11 @@ const sysId = params.get('id');

 onMounted(() => {
  request.moduleGetBySysId(sysId, token).then((res) => {
-    console.log("ChildModules:", res)
+    console.log(sysId)
+    console.log("res:", res)
    ChildModules.value = res.data.data
+    console.log("ChildModules:", ChildModules.value)
+
  })
 })

--- a/src/views/WorkLoadPage/ModuleInfo.vue
+++ b/src/views/WorkLoadPage/ModuleInfo.vue
@ -0,0 +1,70 @@
+<template>
+  <div class="flex relative">
+    <nav aria-label="Breadcrumb" class="flex ml-12">
+      <ol class="mt-4 inline-flex items-center space-x-1 md:space-x-2 rtl:space-x-reverse">
+        <li class="inline-flex items-center">
+          <a class="inline-flex items-center text-sm font-medium text-gray-700 hover:text-blue-600 dark:text-gray-400 dark:hover:text-white" href="#">
+            我管理的
+          </a>
+        </li>
+        <li @click="$router.push('/WorkLoad/I_Manage')">
+          <div class="flex items-center">
+            <svg aria-hidden="true" class="rtl:rotate-180 w-3 h-3 text-gray-400 mx-1" fill="none" viewBox="0 0 6 10" xmlns="http://www.w3.org/2000/svg">
+              <path d="m1 9 4-4-4-4" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+            </svg>
+            <a class="ms-1 text-sm font-medium text-gray-700 hover:text-blue-600 md:ms-2 dark:text-gray-400 dark:hover:text-white" href="#">梁溪区纪委大数据管理平台项目</a>
+          </div>
+        </li>
+        <li>
+          <div class="flex items-center">
+            <svg aria-hidden="true" class="rtl:rotate-180 w-3 h-3 text-gray-400 mx-1" fill="none" viewBox="0 0 6 10" xmlns="http://www.w3.org/2000/svg">
+              <path d="m1 9 4-4-4-4" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+            </svg>
+            <a class="ms-1 text-sm font-medium text-gray-700 hover:text-blue-600 md:ms-2 dark:text-gray-400 dark:hover:text-white" href="#">后端</a>
+          </div>
+        </li>
+        <li>
+          <div class="flex items-center">
+            <svg aria-hidden="true" class="rtl:rotate-180 w-3 h-3 text-gray-400 mx-1" fill="none" viewBox="0 0 6 10" xmlns="http://www.w3.org/2000/svg">
+              <path d="m1 9 4-4-4-4" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+            </svg>
+            <a class="ms-1 text-sm font-medium text-gray-700 hover:text-blue-600 md:ms-2 dark:text-gray-400 dark:hover:text-white" href="#">登录注册模块</a>
+          </div>
+        </li>
+      </ol>
+    </nav>
+  </div>
+  <div class="ml-24 mt-12 w-1/3 flex flex-col justify-center">
+    <div class="mt-4">
+      <a-list :data-source="data" bordered>
+        <template #renderItem="{ item }">
+          <a-list-item>{{ item }}</a-list-item>
+        </template>
+        <template #header>
+          <div class="text-2xl text-blue-400">登录注册模块</div>
+        </template>
+      </a-list>
+    </div>
+  </div>
+</template>
+<script setup>
+
+import {onMounted, reactive} from "vue";
+import {useRoute} from "vue-router";
+import request from '@/js/request.js'
+
+const route = useRoute()
+
+const token = window.localStorage.getItem("token")
+
+const moduleInfo = reactive({
+  name:'',
+
+})
+
+onMounted(()=>{
+  request.getModuleInfo(route.params.id, token).then((res)=>{
+    console.log("ModuleInfo:", res)
+  })
+})
+</script>