From f4c4970b306ef793fd7f76e12b64b12fafaa3ff0 Mon Sep 17 00:00:00 2001
From: Kane Wang <wangkane@qq.com>
Date: Fri, 24 Mar 2023 17:01:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E8=AE=A9=E9=80=89=E4=B8=AD=E9=A1=B9?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/public/color.scss          |  12 +-
 .../src/assets/css/public/mixin.scss          |  21 +
 .../src/assets/css/public/normalize.scss      | 542 +++++++++---------
 .../src/layout/components/Aside.vue           |  47 +-
 .../src/layout/components/Header.vue          |  34 +-
 code/web/task_schedule/src/views/Login.vue    |  15 +-
 code/web/task_schedule/vite.config.js         |  10 +-
 7 files changed, 377 insertions(+), 304 deletions(-)
 create mode 100644 code/web/task_schedule/src/assets/css/public/mixin.scss

diff --git a/code/web/task_schedule/src/assets/css/public/color.scss b/code/web/task_schedule/src/assets/css/public/color.scss
index d63b25e..5f3a65e 100644
--- a/code/web/task_schedule/src/assets/css/public/color.scss
+++ b/code/web/task_schedule/src/assets/css/public/color.scss
@@ -1,11 +1,21 @@
+/*
+ * @Author: Kane
+ * @Date: 2023-02-28 19:25:30
+ * @LastEditors: Kane
+ * @FilePath: /task_schedule/src/assets/css/public/global.scss
+ * @Description: 
+ * 
+ * Copyright (c) ${2022} by Kane, All Rights Reserved. 
+ */
 
+// color
 $color-bg-01: #fecb96;
 $color-bg-02: #f7954e;
 $color-bg-03: #f27620;
 $color-bg-04: #da3703;
 $color-bg-05: #ba1800;
 
-$color-charts-bg:#ffffff9f;
+$color-charts-bg: #ffffff9f;
 $color-honorlist-bg: rgba(255, 255, 255, 0.3);
 
 $banner-background-color: #1d74b2;
\ No newline at end of file
diff --git a/code/web/task_schedule/src/assets/css/public/mixin.scss b/code/web/task_schedule/src/assets/css/public/mixin.scss
new file mode 100644
index 0000000..c6d60c9
--- /dev/null
+++ b/code/web/task_schedule/src/assets/css/public/mixin.scss
@@ -0,0 +1,21 @@
+/*
+ * @Author: Kane
+ * @Date: 2023-02-28 19:25:30
+ * @LastEditors: Kane
+ * @FilePath: /task_schedule/src/assets/css/public/global.scss
+ * @Description: 
+ * 
+ * Copyright (c) ${2022} by Kane, All Rights Reserved. 
+ */
+@mixin 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;
+}
\ No newline at end of file
diff --git a/code/web/task_schedule/src/assets/css/public/normalize.scss b/code/web/task_schedule/src/assets/css/public/normalize.scss
index cd8c889..34f1f7f 100644
--- a/code/web/task_schedule/src/assets/css/public/normalize.scss
+++ b/code/web/task_schedule/src/assets/css/public/normalize.scss
@@ -17,343 +17,373 @@
  * 2. Prevent adjustments of font size after orientation changes in iOS.
  */
 
- html {
-    line-height: 1.15; /* 1 */
-    -webkit-text-size-adjust: 100%; /* 2 */
-    text-size-adjust: 100%;
-  }
-  
-  /* Sections
+html {
+  line-height: 1.15;
+  /* 1 */
+  -webkit-text-size-adjust: 100%;
+  /* 2 */
+  text-size-adjust: 100%;
+}
+
+/* Sections
      ========================================================================== */
-  
-  /**
+
+/**
    * Remove the margin in all browsers.
    */
-  
-  body {
-    margin: 0;
-  }
-  
-  /**
+
+body {
+  margin: 0;
+}
+
+/**
    * Render the `main` element consistently in IE.
    */
-  
-  main {
-    display: block;
-  }
-  
-  /**
+
+main {
+  display: block;
+}
+
+/**
    * Correct the font size and margin on `h1` elements within `section` and
    * `article` contexts in Chrome, Firefox, and Safari.
    */
-  
-  h1 {
-    font-size: 2em;
-    margin: 0.67em 0;
-  }
-  
-  /* Grouping content
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
      ========================================================================== */
-  
-  /**
+
+/**
    * 1. Add the correct box sizing in Firefox.
    * 2. Show the overflow in Edge and IE.
    */
