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] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90=EF=BC=88=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=95=B0=E6=8D=AE=E8=BF=98=E5=B7=AE=E5=87=A0=E4=B8=AA?=
 =?UTF-8?q?=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 } });
 };
 
 // 监听表格行选择事件