From 8d1f4e5a1cea28ac4a7e959c50542c71dcb6f406 Mon Sep 17 00:00:00 2001
From: Kane <wangkane@qq.com>
Date: Sun, 29 Jan 2023 00:05:58 +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     |   4 +-
 .../web/admin_system/src/router/index.js      |  18 +--
 .../admin_system/src/views/account/Login.vue  |   4 +-
 .../views/requirement/RequirementManager.vue  | 150 +++++++++++-------
 4 files changed, 105 insertions(+), 71 deletions(-)

diff --git a/企业级管理系统/web/admin_system/src/layout/Index.vue b/企业级管理系统/web/admin_system/src/layout/Index.vue
index 91128d3..a894b2a 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 10:29:03
+ * @LastEditTime: 2023-01-28 23:35:47
  * @FilePath: \admin_system\src\layout\Index.vue
  * @Description: 
  * 
@@ -51,8 +51,6 @@ export default {
 #layout-container {
   height: 100vh;
   max-height: 100vh;
-  /* overflow: hiddens; */
-  /* min-width: 1280px; */
 }
 
 #layout-container-down {
diff --git a/企业级管理系统/web/admin_system/src/router/index.js b/企业级管理系统/web/admin_system/src/router/index.js
index 70208f7..1148190 100644
--- a/企业级管理系统/web/admin_system/src/router/index.js
+++ b/企业级管理系统/web/admin_system/src/router/index.js
@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2022-12-14 15:12:46
  * @LastEditors: Kane
- * @LastEditTime: 2023-01-28 16:00:58
+ * @LastEditTime: 2023-01-28 21:38:31
  * @FilePath: \admin_system\src\router\index.js
  * @Description: 定义应用路由配置
  * 
@@ -41,6 +41,7 @@ const routes = [
       title: "总览",
       icon: "house",
     },
+    component: () => import("../layout/Index.vue"),
     children: [
       {
         path: "/desktop",
@@ -52,7 +53,6 @@ const routes = [
         component: () => import("../views/overview/OverView.vue"),
       },
     ],
-    component: () => import("../layout/Index.vue"),
   },
   {
     //需求管理
@@ -193,14 +193,14 @@ router.beforeEach((to) =>
   }
 
   //修改默认打开的页面，跳向工作台
-  if (to.name === "Home")
-  {
-    console.log("跳向工作台");
+  // if (to.name === "Home")
+  // {
+  //   console.log("跳向工作台");
 
-    return {
-      name: "DeskTop",
-    };
-  }
+  //   return {
+  //     name: "DeskTop",
+  //   };
+  // }
 });
 
 export default router;
diff --git a/企业级管理系统/web/admin_system/src/views/account/Login.vue b/企业级管理系统/web/admin_system/src/views/account/Login.vue
index c8474c8..dfb0585 100644
--- a/企业级管理系统/web/admin_system/src/views/account/Login.vue
+++ b/企业级管理系统/web/admin_system/src/views/account/Login.vue
@@ -3,7 +3,7 @@
  * @Author: Kane
  * @Date: 2022-12-14 15:23:54
  * @LastEditors: Kane
- * @LastEditTime: 2023-01-18 22:24:21
+ * @LastEditTime: 2023-01-28 21:35:47
  * @FilePath: \admin_system\src\views\account\Login.vue
  * @Description: 
  * 