-  
-  hr {
-    box-sizing: content-box; /* 1 */
-    height: 0; /* 1 */
-    overflow: visible; /* 2 */
-  }
-  
-  /**
+
+hr {
+  box-sizing: content-box;
+  /* 1 */
+  height: 0;
+  /* 1 */
+  overflow: visible;
+  /* 2 */
+}
+
+/**
    * 1. Correct the inheritance and scaling of font size in all browsers.
    * 2. Correct the odd `em` font sizing in all browsers.
    */
-  
-  pre {
-    font-family: monospace, monospace; /* 1 */
-    font-size: 1em; /* 2 */
-  }
-  
-  /* Text-level semantics
+
+pre {
+  font-family: monospace, monospace;
+  /* 1 */
+  font-size: 1em;
+  /* 2 */
+}
+
+/* Text-level semantics
      ========================================================================== */
-  
-  /**
+
+/**
    * Remove the gray background on active links in IE 10.
    */
-  
-  a {
-    background-color: transparent;
-  }
-  
-  /**
+
+a {
+  background-color: transparent;
+}
+
+/**
    * 1. Remove the bottom border in Chrome 57-
    * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
    */
-  
-  abbr[title] {
-    border-bottom: none; /* 1 */
-    text-decoration: underline; /* 2 */
-    text-decoration: underline dotted; /* 2 */
-  }
-  
-  /**
+
+abbr[title] {
+  border-bottom: none;
+  /* 1 */
+  text-decoration: underline;
+  /* 2 */
+  text-decoration: underline dotted;
+  /* 2 */
+}
+
+/**
    * Add the correct font weight in Chrome, Edge, and Safari.
    */
-  
-  b,
-  strong {
-    font-weight: bolder;
-  }
-  
-  /**
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/**
    * 1. Correct the inheritance and scaling of font size in all browsers.
    * 2. Correct the odd `em` font sizing in all browsers.
    */
-  
-  code,
-  kbd,
-  samp {
-    font-family: monospace, monospace; /* 1 */
-    font-size: 1em; /* 2 */
-  }
-  
-  /**
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace;
+  /* 1 */
+  font-size: 1em;
+  /* 2 */
+}
+
+/**
    * Add the correct font size in all browsers.
    */
-  
-  small {
-    font-size: 80%;
-  }
-  
-  /**
+
+small {
+  font-size: 80%;
+}
+
+/**
    * Prevent `sub` and `sup` elements from affecting the line height in
    * all browsers.
    */
-  
-  sub,
-  sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
-  }
-  
-  sub {
-    bottom: -0.25em;
-  }
-  
-  sup {
-    top: -0.5em;
-  }
-  
-  /* Embedded content
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
      ========================================================================== */
-  
-  /**
+
+/**
    * Remove the border on images inside links in IE 10.
    */
-  
-  img {
-    border-style: none;
-  }
-  
-  /* Forms
+
+img {
+  border-style: none;
+}
+
+/* Forms
      ========================================================================== */
-  
-  /**
+
+/**
    * 1. Change the font styles in all browsers.
    * 2. Remove the margin in Firefox and Safari.
    */
-  
-  button,
-  input,
-  optgroup,
-  select,
-  textarea {
-    font-family: inherit; /* 1 */
-    font-size: 100%; /* 1 */
-    line-height: 1.15; /* 1 */
-    margin: 0; /* 2 */
-  }
-  
-  /**
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: inherit;
+  /* 1 */
+  font-size: 100%;
+  /* 1 */
+  line-height: 1.15;
+  /* 1 */
+  margin: 0;
+  /* 2 */
+}
+
+/**
    * Show the overflow in IE.
    * 1. Show the overflow in Edge.
    */
-  
-  button,
-  input { /* 1 */
-    overflow: visible;
-  }
-  
-  /**
+
+button,
+input {
+  /* 1 */
+  overflow: visible;
+}
+
+/**
    * Remove the inheritance of text transform in Edge, Firefox, and IE.
    * 1. Remove the inheritance of text transform in Firefox.
    */
-  
-  button,
-  select { /* 1 */
-    text-transform: none;
-  }
-  
-  /**
+
+button,
+select {
+  /* 1 */
+  text-transform: none;
+}
+
+/**
    * Correct the inability to style clickable types in iOS and Safari.
    */
