From 8e72f3bccd3ee83860d5d6c7d90bfd26c78f0b4e Mon Sep 17 00:00:00 2001
From: Kane Wang <wangkane@qq.com>
Date: Mon, 6 Feb 2023 16:43:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=9C=80=E6=B1=82=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=95=8C=E9=9D=A2=E6=8E=A7=E4=BB=B6=E5=80=BC=E5=82=A8?=
 =?UTF-8?q?=E5=AD=98=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IT工具综合平台/src/layout/Index.vue |   7 +-
 .../src/layout/components/Aside.vue           |   4 +-
 .../src/layout/components/Header copy.vue     |  99 +++++++++++++++++
 .../src/layout/components/Header.vue          |  26 ++---
 .../src/layout/components/Main.vue            |   2 +-
 .../src/store/modules/requirement.js          |   5 +-
 .../src/utils/api/LocalStorage.js             |  73 +++++++++++++
 .../src/utils/api/request.js                  |   4 +-
 .../src/views/account/Login.vue               |  40 +++----
 .../views/requirement/RequirementManager.vue  | 102 +++++++++++++-----
 10 files changed, 291 insertions(+), 71 deletions(-)
 create mode 100644 code/web/IT工具综合平台/src/layout/components/Header copy.vue
 create mode 100644 code/web/IT工具综合平台/src/utils/api/LocalStorage.js

diff --git a/code/web/IT工具综合平台/src/layout/Index.vue b/code/web/IT工具综合平台/src/layout/Index.vue
index 2bfe396..22e4e56 100644
--- a/code/web/IT工具综合平台/src/layout/Index.vue
+++ b/code/web/IT工具综合平台/src/layout/Index.vue
@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2023-01-04 11:05:44
  * @LastEditors: Kane
- * @LastEditTime: 2023-02-05 10:53:45
+ * @LastEditTime: 2023-02-06 09:26:48
  * @FilePath: /IT工具综合平台/src/layout/Index.vue
  * @Description: 
  * 
@@ -97,10 +97,9 @@ export default {
   /* width: 175px; */
   background-color: #2f4156;
   overflow-x: hidden;
-  /* height: calc(100vh - 50px);
+  height: calc(100vh - 50px);
   max-height: calc(100vh - 50px);
-  min-height: calc(100vh - 50px); */
-  height: 100%;
+  min-height: calc(100vh - 50px);
 }
 
 #layout-header {
diff --git a/code/web/IT工具综合平台/src/layout/components/Aside.vue b/code/web/IT工具综合平台/src/layout/components/Aside.vue
index 7eb8c81..ca6719a 100644
--- a/code/web/IT工具综合平台/src/layout/components/Aside.vue
+++ b/code/web/IT工具综合平台/src/layout/components/Aside.vue
@@ -2,14 +2,14 @@
  * @Author: Kane
  * @Date: 2023-01-04 11:30:33
  * @LastEditors: Kane
- * @LastEditTime: 2023-02-06 00:25:26
+ * @LastEditTime: 2023-02-06 09:28:16
  * @FilePath: /IT工具综合平台/src/layout/components/Aside.vue
  * @Description: 
  * 
  * Copyright (c) ${2022} by Kane, All Rights Reserved.  223142 2f4156
 -->
 <template>