@@ -139,7 +139,7 @@ export default {
             this.saveUserInfo(data);
 
             //验证成功，跳转路由
-            router.push("/home");
+            router.push("/Desktop");
           }
           else
           {
diff --git a/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue b/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue
index 0377bc2..8557cb6 100644
--- a/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue
+++ b/企业级管理系统/web/admin_system/src/views/requirement/RequirementManager.vue
@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2023-01-25 23:13:47
  * @LastEditors: Kane
- * @LastEditTime: 2023-01-28 17:44:26
+ * @LastEditTime: 2023-01-28 23:40:51
  * @FilePath: \admin_system\src\views\requirement\RequirementManager.vue
  * @Description: 
  * 
@@ -121,64 +121,90 @@
             </el-pagination>
         </div>
         <!-- 需求详细信息对话框 -->
-        <el-dialog class="requirement-detail-dialog" v-model="dialogRequirementDetailVisible" width="55%"
-            :close-on-click-modal="true" :close-on-press-escape="false" :show-close="false" title="需求详情">
-            <el-scrollbar height="300px">
-                <div class="requirement-detail-wrapper" style="padding: 0px 10px;">
-                    <el-row :gutter="10">
-                        <el-col :span="2">
-                            <span>标题</span>
-                        </el-col>
-                        <el-col :span="22">
-                            <el-input></el-input>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="10">
-                        <el-col :span="2">
-                            <span>需求编号</span>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-input v-model="query_param.requirement_serial"></el-input>
-                        </el-col>
-                        <el-col :span="2">
-                            <span>申请人</span>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-input v-model="query_param.request_people"></el-input>
-                        </el-col>
-                        <el-col :span="2">
-                            <span>状态</span>
-                        </el-col>
-                        <el-col :span="6">
-                            <!-- <el-input v-model="query_param.status"></el-input> -->
-                            <el-select multiple collapse-tags collapse-tags-tooltip v-model="query_param.status">
-                                <el-option v-for="option in requirement_status" :value="option"
-                                    :key="option"></el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="10">
-                        <el-col :span="2">
-                            <span>提交日期</span>
-                        </el-col>
-                        <el-col :span="6">
-                            <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="6">
-                            <el-date-picker v-model="query_param.submit_end_date" style="width:100%;"></el-date-picker>
-                        </el-col>
-                    </el-row>
-                </div>
-            </el-scrollbar>
-            <template #footer>
+        <el-dialog title="需求内容" class="requirement-detail-dialog" v-model="dialogRequirementDetailVisible" width="900px"
+            :close-on-click-modal="true" :close-on-press-escape="false" :show-close="true" :center="false">
+            <el-tabs v-model="activeTabName">
+                <el-tab-pane name="requirement-detail" label="详情">
+                    <el-scrollbar height="300px">
+                        <div class="requirement-detail-wrapper">
+                            <el-row :gutter="10">
+                                <el-col :span="2">
+                                    <span>标题</span>
+                                </el-col>
+                                <el-col :span="22">
+                                    <el-input></el-input>
+                                </el-col>
+                            </el-row>
+                            <el-row :gutter="10">
+                                <el-col :span="2">
+                                    <span>需求编号</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-input v-model="query_param.requirement_serial"></el-input>
+                                </el-col>
+                                <el-col :span="2">
+                                    <span>申请人</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <el-input v-model="query_param.request_people"></el-input>
+                                </el-col>
+                                <el-col :span="2">
+                                    <span>状态</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <!-- <el-input v-model="query_param.status"></el-input> -->
+                                    <el-select multiple collapse-tags collapse-tags-tooltip
+                                        v-model="query_param.status">
+                                        <el-option v-for="option in requirement_status" :value="option"
+                                            :key="option"></el-option>
+                                    </el-select>
+                                </el-col>
+                            </el-row>
+                            <el-row :gutter="10">
+                                <el-col :span="2">
+                                    <span>提交日期</span>
+                                </el-col>
+                                <el-col :span="6">
+                                    <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="6">
+                                    <el-date-picker v-model="query_param.submit_end_date"
+                                        style="width:100%;"></el-date-picker>
+                                </el-col>
+                            </el-row>
+                        </div>
+                    </el-scrollbar>
+                </el-tab-pane>
+                <el-tab-pane name="issue-date" label="排期">
+                    <el-scrollbar height="300px">
+                        <el-table style="width:100%;" border stripe>
+                            <el-table-column label="需求编号" align="center" min-width="200"></el-table-column>
+                            <el-table-column label="初次排期" align="center" width="200"></el-table-column>
+                            <el-table-column label="最终排期" align="center" width="200"></el-table-column>
+                        </el-table>
+                    </el-scrollbar>
+                </el-tab-pane>
+                <el-tab-pane name="comment" label="备注">
+                    <el-scrollbar height="400px">
+                        <p>hello world</p>
+                        <p><span style="font-size: 24px;">ejfalsjfoewafsdjfdsfewo;sd;fk</span></p>
+                        <ol>
+                            <li><span style="color: rgb(225, 60, 57); font-size: 24px;">12344</span></li>
+                            <li><span style="font-size: 24px;">33445</span></li>
+                        </ol>
+                        <p><br></p>
+                    </el-scrollbar>
+                </el-tab-pane>
+            </el-tabs>
+            <!-- <template #footer>
                 <div class="dialogFooter">
                     <el-button type="primary" @click="dialogRequirementDetailVisible = false;">关闭</el-button>
                 </div>
-            </template>
+            </template> -->
         </el-dialog>
     </div>
 </template>
@@ -204,6 +230,7 @@ export default {
                 "未提交", "部门审核", "需求分析", "技术开发", "待发布", "已发布", "被退回",
             ],
             dialogRequirementDetailVisible: false, //需求详情对话框是否显示
+            activeTabName: "requirement-detail",
         };
     },
     computed: {
@@ -353,11 +380,15 @@ export default {
     display: flex;
     justify-content: left;
     align-items: center;
+    /* margin-top: 10px; */
+}
+
+.requirement-detail-dialog .el-row+.el-row {
     margin-top: 10px;
 }
 
 .requirement-detail-wrapper {
-    padding: 0 10px;
+    padding: 0px 10px;
 }
 
 .requirement-detail-wrapper span {
@@ -365,4 +396,9 @@ export default {
     text-align: right;
     width: 100%;
 }
+</style>
+<style>
+.requirement-detail-dialog .el-dialog__body {
+    padding: 0px 15px !important;
+}
 </style>
\ No newline at end of file