-  
-  button,
-  [type="button"],
-  [type="reset"],
-  [type="submit"] {
-    -webkit-appearance: button;
-  }
-  
-  /**
+
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button;
+}
+
+/**
    * Remove the inner border and padding in Firefox.
    */
-  
-  button::-moz-focus-inner,
-  [type="button"]::-moz-focus-inner,
-  [type="reset"]::-moz-focus-inner,
-  [type="submit"]::-moz-focus-inner {
-    border-style: none;
-    padding: 0;
-  }
-  
-  /**
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
    * Restore the focus styles unset by the previous rule.
    */
-  
-  button:-moz-focusring,
-  [type="button"]:-moz-focusring,
-  [type="reset"]:-moz-focusring,
-  [type="submit"]:-moz-focusring {
-    outline: 1px dotted ButtonText;
-  }
-  
-  /**
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
    * Correct the padding in Firefox.
    */
-  
-  fieldset {
-    padding: 0.35em 0.75em 0.625em;
-  }
-  
-  /**
+
+fieldset {
+  padding: 0.35em 0.75em 0.625em;
+}
+
+/**
    * 1. Correct the text wrapping in Edge and IE.
    * 2. Correct the color inheritance from `fieldset` elements in IE.
    * 3. Remove the padding so developers are not caught out when they zero out
    *    `fieldset` elements in all browsers.
    */
-  
-  legend {
-    box-sizing: border-box; /* 1 */
-    color: inherit; /* 2 */
-    display: table; /* 1 */
-    max-width: 100%; /* 1 */
-    padding: 0; /* 3 */
-    white-space: normal; /* 1 */
-  }
-  
-  /**
+
+legend {
+  box-sizing: border-box;
+  /* 1 */
+  color: inherit;
+  /* 2 */
+  display: table;
+  /* 1 */
+  max-width: 100%;
+  /* 1 */
+  padding: 0;
+  /* 3 */
+  white-space: normal;
+  /* 1 */
+}
+
+/**
    * Add the correct vertical alignment in Chrome, Firefox, and Opera.
    */
-  
-  progress {
-    vertical-align: baseline;
-  }
-  
-  /**
+
+progress {
+  vertical-align: baseline;
+}
+
+/**
    * Remove the default vertical scrollbar in IE 10+.
    */
-  
-  textarea {
-    overflow: auto;
-  }
-  
-  /**
+
+textarea {
+  overflow: auto;
+}
+
+/**
    * 1. Add the correct box sizing in IE 10.
    * 2. Remove the padding in IE 10.
    */
-  
-  [type="checkbox"],
-  [type="radio"] {
-    box-sizing: border-box; /* 1 */
-    padding: 0; /* 2 */
-  }
-  
-  /**
+
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box;
+  /* 1 */
+  padding: 0;
+  /* 2 */
+}
+
+/**
    * Correct the cursor style of increment and decrement buttons in Chrome.
    */
-  
-  [type="number"]::-webkit-inner-spin-button,
-  [type="number"]::-webkit-outer-spin-button {
-    height: auto;
-  }
-  
-  /**
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
    * 1. Correct the odd appearance in Chrome and Safari.
    * 2. Correct the outline style in Safari.
    */
-  
-  [type="search"] {
-    -webkit-appearance: textfield; /* 1 */
-    outline-offset: -2px; /* 2 */
-  }
-  
-  /**
+
+[type="search"] {
+  -webkit-appearance: textfield;
+  /* 1 */
+  outline-offset: -2px;
+  /* 2 */
+}
+
+/**
    * Remove the inner padding in Chrome and Safari on macOS.
    */
-  
-  [type="search"]::-webkit-search-decoration {
-    -webkit-appearance: none;
-  }
-  
-  /**
+
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
    * 1. Correct the inability to style clickable types in iOS and Safari.
    * 2. Change font properties to `inherit` in Safari.
    */
-  
-  ::-webkit-file-upload-button {
-    -webkit-appearance: button; /* 1 */
-    font: inherit; /* 2 */
-  }
-  
-  /* Interactive
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button;
+  /* 1 */
+  font: inherit;
+  /* 2 */
+}
+
+/* Interactive
      ========================================================================== */
-  
-  /*
+
+/*
    * Add the correct display in Edge, IE 10+, and Firefox.
    */
-  
-  details {
-    display: block;
-  }
-  
-  /*
+
+details {
+  display: block;
+}
+
+/*
    * Add the correct display in all browsers.
    */
