From f124eeb48dfa7a488b01ff5d674a0f0b6ee76bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Wed, 17 Apr 2024 00:52:58 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=EF=BC=88=E9=9D=A2=E5=8C=85=E5=B1=91=E6=9C=AA=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto-imports.d.ts                             |   2 -
 components.d.ts                               |  12 +-
 src/api/manage.js                             |  71 ++++
 src/components/Breadcrumb/index.vue           |   7 +-
 src/router/index.ts                           |  58 +++-
 src/views/personal/project/charge.vue         | 137 +++++++-
 .../personal/project/childSystem/charge.vue   | 136 ++++++++
 .../personal/project/childSystem/manage.vue   | 162 +++++++++
 .../personal/project/childmodel/charge.vue    |   0
 .../personal/project/childmodel/manage.vue    | 135 ++++++++
 src/views/personal/project/manage.vue         | 314 +++++++++++-------
 11 files changed, 890 insertions(+), 144 deletions(-)
 create mode 100644 src/api/manage.js
 create mode 100644 src/views/personal/project/childSystem/charge.vue
 create mode 100644 src/views/personal/project/childSystem/manage.vue
 create mode 100644 src/views/personal/project/childmodel/charge.vue
 create mode 100644 src/views/personal/project/childmodel/manage.vue

diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 07b6235..8139ac9 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -2,6 +2,4 @@
 export {}
 declare global {
   const ElMessage: typeof import('element-plus/es')['ElMessage']
-  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
-  const ElNotification: typeof import('element-plus/es')['ElNotification']
 }
