我管理的模块修改，差数据和几个功能和权限分配

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()
+        }
+
+
+    })
+}
+
+
+
 
 
 

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="description" label="子系统简介"  >
-        <el-table-column property="address" label="截止时间" />
+          <template #default="{row}">
-        <el-table-column property="address" label="操作">
+            <span >{{ row.description.description }}</span>
-          <el-button link style="color:deepskyblue" @click="toChildModel">查看详情</el-button>
+          </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 { useRoute } from 'vue-router';
-// import { getToken } from '@/utils/auth';
+import { getToken } from '@/utils/auth';
+import { getProjectSysList } from '@/api/manage';
 
 //跳转到子模块
 const router = useRouter();
 
-const toChildModel = () => {
+const toChildModel = (id) => {
-  router.push({ name: 'ChildModManage' })
+  router.push({ name: 'ChildModManage' , query: { id: id } })
 };
 
 const input = ref('');
 
 interface User {
-  cycle:number
+    id: number
-  description:string
-  isDelete:number
-  isFinish:number
-  name:string
     principalId: number
     projectId: number
-  status:boolean
+    name: string
-  type:number
+    cycle: number
     workLoad: number
-  id:number
+    description: { description: string }
+    isDelete: number
+    createdAt: string
 }
 
 const multipleTableRef = ref<InstanceType<typeof ElTable>>();
@@ -84,52 +88,61 @@ 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
-  }
 ]);
+const initialTableData = ref<User[]>([]);
+
+// 获取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());
+
     //处理数据
-// searchSys.then(res => {
+    project.then(res=>{
-//   const data = res.data.data;
+      const data = res.data.data
-//   console.log(data);
 
-//   if (data) {
+      // console.log(data)
-//     tableData.value = data.map(item =>{
+      if(data){
-//       const addproject: User = {
+           const newData = data.map(item=>parseData(item))
-//         id: item.id,
+           console.log(newData);
-//         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 = [...newData,...tableData.value];
+           initialTableData.value = tableData.value.slice();  // 将tableData的内容赋值给initialTableData
 
-//     }) 
+      }
+      
+
+    })
+  }
+
+  fetchData();
       
       
    
@@ -137,16 +150,6 @@ const tableData = ref<User[]>([
       
 
 
-//     }else{
-//       console.log("没有数据");
-      
-//     }
-  
-//     console.log(tableData.value);
-
-// }).catch(err => {
-//   console.log(err);
-// });
 
 
 

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,

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 >子系统1</strong></template>
+      <template #header><strong>子系统{{ id }}</strong></template>
       <div style="display:flex;flex-direction:row;justify-content: space-around ">
         <div>
           名称
@@ -19,51 +19,33 @@
     </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
+        <el-button text type=''>子模块列表</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
+      <el-table ref="multipleTableRef" :data="tableData" style="max-width: 100vw;"
-                    ref="multipleTableRef"
+        @selection-change="handleSelectionChange">
-                    :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>
+          <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="address" label="负责人"  />
+        <el-table-column property="principalUser" label="负责人" />
         <el-table-column property="address" 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="操作"  >
+        <el-table-column property="address" label="操作" #default="{row}">
-                    <el-button
+          <el-button link style="color:deepskyblue" @click="toDetail(row.id)">查看详情</el-button>
-                            link
-                            style="color:deepskyblue"
-                            @click="toDetail"
-                    >查看详情</el-button
-                    >
         </el-table-column>
       </el-table>
-            <el-pagination
+      <el-pagination larger background layout="prev, pager, next" :total="50" class="mt-4"
-                    larger
+        style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" />
-                    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>
@@ -72,21 +54,27 @@
 <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';
 
-  import { useRouter } from 'vue-router';
 
 
 const router = useRouter();
 
 // 路由跳转
-  const toDetail = () => {
+const toDetail = (id) => {
-    router.push({ name: 'ManageDetail' }); // 跳转到子系统详情页面
+  router.push({ name: 'ManageDetail' ,query: { id: id } }); // 跳转到子系统详情页面
 };
 
 interface User {
-      date: string
+  id: number
   name: string
-      address: string
+  principalId: number
+  principalUser:string
+  workLoad: number
+  description: { description: string }
+  status: boolean
 }
 
 const multipleTableRef = ref<InstanceType<typeof ElTable>>();
@@ -98,29 +86,60 @@
 
 const input = ref('');
 
-  const tableData: User[] = [
+const initialTableData = ref<User[]>([]);
-    {
+const tableData = ref<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'
+const route = useRoute();
-    },
+const id = route.query.id;
-    {
+
-      date: '2016-05-04',
+
-      name: 'Tom',
+//处理接口方法
-      address: 'No. 189, Grove St, Los Angeles'
+const parseData = (data) => {
-    },
+    const description = JSON.parse(data.description);
-    {
+
-      date: '2016-05-01',
+
-      name: 'Tom',
+  return{
-      address: 'No. 189, Grove St, Los Angeles'
+      id: data.id,
+      name: data.name,
+      principalId: data.principalId,
+      principalUser: data.principalUser,
+      workLoad: data.workLoad,
+      description: description,
+      status: data.status
   }
 
-  ];
+}
+
+//接口处理
+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);
+  })
+  
+}
+fetchData();
+
 
 
 </script>
@@ -129,14 +148,17 @@
   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;
 }

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);

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();
+
 
 
 

src/views/personal/project/detail/participate.vue

@@ -37,6 +37,9 @@
             </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);
+}
 
 
 

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" />-->
@@ -49,8 +56,8 @@
           </template>
         </el-table-column>
         <el-table-column property="dateline" label="截止时间" />
-        <el-table-column property="name" label="操作">
+        <el-table-column property="name" label="操作" #default="{row}">
-          <el-button link style="color:deepskyblue" @click="toChildSystem">查看详情</el-button>
+          <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"
@@ -76,8 +83,8 @@ import { getManageList } from '@/api/manage.js';
 const router = useRouter();
 
 // 路由跳转
-const toChildSystem = () => {
+const toChildSystem = (id) => {
-  router.push({ name: 'ChildSysManage' }); // 跳转到子系统详情页面
+  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;