-  
-  summary {
-    display: list-item;
-  }
-  
-  /* Misc
+
+summary {
+  display: list-item;
+}
+
+/* Misc
      ========================================================================== */
-  
-  /**
+
+/**
    * Add the correct display in IE 10+.
    */
-  
-  template {
-    display: none;
-  }
-  
-  /**
+
+template {
+  display: none;
+}
+
+/**
    * Add the correct display in IE 10.
    */
-  
-  [hidden] {
-    display: none;
-  }
\ No newline at end of file
+
+[hidden] {
+  display: none;
+}
\ No newline at end of file
diff --git a/code/web/task_schedule/src/layout/components/Aside.vue b/code/web/task_schedule/src/layout/components/Aside.vue
index fbccfcc..0432919 100644
--- a/code/web/task_schedule/src/layout/components/Aside.vue
+++ b/code/web/task_schedule/src/layout/components/Aside.vue
@@ -8,7 +8,7 @@
  * Copyright (c) ${2022} by Kane, All Rights Reserved.
 -->
 <template>
-    <el-scrollbar class="view-wrapper">
+    <el-scrollbar class="sidebar-wrapper">
         <el-menu
             class="side-bar"
             router
@@ -36,7 +36,7 @@
                         </el-menu-item>
                     </template>
                     <template v-else>
-                        <!-- 不止一个子路由，可能是咩有子路由，或者有多个子路由 -->
+                        <!-- 不止一个子路由，可能是咩有子s路由，或者有多个子路由 -->
                         <!-- 如果没有子路由，就不渲染 -->
                         <el-sub-menu
                             v-if="route.children && route.children.length"
@@ -97,8 +97,10 @@ export default {
 };
 </script>
 
