From 36037fcb8ce92b10c4d89c8b58f665bcad3c80e6 Mon Sep 17 00:00:00 2001
From: Kane <wangkane@qq.com>
Date: Thu, 26 Jan 2023 11:02:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=BF=9B=E5=BA=A6=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/admin_system/src/layout/Index.vue     |  28 ++--
 .../src/layout/components/Aside.vue           |   7 +-
 .../src/layout/components/Main.vue            |  21 ++-
 .../views/requirement/RequirementManager.vue  | 145 ++++++++++--------
 4 files changed, 115 insertions(+), 86 deletions(-)

diff --git a/企业级管理系统/web/admin_system/src/layout/Index.vue b/企业级管理系统/web/admin_system/src/layout/Index.vue
index 4a52dec..7366ab4 100644
--- a/企业级管理系统/web/admin_system/src/layout/Index.vue
+++ b/企业级管理系统/web/admin_system/src/layout/Index.vue
@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2023-01-04 11:05:44
  * @LastEditors: Kane
- * @LastEditTime: 2023-01-26 01:56:37
+ * @LastEditTime: 2023-01-26 10:29:03
  * @FilePath: \admin_system\src\layout\Index.vue
  * @Description: 
  * 
@@ -55,32 +55,34 @@ export default {
   /* min-width: 1280px; */
 }
 
-#layout-aside {
-  /* width: 175px; */
-  background-color: #2f4156;
-  overflow-x: hidden;
+#layout-container-down {
   height: calc(100vh - 50px);
   max-height: calc(100vh - 50px);
   min-height: calc(100vh - 50px);
 }
 
+#layout-aside {
+  /* width: 175px; */
+  background-color: #2f4156;
+  overflow-x: hidden;
+  /* height: calc(100vh - 50px);
+  max-height: calc(100vh - 50px);
+  min-height: calc(100vh - 50px); */
+  height: 100%;
+}
+
 #layout-header {
   height: 50px;
-  /* background-color: #77bc99; */
   padding: 0px;
   flex-grow: 0;
 }
 
 #layout-main {
   background-color: #ecf2f9;
-  /* height: 0; */
+  padding: 0px;
+  height: 100%;
+  /* height: calc(100vh - 50px); */
   /* flex-grow: 1; */
   /* overflow: overlay; */
 }
-
-#layout-container-down {
-  height: calc(100vh - 50px);
-  max-height: calc(100vh - 50px);
-  min-height: calc(100vh - 50px);
-}
 </style>
\ No newline at end of file
diff --git a/企业级管理系统/web/admin_system/src/layout/components/Aside.vue b/企业级管理系统/web/admin_system/src/layout/components/Aside.vue
index 23ae695..ad31cf5 100644
--- a/企业级管理系统/web/admin_system/src/layout/components/Aside.vue
+++ b/企业级管理系统/web/admin_system/src/layout/components/Aside.vue
@@ -2,14 +2,14 @@
  * @Author: Kane
  * @Date: 2023-01-04 11:30:33
  * @LastEditors: Kane
- * @LastEditTime: 2023-01-25 23:44:43
+ * @LastEditTime: 2023-01-26 08:10:40
  * @FilePath: \admin_system\src\layout\components\Aside.vue
  * @Description: 
  * 
  * Copyright (c) ${2022} by Kane, All Rights Reserved.  223142 2f4156
 -->
 <template>
-    <div class="wrapper">
+    <el-scrollbar class="wrapper">
         <el-menu id="side-bar" router :default-active="currentPath" background-color="#2f4156" text-color="#fff"
             active-text-color="#ffd04b" :collapse="asideCollapse">
             <template v-for="route in this.routers" :key="route.path">
@@ -42,7 +42,7 @@
                 </template>
             </template>
         </el-menu>
-    </div>
+    </el-scrollbar>
 </template>
 
 <script>
