feat(业务): 我负责的页面完善1

src/api/project.js

@@ -49,7 +49,7 @@ export function DeleteProject(id, token) {
 //编辑项目
 export function EditProject(id, data, token) {
   return request({
-    url: '/project/edit/',
+    url: '/project/edit',
     method: 'put',
     params:{ id },
     data,

src/views/personal/project/charge.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <!--顶部卡片-->
     <el-card style="max-width: 100vw;margin: 1.5vw;">
       <template #header>
         <div class="card-header">
@@ -35,6 +36,8 @@
       </div>
       <template #footer>Footer content</template>
     </el-card>
+
+    <!--表格卡片-->
     <el-card  style="max-width: 100vw;margin: 1.5vw;">
       <template #header>
         <div class="card-header" style="display: flex; justify-content: space-between; align-items: center;">
@@ -118,9 +121,6 @@
               <el-button link type="primary" size="small" @click="toggleEditDialog(row)">编辑</el-button>
               <el-button link type="primary" size="small" @click="toggleDeleteDialog(row)">删除</el-button>
             </div>
-            <div style="margin-bottom: 4px">
-              <el-button link type="primary" size="small" @click="toggleAppointDialog(row)">指定项目负责人</el-button>
-            </div>
             <div style="margin-bottom: 4px">
               <el-button link type="primary" size="small" @click="toChildSystem(row.id)">查看详情</el-button>
             </div>
@@ -129,14 +129,18 @@
       </el-table>
       <div style="display: flex; justify-content: center;margin-top: 2vh">
         <el-pagination
-            background
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="pageSize"
+            :total="total"
             layout="prev, pager, next"
-            :total="totalItems"
+            background
-        />
+            style="display: flex; justify-content: center; margin-top: 20px;">
+        </el-pagination>
+
       </div>
   </el-card>
 
-
     <!--新增项目对话框-->
     <el-dialog v-model="AddDialogVisible" title="新增项目" width="500">
       <el-form label-width="auto" style="max-width: 600px">
@@ -265,7 +269,6 @@
       </template>
     </el-dialog>
 
-
     <!--删除多个项目对话框-->
     <el-dialog
         title="删除项目"
@@ -402,27 +405,6 @@
         </div>
       </template>
     </el-dialog>
-  <!--指定项目负责人对话框-->
-  <el-dialog v-model="AppointDialogVisible" title="指定项目负责人">
-    <el-table :data="[currentRowData]" style="width: 100%">
-      <el-table-column prop="id" label="序号"></el-table-column>
-      <el-table-column prop="principalUser" label="项目负责人"></el-table-column>
-      <el-table-column label="选择新负责人">
-        <el-select v-model="selectedPrincipal" placeholder="请选择项目负责人">
-          <el-option v-for="option in appointOptions.option" :value="option.username">
-            {{option.username}}
-          </el-option>
-        </el-select>
-      </el-table-column>
-    </el-table>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="CancelAppoint()">取消</el-button>
-        <el-button type="primary" @click="confirmAppointment()">确认</el-button>
-      </div>
-    </template>
-  </el-dialog>
-
   </div>
 </template>
 <script lang="ts" setup>
@@ -444,8 +426,9 @@ const tableData = ref([]);
 const listLoading = ref(false);
 const token = getToken();
 const page = ref('');
-const pageSize = ref('');
+const currentPage = ref(1);
-const totalItems = ref(0);
+const pageSize = ref(10);  // 你可以根据需要设置默认的页面大小
+const total = ref(0);
 const editId = reactive({ id:'', })
 const searchData = reactive({ name:'', });
 const deleteDatas = reactive({ ids: '' });
@@ -512,38 +495,46 @@ async function getList() {
   console.log("use token:", token);
   listLoading.value = true;
   try {
+    // 确保这里传递了 page 和 pageSize 参数
     const response = await GetProject(page.value, pageSize.value, token);
-    console.log("完整响应内容:", response);
+    if (response.data && response.data.list) {
-    if (response.data.list) {
+      tableData.value = response.data.list.map(item => parseData(item));
-      const list = response.data.list;
+      total.value = response.data.total;  // 设置总项目数
-      tableData.value = list.map(item => parseData(item));
-      totalItems.value = response.data.total;
     } else {
       console.error("未获取到预期数据，响应内容:", response);
+      tableData.value = [];
+      total.value = 0;
     }
   } catch (error) {
     console.error('请求失败:', error);
+    tableData.value = [];
+    total.value = 0;
   } finally {
     listLoading.value = false;
   }
 }
 
+function handleCurrentChange(newPage) {
+  page.value = newPage;
+  getList();  // 重新获取当前页的数据
+}
+
+
 //新增项目
 function toggleAddDialog() {
   AddDialogVisible.value = !AddDialogVisible.value;
 }
 
 async function addProject() {
-  console.log("add token:", token);
   try {
     const res = await AddProject(AddFormData, token);
-    if (res.data) {
+    if (res.code===200) {
-      getList();
       listLoading.value = true;
       ElMessage({
         message: '新增成功',
         type: 'success',
       })
+      getList();
     } else {
       console.error("未获取到预期数据，响应内容:", res);
     }
@@ -688,45 +679,6 @@ function reset() {
   getList();
 }
 
-
-//指定项目负责人
-async function getAppointOptions() {
-  try {
-    const response = await GetAppointOptions(token);
-    if (response.code === 200) {
-      appointOptions.option = response.data;
-    } else {
-      console.error("无数据");
-    }
-  } catch (error) {
-    console.error('Error fetching status options:', error);
-  }
-};
-
-function toggleAppointDialog(row) {
-  currentRowData.value = row;
-  AppointDialogVisible.value = true;
-}
-
-
-function confirmAppointment() {
-  console.log("指定新负责人:", selectedPrincipal.value);
-  // 在这里添加将确认结果发送到服务器的代码
-  AppointDialogVisible.value = false;
-  ElMessage({
-    message: '项目负责人更新成功',
-    type: 'success',
-    duration: 3000
-  });
-  getList();
-}
-
-function CancelAppoint() {
-  AppointDialogVisible.value = false;
-}
-
-
-
 onMounted(async () => {
   await getList();  // 确保数据加载完成
   await getAppointOptions();

src/views/personal/project/childSystem/charge.vue

@@ -403,7 +403,7 @@ import {
   AddChildSystem,
   DeleteChildSystem,
   DeleteProject,
-  EditChildSystem, GetAppointOptions,
+  EditChildSystem, EditProject, GetAppointOptions,
   GetChildSysById,
   GetProjectByName
 } from '@/api/project';
@@ -496,7 +496,6 @@ function toggleAddDialog() {
 }
 
 async function addChildSystem() {
-  console.log("add token:", token);
   try {
     const res = await AddChildSystem(AddFormData, token);
     if (res.code===200) {
@@ -650,8 +649,11 @@ function toggleAppointDialog(row) {
 }
 
 
-function confirmAppointment() {
+async function confirmAppointment() {
   console.log("指定新负责人:", selectedPrincipal.value);
+  const response = await EditChildSystem(editId, EditFormData, token);
+  if (response.code===200){
+    console.log("指定负责人Result:", response);
     AppointDialogVisible.value = false;
     ElMessage({
       message: '子系统负责人更新成功',
@@ -659,7 +661,15 @@ function confirmAppointment() {
       duration: 3000
     });
     getChildSysById();
+  } else {
+    ElMessage({
+      message:'子系统负责人更新失败',
+      type: 'warning',
+      duration: 3000
+    })
   }
+}
+
 
 function CancelAppoint() {
   AppointDialogVisible.value = false;