-    <el-scrollbar class="wrapper" height="400px">
+    <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 routes" :key="route.path">
diff --git a/code/web/IT工具综合平台/src/layout/components/Header copy.vue b/code/web/IT工具综合平台/src/layout/components/Header copy.vue
new file mode 100644
index 0000000..ebbfe7a
--- /dev/null
+++ b/code/web/IT工具综合平台/src/layout/components/Header copy.vue	
@@ -0,0 +1,99 @@
+<!--
+ * @Author: Kane
+ * @Date: 2023-01-04 11:39:04
+ * @LastEditors: Kane
+ * @LastEditTime: 2023-02-04 01:09:49
+ * @FilePath: \IT工具综合平台\src\layout\components\Header.vue
+ * @Description: 
+ * 
+ * Copyright (c) ${2022} by Kane, All Rights Reserved. 
+-->
+<template>
+  <div class="app_banner no_select">
+    <span class="company_name">CPIC</span>
+    <div class="version_div">
+      <div>测试版</div>
+      <div>3.6.7 x64 Build 202208301257</div>
+    </div>
+    <div class="buttons_div">
+      <User style="width: 25px; height; 25px; margin-right: 8px; cursor:pointer;" />
+      <SwitchButton style="width: 25px; height; 25px; margin-right: 8px; cursor:pointer;" @click="logout" />
+    </div>
+  </div>
+</template>
+
+<script>
+//import { ElMessage } from "element-plus";
+import { Logout } from "../../utils/api/info/account";
+
+export default {
+  name: "AppBanner",
+  data()
+  {
+    return {};
+  },
+  // created() {
+  //   console.log("banner请求数据！");
+  // },
+  mounted()
+  {
+    //console.log("banner请求数据！");
+  },
+  methods: {
+    logout()
+    {
+      this.$confirm("是否退出系统？", "请确认", {
+        confirmButtonText: "是",
+        cancelButtonText: "否",
+        type: "warning",
+      }).then(() =>
+      {
+        Logout();
+      });
+    },
+  },
+};
+</script>
+<style scoped>
+.app_banner {
+  background-color: var(--banner-background-color);
+  color: #fff;
+  display: flex;
+  justify-content: left;
+  align-items: center;
+  padding: 0px 15px 0px 15px;
+  height: 100%;
+  position: relative;
+}
+
+.no_select {
+  -webkit-touch-callout: none;
+  -moz-user-select: none;
+  /*火狐*/
+  -webkit-user-select: none;
+  /*webkit浏览器*/
+  -ms-user-select: none;
+  /*IE10*/
+  -khtml-user-select: none;
+  /*早期浏览器*/
+  user-select: none;
+}
+
+.app_banner>*+* {
+  margin-left: 10px;
+}
+
+.company_name {
+  font-size: 2rem;
+}
+
+.version_div {
+  font-size: 0.5rem;
+}
+
+.buttons_div {
+  margin-left: auto;
+  padding-top: 5px;
+  /* border: 1px solid salmon; */
+}
+</style>
\ No newline at end of file
diff --git a/code/web/IT工具综合平台/src/layout/components/Header.vue b/code/web/IT工具综合平台/src/layout/components/Header.vue
index ebbfe7a..8918290 100644
--- a/code/web/IT工具综合平台/src/layout/components/Header.vue
+++ b/code/web/IT工具综合平台/src/layout/components/Header.vue
@@ -2,8 +2,8 @@
  * @Author: Kane
  * @Date: 2023-01-04 11:39:04
  * @LastEditors: Kane
- * @LastEditTime: 2023-02-04 01:09:49
- * @FilePath: \IT工具综合平台\src\layout\components\Header.vue
+ * @LastEditTime: 2023-02-06 10:17:22
+ * @FilePath: /IT工具综合平台/src/layout/components/Header.vue
  * @Description: 
  * 
  * Copyright (c) ${2022} by Kane, All Rights Reserved. 
@@ -23,26 +23,16 @@
 </template>
 
 <script>
