From 354a4213b43383e6e65f8c4c10ac810b273567b6 Mon Sep 17 00:00:00 2001
From: wuyize <wuyize25@163.com>
Date: Thu, 30 Jun 2022 14:30:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9C=A8=E9=80=94=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E3=80=81=E5=B7=B2=E7=BB=93=E9=A1=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E5=BE=85=E4=B8=8E=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js          |   5 ++
 src/views/ClosedProject.vue  | 141 +++++++++++++++++++++++++++++++++++
 src/views/Home.vue           |   5 +-
 src/views/OngoingProject.vue |  99 ++++++++++++++++++++----
 4 files changed, 233 insertions(+), 17 deletions(-)
 create mode 100644 src/views/ClosedProject.vue

diff --git a/src/router/index.js b/src/router/index.js
index 5326abe..735c209 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,6 +4,7 @@ import {createWebHistory} from "vue-router/dist/vue-router.esm-browser"
 import Login from "@/views/Login.vue"
 import Project from "@/views/Project.vue";
 import OngoingProject from "../views/OngoingProject";
+import ClosedProject from "../views/ClosedProject";
 const routes = [
   {
     path: '/',
@@ -14,6 +15,10 @@ const routes = [
         path: '',
         component: OngoingProject,
       },
+      {
+        path: '/ClosedProject',
+        component: ClosedProject,
+      },
     ],
   },
   {
diff --git a/src/views/ClosedProject.vue b/src/views/ClosedProject.vue
new file mode 100644
index 0000000..b8dd9ac
--- /dev/null
+++ b/src/views/ClosedProject.vue
@@ -0,0 +1,141 @@
+<template>
+  <div style="width: 100%;height: 100%;display: flex;flex-direction: column;align-items: stretch">
+
+    <p style="margin-left: 40px;font-family: 'Segoe UI',sans-serif;font-size: 20px;font-weight: bold;">已结项项目</p>
+
+    <div style="flex: 1; margin: 30px 30px 10px 30px; background-color: white; border-radius: 10px;padding: 20px;
+              display: flex;flex-direction: column;justify-content: space-between">
+
+      <el-table
+          ref="tableRef"
+          class="projectTable"
+          :height="tableHeight"
+          :data="tableData">
+        <el-table-column prop="name" label="项目名称" min-width="15%"/>
+        <el-table-column prop="price" label="合同额（万）" min-width="10%"/>
+        <el-table-column prop="important" label="重要程度" min-width="10%"/>
+        <el-table-column prop="classification" label="项目分类" min-width="10%"/>
+        <el-table-column prop="type" label="项目类型" min-width="10%"/>
+        <el-table-column label="项目进度" min-width="35%">
+          <template #default="scope">
+            <el-progress :text-inside="true" :stroke-width="18" :status="scope.row.schedule === 100 ? 'success' : ''"
+                         :percentage="scope.row.schedule"></el-progress>
+          </template>
+        </el-table-column>
+        <el-table-column prop="closeDate" label="结项日期" min-width="10%" align="right"/>
+      </el-table>
+
+      <!-- 分页 -->
+      <el-pagination
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+          v-model:currentPage ="currentPage"
+          :page-sizes="[5, 10, 15, 20]"
+          :page-size="perPage"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="count"
+          style="float: right;margin-top: 20px;">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script setup>
+// table元素
+import {onMounted, ref} from "vue";
+
+const tableRef = ref(null);
+// table高度
+const tableHeight = ref();
+
+onMounted(() => {
+  // 设置表格初始高度为innerHeight-offsetTop-表格底部与浏览器底部距离85
+  tableHeight.value = window.innerHeight - tableRef.value.$el.offsetTop - 110;
+  // 监听浏览器高度变化
+  window.onresize = () => {
+    tableHeight.value = window.innerHeight - tableRef.value.$el.offsetTop - 110;
+  };
+});
+
+</script>
+<script>
+export default {
+  name: "OngoingProject",
+  data() {
+    return {
+
+      count: 100,
+      currentPage: 1,
+      perPage: 10,
+
+      tableData: [{
+        name: 'OTC研发项目',
+        price: 100,
+        important: '非A类',
+        classification: '外包项目',
+        type: '工作量结算类',
+        schedule: 0,
+        closeDate: '2022-6-30'
+      },
+        {
+          name: 'OTC研发项目',
+          price: 100,
+          important: '非A类',
+          classification: '研发项目',
+          type: '纯研发类',
+          schedule: 50,
+          closeDate: '2022-6-30'
+
+        },
+        {
+          name: 'OTC研发项目',
+          price: 100,
+          important: '非A类',
+          classification: '研发项目',
+          type: '纯研发类',
+          schedule: 100,
+          closeDate: '2022-6-30'
+        },
+        {
+          name: 'OTC研发项目',
+          price: 100,
+          important: '非A类',
+          classification: '研发项目',
+          type: '纯研发类',
+          schedule: 100,
+          closeDate: '2022-6-30'
+        },
+
+        {
+          name: '教育电商项目',
+          price: 100,
+          important: '非A类',
+          classification: '研发项目',
+          type: '纯研发类',
+          schedule: 100,
+          closeDate: '2022-6-30'
+        },
+
+
+      ]
+    }
+  },
+  methods: {
+    // 选择一页显示多少条数据
+    handleSizeChange(val) {
+
+    },
+    // 选择当前的是第几页
+    handleCurrentChange(val) {
+
+    },
+    onCloseProject(row) {}
+  }
+}
+</script>
+
+<style scoped>
+.projectTable {
+  width: 100%;
+}
+
+</style>
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 9781142..df4af4a 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -3,6 +3,7 @@
     <el-aside width="260px"
               style="display: flex;flex-direction: column;align-items: stretch;overflow: unset">
       <el-menu
+          router
           style="height: 100%"
           default-active="1">
         <div
@@ -10,10 +11,10 @@
           <svg-icon style="width: 52px;height: 52px;margin: 10px" icon-class="logo"></svg-icon>
           <p style="font-family: 'Segoe UI',sans-serif;font-size: 20px;font-weight: bold;color: #606266">项目<br/>管理系统</p>
         </div>
-        <el-menu-item index="1">
+        <el-menu-item index="1" route="/">
           <span>在途项目</span>
         </el-menu-item>
-        <el-menu-item index="2">
+        <el-menu-item index="2" route="/ClosedProject">
           <span>已结项项目</span>
         </el-menu-item>
       </el-menu>
diff --git a/src/views/OngoingProject.vue b/src/views/OngoingProject.vue
index bc04f50..8881759 100644
--- a/src/views/OngoingProject.vue
+++ b/src/views/OngoingProject.vue
@@ -1,34 +1,41 @@
 <template>
   <div style="width: 100%;height: 100%;display: flex;flex-direction: column;align-items: stretch">
-    <div style="flex: 1; margin: 30px 30px 30px 30px; background-color: white; border-radius: 10px;padding: 20px;
-              display: flex;flex-direction: column">
+
+    <div style="margin: 0 40px 0 40px;
+                display: flex;flex-direction: row;justify-content: space-between">
+      <p style="font-family: 'Segoe UI',sans-serif;font-size: 20px;font-weight: bold;">在途项目</p>
+      <el-button type="primary" >新增项目</el-button>
+    </div>
+    <div style="flex: 1; margin: 30px 30px 10px 30px; background-color: white; border-radius: 10px;padding: 20px;
+              display: flex;flex-direction: column;justify-content: space-between">
 
       <el-table
+          ref="tableRef"
           class="projectTable"
+          :height="tableHeight"
           :data="tableData">
-        <el-table-column prop="name" label="项目名称" />
-        <el-table-column prop="price" label="合同额（万）" />
-        <el-table-column prop="important" label="重要程度"/>
-        <el-table-column prop="classification" label="项目分类"/>
-        <el-table-column prop="type" label="项目类型" />
-        <el-table-column label="项目进度" >
+        <el-table-column prop="name" label="项目名称" min-width="15%"/>
+        <el-table-column prop="price" label="合同额（万）" min-width="10%"/>
+        <el-table-column prop="important" label="重要程度" min-width="10%"/>
+        <el-table-column prop="classification" label="项目分类" min-width="10%"/>
+        <el-table-column prop="type" label="项目类型" min-width="10%"/>
+        <el-table-column label="项目进度" min-width="35%">
           <template #default="scope">
             <el-progress :text-inside="true" :stroke-width="18" :status="scope.row.schedule === 100 ? 'success' : ''"
                          :percentage="scope.row.schedule"></el-progress>
           </template>
         </el-table-column>
-        <el-table-column>
+        <el-table-column min-width="10%" align="right">
           <template #default="scope">
-            <el-button type="primary" @click="onCloseProject(scope.row)">结项</el-button>
+            <el-button type="primary" plain @click="onCloseProject(scope.row)">结项</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <!-- 分页 -->
       <el-pagination
           @current-change="handleCurrentChange"
           @size-change="handleSizeChange"
-          :current-page="currentPage"
+          v-model:currentPage ="currentPage"
           :page-sizes="[5, 10, 15, 20]"
           :page-size="perPage"
           layout="total, sizes, prev, pager, next, jumper"
@@ -38,13 +45,29 @@
     </div>
   </div>
 </template>
+<script setup>
+// table元素
+import {onMounted, ref} from "vue";
 
+const tableRef = ref(null);
+// table高度
+const tableHeight = ref();
+
+onMounted(() => {
+  // 设置表格初始高度为innerHeight-offsetTop-表格底部与浏览器底部距离85
+  tableHeight.value = window.innerHeight - tableRef.value.$el.offsetTop - 110;
+  // 监听浏览器高度变化
+  window.onresize = () => {
+    tableHeight.value = window.innerHeight - tableRef.value.$el.offsetTop - 110;
+  };
+});
+
+</script>
 <script>
 export default {
   name: "OngoingProject",
   data() {
     return {
-
       count: 100,
       currentPage: 1,
       perPage: 10,
@@ -90,8 +113,54 @@ export default {
           type: '纯研发类',
           schedule: 100
         },
-
-
+        {
+          name: '教育电商项目',
+          price: 100,
+          important: '非A类',
+          classification: '研发项目',
+          type: '纯研发类',
+          schedule: 100
+        },
+        {
+          name: '教育电商项目',
+          price: 100,
+          important: '非A类',
+          classification: '研发项目',
+          type: '纯研发类',
+          schedule: 100
+        },
+        {
+          name: '教育电商项目',
+          price: 100,
+          important: '非A类',
+          classification: '研发项目',
+          type: '纯研发类',
+          schedule: 100
+        },
+        {
+          name: '教育电商项目',
+          price: 100,
+          important: '非A类',
+          classification: '研发项目',
+          type: '纯研发类',
+          schedule: 100
+        },
+        {
+          name: '教育电商项目',
+          price: 100,
+          important: '非A类',
+          classification: '研发项目',
+          type: '纯研发类',
+          schedule: 100
+        },
+        {
+          name: '教育电商项目',
+          price: 100,
+          important: '非A类',
+          classification: '研发项目',
+          type: '纯研发类',
+          schedule: 100
+        },
       ]
     }
   },