-<style scoped>
-.view-wrapper {
+<style lang="scss" scoped>
+.sidebar-wrapper {
+    @include no-select;
+
     height: 100%;
     width: 100%;
 }
@@ -108,24 +110,20 @@ export default {
     /* border-left: 5px solid #1d74b2; */
     overflow: auto;
 
-    -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;
-}
+    .el-menu-item {
+        font-weight: normal;
+    }
 
-.el-menu-item {
-    font-weight: normal;
-}
+    .el-sub-menu {
+        font-weight: normal;
+    }
 
-.el-sub-menu {
-    font-weight: normal;
+    .el-menu-item.is-active {
+        // background-color: #ffffff1f !important;
+        font-weight: 1000;
+        font-size: 15px;
+        color: #ffd04b;
+    }
 }
 
 .sidebar-submenu {
@@ -136,14 +134,6 @@ export default {
     background-color: #223142 !important;
 }
 
-/* 顺序必须在上面两个之后*/
-.is-active {
-    /* background-color: #ffffff4f !important; */
-    /* font-weight: 1000; */
-    /* font-size: 15px; */
-    color: #ffd04b;
-}
-
 /* .is-opened {
     border-left: 5px solid #1d74b2;
 } */
@@ -153,5 +143,4 @@ export default {
     height: 1em;
     margin-right: 8px;
 }
-
 </style>
diff --git a/code/web/task_schedule/src/layout/components/Header.vue b/code/web/task_schedule/src/layout/components/Header.vue
index 0e562f5..5fd2385 100644
--- a/code/web/task_schedule/src/layout/components/Header.vue
+++ b/code/web/task_schedule/src/layout/components/Header.vue
@@ -14,34 +14,43 @@
             <span>测试版</span>
             <span>Build-202303251257</span>
         </div>
-        <div class="button-wrapper">
+        <div class="buttons-wrapper">
             <component
-                :is="'user'"
+                :is="'SwitchButton'"
                 class="icons"
+                @click="Logout"
             />
         </div>
     </div>
 </template>
 
 <script lang="ts">
+import { logout } from "@/utils/account.js";
+
 export default {
     name: "LayoutHeader",
     setup()
     {
-        return {};
+        const Logout = () =>
+        {
+            logout();
+        };
+
+        return { Logout, };
     },
 };
 </script>
 
 <style lang="scss" scoped>
 .header-wrapper {
-    width: 100%;
+    @include no-select;
+
     height: 50px;
     max-height: 50px;
 
     padding: 0px 15px;
 
-    position: relative;
+    // position: relative;
 
     display: flex;
     justify-content: start;
@@ -51,10 +60,10 @@ export default {
     background-color: $banner-background-color;
 
     span {
-        text-align:left;
+        text-align: left;
     }
 
-    > *+* {
+    >*+* {
         margin-left: 10px;
     }
 
@@ -73,10 +82,17 @@ export default {
         font-size: 2rem;
     }
 
-    .buttons_div {
+    .buttons-wrapper {
         margin-left: auto;
         padding-top: 5px;
-        /* border: 1px solid salmon; */
+        // border: 1px solid salmon;
+    }
+
+    .icons {
+        width: 25px;
+        height: 25px;
+        // margin-right: 8px;
+        cursor: pointer;
     }
 }
 </style>
diff --git a/code/web/task_schedule/src/views/Login.vue b/code/web/task_schedule/src/views/Login.vue
index 176afa8..15e83f8 100644
--- a/code/web/task_schedule/src/views/Login.vue
+++ b/code/web/task_schedule/src/views/Login.vue
@@ -67,7 +67,7 @@
 <script lang="ts">
 import { reactive, onBeforeMount } from "vue";
 import { useRouter } from "vue-router";
-import { loadStaffInfo, saveStaffInfo, getUserType, saveUserType, getCallerInfo, saveCallerInfo } from "@/utils/api/localStorage";
+import { saveStaffInfo, getUserType, saveUserType, getCallerInfo, saveCallerInfo } from "@/utils/api/localStorage";
 import { login } from "@/utils/account";
 import { ElMessage } from "element-plus";
 import { StaffInfo } from "@/data/cpicxim/StaffInfo";
@@ -161,7 +161,7 @@ export default {
             }
             else if ( ui.currentMenu === "tele_saler" )
             {
-                // 坐席
+                // 是坐席，将坐席工号保存到本地，然后跳转
                 saveCallerInfo( ui.account );
 
                 // 跳转路由
@@ -171,14 +171,17 @@ export default {
 
         onBeforeMount(() =>
         {
+            // 判断已登录的信息是坐席还是内勤
+            // 坐席就直接跳转桌面霸屏
+            // 员工就暂且什么都不做
             const staffType = getUserType();
 
-            // 判断已登录的信息是坐席还是内勤
             if ( staffType === "tele_saler" )
             {
+                // 是坐席，尝试获取存储的坐席工号
                 const callInfo = getCallerInfo();
 
-                // 判断是否已经记录了P13账号，有则提示已登录，然后跳转路由
+                // 判断是否已经记录了坐席工号，有则提示已登录，然后跳转路由
                 if ( callInfo !== "" )
                 {
                     ElMessage({
@@ -191,6 +194,10 @@ export default {
                     router.push( "/desktop_archievement" );
                 }
             }
+            else if ( staffType === "cpicxim_staff" )
+            {
+                // 是员工，暂且不管；
+            }
         });
 
         const onToggleMenu = ( type: string ) =>
diff --git a/code/web/task_schedule/vite.config.js b/code/web/task_schedule/vite.config.js
index 06b2ba2..717c7c6 100644
--- a/code/web/task_schedule/vite.config.js
+++ b/code/web/task_schedule/vite.config.js
@@ -2,7 +2,7 @@
  * @Author: Kane
  * @Date: 2023-02-15 09:25:52
  * @LastEditors: Kane
- * @LastEditTime: 2023-03-03 15:52:58
+ * @LastEditTime: 2023-03-24 15:47:31
  * @FilePath: /task_schedule/vite.config.js
  * @Description: 
  * 
@@ -13,9 +13,9 @@ import vue from "@vitejs/plugin-vue";
 import path from "path";
 
 // https://vitejs.dev/config/
-export default defineConfig((command, mode) =>
+export default defineConfig(( command, mode ) =>
 {
-    const env = loadEnv(mode, process.cwd(), "");
+    const env = loadEnv( mode, process.cwd(), "" );
 
     return {
         plugins: [vue(),],
@@ -29,7 +29,7 @@ export default defineConfig((command, mode) =>
                 },
                 {
                     find: "@",
-                    replacement: path.resolve(__dirname, "src"),
+                    replacement: path.resolve( __dirname, "src" ),
                 },
             ],
         },
@@ -39,7 +39,7 @@ export default defineConfig((command, mode) =>
         css: {
             preprocessorOptions: {
                 scss: {
-                    additionalData: "@import \"./src/assets/css/public/color.scss\";",
+                    additionalData: "@import \"./src/assets/css/public/color.scss\",\"./src/assets/css/public/mixin.scss\";",
                 },
             },
         },