@@ -146,6 +146,5 @@ export default {
 
 .wrapper {
     height: 100%;
-    overflow-y: overlay;
 }
 </style>
\ No newline at end of file
diff --git a/企业级管理系统/web/admin_system/src/layout/components/Main.vue b/企业级管理系统/web/admin_system/src/layout/components/Main.vue
index 10dfc61..3deba63 100644
--- a/企业级管理系统/web/admin_system/src/layout/components/Main.vue
+++ b/企业级管理系统/web/admin_system/src/layout/components/Main.vue
@@ -2,16 +2,20 @@
  * @Author: Kane
  * @Date: 2023-01-04 11:40:03
  * @LastEditors: Kane
- * @LastEditTime: 2023-01-26 01:54:00
+ * @LastEditTime: 2023-01-26 10:46:37
  * @FilePath: \admin_system\src\layout\components\Main.vue
  * @Description: 
  * 
  * Copyright (c) ${2022} by Kane, All Rights Reserved. 
 -->
 <template>
-    <div class="main-content">
-        <router-view />
-    </div>
+    <!-- <div class="main-content"> -->
+    <el-scrollbar>
+        <div class="view-wrapper">
+            <router-view />
+        </div>
+    </el-scrollbar>
+    <!-- </div> -->
 </template>
 
 <script>
@@ -21,8 +25,11 @@ export default {
 </script>
 
 <style scoped>
-.main-content {
-    min-height: calc(100vh - 75px);
-    /* overflow: overlay; */
+.el-scrollbar {
+    height: 100%;
+}
+
+.view-wrapper {
+    margin: 25px;
 }
 </style>
\ No newline at end of file
diff --git a/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue b/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue
index 0475ed1..f3a0305 100644
--- a/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue
+++ b/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue
@@ -2,65 +2,71 @@
  * @Author: Kane
  * @Date: 2023-01-25 23:13:47
  * @LastEditors: Kane
- * @LastEditTime: 2023-01-26 01:51:53
+ * @LastEditTime: 2023-01-26 10:56:40
  * @FilePath: \admin_system\src\views\requirement\RequirementManager.vue
  * @Description: 
  * 
  * Copyright (c) ${2022} by Kane, All Rights Reserved. 
 -->
 <template>
-    <div class="search-box">
-        <el-row :gutter="10">
-            <el-col :span="2">
-                <span>需求编号：</span>
-            </el-col>
-            <el-col :span="4">
-                <el-input></el-input>
-            </el-col>
-            <el-col :span="2">
-                <span>申请人：</span>
-            </el-col>
-            <el-col :span="4">
-                <el-input></el-input>
-            </el-col>
-            <el-col :span="2">
-                <span>状态：</span>
-            </el-col>
-            <el-col :span="4">
-                <el-input></el-input>
-            </el-col>
-            <el-col :span="6"></el-col>
-        </el-row>
-        <el-row :gutter="10">
-            <el-col :span="2">
-                <span>提交日期：</span>
-            </el-col>
-            <el-col :span="4">
-                <el-date-picker v-model="query_param.submit_start_date" style="width:100%;"></el-date-picker>
-            </el-col>
-            <el-col :span="2">
-                <span>至：</span>
-            </el-col>
-            <el-col :span="4">
-                <el-date-picker v-model="query_param.submit_end_date" style="width:100%;"></el-date-picker>
-            </el-col>
-            <el-col :span="6">
-                <div class="button-wrapper-right">
-                    <el-button type="primary" icon="search">查询</el-button>
-                    <el-button icon="Refresh">重置</el-button>
-                </div>
-            </el-col>
-            <el-col :span="6"></el-col>
-        </el-row>
-    </div>
-    <div class="tool-button-wrapper">
-        <el-row>
-            <el-col>
-                <el-button type="success" icon="DocumentAdd" plain>新增</el-button>
-                <el-button type="warning" icon="edit" plain>修改</el-button>
-                <el-button type="danger" icon="delete" plain>删除</el-button>
-            </el-col>
-        </el-row>
+    <div class="requirement_wrapper">
+        <div class="search-box">
+            <el-row :gutter="10">
+                <el-col :span="2">
+                    <span>需求编号：</span>
+                </el-col>
+                <el-col :span="4">
+                    <el-input v-model="query_param.requirement_serial"></el-input>
+                </el-col>
+                <el-col :span="2">
+                    <span>申请人：</span>
+                </el-col>
+                <el-col :span="4">
+                    <el-input v-model="query_param.request_people"></el-input>
+                </el-col>
+                <el-col :span="2">
+                    <span>状态：</span>
+                </el-col>
+                <el-col :span="4">
+                    <el-input v-model="query_param.status"></el-input>
+                </el-col>
+                <el-col :span="6"></el-col>
+            </el-row>
+            <el-row :gutter="10">
+                <el-col :span="2">
+                    <span>提交日期：</span>
+                </el-col>
+                <el-col :span="4">
+                    <el-date-picker v-model="query_param.submit_start_date" style="width:100%;"></el-date-picker>
+                </el-col>
+                <el-col :span="2">
+                    <span>至：</span>
+                </el-col>
+                <el-col :span="4">
+                    <el-date-picker v-model="query_param.submit_end_date" style="width:100%;"></el-date-picker>
+                </el-col>
+                <el-col :span="6">
+                    <div class="button-wrapper-right">
+                        <el-button type="primary" icon="search">查询</el-button>
+                        <el-button icon="Refresh">重置</el-button>
+                    </div>
+                </el-col>
+                <el-col :span="6"></el-col>
+            </el-row>
+        </div>
+
+        <div class="tool-button-wrapper">
+            <el-row>
+                <el-col>
+                    <el-button type="success" icon="DocumentAdd" plain>新增</el-button>
+                    <el-button type="warning" icon="edit" plain>修改</el-button>
+                    <el-button type="danger" icon="delete" plain>删除</el-button>
+                </el-col>
+            </el-row>
+        </div>
+        <el-table border stripe width="100%">
+            <el-table-column type="selection"></el-table-column>
+        </el-table>
     </div>
 </template>
 
@@ -84,15 +90,13 @@ export default {
 
 <style scoped>
 .search-box {
-    padding: 15px 10px;
-    background-color: #fff;
-    border-radius: 5px;
-    box-shadow: 0px 0px 20px -10px rgb(14 18 22 / 25%);
+    /* padding: 15px 10px; */
+    /* background-color: #fff; */
+    /* border-radius: 5px; */
+    /* box-shadow: 0px 0px 20px -10px rgb(14 18 22 / 25%); */
 }
 
-.search-box:hover {
-    box-shadow: 0px 0px 20px -10px rgb(14 18 22 / 40%);
-}
+
 
 span {
     font-weight: bold;
@@ -121,8 +125,25 @@ span {
     justify-content: right;
 }
 
-.tool-button-wrapper {
+.requirement_wrapper {
+    padding: 15px 10px;
     margin-top: 15px;
-    padding-left: 30px;
+    background-color: #fff;
+    border-radius: 5px;
+    box-shadow: 0px 0px 20px -10px rgb(14 18 22 / 25%);
+}
+
+.requirement_wrapper:hover {
+    box-shadow: 0px 0px 20px -10px rgb(14 18 22 / 40%);
+}
+
+.requirement_wrapper>*+* {
+    margin-top: 15px;
+}
+
+
+
+.tool-button-wrapper {
+    padding-left: 15px;
 }
 </style>
\ No newline at end of file