-//import { ElMessage } from "element-plus";
+import { ElMessageBox } from "element-plus";
 import { Logout } from "../../utils/api/info/account";
 
 export default {
   name: "AppBanner",
-  data()
+  setup(props, context)
   {
-    return {};
-  },
-  // created() {
-  //   console.log("banner请求数据！");
-  // },
-  mounted()
-  {
-    //console.log("banner请求数据！");
-  },
-  methods: {
-    logout()
+    const logout = () =>
     {
-      this.$confirm("是否退出系统？", "请确认", {
+      ElMessageBox.confirm("是否退出系统？", "请确认", {
         confirmButtonText: "是",
         cancelButtonText: "否",
         type: "warning",
@@ -50,7 +40,9 @@ export default {
       {
         Logout();
       });
-    },
+    };
+
+    return { logout, };
   },
 };
 </script>
diff --git a/code/web/IT工具综合平台/src/layout/components/Main.vue b/code/web/IT工具综合平台/src/layout/components/Main.vue
index 0b5ba50..141fc4a 100644
--- a/code/web/IT工具综合平台/src/layout/components/Main.vue
+++ b/code/web/IT工具综合平台/src/layout/components/Main.vue
@@ -20,7 +20,7 @@
 
 <script>
 export default {
-    name: "LayoutMain"
+    name: "LayoutMain",
 };
 </script>
 
diff --git a/code/web/IT工具综合平台/src/store/modules/requirement.js b/code/web/IT工具综合平台/src/store/modules/requirement.js
index 57b1cc3..6727ea8 100644
--- a/code/web/IT工具综合平台/src/store/modules/requirement.js
+++ b/code/web/IT工具综合平台/src/store/modules/requirement.js
@@ -10,8 +10,11 @@
  */
 
 const state = {
-    status: {},
+    status: {},//包含全部需求状态的数组
     status_update_time: new Date(),
+    ui: {
+        selected_status: [], //已选择的需求状态
+    },
 };
 
 export default {
diff --git a/code/web/IT工具综合平台/src/utils/api/LocalStorage.js b/code/web/IT工具综合平台/src/utils/api/LocalStorage.js
new file mode 100644
index 0000000..686e74e
--- /dev/null
+++ b/code/web/IT工具综合平台/src/utils/api/LocalStorage.js
@@ -0,0 +1,73 @@
+/*
+ * @Author: Kane
+ * @Date: 2023-02-06 14:12:11
+ * @LastEditors: Kane
+ * @LastEditTime: 2023-02-06 15:52:55
+ * @FilePath: /IT工具综合平台/src/utils/api/LocalStorage.js
+ * @Description: 初始化localStorage中保存的值。
+ * 
+ * Copyright (c) ${2022} by Kane, All Rights Reserved. 
+ */
+
+//常量
+const REQUIREMRNT_UI = "requirement_ui";
+
+//需求管理模块
+function loadRequirementUI()
+{
+    // debugger;
+
+    let requirementUI = null;
+
+    try
+    {
+        requirementUI = JSON.parse(window.localStorage.getItem(REQUIREMRNT_UI));
+    }
+    catch (error)
+    {
+        console.log("转换requirement-ui失败：", error);
+        requirementUI = {};
+    }
+
+    //如果之前不存在，json转换结果也会是null
+    if (requirementUI === null)
+    {
+        requirementUI = {};
+    }
+
+    if (requirementUI.selected_status === undefined)
+    {
+        requirementUI.selected_status = [];
+    }
+
+    if (requirementUI.title === undefined)
+    {
+        requirementUI.title = "";
+    }
+
+    if (requirementUI.serial_no === undefined)
+    {
+        requirementUI.serial_no = "";
+    }
+
+    if (requirementUI.request_people === undefined)
+    {
+        requirementUI.request_people = "";
+    }
+
+    if (requirementUI.commit_start_date === undefined)
+    {
+        requirementUI.commit_start_date = new Date();
+        requirementUI.commit_start_date.setMonth(0);
+        requirementUI.commit_start_date.setDate(1);
+    }
+
+    if (requirementUI.commit_end_date === undefined)
+    {
+        requirementUI.commit_end_date = new Date();
+    }
+
+    return requirementUI;
+}
+
+export { loadRequirementUI };
\ No newline at end of file
diff --git a/code/web/IT工具综合平台/src/utils/api/request.js b/code/web/IT工具综合平台/src/utils/api/request.js
index 382d641..f7bce7c 100644
--- a/code/web/IT工具综合平台/src/utils/api/request.js
+++ b/code/web/IT工具综合平台/src/utils/api/request.js
@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2022-12-22 17:18:10
  * @LastEditors: Kane
- * @LastEditTime: 2023-02-04 21:51:11
+ * @LastEditTime: 2023-02-06 09:19:32
  * @FilePath: /IT工具综合平台/src/utils/api/request.js
  * @Description: 配置axios拦截器
  * 
@@ -72,7 +72,7 @@ service.interceptors.response.use(
                     confirmButtonText: "是",
                     cancelButtonText: "否",
                     type: "warning",
-                },
+                }
             ).then(() =>
             {
                 router.replace("/login");
diff --git a/code/web/IT工具综合平台/src/views/account/Login.vue b/code/web/IT工具综合平台/src/views/account/Login.vue
index 664cbce..3d1b3be 100644
--- a/code/web/IT工具综合平台/src/views/account/Login.vue
+++ b/code/web/IT工具综合平台/src/views/account/Login.vue
@@ -3,7 +3,7 @@
  * @Author: Kane
  * @Date: 2022-12-14 15:23:54
  * @LastEditors: Kane
- * @LastEditTime: 2023-02-04 16:55:12
+ * @LastEditTime: 2023-02-06 14:32:18
  * @FilePath: /IT工具综合平台/src/views/account/Login.vue
  * @Description: 
  * 
@@ -59,6 +59,7 @@ import { useStore } from "vuex";
 import { useRouter } from "vue-router";
 import { Login } from "@/utils/api/info/account";
 import { ElMessage } from "element-plus";
+
 //import router from "../../router/index";
 
 export default {
@@ -77,8 +78,8 @@ export default {
 
     const tab_menu = reactive(
       [
-        { type: "login", label: "登录" },
-        { type: "regiester", label: "注册" },
+        { type: "login", label: "登录", },
+        { type: "regiester", label: "注册", },
       ]);
 
     const ui = reactive(
@@ -103,6 +104,23 @@ export default {
         type: "error",
       });
     };
+
+    //将获取到的用户信息和token保存到vuex和localStorage
+    const saveUserInfo = (userInfo) =>
+    {
+      console.log("保存用户信息");
+      console.log("保存用户信息", store);
+      //保存到vuex
+      store.commit("app/SET_USERINFO", userInfo);
+
+      //保存到localStorage
+      const token = userInfo.token;
+      const userInfoJson = JSON.stringify(userInfo);
+
+      window.localStorage.setItem("token", token);
+      window.localStorage.setItem("user_info", userInfoJson);
+    };
+
     /**
      * 登录
      */
@@ -180,22 +198,6 @@ export default {
         });
     };
 
-    //将获取到的用户信息和token保存到vuex和localStorage
-    const saveUserInfo = (userInfo) =>
-    {
-      console.log("保存用户信息");
-      console.log("保存用户信息", store);
-      //保存到vuex
-      store.commit("app/SET_USERINFO", userInfo);
-
-      //保存到localStorage
-      const token = userInfo.token;
-      const userInfoJson = JSON.stringify(userInfo);
-
-      window.localStorage.setItem("token", token);
-      window.localStorage.setItem("user_info", userInfoJson);
-    };
-
     onBeforeMount(() =>
     {
       //初始化菜单选项
diff --git a/code/web/IT工具综合平台/src/views/requirement/RequirementManager.vue b/code/web/IT工具综合平台/src/views/requirement/RequirementManager.vue
index 5a9bebb..150cca2 100644
--- a/code/web/IT工具综合平台/src/views/requirement/RequirementManager.vue
+++ b/code/web/IT工具综合平台/src/views/requirement/RequirementManager.vue
@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2023-02-02 22:19:12
  * @LastEditors: Kane
- * @LastEditTime: 2023-02-06 08:33:42
+ * @LastEditTime: 2023-02-06 15:57:19
  * @FilePath: /IT工具综合平台/src/views/requirement/RequirementManager.vue
  * @Description: 
  * 
@@ -38,7 +38,8 @@
                 </el-col>
                 <el-col :span="4">
                     <!-- <el-input v-model="query_param.status"></el-input> -->
-                    <el-select multiple collapse-tags collapse-tags-tooltip v-model.trim.lazy="query_param.status">
+                    <el-select multiple collapse-tags collapse-tags-tooltip
+                        v-model.trim.lazy="query_param.selected_status">
                         <el-option v-for="option in statusData" :value="option.status_name" lable="option.status_code"
                             :key="option.status_code + option.status_name"></el-option>
                     </el-select>
@@ -161,13 +162,13 @@
                                     <span>状态</span>
                                 </el-col>
                                 <el-col :span="6">
-                                    <el-input readonly v-model="query_param.status"></el-input>
+                                    <el-input readonly v-model="query_param.select_status"></el-input>
                                 </el-col>
                                 <el-col :span="2">
                                     <span>当前处理人</span>
                                 </el-col>
                                 <el-col :span="6">
-                                    <el-input readonly v-model="query_param.status"></el-input>
+                                    <el-input readonly v-model="query_param.select_status"></el-input>
                                 </el-col>
                             </el-row>
                             <el-row :gutter="10">
@@ -175,19 +176,19 @@
                                     <span>联系人</span>
                                 </el-col>
                                 <el-col :span="6">
-                                    <el-input readonly v-model="query_param.status"></el-input>
+                                    <el-input readonly v-model="query_param.select_status"></el-input>
                                 </el-col>
                                 <el-col :span="2">
                                     <span>联系方式</span>
                                 </el-col>
                                 <el-col :span="6">
-                                    <el-input readonly v-model="query_param.status"></el-input>
+                                    <el-input readonly v-model="query_param.select_status"></el-input>
                                 </el-col>
                                 <el-col :span="2">
                                     <span>提交日期</span>
                                 </el-col>
                                 <el-col :span="6">
-                                    <el-input readonly v-model="query_param.status"></el-input>
+                                    <el-input readonly v-model="query_param.select_status"></el-input>
                                 </el-col>
                             </el-row>
                         </div>
@@ -228,12 +229,13 @@
 </template>
 
 <script>
-import { reactive, computed, onBeforeMount } from "vue";
+import { reactive, computed, onBeforeMount, onBeforeUnmount } from "vue";
 //import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import { requirementTestData } from '@/test/data/TestData';
 import { useRouter } from "vue-router";
 import { useStore } from "vuex";
 import { query_requirement_ui } from "@/utils/api/requirement/requirement";
+import { loadRequirementUI } from "@/utils/api/LocalStorage.js";
 
 export default {
     name: "requirement-manager",
@@ -250,20 +252,39 @@ export default {
                 dialogRequirementDetailLoadingVisible: true,
                 pageVisible: false,
                 activeTabName: "requirement-detail",
-                requirement_status: [
-                    "未提交", "部门审核", "需求分析", "技术开发", "待发布", "已发布", "被退回",
-                ],
-            });
-        const query_param = reactive(
-            {
-                title: "",
-                serial_no: "",
-                request_people: "",
-                commit_start_date: new Date(),
-                commit_end_date: new Date(),
-                status: "",
             });
+        // const query_param = reactive(
+        //     {
+        //         title: "",
+        //         serial_no: "",
+        //         request_people: "",
+        //         commit_start_date: new Date(),
+        //         commit_end_date: new Date(),
+        //         selected_status: "",
+        //     });
+        const query_param = reactive(loadRequirementUI());
 
+        //已选择的状态项目
+        // let saved_ui = query_param;
+
+        // if (saved_ui === null || saved_ui === "{}")
+        // {
+        //     saved_ui = {
+        //         selected_status: [],
+        //     };
+
+        //     window.localStorage.setItem("requirement_ui", JSON.stringify(saved_ui));
+        // }
+        // else
+        // {
+        //     saved_ui = JSON.parse(saved_ui);
+        // }
+
+        // const selected_status = saved_ui.selected_status;
+        // //请求到的状态数据
+        // const requirement_status = store.state.requirement.status;
+
+        /*计算变量 *****************/
         const tableHeight = computed(() =>
         {
             return 10 * 50 + 40;
@@ -318,7 +339,7 @@ export default {
 
         const showRequirementDetail = (serial_no) =>
         {
-            console.log("状态", query_param.status);
+            console.log("状态", query_param.select_status);
             setTimeout(() =>
             {
                 ui.dialogRequirementDetailLoadingVisible = false;
@@ -335,15 +356,45 @@ export default {
             ui.dialogRequirementDetailLoadingVisible = true;
         };
 
+        //用户选择状态时的事件
+        const onUIChange = () =>
+        {
+            //console.log("当前选择的状态：", query_param.status);
+            // debugger;
+
+            //保存到浏览器
+            window.localStorage.setItem("requirement_ui", JSON.stringify(query_param));
+
+            store.state.requirement.ui.selected_status = query_param.select_status;
+        };
+
         onBeforeMount(() =>
         {
-            query_param.commit_end_date = new Date(Date.now());
-            query_param.commit_start_date = new Date();
+            // debugger;
+            //判断selected_status是否有保存的值，有的话就直接用，否则从获取到数据中添加
+            if (query_param.selected_status.length === 0)
+            {
+                for (let index in store.state.requirement.status)
+                {
+                    const status_name = store.state.requirement.status[index].status_name;
 
-            query_param.commit_start_date.setMonth(query_param.commit_end_date.getMonth() - 1);
+                    if (typeof status_name === "string" && status_name.length != 0)
+                    {
+                        query_param.selected_status.push(status_name);
+                    }
+                }
+
+                onUIChange();
+            }
         });
 
-        //加载数据
+        onBeforeUnmount(() =>
+        {
+            onUIChange();
+        });
+
+        /*加载数据***************************/
+        //需求状态相关，默认全部选择
         query_requirement_ui(store.state.requirement, "ErrorPage");
 
         //输出控制台
@@ -366,6 +417,7 @@ export default {
             onTablePageSizeChange,
             showRequirementDetail,
             closeRequirementDetail,
+            onUIChange,
             //生命周期
             onBeforeMount,
         };