diff --git a/components.d.ts b/components.d.ts
index 6de8fe2..7e176cd 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -13,12 +13,14 @@ declare module '@vue/runtime-core' {
     DropdownMenu: typeof import('./src/components/Share/DropdownMenu.vue')['default']
     Dropzone: typeof import('./src/components/Dropzone/index.vue')['default']
     EditorImage: typeof import('./src/components/Tinymce/components/EditorImage.vue')['default']
+    ElAlert: typeof import('element-plus/es')['ElAlert']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
@@ -31,14 +33,15 @@ declare module '@vue/runtime-core' {
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElRate: typeof import('element-plus/es')['ElRate']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
@@ -47,8 +50,12 @@ declare module '@vue/runtime-core' {
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    ElTree: typeof import('element-plus/es')['ElTree']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
     ErrorLog: typeof import('./src/components/ErrorLog/index.vue')['default']
     GithubCorner: typeof import('./src/components/GithubCorner/index.vue')['default']
     Hamburger: typeof import('./src/components/Hamburger/index.vue')['default']
@@ -75,4 +82,7 @@ declare module '@vue/runtime-core' {
     UploadExcel: typeof import('./src/components/UploadExcel/index.vue')['default']
     VueCountTo: typeof import('./src/components/vue-count-to/vue-countTo.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
 }
diff --git a/src/api/manage.js b/src/api/manage.js
new file mode 100644
index 0000000..49f238c
--- /dev/null
+++ b/src/api/manage.js
@@ -0,0 +1,71 @@
+import axios from "axios";
+
+function getCurrentTimestamp() {
+    return new Date().getTime();
+}
+
+const api = 'http://nbxt.oa.x-lf.cn'
+
+/**
+ * 根据项目id获取项目信息
+ * @param id 项目id
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+const projectGetById = (id, token) => {
+    return axios({
+        url: api + "/project/get/id?id=" + id,
+        method: "get",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+        }
+    })
+}
+
+
+/**
+ * 获取项目信息
+ * @param projectId 项目id
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+
+export const getproject = (projectId, token) => {
+    return axios({
+        url: api +"/project/get?projectId=" + projectId,
+        method: "get",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+
+        }
+
+
+    })
+}
+
+
+
+/**
+ * 获取项目信息
+ * @param projectId 项目id
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+export const searchModel = (projectId ,token) => {
+    return axios({
+        url: api +"/module/get?projectId=" + projectId ,
+        method: "get",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+           
+            'Timestamp': getCurrentTimestamp()
+            
+
+        }
+
+
+    })
+}
+
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index bb5074a..2e7b973 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -3,8 +3,8 @@
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
         <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{
-             item.meta.title
-        }}</span>
+        item.meta.title
+      }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
     </transition-group>
@@ -41,8 +41,9 @@ export default defineComponent({
       const first = matched[0];
 
       if (!this.isDashboard(first)) {
-        matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched);
+        matched = [{ path: '/dashboard', meta: { title: 'Dashboard' } }].concat(matched);
       }
+    
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false);
     },
diff --git a/src/router/index.ts b/src/router/index.ts
index 3e8bd0d..0796433 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -31,6 +31,7 @@ export const constantRoutes:RouteRecordRaw[] = [
       }
     ]
   },
+ 
   {
     path: '/login',
     component: () => import('@/views/login/index.vue'),
@@ -158,41 +159,64 @@ export const asyncRoutes:RouteRecordRaw[] = [
   {
     path: '/myself',
     component: Layout,
-    redirect: '/myself',
+    redirect: 'noRedirect',
     meta: {
-      alwaysShow: true, // will always show the root menu
+      alwaysShow: false, // 始终显示根菜单
       title: '个人项目',
       icon: 'nested',
       roles: ['admin', 'teacher_user']
     },
     children: [
       {
-        // 我负责的
-        path: 'charge',
-        component: () => import('@/views/personal/project/charge.vue'),
-        name: 'Charge',
+        path: 'participate',
+        component: () => import('@/views/personal/project/participate.vue'),
+        name: 'participate',
         meta: { title: '我负责的', icon: 'user', affix: true }
       },
+      //我管理的以及子页面
       {
-        // 我管理的
         path: 'manage',
         component: () => import('@/views/personal/project/manage.vue'),
         name: 'Manage',
-        meta: { title: '我管理的', icon: 'user', affix: true }
+        meta: { title: '我管理的', icon: 'user', affix: true,  },
+        
       },
       {
-        // 我参与的
-        path: 'participate',
-        component: () => import('@/views/personal/project/participate.vue'),
-        name: 'Participate',
+        path: 'childSysManage',
+        component: () => import('@/views/personal/project/childSystem/manage.vue'),
+        name: 'ChildSysManage',
+        meta: { title: '子系统', breadcrumb: true , hidden: true  },  
+       
+      },
+      {
+        path: 'childModManage',
+        component: () => import('@/views/personal/project/childModel/manage.vue'),
+        name: 'ChildModManage',
+        meta: { title: '子模块', breadcrumb: true , hidden: true  }  
+      },
+      //我参与的以及子界面
+      {
+        path: 'charge',
+        component: () => import('@/views/personal/project/charge.vue'),
+        name: 'Charge',
         meta: { title: '我参与的', icon: 'user', affix: true }
       },
-
-
-
-
+      {
+        path: 'childSysCharge',
+        component: () => import('@/views/personal/project/childSystem/manage.vue'),
+        name: 'ChildSysCharge',
+        meta: { title: '子系统', breadcrumb: true , hidden: true  },  
+       
+      },
+      {
+        path: 'childModCharge',
+        component: () => import('@/views/personal/project/childModel/manage.vue'),
+        name: 'ChildModCharge',
+        meta: { title: '子模块', breadcrumb: true , hidden: true  }  
+      },
     ]
-  },
+  }
+  ,
 
 
   // {
diff --git a/src/views/personal/project/charge.vue b/src/views/personal/project/charge.vue
index b8461c3..85827ce 100644
--- a/src/views/personal/project/charge.vue
+++ b/src/views/personal/project/charge.vue
@@ -1,3 +1,136 @@
 <template>
-    hello
-</template>
\ No newline at end of file
+    <div style=" width:100%">
+        <el-card style="max-width: 100vw;margin: 1.5vw;">
+          <template #header><strong >我参与的</strong></template>
+            <div style="display:flex;flex-direction:row;justify-content: space-around ">
+                <div>
+                    名称
+                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+                </div>
+                <div>
+                    状态
+                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+                </div>
+                <div>
+                  <el-button type="primary" style="width:80px">查询</el-button>
+                      <el-button style="width:80px">重置</el-button>
+                </div>
+            </div>
+        </el-card>
+        <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
+            <div style="display:flex;flex-direction: row;justify-content: space-between">
+                <el-button
+                        text
+                        type=''
+                >项目列表</el-button
+                >
+            </div>
+            <el-table
+                    ref="multipleTableRef"
+                    :data="tableData"
+                    style="max-width: 100vw;"
+                    @selection-change="handleSelectionChange"
+            >
+  <!--                <el-table-column type="selection" width="55" />-->
+                <el-table-column label="序号" width="120">
+                    <template #default="scope">{{ scope.row.date }}</template>
+                </el-table-column>
+                <el-table-column property="name" label="项目名称" width="120" />
+                <el-table-column property="address" label="工作量" show-overflow-tooltip />
+                <el-table-column property="address" label="周期"  />
+                <el-table-column property="address" label="负责人"  />
+                <el-table-column property="address" label="状态"  />
+                <el-table-column property="address" label="子系统简介"  />
+                <el-table-column property="address" label="截止时间"  />
+                <el-table-column property="address" label="操作"  >
+                    <el-button
+                            link
+                            style="color:deepskyblue"
+                            @click="toChildSystem"
+                    >查看详情</el-button
+                    >
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                    larger
+                    background
+                    layout="prev, pager, next"
+                    :total="50"
+                    class="mt-4"
+                    style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
+            />
+        </el-card>
+     
+      </div>
+  </template>
+  
+  <script lang="ts" setup>
+  import { ref } from 'vue';
+  import { ElTable } from 'element-plus';
+  import  { useRouter } from 'vue-router';
+
+const router = useRouter();
+
+// 路由跳转
+const toChildSystem = () => {
+  router.push({ name: 'ChildSysManage' }); // 跳转到子系统详情页面
+};
+
+const input = ref('');
+
+  interface User {
+      date: string
+      name: string
+      address: string
+  }
+  
+  const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+  const multipleSelection = ref<User[]>([]);
+  
+  const handleSelectionChange = (val: User[]) => {
+    multipleSelection.value = val;
+  };
+  
+  const tableData: User[] = [
+    {
+      date: '2016-05-03',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    },
+    {
+      date: '2016-05-02',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    },
+    {
+      date: '2016-05-04',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    },
+    {
+      date: '2016-05-01',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    }
+  
+  ];
+  
+  
+  </script>
+  <style>
+  .my-autocomplete li {
+      line-height: normal;
+      padding: 7px;
+  }
+  .my-autocomplete li .name {
+      text-overflow: ellipsis;
+      overflow: hidden;
+  }
+  .my-autocomplete li .addr {
+      font-size: 12px;
+      color: #b4b4b4;
+  }
+  .my-autocomplete li .highlighted .addr {
+      color: #ddd;
+  }
+  </style>
\ No newline at end of file
diff --git a/src/views/personal/project/childSystem/charge.vue b/src/views/personal/project/childSystem/charge.vue
new file mode 100644
index 0000000..ca5b038
--- /dev/null
+++ b/src/views/personal/project/childSystem/charge.vue
@@ -0,0 +1,136 @@
+<template>
+    <div style=" width:100%">
+        <el-card style="max-width: 100vw;margin: 1.5vw;">
+          <template #header><strong >项目1</strong></template>
+            <div style="display:flex;flex-direction:row;justify-content: space-around ">
+                <div>
+                    名称
+                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+                </div>
+                <div>
+                    状态
+                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+                </div>
+                <div>
+                  <el-button type="primary" style="width:80px">查询</el-button>
+                      <el-button style="width:80px">重置</el-button>
+                </div>
+            </div>
+        </el-card>
+        <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
+            <div style="display:flex;flex-direction: row;justify-content: space-between">
+                <el-button
+                        text
+                        type=''
+                >子系统列表</el-button
+                >
+            </div>
+            <el-table
+                    ref="multipleTableRef"
+                    :data="tableData"
+                    style="max-width: 100vw;"
+                    @selection-change="handleSelectionChange"
+            >
+  <!--                <el-table-column type="selection" width="55" />-->
+                <el-table-column label="序号" width="120">
+                    <template #default="scope">{{ scope.row.date }}</template>
+                </el-table-column>
+                <el-table-column property="name" label="子系统名称" width="120" />
+                <el-table-column property="address" label="工作量" show-overflow-tooltip />
+                <el-table-column property="address" label="周期"  />
+                <el-table-column property="address" label="负责人"  />
+                <el-table-column property="address" label="状态"  />
+                <el-table-column property="address" label="子系统简介"  />
+                <el-table-column property="address" label="截止时间"  />
+                <el-table-column property="address" label="操作"  >
+                    <el-button
+                            link
+                            style="color:deepskyblue"
+                            @click="toChildModel"
+                    >查看详情</el-button
+                    >
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                    larger
+                    background
+                    layout="prev, pager, next"
+                    :total="50"
+                    class="mt-4"
+                    style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
+            />
+        </el-card>
+     
+      </div>
+  </template>
+  
+  <script lang="ts" setup>
+  import { ref } from 'vue';
+  import { ElTable } from 'element-plus';
+  import { useRouter } from 'vue-router';
+  
+  //跳转到子模块
+  const router = useRouter();
+
+  const toChildModel = () => {
+    router.push({name:'ChildModCharge'})
+  };
+
+  const input = ref('');
+
+  interface User {
+      date: string
+      name: string
+      address: string
+  }
+  
+  const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+  const multipleSelection = ref<User[]>([]);
+  
+  const handleSelectionChange = (val: User[]) => {
+    multipleSelection.value = val;
+  };
+  
+  const tableData: User[] = [
+    {
+      date: '2016-05-03',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    },
+    {
+      date: '2016-05-02',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    },
+    {
+      date: '2016-05-04',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    },
+    {
+      date: '2016-05-01',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    }
+  
+  ];
+  
+  
+  </script>
+  <style>
+  .my-autocomplete li {
+      line-height: normal;
+      padding: 7px;
+  }
+  .my-autocomplete li .name {
+      text-overflow: ellipsis;
+      overflow: hidden;
+  }
+  .my-autocomplete li .addr {
+      font-size: 12px;
+      color: #b4b4b4;
+  }
+  .my-autocomplete li .highlighted .addr {
+      color: #ddd;
+  }
+  </style>
\ No newline at end of file
diff --git a/src/views/personal/project/childSystem/manage.vue b/src/views/personal/project/childSystem/manage.vue
new file mode 100644
index 0000000..e177ac1
--- /dev/null
+++ b/src/views/personal/project/childSystem/manage.vue
@@ -0,0 +1,162 @@
+<template>
+  <div style=" width:100%">
+    <el-card style="max-width: 100vw;margin: 1.5vw;">
+      <template #header><strong>项目1</strong></template>
+      <div style="display:flex;flex-direction:row;justify-content: space-around ">
+        <div>
+          名称
+          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          状态
+          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          <el-button type="primary" style="width:80px">查询</el-button>
+          <el-button style="width:80px">重置</el-button>
+        </div>
+      </div>
+    </el-card>
+    <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
+      <div style="display:flex;flex-direction: row;justify-content: space-between">
+        <el-button text type=''>子系统列表</el-button>
+      </div>
+      <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
+        @selection-change="handleSelectionChange">
+        <!--                <el-table-column type="selection" width="55" />-->
+        <el-table-column label="序号" width="120">
+          <template #default="scope">{{ scope.row.date }}</template>
+        </el-table-column>
+        <el-table-column property="name" label="子系统名称" width="120" />
+        <el-table-column property="cycle" label="工作量" show-overflow-tooltip />
+        <el-table-column property="address" label="周期" />
+        <el-table-column property="address" label="负责人" />
+        <el-table-column property="isFinish" label="状态" />
+        <el-table-column property="description" label="子系统简介" />
+        <el-table-column property="address" label="截止时间" />
+        <el-table-column property="address" label="操作">
+          <el-button link style="color:deepskyblue" @click="toChildModel">查看详情</el-button>
+        </el-table-column>
+      </el-table>
+      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
+        style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
+    </el-card>
+
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { ElTable } from 'element-plus';
+import { useRouter } from 'vue-router';
+import { searchModel } from '@/api/manage.js';
+import { getToken } from '@/utils/auth';
+
+//跳转到子模块
+const router = useRouter();
+
+const toChildModel = () => {
+  router.push({ name: 'ChildModManage' })
+};
+
+const input = ref('');
+
+interface User {
+  cycle:number
+  description:string
+  isDelete:number
+  isFinish:number
+  name:string
+  principalId:number
+  projectId:number
+  status:boolean
+  type:number
+  workLoad:number
+  id:number
+}
+
+const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+const multipleSelection = ref<User[]>([]);
+
+const handleSelectionChange = (val: User[]) => {
+  multipleSelection.value = val;
+};
+
+//搜索子系统 
+//获取数据
+const searchSys = searchModel(1, getToken());
+
+
+console.log(searchSys);
+
+const tableData = ref<User[]>([]);
+//处理数据
+searchSys.then(res => {
+  const data = res.data.data;
+  console.log(data);
+  
+  if (data) {
+    tableData.value = data.map(item =>{
+      const addproject: User = {
+        id: item.id,
+        cycle: item.cycle,
+        description: item.description,
+        isDelete: item.isDelete,
+        isFinish: item.isFinish,
+        name: item.name,
+        principalId: item.principalId,
+        projectId: item.projectId,
+        status: item.status,
+        type: item.type,
+        workLoad: item.workLoad
+      };
+
+      tableData.value.push(addproject);
+
+    }) 
+  
+      
+      
+   
+    
+      
+
+    }else{
+      console.log("没有数据");
+      
+    }
+  
+    console.log(tableData.value);
+
+}).catch(err => {
+  console.log(err);
+});
+
+
+
+
+
+
+
+
+</script>
+<style>
+.my-autocomplete li {
+  line-height: normal;
+  padding: 7px;
+}
+
+.my-autocomplete li .name {
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.my-autocomplete li .addr {
+  font-size: 12px;
+  color: #b4b4b4;
+}
+
+.my-autocomplete li .highlighted .addr {
+  color: #ddd;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/project/childmodel/charge.vue b/src/views/personal/project/childmodel/charge.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue
new file mode 100644
index 0000000..47a23ae
--- /dev/null
+++ b/src/views/personal/project/childmodel/manage.vue
@@ -0,0 +1,135 @@
+<template>
+    <div style=" width:100%">
+        <el-card style="max-width: 100vw;margin: 1.5vw;">
+          <template #header><strong >子系统1</strong></template>
+            <div style="display:flex;flex-direction:row;justify-content: space-around ">
+                <div>
+                    名称
+                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+                </div>
+                <div>
+                    状态
+                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+                </div>
+                <div>
+                  <el-button type="primary" style="width:80px">查询</el-button>
+                      <el-button style="width:80px">重置</el-button>
+                </div>
+            </div>
+        </el-card>
+        <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
+            <div style="display:flex;flex-direction: row;justify-content: space-between">
+                <el-button
+                        text
+                        type=''
+
+                >子模块列表</el-button
+                >
+                <div>
+                  <el-button type="primary" style="width:80px">新增</el-button>
+                      <el-button style="width:80px ;background-color: #bd3124;color: azure;">删除</el-button>
+                </div>
+            </div>
+            <el-table
+                    ref="multipleTableRef"
+                    :data="tableData"
+                    style="max-width: 100vw;"
+                    @selection-change="handleSelectionChange"
+            >
+  <!--                <el-table-column type="selection" width="55" />-->
+                <el-table-column label="序号" width="120">
+                    <template #default="scope">{{ scope.row.date }}</template>
+                </el-table-column>
+                <el-table-column property="name" label="子模块名称" width="120" />
+                <el-table-column property="address" label="工作量" show-overflow-tooltip />
+                <el-table-column property="address" label="周期"  />
+                <el-table-column property="address" label="负责人"  />
+                <el-table-column property="address" label="状态"  />
+                <el-table-column property="address" label="子系统简介"  />
+                <el-table-column property="address" label="截止时间"  />
+                <el-table-column property="address" label="操作"  >
+                    <el-button
+                            link
+                            style="color:deepskyblue"
+                            @click=""
+                    >查看详情</el-button
+                    >
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                    larger
+                    background
+                    layout="prev, pager, next"
+                    :total="50"
+                    class="mt-4"
+                    style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
+            />
+        </el-card>
+     
+      </div>
+  </template>
+  
+  <script lang="ts" setup>
+  import { ref } from 'vue';
+  import { ElTable } from 'element-plus';
+
+
+
+  interface User {
+      date: string
+      name: string
+      address: string
+  }
+  
+  const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+  const multipleSelection = ref<User[]>([]);
+  
+  const handleSelectionChange = (val: User[]) => {
+    multipleSelection.value = val;
+  };
+
+  const input = ref('');
+  
+  const tableData: User[] = [
+    {
+      date: '2016-05-03',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    },
+    {
+      date: '2016-05-02',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    },
+    {
+      date: '2016-05-04',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    },
+    {
+      date: '2016-05-01',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    }
+  
+  ];
+  
+  
+  </script>
+  <style>
+  .my-autocomplete li {
+      line-height: normal;
+      padding: 7px;
+  }
+  .my-autocomplete li .name {
+      text-overflow: ellipsis;
+      overflow: hidden;
+  }
+  .my-autocomplete li .addr {
+      font-size: 12px;
+      color: #b4b4b4;
+  }
+  .my-autocomplete li .highlighted .addr {
+      color: #ddd;
+  }
+  </style>
\ No newline at end of file
diff --git a/src/views/personal/project/manage.vue b/src/views/personal/project/manage.vue
index a704adf..6b8f7f6 100644
--- a/src/views/personal/project/manage.vue
+++ b/src/views/personal/project/manage.vue
@@ -1,124 +1,200 @@
 <template>
-    <div style=" width:100%">
-        <el-card style="max-width: 100vw;margin: 1.5vw;">
-          <template #header><strong >项目1</strong></template>
-            <div style="display:flex;flex-direction:row;justify-content: space-around ">
-                <div>
-                    名称
-                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
-                </div>
-                <div>
-                    状态
-                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
-                </div>
-                <div>
-                  <el-button type="primary" style="width:80px">查询</el-button>
-                      <el-button style="width:80px">重置</el-button>
-                </div>
-            </div>
-        </el-card>
-        <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
-            <div style="display:flex;flex-direction: row;justify-content: space-between">
-                <el-button
-                        text
-                        type=''
-                >子系统列表</el-button
-                >
-            </div>
-            <el-table
-                    ref="multipleTableRef"
-                    :data="tableData"
-                    style="max-width: 100vw;"
-                    @selection-change="handleSelectionChange"
-            >
-  <!--                <el-table-column type="selection" width="55" />-->
-                <el-table-column label="序号" width="120">
-                    <template #default="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column property="name" label="子系统名称" width="120" />
-                <el-table-column property="address" label="工作量" show-overflow-tooltip />
-                <el-table-column property="address" label="周期"  />
-                <el-table-column property="address" label="负责人"  />
-                <el-table-column property="address" label="状态"  />
-                <el-table-column property="address" label="子系统简介"  />
-                <el-table-column property="address" label="截止时间"  />
-                <el-table-column property="address" label="操作"  >
-                    <el-button
-                            link
-                            style="color:deepskyblue"
-                    >查看详情</el-button
-                    >
-                </el-table-column>
-            </el-table>
-            <el-pagination
-                    larger
-                    background
-                    layout="prev, pager, next"
-                    :total="50"
-                    class="mt-4"
-                    style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
-            />
-        </el-card>
-     
+  <div style=" width:100%">
+    <el-card style="max-width: 100vw;margin: 1.5vw;">
+      <template #header><strong>我管理的</strong></template>
+      <div style="display:flex;flex-direction:row;justify-content: space-around ">
+        <div>
+          名称
+          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          状态
+          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          <el-button type="primary" style="width:80px">查询</el-button>
+          <el-button style="width:80px">重置</el-button>
+        </div>
       </div>
-  </template>
-  
-  <script lang="ts" setup>
-  import { ref } from 'vue';
-  import { ElTable } from 'element-plus';
-  interface User {
-      date: string
-      name: string
-      address: string
+    </el-card>
+    <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
+      <div style="display:flex;flex-direction: row;justify-content: space-between">
+        <el-button text type=''>项目列表</el-button>
+      </div>
+      <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
+        @selection-change="handleSelectionChange">
+        <!--                <el-table-column type="selection" width="55" />-->
+        <el-table-column label="序号" width="120">
+          <template v-slot="{$index}">{{ $index+1 }}</template>
+        </el-table-column>
+        <el-table-column property="name" label="项目名称" width="120" />
+        <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
+        <el-table-column property="cycle" label="周期" />
+        <el-table-column property="principalUser" label="负责人" />
+        <el-table-column property="isFinish" label="状态" />
+        <el-table-column property="description" label="子系统简介" />
+        <el-table-column property="id" label="截止时间" />
+        <el-table-column property="name" label="操作">
+          <el-button link style="color:deepskyblue" @click="toChildSystem">查看详情</el-button>
+        </el-table-column>
+      </el-table>
+      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
+        style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
+    </el-card>
+
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { ElTable } from 'element-plus';
+import { getproject } from '@/api/manage.js';
+import { getToken } from '@/utils/auth';
+import  { useRouter } from 'vue-router';
+
+const router = useRouter();
+
+// 路由跳转
+const toChildSystem = () => {
+  router.push({ name: 'ChildSysManage' ,params:{ token : getToken()}}); // 跳转到子系统详情页面
+};
+
+
+
+interface User {
+  id: number
+  cycle: number
+  name: string
+  description: string
+  workLoad: number
+  isFinish: number
+  principalUser: string
+}
+
+const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+const multipleSelection = ref<User[]>([]);
+
+const handleSelectionChange = (val: User[]) => {
+  multipleSelection.value = val;
+};
+
+// const tableData: User[] = [
+//   {
+//     date: '2016-05-03',
+//     name: 'Tom',
+//     address: 'No. 189, Grove St, Los Angeles'
+//   },
+//   {
+//     date: '2016-05-02',
+//     name: 'Tom',
+//     address: 'No. 189, Grove St, Los Angeles'
+//   },
+//   {
+//     date: '2016-05-04',
+//     name: 'Tom',
+//     address: 'No. 189, Grove St, Los Angeles'
+//   },
+//   {
+//     date: '2016-05-01',
+//     name: 'Tom',
+//     address: 'No. 189, Grove St, Los Angeles'
+//   }
+
+// ];
+//获取数据
+const project = getproject(2, getToken());
+
+//响应式
+const tableData = ref<User[]>([
+  //测试用例
+  {
+    id: 4,
+    cycle: 2,
+    name: "shij",
+    description: "null",
+    workLoad: 1,
+    isFinish: 2,
+    principalUser: "teacher_user",
+  },
+  {
+    id: 4,
+    cycle: 2,
+    name: "shij",
+    description: "null",
+    workLoad: 1,
+    isFinish: 2,
+    principalUser: "teacher_user",
+  },
+  {
+    id: 4,
+    cycle: 2,
+    name: "shij",
+    description: "null",
+    workLoad: 1,
+    isFinish: 2,
+    principalUser: "teacher_user",
+  },
+
+
+]);
+
+
+// 处理接口数据 
+project.then(res => {
+
+  const data = res.data.data[0];
+  if (data) {
+    const dataProject: User = {
+      id: data.id,
+      cycle: data.cycle,
+      name: data.name,
+      description: data.description,
+      workLoad: data.workLoad,
+      isFinish: data.isFinish,
+      principalUser: data.principalUser
+    };
+    // 使用 tableData.value 进行访问
+    tableData.value.push(dataProject);
+
+
+  } else {
+    console.log("没有数据");
+
   }
   
-  const multipleTableRef = ref<InstanceType<typeof ElTable>>();
-  const multipleSelection = ref<User[]>([]);
   
-  const handleSelectionChange = (val: User[]) => {
-    multipleSelection.value = val;
-  };
-  
-  const tableData: User[] = [
-    {
-      date: '2016-05-03',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-02',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-04',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-01',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    }
-  
-  ];
-  
-  
-  </script>
-  <style>
-  .my-autocomplete li {
-      line-height: normal;
-      padding: 7px;
-  }
-  .my-autocomplete li .name {
-      text-overflow: ellipsis;
-      overflow: hidden;
-  }
-  .my-autocomplete li .addr {
-      font-size: 12px;
-      color: #b4b4b4;
-  }
-  .my-autocomplete li .highlighted .addr {
-      color: #ddd;
-  }
-  </style>
\ No newline at end of file
+})
+  .catch(err => {
+    console.log(err);
+  });
+
+
+
+const input = ref('');
+
+
+
+
+
+
+</script>
+<style>
+.my-autocomplete li {
+  line-height: normal;
+  padding: 7px;
+}
+
+.my-autocomplete li .name {
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.my-autocomplete li .addr {
+  font-size: 12px;
+  color: #b4b4b4;
+}
+
+.my-autocomplete li .highlighted .addr {
+  color: #ddd;
+}
+</style>
\ No newline at end of file
-- 
2.43.0


From 7e1dc445692086f9b45397c756338eabbe325d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Wed, 17 Apr 2024 21:56:23 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=88=91=E7=AE=A1=E7=90=86=E7=9A=84=E5=92=8C=E6=88=91?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=88=E6=8E=A5=E5=8F=A3=E8=BF=98=E6=B2=A1=E5=81=9A=E5=AE=8C?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  13 -
 src/api/charge.js                             |  24 ++
 src/api/manage.js                             |  76 ++++-
 src/layout/components/Navbar.vue              |   2 +-
 src/router/index.ts                           | 107 +------
 src/router/modules/manage.ts                  |  81 +++++
 src/views/personal/project/charge.vue         | 285 ++++++++++--------
 .../personal/project/childSystem/manage.vue   |  82 +++--
 .../personal/project/childmodel/charge.vue    | 143 +++++++++
 .../personal/project/childmodel/manage.vue    |  12 +-
 src/views/personal/project/detail/charge.vue  | 101 +++++++
 src/views/personal/project/detail/manage.vue  | 103 +++++++
 src/views/personal/project/manage.vue         | 243 +++++++++------
 13 files changed, 897 insertions(+), 375 deletions(-)
 create mode 100644 src/api/charge.js
 create mode 100644 src/router/modules/manage.ts
 create mode 100644 src/views/personal/project/detail/charge.vue
 create mode 100644 src/views/personal/project/detail/manage.vue

diff --git a/components.d.ts b/components.d.ts
index 7e176cd..f44ce52 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -20,7 +20,6 @@ declare module '@vue/runtime-core' {
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
@@ -38,24 +37,15 @@ declare module '@vue/runtime-core' {
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElProgress: typeof import('element-plus/es')['ElProgress']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
-    ElRate: typeof import('element-plus/es')['ElRate']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    ElTree: typeof import('element-plus/es')['ElTree']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
     ErrorLog: typeof import('./src/components/ErrorLog/index.vue')['default']
     GithubCorner: typeof import('./src/components/GithubCorner/index.vue')['default']
     Hamburger: typeof import('./src/components/Hamburger/index.vue')['default']
@@ -82,7 +72,4 @@ declare module '@vue/runtime-core' {
     UploadExcel: typeof import('./src/components/UploadExcel/index.vue')['default']
     VueCountTo: typeof import('./src/components/vue-count-to/vue-countTo.vue')['default']
   }
-  export interface ComponentCustomProperties {
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-  }
 }
diff --git a/src/api/charge.js b/src/api/charge.js
new file mode 100644
index 0000000..4032ace
--- /dev/null
+++ b/src/api/charge.js
@@ -0,0 +1,24 @@
+import axios from "axios";
+
+function getCurrentTimestamp() {
+    return new Date().getTime();
+}
+
+const api = 'http://nbxt.oa.x-lf.cn'
+
+/**
+ * 获取我参与的项目列表
+ * 
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+const  getChargeProjectList = (token)=> {
+    return axios({
+        method: 'get',
+        url: `${api}/project/participate/get`,
+        headers: {
+            'Authorization': `Bearer ${token}`,
+            'Timestamp':getCurrentTimestamp()
+        }
+    })
+}
\ No newline at end of file
diff --git a/src/api/manage.js b/src/api/manage.js
index 49f238c..d89dfa0 100644
--- a/src/api/manage.js
+++ b/src/api/manage.js
@@ -48,14 +48,14 @@ export const getproject = (projectId, token) => {
 
 
 /**
- * 获取项目信息
- * @param projectId 项目id
+ * 获取我管理页面的项目列表(接口有问题)
+ * 
  * @param token 访问令牌
  * @returns {Promise<AxiosResponse<any>> | *}
  */
-export const searchModel = (projectId ,token) => {
+export const getManageList = (token) => {
     return axios({
-        url: api +"/module/get?projectId=" + projectId ,
+        url: api +"/project/child/get" ,
         method: "get",
         headers: {
             'Authorization': 'Bearer ' + token,
@@ -69,3 +69,71 @@ export const searchModel = (projectId ,token) => {
     })
 }
 
+// 我管理的所有接口
+
+
+/**
+ * 获取我管理的页面的搜索
+ * 
+ * @param projectId 项目id
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+export const getManageListById = (projectId, token) => {
+    return axios({
+        url: api +'/project/get/' + projectId,
+        method: "get",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+        }
+
+    })
+
+}
+/**
+ * 获取我管理的页面的项目列表
+ * 
+ * @param projectId 项目id
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+export const getManageProjectList = (token) => {
+    return axios({
+        url: api +'/project/child/get' ,
+        method: "get",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+        }
+
+    })
+
+}
+
+
+
+
+
+
+/**
+ * 获取我管理的页面的子模块项目列表(接口没数据)
+ * 
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+export const getProjectList = (token) => {
+    return axios({
+        url: api +"/project/module/get" ,
+        method: "get",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+        }
+
+
+    })
+}
+
+
+
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 88c2bf4..022fa79 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -2,7 +2,7 @@
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
       @toggleClick="toggleSidebar" />
-
+    <!-- 面包屑导航 -->
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
     <div class="right-menu">
diff --git a/src/router/index.ts b/src/router/index.ts
index 0796433..666ab92 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -11,6 +11,7 @@ const Layout = ():RouteComponent => import('@/layout/index.vue');
 // import chartsRouter from './modules/charts';
 // import nestedRouter from './modules/nested';
 // import tableRouter from './modules/table';
+  import manageRouter from './modules/manage';
 
 /**
  * constantRoutes
@@ -113,110 +114,10 @@ export const constantRoutes:RouteRecordRaw[] = [
  * 注意：hidden、alwaysShow 属性配置移动到了meta中！！！
  */
 export const asyncRoutes:RouteRecordRaw[] = [
-  // {
-  //   path: '/permission',
-  //   component: Layout,
-  //   redirect: '/permission/page',
-  //   name: 'Permission',
-  //   meta: {
-  //     alwaysShow: true, // will always show the root menu
-  //     title: 'Permission',
-  //     icon: 'lock',
-  //     roles: ['admin', 'editor','teacher_user'] // you can set roles in root nav
-  //   },
-  //   children: [
-  //     {
-  //       path: 'page',
-  //       component: () => import('@/views/permission/page.vue'),
-  //       name: 'PagePermission',
-  //       meta: {
-  //         title: 'Page Permission',
-  //         roles: ['admin','teacher_user'] // or you can only set roles in sub nav
-  //       }
-  //     },
-  //     {
-  //       path: 'directive',
-  //       component: () => import('@/views/permission/directive.vue'),
-  //       name: 'DirectivePermission',
-  //       meta: {
-  //         title: 'Directive Permission'
-  //         // if do not set roles, means: this page does not require permission
-  //       }
-  //     },
-  //     {
-  //       path: 'role',
-  //       component: () => import('@/views/permission/role.vue'),
-  //       name: 'RolePermission',
-  //       meta: {
-  //         title: 'Role Permission',
-  //         roles: ['admin','teacher']
-  //       }
-  //     }
-  //   ]
-  // },
 
-  // 个人项目
-  {
-    path: '/myself',
-    component: Layout,
-    redirect: 'noRedirect',
-    meta: {
-      alwaysShow: false, // 始终显示根菜单
-      title: '个人项目',
-      icon: 'nested',
-      roles: ['admin', 'teacher_user']
-    },
-    children: [
-      {
-        path: 'participate',
-        component: () => import('@/views/personal/project/participate.vue'),
-        name: 'participate',
-        meta: { title: '我负责的', icon: 'user', affix: true }
-      },
-      //我管理的以及子页面
-      {
-        path: 'manage',
-        component: () => import('@/views/personal/project/manage.vue'),
-        name: 'Manage',
-        meta: { title: '我管理的', icon: 'user', affix: true,  },
-        
-      },
-      {
-        path: 'childSysManage',
-        component: () => import('@/views/personal/project/childSystem/manage.vue'),
-        name: 'ChildSysManage',
-        meta: { title: '子系统', breadcrumb: true , hidden: true  },  
-       
-      },
-      {
-        path: 'childModManage',
-        component: () => import('@/views/personal/project/childModel/manage.vue'),
-        name: 'ChildModManage',
-        meta: { title: '子模块', breadcrumb: true , hidden: true  }  
-      },
-      //我参与的以及子界面
-      {
-        path: 'charge',
-        component: () => import('@/views/personal/project/charge.vue'),
-        name: 'Charge',
-        meta: { title: '我参与的', icon: 'user', affix: true }
-      },
-      {
-        path: 'childSysCharge',
-        component: () => import('@/views/personal/project/childSystem/manage.vue'),
-        name: 'ChildSysCharge',
-        meta: { title: '子系统', breadcrumb: true , hidden: true  },  
-       
-      },
-      {
-        path: 'childModCharge',
-        component: () => import('@/views/personal/project/childModel/manage.vue'),
-        name: 'ChildModCharge',
-        meta: { title: '子模块', breadcrumb: true , hidden: true  }  
-      },
-    ]
-  }
-  ,
+
+  
+  manageRouter,
 
 
   // {
diff --git a/src/router/modules/manage.ts b/src/router/modules/manage.ts
new file mode 100644
index 0000000..ace0dc2
--- /dev/null
+++ b/src/router/modules/manage.ts
@@ -0,0 +1,81 @@
+
+
+const Layout = () => import('@/layout/index.vue')
+
+const manageRouter = {
+    path: '/myslef',
+    component: Layout,
+    
+    
+    meta: {
+      alwaysShow: false, // 始终显示根菜单
+      title: '个人项目',
+      icon: 'nested',
+      roles: ['admin', 'teacher_user']
+    },
+    children: [
+      {
+        path: 'participate',
+        component: () => import('@/views/personal/project/participate.vue'),
+        name: 'participate',
+        meta: { title: '我负责的', icon: 'user', affix: true }
+      },
+      //我管理的以及子页面
+     
+      {
+        path: 'manage',
+        component: () => import('@/views/personal/project/manage.vue'),
+        name: 'Manage',
+        meta: { title: '我管理的', icon: 'user', affix: true,  },
+        
+      },
+      {
+        path: 'childSysManage',
+        component: () => import('@/views/personal/project/childSystem/manage.vue'),
+        name: 'ChildSysManage',
+        meta: { title: '我管理的 / 子系统', breadcrumb: true , hidden: true  },  
+       
+      },
+      {
+        path: 'childModManage',
+        component: () => import('@/views/personal/project/childModel/manage.vue'),
+        name: 'ChildModManage',
+        meta: { title: '我管理的 / 子系统 / 子模块', breadcrumb: true , hidden: true  }  
+      },
+      {
+        path:'manageDetail',
+        component:()=>import('@/views/personal/project/detail/manage.vue'),
+        name: 'ManageDetail',
+        meta: { title: '我管理的 / 子系统 / 子模块 / 详情', breadcrumb: true , hidden: true  }  
+      },
+      //我参与的以及子界面
+      {
+        path: 'charge',
+        component: () => import('@/views/personal/project/charge.vue'),
+        name: 'Charge',
+        meta: { title: '我参与的', icon: 'user', affix: true }
+      },
+      {
+        path: 'childSysCharge',
+        component: () => import('@/views/personal/project/childSystem/charge.vue'),
+        name: 'ChildSysCharge',
+        meta: { title: '我参与的 / 子系统', breadcrumb: true , hidden: true  ,affix:false},  
+       
+      },
+      {
+        path: 'childModCharge',
+        component: () => import('@/views/personal/project/childModel/charge.vue'),
+        name: 'ChildModCharge',
+        meta: { title: '我参与的 / 子系统 / 子模块', breadcrumb: true , hidden: true  }  
+      },
+      {
+        path: 'chargeDetail',
+        component:()=>import('@/views/personal/project/detail/charge.vue'),
+        name: 'ChargeDetail',
+        meta: { title: '我参与的 / 子系统 / 子模块 /详情', breadcrumb: true , hidden: true  }  
+      }
+    ]
+  }
+
+
+export default manageRouter
\ No newline at end of file
diff --git a/src/views/personal/project/charge.vue b/src/views/personal/project/charge.vue
index 85827ce..5d9af37 100644
--- a/src/views/personal/project/charge.vue
+++ b/src/views/personal/project/charge.vue
@@ -1,136 +1,173 @@
 <template>
-    <div style=" width:100%">
-        <el-card style="max-width: 100vw;margin: 1.5vw;">
-          <template #header><strong >我参与的</strong></template>
-            <div style="display:flex;flex-direction:row;justify-content: space-around ">
-                <div>
-                    名称
-                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
-                </div>
-                <div>
-                    状态
-                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
-                </div>
-                <div>
-                  <el-button type="primary" style="width:80px">查询</el-button>
-                      <el-button style="width:80px">重置</el-button>
-                </div>
-            </div>
-        </el-card>
-        <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
-            <div style="display:flex;flex-direction: row;justify-content: space-between">
-                <el-button
-                        text
-                        type=''
-                >项目列表</el-button
-                >
-            </div>
-            <el-table
-                    ref="multipleTableRef"
-                    :data="tableData"
-                    style="max-width: 100vw;"
-                    @selection-change="handleSelectionChange"
-            >
-  <!--                <el-table-column type="selection" width="55" />-->
-                <el-table-column label="序号" width="120">
-                    <template #default="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column property="name" label="项目名称" width="120" />
-                <el-table-column property="address" label="工作量" show-overflow-tooltip />
-                <el-table-column property="address" label="周期"  />
-                <el-table-column property="address" label="负责人"  />
-                <el-table-column property="address" label="状态"  />
-                <el-table-column property="address" label="子系统简介"  />
-                <el-table-column property="address" label="截止时间"  />
-                <el-table-column property="address" label="操作"  >
-                    <el-button
-                            link
-                            style="color:deepskyblue"
-                            @click="toChildSystem"
-                    >查看详情</el-button
-                    >
-                </el-table-column>
-            </el-table>
-            <el-pagination
-                    larger
-                    background
-                    layout="prev, pager, next"
-                    :total="50"
-                    class="mt-4"
-                    style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
-            />
-        </el-card>
-     
+  <div style=" width:100%">
+    <el-card style="max-width: 100vw;margin: 1.5vw;">
+      <template #header><strong>我参与的</strong></template>
+      <div style="display:flex;flex-direction:row;justify-content: space-around ">
+        <div>
+          名称
+          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          状态
+          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          <el-button type="primary" style="width:80px">查询</el-button>
+          <el-button style="width:80px">重置</el-button>
+        </div>
       </div>
-  </template>
-  
-  <script lang="ts" setup>
-  import { ref } from 'vue';
-  import { ElTable } from 'element-plus';
-  import  { useRouter } from 'vue-router';
+    </el-card>
+    <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
+      <div style="display:flex;flex-direction: row;justify-content: space-between">
+        <el-button text type=''>项目列表</el-button>
+      </div>
+      <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
+        @selection-change="handleSelectionChange">
+        <!--                <el-table-column type="selection" width="55" />-->
+        <el-table-column label="序号" width="120">
+          <template #default="scope">{{ scope.row.date }}</template>
+        </el-table-column>
+        <el-table-column property="name" label="项目名称" width="120" />
+        <el-table-column property="address" label="工作量" show-overflow-tooltip />
+        <el-table-column property="address" label="周期" />
+        <el-table-column property="address" label="负责人" />
+        <el-table-column property="address" label="状态"/>
+         
+     
+        <el-table-column property="address" label="项目简介" />
+        <el-table-column property="address" label="截止时间" />
+        <el-table-column property="address" label="操作">
+          <el-button link style="color:deepskyblue" @click="toChildSystem">查看详情</el-button>
+        </el-table-column>
+      </el-table>
+      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
+        style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
+    </el-card>
 
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { ElTable } from 'element-plus';
+import { useRouter } from 'vue-router';
+import { getManageList } from '@/api/manage.js';
+import { getToken } from '@/utils/auth';
 const router = useRouter();
 
 // 路由跳转
 const toChildSystem = () => {
-  router.push({ name: 'ChildSysManage' }); // 跳转到子系统详情页面
+  router.push({ name: 'ChildSysCharge' }); // 跳转到子系统详情页面
 };
 
 const input = ref('');
 
-  interface User {
-      date: string
-      name: string
-      address: string
+
+
+
+
+
+interface User {
+  id: number
+  cycle: number
+  name: string
+  description: string
+  workLoad: number
+  card: string
+  isFinish: number
+  principalUser: string
+  dateline: string
+}
+
+const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+const multipleSelection = ref<User[]>([]);
+
+const handleSelectionChange = (val: User[]) => {
+  multipleSelection.value = val;
+};
+
+//获取数据
+const project = getManageList(getToken());
+
+//响应式
+const tableData = ref<User[]>([
+  //测试用例
+  {
+    id: 4,
+    cycle: 2,
+    name: "项目2",
+    description: "xxxxxxx",
+    workLoad: 12,
+    card: "java",
+    isFinish: 2,
+    principalUser: "teacher_user",
+    dateline: "2021-12-31"
+  },
+  {
+    id: 4,
+    cycle: 2,
+    name: "项目2",
+    description: "xxxxxxx",
+    workLoad: 12,
+    card: "java",
+    isFinish: 2,
+    principalUser: "teacher_user",
+    dateline: "2021-12-31"
+  },
+
+
+
+]);
+
+
+// 处理接口数据 
+project.then(res => {
+
+  const data = res.data;
+  console.log(data);
+  if (data) {
+    const dataProject: User = {
+      id: 4,
+      cycle: 2,
+      name: "项目2",
+      description: "xxxxxxx",
+      workLoad: 12,
+      card: "java",
+      isFinish: 2,
+      principalUser: "teacher_user",
+      dateline: "2021-12-31"
+    };
+    // 使用 tableData.value 进行添加
+    tableData.value.push(dataProject);
+
+
+  } else {
+    console.log("没有数据");
   }
-  
-  const multipleTableRef = ref<InstanceType<typeof ElTable>>();
-  const multipleSelection = ref<User[]>([]);
-  
-  const handleSelectionChange = (val: User[]) => {
-    multipleSelection.value = val;
-  };
-  
-  const tableData: User[] = [
-    {
-      date: '2016-05-03',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-02',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-04',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-01',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    }
-  
-  ];
-  
-  
-  </script>
-  <style>
-  .my-autocomplete li {
-      line-height: normal;
-      padding: 7px;
-  }
-  .my-autocomplete li .name {
-      text-overflow: ellipsis;
-      overflow: hidden;
-  }
-  .my-autocomplete li .addr {
-      font-size: 12px;
-      color: #b4b4b4;
-  }
-  .my-autocomplete li .highlighted .addr {
-      color: #ddd;
-  }
-  </style>
\ No newline at end of file
+})
+.catch(err => {
+    console.log(err);
+  });
+
+
+</script>
+<style>
+.my-autocomplete li {
+  line-height: normal;
+  padding: 7px;
+}
+
+.my-autocomplete li .name {
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.my-autocomplete li .addr {
+  font-size: 12px;
+  color: #b4b4b4;
+}
+
+.my-autocomplete li .highlighted .addr {
+  color: #ddd;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/project/childSystem/manage.vue b/src/views/personal/project/childSystem/manage.vue
index e177ac1..73637c9 100644
--- a/src/views/personal/project/childSystem/manage.vue
+++ b/src/views/personal/project/childSystem/manage.vue
@@ -41,7 +41,9 @@
       <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
         style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
     </el-card>
-
+    <el-alert >
+            <router-view />
+        </el-alert>
   </div>
 </template>
 
@@ -49,8 +51,8 @@
 import { ref } from 'vue';
 import { ElTable } from 'element-plus';
 import { useRouter } from 'vue-router';
-import { searchModel } from '@/api/manage.js';
-import { getToken } from '@/utils/auth';
+// import { searchModel } from '@/api/manage.js';
+// import { getToken } from '@/utils/auth';
 
 //跳转到子模块
 const router = useRouter();
@@ -84,36 +86,50 @@ const handleSelectionChange = (val: User[]) => {
 
 //搜索子系统 
 //获取数据
-const searchSys = searchModel(1, getToken());
 
 
-console.log(searchSys);
 
-const tableData = ref<User[]>([]);
+// console.log(searchSys);
+
+const tableData = ref<User[]>([
+  {
+    id: 1,
+    cycle: 1,
+    description: '子系统1',
+    isDelete: 0,
+    isFinish: 1,
+    name: '子系统1',
+    principalId: 1,
+    projectId: 1,
+    status: true,
+    type: 1,
+    workLoad: 1
+  }
+]);
 //处理数据
-searchSys.then(res => {
-  const data = res.data.data;
-  console.log(data);
+// searchSys.then(res => {
+//   const data = res.data.data;
+//   console.log(data);
   
-  if (data) {
-    tableData.value = data.map(item =>{
-      const addproject: User = {
-        id: item.id,
-        cycle: item.cycle,
-        description: item.description,
-        isDelete: item.isDelete,
-        isFinish: item.isFinish,
-        name: item.name,
-        principalId: item.principalId,
-        projectId: item.projectId,
-        status: item.status,
-        type: item.type,
-        workLoad: item.workLoad
-      };
+//   if (data) {
+//     tableData.value = data.map(item =>{
+//       const addproject: User = {
+//         id: item.id,
+//         cycle: item.cycle,
+//         description: item.description,
+//         isDelete: item.isDelete,
+//         isFinish: item.isFinish,
+//         name: item.name,
+//         principalId: item.principalId,
+//         projectId: item.projectId,
+//         status: item.status,
+//         type: item.type,
+//         workLoad: item.workLoad
+//       };
 
-      tableData.value.push(addproject);
+//       tableData.value.push(addproject);
 
-    }) 
+//     }) 
   
       
       
@@ -121,16 +137,16 @@ searchSys.then(res => {
     
       
 
-    }else{
-      console.log("没有数据");
+//     }else{
+//       console.log("没有数据");
       
-    }
+//     }
   
-    console.log(tableData.value);
+//     console.log(tableData.value);
 
-}).catch(err => {
-  console.log(err);
-});
+// }).catch(err => {
+//   console.log(err);
+// });
 
 
 
diff --git a/src/views/personal/project/childmodel/charge.vue b/src/views/personal/project/childmodel/charge.vue
index e69de29..6365ec6 100644
--- a/src/views/personal/project/childmodel/charge.vue
+++ b/src/views/personal/project/childmodel/charge.vue
@@ -0,0 +1,143 @@
+<template>
+    <div style=" width:100%">
+        <el-card style="max-width: 100vw;margin: 1.5vw;">
+          <template #header><strong >子系统1</strong></template>
+            <div style="display:flex;flex-direction:row;justify-content: space-around ">
+                <div>
+                    名称
+                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+                </div>
+                <div>
+                    状态
+                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+                </div>
+                <div>
+                  <el-button type="primary" style="width:80px">查询</el-button>
+                      <el-button style="width:80px">重置</el-button>
+                </div>
+            </div>
+        </el-card>
+        <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
+            <div style="display:flex;flex-direction: row;justify-content: space-between">
+                <el-button
+                        text
+                        type=''
+
+                >子模块列表</el-button
+                >
+                <div>
+                  <el-button type="primary" style="width:80px">新增</el-button>
+                      <el-button style="width:80px ;background-color: #bd3124;color: azure;">删除</el-button>
+                </div>
+            </div>
+            <el-table
+                    ref="multipleTableRef"
+                    :data="tableData"
+                    style="max-width: 100vw;"
+                    @selection-change="handleSelectionChange"
+            >
+  <!--                <el-table-column type="selection" width="55" />-->
+                <el-table-column label="序号" width="120">
+                    <template #default="scope">{{ scope.row.date }}</template>
+                </el-table-column>
+                <el-table-column property="name" label="子模块名称" width="120" />
+                <el-table-column property="address" label="工作量" show-overflow-tooltip />
+                <el-table-column property="address" label="周期"  />
+                <el-table-column property="address" label="负责人"  />
+                <el-table-column property="address" label="状态"  />
+                <el-table-column property="address" label="子系统简介"  />
+                <el-table-column property="address" label="截止时间"  />
+                <el-table-column property="address" label="操作"  >
+                    <el-button
+                            link
+                            style="color:deepskyblue"
+                            @click="toDetail"
+                    >查看详情</el-button
+                    >
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                    larger
+                    background
+                    layout="prev, pager, next"
+                    :total="50"
+                    class="mt-4"
+                    style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
+            />
+        </el-card>
+     
+      </div>
+  </template>
+  
+  <script lang="ts" setup>
+  import { ref } from 'vue';
+  import { ElTable } from 'element-plus';
+
+  import { useRouter } from 'vue-router';
+
+
+  const router = useRouter();
+
+  // 路由跳转
+  const toDetail = () => {
+    router.push({ name: 'ChargeDetail' }); // 跳转到子系统详情页面
+  };
+
+  interface User {
+      date: string
+      name: string
+      address: string
+  }
+  
+  const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+  const multipleSelection = ref<User[]>([]);
+  
+  const handleSelectionChange = (val: User[]) => {
+    multipleSelection.value = val;
+  };
+
+  const input = ref('');
+  
+  const tableData: User[] = [
+    {
+      date: '2016-05-03',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    },
+    {
+      date: '2016-05-02',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    },
+    {
+      date: '2016-05-04',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    },
+    {
+      date: '2016-05-01',
+      name: 'Tom',
+      address: 'No. 189, Grove St, Los Angeles'
+    }
+  
+  ];
+  
+  
+  </script>
+  <style>
+  .my-autocomplete li {
+      line-height: normal;
+      padding: 7px;
+  }
+  .my-autocomplete li .name {
+      text-overflow: ellipsis;
+      overflow: hidden;
+  }
+  .my-autocomplete li .addr {
+      font-size: 12px;
+      color: #b4b4b4;
+  }
+  .my-autocomplete li .highlighted .addr {
+      color: #ddd;
+  }
+  </style>
\ No newline at end of file
diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue
index 47a23ae..d66b716 100644
--- a/src/views/personal/project/childmodel/manage.vue
+++ b/src/views/personal/project/childmodel/manage.vue
@@ -51,7 +51,7 @@
                     <el-button
                             link
                             style="color:deepskyblue"
-                            @click=""
+                            @click="toDetail"
                     >查看详情</el-button
                     >
                 </el-table-column>
@@ -65,7 +65,7 @@
                     style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
             />
         </el-card>
-     
+        <router-view/>
       </div>
   </template>
   
@@ -73,8 +73,16 @@
   import { ref } from 'vue';
   import { ElTable } from 'element-plus';
 
+  import { useRouter } from 'vue-router';
 
 
+  const router = useRouter();
+
+  // 路由跳转
+  const toDetail = () => {
+    router.push({ name: 'ManageDetail' }); // 跳转到子系统详情页面
+  };
+
   interface User {
       date: string
       name: string
diff --git a/src/views/personal/project/detail/charge.vue b/src/views/personal/project/detail/charge.vue
new file mode 100644
index 0000000..a0b911e
--- /dev/null
+++ b/src/views/personal/project/detail/charge.vue
@@ -0,0 +1,101 @@
+<template>
+    <div style=" width:100%;">
+        <el-card style="max-width: 100vw;">
+            <template #header><strong>子模块1</strong></template>
+
+
+        </el-card>
+
+        <el-card class="card">
+            <el-row :gutter="20">
+                <el-col :span="12">
+                    <el-row v-for="item in projectItems" :key="item.label">
+                        <el-col :span="24">
+                            <div style="margin-top: 10%;"><strong>{{ item.label }}</strong> </div>
+                        </el-col>
+                    </el-row>
+                </el-col>
+                <el-col :span="12">
+                    <el-row v-for="item in projectItems" :key="item.label">
+                        <el-col :span="24">
+                            <div v-if="item.label !== '05.状态' && item.label !== '07.简介'" style="margin-top: 10%;">{{
+                item.value
+            }}</div>
+                            <el-select v-if="item.label === '05.状态'" v-model="selectedStatus" placeholder="请选择状态"
+                                style="width: 150px ;margin-top: 10%">
+                                <el-option label="未开始" value="未开始"></el-option>
+                                <el-option label="进行中" value="进行中"></el-option>
+                                <el-option label="已完成" value="已完成"></el-option>
+                                <el-option label="异常暂停" value="异常暂停"></el-option>
+                            </el-select>
+                            <textarea style="resize: none;margin-top: 10%;width: 150px;" v-if="item.label === '07.简介'"
+                                v-model="item.value" rows="4" cols="50"></textarea>
+                        </el-col>
+                    </el-row>
+                </el-col>
+            </el-row>
+
+        </el-card>
+        <div style="display: flex; justify-content: center;">
+            <el-button type="primary" style="width:80px">编辑</el-button>
+            <el-button style="width:80px ;background-color: #bd3124;color: azure;">删除</el-button>
+
+        </div>
+
+
+
+    </div>
+</template>
+
+<script lang="ts" setup>
+
+import { ref } from 'vue';
+
+const projectItems = ref([
+    { label: '01.模块名称', value: '名称1' },
+    { label: '02.模块周期', value: '3个月' },
+    { label: '03.工作量', value: '100小时' },
+    { label: '04.负责人', value: '张三' },
+    { label: '05.状态', value: '进行中' },
+    { label: '06.时间', value: '2024-01-01 12:00:00' },
+    { label: '07.简介', value: '大王iu大概iudg拍高端屁股的怕耽搁u对爬过文档爬过无' },
+]);
+
+const selectedStatus = ref('进行中');
+
+
+
+
+
+
+
+
+
+
+</script>
+<style>
+.my-autocomplete li {
+    line-height: normal;
+    padding: 7px;
+}
+
+.my-autocomplete li .name {
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.my-autocomplete li .addr {
+    font-size: 12px;
+    color: #b4b4b4;
+}
+
+.my-autocomplete li .highlighted .addr {
+    color: #ddd;
+}
+
+.card {
+    width: 28%;
+    margin-left: 50%;
+    transform: translateX(-50%);
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/project/detail/manage.vue b/src/views/personal/project/detail/manage.vue
new file mode 100644
index 0000000..32976ff
--- /dev/null
+++ b/src/views/personal/project/detail/manage.vue
@@ -0,0 +1,103 @@
+<template>
+    <div style=" width:100%;">
+        <el-card style="max-width: 100vw;">
+            <template #header><strong>子模块1</strong></template>
+
+
+        </el-card>
+
+        <el-card class="card">
+            <el-row :gutter="20">
+                <el-col :span="12">
+                    <el-row v-for="item in projectItems" :key="item.label">
+                        <el-col :span="24">
+                            <div style="margin-top: 10%;"><strong>{{ item.label }}</strong> </div>
+                        </el-col>
+                    </el-row>
+                </el-col>
+                <el-col :span="12">
+                    <el-row v-for="item in projectItems" :key="item.label">
+                        <el-col :span="24">
+                            <div v-if="item.label !== '05.状态' && item.label !== '07.简介'" style="margin-top: 10%;">{{
+                item.value
+            }}</div>
+                            <el-select v-if="item.label === '05.状态'" v-model="selectedStatus" placeholder="请选择状态"
+                                style="width: 150px ;margin-top: 10%">
+                                <el-option label="未开始" value="未开始"></el-option>
+                                <el-option label="进行中" value="进行中"></el-option>
+                                <el-option label="已完成" value="已完成"></el-option>
+                                <el-option label="异常暂停" value="异常暂停"></el-option>
+                            </el-select>
+                            <textarea style="resize: none;margin-top: 10%;width: 150px;" v-if="item.label === '07.简介'"
+                                v-model="item.value" rows="4" cols="50"></textarea>
+                        </el-col>
+                    </el-row>
+                </el-col>
+            </el-row>
+
+        </el-card>
+        <div style="display: flex; justify-content: center;">
+            <el-button type="primary" style="width:80px">编辑</el-button>
+            <el-button style="width:80px ;background-color: #bd3124;color: azure;">删除</el-button>
+
+        </div>
+
+
+        <el-alert >
+            <router-view />
+        </el-alert>
+    </div>
+</template>
+
+<script lang="ts" setup>
+
+import { ref } from 'vue';
+
+const projectItems = ref([
+    { label: '01.模块名称', value: '项目名称1' },
+    { label: '02.模块周期', value: '3个月' },
+    { label: '03.工作量', value: '100小时' },
+    { label: '04.负责人', value: '张三' },
+    { label: '05.状态', value: '进行中' },
+    { label: '06.时间', value: '2024-01-01 12:00:00' },
+    { label: '07.简介', value: '大王iu大概iudg拍高端屁股的怕耽搁u对爬过文档爬过无' },
+]);
+
+const selectedStatus = ref('进行中');
+
+
+
+
+
+
+
+
+
+
+</script>
+<style>
+.my-autocomplete li {
+    line-height: normal;
+    padding: 7px;
+}
+
+.my-autocomplete li .name {
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.my-autocomplete li .addr {
+    font-size: 12px;
+    color: #b4b4b4;
+}
+
+.my-autocomplete li .highlighted .addr {
+    color: #ddd;
+}
+
+.card {
+    width: 28%;
+    margin-left: 50%;
+    transform: translateX(-50%);
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/project/manage.vue b/src/views/personal/project/manage.vue
index 6b8f7f6..bb3fd1b 100644
--- a/src/views/personal/project/manage.vue
+++ b/src/views/personal/project/manage.vue
@@ -5,14 +5,14 @@
       <div style="display:flex;flex-direction:row;justify-content: space-around ">
         <div>
           名称
-          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+          <el-input v-model="input1" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
         </div>
         <div>
           状态
-          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+          <el-input v-model="input2" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
         </div>
         <div>
-          <el-button type="primary" style="width:80px">查询</el-button>
+          <el-button type="primary" style="width:80px" @click="search">查询</el-button>
           <el-button style="width:80px">重置</el-button>
         </div>
       </div>
@@ -25,52 +25,102 @@
         @selection-change="handleSelectionChange">
         <!--                <el-table-column type="selection" width="55" />-->
         <el-table-column label="序号" width="120">
-          <template v-slot="{$index}">{{ $index+1 }}</template>
+          <template v-slot="{ $index }">{{ $index + 1 }}</template>
         </el-table-column>
         <el-table-column property="name" label="项目名称" width="120" />
         <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
         <el-table-column property="cycle" label="周期" />
         <el-table-column property="principalUser" label="负责人" />
         <el-table-column property="isFinish" label="状态" />
-        <el-table-column property="description" label="子系统简介" />
-        <el-table-column property="id" label="截止时间" />
+
+
+        <el-table-column property="isFinish" label="文档（点击下载）">
+          <el-button link style="color:deepskyblue">接口文档</el-button>
+          <el-button link style="color:deepskyblue">需求文档</el-button>
+        </el-table-column>
+        <el-table-column property="tags" label="标签">
+          <template v-slot="{ row }">
+            <span v-for="(tag, index) in row.tags" :key="index">{{ tag.toString() }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column property="description" label="项目简介" >
+          <template v-slot="{row}">
+            <span v-for="(des, index) in row.description" :key="index">{{ des.toString() }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column property="dateline" label="截止时间" />
         <el-table-column property="name" label="操作">
           <el-button link style="color:deepskyblue" @click="toChildSystem">查看详情</el-button>
         </el-table-column>
       </el-table>
-      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
+      <el-pagination larger background layout="prev, pager, next" :total="40" class="mt-4"
         style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
     </el-card>
-
+    <el-alert>
+      <router-view />
+    </el-alert>
   </div>
+
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref ,onMounted} from 'vue';
 import { ElTable } from 'element-plus';
-import { getproject } from '@/api/manage.js';
+import { getManageListById } from '@/api/manage.js';
 import { getToken } from '@/utils/auth';
-import  { useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
+import { getManageList } from '@/api/manage.js';
+
+
 
 const router = useRouter();
 
 // 路由跳转
 const toChildSystem = () => {
-  router.push({ name: 'ChildSysManage' ,params:{ token : getToken()}}); // 跳转到子系统详情页面
+  router.push({ name: 'ChildSysManage' }); // 跳转到子系统详情页面
 };
 
+//页面加载直接获取数据
+onMounted(() => {
+  getAllProject();
+});
+
+
+
+
 
 
 interface User {
   id: number
+  total: number
   cycle: number
   name: string
-  description: string
+  description: Array<any>
   workLoad: number
-  isFinish: number
-  principalUser: string
+  status: string
+  deadline: string
+  tags: Array<any>
+  files: Array<any>
+  isDelete: boolean
+  principal_id: number
+  updatedAt: string
+  createdAt: string
+  completeTime: string
+  beginTime: string
+
 }
 
+// 数组转出
+
+
+
+
+
+// 获取输入框内容
+const input1 = ref('');
+const input2 = ref('');
+
+
 const multipleTableRef = ref<InstanceType<typeof ElTable>>();
 const multipleSelection = ref<User[]>([]);
 
@@ -78,99 +128,102 @@ const handleSelectionChange = (val: User[]) => {
   multipleSelection.value = val;
 };
 
-// const tableData: User[] = [
-//   {
-//     date: '2016-05-03',
-//     name: 'Tom',
-//     address: 'No. 189, Grove St, Los Angeles'
-//   },
-//   {
-//     date: '2016-05-02',
-//     name: 'Tom',
-//     address: 'No. 189, Grove St, Los Angeles'
-//   },
-//   {
-//     date: '2016-05-04',
-//     name: 'Tom',
-//     address: 'No. 189, Grove St, Los Angeles'
-//   },
-//   {
-//     date: '2016-05-01',
-//     name: 'Tom',
-//     address: 'No. 189, Grove St, Los Angeles'
-//   }
+// 在 Vue 组件中添加 parseData 函数
+const parseData = (data) => {
+  const description = JSON.parse(data.description);
+  const files = JSON.parse(data.files);
+  const tags = JSON.parse(data.tags);
+
+  return {
+    id: data.id,
+    total:20,
+    cycle: data.cycle,
+    name: data.name,
+    description: description,
+    workLoad: data.workLoad,
+    status: data.status,
+    deadline: data.deadline,
+    tags: tags,
+    files: files,
+    isDelete: data.isDelete,
+    principal_id: data.principalId,
+    updatedAt: data.updatedAt,
+    createdAt: data.createdAt,
+    completeTime: data.completeTime,
+    beginTime: data.beginTime
+  };
+};
+
+//获取所有项目
+const getAllProject = () => {
+  const project = getManageList(getToken());
+
+
+  // 处理接口数据 
+  project.then(res => {
+    const data = res.data.data;
+    console.log(data);
+    if (data) {
+      const newData = data.map(item => parseData(item)); // 使用先前定义的函数处理数据
+      // 使用 tableData.value 进行添加
+      tableData.value = newData;
+      console.log(tableData.value);
+
+
+
+    } else {
+      console.log("没有数据");
+    }
+  })
+    .catch(err => {
+      console.log(err);
+    });
+}
+
+
+// 查询
+const search = () => {
+  //获取数据
+  const project = getManageListById(input1.value, getToken());
+
+  // 处理接口数据 
+  project.then(res => {
+
+    const data = res.data.data;
+    console.log(data);
+    if (data) {
+      const newData = parseData(data); // 使用先前定义的函数处理数据
+      // 使用 tableData.value 进行添加
+
+      tableData.value.push(newData);
+      console.log(tableData.value);
+
+    } else {
+      console.log("没有数据");
+    }
+  })
+    .catch(err => {
+      console.log(err);
+    });
+
+}
 
-// ];
-//获取数据
-const project = getproject(2, getToken());
 
 //响应式
 const tableData = ref<User[]>([
   //测试用例
-  {
-    id: 4,
-    cycle: 2,
-    name: "shij",
-    description: "null",
-    workLoad: 1,
-    isFinish: 2,
-    principalUser: "teacher_user",
-  },
-  {
-    id: 4,
-    cycle: 2,
-    name: "shij",
-    description: "null",
-    workLoad: 1,
-    isFinish: 2,
-    principalUser: "teacher_user",
-  },
-  {
-    id: 4,
-    cycle: 2,
-    name: "shij",
-    description: "null",
-    workLoad: 1,
-    isFinish: 2,
-    principalUser: "teacher_user",
-  },
+
+
 
 
 ]);
 
 
-// 处理接口数据 
-project.then(res => {
-
-  const data = res.data.data[0];
-  if (data) {
-    const dataProject: User = {
-      id: data.id,
-      cycle: data.cycle,
-      name: data.name,
-      description: data.description,
-      workLoad: data.workLoad,
-      isFinish: data.isFinish,
-      principalUser: data.principalUser
-    };
-    // 使用 tableData.value 进行访问
-    tableData.value.push(dataProject);
-
-
-  } else {
-    console.log("没有数据");
-
-  }
-  
-  
-})
-  .catch(err => {
-    console.log(err);
-  });
 
 
 
-const input = ref('');
+
+
 
 
 
-- 
2.43.0


From dd85d5eea4c5fcf132b3db856ec4a0b28b6dcc66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Wed, 17 Apr 2024 23:57:25 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84?=
 =?UTF-8?q?=EF=BC=8C=E6=A3=80=E7=B4=A2=E4=B8=8E=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/charge.js                             |   7 +-
 src/views/personal/project/charge.vue         | 198 ++++++++++--------
 .../personal/project/childmodel/charge.vue    |   5 +-
 .../personal/project/childmodel/manage.vue    |   2 +-
 src/views/personal/project/detail/charge.vue  |   6 +-
 5 files changed, 120 insertions(+), 98 deletions(-)

diff --git a/src/api/charge.js b/src/api/charge.js
index 4032ace..38a58fe 100644
--- a/src/api/charge.js
+++ b/src/api/charge.js
@@ -12,7 +12,7 @@ const api = 'http://nbxt.oa.x-lf.cn'
  * @param token 访问令牌
  * @returns {Promise<AxiosResponse<any>> | *}
  */
-const  getChargeProjectList = (token)=> {
+export const  getChargeProjectList = (token)=> {
     return axios({
         method: 'get',
         url: `${api}/project/participate/get`,
@@ -21,4 +21,7 @@ const  getChargeProjectList = (token)=> {
             'Timestamp':getCurrentTimestamp()
         }
     })
-}
\ No newline at end of file
+}
+
+
+
diff --git a/src/views/personal/project/charge.vue b/src/views/personal/project/charge.vue
index 5d9af37..607a418 100644
--- a/src/views/personal/project/charge.vue
+++ b/src/views/personal/project/charge.vue
@@ -5,15 +5,15 @@
       <div style="display:flex;flex-direction:row;justify-content: space-around ">
         <div>
           名称
-          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+          <el-input v-model="input1" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
         </div>
         <div>
           状态
-          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+          <el-input v-model="input2" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
         </div>
         <div>
-          <el-button type="primary" style="width:80px">查询</el-button>
-          <el-button style="width:80px">重置</el-button>
+          <el-button type="primary" style="width:80px" @click="search">查询</el-button>
+          <el-button style="width:80px" @click="reset">重置</el-button>
         </div>
       </div>
     </el-card>
@@ -23,17 +23,17 @@
       </div>
       <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
         @selection-change="handleSelectionChange">
-        <!--                <el-table-column type="selection" width="55" />-->
+        <el-table-column type="selection" width="55" />
         <el-table-column label="序号" width="120">
           <template #default="scope">{{ scope.row.date }}</template>
         </el-table-column>
         <el-table-column property="name" label="项目名称" width="120" />
-        <el-table-column property="address" label="工作量" show-overflow-tooltip />
-        <el-table-column property="address" label="周期" />
-        <el-table-column property="address" label="负责人" />
-        <el-table-column property="address" label="状态"/>
-         
-     
+        <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
+        <el-table-column property="cycle" label="周期" />
+        <el-table-column property="principalUser" label="负责人" />
+        <el-table-column property="isFinish" label="状态" />
+
+
         <el-table-column property="address" label="项目简介" />
         <el-table-column property="address" label="截止时间" />
         <el-table-column property="address" label="操作">
@@ -51,16 +51,11 @@
 import { ref } from 'vue';
 import { ElTable } from 'element-plus';
 import { useRouter } from 'vue-router';
-import { getManageList } from '@/api/manage.js';
+import { getChargeProjectList } from '@/api/charge.js';
 import { getToken } from '@/utils/auth';
 const router = useRouter();
 
-// 路由跳转
-const toChildSystem = () => {
-  router.push({ name: 'ChildSysCharge' }); // 跳转到子系统详情页面
-};
 
-const input = ref('');
 
 
 
@@ -68,17 +63,85 @@ const input = ref('');
 
 
 interface User {
-  id: number
-  cycle: number
-  name: string
-  description: string
-  workLoad: number
-  card: string
-  isFinish: number
-  principalUser: string
-  dateline: string
+  id: number;
+  cycle: number;
+  name: string;
+  description: string;
+  workLoad: number;
+  card: string;
+  isFinish: number;
+  principalUser: string;
+  dateline: string;
 }
 
+// 响应式数据
+const input1 = ref('');
+const input2 = ref('');
+const tableData = ref<User[]>([
+  {
+    id: 4,
+    cycle: 2,
+    name: "项目2",
+    description: "xxxxxxx",
+    workLoad: 12,
+    card: "java",
+    isFinish: 3,
+    principalUser: "teacher_user",
+    dateline: "2021-12-31"
+  },
+  {
+    id: 4,
+    cycle: 2,
+    name: "项目2",
+    description: "xxxxxxx",
+    workLoad: 12,
+    card: "java",
+    isFinish: 1,
+    principalUser: "teacher_user",
+    dateline: "2021-12-31"
+  }
+
+]);
+const initialTableData = ref<User[]>([]);
+
+// 处理接口数据 
+const fetchData = () => {
+  const project = getChargeProjectList(getToken());
+  project.then(res => {
+    const data = res.data;
+    if (data) {
+      // 假设 data 是从接口返回的数据，这里做一个示例
+      const dataProject: User = {
+        id: 4,
+        cycle: 2,
+        name: "项目3",
+        description: "xxxxxxx",
+        workLoad: 12,
+        card: "java",
+        isFinish: 2,
+        principalUser: "teacher_user",
+        dateline: "2021-12-31"
+      };
+
+      tableData.value.push(dataProject);
+      initialTableData.value = tableData.value.slice();  // 将tableData的内容赋值给initialTableData
+    } else {
+      console.log("没有数据");
+    }
+  }).catch(err => {
+    console.log(err);
+  });
+};
+
+// 调用获取数据的函数
+fetchData();
+
+// 处理路由跳转
+const toChildSystem = () => {
+  router.push({ name: 'ChildSysCharge' });
+};
+
+// 监听表格行选择事件
 const multipleTableRef = ref<InstanceType<typeof ElTable>>();
 const multipleSelection = ref<User[]>([]);
 
@@ -86,69 +149,32 @@ const handleSelectionChange = (val: User[]) => {
   multipleSelection.value = val;
 };
 
-//获取数据
-const project = getManageList(getToken());
+// 统一检索函数
+const search = () => {
+  const keyword = input1.value.trim().toLowerCase();
+  const status = parseInt(input2.value);
 
-//响应式
-const tableData = ref<User[]>([
-  //测试用例
-  {
-    id: 4,
-    cycle: 2,
-    name: "项目2",
-    description: "xxxxxxx",
-    workLoad: 12,
-    card: "java",
-    isFinish: 2,
-    principalUser: "teacher_user",
-    dateline: "2021-12-31"
-  },
-  {
-    id: 4,
-    cycle: 2,
-    name: "项目2",
-    description: "xxxxxxx",
-    workLoad: 12,
-    card: "java",
-    isFinish: 2,
-    principalUser: "teacher_user",
-    dateline: "2021-12-31"
-  },
-
-
-
-]);
-
-
-// 处理接口数据 
-project.then(res => {
-
-  const data = res.data;
-  console.log(data);
-  if (data) {
-    const dataProject: User = {
-      id: 4,
-      cycle: 2,
-      name: "项目2",
-      description: "xxxxxxx",
-      workLoad: 12,
-      card: "java",
-      isFinish: 2,
-      principalUser: "teacher_user",
-      dateline: "2021-12-31"
-    };
-    // 使用 tableData.value 进行添加
-    tableData.value.push(dataProject);
-
-
-  } else {
-    console.log("没有数据");
+  // 如果搜索关键词和状态都为空，则恢复初始数据
+  if (keyword === '' && isNaN(status)) {
+    tableData.value = initialTableData.value.slice();
+    return; 
   }
-})
-.catch(err => {
-    console.log(err);
-  });
 
+  // 根据关键词和状态进行检索
+  tableData.value = initialTableData.value.filter(item => {
+    const matchKeyword = (keyword === '' || item.name.toLowerCase().includes(keyword));
+    const matchStatus = (isNaN(status) || item.isFinish === status);
+    return matchKeyword && matchStatus;
+  });
+};
+
+
+// 重置检索条件
+const reset = () => {
+  input1.value = '';
+  input2.value = '';
+  tableData.value = initialTableData.value.slice();  // 恢复初始数据
+};
 
 </script>
 <style>
diff --git a/src/views/personal/project/childmodel/charge.vue b/src/views/personal/project/childmodel/charge.vue
index 6365ec6..e38d1e1 100644
--- a/src/views/personal/project/childmodel/charge.vue
+++ b/src/views/personal/project/childmodel/charge.vue
@@ -25,10 +25,7 @@
 
                 >子模块列表</el-button
                 >
-                <div>
-                  <el-button type="primary" style="width:80px">新增</el-button>
-                      <el-button style="width:80px ;background-color: #bd3124;color: azure;">删除</el-button>
-                </div>
+              
             </div>
             <el-table
                     ref="multipleTableRef"
diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue
index d66b716..7737559 100644
--- a/src/views/personal/project/childmodel/manage.vue
+++ b/src/views/personal/project/childmodel/manage.vue
@@ -36,7 +36,7 @@
                     style="max-width: 100vw;"
                     @selection-change="handleSelectionChange"
             >
-  <!--                <el-table-column type="selection" width="55" />-->
+                 <el-table-column type="selection" width="55" />
                 <el-table-column label="序号" width="120">
                     <template #default="scope">{{ scope.row.date }}</template>
                 </el-table-column>
diff --git a/src/views/personal/project/detail/charge.vue b/src/views/personal/project/detail/charge.vue
index a0b911e..ddf88ad 100644
--- a/src/views/personal/project/detail/charge.vue
+++ b/src/views/personal/project/detail/charge.vue
@@ -36,11 +36,7 @@
             </el-row>
 
         </el-card>
-        <div style="display: flex; justify-content: center;">
-            <el-button type="primary" style="width:80px">编辑</el-button>
-            <el-button style="width:80px ;background-color: #bd3124;color: azure;">删除</el-button>
-
-        </div>
+       
 
 
 
-- 
2.43.0


From fd4592489c8f474ce2bd6bc4af82dfd9cc6a119e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Thu, 18 Apr 2024 14:02:19 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=8B=89=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/{charge.js => participate.js}         |   2 +-
 src/router/modules/manage.ts                  |  30 +--
 src/views/personal/project/charge.vue         | 200 +--------------
 .../{charge.vue => participate.vue}           |   2 +-
 .../{charge.vue => participate.vue}           |   2 +-
 .../detail/{charge.vue => participate.vue}    |   0
 src/views/personal/project/participate.vue    | 241 +++++++++++++++++-
 7 files changed, 259 insertions(+), 218 deletions(-)
 rename src/api/{charge.js => participate.js} (89%)
 rename src/views/personal/project/childSystem/{charge.vue => participate.vue} (98%)
 rename src/views/personal/project/childmodel/{charge.vue => participate.vue} (97%)
 rename src/views/personal/project/detail/{charge.vue => participate.vue} (100%)

diff --git a/src/api/charge.js b/src/api/participate.js
similarity index 89%
rename from src/api/charge.js
rename to src/api/participate.js
index 38a58fe..a043a3a 100644
--- a/src/api/charge.js
+++ b/src/api/participate.js
@@ -12,7 +12,7 @@ const api = 'http://nbxt.oa.x-lf.cn'
  * @param token 访问令牌
  * @returns {Promise<AxiosResponse<any>> | *}
  */
-export const  getChargeProjectList = (token)=> {
+export const  getParticipateProjectList = (token)=> {
     return axios({
         method: 'get',
         url: `${api}/project/participate/get`,
diff --git a/src/router/modules/manage.ts b/src/router/modules/manage.ts
index ace0dc2..7dd06da 100644
--- a/src/router/modules/manage.ts
+++ b/src/router/modules/manage.ts
@@ -15,9 +15,9 @@ const manageRouter = {
     },
     children: [
       {
-        path: 'participate',
-        component: () => import('@/views/personal/project/participate.vue'),
-        name: 'participate',
+        path: 'charge',
+        component: () => import('@/views/personal/project/charge.vue'),
+        name: 'Charge',
         meta: { title: '我负责的', icon: 'user', affix: true }
       },
       //我管理的以及子页面
@@ -50,28 +50,28 @@ const manageRouter = {
       },
       //我参与的以及子界面
       {
-        path: 'charge',
-        component: () => import('@/views/personal/project/charge.vue'),
-        name: 'Charge',
+        path: 'participate',
+        component: () => import('@/views/personal/project/participate.vue'),
+        name: 'Participate',
         meta: { title: '我参与的', icon: 'user', affix: true }
       },
       {
-        path: 'childSysCharge',
-        component: () => import('@/views/personal/project/childSystem/charge.vue'),
-        name: 'ChildSysCharge',
+        path: 'childSysParticipate',
+        component: () => import('@/views/personal/project/childSystem/participate.vue'),
+        name: 'ChildSysParticipate',
         meta: { title: '我参与的 / 子系统', breadcrumb: true , hidden: true  ,affix:false},  
        
       },
       {
-        path: 'childModCharge',
-        component: () => import('@/views/personal/project/childModel/charge.vue'),
-        name: 'ChildModCharge',
+        path: 'childModParticipate',
+        component: () => import('@/views/personal/project/childModel/participate.vue'),
+        name: 'ChildModParticipate',
         meta: { title: '我参与的 / 子系统 / 子模块', breadcrumb: true , hidden: true  }  
       },
       {
-        path: 'chargeDetail',
-        component:()=>import('@/views/personal/project/detail/charge.vue'),
-        name: 'ChargeDetail',
+        path: 'participateDetail',
+        component:()=>import('@/views/personal/project/detail/participate.vue'),
+        name: 'ParticipateDetail',
         meta: { title: '我参与的 / 子系统 / 子模块 /详情', breadcrumb: true , hidden: true  }  
       }
     ]
diff --git a/src/views/personal/project/charge.vue b/src/views/personal/project/charge.vue
index 607a418..5cd477b 100644
--- a/src/views/personal/project/charge.vue
+++ b/src/views/personal/project/charge.vue
@@ -1,199 +1,3 @@
 <template>
-  <div style=" width:100%">
-    <el-card style="max-width: 100vw;margin: 1.5vw;">
-      <template #header><strong>我参与的</strong></template>
-      <div style="display:flex;flex-direction:row;justify-content: space-around ">
-        <div>
-          名称
-          <el-input v-model="input1" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
-        </div>
-        <div>
-          状态
-          <el-input v-model="input2" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
-        </div>
-        <div>
-          <el-button type="primary" style="width:80px" @click="search">查询</el-button>
-          <el-button style="width:80px" @click="reset">重置</el-button>
-        </div>
-      </div>
-    </el-card>
-    <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
-      <div style="display:flex;flex-direction: row;justify-content: space-between">
-        <el-button text type=''>项目列表</el-button>
-      </div>
-      <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
-        @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
-        <el-table-column label="序号" width="120">
-          <template #default="scope">{{ scope.row.date }}</template>
-        </el-table-column>
-        <el-table-column property="name" label="项目名称" width="120" />
-        <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
-        <el-table-column property="cycle" label="周期" />
-        <el-table-column property="principalUser" label="负责人" />
-        <el-table-column property="isFinish" label="状态" />
-
-
-        <el-table-column property="address" label="项目简介" />
-        <el-table-column property="address" label="截止时间" />
-        <el-table-column property="address" label="操作">
-          <el-button link style="color:deepskyblue" @click="toChildSystem">查看详情</el-button>
-        </el-table-column>
-      </el-table>
-      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
-        style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
-    </el-card>
-
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { ref } from 'vue';
-import { ElTable } from 'element-plus';
-import { useRouter } from 'vue-router';
-import { getChargeProjectList } from '@/api/charge.js';
-import { getToken } from '@/utils/auth';
-const router = useRouter();
-
-
-
-
-
-
-
-
-interface User {
-  id: number;
-  cycle: number;
-  name: string;
-  description: string;
-  workLoad: number;
-  card: string;
-  isFinish: number;
-  principalUser: string;
-  dateline: string;
-}
-
-// 响应式数据
-const input1 = ref('');
-const input2 = ref('');
-const tableData = ref<User[]>([
-  {
-    id: 4,
-    cycle: 2,
-    name: "项目2",
-    description: "xxxxxxx",
-    workLoad: 12,
-    card: "java",
-    isFinish: 3,
-    principalUser: "teacher_user",
-    dateline: "2021-12-31"
-  },
-  {
-    id: 4,
-    cycle: 2,
-    name: "项目2",
-    description: "xxxxxxx",
-    workLoad: 12,
-    card: "java",
-    isFinish: 1,
-    principalUser: "teacher_user",
-    dateline: "2021-12-31"
-  }
-
-]);
-const initialTableData = ref<User[]>([]);
-
-// 处理接口数据 
-const fetchData = () => {
-  const project = getChargeProjectList(getToken());
-  project.then(res => {
-    const data = res.data;
-    if (data) {
-      // 假设 data 是从接口返回的数据，这里做一个示例
-      const dataProject: User = {
-        id: 4,
-        cycle: 2,
-        name: "项目3",
-        description: "xxxxxxx",
-        workLoad: 12,
-        card: "java",
-        isFinish: 2,
-        principalUser: "teacher_user",
-        dateline: "2021-12-31"
-      };
-
-      tableData.value.push(dataProject);
-      initialTableData.value = tableData.value.slice();  // 将tableData的内容赋值给initialTableData
-    } else {
-      console.log("没有数据");
-    }
-  }).catch(err => {
-    console.log(err);
-  });
-};
-
-// 调用获取数据的函数
-fetchData();
-
-// 处理路由跳转
-const toChildSystem = () => {
-  router.push({ name: 'ChildSysCharge' });
-};
-
-// 监听表格行选择事件
-const multipleTableRef = ref<InstanceType<typeof ElTable>>();
-const multipleSelection = ref<User[]>([]);
-
-const handleSelectionChange = (val: User[]) => {
-  multipleSelection.value = val;
-};
-
-// 统一检索函数
-const search = () => {
-  const keyword = input1.value.trim().toLowerCase();
-  const status = parseInt(input2.value);
-
-  // 如果搜索关键词和状态都为空，则恢复初始数据
-  if (keyword === '' && isNaN(status)) {
-    tableData.value = initialTableData.value.slice();
-    return; 
-  }
-
-  // 根据关键词和状态进行检索
-  tableData.value = initialTableData.value.filter(item => {
-    const matchKeyword = (keyword === '' || item.name.toLowerCase().includes(keyword));
-    const matchStatus = (isNaN(status) || item.isFinish === status);
-    return matchKeyword && matchStatus;
-  });
-};
-
-
-// 重置检索条件
-const reset = () => {
-  input1.value = '';
-  input2.value = '';
-  tableData.value = initialTableData.value.slice();  // 恢复初始数据
-};
-
-</script>
-<style>
-.my-autocomplete li {
-  line-height: normal;
-  padding: 7px;
-}
-
-.my-autocomplete li .name {
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-
-.my-autocomplete li .addr {
-  font-size: 12px;
-  color: #b4b4b4;
-}
-
-.my-autocomplete li .highlighted .addr {
-  color: #ddd;
-}
-</style>
\ No newline at end of file
+    hi
+</template>
\ No newline at end of file
diff --git a/src/views/personal/project/childSystem/charge.vue b/src/views/personal/project/childSystem/participate.vue
similarity index 98%
rename from src/views/personal/project/childSystem/charge.vue
rename to src/views/personal/project/childSystem/participate.vue
index ca5b038..b340fd4 100644
--- a/src/views/personal/project/childSystem/charge.vue
+++ b/src/views/personal/project/childSystem/participate.vue
@@ -73,7 +73,7 @@
   const router = useRouter();
 
   const toChildModel = () => {
-    router.push({name:'ChildModCharge'})
+    router.push({name:'ChildModParticipate'})
   };
 
   const input = ref('');
diff --git a/src/views/personal/project/childmodel/charge.vue b/src/views/personal/project/childmodel/participate.vue
similarity index 97%
rename from src/views/personal/project/childmodel/charge.vue
rename to src/views/personal/project/childmodel/participate.vue
index e38d1e1..5c79f30 100644
--- a/src/views/personal/project/childmodel/charge.vue
+++ b/src/views/personal/project/childmodel/participate.vue
@@ -77,7 +77,7 @@
 
   // 路由跳转
   const toDetail = () => {
-    router.push({ name: 'ChargeDetail' }); // 跳转到子系统详情页面
+    router.push({ name: 'ParticipateDetail' }); // 跳转到子系统详情页面
   };
 
   interface User {
diff --git a/src/views/personal/project/detail/charge.vue b/src/views/personal/project/detail/participate.vue
similarity index 100%
rename from src/views/personal/project/detail/charge.vue
rename to src/views/personal/project/detail/participate.vue
diff --git a/src/views/personal/project/participate.vue b/src/views/personal/project/participate.vue
index 5cd477b..7483a84 100644
--- a/src/views/personal/project/participate.vue
+++ b/src/views/personal/project/participate.vue
@@ -1,3 +1,240 @@
 <template>
-    hi
-</template>
\ No newline at end of file
+  <div style=" width:100%">
+    <el-card style="max-width: 100vw;margin: 1.5vw;">
+      <template #header><strong>我参与的</strong></template>
+      <div style="display:flex;flex-direction:row;justify-content: space-around ">
+        <div>
+          名称
+          <el-input v-model="input1" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          状态
+          <el-input v-model="input2" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          <el-button type="primary" style="width:80px" @click="search">查询</el-button>
+          <el-button style="width:80px" @click="reset">重置</el-button>
+        </div>
+      </div>
+    </el-card>
+    <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
+      <div style="display:flex;flex-direction: row;justify-content: space-between">
+        <el-button text type=''>项目列表</el-button>
+      </div>
+      <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" />
+        <el-table-column label="序号" width="120">
+          <template v-slot="{ $index }">{{ $index + 1 }}</template>
+        </el-table-column>
+        <el-table-column property="name" label="项目名称" width="120" />
+        <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
+        <el-table-column property="cycle" label="周期" />
+        <el-table-column property="principalUser" label="负责人" />
+        <el-table-column property="status" label="状态" />
+        <el-table-column property="tags" label="标签">
+          <template #default="{ row }">
+            <el-tag v-for="tag in row.tags" :key="tag">{{ tag.toString() }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column property="files" label="文档(点击下载)">
+          <template #default="{ row }">
+            <template v-if="row.files && row.files.URI">
+              <a :href="row.files.URI" target="_blank" style="color: deepskyblue">
+                下载文档
+              </a>
+            </template>
+            <template v-else>
+              无
+            </template>
+          </template>
+        </el-table-column>
+
+        <el-table-column property="description" label="项目简介" />
+        <el-table-column property="deadline" label="截止时间" />
+        <el-table-column property="address" label="操作">
+          <el-button link style="color:deepskyblue" @click="toChildSystem">查看详情</el-button>
+        </el-table-column>
+      </el-table>
+      <el-pagination larger background layout="prev, pager, next" :total="total" class="mt-4" :page-size="pageSize"
+        style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
+    </el-card>
+
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { ElTable } from 'element-plus';
+import { useRouter } from 'vue-router';
+import { getParticipateProjectList } from '@/api/participate.js';
+import { getToken } from '@/utils/auth';
+
+const router = useRouter();
+
+//设置页码
+const total = ref(2);
+const pageSize = ref(3);
+
+
+
+
+interface User {
+  id: number;
+  cycle: number;
+  name: string;
+  description: string;
+  workLoad: number;
+  files: { URI: string };
+  status: string
+  principalUser: string;
+  deadline: string;
+  tags: Array<any>;
+}
+
+// 响应式数据
+const input1 = ref('');
+const input2 = ref('');
+const tableData = ref<User[]>([
+  {
+    id: 4,
+    cycle: 2,
+    name: "项目2",
+    description: "xxxxxxx",
+    workLoad: 12,
+    files: { URI: 'http://www.baidu.com' },
+    status: "暂停",
+    principalUser: "teacher_user",
+    deadline: "2021-12-31",
+    tags: ["java", "spring"]
+
+  },
+  {
+    id: 4,
+    cycle: 2,
+    name: "项目2",
+    description: "xxxxxxx",
+    workLoad: 12,
+    files: { URI: 'http://www.baidu.com' },
+    status: "进行中",
+    principalUser: "teacher_user",
+    deadline: "2021-12-31",
+    tags: ["java", "spring"]
+
+  }
+
+]);
+const initialTableData = ref<User[]>([]);
+
+//处理返回数据函数
+const parseData = (data) => {
+  const files = JSON.parse(data.files);
+  const tags = JSON.parse(data.tags);
+
+  return {
+    id: data.id,
+    cycle: data.cycle,
+    name: data.name,
+    description: data.description,
+    workLoad: data.workLoad,
+    files: files,
+    status: data.status,
+    principalUser: data.principalUser,
+    deadline: data.deadLine,
+    tags: tags,
+
+
+
+  }
+}
+
+// 处理接口数据 
+const fetchData = () => {
+  const project = getParticipateProjectList(getToken());
+  console.log(project);
+
+  project.then(res => {
+    const data = res.data.data.list;
+
+
+    if (data) {
+      // 假设 data 是从接口返回的数据，这里做一个示例
+      const dataProject = data.map(item => parseData(item));
+      console.log(dataProject);
+
+      tableData.value = [...dataProject, ...tableData.value];  // 将接口数据和现有数据合并
+      console.log(tableData.value);
+      initialTableData.value = tableData.value.slice();  // 将tableData的内容赋值给initialTableData
+    } else {
+      console.log("没有数据");
+    }
+  }).catch(err => {
+    console.log(err);
+  });
+};
+
+// 调用获取数据的函数
+fetchData();
+
+// 处理路由跳转
+const toChildSystem = () => {
+  router.push({ name: 'ChildSysParticipate' });
+};
+
+// 监听表格行选择事件
+const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+const multipleSelection = ref<User[]>([]);
+
+const handleSelectionChange = (val: User[]) => {
+  multipleSelection.value = val;
+};
+
+// 统一检索函数
+const search = () => {
+  const keyword = input1.value.trim().toLowerCase();
+  const status = input2.value.trim().toLowerCase();
+
+  // 如果搜索关键词和状态都为空，则恢复初始数据
+  if (keyword === '' && status === '') {
+    tableData.value = initialTableData.value.slice();
+    return;
+  }
+
+  // 根据关键词和状态进行检索
+  tableData.value = initialTableData.value.filter(item => {
+    const matchKeyword = (keyword === '' || item.name.toLowerCase().includes(keyword));
+    const matchStatus = (status === '' || item.status.toLowerCase().includes(status));
+    return matchKeyword && matchStatus;
+  });
+};
+
+
+
+// 重置检索条件
+const reset = () => {
+  input1.value = '';
+  input2.value = '';
+  tableData.value = initialTableData.value.slice();  // 恢复初始数据
+};
+
+</script>
+<style>
+.my-autocomplete li {
+  line-height: normal;
+  padding: 7px;
+}
+
+.my-autocomplete li .name {
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.my-autocomplete li .addr {
+  font-size: 12px;
+  color: #b4b4b4;
+}
+
+.my-autocomplete li .highlighted .addr {
+  color: #ddd;
+}
+</style>
\ No newline at end of file
-- 
2.43.0


From b30cc287e872d56c78a5a268b14e54efbc8e688b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Thu, 18 Apr 2024 17:17:45 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90=EF=BC=88?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E8=BF=98=E5=B7=AE=E5=87=A0?=
 =?UTF-8?q?=E4=B8=AA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   2 +
 src/api/participate.js                        |  49 +++
 .../project/childSystem/participate.vue       | 336 +++++++++++-------
 .../project/childmodel/participate.vue        | 316 +++++++++-------
 .../personal/project/detail/participate.vue   |  61 +++-
 src/views/personal/project/participate.vue    |  17 +-
 6 files changed, 514 insertions(+), 267 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index f44ce52..8e58971 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -23,6 +23,7 @@ declare module '@vue/runtime-core' {
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
@@ -44,6 +45,7 @@ declare module '@vue/runtime-core' {
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTableRow: typeof import('element-plus/es')['ElTableRow']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ErrorLog: typeof import('./src/components/ErrorLog/index.vue')['default']
diff --git a/src/api/participate.js b/src/api/participate.js
index a043a3a..d00797a 100644
--- a/src/api/participate.js
+++ b/src/api/participate.js
@@ -22,6 +22,55 @@ export const  getParticipateProjectList = (token)=> {
         }
     })
 }
+/**
+ * 获取我参与的项目的子系统列表
+ * @param projectId 项目ID
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+export const  getParticipateSystemList = ( projectId,token)=> {
+    return axios({
+        method: 'get',
+        url: `${api}/module/get?projectId=${projectId}`,
+        headers: {
+            'Authorization': `Bearer ${token}`,
+            'Timestamp':getCurrentTimestamp()
+        }
+    })
+}
+/**
+ * 获取我参与的项目的子模块列表
+ * @param SysId 项目ID
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+export const  getParticipateModuleList = ( SysId,token)=> {
+    return axios({
+        method: 'get',
+        url: `${api}/module/get/min?sysId=${SysId}`,
+        headers: {
+            'Authorization': `Bearer ${token}`,
+            'Timestamp':getCurrentTimestamp()
+        }
+    })
+}
+/**
+ * 获取我参与的项目的子模块的详细信息
+ * @param ModId 项目ID
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+export const  getParticipateDetail = ( ModId,token)=> {
+    return axios({
+        method: 'get',
+        url: `${api}/project/module/id?id=${ModId}`,
+        headers: {
+            'Authorization': `Bearer ${token}`,
+            'Timestamp':getCurrentTimestamp()
+        }
+    })
+}
+
 
 
 
diff --git a/src/views/personal/project/childSystem/participate.vue b/src/views/personal/project/childSystem/participate.vue
index b340fd4..f4a4c34 100644
--- a/src/views/personal/project/childSystem/participate.vue
+++ b/src/views/personal/project/childSystem/participate.vue
@@ -1,136 +1,216 @@
 <template>
-    <div style=" width:100%">
-        <el-card style="max-width: 100vw;margin: 1.5vw;">
-          <template #header><strong >项目1</strong></template>
-            <div style="display:flex;flex-direction:row;justify-content: space-around ">
-                <div>
-                    名称
-                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
-                </div>
-                <div>
-                    状态
-                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
-                </div>
-                <div>
-                  <el-button type="primary" style="width:80px">查询</el-button>
-                      <el-button style="width:80px">重置</el-button>
-                </div>
-            </div>
-        </el-card>
-        <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
-            <div style="display:flex;flex-direction: row;justify-content: space-between">
-                <el-button
-                        text
-                        type=''
-                >子系统列表</el-button
-                >
-            </div>
-            <el-table
-                    ref="multipleTableRef"
-                    :data="tableData"
-                    style="max-width: 100vw;"
-                    @selection-change="handleSelectionChange"
-            >
-  <!--                <el-table-column type="selection" width="55" />-->
-                <el-table-column label="序号" width="120">
-                    <template #default="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column property="name" label="子系统名称" width="120" />
-                <el-table-column property="address" label="工作量" show-overflow-tooltip />
-                <el-table-column property="address" label="周期"  />
-                <el-table-column property="address" label="负责人"  />
-                <el-table-column property="address" label="状态"  />
-                <el-table-column property="address" label="子系统简介"  />
-                <el-table-column property="address" label="截止时间"  />
-                <el-table-column property="address" label="操作"  >
-                    <el-button
-                            link
-                            style="color:deepskyblue"
-                            @click="toChildModel"
-                    >查看详情</el-button
-                    >
-                </el-table-column>
-            </el-table>
-            <el-pagination
-                    larger
-                    background
-                    layout="prev, pager, next"
-                    :total="50"
-                    class="mt-4"
-                    style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
-            />
-        </el-card>
-     
+  <div style=" width:100%">
+    <el-card style="max-width: 100vw;margin: 1.5vw;">
+      <template #header><strong>项目{{ projectid }}</strong></template>
+      <div style="display:flex;flex-direction:row;justify-content: space-around ">
+        <div>
+          名称
+          <el-input v-model="input1" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          状态
+          <el-input v-model="input2" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          <el-button type="primary" style="width:80px" @click="search()">查询</el-button>
+          <el-button style="width:80px" @click="reset()">重置</el-button>
+        </div>
       </div>
-  </template>
-  
-  <script lang="ts" setup>
-  import { ref } from 'vue';
-  import { ElTable } from 'element-plus';
-  import { useRouter } from 'vue-router';
-  
-  //跳转到子模块
-  const router = useRouter();
+    </el-card>
+    <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
+      <div style="display:flex;flex-direction: row;justify-content: space-between">
+        <el-button text type=''>子系统列表</el-button>
+      </div>
+      <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
+        @selection-change="handleSelectionChange">
+        <!--                <el-table-column type="selection" width="55" />-->
+        <el-table-column label="序号" width="120">
+          <template #default="scope">{{ scope.$index + 1 }}</template>
+        </el-table-column>
+        <el-table-column property="name" label="子系统名称" width="120" />
+        <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
+        <el-table-column property="cycle" label="周期" />
+        <el-table-column property="principalUser" label="负责人" />
+        <el-table-column property="status" label="状态" />
+        <el-table-column property="description" label="子系统简介">
+          <template #default="{ row }">
+            <span>{{ row.description.description }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column property="createdAt" label="创建时间" />
+        <el-table-column property="address" label="操作" #default="{row}">
+          <el-button link style="color:deepskyblue" @click="toChildModel(row.id)">查看详情</el-button>
+        </el-table-column>
+      </el-table>
+      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
+        style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
+    </el-card>
 
-  const toChildModel = () => {
-    router.push({name:'ChildModParticipate'})
-  };
+  </div>
+</template>
 
-  const input = ref('');
+<script lang="ts" setup>
+import { ref } from 'vue';
 
-  interface User {
-      date: string
-      name: string
-      address: string
+import { ElTable } from 'element-plus';
+import { useRouter, useRoute } from 'vue-router';
+import { getToken } from '@/utils/auth';
+import { getParticipateSystemList } from '@/api/participate.js';
+
+
+//取值
+const route = useRoute();
+const projectid = route.query.projectId ? route.query.projectId : 1 ;
+
+
+
+
+//跳转到子模块
+const router = useRouter();
+
+const toChildModel = (SysId: number) => {
+  router.push({ name: 'ChildModParticipate' , query: { SysId: SysId } })
+};
+
+
+
+interface User {
+  id: number
+  createdAt: string
+  cycle: number
+  description: { description: string }
+  isDeleted: number
+  name: string
+  principalId: number
+  projectId: number
+  workLoad: number
+  status: string
+  principalUser:string
+}
+
+const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+const multipleSelection = ref<User[]>([]);
+
+const handleSelectionChange = (val: User[]) => {
+  multipleSelection.value = val;
+};
+
+const tableData = ref<User[]>([
+  {
+    id: 1,
+    createdAt: '2022-01-01',
+    cycle: 1,
+    description: { description: '子系统1的简介' },
+    isDeleted: 0, 
+
+ 
+    name: '子系统1',
+    principalId: 1,
+    projectId: 1,
+    workLoad: 1,
+    status: '待定',
+    principalUser: '等数据ing'
   }
-  
-  const multipleTableRef = ref<InstanceType<typeof ElTable>>();
-  const multipleSelection = ref<User[]>([]);
-  
-  const handleSelectionChange = (val: User[]) => {
-    multipleSelection.value = val;
-  };
-  
-  const tableData: User[] = [
-    {
-      date: '2016-05-03',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-02',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-04',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-01',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
+]);
+const initialTableData = ref<User[]>([]);
+
+const parseData = (data) => {
+  const description = JSON.parse(data.description);
+
+
+
+
+  return {
+    id: data.id,
+    createdAt: data.createdAt,
+    cycle: data.cycle,
+    description: description,
+    isDeleted: data.isDeleted,
+    name: data.name,
+    principalId: data.principalId,
+    projectId: data.projectId,
+    workLoad: data.workLoad,
+    status:"待定",
+    principalUser:"等数据ing"
+  }
+}
+
+//获取子系统列表
+const fetchData = () => {
+  //调用接口
+  const project = getParticipateSystemList(<number>projectid-1, getToken());
+
+  project.then((res) => {
+    const data = res.data.data;
+    console.log(data);
+
+    if (data) {
+      const dataProject = data.map(item => parseData(item));
+
+      tableData.value = [...dataProject, ...tableData.value];
+      console.log(tableData.value);
+      initialTableData.value = tableData.value.slice();
     }
-  
-  ];
-  
-  
-  </script>
-  <style>
-  .my-autocomplete li {
-      line-height: normal;
-      padding: 7px;
+
+  }).catch(err => {
+    console.log(err);
+  })
+
+}
+
+fetchData();
+
+// 统一检索函数
+const search = () => {
+  const keyword = input1.value.trim().toLowerCase();
+  const status = input2.value.trim().toLowerCase();
+
+  // 如果搜索关键词和状态都为空，则恢复初始数据
+  if (keyword === '' && status === '') {
+    tableData.value = initialTableData.value.slice();
+    return;
   }
-  .my-autocomplete li .name {
-      text-overflow: ellipsis;
-      overflow: hidden;
-  }
-  .my-autocomplete li .addr {
-      font-size: 12px;
-      color: #b4b4b4;
-  }
-  .my-autocomplete li .highlighted .addr {
-      color: #ddd;
-  }
-  </style>
\ No newline at end of file
+
+  // 根据关键词和状态进行检索
+  tableData.value = initialTableData.value.filter(item => {
+    const matchKeyword = (keyword === '' || item.name.toLowerCase().includes(keyword));
+    const matchStatus = (status === '' || item.status.toLowerCase().includes(status));
+    return matchKeyword && matchStatus;
+  });
+};
+
+const input1 = ref('');
+const input2 = ref('');
+
+// 重置检索条件
+const reset = () => {
+  input1.value = '';
+  input2.value = '';
+  tableData.value = initialTableData.value.slice();  // 恢复初始数据
+};
+
+
+
+
+
+</script>
+<style>
+.my-autocomplete li {
+  line-height: normal;
+  padding: 7px;
+}
+
+.my-autocomplete li .name {
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.my-autocomplete li .addr {
+  font-size: 12px;
+  color: #b4b4b4;
+}
+
+.my-autocomplete li .highlighted .addr {
+  color: #ddd;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/project/childmodel/participate.vue b/src/views/personal/project/childmodel/participate.vue
index 5c79f30..79df9cb 100644
--- a/src/views/personal/project/childmodel/participate.vue
+++ b/src/views/personal/project/childmodel/participate.vue
@@ -1,140 +1,198 @@
 <template>
-    <div style=" width:100%">
-        <el-card style="max-width: 100vw;margin: 1.5vw;">
-          <template #header><strong >子系统1</strong></template>
-            <div style="display:flex;flex-direction:row;justify-content: space-around ">
-                <div>
-                    名称
-                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
-                </div>
-                <div>
-                    状态
-                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
-                </div>
-                <div>
-                  <el-button type="primary" style="width:80px">查询</el-button>
-                      <el-button style="width:80px">重置</el-button>
-                </div>
-            </div>
-        </el-card>
-        <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
-            <div style="display:flex;flex-direction: row;justify-content: space-between">
-                <el-button
-                        text
-                        type=''
-
-                >子模块列表</el-button
-                >
-              
-            </div>
-            <el-table
-                    ref="multipleTableRef"
-                    :data="tableData"
-                    style="max-width: 100vw;"
-                    @selection-change="handleSelectionChange"
-            >
-  <!--                <el-table-column type="selection" width="55" />-->
-                <el-table-column label="序号" width="120">
-                    <template #default="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column property="name" label="子模块名称" width="120" />
-                <el-table-column property="address" label="工作量" show-overflow-tooltip />
-                <el-table-column property="address" label="周期"  />
-                <el-table-column property="address" label="负责人"  />
-                <el-table-column property="address" label="状态"  />
-                <el-table-column property="address" label="子系统简介"  />
-                <el-table-column property="address" label="截止时间"  />
-                <el-table-column property="address" label="操作"  >
-                    <el-button
-                            link
-                            style="color:deepskyblue"
-                            @click="toDetail"
-                    >查看详情</el-button
-                    >
-                </el-table-column>
-            </el-table>
-            <el-pagination
-                    larger
-                    background
-                    layout="prev, pager, next"
-                    :total="50"
-                    class="mt-4"
-                    style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
-            />
-        </el-card>
-     
+  <div style=" width:100%">
+    <el-card style="max-width: 100vw;margin: 1.5vw;">
+      <template #header><strong>子系统{{ SysId }}</strong></template>
+      <div style="display:flex;flex-direction:row;justify-content: space-around ">
+        <div>
+          名称
+          <el-input v-model="input1" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          状态
+          <el-input v-model="input2" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          <el-button type="primary" style="width:80px" @click="search()">查询</el-button>
+          <el-button style="width:80px" @click="reset()">重置</el-button>
+        </div>
       </div>
-  </template>
-  
-  <script lang="ts" setup>
-  import { ref } from 'vue';
-  import { ElTable } from 'element-plus';
+    </el-card>
+    <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
+      <div style="display:flex;flex-direction: row;justify-content: space-between">
+        <el-button text type=''>子模块列表</el-button>
 
-  import { useRouter } from 'vue-router';
+      </div>
+      <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
+        @selection-change="handleSelectionChange">
+        <!--                <el-table-column type="selection" width="55" />-->
+        <el-table-column label="序号" width="120">
+          <template #default="{ row }">{{ row.id }}</template>
+        </el-table-column>
+        <el-table-column property="name" label="子模块名称" width="120" />
+        <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
+        <el-table-column property="address" label="周期" />
+        <el-table-column property="principalUser" label="负责人" />
+        <el-table-column property="status" label="状态" />
+        <el-table-column property="description" label="子模块简介" #default="{ row }">
+          <span>{{ row.description.description }}</span>
+        </el-table-column>
+        <el-table-column property="address" label="截止时间" />
+        <el-table-column property="address" label="操作" #default="{ row }">
+          <el-button link style="color:deepskyblue" @click="toDetail(row.id)">查看详情</el-button>
+        </el-table-column>
+      </el-table>
+      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
+        style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
+    </el-card>
+
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { ElTable } from 'element-plus';
+import { getParticipateModuleList } from '@/api/participate';
+import { useRouter, useRoute } from 'vue-router';
+import { getToken } from '@/utils/auth';
 
 
-  const router = useRouter();
 
-  // 路由跳转
-  const toDetail = () => {
-    router.push({ name: 'ParticipateDetail' }); // 跳转到子系统详情页面
-  };
+const router = useRouter();
+//取值
+const route = useRoute()
+const SysId = route.query.SysId;
 
-  interface User {
-      date: string
-      name: string
-      address: string
+// 路由跳转
+const toDetail = (ModId) => {
+  router.push({ name: 'ParticipateDetail', query: { ModId: ModId } }); // 跳转到子系统详情页面
+};
+
+interface User {
+  beginTime: string;
+  childSystemName: string;
+  completeTime: string;
+  cycle: string;
+  description: { description: string };
+  id: number;
+  isDelete: number
+  isFinishi: string
+  name: string;
+  pid: string
+  principalId: number
+  principalUser: string
+  projectId: number
+  status: string
+  type: string
+  workLoad: number
+}
+
+const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+const multipleSelection = ref<User[]>([]);
+
+const handleSelectionChange = (val: User[]) => {
+  multipleSelection.value = val;
+};
+
+
+
+//列表
+const tableData = ref<User[]>([]);
+const initialTableData = ref<User[]>([]);
+const parseData = (data) => {
+  const descripation = JSON.parse(data.description);
+
+  return {
+    beginTime: data.beginTime,
+    childSystemName: data.childSystemName,
+    completeTime: data.completeTime,
+    cycle: data.cycle,
+    description: descripation,
+    id: data.id,
+    isDelete: data.isDelete,
+    isFinishi: data.isFinishi,
+    name: data.name,
+    pid: data.pid,
+    principalId: data.principalId,
+    principalUser: data.principalUser,
+    projectId: data.projectId,
+    status: '待完成',
+    type: data.type,
+    workLoad: data.workLoad
   }
-  
-  const multipleTableRef = ref<InstanceType<typeof ElTable>>();
-  const multipleSelection = ref<User[]>([]);
-  
-  const handleSelectionChange = (val: User[]) => {
-    multipleSelection.value = val;
-  };
+}
 
-  const input = ref('');
-  
-  const tableData: User[] = [
-    {
-      date: '2016-05-03',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-02',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-04',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-01',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
+//接口获取内容
+const fetchData = () => {
+  const project = getParticipateModuleList(SysId, getToken());
+  console.log(project);
+
+  project.then((res) => {
+    const data = res.data.data
+    console.log(data);
+
+    if (data) {
+      const newData = data.map((item) => parseData(item));
+      tableData.value = [...newData, ...tableData.value]
+      
+      
+      initialTableData.value = tableData.value.slice();
     }
-  
-  ];
-  
-  
-  </script>
-  <style>
-  .my-autocomplete li {
-      line-height: normal;
-      padding: 7px;
+  }).catch((err) => {
+    console.log(err);
+  });
+
+}
+
+fetchData();
+
+// 统一检索函数
+const search = () => {
+  const keyword = input1.value.trim().toLowerCase();
+  const status = input2.value.trim().toLowerCase();
+
+  // 如果搜索关键词和状态都为空，则恢复初始数据
+  if (keyword === '' && status === '') {
+    tableData.value = initialTableData.value.slice();
+    return;
   }
-  .my-autocomplete li .name {
-      text-overflow: ellipsis;
-      overflow: hidden;
-  }
-  .my-autocomplete li .addr {
-      font-size: 12px;
-      color: #b4b4b4;
-  }
-  .my-autocomplete li .highlighted .addr {
-      color: #ddd;
-  }
-  </style>
\ No newline at end of file
+
+  // 根据关键词和状态进行检索
+  tableData.value = initialTableData.value.filter(item => {
+    const matchKeyword = (keyword === '' || item.name.toLowerCase().includes(keyword));
+    const matchStatus = (status === '' || item.status.toLowerCase().includes(status));
+    return matchKeyword && matchStatus;
+  });
+};
+
+const input1 = ref('');
+const input2 = ref('');
+
+// 重置检索条件
+const reset = () => {
+  input1.value = '';
+  input2.value = '';
+  tableData.value = initialTableData.value.slice();  // 恢复初始数据
+};
+
+
+</script>
+<style>
+.my-autocomplete li {
+  line-height: normal;
+  padding: 7px;
+}
+
+.my-autocomplete li .name {
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.my-autocomplete li .addr {
+  font-size: 12px;
+  color: #b4b4b4;
+}
+
+.my-autocomplete li .highlighted .addr {
+  color: #ddd;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/project/detail/participate.vue b/src/views/personal/project/detail/participate.vue
index ddf88ad..c558f28 100644
--- a/src/views/personal/project/detail/participate.vue
+++ b/src/views/personal/project/detail/participate.vue
@@ -1,7 +1,7 @@
 <template>
     <div style=" width:100%;">
         <el-card style="max-width: 100vw;">
-            <template #header><strong>子模块1</strong></template>
+            <template #header><strong>子模块{{ id }}</strong></template>
 
 
         </el-card>
@@ -26,6 +26,7 @@
                                 <el-option label="未开始" value="未开始"></el-option>
                                 <el-option label="进行中" value="进行中"></el-option>
                                 <el-option label="已完成" value="已完成"></el-option>
+                                <el-option label="未知" value="未知"></el-option>
                                 <el-option label="异常暂停" value="异常暂停"></el-option>
                             </el-select>
                             <textarea style="resize: none;margin-top: 10%;width: 150px;" v-if="item.label === '07.简介'"
@@ -36,7 +37,10 @@
             </el-row>
 
         </el-card>
-       
+
+
+
+
 
 
 
@@ -45,7 +49,12 @@
 
 <script lang="ts" setup>
 
+import { getToken } from '@/utils/auth';
 import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { getParticipateDetail } from '@/api/participate';
+
+
 
 const projectItems = ref([
     { label: '01.模块名称', value: '名称1' },
@@ -54,11 +63,57 @@ const projectItems = ref([
     { label: '04.负责人', value: '张三' },
     { label: '05.状态', value: '进行中' },
     { label: '06.时间', value: '2024-01-01 12:00:00' },
-    { label: '07.简介', value: '大王iu大概iudg拍高端屁股的怕耽搁u对爬过文档爬过无' },
+    { label: '07.简介', value: '测试ing' },
 ]);
 
 const selectedStatus = ref('进行中');
 
+const route = useRoute();
+const id = route.query.ModId;
+
+//修改表单内数据
+const parseData = (data) => {
+
+
+    projectItems.value.forEach(item => {
+        if (item.label === '01.模块名称') {
+            item.value = data.name;
+        } else if (item.label === '02.模块周期') {
+            item.value = data.cycle ? data.cycle : '未知';
+        } else if (item.label === '03.工作量') {
+            item.value = data.workLoad + "人/天";
+        } else if (item.label === '04.负责人') {
+            item.value = data.principalUser;
+        } else if (item.label === '05.状态') {
+            item.value = data.status ? data.status : '未知';
+        } else if (item.label === '06.时间') {
+            item.value = data.deadLine ? data.deadLine : '2024-01-01 12:00:00';
+        } else if (item.label === '07.简介') {
+            item.value = data.description;
+        }
+    })
+}
+
+
+
+//接收接口数据
+
+const fetchData = () => {
+    const project = getParticipateDetail(id, getToken());
+
+
+    project.then(res => {
+        const data = res.data.data;
+        console.log(data);
+        if (data) {
+            parseData(data);
+        }
+    })
+
+}
+fetchData();
+
+
 
 
 
diff --git a/src/views/personal/project/participate.vue b/src/views/personal/project/participate.vue
index 7483a84..fd2094f 100644
--- a/src/views/personal/project/participate.vue
+++ b/src/views/personal/project/participate.vue
@@ -23,9 +23,9 @@
       </div>
       <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
         @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
+        <!-- <el-table-column type="selection" width="55" /> -->
         <el-table-column label="序号" width="120">
-          <template v-slot="{ $index }">{{ $index + 1 }}</template>
+          <template #default="{row}">{{ row.id }}</template>
         </el-table-column>
         <el-table-column property="name" label="项目名称" width="120" />
         <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
@@ -52,8 +52,11 @@
 
         <el-table-column property="description" label="项目简介" />
         <el-table-column property="deadline" label="截止时间" />
-        <el-table-column property="address" label="操作">
-          <el-button link style="color:deepskyblue" @click="toChildSystem">查看详情</el-button>
+        <el-table-column property="address" label="操作" #default="{ row }">
+          
+            <el-button link style="color:deepskyblue" @click="toChildSystem( row.id)">查看详情</el-button>
+          
+          
         </el-table-column>
       </el-table>
       <el-pagination larger background layout="prev, pager, next" :total="total" class="mt-4" :page-size="pageSize"
@@ -110,7 +113,7 @@ const tableData = ref<User[]>([
 
   },
   {
-    id: 4,
+    id: 2,
     cycle: 2,
     name: "项目2",
     description: "xxxxxxx",
@@ -177,8 +180,8 @@ const fetchData = () => {
 fetchData();
 
 // 处理路由跳转
-const toChildSystem = () => {
-  router.push({ name: 'ChildSysParticipate' });
+const toChildSystem = (id) => {
+  router.push({ name: 'ChildSysParticipate' ,query: { projectId: id } });
 };
 
 // 监听表格行选择事件
-- 
2.43.0


From a4f4b16881f9abc1250d5be3cd29d2f567805054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Thu, 18 Apr 2024 23:55:48 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E6=88=91=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=B7=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=92=8C=E5=87=A0=E4=B8=AA=E5=8A=9F=E8=83=BD=E5=92=8C?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/manage.js                             |  59 +++-
 .../personal/project/childSystem/manage.vue   | 139 ++++-----
 .../project/childSystem/participate.vue       |  11 +-
 .../personal/project/childmodel/manage.vue    | 288 ++++++++++--------
 .../project/childmodel/participate.vue        |  25 +-
 src/views/personal/project/detail/manage.vue  |  55 +++-
 .../personal/project/detail/participate.vue   |  10 +-
 src/views/personal/project/manage.vue         |  29 +-
 8 files changed, 393 insertions(+), 223 deletions(-)

diff --git a/src/api/manage.js b/src/api/manage.js
index d89dfa0..b09b6af 100644
--- a/src/api/manage.js
+++ b/src/api/manage.js
@@ -117,7 +117,7 @@ export const getManageProjectList = (token) => {
 
 
 /**
- * 获取我管理的页面的子模块项目列表(接口没数据)
+ * 获取我管理的页面的子模块项目列表
  * 
  * @param token 访问令牌
  * @returns {Promise<AxiosResponse<any>> | *}
@@ -134,6 +134,63 @@ export const getProjectList = (token) => {
 
     })
 }
+/**
+ * 获取我管理的页面的子系统项目列表
+ * @param projectId 项目id
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+export const getProjectSysList = (projectId,token) => {
+    return axios({
+        url: api +"/module/get?projectId=" + projectId ,
+        method: "get",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+        }
+
+
+    })
+}
+/**
+ * 获取我管理的页面的子模块项目列表(接口没数据)
+ * @param sysId 子系统id
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+export const getProjectModList = (sysId,token) => {
+    return axios({
+        url: api +"/module/get/min?sysId=" + sysId ,
+        method: "get",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+        }
+
+
+    })
+}
+/**
+ * 获取我管理的页面的子模块详细信息
+ * @param id 子模块id
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+export const getProjectModDetail = (id,token) => {
+    return axios({
+        url: api +"/project/module/id?id=" + id ,
+        method: "get",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+        }
+
+
+    })
+}
+
+
+
 
 
 
diff --git a/src/views/personal/project/childSystem/manage.vue b/src/views/personal/project/childSystem/manage.vue
index 73637c9..8ae5475 100644
--- a/src/views/personal/project/childSystem/manage.vue
+++ b/src/views/personal/project/childSystem/manage.vue
@@ -1,7 +1,7 @@
 <template>
   <div style=" width:100%">
     <el-card style="max-width: 100vw;margin: 1.5vw;">
-      <template #header><strong>项目1</strong></template>
+      <template #header><strong>项目{{ projectId }}</strong></template>
       <div style="display:flex;flex-direction:row;justify-content: space-around ">
         <div>
           名称
@@ -25,17 +25,22 @@
         @selection-change="handleSelectionChange">
         <!--                <el-table-column type="selection" width="55" />-->
         <el-table-column label="序号" width="120">
-          <template #default="scope">{{ scope.row.date }}</template>
+          <template #default="{row}">{{ row.id }}</template>
         </el-table-column>
         <el-table-column property="name" label="子系统名称" width="120" />
         <el-table-column property="cycle" label="工作量" show-overflow-tooltip />
-        <el-table-column property="address" label="周期" />
+        <el-table-column property="workLoad" label="周期" />
         <el-table-column property="address" label="负责人" />
         <el-table-column property="isFinish" label="状态" />
-        <el-table-column property="description" label="子系统简介" />
-        <el-table-column property="address" label="截止时间" />
-        <el-table-column property="address" label="操作">
-          <el-button link style="color:deepskyblue" @click="toChildModel">查看详情</el-button>
+        <el-table-column property="description" label="子系统简介"  >
+          <template #default="{row}">
+            <span >{{ row.description.description }}</span>
+          </template>
+            
+        </el-table-column>
+        <el-table-column property="createdAt" label="截止时间" />
+        <el-table-column property="address" label="操作" #default="{row}">
+          <el-button link style="color:deepskyblue" @click="toChildModel(row.id)">查看详情</el-button>
         </el-table-column>
       </el-table>
       <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
@@ -51,30 +56,29 @@
 import { ref } from 'vue';
 import { ElTable } from 'element-plus';
 import { useRouter } from 'vue-router';
-// import { searchModel } from '@/api/manage.js';
-// import { getToken } from '@/utils/auth';
+import { useRoute } from 'vue-router';
+import { getToken } from '@/utils/auth';
+import { getProjectSysList } from '@/api/manage';
 
 //跳转到子模块
 const router = useRouter();
 
-const toChildModel = () => {
-  router.push({ name: 'ChildModManage' })
+const toChildModel = (id) => {
+  router.push({ name: 'ChildModManage' , query: { id: id } })
 };
 
 const input = ref('');
 
 interface User {
-  cycle:number
-  description:string
-  isDelete:number
-  isFinish:number
-  name:string
-  principalId:number
-  projectId:number
-  status:boolean
-  type:number
-  workLoad:number
-  id:number
+    id: number
+    principalId: number
+    projectId: number
+    name: string
+    cycle: number
+    workLoad: number
+    description: { description: string }
+    isDelete: number
+    createdAt: string
 }
 
 const multipleTableRef = ref<InstanceType<typeof ElTable>>();
@@ -84,69 +88,68 @@ const handleSelectionChange = (val: User[]) => {
   multipleSelection.value = val;
 };
 
-//搜索子系统 
-//获取数据
+
 
 
 
 // console.log(searchSys);
 
 const tableData = ref<User[]>([
-  {
-    id: 1,
-    cycle: 1,
-    description: '子系统1',
-    isDelete: 0,
-    isFinish: 1,
-    name: '子系统1',
-    principalId: 1,
-    projectId: 1,
-    status: true,
-    type: 1,
-    workLoad: 1
-  }
+
 ]);
-//处理数据
-// searchSys.then(res => {
-//   const data = res.data.data;
-//   console.log(data);
-  
-//   if (data) {
-//     tableData.value = data.map(item =>{
-//       const addproject: User = {
-//         id: item.id,
-//         cycle: item.cycle,
-//         description: item.description,
-//         isDelete: item.isDelete,
-//         isFinish: item.isFinish,
-//         name: item.name,
-//         principalId: item.principalId,
-//         projectId: item.projectId,
-//         status: item.status,
-//         type: item.type,
-//         workLoad: item.workLoad
-//       };
+const initialTableData = ref<User[]>([]);
 
-//       tableData.value.push(addproject);
+// 获取projectid
+  const route = useRoute();
+  const projectId = route.query.id;
 
-//     }) 
+  //处理数据函数
+  const parseData = (data)=>{
+    const description = JSON.parse(data.description);
+
+    return{
+          id: data.id,
+          cycle: data.cycle,
+          description: description,
+          isDelete: data.isDelete,
+       
+          name: data.name,
+          principalId: data.principalId,
+          projectId: data.projectId,
+          workLoad: data.workLoad,
+          createdAt: data.createdAt
+    }
+  }
   
+  const fetchData = () => {
+    const project = getProjectSysList(projectId,getToken());
+
+    //处理数据
+    project.then(res=>{
+      const data = res.data.data
+
+      // console.log(data)
+      if(data){
+           const newData = data.map(item=>parseData(item))
+           console.log(newData);
+           
+           tableData.value = [...newData,...tableData.value];
+           initialTableData.value = tableData.value.slice();  // 将tableData的内容赋值给initialTableData
+
+      }
+      
+
+    })
+  }
+
+  fetchData();
       
       
    
     
       
 
-//     }else{
-//       console.log("没有数据");
-      
-//     }
-  
-//     console.log(tableData.value);
 
-// }).catch(err => {
-//   console.log(err);
-// });
 
 
 
diff --git a/src/views/personal/project/childSystem/participate.vue b/src/views/personal/project/childSystem/participate.vue
index f4a4c34..acb2f10 100644
--- a/src/views/personal/project/childSystem/participate.vue
+++ b/src/views/personal/project/childSystem/participate.vue
@@ -37,7 +37,7 @@
             <span>{{ row.description.description }}</span>
           </template>
         </el-table-column>
-        <el-table-column property="createdAt" label="创建时间" />
+        <el-table-column property="deadLine" label="截止时间" />
         <el-table-column property="address" label="操作" #default="{row}">
           <el-button link style="color:deepskyblue" @click="toChildModel(row.id)">查看详情</el-button>
         </el-table-column>
@@ -76,12 +76,13 @@ const toChildModel = (SysId: number) => {
 
 interface User {
   id: number
-  createdAt: string
+  
   cycle: number
   description: { description: string }
   isDeleted: number
   name: string
   principalId: number
+  deadLine: string
   projectId: number
   workLoad: number
   status: string
@@ -98,12 +99,10 @@ const handleSelectionChange = (val: User[]) => {
 const tableData = ref<User[]>([
   {
     id: 1,
-    createdAt: '2022-01-01',
+    deadLine: '2022-01-01',
     cycle: 1,
     description: { description: '子系统1的简介' },
     isDeleted: 0, 
-
- 
     name: '子系统1',
     principalId: 1,
     projectId: 1,
@@ -122,7 +121,7 @@ const parseData = (data) => {
 
   return {
     id: data.id,
-    createdAt: data.createdAt,
+    deadLine: data.deadLine,
     cycle: data.cycle,
     description: description,
     isDeleted: data.isDeleted,
diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue
index 7737559..828bfb3 100644
--- a/src/views/personal/project/childmodel/manage.vue
+++ b/src/views/personal/project/childmodel/manage.vue
@@ -1,143 +1,165 @@
 <template>
-    <div style=" width:100%">
-        <el-card style="max-width: 100vw;margin: 1.5vw;">
-          <template #header><strong >子系统1</strong></template>
-            <div style="display:flex;flex-direction:row;justify-content: space-around ">
-                <div>
-                    名称
-                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
-                </div>
-                <div>
-                    状态
-                    <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
-                </div>
-                <div>
-                  <el-button type="primary" style="width:80px">查询</el-button>
-                      <el-button style="width:80px">重置</el-button>
-                </div>
-            </div>
-        </el-card>
-        <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
-            <div style="display:flex;flex-direction: row;justify-content: space-between">
-                <el-button
-                        text
-                        type=''
-
-                >子模块列表</el-button
-                >
-                <div>
-                  <el-button type="primary" style="width:80px">新增</el-button>
-                      <el-button style="width:80px ;background-color: #bd3124;color: azure;">删除</el-button>
-                </div>
-            </div>
-            <el-table
-                    ref="multipleTableRef"
-                    :data="tableData"
-                    style="max-width: 100vw;"
-                    @selection-change="handleSelectionChange"
-            >
-                 <el-table-column type="selection" width="55" />
-                <el-table-column label="序号" width="120">
-                    <template #default="scope">{{ scope.row.date }}</template>
-                </el-table-column>
-                <el-table-column property="name" label="子模块名称" width="120" />
-                <el-table-column property="address" label="工作量" show-overflow-tooltip />
-                <el-table-column property="address" label="周期"  />
-                <el-table-column property="address" label="负责人"  />
-                <el-table-column property="address" label="状态"  />
-                <el-table-column property="address" label="子系统简介"  />
-                <el-table-column property="address" label="截止时间"  />
-                <el-table-column property="address" label="操作"  >
-                    <el-button
-                            link
-                            style="color:deepskyblue"
-                            @click="toDetail"
-                    >查看详情</el-button
-                    >
-                </el-table-column>
-            </el-table>
-            <el-pagination
-                    larger
-                    background
-                    layout="prev, pager, next"
-                    :total="50"
-                    class="mt-4"
-                    style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh"
-            />
-        </el-card>
-        <router-view/>
+  <div style=" width:100%">
+    <el-card style="max-width: 100vw;margin: 1.5vw;">
+      <template #header><strong>子系统{{ id }}</strong></template>
+      <div style="display:flex;flex-direction:row;justify-content: space-around ">
+        <div>
+          名称
+          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          状态
+          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+        </div>
+        <div>
+          <el-button type="primary" style="width:80px">查询</el-button>
+          <el-button style="width:80px">重置</el-button>
+        </div>
       </div>
-  </template>
+    </el-card>
+    <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
+      <div style="display:flex;flex-direction: row;justify-content: space-between">
+        <el-button text type=''>子模块列表</el-button>
+        <div>
+          <el-button type="primary" style="width:80px">新增</el-button>
+          <el-button style="width:80px ;background-color: #bd3124;color: azure;">删除</el-button>
+        </div>
+      </div>
+      <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" />
+        <el-table-column label="序号" width="120">
+          <template #default="{row}">{{row.id }}</template>
+        </el-table-column>
+        <el-table-column property="name" label="子模块名称" width="120" />
+        <el-table-column property="address" label="工作量" show-overflow-tooltip />
+        <el-table-column property="address" label="周期" />
+        <el-table-column property="principalUser" label="负责人" />
+        <el-table-column property="address" label="状态" />
+        <el-table-column property="address" label="子模块简介" #default="{row}" >
+            <span>{{row.description.description}}</span>
+        </el-table-column>  
+        <el-table-column property="address" label="截止时间" />
+        <el-table-column property="address" label="操作" #default="{row}">
+          <el-button link style="color:deepskyblue" @click="toDetail(row.id)">查看详情</el-button>
+        </el-table-column>
+      </el-table>
+      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
+        style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
+    </el-card>
+    <router-view />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { ElTable } from 'element-plus';
+import { getProjectModList } from '@/api/manage';
+import { useRouter ,useRoute} from 'vue-router';
+import { getToken } from '@/utils/auth';
+
+
+
+const router = useRouter();
+
+// 路由跳转
+const toDetail = (id) => {
+  router.push({ name: 'ManageDetail' ,query: { id: id } }); // 跳转到子系统详情页面
+};
+
+interface User {
+  id: number
+  name: string
+  principalId: number
+  principalUser:string
+  workLoad: number
+  description: { description: string }
+  status: boolean
+}
+
+const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+const multipleSelection = ref<User[]>([]);
+
+const handleSelectionChange = (val: User[]) => {
+  multipleSelection.value = val;
+};
+
+const input = ref('');
+
+const initialTableData = ref<User[]>([]);
+const tableData = ref<User[]>([
+ 
+]) ;
   
-  <script lang="ts" setup>
-  import { ref } from 'vue';
-  import { ElTable } from 'element-plus';
-
-  import { useRouter } from 'vue-router';
 
 
-  const router = useRouter();
 
-  // 路由跳转
-  const toDetail = () => {
-    router.push({ name: 'ManageDetail' }); // 跳转到子系统详情页面
-  };
+//获取参数
+const route = useRoute();
+const id = route.query.id;
 
-  interface User {
-      date: string
-      name: string
-      address: string
+
+//处理接口方法
+const parseData = (data) => {
+    const description = JSON.parse(data.description);
+
+
+  return{
+      id: data.id,
+      name: data.name,
+      principalId: data.principalId,
+      principalUser: data.principalUser,
+      workLoad: data.workLoad,
+      description: description,
+      status: data.status
   }
-  
-  const multipleTableRef = ref<InstanceType<typeof ElTable>>();
-  const multipleSelection = ref<User[]>([]);
-  
-  const handleSelectionChange = (val: User[]) => {
-    multipleSelection.value = val;
-  };
 
-  const input = ref('');
+}
+
+//接口处理
+const fetchData = ()=>{
+  //请求数据
+  const project = getProjectModList(3,getToken());
+  console.log(project);
+  //处理数据
+  project.then(res=>{
+    const data = res.data.data;
+    
+    if(data){
+           const newData = data.map(item=>parseData(item))
+          //  console.log(newData);
+           
+           tableData.value = [...newData,...tableData.value];
+           initialTableData.value = tableData.value.slice();  // 将tableData的内容赋值给initialTableData
+
+      }
+  }).catch(err=>{
+    console.log(err);
+  })
   
-  const tableData: User[] = [
-    {
-      date: '2016-05-03',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-02',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-04',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    },
-    {
-      date: '2016-05-01',
-      name: 'Tom',
-      address: 'No. 189, Grove St, Los Angeles'
-    }
-  
-  ];
-  
-  
-  </script>
-  <style>
-  .my-autocomplete li {
-      line-height: normal;
-      padding: 7px;
-  }
-  .my-autocomplete li .name {
-      text-overflow: ellipsis;
-      overflow: hidden;
-  }
-  .my-autocomplete li .addr {
-      font-size: 12px;
-      color: #b4b4b4;
-  }
-  .my-autocomplete li .highlighted .addr {
-      color: #ddd;
-  }
-  </style>
\ No newline at end of file
+}
+fetchData();
+
+
+
+</script>
+<style>
+.my-autocomplete li {
+  line-height: normal;
+  padding: 7px;
+}
+
+.my-autocomplete li .name {
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.my-autocomplete li .addr {
+  font-size: 12px;
+  color: #b4b4b4;
+}
+
+.my-autocomplete li .highlighted .addr {
+  color: #ddd;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/project/childmodel/participate.vue b/src/views/personal/project/childmodel/participate.vue
index 79df9cb..ba6a044 100644
--- a/src/views/personal/project/childmodel/participate.vue
+++ b/src/views/personal/project/childmodel/participate.vue
@@ -30,7 +30,7 @@
         </el-table-column>
         <el-table-column property="name" label="子模块名称" width="120" />
         <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
-        <el-table-column property="address" label="周期" />
+        <el-table-column property="cycle" label="周期" />
         <el-table-column property="principalUser" label="负责人" />
         <el-table-column property="status" label="状态" />
         <el-table-column property="description" label="子模块简介" #default="{ row }">
@@ -96,7 +96,28 @@ const handleSelectionChange = (val: User[]) => {
 
 
 //列表
-const tableData = ref<User[]>([]);
+const tableData = ref<User[]>([
+  {
+    beginTime: '2021-11-11',
+    childSystemName: '子系统1',
+    completeTime: '2021-11-11',
+    cycle: "10tian",
+    description: { description: '子系统1描述' },
+    id: 1,
+    isDelete: 0,
+    isFinishi: '否',
+    name: '子模块1',
+    pid: '1',
+    principalId: 1,
+    principalUser: '负责人1',
+    projectId: 1,
+    status: '待完成',
+    type: '子系统',
+    workLoad: 10
+  }
+  
+
+]);
 const initialTableData = ref<User[]>([]);
 const parseData = (data) => {
   const descripation = JSON.parse(data.description);
diff --git a/src/views/personal/project/detail/manage.vue b/src/views/personal/project/detail/manage.vue
index 32976ff..d74863c 100644
--- a/src/views/personal/project/detail/manage.vue
+++ b/src/views/personal/project/detail/manage.vue
@@ -1,7 +1,7 @@
 <template>
     <div style=" width:100%;">
         <el-card style="max-width: 100vw;">
-            <template #header><strong>子模块1</strong></template>
+            <template #header><strong>子模块{{ projectId }}</strong></template>
 
 
         </el-card>
@@ -52,6 +52,9 @@
 <script lang="ts" setup>
 
 import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { getProjectModDetail } from '@/api/manage';
+import { getToken } from '@/utils/auth';
 
 const projectItems = ref([
     { label: '01.模块名称', value: '项目名称1' },
@@ -65,6 +68,56 @@ const projectItems = ref([
 
 const selectedStatus = ref('进行中');
 
+const route = useRoute();
+const projectId = route.query.id;
+
+//修改时间方法
+function renderTime(date) {
+        var dateee = new Date(date).toJSON();
+        return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
+    }
+
+//加载数据
+//修改表单内数据
+const parseData = (data) => {
+
+
+projectItems.value.forEach(item => {
+    if (item.label === '01.模块名称') {
+        item.value = data.name;
+    } else if (item.label === '02.模块周期') {
+        item.value = data.cycle ? data.cycle : '未知';
+    } else if (item.label === '03.工作量') {
+        item.value = data.workLoad + "人/天";
+    } else if (item.label === '04.负责人') {
+        item.value = data.principalUser;
+    } else if (item.label === '05.状态') {
+        item.value = data.status ? data.status : '未知';
+    } else if (item.label === '06.时间') {
+        item.value = renderTime(data.deadLine) ? data.deadLine : '2024-01-01 12:00:00';
+    } else if (item.label === '07.简介') {
+        item.value = data.description;
+    }
+})
+}
+
+//获取数据方法
+const fetchData = () => {
+    const project = getProjectModDetail(projectId, getToken());
+
+
+    project.then(res => {
+        const data = res.data.data;
+        console.log(data);
+        if (data) {
+            parseData(data);
+        }
+    })
+
+}
+
+fetchData();
+
 
 
 
diff --git a/src/views/personal/project/detail/participate.vue b/src/views/personal/project/detail/participate.vue
index c558f28..d08edfd 100644
--- a/src/views/personal/project/detail/participate.vue
+++ b/src/views/personal/project/detail/participate.vue
@@ -37,7 +37,10 @@
             </el-row>
 
         </el-card>
-
+        <div style="display: flex;justify-content: center;">
+            <el-button style="width: 80px;background-color: #409eff;color: azure" @click="toBack" >完成</el-button>
+        </div>
+        
 
 
 
@@ -113,7 +116,10 @@ const fetchData = () => {
 }
 fetchData();
 
-
+//完成返回上一级
+const toBack = () => {
+    window.history.go(-1);
+}
 
 
 
diff --git a/src/views/personal/project/manage.vue b/src/views/personal/project/manage.vue
index bb3fd1b..ea69913 100644
--- a/src/views/personal/project/manage.vue
+++ b/src/views/personal/project/manage.vue
@@ -16,11 +16,18 @@
           <el-button style="width:80px">重置</el-button>
         </div>
       </div>
+
     </el-card>
+
     <el-card style="max-width: 100vw;height:60vh;margin:1.3vw">
       <div style="display:flex;flex-direction: row;justify-content: space-between">
         <el-button text type=''>项目列表</el-button>
+        <div style="text-align: right;">
+          <el-button type="primary" style="width:80px">新增</el-button>
+          <el-button style="width:80px ;background-color: #bd3124;color: azure;">删除</el-button>
+        </div>
       </div>
+
       <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
         @selection-change="handleSelectionChange">
         <!--                <el-table-column type="selection" width="55" />-->
@@ -43,14 +50,14 @@
             <span v-for="(tag, index) in row.tags" :key="index">{{ tag.toString() }} </span>
           </template>
         </el-table-column>
-        <el-table-column property="description" label="项目简介" >
-          <template v-slot="{row}">
+        <el-table-column property="description" label="项目简介">
+          <template v-slot="{ row }">
             <span v-for="(des, index) in row.description" :key="index">{{ des.toString() }} </span>
           </template>
         </el-table-column>
         <el-table-column property="dateline" label="截止时间" />
-        <el-table-column property="name" label="操作">
-          <el-button link style="color:deepskyblue" @click="toChildSystem">查看详情</el-button>
+        <el-table-column property="name" label="操作" #default="{row}">
+          <el-button link style="color:deepskyblue" @click="toChildSystem(row.id)">查看详情</el-button>
         </el-table-column>
       </el-table>
       <el-pagination larger background layout="prev, pager, next" :total="40" class="mt-4"
@@ -64,7 +71,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref ,onMounted} from 'vue';
+import { ref, onMounted } from 'vue';
 import { ElTable } from 'element-plus';
 import { getManageListById } from '@/api/manage.js';
 import { getToken } from '@/utils/auth';
@@ -76,8 +83,8 @@ import { getManageList } from '@/api/manage.js';
 const router = useRouter();
 
 // 路由跳转
-const toChildSystem = () => {
-  router.push({ name: 'ChildSysManage' }); // 跳转到子系统详情页面
+const toChildSystem = (id) => {
+  router.push({ name: 'ChildSysManage' ,query: { id: id } }); // 跳转到子系统详情页面
 };
 
 //页面加载直接获取数据
@@ -110,7 +117,7 @@ interface User {
 
 }
 
-// 数组转出
+
 
 
 
@@ -122,7 +129,9 @@ const input2 = ref('');
 
 
 const multipleTableRef = ref<InstanceType<typeof ElTable>>();
-const multipleSelection = ref<User[]>([]);
+const multipleSelection = ref<User[]>([
+
+]);
 
 const handleSelectionChange = (val: User[]) => {
   multipleSelection.value = val;
@@ -136,7 +145,7 @@ const parseData = (data) => {
 
   return {
     id: data.id,
-    total:20,
+    total: 20,
     cycle: data.cycle,
     name: data.name,
     description: description,
-- 
2.43.0


From f9232ae6d08c225984fc28476b6485ba2ab62e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Fri, 19 Apr 2024 18:23:11 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E6=88=91=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto-imports.d.ts                             |   1 +
 src/api/manage.js                             |  84 +++---
 src/utils/validate.ts                         |   2 +-
 src/views/login/index.vue                     |   4 +-
 .../personal/project/childSystem/manage.vue   |  59 ++--
 .../project/childSystem/participate.vue       |  10 +-
 .../personal/project/childmodel/manage.vue    |  27 +-
 src/views/personal/project/manage.vue         | 259 ++++++++++++------
 8 files changed, 281 insertions(+), 165 deletions(-)

diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 8139ac9..24e619c 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -2,4 +2,5 @@
 export {}
 declare global {
   const ElMessage: typeof import('element-plus/es')['ElMessage']
+  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
 }
diff --git a/src/api/manage.js b/src/api/manage.js
index b09b6af..94ba1e7 100644
--- a/src/api/manage.js
+++ b/src/api/manage.js
@@ -50,16 +50,18 @@ export const getproject = (projectId, token) => {
 /**
  * 获取我管理页面的项目列表(接口有问题)
  * 
+ * @param pageSize 页面大小
  * @param token 访问令牌
  * @returns {Promise<AxiosResponse<any>> | *}
  */
-export const getManageList = (token) => {
+export const getManageList = (params ,token ,) => {
+
+    const {pageSize ,is ,page} = params;
     return axios({
-        url: api +"/project/child/get" ,
+        url:  `${api}/project/child/get?is=${is}&pageSize=${pageSize}&page=${page}` ,
         method: "get",
         headers: {
             'Authorization': 'Bearer ' + token,
-           
             'Timestamp': getCurrentTimestamp()
             
 
@@ -72,25 +74,7 @@ export const getManageList = (token) => {
 // 我管理的所有接口
 
 
-/**
- * 获取我管理的页面的搜索
- * 
- * @param projectId 项目id
- * @param token 访问令牌
- * @returns {Promise<AxiosResponse<any>> | *}
- */
-export const getManageListById = (projectId, token) => {
-    return axios({
-        url: api +'/project/get/' + projectId,
-        method: "get",
-        headers: {
-            'Authorization': 'Bearer ' + token,
-            'Timestamp': getCurrentTimestamp()
-        }
 
-    })
-
-}
 /**
  * 获取我管理的页面的项目列表
  * 
@@ -116,24 +100,6 @@ export const getManageProjectList = (token) => {
 
 
 
-/**
- * 获取我管理的页面的子模块项目列表
- * 
- * @param token 访问令牌
- * @returns {Promise<AxiosResponse<any>> | *}
- */
-export const getProjectList = (token) => {
-    return axios({
-        url: api +"/project/module/get" ,
-        method: "get",
-        headers: {
-            'Authorization': 'Bearer ' + token,
-            'Timestamp': getCurrentTimestamp()
-        }
-
-
-    })
-}
 /**
  * 获取我管理的页面的子系统项目列表
  * @param projectId 项目id
@@ -188,6 +154,46 @@ export const getProjectModDetail = (id,token) => {
 
     })
 }
+//功能接口
+
+
+//删除项目
+
+/**
+ * 选择项目删除
+ * @param id 项目id
+ * @param token 访问令牌
+ * @returns {Promise<AxiosResponse<any>> | *}
+ */
+export const deleteProject = (id,token) => {
+    return axios({
+        url: api +"/project/delete?id=" + id ,
+        method: "delete",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+        }
+
+
+    })
+}
+// 添加项目接口
+/**
+ * 添加项目
+ * @param data 要添加的项目数据
+ * @returns {Promise<AxiosResponse<any>>} 返回API响应
+ */
+export const addProject = (data ,token) => {
+    return axios({
+      url: api + "/project/add", // 替换为实际的项目API端点
+      method: "post", // 使用POST方法添加项目
+      headers: {
+        'Authorization': 'Bearer ' + token,
+        'Timestamp': getCurrentTimestamp()
+      },
+      data: data  // 将要添加的项目数据传递给API
+    });
+  }
 
 
 
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index da6633c..a7b4833 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -15,7 +15,7 @@ export function isExternal(path) {
  * @returns {Boolean}
  */
 export function validUsername(str) {
-  const valid_map = ['admin', 'editor', 'teacher_user', 'teacher_demo', 'demo', 'xiao_lfeng', 'yangna'];
+  const valid_map = ['console_user', 'developer_user', 'principal_user'];
   return valid_map.indexOf(str.trim()) >= 0;
 }
 
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 7f54039..9e33c0e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -113,8 +113,8 @@ export default defineComponent({
     };
     return {
       loginForm: {
-        username: 'teacher_user',
-        password: '123456'
+        username: 'principal_user',
+        password: 'jsl_nbxt'
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', validator: validateUsername }],
diff --git a/src/views/personal/project/childSystem/manage.vue b/src/views/personal/project/childSystem/manage.vue
index 8ae5475..08fc903 100644
--- a/src/views/personal/project/childSystem/manage.vue
+++ b/src/views/personal/project/childSystem/manage.vue
@@ -28,17 +28,17 @@
           <template #default="{row}">{{ row.id }}</template>
         </el-table-column>
         <el-table-column property="name" label="子系统名称" width="120" />
-        <el-table-column property="cycle" label="工作量" show-overflow-tooltip />
-        <el-table-column property="workLoad" label="周期" />
-        <el-table-column property="address" label="负责人" />
-        <el-table-column property="isFinish" label="状态" />
+        <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
+        <el-table-column property="cycle" label="周期" />
+        <el-table-column property="principalName" label="负责人" />
+        <el-table-column property="status" label="状态" />
         <el-table-column property="description" label="子系统简介"  >
           <template #default="{row}">
             <span >{{ row.description.description }}</span>
           </template>
             
         </el-table-column>
-        <el-table-column property="createdAt" label="截止时间" />
+        <el-table-column property="deadLine" label="截止时间" />
         <el-table-column property="address" label="操作" #default="{row}">
           <el-button link style="color:deepskyblue" @click="toChildModel(row.id)">查看详情</el-button>
         </el-table-column>
@@ -64,21 +64,22 @@ import { getProjectSysList } from '@/api/manage';
 const router = useRouter();
 
 const toChildModel = (id) => {
-  router.push({ name: 'ChildModManage' , query: { id: id } })
+  router.push({ name: 'ChildModManage' , query: { id: 3 } })
 };
 
 const input = ref('');
 
 interface User {
-    id: number
-    principalId: number
-    projectId: number
-    name: string
-    cycle: number
-    workLoad: number
-    description: { description: string }
-    isDelete: number
-    createdAt: string
+    cycle:number
+    deadLine:string
+    description: {description :string}
+    id:number
+    isDelete:number
+    name:string
+    principalName:string
+    projectId:number
+    status:string
+    workLoad:number
 }
 
 const multipleTableRef = ref<InstanceType<typeof ElTable>>();
@@ -108,27 +109,29 @@ const initialTableData = ref<User[]>([]);
     const description = JSON.parse(data.description);
 
     return{
-          id: data.id,
-          cycle: data.cycle,
-          description: description,
-          isDelete: data.isDelete,
-       
-          name: data.name,
-          principalId: data.principalId,
-          projectId: data.projectId,
-          workLoad: data.workLoad,
-          createdAt: data.createdAt
+            cycle:data.cycle,
+            deadLine:data.deadLine,
+            description:description,
+            id:data.id,
+            isDelete:data.isDelete,
+            name:data.name,
+            principalName:data.principalName,
+            projectId:data.projectId,
+            status:data.status,
+            workLoad:data.workLoad,
     }
   }
   
   const fetchData = () => {
-    const project = getProjectSysList(projectId,getToken());
+    
+    const project = getProjectSysList( projectId ? Number(projectId) - 1 : 0,getToken());
 
     //处理数据
     project.then(res=>{
       const data = res.data.data
-
-      // console.log(data)
+      console.log(data);
+      
+      
       if(data){
            const newData = data.map(item=>parseData(item))
            console.log(newData);
diff --git a/src/views/personal/project/childSystem/participate.vue b/src/views/personal/project/childSystem/participate.vue
index acb2f10..444657a 100644
--- a/src/views/personal/project/childSystem/participate.vue
+++ b/src/views/personal/project/childSystem/participate.vue
@@ -30,7 +30,7 @@
         <el-table-column property="name" label="子系统名称" width="120" />
         <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
         <el-table-column property="cycle" label="周期" />
-        <el-table-column property="principalUser" label="负责人" />
+        <el-table-column property="principalName" label="负责人" />
         <el-table-column property="status" label="状态" />
         <el-table-column property="description" label="子系统简介">
           <template #default="{ row }">
@@ -86,7 +86,7 @@ interface User {
   projectId: number
   workLoad: number
   status: string
-  principalUser:string
+  principalName:string
 }
 
 const multipleTableRef = ref<InstanceType<typeof ElTable>>();
@@ -108,7 +108,7 @@ const tableData = ref<User[]>([
     projectId: 1,
     workLoad: 1,
     status: '待定',
-    principalUser: '等数据ing'
+    principalName: '测试数据'
   }
 ]);
 const initialTableData = ref<User[]>([]);
@@ -129,8 +129,8 @@ const parseData = (data) => {
     principalId: data.principalId,
     projectId: data.projectId,
     workLoad: data.workLoad,
-    status:"待定",
-    principalUser:"等数据ing"
+    status:data.status,
+    principalName:data.principalName
   }
 }
 
diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue
index 828bfb3..0f17115 100644
--- a/src/views/personal/project/childmodel/manage.vue
+++ b/src/views/personal/project/childmodel/manage.vue
@@ -1,7 +1,7 @@
 <template>
   <div style=" width:100%">
     <el-card style="max-width: 100vw;margin: 1.5vw;">
-      <template #header><strong>子系统{{ id }}</strong></template>
+      <template #header><strong>子系统{{ sysId }}</strong></template>
       <div style="display:flex;flex-direction:row;justify-content: space-around ">
         <div>
           名称
@@ -22,7 +22,7 @@
         <el-button text type=''>子模块列表</el-button>
         <div>
           <el-button type="primary" style="width:80px">新增</el-button>
-          <el-button style="width:80px ;background-color: #bd3124;color: azure;">删除</el-button>
+          
         </div>
       </div>
       <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
@@ -32,14 +32,14 @@
           <template #default="{row}">{{row.id }}</template>
         </el-table-column>
         <el-table-column property="name" label="子模块名称" width="120" />
-        <el-table-column property="address" label="工作量" show-overflow-tooltip />
-        <el-table-column property="address" label="周期" />
+        <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
+        <el-table-column property="cycle" label="周期" />
         <el-table-column property="principalUser" label="负责人" />
-        <el-table-column property="address" label="状态" />
-        <el-table-column property="address" label="子模块简介" #default="{row}" >
+        <el-table-column property="status" label="状态" />
+        <el-table-column property="description" label="子模块简介" #default="{row}" >
             <span>{{row.description.description}}</span>
         </el-table-column>  
-        <el-table-column property="address" label="截止时间" />
+        <el-table-column property="deadLine" label="截止时间" />
         <el-table-column property="address" label="操作" #default="{row}">
           <el-button link style="color:deepskyblue" @click="toDetail(row.id)">查看详情</el-button>
         </el-table-column>
@@ -62,6 +62,8 @@ import { getToken } from '@/utils/auth';
 
 const router = useRouter();
 
+
+
 // 路由跳转
 const toDetail = (id) => {
   router.push({ name: 'ManageDetail' ,query: { id: id } }); // 跳转到子系统详情页面
@@ -74,7 +76,8 @@ interface User {
   principalUser:string
   workLoad: number
   description: { description: string }
-  status: boolean
+  status: string
+  deadLine: string
 }
 
 const multipleTableRef = ref<InstanceType<typeof ElTable>>();
@@ -96,7 +99,7 @@ const tableData = ref<User[]>([
 
 //获取参数
 const route = useRoute();
-const id = route.query.id;
+const sysId = route.query.id;
 
 
 //处理接口方法
@@ -111,7 +114,9 @@ const parseData = (data) => {
       principalUser: data.principalUser,
       workLoad: data.workLoad,
       description: description,
-      status: data.status
+      status: data.status,
+      deadLine: data.deadLine,
+
   }
 
 }
@@ -119,7 +124,7 @@ const parseData = (data) => {
 //接口处理
 const fetchData = ()=>{
   //请求数据
-  const project = getProjectModList(3,getToken());
+  const project = getProjectModList(sysId,getToken());
   console.log(project);
   //处理数据
   project.then(res=>{
diff --git a/src/views/personal/project/manage.vue b/src/views/personal/project/manage.vue
index ea69913..7be040b 100644
--- a/src/views/personal/project/manage.vue
+++ b/src/views/personal/project/manage.vue
@@ -12,7 +12,7 @@
           <el-input v-model="input2" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
         </div>
         <div>
-          <el-button type="primary" style="width:80px" @click="search">查询</el-button>
+          <el-button type="primary" style="width:80px">查询</el-button>
           <el-button style="width:80px">重置</el-button>
         </div>
       </div>
@@ -23,31 +23,40 @@
       <div style="display:flex;flex-direction: row;justify-content: space-between">
         <el-button text type=''>项目列表</el-button>
         <div style="text-align: right;">
-          <el-button type="primary" style="width:80px">新增</el-button>
-          <el-button style="width:80px ;background-color: #bd3124;color: azure;">删除</el-button>
+          <el-button type="primary" style="width:80px" >编辑</el-button>
+          <el-button style="width:80px ;background-color: #bd3124;color: azure;"
+            @click="handleDeleteProjects">删除</el-button>
         </div>
       </div>
 
       <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
         @selection-change="handleSelectionChange">
-        <!--                <el-table-column type="selection" width="55" />-->
+        <el-table-column type="selection" width="55" />
         <el-table-column label="序号" width="120">
-          <template v-slot="{ $index }">{{ $index + 1 }}</template>
+          <template #default="{ row }">{{ row.id }}</template>
         </el-table-column>
         <el-table-column property="name" label="项目名称" width="120" />
         <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
         <el-table-column property="cycle" label="周期" />
         <el-table-column property="principalUser" label="负责人" />
-        <el-table-column property="isFinish" label="状态" />
+        <el-table-column property="status" label="状态" />
 
 
         <el-table-column property="isFinish" label="文档（点击下载）">
-          <el-button link style="color:deepskyblue">接口文档</el-button>
-          <el-button link style="color:deepskyblue">需求文档</el-button>
+          <template #default="{ row }">
+            <template v-if="row.files && row.files.URI">
+              <a :href="row.files.URI" target="_blank" style="color: deepskyblue">
+                下载文档
+              </a>
+            </template>
+            <template v-else>
+              无
+            </template>
+          </template>
         </el-table-column>
         <el-table-column property="tags" label="标签">
-          <template v-slot="{ row }">
-            <span v-for="(tag, index) in row.tags" :key="index">{{ tag.toString() }} </span>
+          <template #default="{ row }">
+            <el-tag v-for="tag in row.tags" :key="tag">{{ tag.toString() }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column property="description" label="项目简介">
@@ -55,14 +64,16 @@
             <span v-for="(des, index) in row.description" :key="index">{{ des.toString() }} </span>
           </template>
         </el-table-column>
-        <el-table-column property="dateline" label="截止时间" />
-        <el-table-column property="name" label="操作" #default="{row}">
+        <el-table-column property="deadLine" label="截止时间" />
+        <el-table-column property="name" label="操作" #default="{ row }">
           <el-button link style="color:deepskyblue" @click="toChildSystem(row.id)">查看详情</el-button>
         </el-table-column>
       </el-table>
-      <el-pagination larger background layout="prev, pager, next" :total="40" class="mt-4"
+      <el-pagination larger background layout="prev, pager, next" @current-change="handleCurrentChange"
+        :current-page="currentPage" :page-size="pageSize" :total="total"
         style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
     </el-card>
+    
     <el-alert>
       <router-view />
     </el-alert>
@@ -71,27 +82,33 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted } from 'vue';
-import { ElTable } from 'element-plus';
-import { getManageListById } from '@/api/manage.js';
+import { ref, watch } from 'vue';
+import { ElTable, ElTableColumn, ElPagination, ElButton, ElInput, ElTag, ElMessageBox, ElMessage } from 'element-plus';
 import { getToken } from '@/utils/auth';
 import { useRouter } from 'vue-router';
-import { getManageList } from '@/api/manage.js';
+import { getManageList, deleteProject } from '@/api/manage.js';
+
 
 
 
 const router = useRouter();
 
+const pageSize = ref(5); // 每页显示的条数
+const currentPage = ref(1); // 当前页数
+const total = ref(10); // 总条数
+
+
+
+
 // 路由跳转
 const toChildSystem = (id) => {
-  router.push({ name: 'ChildSysManage' ,query: { id: id } }); // 跳转到子系统详情页面
+  router.push({ name: 'ChildSysManage', query: { id: 2 } }); // 跳转到子系统详情页面
 };
 
-//页面加载直接获取数据
-onMounted(() => {
-  getAllProject();
-});
+//响应式
+const tableData = ref<User[]>([]);
 
+const selectedIds = ref([]); // 存储被选中的项目的ID
 
 
 
@@ -99,21 +116,16 @@ onMounted(() => {
 
 interface User {
   id: number
-  total: number
   cycle: number
   name: string
-  description: Array<any>
+  description: string
   workLoad: number
   status: string
-  deadline: string
+  deadLine: string
   tags: Array<any>
   files: Array<any>
-  isDelete: boolean
-  principal_id: number
-  updatedAt: string
-  createdAt: string
-  completeTime: string
-  beginTime: string
+  principalUser: string
+
 
 }
 
@@ -128,49 +140,58 @@ const input1 = ref('');
 const input2 = ref('');
 
 
-const multipleTableRef = ref<InstanceType<typeof ElTable>>();
-const multipleSelection = ref<User[]>([
+// const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+// const multipleSelection = ref<User[]>([
 
-]);
+// ]);
 
-const handleSelectionChange = (val: User[]) => {
-  multipleSelection.value = val;
-};
+// const handleSelectionChange = (val: User[]) => {
+//   multipleSelection.value = val;
+// };
 
 // 在 Vue 组件中添加 parseData 函数
 const parseData = (data) => {
-  const description = JSON.parse(data.description);
+
   const files = JSON.parse(data.files);
   const tags = JSON.parse(data.tags);
 
   return {
     id: data.id,
-    total: 20,
     cycle: data.cycle,
     name: data.name,
-    description: description,
+    description: data.description,
     workLoad: data.workLoad,
     status: data.status,
-    deadline: data.deadline,
+    deadLine: data.deadLine,
     tags: tags,
     files: files,
-    isDelete: data.isDelete,
-    principal_id: data.principalId,
-    updatedAt: data.updatedAt,
-    createdAt: data.createdAt,
-    completeTime: data.completeTime,
-    beginTime: data.beginTime
+    principalUser: data.principalUser
   };
 };
 
+
+// 监听 currentPage 的变化，当 currentPage 变化时请求对应页的数据
+watch(currentPage, () => {
+  fetchData();
+});
+
 //获取所有项目
-const getAllProject = () => {
-  const project = getManageList(getToken());
+const fetchData = () => {
+
+  const params = {
+    page: currentPage.value, // 当前页码
+    pageSize: pageSize.value, // 每页显示的条数
+    is: 1
+
+  };
+
+  const project = getManageList(params, getToken());
+
 
 
   // 处理接口数据 
   project.then(res => {
-    const data = res.data.data;
+    const data = res.data.data.list;
     console.log(data);
     if (data) {
       const newData = data.map(item => parseData(item)); // 使用先前定义的函数处理数据
@@ -189,44 +210,68 @@ const getAllProject = () => {
     });
 }
 
+fetchData();
 
-// 查询
-const search = () => {
-  //获取数据
-  const project = getManageListById(input1.value, getToken());
 
-  // 处理接口数据 
-  project.then(res => {
+//翻页处理
+// 翻页事件处理函数
+const handleCurrentChange = (page) => {
+  currentPage.value = page; // 更新 currentPage 的值
+};
 
-    const data = res.data.data;
-    console.log(data);
-    if (data) {
-      const newData = parseData(data); // 使用先前定义的函数处理数据
-      // 使用 tableData.value 进行添加
 
-      tableData.value.push(newData);
-      console.log(tableData.value);
+// 删除项目
+// 这个方法将在表格的选择项发生变化时被调用
+const handleSelectionChange = (selection) => {
+  selectedIds.value = selection.map(item => item.id); // 更新被选择的项目的ID数组
+};
 
-    } else {
-      console.log("没有数据");
+
+
+// 弹窗设置
+
+const confirmDelete = (selectedIds) => {
+  const message = `确定要删除ID为${selectedIds}的项目吗？`;
+
+  ElMessageBox.confirm(
+    message, {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    // type: 'warning',
+    center: true,
+  }).then(async () => {
+    const token = getToken();
+    for (let id of selectedIds) {
+      await deleteProject(id, token)
+        .then(() => {
+          console.log("项目删除成功", id);
+          fetchData();
+          ElMessage.success('项目删除成功');
+        })
+        .catch(error => {
+          console.error("删除失败", error);
+          ElMessage.error('删除操作失败');
+        });
     }
-  })
-    .catch(err => {
-      console.log(err);
+  }).catch(() => {
+    ElMessage.info('删除操作已取消');
+  });
+};
+
+const handleDeleteProjects = async () => {
+  if (selectedIds.value.length === 0) {
+    ElMessage({
+      message: '请选择一个进行删除',
+      type: 'warning',
+      duration: 3000
     });
+    return;
+  }
 
-}
-
-
-//响应式
-const tableData = ref<User[]>([
-  //测试用例
-
-
-
-
-]);
+  confirmDelete(selectedIds.value);
+};
 
+//编辑功能 
 
 
 
@@ -259,4 +304,60 @@ const tableData = ref<User[]>([
 .my-autocomplete li .highlighted .addr {
   color: #ddd;
 }
+
+/* 自定义弹窗样式 */
+.el-message-box {
+  background-color: #fff;
+  /* 设置背景颜色 */
+  border: 2px solid #eee;
+  /* 设置边框样式 */
+  border-radius: 8px;
+  /* 设置边框圆角 */
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  /* 添加阴影效果 */
+}
+
+.el-message-box__message {
+  color: #333;
+  /* 设置文本颜色 */
+}
+
+.el-message-box__btns {
+  display: flex;
+  justify-content: space-around;
+  /* 设置按钮水平居中 */
+}
+
+
+.el-message-box {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  /* 垂直居中 */
+  align-items: center;
+  /* 水平居中 */
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.el-message-box__message {
+  margin-bottom: 20px;
+  /* 设置文字与按钮之间的距离 */
+}
+
+.el-message-box__btns {
+  display: flex;
+  justify-content: center;
+  /* 水平居中 */
+  gap: 10px;
+  /* 设置按钮间隔 */
+}
+
+.el-message-box__close {
+  display: none;
+  /* 隐藏默认关闭按钮 */
+
+}
 </style>
\ No newline at end of file
-- 
2.43.0


From e4b4d43c860e32a4b954f8f77cf68ac934a93f83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Fri, 19 Apr 2024 18:40:10 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/personal/project/childSystem/manage.vue      | 4 +++-
 src/views/personal/project/childSystem/participate.vue | 4 +++-
 src/views/personal/project/childmodel/manage.vue       | 4 +++-
 src/views/personal/project/childmodel/participate.vue  | 4 +++-
 src/views/personal/project/detail/manage.vue           | 8 ++------
 src/views/personal/project/detail/participate.vue      | 2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/views/personal/project/childSystem/manage.vue b/src/views/personal/project/childSystem/manage.vue
index 08fc903..1305120 100644
--- a/src/views/personal/project/childSystem/manage.vue
+++ b/src/views/personal/project/childSystem/manage.vue
@@ -38,7 +38,9 @@
           </template>
             
         </el-table-column>
-        <el-table-column property="deadLine" label="截止时间" />
+        <el-table-column property="deadLine" label="截止时间" #default="{row}">
+            <span>{{ new Date(row.deadLine).toLocaleDateString() }}</span>
+        </el-table-column>
         <el-table-column property="address" label="操作" #default="{row}">
           <el-button link style="color:deepskyblue" @click="toChildModel(row.id)">查看详情</el-button>
         </el-table-column>
diff --git a/src/views/personal/project/childSystem/participate.vue b/src/views/personal/project/childSystem/participate.vue
index 444657a..7f5eef3 100644
--- a/src/views/personal/project/childSystem/participate.vue
+++ b/src/views/personal/project/childSystem/participate.vue
@@ -37,7 +37,9 @@
             <span>{{ row.description.description }}</span>
           </template>
         </el-table-column>
-        <el-table-column property="deadLine" label="截止时间" />
+        <el-table-column property="deadLine" label="截止时间" #default="{row}">
+            <span>{{ new Date(row.deadLine).toLocaleDateString() }}</span>
+        </el-table-column>
         <el-table-column property="address" label="操作" #default="{row}">
           <el-button link style="color:deepskyblue" @click="toChildModel(row.id)">查看详情</el-button>
         </el-table-column>
diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue
index 0f17115..355f1dd 100644
--- a/src/views/personal/project/childmodel/manage.vue
+++ b/src/views/personal/project/childmodel/manage.vue
@@ -39,7 +39,9 @@
         <el-table-column property="description" label="子模块简介" #default="{row}" >
             <span>{{row.description.description}}</span>
         </el-table-column>  
-        <el-table-column property="deadLine" label="截止时间" />
+        <el-table-column property="deadLine" label="截止时间" #default="{row}">
+            <span>{{ new Date(row.deadLine).toLocaleDateString() }}</span>
+        </el-table-column>
         <el-table-column property="address" label="操作" #default="{row}">
           <el-button link style="color:deepskyblue" @click="toDetail(row.id)">查看详情</el-button>
         </el-table-column>
diff --git a/src/views/personal/project/childmodel/participate.vue b/src/views/personal/project/childmodel/participate.vue
index ba6a044..a49c2e7 100644
--- a/src/views/personal/project/childmodel/participate.vue
+++ b/src/views/personal/project/childmodel/participate.vue
@@ -36,7 +36,9 @@
         <el-table-column property="description" label="子模块简介" #default="{ row }">
           <span>{{ row.description.description }}</span>
         </el-table-column>
-        <el-table-column property="address" label="截止时间" />
+        <el-table-column property="deadLine" label="截止时间" #default="{row}">
+            <span>{{ new Date(row.deadLine).toLocaleDateString() }}</span>
+        </el-table-column>
         <el-table-column property="address" label="操作" #default="{ row }">
           <el-button link style="color:deepskyblue" @click="toDetail(row.id)">查看详情</el-button>
         </el-table-column>
diff --git a/src/views/personal/project/detail/manage.vue b/src/views/personal/project/detail/manage.vue
index d74863c..295917f 100644
--- a/src/views/personal/project/detail/manage.vue
+++ b/src/views/personal/project/detail/manage.vue
@@ -71,11 +71,7 @@ const selectedStatus = ref('进行中');
 const route = useRoute();
 const projectId = route.query.id;
 
-//修改时间方法
-function renderTime(date) {
-        var dateee = new Date(date).toJSON();
-        return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
-    }
+
 
 //加载数据
 //修改表单内数据
@@ -94,7 +90,7 @@ projectItems.value.forEach(item => {
     } else if (item.label === '05.状态') {
         item.value = data.status ? data.status : '未知';
     } else if (item.label === '06.时间') {
-        item.value = renderTime(data.deadLine) ? data.deadLine : '2024-01-01 12:00:00';
+        item.value =  new Date(data.deadLine).toLocaleDateString();
     } else if (item.label === '07.简介') {
         item.value = data.description;
     }
diff --git a/src/views/personal/project/detail/participate.vue b/src/views/personal/project/detail/participate.vue
index d08edfd..56926b8 100644
--- a/src/views/personal/project/detail/participate.vue
+++ b/src/views/personal/project/detail/participate.vue
@@ -90,7 +90,7 @@ const parseData = (data) => {
         } else if (item.label === '05.状态') {
             item.value = data.status ? data.status : '未知';
         } else if (item.label === '06.时间') {
-            item.value = data.deadLine ? data.deadLine : '2024-01-01 12:00:00';
+            item.value = new Date(data.deadLine).toLocaleDateString();
         } else if (item.label === '07.简介') {
             item.value = data.description;
         }
-- 
2.43.0


From 551b166b79161681147bbbdf255d06a62497fc56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Fri, 19 Apr 2024 20:13:50 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=85=A8=E9=83=A8=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personal/project/childSystem/manage.vue   |  46 ++++-
 .../project/childSystem/participate.vue       |  36 ++--
 .../personal/project/childmodel/manage.vue    |  45 ++++-
 .../project/childmodel/participate.vue        |  44 ++--
 src/views/personal/project/manage.vue         | 188 +++++++-----------
 src/views/personal/project/participate.vue    |  85 +++-----
 6 files changed, 206 insertions(+), 238 deletions(-)

diff --git a/src/views/personal/project/childSystem/manage.vue b/src/views/personal/project/childSystem/manage.vue
index 1305120..b6cb93d 100644
--- a/src/views/personal/project/childSystem/manage.vue
+++ b/src/views/personal/project/childSystem/manage.vue
@@ -5,15 +5,15 @@
       <div style="display:flex;flex-direction:row;justify-content: space-around ">
         <div>
           名称
-          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+          <el-input v-model="input1" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
         </div>
         <div>
           状态
-          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+          <el-input v-model="input2" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
         </div>
         <div>
-          <el-button type="primary" style="width:80px">查询</el-button>
-          <el-button style="width:80px">重置</el-button>
+          <el-button type="primary" style="width:80px" @click="search">查询</el-button>
+          <el-button style="width:80px" @click="reset">重置</el-button>
         </div>
       </div>
     </el-card>
@@ -34,7 +34,7 @@
         <el-table-column property="status" label="状态" />
         <el-table-column property="description" label="子系统简介"  >
           <template #default="{row}">
-            <span >{{ row.description.description }}</span>
+            <span >{{ row.description }}</span>
           </template>
             
         </el-table-column>
@@ -69,7 +69,7 @@ const toChildModel = (id) => {
   router.push({ name: 'ChildModManage' , query: { id: 3 } })
 };
 
-const input = ref('');
+
 
 interface User {
     cycle:number
@@ -97,6 +97,9 @@ const handleSelectionChange = (val: User[]) => {
 
 // console.log(searchSys);
 
+const input1 = ref('');
+const input2 = ref('');
+
 const tableData = ref<User[]>([
 
 ]);
@@ -108,12 +111,12 @@ const initialTableData = ref<User[]>([]);
 
   //处理数据函数
   const parseData = (data)=>{
-    const description = JSON.parse(data.description);
+    
 
     return{
             cycle:data.cycle,
             deadLine:data.deadLine,
-            description:description,
+            description: data.description,
             id:data.id,
             isDelete:data.isDelete,
             name:data.name,
@@ -130,6 +133,8 @@ const initialTableData = ref<User[]>([]);
 
     //处理数据
     project.then(res=>{
+      console.log(res);
+      
       const data = res.data.data
       console.log(data);
       
@@ -149,7 +154,30 @@ const initialTableData = ref<User[]>([]);
 
   fetchData();
       
-      
+// 统一检索函数
+const search = () => {
+  const keyword = input1.value.trim().toLowerCase();
+  const status = input2.value.trim().toLowerCase();
+
+  // 如果搜索关键词和状态都为空，则恢复初始数据
+  if (keyword === '' && status === '') {
+    tableData.value = initialTableData.value.slice();
+    return;
+  }
+
+  // 根据关键词和状态进行检索
+  tableData.value = initialTableData.value.filter(item => {
+    const matchKeyword = (keyword === '' || item.name.toLowerCase().includes(keyword));
+    const matchStatus = (status === '' || item.status.toLowerCase().includes(status));
+    return matchKeyword && matchStatus;
+  });
+};
+
+const reset = () => {
+  input1.value = '';
+  input2.value = '';
+  tableData.value = initialTableData.value.slice();
+};
    
     
       
diff --git a/src/views/personal/project/childSystem/participate.vue b/src/views/personal/project/childSystem/participate.vue
index 7f5eef3..1f795c1 100644
--- a/src/views/personal/project/childSystem/participate.vue
+++ b/src/views/personal/project/childSystem/participate.vue
@@ -34,7 +34,7 @@
         <el-table-column property="status" label="状态" />
         <el-table-column property="description" label="子系统简介">
           <template #default="{ row }">
-            <span>{{ row.description.description }}</span>
+            <span>{{ row.description }}</span>
           </template>
         </el-table-column>
         <el-table-column property="deadLine" label="截止时间" #default="{row}">
@@ -98,25 +98,11 @@ const handleSelectionChange = (val: User[]) => {
   multipleSelection.value = val;
 };
 
-const tableData = ref<User[]>([
-  {
-    id: 1,
-    deadLine: '2022-01-01',
-    cycle: 1,
-    description: { description: '子系统1的简介' },
-    isDeleted: 0, 
-    name: '子系统1',
-    principalId: 1,
-    projectId: 1,
-    workLoad: 1,
-    status: '待定',
-    principalName: '测试数据'
-  }
-]);
+const tableData = ref<User[]>([]);
 const initialTableData = ref<User[]>([]);
 
 const parseData = (data) => {
-  const description = JSON.parse(data.description);
+  
 
 
 
@@ -125,7 +111,7 @@ const parseData = (data) => {
     id: data.id,
     deadLine: data.deadLine,
     cycle: data.cycle,
-    description: description,
+    description: data.description,
     isDeleted: data.isDeleted,
     name: data.name,
     principalId: data.principalId,
@@ -139,9 +125,12 @@ const parseData = (data) => {
 //获取子系统列表
 const fetchData = () => {
   //调用接口
-  const project = getParticipateSystemList(<number>projectid-1, getToken());
+  const project = getParticipateSystemList(<number>projectid, getToken());
 
   project.then((res) => {
+    console.log(res);
+
+    
     const data = res.data.data;
     console.log(data);
 
@@ -161,6 +150,9 @@ const fetchData = () => {
 
 fetchData();
 
+const input1 = ref('');
+const input2 = ref('');
+
 // 统一检索函数
 const search = () => {
   const keyword = input1.value.trim().toLowerCase();
@@ -180,14 +172,10 @@ const search = () => {
   });
 };
 
-const input1 = ref('');
-const input2 = ref('');
-
-// 重置检索条件
 const reset = () => {
   input1.value = '';
   input2.value = '';
-  tableData.value = initialTableData.value.slice();  // 恢复初始数据
+  tableData.value = initialTableData.value.slice();
 };
 
 
diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue
index 355f1dd..fe7548b 100644
--- a/src/views/personal/project/childmodel/manage.vue
+++ b/src/views/personal/project/childmodel/manage.vue
@@ -5,15 +5,15 @@
       <div style="display:flex;flex-direction:row;justify-content: space-around ">
         <div>
           名称
-          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+          <el-input v-model="input1" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
         </div>
         <div>
           状态
-          <el-input v-model="input" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
+          <el-input v-model="input2" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
         </div>
         <div>
-          <el-button type="primary" style="width:80px">查询</el-button>
-          <el-button style="width:80px">重置</el-button>
+          <el-button type="primary" style="width:80px" @click="search">查询</el-button>
+          <el-button style="width:80px" @click="reset">重置</el-button>
         </div>
       </div>
     </el-card>
@@ -37,7 +37,7 @@
         <el-table-column property="principalUser" label="负责人" />
         <el-table-column property="status" label="状态" />
         <el-table-column property="description" label="子模块简介" #default="{row}" >
-            <span>{{row.description.description}}</span>
+            <span>{{row.description}}</span>
         </el-table-column>  
         <el-table-column property="deadLine" label="截止时间" #default="{row}">
             <span>{{ new Date(row.deadLine).toLocaleDateString() }}</span>
@@ -80,6 +80,7 @@ interface User {
   description: { description: string }
   status: string
   deadLine: string
+  cycle: number
 }
 
 const multipleTableRef = ref<InstanceType<typeof ElTable>>();
@@ -89,7 +90,7 @@ const handleSelectionChange = (val: User[]) => {
   multipleSelection.value = val;
 };
 
-const input = ref('');
+
 
 const initialTableData = ref<User[]>([]);
 const tableData = ref<User[]>([
@@ -106,7 +107,7 @@ const sysId = route.query.id;
 
 //处理接口方法
 const parseData = (data) => {
-    const description = JSON.parse(data.description);
+    
 
 
   return{
@@ -115,9 +116,10 @@ const parseData = (data) => {
       principalId: data.principalId,
       principalUser: data.principalUser,
       workLoad: data.workLoad,
-      description: description,
+      description: data.description,
       status: data.status,
       deadLine: data.deadLine,
+      cycle: data.cycle,
 
   }
 
@@ -146,6 +148,33 @@ const fetchData = ()=>{
   
 }
 fetchData();
+const input1 = ref('');
+const input2 = ref('');
+
+// 统一检索函数
+const search = () => {
+  const keyword = input1.value.trim().toLowerCase();
+  const status = input2.value.trim().toLowerCase();
+
+  // 如果搜索关键词和状态都为空，则恢复初始数据
+  if (keyword === '' && status === '') {
+    tableData.value = initialTableData.value.slice();
+    return;
+  }
+
+  // 根据关键词和状态进行检索
+  tableData.value = initialTableData.value.filter(item => {
+    const matchKeyword = (keyword === '' || item.name.toLowerCase().includes(keyword));
+    const matchStatus = (status === '' || item.status.toLowerCase().includes(status));
+    return matchKeyword && matchStatus;
+  });
+};
+
+const reset = () => {
+  input1.value = '';
+  input2.value = '';
+  tableData.value = initialTableData.value.slice();
+};
 
 
 
diff --git a/src/views/personal/project/childmodel/participate.vue b/src/views/personal/project/childmodel/participate.vue
index a49c2e7..656047f 100644
--- a/src/views/personal/project/childmodel/participate.vue
+++ b/src/views/personal/project/childmodel/participate.vue
@@ -33,9 +33,9 @@
         <el-table-column property="cycle" label="周期" />
         <el-table-column property="principalUser" label="负责人" />
         <el-table-column property="status" label="状态" />
-        <el-table-column property="description" label="子模块简介" #default="{ row }">
-          <span>{{ row.description.description }}</span>
-        </el-table-column>
+        <el-table-column property="description" label="子模块简介" />
+          
+        
         <el-table-column property="deadLine" label="截止时间" #default="{row}">
             <span>{{ new Date(row.deadLine).toLocaleDateString() }}</span>
         </el-table-column>
@@ -74,7 +74,7 @@ interface User {
   childSystemName: string;
   completeTime: string;
   cycle: string;
-  description: { description: string };
+  description: string;
   id: number;
   isDelete: number
   isFinishi: string
@@ -86,6 +86,7 @@ interface User {
   status: string
   type: string
   workLoad: number
+  deadLine: string
 }
 
 const multipleTableRef = ref<InstanceType<typeof ElTable>>();
@@ -98,38 +99,18 @@ const handleSelectionChange = (val: User[]) => {
 
 
 //列表
-const tableData = ref<User[]>([
-  {
-    beginTime: '2021-11-11',
-    childSystemName: '子系统1',
-    completeTime: '2021-11-11',
-    cycle: "10tian",
-    description: { description: '子系统1描述' },
-    id: 1,
-    isDelete: 0,
-    isFinishi: '否',
-    name: '子模块1',
-    pid: '1',
-    principalId: 1,
-    principalUser: '负责人1',
-    projectId: 1,
-    status: '待完成',
-    type: '子系统',
-    workLoad: 10
-  }
-  
-
-]);
+const tableData = ref<User[]>([]);
 const initialTableData = ref<User[]>([]);
+
 const parseData = (data) => {
-  const descripation = JSON.parse(data.description);
+  
 
   return {
     beginTime: data.beginTime,
     childSystemName: data.childSystemName,
     completeTime: data.completeTime,
     cycle: data.cycle,
-    description: descripation,
+    description: data.description,
     id: data.id,
     isDelete: data.isDelete,
     isFinishi: data.isFinishi,
@@ -138,9 +119,10 @@ const parseData = (data) => {
     principalId: data.principalId,
     principalUser: data.principalUser,
     projectId: data.projectId,
-    status: '待完成',
+    status: data.status,
     type: data.type,
-    workLoad: data.workLoad
+    workLoad: data.workLoad,
+    deadLine: data.deadLine
   }
 }
 
@@ -194,6 +176,8 @@ const input2 = ref('');
 const reset = () => {
   input1.value = '';
   input2.value = '';
+  console.log(tableData.value);
+  
   tableData.value = initialTableData.value.slice();  // 恢复初始数据
 };
 
diff --git a/src/views/personal/project/manage.vue b/src/views/personal/project/manage.vue
index 7be040b..a98c8e3 100644
--- a/src/views/personal/project/manage.vue
+++ b/src/views/personal/project/manage.vue
@@ -12,8 +12,8 @@
           <el-input v-model="input2" style="width: 240px;margin-left:0.5vw" placeholder="请输入" />
         </div>
         <div>
-          <el-button type="primary" style="width:80px">查询</el-button>
-          <el-button style="width:80px">重置</el-button>
+          <el-button type="primary" style="width:80px" @click="search">查询</el-button>
+          <el-button style="width:80px" @click="reset">重置</el-button>
         </div>
       </div>
 
@@ -81,7 +81,7 @@
 
 </template>
 
-<script lang="ts" setup>
+<script setup lang="ts">
 import { ref, watch } from 'vue';
 import { ElTable, ElTableColumn, ElPagination, ElButton, ElInput, ElTag, ElMessageBox, ElMessage } from 'element-plus';
 import { getToken } from '@/utils/auth';
@@ -89,72 +89,36 @@ import { useRouter } from 'vue-router';
 import { getManageList, deleteProject } from '@/api/manage.js';
 
 
-
-
+// 初始化路由
 const router = useRouter();
 
-const pageSize = ref(5); // 每页显示的条数
-const currentPage = ref(1); // 当前页数
-const total = ref(10); // 总条数
-
-
-
-
-// 路由跳转
-const toChildSystem = (id) => {
-  router.push({ name: 'ChildSysManage', query: { id: 2 } }); // 跳转到子系统详情页面
-};
-
-//响应式
-const tableData = ref<User[]>([]);
-
-const selectedIds = ref([]); // 存储被选中的项目的ID
-
-
-
-
-
-interface User {
-  id: number
-  cycle: number
-  name: string
-  description: string
-  workLoad: number
-  status: string
-  deadLine: string
-  tags: Array<any>
-  files: Array<any>
-  principalUser: string
-
-
-}
-
-
-
-
-
-
-
-// 获取输入框内容
+// 定义响应式变量
+const pageSize = ref(5);
+const currentPage = ref(1);
+const total = ref(10);
 const input1 = ref('');
 const input2 = ref('');
+const tableData = ref<User[]>([]);
+const selectedIds = ref([]);
 
+// 定义用户接口
+interface User {
+  id: number;
+  cycle: number;
+  name: string;
+  description: string;
+  workLoad: number;
+  status: string;
+  deadLine: string;
+  tags: Array<any>;
+  files: Array<any>;
+  principalUser: string;
+}
 
-// const multipleTableRef = ref<InstanceType<typeof ElTable>>();
-// const multipleSelection = ref<User[]>([
-
-// ]);
-
-// const handleSelectionChange = (val: User[]) => {
-//   multipleSelection.value = val;
-// };
-
-// 在 Vue 组件中添加 parseData 函数
+// 定义解析数据的函数
 const parseData = (data) => {
-
   const files = JSON.parse(data.files);
   const tags = JSON.parse(data.tags);
-
   return {
     id: data.id,
     cycle: data.cycle,
@@ -169,75 +133,58 @@ const parseData = (data) => {
   };
 };
 
-
-// 监听 currentPage 的变化，当 currentPage 变化时请求对应页的数据
+// 定义处理当前页码变化的函数
 watch(currentPage, () => {
   fetchData();
 });
 
-//获取所有项目
+// 定义获取数据的函数
 const fetchData = () => {
-
   const params = {
-    page: currentPage.value, // 当前页码
-    pageSize: pageSize.value, // 每页显示的条数
+    page: currentPage.value,
+    pageSize: pageSize.value,
     is: 1
-
   };
-
   const project = getManageList(params, getToken());
-
-
-
-  // 处理接口数据 
   project.then(res => {
     const data = res.data.data.list;
-    console.log(data);
+    const dataTotal = res.data.data.total;
+    const dataPageSize = res.data.data.pageSize;
+    
+    console.log(dataTotal, dataPageSize);
+    
+    total.value = dataTotal;
+    pageSize.value = dataPageSize;
+    
     if (data) {
-      const newData = data.map(item => parseData(item)); // 使用先前定义的函数处理数据
-      // 使用 tableData.value 进行添加
+      const newData = data.map(item => parseData(item));
       tableData.value = newData;
-      console.log(tableData.value);
-
-
-
+      initialTableData.value = tableData.value.slice();
     } else {
-      console.log("没有数据");
+      console.log("没有可用数据");
     }
-  })
-    .catch(err => {
-      console.log(err);
-    });
+  }).catch(err => {
+    console.log(err);
+  });
 }
-
 fetchData();
 
-
-//翻页处理
-// 翻页事件处理函数
+// 定义处理当前页码变化的函数
 const handleCurrentChange = (page) => {
-  currentPage.value = page; // 更新 currentPage 的值
+  currentPage.value = page;
 };
 
-
-// 删除项目
-// 这个方法将在表格的选择项发生变化时被调用
+// 定义处理选择变化的函数
 const handleSelectionChange = (selection) => {
-  selectedIds.value = selection.map(item => item.id); // 更新被选择的项目的ID数组
+  selectedIds.value = selection.map(item => item.id);
 };
 
-
-
-// 弹窗设置
-
+// 定义确认删除项目的函数
 const confirmDelete = (selectedIds) => {
-  const message = `确定要删除ID为${selectedIds}的项目吗？`;
-
-  ElMessageBox.confirm(
-    message, {
+  const message = `确认删除 ID 为 ${selectedIds} 的项目吗？`;
+  ElMessageBox.confirm(message, {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
-    // type: 'warning',
     center: true,
   }).then(async () => {
     const token = getToken();
@@ -258,6 +205,7 @@ const confirmDelete = (selectedIds) => {
   });
 };
 
+// 定义处理项目删除的函数
 const handleDeleteProjects = async () => {
   if (selectedIds.value.length === 0) {
     ElMessage({
@@ -267,24 +215,42 @@ const handleDeleteProjects = async () => {
     });
     return;
   }
-
   confirmDelete(selectedIds.value);
 };
 
-//编辑功能 
-
-
-
-
-
-
-
+const initialTableData = ref<User[]>([]);
 
+// 统一检索函数
+const search = () => {
+  const keyword = input1.value.trim().toLowerCase();
+  const status = input2.value.trim().toLowerCase();
 
+  // 如果搜索关键词和状态都为空，则恢复初始数据
+  if (keyword === '' && status === '') {
+    tableData.value = initialTableData.value.slice();
+    return;
+  }
 
+  // 根据关键词和状态进行检索
+  tableData.value = initialTableData.value.filter(item => {
+    const matchKeyword = (keyword === '' || item.name.toLowerCase().includes(keyword));
+    const matchStatus = (status === '' || item.status.toLowerCase().includes(status));
+    return matchKeyword && matchStatus;
+  });
+};
 
+const reset = () => {
+  input1.value = '';
+  input2.value = '';
+  tableData.value = initialTableData.value.slice();
+};
 
+// 定义跳转到子系统的函数
+const toChildSystem = (id) => {
+  router.push({ name: 'ChildSysManage', query: { id: 2 } });
+};
 </script>
+
 <style>
 .my-autocomplete li {
   line-height: normal;
diff --git a/src/views/personal/project/participate.vue b/src/views/personal/project/participate.vue
index fd2094f..8371a2e 100644
--- a/src/views/personal/project/participate.vue
+++ b/src/views/personal/project/participate.vue
@@ -59,8 +59,8 @@
           
         </el-table-column>
       </el-table>
-      <el-pagination larger background layout="prev, pager, next" :total="total" class="mt-4" :page-size="pageSize"
-        style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
+      <el-pagination larger background layout="prev, pager, next" :total="total" class="mt-4" :page-size="pageSize" :current-page="currentPage"
+      @current-change="handleCurrentChange" style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
     </el-card>
 
   </div>
@@ -75,13 +75,12 @@ import { getToken } from '@/utils/auth';
 
 const router = useRouter();
 
-//设置页码
-const total = ref(2);
-const pageSize = ref(3);
-
-
-
+// 设置页码
+const pageSize = ref(2);
+const currentPage = ref(1);
+const total = ref(4);
 
+// 定义用户数据接口
 interface User {
   id: number;
   cycle: number;
@@ -89,7 +88,7 @@ interface User {
   description: string;
   workLoad: number;
   files: { URI: string };
-  status: string
+  status: string;
   principalUser: string;
   deadline: string;
   tags: Array<any>;
@@ -99,37 +98,11 @@ interface User {
 const input1 = ref('');
 const input2 = ref('');
 const tableData = ref<User[]>([
-  {
-    id: 4,
-    cycle: 2,
-    name: "项目2",
-    description: "xxxxxxx",
-    workLoad: 12,
-    files: { URI: 'http://www.baidu.com' },
-    status: "暂停",
-    principalUser: "teacher_user",
-    deadline: "2021-12-31",
-    tags: ["java", "spring"]
-
-  },
-  {
-    id: 2,
-    cycle: 2,
-    name: "项目2",
-    description: "xxxxxxx",
-    workLoad: 12,
-    files: { URI: 'http://www.baidu.com' },
-    status: "进行中",
-    principalUser: "teacher_user",
-    deadline: "2021-12-31",
-    tags: ["java", "spring"]
-
-  }
 
 ]);
 const initialTableData = ref<User[]>([]);
 
-//处理返回数据函数
+// 处理返回数据函数
 const parseData = (data) => {
   const files = JSON.parse(data.files);
   const tags = JSON.parse(data.tags);
@@ -144,32 +117,29 @@ const parseData = (data) => {
     status: data.status,
     principalUser: data.principalUser,
     deadline: data.deadLine,
-    tags: tags,
+    tags: tags
+  };
+};
 
-
-
-  }
-}
-
-// 处理接口数据 
+// 处理接口数据
 const fetchData = () => {
   const project = getParticipateProjectList(getToken());
-  console.log(project);
-
   project.then(res => {
     const data = res.data.data.list;
+    const dataTotal = res.data.data.total;
+    const dataPageSize = res.data.data.pageSize;
 
+    console.log(dataTotal, dataPageSize);
+    
+    total.value = dataTotal;
+    pageSize.value = dataPageSize;
 
     if (data) {
-      // 假设 data 是从接口返回的数据，这里做一个示例
       const dataProject = data.map(item => parseData(item));
-      console.log(dataProject);
-
-      tableData.value = [...dataProject, ...tableData.value];  // 将接口数据和现有数据合并
-      console.log(tableData.value);
-      initialTableData.value = tableData.value.slice();  // 将tableData的内容赋值给initialTableData
+      tableData.value = [...dataProject, ...tableData.value];
+      initialTableData.value = tableData.value.slice();
     } else {
-      console.log("没有数据");
+      console.log('没有数据');
     }
   }).catch(err => {
     console.log(err);
@@ -181,7 +151,7 @@ fetchData();
 
 // 处理路由跳转
 const toChildSystem = (id) => {
-  router.push({ name: 'ChildSysParticipate' ,query: { projectId: id } });
+  router.push({ name: 'ChildSysParticipate', query: { projectId: id } });
 };
 
 // 监听表格行选择事件
@@ -212,15 +182,18 @@ const search = () => {
 };
 
 
-
+// 定义处理当前页码变化的函数
+const handleCurrentChange = (page) => {
+  currentPage.value = page;
+};
 // 重置检索条件
 const reset = () => {
   input1.value = '';
   input2.value = '';
-  tableData.value = initialTableData.value.slice();  // 恢复初始数据
+  tableData.value = initialTableData.value.slice();
 };
-
 </script>
+
 <style>
 .my-autocomplete li {
   line-height: normal;
-- 
2.43.0


From 15f698087647febf5f7f4e67ba8c96275d56ed51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Sat, 20 Apr 2024 19:12:36 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto-imports.d.ts                             |   1 -
 components.d.ts                               |   1 +
 src/api/manage.js                             |  32 ++--
 .../personal/project/childSystem/manage.vue   |   4 +-
 .../personal/project/childmodel/manage.vue    | 111 +++++++-----
 src/views/personal/project/manage.vue         | 168 ++++++++++++++++--
 6 files changed, 244 insertions(+), 73 deletions(-)

diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 24e619c..8139ac9 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -2,5 +2,4 @@
 export {}
 declare global {
   const ElMessage: typeof import('element-plus/es')['ElMessage']
-  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
 }
diff --git a/components.d.ts b/components.d.ts
index 8e58971..3410aed 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -48,6 +48,7 @@ declare module '@vue/runtime-core' {
     ElTableRow: typeof import('element-plus/es')['ElTableRow']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
     ErrorLog: typeof import('./src/components/ErrorLog/index.vue')['default']
     GithubCorner: typeof import('./src/components/GithubCorner/index.vue')['default']
     Hamburger: typeof import('./src/components/Hamburger/index.vue')['default']
diff --git a/src/api/manage.js b/src/api/manage.js
index 94ba1e7..a1671ef 100644
--- a/src/api/manage.js
+++ b/src/api/manage.js
@@ -177,23 +177,27 @@ export const deleteProject = (id,token) => {
 
     })
 }
-// 添加项目接口
 /**
- * 添加项目
- * @param data 要添加的项目数据
- * @returns {Promise<AxiosResponse<any>>} 返回API响应
+ * 修改项目信息
+ * @param {Object} body 包含项目更新信息的对象
+ * @param {number} id 项目ID
+ * @param {string} token 访问令牌
+ * @returns {Promise<AxiosResponse<any>>}
  */
-export const addProject = (data ,token) => {
+export const editProject = (body ,id,token) => {
     return axios({
-      url: api + "/project/add", // 替换为实际的项目API端点
-      method: "post", // 使用POST方法添加项目
-      headers: {
-        'Authorization': 'Bearer ' + token,
-        'Timestamp': getCurrentTimestamp()
-      },
-      data: data  // 将要添加的项目数据传递给API
-    });
-  }
+        url: api +"/project/edit?id=" + id ,
+        method: "put",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+        },
+        data:body
+
+
+    })
+}
+
 
 
 
diff --git a/src/views/personal/project/childSystem/manage.vue b/src/views/personal/project/childSystem/manage.vue
index b6cb93d..c06ee3a 100644
--- a/src/views/personal/project/childSystem/manage.vue
+++ b/src/views/personal/project/childSystem/manage.vue
@@ -66,7 +66,7 @@ import { getProjectSysList } from '@/api/manage';
 const router = useRouter();
 
 const toChildModel = (id) => {
-  router.push({ name: 'ChildModManage' , query: { id: 3 } })
+  router.push({ name: 'ChildModManage' , query: { id: id } })
 };
 
 
@@ -136,7 +136,7 @@ const initialTableData = ref<User[]>([]);
       console.log(res);
       
       const data = res.data.data
-      console.log(data);
+      
       
       
       if(data){
diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue
index fe7548b..308cb96 100644
--- a/src/views/personal/project/childmodel/manage.vue
+++ b/src/views/personal/project/childmodel/manage.vue
@@ -21,61 +21,86 @@
       <div style="display:flex;flex-direction: row;justify-content: space-between">
         <el-button text type=''>子模块列表</el-button>
         <div>
-          <el-button type="primary" style="width:80px">新增</el-button>
-          
+          <el-button type="primary" style="width:80px" @click="openEditDialog">新增</el-button>
+
         </div>
       </div>
       <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
         @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
+        <!-- <el-table-column type="selection" width="55" /> -->
         <el-table-column label="序号" width="120">
-          <template #default="{row}">{{row.id }}</template>
+          <template #default="{ row }">{{ row.id }}</template>
         </el-table-column>
         <el-table-column property="name" label="子模块名称" width="120" />
         <el-table-column property="workLoad" label="工作量" show-overflow-tooltip />
         <el-table-column property="cycle" label="周期" />
         <el-table-column property="principalUser" label="负责人" />
         <el-table-column property="status" label="状态" />
-        <el-table-column property="description" label="子模块简介" #default="{row}" >
-            <span>{{row.description}}</span>
-        </el-table-column>  
-        <el-table-column property="deadLine" label="截止时间" #default="{row}">
-            <span>{{ new Date(row.deadLine).toLocaleDateString() }}</span>
+        <el-table-column property="description" label="子模块简介" #default="{ row }">
+          <span>{{ row.description }}</span>
         </el-table-column>
-        <el-table-column property="address" label="操作" #default="{row}">
+        <el-table-column property="deadLine" label="截止时间" #default="{ row }">
+          <span>{{ new Date(row.deadLine).toLocaleDateString() }}</span>
+        </el-table-column>
+        <el-table-column property="address" label="操作" #default="{ row }">
           <el-button link style="color:deepskyblue" @click="toDetail(row.id)">查看详情</el-button>
         </el-table-column>
       </el-table>
       <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
         style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
     </el-card>
-    <router-view />
+    <!-- 编辑弹窗 -->
+    <el-dialog title="编辑信息" :visible.sync="dialogVisible" @click="dialogVisible = true">
+      <el-form ref="editForm" :model="editForm" label-width="100px">
+        <el-form-item label="名称">
+          <el-input v-model="editForm.name" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-input v-model="editForm.status" placeholder="请输入状态" />
+        </el-form-item>
+        <!-- 添加其他需要编辑的表单项 -->
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleCloseDialog">取消</el-button>
+        <el-button type="primary" @click="submitEditInfo">确认</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import { ElTable } from 'element-plus';
+import { ElTable ,ElDialog, ElForm, ElFormItem, ElInput, ElButton } from 'element-plus';
 import { getProjectModList } from '@/api/manage';
-import { useRouter ,useRoute} from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 import { getToken } from '@/utils/auth';
 
 
 
 const router = useRouter();
-
+const dialogVisible = ref(true);
+const editForm = ref({
+  name: '',
+  status: '',
+  // 添加其他需要编辑的表单项
+});
+// 点击编辑按钮打开弹窗
+const openEditDialog = () => {
+  dialogVisible.value = true;
+};
 
 
 // 路由跳转
 const toDetail = (id) => {
-  router.push({ name: 'ManageDetail' ,query: { id: id } }); // 跳转到子系统详情页面
+  router.push({ name: 'ManageDetail', query: { id: id } }); // 跳转到子系统详情页面
 };
 
 interface User {
   id: number
   name: string
   principalId: number
-  principalUser:string
+  principalUser: string
   workLoad: number
   description: { description: string }
   status: string
@@ -94,9 +119,9 @@ const handleSelectionChange = (val: User[]) => {
 
 const initialTableData = ref<User[]>([]);
 const tableData = ref<User[]>([
- 
-]) ;
-  
+
+]);
+
 
 
 
@@ -107,45 +132,45 @@ const sysId = route.query.id;
 
 //处理接口方法
 const parseData = (data) => {
-    
 
 
-  return{
-      id: data.id,
-      name: data.name,
-      principalId: data.principalId,
-      principalUser: data.principalUser,
-      workLoad: data.workLoad,
-      description: data.description,
-      status: data.status,
-      deadLine: data.deadLine,
-      cycle: data.cycle,
+
+  return {
+    id: data.id,
+    name: data.name,
+    principalId: data.principalId,
+    principalUser: data.principalUser,
+    workLoad: data.workLoad,
+    description: data.description,
+    status: data.status,
+    deadLine: data.deadLine,
+    cycle: data.cycle,
 
   }
 
 }
 
 //接口处理
-const fetchData = ()=>{
+const fetchData = () => {
   //请求数据
-  const project = getProjectModList(sysId,getToken());
+  const project = getProjectModList(sysId, getToken());
   console.log(project);
   //处理数据
-  project.then(res=>{
+  project.then(res => {
     const data = res.data.data;
-    
-    if(data){
-           const newData = data.map(item=>parseData(item))
-          //  console.log(newData);
-           
-           tableData.value = [...newData,...tableData.value];
-           initialTableData.value = tableData.value.slice();  // 将tableData的内容赋值给initialTableData
 
-      }
-  }).catch(err=>{
+    if (data) {
+      const newData = data.map(item => parseData(item))
+      //  console.log(newData);
+
+      tableData.value = [...newData, ...tableData.value];
+      initialTableData.value = tableData.value.slice();  // 将tableData的内容赋值给initialTableData
+
+    }
+  }).catch(err => {
     console.log(err);
   })
-  
+
 }
 fetchData();
 const input1 = ref('');
diff --git a/src/views/personal/project/manage.vue b/src/views/personal/project/manage.vue
index a98c8e3..3492724 100644
--- a/src/views/personal/project/manage.vue
+++ b/src/views/personal/project/manage.vue
@@ -23,7 +23,7 @@
       <div style="display:flex;flex-direction: row;justify-content: space-between">
         <el-button text type=''>项目列表</el-button>
         <div style="text-align: right;">
-          <el-button type="primary" style="width:80px" >编辑</el-button>
+          <el-button type="primary" style="width:80px" @click="showEditDialog">编辑</el-button>
           <el-button style="width:80px ;background-color: #bd3124;color: azure;"
             @click="handleDeleteProjects">删除</el-button>
         </div>
@@ -73,10 +73,41 @@
         :current-page="currentPage" :page-size="pageSize" :total="total"
         style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
     </el-card>
-    
-    <el-alert>
-      <router-view />
-    </el-alert>
+    <el-dialog v-model="isDialogVisible" title="编辑项目" :close-on-click-modal="false">
+      <el-form :model="editFormData">
+        <el-form-item label="项目名称">
+          <el-input v-model="editFormData.name"></el-input>
+        </el-form-item>
+        <el-form-item label="项目描述">
+          <el-input v-model="editFormData.description"></el-input>
+        </el-form-item>
+        <el-form-item label="负责人ID">
+          <el-input v-model="editFormData.principalUser"></el-input>
+        </el-form-item>
+        <el-form-item label="工作量">
+          <el-input v-model="editFormData.workLoad"></el-input>
+        </el-form-item>
+        <el-form-item label="周期">
+          <el-input v-model="editFormData.cycle"></el-input>
+        </el-form-item>
+        <el-form-item label="截止时间">
+          <el-input v-model="editFormData.deadLine"></el-input>
+        </el-form-item>
+        <el-form-item label="标签">
+          <el-input v-model="editFormData.tags"></el-input>
+        </el-form-item>
+        <el-form-item label="文档">
+          <el-input v-model="editFormData.files"></el-input>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" @click="submitEditForm">提交</el-button>
+          <el-button @click="isDialogVisible = false">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+
+
   </div>
 
 </template>
@@ -86,7 +117,11 @@ import { ref, watch } from 'vue';
 import { ElTable, ElTableColumn, ElPagination, ElButton, ElInput, ElTag, ElMessageBox, ElMessage } from 'element-plus';
 import { getToken } from '@/utils/auth';
 import { useRouter } from 'vue-router';
-import { getManageList, deleteProject } from '@/api/manage.js';
+import { getManageList, deleteProject, editProject } from '@/api/manage.js';
+
+
+
+
 
 
 // 初始化路由
@@ -95,12 +130,17 @@ const router = useRouter();
 // 定义响应式变量
 const pageSize = ref(5);
 const currentPage = ref(1);
-const total = ref(10);
+const total = ref(6);
 const input1 = ref('');
 const input2 = ref('');
 const tableData = ref<User[]>([]);
 const selectedIds = ref([]);
 
+
+
+
+
+
 // 定义用户接口
 interface User {
   id: number;
@@ -149,16 +189,20 @@ const fetchData = () => {
   project.then(res => {
     const data = res.data.data.list;
     const dataTotal = res.data.data.total;
-    const dataPageSize = res.data.data.pageSize;
-    
-    console.log(dataTotal, dataPageSize);
     
+
+  
+
     total.value = dataTotal;
-    pageSize.value = dataPageSize;
-    
+   
+
     if (data) {
       const newData = data.map(item => parseData(item));
+      console.log(newData);
+      
       tableData.value = newData;
+      console.log(tableData.value);
+      
       initialTableData.value = tableData.value.slice();
     } else {
       console.log("没有可用数据");
@@ -247,8 +291,106 @@ const reset = () => {
 
 // 定义跳转到子系统的函数
 const toChildSystem = (id) => {
-  router.push({ name: 'ChildSysManage', query: { id: 2 } });
+  router.push({ name: 'ChildSysManage', query: { id: 4 } });//目前只有4有数据
 };
+
+//编辑功能
+
+//创建响应式变量和数据
+const isDialogVisible = ref(false);
+
+interface EditFormData {
+  id: number;
+  cycle: number;
+  name: string;
+  description: string;
+  workLoad: number;
+  status: string;
+  deadLine: string;
+  tags: Array<any>;
+  files: Array<any>;
+  principalUser: string;
+}
+
+const editFormData = ref<EditFormData>({
+  id: 0, // 默认为0，表示新建时的默认值
+  cycle: 0,
+  name: '',
+  description: '',
+  workLoad: 0,
+  status: '',
+  deadLine: '',
+  tags: [],
+  files: [],
+  principalUser: ''
+});
+//添加显示数据
+const showEditDialog = () => {
+  if (selectedIds.value.length === 0 || selectedIds.value.length > 1) {
+    ElMessage({
+      message: '请选择一个项目进行编辑',
+      type: 'warning',
+      duration: 3000
+    });
+    return;
+  }
+
+  const idToEdit = selectedIds.value[0];  // 由于是编辑，只选中一个进行编辑
+  const projectToEdit = tableData.value.find(project => project.id === idToEdit);
+  
+  if (projectToEdit) {
+    editFormData.value = { ...projectToEdit };
+    editFormData.value.tags = projectToEdit.tags.tags;
+    editFormData.value.files = projectToEdit.files.URI;
+  
+    
+    isDialogVisible.value = true;
+  } else {
+    ElMessage.error('选中的项目未找到');
+  }
+};
+
+
+//提交表单按钮以及提交
+const submitEditForm = async () => {
+
+  // 假设有一个API方法updateProject来处理PUT请求
+  console.log(editFormData);
+    const body = {
+      id: editFormData.value.id,
+      name: editFormData.value.name,
+      description: editFormData.value.description,
+      workLoad: editFormData.value.workLoad,
+      cycle: editFormData.value.cycle,
+      deadLine: editFormData.value.deadLine,
+      tags: editFormData.value.tags.toString(),
+      files: editFormData.value.files.toString(),
+      principalUser: editFormData.value.principalUser,
+      status: editFormData.value.status
+    }
+    console.log(body);
+    
+  editProject(body, editFormData.value.id, getToken()).then(res => {
+    console.log(res);
+    if (res.data.code === 200) {
+      ElMessage.success('更新成功');
+    } else {
+      ElMessage.error('更新失败');
+    }
+
+    isDialogVisible.value = false;
+    fetchData(); // 重新加载列表数据
+  }).catch(err => {
+    console.log(err);
+    ElMessage.error('更新失败');
+  });
+
+
+
+};
+
+
+
 </script>
 
 <style>
-- 
2.43.0


From 5410c3adf0a7254b7379f1f075d892210da46855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Sat, 20 Apr 2024 21:10:04 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=90=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/manage.js                             |  23 ++++
 .../personal/project/childSystem/manage.vue   |   3 +-
 .../personal/project/childmodel/manage.vue    | 107 +++++++++++++++---
 src/views/personal/project/detail/manage.vue  |   9 +-
 src/views/personal/project/manage.vue         |   2 +-
 5 files changed, 123 insertions(+), 21 deletions(-)

diff --git a/src/api/manage.js b/src/api/manage.js
index a1671ef..5a97cf7 100644
--- a/src/api/manage.js
+++ b/src/api/manage.js
@@ -198,6 +198,29 @@ export const editProject = (body ,id,token) => {
     })
 }
 
+/**
+ * 
+ * 新增子模块
+ * @param {Object} body 包含项目更新信息的对象
+ * @param {string} token 访问令牌
+ * @returns {Promise<AxiosResponse<any>>}
+ * 
+ */
+export const addModule = (body,token) => {
+    return axios({
+        url: api +"/project/module/add" ,
+        method: "post",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+        },
+        data:body
+
+
+    })
+}
+
+
 
 
 
diff --git a/src/views/personal/project/childSystem/manage.vue b/src/views/personal/project/childSystem/manage.vue
index c06ee3a..8b9a7ba 100644
--- a/src/views/personal/project/childSystem/manage.vue
+++ b/src/views/personal/project/childSystem/manage.vue
@@ -108,6 +108,7 @@ const initialTableData = ref<User[]>([]);
 // 获取projectid
   const route = useRoute();
   const projectId = route.query.id;
+console.log(projectId);
 
   //处理数据函数
   const parseData = (data)=>{
@@ -129,7 +130,7 @@ const initialTableData = ref<User[]>([]);
   
   const fetchData = () => {
     
-    const project = getProjectSysList( projectId ? Number(projectId) - 1 : 0,getToken());
+    const project = getProjectSysList(  projectId ,getToken());
 
     //处理数据
     project.then(res=>{
diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue
index 308cb96..141e90d 100644
--- a/src/views/personal/project/childmodel/manage.vue
+++ b/src/views/personal/project/childmodel/manage.vue
@@ -49,18 +49,44 @@
       <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
         style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
     </el-card>
-    <!-- 编辑弹窗 -->
-    <el-dialog title="编辑信息" :visible.sync="dialogVisible" @click="dialogVisible = true">
-      <el-form ref="editForm" :model="editForm" label-width="100px">
+
+
+    <!-- 新增弹窗 -->
+    <el-dialog title="新增子模块信息" v-model="dialogVisible" style="width: 27%" >
+      <el-form  :model="editForm" label-width="100px">
+        
+        <!-- <el-form-item label="序号">
+          <el-input v-model="editForm.id" placeholder="请输入id" />
+        </el-form-item> -->
         <el-form-item label="名称">
           <el-input v-model="editForm.name" placeholder="请输入名称" />
         </el-form-item>
         <el-form-item label="状态">
           <el-input v-model="editForm.status" placeholder="请输入状态" />
         </el-form-item>
+        <el-form-item label="工作量">
+          <el-input v-model="editForm.workLoad" placeholder="请输入工作量" />
+        </el-form-item>
+        <el-form-item label="周期">
+          <el-input v-model="editForm.cycle" placeholder="请输入周期" />
+        </el-form-item>
+        <!-- <el-form-item label="负责人">
+          <el-input v-model="editForm.principalUser" placeholder="请输入负责人" />
+        </el-form-item> -->
+
+        <el-form-item label="子系统">
+          <el-input  :placeholder="`子系统 ${editForm.projectChildId}`"  disabled />
+        </el-form-item>
+        <el-form-item label="截止时间">
+          <el-date-picker v-model="editForm.deadLine" type="date" placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="子模块简介">
+          <el-input v-model="editForm.description" placeholder="请输入子模块简介" />
+        </el-form-item>
         <!-- 添加其他需要编辑的表单项 -->
       </el-form>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer" class="dialog-footer" style="display: flex;flex-direction: row;justify-content: center;">
         <el-button @click="handleCloseDialog">取消</el-button>
         <el-button type="primary" @click="submitEditInfo">确认</el-button>
       </span>
@@ -72,24 +98,81 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import { ElTable ,ElDialog, ElForm, ElFormItem, ElInput, ElButton } from 'element-plus';
-import { getProjectModList } from '@/api/manage';
+import { getProjectModList ,addModule } from '@/api/manage';
 import { useRouter, useRoute } from 'vue-router';
 import { getToken } from '@/utils/auth';
 
-
+//获取参数
+const route = useRoute();
+const sysId = route.query.id;
 
 const router = useRouter();
-const dialogVisible = ref(true);
+const dialogVisible = ref(false);
+//表单显示内容
 const editForm = ref({
-  name: '',
+  name: 'name',
   status: '',
-  // 添加其他需要编辑的表单项
+  workLoad: '',
+  cycle: '',
+  projectChildId: sysId,
+  deadLine: '',
+  description: '',
+  
 });
-// 点击编辑按钮打开弹窗
+// 点击新增按钮打开弹窗
 const openEditDialog = () => {
+  
+  
   dialogVisible.value = true;
+  // console.log(dialogVisible.value);
+  
 };
+//关闭弹窗
+const handleCloseDialog = ()=>{
+  dialogVisible.value = false;
+}
 
+const submitEditInfo = ()=>{
+     // 将日期对象转换为日期字符串
+     const formattedDate = editForm.value.deadLine instanceof Date ? editForm.value.deadLine.toISOString() : editForm.value.deadLine;
+
+
+    const body={
+      name: editForm.value.name,
+      status: editForm.value.status,
+      workLoad: editForm.value.workLoad,
+      cycle: editForm.value.cycle,
+      projectChildId: sysId,
+      deadLine: formattedDate,
+      description: editForm.value.description,
+      principalId: 1,
+    }
+    console.log(body);
+    
+    const promise = addModule(body,getToken());
+    console.log(promise);
+    
+    promise.then(res => {
+      if (res.data.code === 200) {
+        console.log(res.data);
+        
+        dialogVisible.value = false;
+      
+        fetchData();
+        ElMessage.success('新增成功');
+      } else {
+        ElMessage.error("新增失败" +res.message);
+        console.log(res.message);
+      }
+    }).catch(err => {
+      console.log(err);
+    })
+      
+    
+
+
+
+}
 
 // 路由跳转
 const toDetail = (id) => {
@@ -125,9 +208,7 @@ const tableData = ref<User[]>([
 
 
 
-//获取参数
-const route = useRoute();
-const sysId = route.query.id;
+
 
 
 //处理接口方法
diff --git a/src/views/personal/project/detail/manage.vue b/src/views/personal/project/detail/manage.vue
index 295917f..389bbd1 100644
--- a/src/views/personal/project/detail/manage.vue
+++ b/src/views/personal/project/detail/manage.vue
@@ -23,10 +23,7 @@
             }}</div>
                             <el-select v-if="item.label === '05.状态'" v-model="selectedStatus" placeholder="请选择状态"
                                 style="width: 150px ;margin-top: 10%">
-                                <el-option label="未开始" value="未开始"></el-option>
-                                <el-option label="进行中" value="进行中"></el-option>
-                                <el-option label="已完成" value="已完成"></el-option>
-                                <el-option label="异常暂停" value="异常暂停"></el-option>
+                               
                             </el-select>
                             <textarea style="resize: none;margin-top: 10%;width: 150px;" v-if="item.label === '07.简介'"
                                 v-model="item.value" rows="4" cols="50"></textarea>
@@ -82,13 +79,13 @@ projectItems.value.forEach(item => {
     if (item.label === '01.模块名称') {
         item.value = data.name;
     } else if (item.label === '02.模块周期') {
-        item.value = data.cycle ? data.cycle : '未知';
+        item.value = data.workLoad;
     } else if (item.label === '03.工作量') {
         item.value = data.workLoad + "人/天";
     } else if (item.label === '04.负责人') {
         item.value = data.principalUser;
     } else if (item.label === '05.状态') {
-        item.value = data.status ? data.status : '未知';
+        item.value = data.workLoad ? data.workLoad : '未知';
     } else if (item.label === '06.时间') {
         item.value =  new Date(data.deadLine).toLocaleDateString();
     } else if (item.label === '07.简介') {
diff --git a/src/views/personal/project/manage.vue b/src/views/personal/project/manage.vue
index 3492724..fc3fc29 100644
--- a/src/views/personal/project/manage.vue
+++ b/src/views/personal/project/manage.vue
@@ -291,7 +291,7 @@ const reset = () => {
 
 // 定义跳转到子系统的函数
 const toChildSystem = (id) => {
-  router.push({ name: 'ChildSysManage', query: { id: 4 } });//目前只有4有数据
+  router.push({ name: 'ChildSysManage', query: { id: id } });//目前只有4有数据
 };
 
 //编辑功能
-- 
2.43.0


From 8680c52ad9bdcd3bd65f7e543e75e326ba4fd894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Sun, 21 Apr 2024 02:49:08 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=92=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto-imports.d.ts                            |   1 +
 components.d.ts                              |   1 +
 src/api/manage.js                            |  46 +++++
 src/views/personal/project/detail/manage.vue | 195 ++++++++++++++-----
 4 files changed, 196 insertions(+), 47 deletions(-)

diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 8139ac9..24e619c 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -2,4 +2,5 @@
 export {}
 declare global {
   const ElMessage: typeof import('element-plus/es')['ElMessage']
+  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
 }
diff --git a/components.d.ts b/components.d.ts
index 3410aed..8c0f53f 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -24,6 +24,7 @@ declare module '@vue/runtime-core' {
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
diff --git a/src/api/manage.js b/src/api/manage.js
index 5a97cf7..6691ec5 100644
--- a/src/api/manage.js
+++ b/src/api/manage.js
@@ -219,6 +219,52 @@ export const addModule = (body,token) => {
 
     })
 }
+/**
+ * 
+ * 删除子模块
+ * @param {number} id 子模块ID
+ * @param {string} token 访问令牌
+ * @returns {Promise<AxiosResponse<any>>}
+ * 
+ */
+export const deleteModule = (id,token) => {
+    return axios({
+        url: api +"/project/module/delete?id=" +id ,
+        method: "delete",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+        },
+        
+
+
+    })
+}
+/**
+ * 
+ * 修改子模块
+ * @param {number} id 子模块ID
+ * @param {Object} body 包含子模块更新信息的对象
+ * @param {string} token 访问令牌
+ * @returns {Promise<AxiosResponse<any>>}
+ * 
+ */
+export const editModule = ( body,id,token) => {
+    return axios({
+        url: api +"/project/module/edit?id=" +id ,
+        method: "put",
+        headers: {
+            'Authorization': 'Bearer ' + token,
+            'Timestamp': getCurrentTimestamp()
+        },
+        data:body
+        
+
+
+    })
+}
+
+
 
 
 
diff --git a/src/views/personal/project/detail/manage.vue b/src/views/personal/project/detail/manage.vue
index 389bbd1..035ea54 100644
--- a/src/views/personal/project/detail/manage.vue
+++ b/src/views/personal/project/detail/manage.vue
@@ -2,8 +2,6 @@
     <div style=" width:100%;">
         <el-card style="max-width: 100vw;">
             <template #header><strong>子模块{{ projectId }}</strong></template>
-
-
         </el-card>
 
         <el-card class="card">
@@ -11,48 +9,51 @@
                 <el-col :span="12">
                     <el-row v-for="item in projectItems" :key="item.label">
                         <el-col :span="24">
-                            <div style="margin-top: 10%;"><strong>{{ item.label }}</strong> </div>
+                            <div style="margin-top: 10%;"><strong>{{ item.label }}</strong></div>
                         </el-col>
                     </el-row>
                 </el-col>
                 <el-col :span="12">
                     <el-row v-for="item in projectItems" :key="item.label">
                         <el-col :span="24">
-                            <div v-if="item.label !== '05.状态' && item.label !== '07.简介'" style="margin-top: 10%;">{{
-                item.value
-            }}</div>
-                            <el-select v-if="item.label === '05.状态'" v-model="selectedStatus" placeholder="请选择状态"
-                                style="width: 150px ;margin-top: 10%">
-                               
-                            </el-select>
-                            <textarea style="resize: none;margin-top: 10%;width: 150px;" v-if="item.label === '07.简介'"
-                                v-model="item.value" rows="4" cols="50"></textarea>
+                            <div v-if="item.label !== '07.简介'" style="margin-top: 10%;">
+                                <template v-if="editMode">
+                                    <input v-model="item.value" />
+                                </template>
+                                <template v-else>
+                                    {{ item.value }}
+                                </template>
+                            </div>
+                            <textarea v-if="item.label === '07.简介'" style="resize: none; margin-top: 10%; width: 100%;"
+                                v-model="item.value" :disabled="!editMode" rows="4" cols="50">
+                    </textarea>
                         </el-col>
                     </el-row>
                 </el-col>
             </el-row>
-
         </el-card>
         <div style="display: flex; justify-content: center;">
-            <el-button type="primary" style="width:80px">编辑</el-button>
-            <el-button style="width:80px ;background-color: #bd3124;color: azure;">删除</el-button>
-
+            <el-button @click="toggleEditMode" :type="editMode ? 'success' : 'primary'" style="width:80px">
+                {{ editMode ? '保存' : '编辑' }}
+            </el-button>
+            <el-button style="width:80px ;background-color: #bd3124;color: azure;" @click="deleteModuleClick">删除</el-button>
         </div>
 
-
-        <el-alert >
+        <el-alert>
             <router-view />
         </el-alert>
     </div>
 </template>
 
+
 <script lang="ts" setup>
 
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
-import { getProjectModDetail } from '@/api/manage';
+import { getProjectModDetail, editModule, deleteModule } from '@/api/manage';
 import { getToken } from '@/utils/auth';
 
+
 const projectItems = ref([
     { label: '01.模块名称', value: '项目名称1' },
     { label: '02.模块周期', value: '3个月' },
@@ -63,10 +64,14 @@ const projectItems = ref([
     { label: '07.简介', value: '大王iu大概iudg拍高端屁股的怕耽搁u对爬过文档爬过无' },
 ]);
 
-const selectedStatus = ref('进行中');
+const editMode = ref(false); // 编辑模式状态
 
+
+
+
+//获取id
 const route = useRoute();
-const projectId = route.query.id;
+const projectId = Number(route.query.id);
 
 
 
@@ -75,42 +80,138 @@ const projectId = route.query.id;
 const parseData = (data) => {
 
 
-projectItems.value.forEach(item => {
-    if (item.label === '01.模块名称') {
-        item.value = data.name;
-    } else if (item.label === '02.模块周期') {
-        item.value = data.workLoad;
-    } else if (item.label === '03.工作量') {
-        item.value = data.workLoad + "人/天";
-    } else if (item.label === '04.负责人') {
-        item.value = data.principalUser;
-    } else if (item.label === '05.状态') {
-        item.value = data.workLoad ? data.workLoad : '未知';
-    } else if (item.label === '06.时间') {
-        item.value =  new Date(data.deadLine).toLocaleDateString();
-    } else if (item.label === '07.简介') {
-        item.value = data.description;
-    }
-})
+    projectItems.value.forEach(item => {
+        if (item.label === '01.模块名称') {
+            item.value = data.name;
+        } else if (item.label === '02.模块周期') {
+            item.value = data.workLoad;
+        } else if (item.label === '03.工作量') {
+            item.value = data.workLoad ;
+        } else if (item.label === '04.负责人') {
+            item.value = "1";
+        } else if (item.label === '05.状态') {
+            item.value = data.workLoad.toString();
+        } else if (item.label === '06.时间') {
+            item.value = new Date(data.deadLine).toLocaleDateString();
+        } else if (item.label === '07.简介') {
+            item.value = data.description;
+        }
+    })
 }
 
 //获取数据方法
-const fetchData = () => {
-    const project = getProjectModDetail(projectId, getToken());
+const fetchData = async () => {
+    const res = await getProjectModDetail(projectId, getToken());
+    console.log(res.data);
+    if (res.data.data) {
+        parseData(res.data.data); // 解析数据
+        ElMessage.success('加载成功!');
+    }
+};
 
+const saveData = async () => {
+    // 创建提交给后端的数据对象
+    let payload = {
+        name: '',
+        description: '',
+        principalId: '', // 需要一种方式来映射或转换为ID
+        workLoad: '',
+        cycle: '',
+        completeTime: '',
+        status: '',
+        deadLine: ''
+    };
 
-    project.then(res => {
-        const data = res.data.data;
-        console.log(data);
-        if (data) {
-            parseData(data);
+    const formatDate = (dateStr) => {
+        const date = new Date(dateStr);
+        const year = date.getFullYear();
+        const month = (date.getMonth() + 1).toString().padStart(2, '0'); // 月份从0开始，所以需要+1
+        const day = date.getDate().toString().padStart(2, '0');
+        return `${year}-${month}-${day}`;
+    };
+
+    projectItems.value.forEach(item => {
+        switch (item.label) {
+            case '01.模块名称':
+                payload.name = item.value;
+                break;
+            case '02.模块周期':
+                payload.cycle = item.value.toString();
+                break;
+            case '03.工作量':
+                payload.workLoad = item.value.toString();
+                break;
+            case '04.负责人':
+                payload.principalId = item.value; // 假设这里的值已经是ID，或者需要其他逻辑处理为ID
+                break;
+            case '05.状态':
+                payload.status = item.value.toString();
+                break;
+            case '06.时间':
+                payload.completeTime = formatDate(item.value);
+                payload.deadLine = formatDate(item.value); // 如果deadLine和completeTime相同
+                break;
+            case '07.简介':
+                payload.description = item.value;
+                break;
         }
-    })
+    });
 
-}
+  
+
+
+
+    console.log(payload);
+
+    const res = editModule(payload, projectId, getToken());
+    res.then(response => {
+        if (response.data.code === 200) {
+            ElMessage.success('保存成功!');
+            fetchData(); // 刷新页面数据
+        } else {
+            ElMessage.error('保存失败!');
+        }
+    }).catch(error => {
+        ElMessage.error('保存失败!'+error);
+    });
+
+
+
+};
+
+
+const toggleEditMode = () => {
+    if (editMode.value) {
+        saveData(); // 如果当前处于编辑模式，调用 saveData 函数保存数据
+    }
+
+    editMode.value = !editMode.value; // 切换编辑模式的状态
+};
 
 fetchData();
 
+//删除模块
+const deleteModuleClick = () => {
+    //确认删除吗
+
+    const confirm = ElMessageBox.confirm('确认删除吗？');
+    confirm.then(() => {
+        const res = deleteModule(projectId, getToken());
+        res.then(response => {
+            if (response.data.code === 200) {
+                ElMessage.success('删除成功!');
+                //返回上一级页面
+                window.history.go(-1);
+            } else {
+                ElMessage.error('删除失败!');
+            }
+        }).catch(error => {
+            ElMessage.error('删除失败!'+error);
+        });
+    }).catch(() => {
+        //取消删除
+    });
+}
 
 
 
-- 
2.43.0


From d39f6079c3051bd374505055cb7984cb15a952be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Sun, 21 Apr 2024 19:07:00 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto-imports.d.ts                             |   1 -
 .../personal/project/childSystem/manage.vue   |   2 +-
 .../project/childSystem/participate.vue       |   3 +-
 .../personal/project/childmodel/manage.vue    |   2 +-
 src/views/personal/project/detail/manage.vue  |  17 ++-
 .../personal/project/detail/participate.vue   | 104 +++++++++---------
 src/views/personal/project/participate.vue    |   2 +
 7 files changed, 68 insertions(+), 63 deletions(-)

diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 24e619c..8139ac9 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -2,5 +2,4 @@
 export {}
 declare global {
   const ElMessage: typeof import('element-plus/es')['ElMessage']
-  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
 }
diff --git a/src/views/personal/project/childSystem/manage.vue b/src/views/personal/project/childSystem/manage.vue
index 8b9a7ba..84ed6be 100644
--- a/src/views/personal/project/childSystem/manage.vue
+++ b/src/views/personal/project/childSystem/manage.vue
@@ -45,7 +45,7 @@
           <el-button link style="color:deepskyblue" @click="toChildModel(row.id)">查看详情</el-button>
         </el-table-column>
       </el-table>
-      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
+      <el-pagination larger background layout="prev, pager, next" :total="5" class="mt-4"
         style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
     </el-card>
     <el-alert >
diff --git a/src/views/personal/project/childSystem/participate.vue b/src/views/personal/project/childSystem/participate.vue
index 1f795c1..a55f2b1 100644
--- a/src/views/personal/project/childSystem/participate.vue
+++ b/src/views/personal/project/childSystem/participate.vue
@@ -44,7 +44,7 @@
           <el-button link style="color:deepskyblue" @click="toChildModel(row.id)">查看详情</el-button>
         </el-table-column>
       </el-table>
-      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
+      <el-pagination larger background layout="prev, pager, next" :total="5" class="mt-4" 
         style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
     </el-card>
 
@@ -67,6 +67,7 @@ const projectid = route.query.projectId ? route.query.projectId : 1 ;
 
 
 
+
 //跳转到子模块
 const router = useRouter();
 
diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue
index 141e90d..31d4c1b 100644
--- a/src/views/personal/project/childmodel/manage.vue
+++ b/src/views/personal/project/childmodel/manage.vue
@@ -46,7 +46,7 @@
           <el-button link style="color:deepskyblue" @click="toDetail(row.id)">查看详情</el-button>
         </el-table-column>
       </el-table>
-      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
+      <el-pagination larger background layout="prev, pager, next" :total="5" class="mt-4"
         style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
     </el-card>
 
diff --git a/src/views/personal/project/detail/manage.vue b/src/views/personal/project/detail/manage.vue
index 035ea54..e298d24 100644
--- a/src/views/personal/project/detail/manage.vue
+++ b/src/views/personal/project/detail/manage.vue
@@ -16,7 +16,7 @@
                 <el-col :span="12">
                     <el-row v-for="item in projectItems" :key="item.label">
                         <el-col :span="24">
-                            <div v-if="item.label !== '07.简介'" style="margin-top: 10%;">
+                            <div v-if="item.label !== '07.简介'" style="margin-top: 11%;">
                                 <template v-if="editMode">
                                     <input v-model="item.value" />
                                 </template>
@@ -24,7 +24,7 @@
                                     {{ item.value }}
                                 </template>
                             </div>
-                            <textarea v-if="item.label === '07.简介'" style="resize: none; margin-top: 10%; width: 100%;"
+                            <textarea v-if="item.label === '07.简介'" style="resize: none; margin-top: 15%; width: 100%;"
                                 v-model="item.value" :disabled="!editMode" rows="4" cols="50">
                     </textarea>
                         </el-col>
@@ -52,13 +52,14 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { getProjectModDetail, editModule, deleteModule } from '@/api/manage';
 import { getToken } from '@/utils/auth';
+import { ElMessage, ElMessageBox } from 'element-plus';
 
 
 const projectItems = ref([
     { label: '01.模块名称', value: '项目名称1' },
     { label: '02.模块周期', value: '3个月' },
     { label: '03.工作量', value: '100小时' },
-    { label: '04.负责人', value: '张三' },
+    { label: '04.负责人ID', value: '张三' },
     { label: '05.状态', value: '进行中' },
     { label: '06.时间', value: '2024-01-01 12:00:00' },
     { label: '07.简介', value: '大王iu大概iudg拍高端屁股的怕耽搁u对爬过文档爬过无' },
@@ -87,10 +88,10 @@ const parseData = (data) => {
             item.value = data.workLoad;
         } else if (item.label === '03.工作量') {
             item.value = data.workLoad ;
-        } else if (item.label === '04.负责人') {
+        } else if (item.label === '04.负责人ID') {
             item.value = "1";
         } else if (item.label === '05.状态') {
-            item.value = data.workLoad.toString();
+            item.value = data.status.toString();
         } else if (item.label === '06.时间') {
             item.value = new Date(data.deadLine).toLocaleDateString();
         } else if (item.label === '07.简介') {
@@ -197,12 +198,16 @@ const deleteModuleClick = () => {
     const confirm = ElMessageBox.confirm('确认删除吗？');
     confirm.then(() => {
         const res = deleteModule(projectId, getToken());
+        console.log(res);
+        
         res.then(response => {
             if (response.data.code === 200) {
                 ElMessage.success('删除成功!');
                 //返回上一级页面
                 window.history.go(-1);
-            } else {
+            } else if(response.data.code === 40019) {
+                ElMessage.error('删除失败!没有权限');
+            }else{
                 ElMessage.error('删除失败!');
             }
         }).catch(error => {
diff --git a/src/views/personal/project/detail/participate.vue b/src/views/personal/project/detail/participate.vue
index 56926b8..28b50f8 100644
--- a/src/views/personal/project/detail/participate.vue
+++ b/src/views/personal/project/detail/participate.vue
@@ -1,9 +1,7 @@
 <template>
     <div style=" width:100%;">
         <el-card style="max-width: 100vw;">
-            <template #header><strong>子模块{{ id }}</strong></template>
-
-
+            <template #header><strong>子模块{{ projectId }}</strong></template>
         </el-card>
 
         <el-card class="card">
@@ -11,69 +9,72 @@
                 <el-col :span="12">
                     <el-row v-for="item in projectItems" :key="item.label">
                         <el-col :span="24">
-                            <div style="margin-top: 10%;"><strong>{{ item.label }}</strong> </div>
+                            <div style="margin-top: 10%;"><strong>{{ item.label }}</strong></div>
                         </el-col>
                     </el-row>
                 </el-col>
                 <el-col :span="12">
                     <el-row v-for="item in projectItems" :key="item.label">
                         <el-col :span="24">
-                            <div v-if="item.label !== '05.状态' && item.label !== '07.简介'" style="margin-top: 10%;">{{
-                item.value
-            }}</div>
-                            <el-select v-if="item.label === '05.状态'" v-model="selectedStatus" placeholder="请选择状态"
-                                style="width: 150px ;margin-top: 10%">
-                                <el-option label="未开始" value="未开始"></el-option>
-                                <el-option label="进行中" value="进行中"></el-option>
-                                <el-option label="已完成" value="已完成"></el-option>
-                                <el-option label="未知" value="未知"></el-option>
-                                <el-option label="异常暂停" value="异常暂停"></el-option>
-                            </el-select>
-                            <textarea style="resize: none;margin-top: 10%;width: 150px;" v-if="item.label === '07.简介'"
-                                v-model="item.value" rows="4" cols="50"></textarea>
+                            <div v-if="item.label !== '07.简介'" style="margin-top: 11%;">
+                                <template v-if="editMode">
+                                    <input v-model="item.value" />
+                                </template>
+                                <template v-else>
+                                    {{ item.value }}
+                                </template>
+                            </div>
+                            <textarea v-if="item.label === '07.简介'" style="resize: none; margin-top: 15%; width: 100%;"
+                                v-model="item.value" :disabled="!editMode" rows="4" cols="50">
+                    </textarea>
                         </el-col>
                     </el-row>
                 </el-col>
             </el-row>
-
         </el-card>
         <div style="display: flex;justify-content: center;">
             <el-button style="width: 80px;background-color: #409eff;color: azure" @click="toBack" >完成</el-button>
         </div>
         
 
-
-
-
-
-
+        <el-alert>
+            <router-view />
+        </el-alert>
     </div>
 </template>
 
+
 <script lang="ts" setup>
 
-import { getToken } from '@/utils/auth';
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
-import { getParticipateDetail } from '@/api/participate';
-
+import { getProjectModDetail} from '@/api/manage';
+import { getToken } from '@/utils/auth';
+import { ElMessage } from 'element-plus';
 
 
 const projectItems = ref([
-    { label: '01.模块名称', value: '名称1' },
+    { label: '01.模块名称', value: '项目名称1' },
     { label: '02.模块周期', value: '3个月' },
     { label: '03.工作量', value: '100小时' },
-    { label: '04.负责人', value: '张三' },
+    { label: '04.负责人ID', value: '张三' },
     { label: '05.状态', value: '进行中' },
     { label: '06.时间', value: '2024-01-01 12:00:00' },
-    { label: '07.简介', value: '测试ing' },
+    { label: '07.简介', value: '大王iu大概iudg拍高端屁股的怕耽搁u对爬过文档爬过无' },
 ]);
 
-const selectedStatus = ref('进行中');
+const editMode = ref(false); // 编辑模式状态
 
+
+
+
+//获取id
 const route = useRoute();
-const id = route.query.ModId;
+const projectId = Number(route.query.id);
 
+
+
+//加载数据
 //修改表单内数据
 const parseData = (data) => {
 
@@ -82,13 +83,13 @@ const parseData = (data) => {
         if (item.label === '01.模块名称') {
             item.value = data.name;
         } else if (item.label === '02.模块周期') {
-            item.value = data.cycle ? data.cycle : '未知';
+            item.value = data.workLoad;
         } else if (item.label === '03.工作量') {
-            item.value = data.workLoad + "人/天";
-        } else if (item.label === '04.负责人') {
-            item.value = data.principalUser;
+            item.value = data.workLoad ;
+        } else if (item.label === '04.负责人ID') {
+            item.value = "1";
         } else if (item.label === '05.状态') {
-            item.value = data.status ? data.status : '未知';
+            item.value = data.status.toString();
         } else if (item.label === '06.时间') {
             item.value = new Date(data.deadLine).toLocaleDateString();
         } else if (item.label === '07.简介') {
@@ -97,25 +98,17 @@ const parseData = (data) => {
     })
 }
 
+//获取数据方法
+const fetchData = async () => {
+    const res = await getProjectModDetail(projectId, getToken());
+    console.log(res.data);
+    if (res.data.data) {
+        parseData(res.data.data); // 解析数据
+        ElMessage.success('加载成功!');
+    }
+};
 
 
-//接收接口数据
-
-const fetchData = () => {
-    const project = getParticipateDetail(id, getToken());
-
-
-    project.then(res => {
-        const data = res.data.data;
-        console.log(data);
-        if (data) {
-            parseData(data);
-        }
-    })
-
-}
-fetchData();
-
 //完成返回上一级
 const toBack = () => {
     window.history.go(-1);
@@ -123,6 +116,11 @@ const toBack = () => {
 
 
 
+fetchData();
+
+
+
+
 
 
 
diff --git a/src/views/personal/project/participate.vue b/src/views/personal/project/participate.vue
index 8371a2e..09b596c 100644
--- a/src/views/personal/project/participate.vue
+++ b/src/views/personal/project/participate.vue
@@ -124,6 +124,8 @@ const parseData = (data) => {
 // 处理接口数据
 const fetchData = () => {
   const project = getParticipateProjectList(getToken());
+  console.log(project);
+  
   project.then(res => {
     const data = res.data.data.list;
     const dataTotal = res.data.data.total;
-- 
2.43.0


From 26a11623eae47b3d9f5810d2e3c88b7a3a4d6adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Mon, 22 Apr 2024 00:23:28 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/personal/project/detail/manage.vue  |  2 +-
 .../personal/project/detail/participate.vue   | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/personal/project/detail/manage.vue b/src/views/personal/project/detail/manage.vue
index e298d24..a95050d 100644
--- a/src/views/personal/project/detail/manage.vue
+++ b/src/views/personal/project/detail/manage.vue
@@ -85,7 +85,7 @@ const parseData = (data) => {
         if (item.label === '01.模块名称') {
             item.value = data.name;
         } else if (item.label === '02.模块周期') {
-            item.value = data.workLoad;
+            item.value = data.cycle;
         } else if (item.label === '03.工作量') {
             item.value = data.workLoad ;
         } else if (item.label === '04.负责人ID') {
diff --git a/src/views/personal/project/detail/participate.vue b/src/views/personal/project/detail/participate.vue
index 28b50f8..4ec657b 100644
--- a/src/views/personal/project/detail/participate.vue
+++ b/src/views/personal/project/detail/participate.vue
@@ -54,13 +54,13 @@ import { ElMessage } from 'element-plus';
 
 
 const projectItems = ref([
-    { label: '01.模块名称', value: '项目名称1' },
-    { label: '02.模块周期', value: '3个月' },
-    { label: '03.工作量', value: '100小时' },
-    { label: '04.负责人ID', value: '张三' },
-    { label: '05.状态', value: '进行中' },
-    { label: '06.时间', value: '2024-01-01 12:00:00' },
-    { label: '07.简介', value: '大王iu大概iudg拍高端屁股的怕耽搁u对爬过文档爬过无' },
+    { label: '01.模块名称', value: '' },
+    { label: '02.模块周期', value: '' },
+    { label: '03.工作量', value: '' },
+    { label: '04.负责人ID', value: '' },
+    { label: '05.状态', value: '' },
+    { label: '06.时间', value: '' },
+    { label: '07.简介', value: '' },
 ]);
 
 const editMode = ref(false); // 编辑模式状态
@@ -70,7 +70,7 @@ const editMode = ref(false); // 编辑模式状态
 
 //获取id
 const route = useRoute();
-const projectId = Number(route.query.id);
+const projectId = Number(route.query.ModId);
 
 
 
@@ -83,7 +83,7 @@ const parseData = (data) => {
         if (item.label === '01.模块名称') {
             item.value = data.name;
         } else if (item.label === '02.模块周期') {
-            item.value = data.workLoad;
+            item.value = data.cycle;
         } else if (item.label === '03.工作量') {
             item.value = data.workLoad ;
         } else if (item.label === '04.负责人ID') {
@@ -100,8 +100,10 @@ const parseData = (data) => {
 
 //获取数据方法
 const fetchData = async () => {
+    console.log(projectId);
+    
     const res = await getProjectModDetail(projectId, getToken());
-    console.log(res.data);
+    console.log(res);
     if (res.data.data) {
         parseData(res.data.data); // 解析数据
         ElMessage.success('加载成功!');
-- 
2.43.0


From e7d831c1af56f28ca944991629020b990536d8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CXCYH=E2=80=9D?= <“1561381013@qq.com”>
Date: Mon, 22 Apr 2024 15:51:07 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E5=B0=8F=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personal/project/childmodel/manage.vue    | 133 ++++++++++--------
 .../project/childmodel/participate.vue        |   2 +-
 2 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue
index 31d4c1b..172e097 100644
--- a/src/views/personal/project/childmodel/manage.vue
+++ b/src/views/personal/project/childmodel/manage.vue
@@ -46,15 +46,15 @@
           <el-button link style="color:deepskyblue" @click="toDetail(row.id)">查看详情</el-button>
         </el-table-column>
       </el-table>
-      <el-pagination larger background layout="prev, pager, next" :total="5" class="mt-4"
+      <el-pagination larger background layout="prev, pager, next" :total="total" class="mt-4" 
         style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
     </el-card>
 
 
     <!-- 新增弹窗 -->
-    <el-dialog title="新增子模块信息" v-model="dialogVisible" style="width: 27%" >
-      <el-form  :model="editForm" label-width="100px">
-        
+    <el-dialog title="新增子模块信息" v-model="dialogVisible" style="width: 27%">
+      <el-form :model="editForm" label-width="100px">
+
         <!-- <el-form-item label="序号">
           <el-input v-model="editForm.id" placeholder="请输入id" />
         </el-form-item> -->
@@ -70,21 +70,22 @@
         <el-form-item label="周期">
           <el-input v-model="editForm.cycle" placeholder="请输入周期" />
         </el-form-item>
-        <!-- <el-form-item label="负责人">
-          <el-input v-model="editForm.principalUser" placeholder="请输入负责人" />
-        </el-form-item> -->
-
-        <el-form-item label="子系统">
-          <el-input  :placeholder="`子系统 ${editForm.projectChildId}`"  disabled />
+        <el-form-item label="负责人">
+          <el-select v-model="editForm.principalId" placeholder="请选择负责人">
+            <el-option v-for="person in persons" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="截止时间">
-          <el-date-picker v-model="editForm.deadLine" type="date" placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="子模块简介">
-          <el-input v-model="editForm.description" placeholder="请输入子模块简介" />
-        </el-form-item>
-        <!-- 添加其他需要编辑的表单项 -->
+          <el-form-item label="子系统">
+            <el-input :placeholder="`子系统 ${editForm.projectChildId}`" disabled />
+          </el-form-item>
+          <el-form-item label="截止时间">
+            <el-date-picker v-model="editForm.deadLine" type="date" placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="子模块简介">
+            <el-input v-model="editForm.description" placeholder="请输入子模块简介" />
+          </el-form-item>
+          <!-- 添加其他需要编辑的表单项 -->
       </el-form>
       <span slot="footer" class="dialog-footer" style="display: flex;flex-direction: row;justify-content: center;">
         <el-button @click="handleCloseDialog">取消</el-button>
@@ -97,8 +98,8 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import { ElTable ,ElDialog, ElForm, ElFormItem, ElInput, ElButton } from 'element-plus';
-import { getProjectModList ,addModule } from '@/api/manage';
+import { ElTable, ElDialog, ElForm, ElFormItem, ElInput, ElButton } from 'element-plus';
+import { getProjectModList, addModule } from '@/api/manage';
 import { useRouter, useRoute } from 'vue-router';
 import { getToken } from '@/utils/auth';
 
@@ -108,6 +109,11 @@ const sysId = route.query.id;
 
 const router = useRouter();
 const dialogVisible = ref(false);
+const total = ref(5);
+
+
+
+
 //表单显示内容
 const editForm = ref({
   name: 'name',
@@ -117,58 +123,65 @@ const editForm = ref({
   projectChildId: sysId,
   deadLine: '',
   description: '',
-  
+  principalId: '',
+
 });
+
+const persons = [
+  {id:0 ,name:"principal_user"},
+  {id:1 ,name:"console_user"},
+  {id:2 ,name:"developer_user"}
+]
 // 点击新增按钮打开弹窗
 const openEditDialog = () => {
-  
-  
+
+
   dialogVisible.value = true;
   // console.log(dialogVisible.value);
-  
+
 };
 //关闭弹窗
-const handleCloseDialog = ()=>{
+const handleCloseDialog = () => {
   dialogVisible.value = false;
 }
 
-const submitEditInfo = ()=>{
-     // 将日期对象转换为日期字符串
-     const formattedDate = editForm.value.deadLine instanceof Date ? editForm.value.deadLine.toISOString() : editForm.value.deadLine;
+const submitEditInfo = () => {
+  // 将日期对象转换为日期字符串
+  const formattedDate = editForm.value.deadLine instanceof Date ? editForm.value.deadLine.toISOString() : editForm.value.deadLine;
 
 
-    const body={
-      name: editForm.value.name,
-      status: editForm.value.status,
-      workLoad: editForm.value.workLoad,
-      cycle: editForm.value.cycle,
-      projectChildId: sysId,
-      deadLine: formattedDate,
-      description: editForm.value.description,
-      principalId: 1,
+  const body = {
+    name: editForm.value.name,
+    status: editForm.value.status,
+    workLoad: editForm.value.workLoad,
+    cycle: editForm.value.cycle,
+    projectChildId: sysId,
+    deadLine: formattedDate,
+    description: editForm.value.description,
+    principalId: editForm.value.principalId,
+  }
+  console.log(body);
+
+  const promise = addModule(body, getToken());
+  console.log(promise);
+
+  promise.then(res => {
+    if (res.data.code === 200) {
+      console.log(res.data);
+
+      dialogVisible.value = false;
+
+      fetchData();
+      ElMessage.success('新增成功');
+    } else {
+      ElMessage.error("新增失败" + res.message);
+      console.log(res.message);
     }
-    console.log(body);
-    
-    const promise = addModule(body,getToken());
-    console.log(promise);
-    
-    promise.then(res => {
-      if (res.data.code === 200) {
-        console.log(res.data);
-        
-        dialogVisible.value = false;
-      
-        fetchData();
-        ElMessage.success('新增成功');
-      } else {
-        ElMessage.error("新增失败" +res.message);
-        console.log(res.message);
-      }
-    }).catch(err => {
-      console.log(err);
-    })
-      
-    
+  }).catch(err => {
+    console.log(err);
+  })
+
+
 
 
 
@@ -244,7 +257,7 @@ const fetchData = () => {
       const newData = data.map(item => parseData(item))
       //  console.log(newData);
 
-      tableData.value = [...newData, ...tableData.value];
+      tableData.value = [...newData];
       initialTableData.value = tableData.value.slice();  // 将tableData的内容赋值给initialTableData
 
     }
diff --git a/src/views/personal/project/childmodel/participate.vue b/src/views/personal/project/childmodel/participate.vue
index 656047f..8a2f319 100644
--- a/src/views/personal/project/childmodel/participate.vue
+++ b/src/views/personal/project/childmodel/participate.vue
@@ -43,7 +43,7 @@
           <el-button link style="color:deepskyblue" @click="toDetail(row.id)">查看详情</el-button>
         </el-table-column>
       </el-table>
-      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
+      <el-pagination larger background layout="prev, pager, next" :total="5" class="mt-4"
         style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
     </el-card>
 
-- 
2.43.0