From 2a66edab060cde2840b9e976b46e1763f712397a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=BA=9A=E7=94=B7?= <yaoyanan@syxysoft.com>
Date: Thu, 16 Sep 2021 17:24:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/color.less                        |   2 +-
 src/assets/logo.png                      | Bin 4478 -> 5528 bytes
 src/components/layouts/TabLayout.vue     |  13 +-
 src/components/menu/SideMenu.vue         |  19 +-
 src/components/page/GlobalHeader.vue     |  30 +--
 src/components/page/GlobalLayout.vue     |  13 +-
 src/components/setting/SettingDrawer.vue | 323 -----------------------
 src/components/setting/SettingItem.vue   |  38 ---
 src/components/tools/DepartSelect.vue    | 162 ------------
 src/components/tools/HeaderNotice.vue    |   2 +-
 src/components/tools/Logo.vue            |   1 -
 src/components/tools/UserMenu.vue        |  87 +-----
 src/defaultSettings.js                   |   2 +-
 src/store/modules/user.js                |  13 +
 src/views/user/alteration/Step1.vue      | 183 -------------
 src/views/user/alteration/Step2.vue      | 204 --------------
 src/views/user/alteration/Step3.vue      | 132 ---------
 src/views/user/alteration/Step4.vue      |  55 ----
 18 files changed, 63 insertions(+), 1216 deletions(-)
 delete mode 100644 src/components/setting/SettingDrawer.vue
 delete mode 100644 src/components/setting/SettingItem.vue
 delete mode 100644 src/components/tools/DepartSelect.vue
 delete mode 100644 src/views/user/alteration/Step1.vue
 delete mode 100644 src/views/user/alteration/Step2.vue
 delete mode 100644 src/views/user/alteration/Step3.vue
 delete mode 100644 src/views/user/alteration/Step4.vue

diff --git a/public/color.less b/public/color.less
index 0f799c1..b5cd57b 100644
--- a/public/color.less
+++ b/public/color.less
@@ -1,4 +1,4 @@
-@primary-color: #1890ff;
+@primary-color: #069F99;
 /* stylelint-disable at-rule-empty-line-before,at-rule-name-space-after,at-rule-no-unknown */
 /* stylelint-disable no-duplicate-selectors */
 /* stylelint-disable */
diff --git a/src/assets/logo.png b/src/assets/logo.png
index 4c98ab5b12b91ee1caaa74ca0638f404d3d25935..a95999fedd9f41dc2ef4b7f40e5aa9a5b445cc9a 100644
GIT binary patch
literal 5528
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
atN#n8W%8B#kl8x`0000<MNUMnLSTYe1dihX

literal 4478
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
Qod5s;07*qoM6N<$g6}PD^#A|>

diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue
index 8b404ff..ebdcf94 100644
--- a/src/components/layouts/TabLayout.vue
+++ b/src/components/layouts/TabLayout.vue
@@ -368,19 +368,17 @@
 
   /*美化弹出Tab样式*/
   .ant-tabs-nav-container {
-    margin-top: 4px;
+    margin: 0 !important;
   }
 
   /* 修改 ant-tabs 样式 */
   .tab-layout-tabs.ant-tabs {
-    border-bottom: 1px solid #ccc;
-    border-left: 1px solid #ccc;
     background-color: white;
-    padding: 0 20px;
+    height: 40px !important;
 
     .ant-tabs-bar {
-      margin: 4px 0 0;
       border: none;
+      margin: 0;
     }
 
   }
@@ -419,7 +417,10 @@
       border-bottom: 1px solid transparent !important;
     }
     .ant-tabs-tab-active {
-      border-color: @primary-color!important;
+      border-color: #069F99 !important;
+      color: #069F99;
+      background: rgba(6,159,153,0.1) !important;
+      border-radius: 0 !important;
     }
   }
 
diff --git a/src/components/menu/SideMenu.vue b/src/components/menu/SideMenu.vue
index acb8ad9..c920136 100644
--- a/src/components/menu/SideMenu.vue
+++ b/src/components/menu/SideMenu.vue
@@ -79,7 +79,7 @@
     @scrollBarSize: 10px;
 
     ul.ant-menu {
-
+      background: #069F99;
       /* 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
       &::-webkit-scrollbar {
         width: @scrollBarSize;
@@ -137,7 +137,6 @@
         }
       }
     }
-
   }
 
   /* update_end author:sunjianlei date:20190509 for: 修改侧边导航栏滚动条的样式 */
@@ -149,25 +148,31 @@
     & > .ant-menu-item:first-child {
       background-color: transparent;
 
-      & > a, & > a:hover {
-        color: rgba(0, 0, 0, 0.65);
+      & > a {
+        color: #fff !important;
+      }
+
+      & > a:hover {
+        color: #fff !important;
+        font-weight: 600;
       }
 
       &.ant-menu-item-selected {
         & > a, & > a:hover {
-          color: @primary-color;
+          color: #fff !important;
+          font-weight: 600;
         }
       }
     }
 
     &.ant-menu-dark > .ant-menu-item:first-child {
       & > a, & > a:hover {
-        color: rgba(255, 255, 255, 0.65);
+        color:#fff !important;
       }
 
       &.ant-menu-item-selected {
         & > a, & > a:hover {
-          color: rgba(255, 255, 255, 1);
+          color: #fff !important;
         }
       }
     }
diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index 56c629e..74354c7 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -4,32 +4,15 @@
     v-if="!headerBarFixed"
     :class="[fixedHeader && 'ant-header-fixedHeader', sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed', ]"
     :style="{ padding: '0' }">
-
-    <div v-if="mode === 'sidemenu'" class="header" :class="theme">
-      <a-icon
-        v-if="device==='mobile'"
-        class="trigger"
-        :type="collapsed ? 'menu-fold' : 'menu-unfold'"
-        @click="toggle"></a-icon>
-      <a-icon
-        v-else
-        class="trigger"
-        :type="collapsed ? 'menu-unfold' : 'menu-fold'"
-        @click="toggle"/>
-
-      <span v-if="device === 'desktop'">欢迎进入 Jero-Boot 平台</span>
-      <span v-else>Jero-Boot</span>
-
-      <user-menu :theme="theme"/>
-    </div>
     <!-- 顶部导航栏模式 -->
-    <div v-else :class="['top-nav-header-index', theme]">
+    <div :class="['top-nav-header-index']">
       <div class="header-index-wide">
         <div class="header-index-left" :style="topMenuStyle.headerIndexLeft">
-          <logo class="top-nav-header" :show-title="device !== 'mobile'" :style="topMenuStyle.topNavHeader"/>
+          <logo class="top-nav-header" :show-title="device !== 'mobile'" title='标准所来款管理系统'/>
           <div v-if="device !== 'mobile'" :style="topMenuStyle.topSmenuStyle">
             <s-menu
               mode="horizontal"
+              style='background: #069F99; text-align: right;'
               :menu="menus"
               :theme="theme"></s-menu>
           </div>
@@ -39,7 +22,7 @@
             :type="collapsed ? 'menu-fold' : 'menu-unfold'"
             @click="toggle"></a-icon>
         </div>
-        <user-menu class="header-index-right" :theme="theme" :style="topMenuStyle.headerIndexRight"/>
+        <user-menu class="header-index-right"/>
       </div>
     </div>
 
@@ -170,9 +153,12 @@
   .layout {
 
     .top-nav-header-index {
-
+      background: #069F99 !important;
       .header-index-wide {
         margin-left: 10px;
+        .header-index-left{
+          background: #069F99;
+        }
 
         .ant-menu.ant-menu-horizontal {
           height: @height;
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 0f96ee7..3743c7f 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -445,6 +445,17 @@
           border: none;
           height: 64px;
           line-height: 64px;
+          a{
+            color: #fff;
+          }
+          a:hover{
+            font-weight: 600;
+          }
+          .ant-menu-item-selected {
+            a {
+              font-weight: 600;
+            }
+          }
         }
 
         .header-index-left {
@@ -452,7 +463,7 @@
           display: flex;
 
           .logo.top-nav-header {
-            width: 165px;
+            width: 250px;
             height: 64px;
             position: relative;
             line-height: 64px;
diff --git a/src/components/setting/SettingDrawer.vue b/src/components/setting/SettingDrawer.vue
deleted file mode 100644
index 79f5e9e..0000000
--- a/src/components/setting/SettingDrawer.vue
+++ /dev/null
@@ -1,323 +0,0 @@
-<template>
-  <div class="setting-drawer">
-    <a-drawer
-      width="300"
-      placement="right"
-      :closable="false"
-      @close="onClose"
-      :visible="visible"
-      style="height: 100%;overflow: auto;"
-    >
-      <div class="setting-drawer-index-content">
-
-        <div :style="{ marginBottom: '24px' }">
-          <h3 class="setting-drawer-index-title">整体风格设置</h3>
-
-          <div class="setting-drawer-index-blockChecbox">
-            <a-tooltip>
-              <template slot="title">
-                暗色菜单风格
-              </template>
-              <div class="setting-drawer-index-item" @click="handleMenuTheme('dark')">
-                <img src="https://gw.alipayobjects.com/zos/rmsportal/LCkqqYNmvBEbokSDscrm.svg" alt="dark">
-                <div class="setting-drawer-index-selectIcon" v-if="navTheme === 'dark'">
-                  <a-icon type="check"/>
-                </div>
-              </div>
-            </a-tooltip>
-
-            <a-tooltip>
-              <template slot="title">
-                亮色菜单风格
-              </template>
-              <div class="setting-drawer-index-item" @click="handleMenuTheme('light')">
-                <img src="https://gw.alipayobjects.com/zos/rmsportal/jpRkZQMyYRryryPNtyIC.svg" alt="light">
-                <div class="setting-drawer-index-selectIcon" v-if="navTheme !== 'dark'">
-                  <a-icon type="check"/>
-                </div>
-              </div>
-            </a-tooltip>
-          </div>
-        </div>
-
-        <div :style="{ marginBottom: '24px' }">
-          <h3 class="setting-drawer-index-title">主题色</h3>
-
-          <div style="height: 20px">
-            <a-tooltip class="setting-drawer-theme-color-colorBlock" v-for="(item, index) in colorList" :key="index">
-              <template slot="title">
-                {{ item.key }}
-              </template>
-              <a-tag :color="item.color" @click="changeColor(item.color)">
-                <a-icon type="check" v-if="item.color === primaryColor"></a-icon>
-              </a-tag>
-            </a-tooltip>
-
-          </div>
-        </div>
-        <a-divider />
-
-        <div :style="{ marginBottom: '24px' }">
-          <h3 class="setting-drawer-index-title">导航模式</h3>
-
-          <div class="setting-drawer-index-blockChecbox">
-            <a-tooltip>
-              <template slot="title">
-                侧边栏导航
-              </template>
-              <div class="setting-drawer-index-item" @click="handleLayout('sidemenu')">
-                <img src="https://gw.alipayobjects.com/zos/rmsportal/JopDzEhOqwOjeNTXkoje.svg" alt="sidemenu">
-                <div class="setting-drawer-index-selectIcon" v-if="layoutMode === 'sidemenu'">
-                  <a-icon type="check"/>
-                </div>
-              </div>
-            </a-tooltip>
-
-            <a-tooltip>
-              <template slot="title">
-                顶部栏导航
-              </template>
-              <div class="setting-drawer-index-item" @click="handleLayout('topmenu')">
-                <img src="https://gw.alipayobjects.com/zos/rmsportal/KDNDBbriJhLwuqMoxcAr.svg" alt="topmenu">
-                <div class="setting-drawer-index-selectIcon" v-if="layoutMode !== 'sidemenu'">
-                  <a-icon type="check"/>
-                </div>
-              </div>
-            </a-tooltip>
-          </div>
-          <div :style="{ marginTop: '24px' }">
-            <a-list :split="false">
-              <a-list-item>
-                <a-tooltip slot="actions">
-                  <template slot="title">
-                    该设定仅 [顶部栏导航] 时有效
-                  </template>
-                  <a-select size="small" style="width: 80px;" :defaultValue="contentWidth" @change="handleContentWidthChange">
-                    <a-select-option value="Fixed">固定</a-select-option>
-                    <a-select-option value="Fluid" v-if="layoutMode !== 'sidemenu'">流式</a-select-option>
-                  </a-select>
-                </a-tooltip>
-                <a-list-item-meta>
-                  <div slot="title">内容区域宽度</div>
-                </a-list-item-meta>
-              </a-list-item>
-              <a-list-item>
-                <a-switch slot="actions" size="small" :defaultChecked="fixedHeader" @change="handleFixedHeader" />
-                <a-list-item-meta>
-                  <div slot="title">固定 Header</div>
-                </a-list-item-meta>
-              </a-list-item>
-              <a-list-item>
-                <a-switch slot="actions" size="small" :disabled="!fixedHeader" :defaultChecked="autoHideHeader" @change="handleFixedHeaderHidden" />
-                <a-list-item-meta>
-                  <div slot="title" :style="{ textDecoration: !fixedHeader ? 'line-through' : 'unset' }">下滑时隐藏 Header</div>
-                </a-list-item-meta>
-              </a-list-item>
-              <a-list-item>
-                <a-switch slot="actions" size="small" :disabled="(layoutMode === 'topmenu')" :checked="dataFixSiderbar" @change="handleFixSiderbar" />
-                <a-list-item-meta>
-                  <div slot="title" :style="{ textDecoration: layoutMode === 'topmenu' ? 'line-through' : 'unset' }">固定侧边菜单</div>
-                </a-list-item-meta>
-              </a-list-item>
-            </a-list>
-          </div>
-        </div>
-        <a-divider />
-
-        <div :style="{ marginBottom: '24px' }">
-          <h3 class="setting-drawer-index-title">其他设置</h3>
-          <div>
-            <a-list :split="false">
-              <a-list-item>
-                <a-switch slot="actions" size="small" :defaultChecked="colorWeak" @change="onColorWeak" />
-                <a-list-item-meta>
-                  <div slot="title">色弱模式</div>
-                </a-list-item-meta>
-              </a-list-item>
-              <a-list-item>
-                <a-switch slot="actions" size="small" :defaultChecked="multipage" @change="onMultipageWeak" />
-                <a-list-item-meta>
-                  <div slot="title">多页签模式</div>
-                </a-list-item-meta>
-              </a-list-item>
-            </a-list>
-          </div>
-        </div>
-        <a-divider />
-        <div :style="{ marginBottom: '24px' }">
-          <a-alert type="warning">
-            <span slot="message">
-              配置栏只在开发环境用于预览，生产环境不会展现，请手动修改配置文件
-              <a href="https://github.com/sendya/ant-design-pro-vue/blob/master/src/defaultSettings.js" target="_blank">src/defaultSettings.js</a>
-            </span>
-          </a-alert>
-        </div>
-      </div>
-      <div class="setting-drawer-index-handle" @click="toggle" v-if="visible">
-<!--        <a-icon type="setting" v-if="!visible"/>-->
-<!--        <a-icon type="close" v-else/>-->
-        <a-icon type="close" />
-      </div>
-    </a-drawer>
-  </div>
-</template>
-
-<script>
-  import DetailList from '@/components/tools/DetailList'
-  import SettingItem from '@/components/setting/SettingItem'
-  import config from '@/defaultSettings'
-  import { updateTheme, updateColorWeak, colorList } from '@/components/tools/setting'
-  import { mixin, mixinDevice } from '@/utils/mixin.js'
-  import { triggerWindowResizeEvent } from '@/utils/util'
-
-  export default {
-    components: {
-      DetailList,
-      SettingItem
-    },
-    mixins: [mixin, mixinDevice],
-    data() {
-      return {
-        visible: false,
-        colorList,
-        dataFixSiderbar: false
-    }
-    },
-    mounted () {
-      // 当主题色不是默认色时，才进行主题编译
-      if (this.primaryColor !== config.primaryColor) {
-        updateTheme(this.primaryColor)
-      }
-      if (this.colorWeak !== config.colorWeak) {
-        updateColorWeak(this.colorWeak)
-      }
-      if (this.multipage !== config.multipage) {
-        this.$store.dispatch('ToggleMultipage', this.multipage)
-      }
-    },
-    methods: {
-      showDrawer() {
-        this.visible = true
-      },
-      onClose() {
-        this.visible = false
-      },
-      toggle() {
-        this.visible = !this.visible
-      },
-      onColorWeak (checked) {
-        this.$store.dispatch('ToggleWeak', checked)
-        updateColorWeak(checked)
-      },
-      onMultipageWeak (checked) {
-        this.$store.dispatch('ToggleMultipage', checked)
-      },
-      handleMenuTheme (theme) {
-        this.$store.dispatch('ToggleTheme', theme)
-      },
-      handleLayout (mode) {
-        this.$store.dispatch('ToggleLayoutMode', mode)
-        // 因为顶部菜单不能固定左侧菜单栏，所以强制关闭
-        this.handleFixSiderbar(false)
-        // 触发窗口resize事件
-        triggerWindowResizeEvent()
-      },
-      handleContentWidthChange (type) {
-        this.$store.dispatch('ToggleContentWidth', type)
-      },
-      changeColor (color) {
-        if (this.primaryColor !== color) {
-          this.$store.dispatch('ToggleColor', color)
-          updateTheme(color)
-        }
-      },
-      handleFixedHeader (fixed) {
-        this.$store.dispatch('ToggleFixedHeader', fixed)
-      },
-      handleFixedHeaderHidden (autoHidden) {
-        this.$store.dispatch('ToggleFixedHeaderHidden', autoHidden)
-      },
-      handleFixSiderbar (fixed) {
-        if (this.layoutMode === 'topmenu') {
-          fixed = false
-        }
-        this.dataFixSiderbar = fixed
-        this.$store.dispatch('ToggleFixSiderbar', fixed)
-      }
-    },
-  }
-</script>
-
-<style lang="less" scoped>
-
-  .setting-drawer-index-content {
-
-    .setting-drawer-index-blockChecbox {
-      display: flex;
-
-      .setting-drawer-index-item {
-        margin-right: 16px;
-        position: relative;
-        border-radius: 4px;
-        cursor: pointer;
-
-        img {
-          width: 48px;
-        }
-
-        .setting-drawer-index-selectIcon {
-          position: absolute;
-          top: 0;
-          right: 0;
-          width: 100%;
-          padding-top: 15px;
-          padding-left: 24px;
-          height: 100%;
-          color: #1890ff;
-          font-size: 14px;
-          font-weight: 700;
-        }
-      }
-    }
-    .setting-drawer-theme-color-colorBlock {
-      width: 20px;
-      height: 20px;
-      border-radius: 2px;
-      float: left;
-      cursor: pointer;
-      margin-right: 8px;
-      padding-left: 0px;
-      padding-right: 0px;
-      text-align: center;
-      color: #fff;
-      font-weight: 700;
-
-      i {
-        font-size: 14px;
-      }
-    }
-  }
-
-  .setting-drawer-index-handle {
-    position: absolute;
-    top: 240px;
-    background: #1890ff;
-    width: 48px;
-    height: 48px;
-    right: 300px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    cursor: pointer;
-    pointer-events: auto;
-    z-index: 1001;
-    text-align: center;
-    font-size: 16px;
-    border-radius: 4px 0 0 4px;
-
-    i {
-      color: rgb(255, 255, 255);
-      font-size: 20px;
-    }
-  }
-</style>
diff --git a/src/components/setting/SettingItem.vue b/src/components/setting/SettingItem.vue
deleted file mode 100644
index de0cbe0..0000000
--- a/src/components/setting/SettingItem.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <div class="setting-drawer-index-item">
-    <h3 class="setting-drawer-index-title">{{ title }}</h3>
-    <slot></slot>
-    <a-divider v-if="divider"/>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: "SettingItem",
-    props: {
-      title: {
-        type: String,
-        default: ''
-      },
-      divider: {
-        type: Boolean,
-        default: false
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-
-  .setting-drawer-index-item {
-    margin-bottom: 24px;
-
-    .setting-drawer-index-title {
-      font-size: 14px;
-      color: rgba(0, 0, 0, .85);
-      line-height: 22px;
-      margin-bottom: 12px;
-    }
-
-  }
-</style>
\ No newline at end of file
diff --git a/src/components/tools/DepartSelect.vue b/src/components/tools/DepartSelect.vue
deleted file mode 100644
index 7a7e15a..0000000
--- a/src/components/tools/DepartSelect.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-  <a-modal
-    :title="currTitle"
-    :width="450"
-    :visible="visible"
-    :closable="false"
-    :maskClosable="closable">
-    <template slot="footer">
-      <a-button v-if="closable" @click="close">关闭</a-button>
-      <a-button type="primary" @click="departOk">确认</a-button>
-    </template>
-
-    <a-form>
-      <a-form-item
-        :labelCol="{span:4}"
-        :wrapperCol="{span:20}"
-        style="margin-bottom:10px"
-        :validate-status="validate_status">
-        <a-tooltip placement="topLeft" >
-          <template slot="title">
-            <span>您隶属于多部门，请选择当前所在部门</span>
-          </template>
-          <a-avatar style="backgroundColor:#87d068" icon="gold" />
-        </a-tooltip>
-        <a-select v-model="departSelected" :class="{'valid-error':validate_status=='error'}" placeholder="请选择登录部门" style="margin-left:10px;width: 80%">
-          <a-icon slot="suffixIcon" type="gold" />
-          <a-select-option
-            v-for="d in departList"
-            :key="d.id"
-            :value="d.orgCode">
-            {{ d.departName }}
-          </a-select-option>
-        </a-select>
-      </a-form-item>
-    </a-form>
-
-
-  </a-modal>
-    
-</template>
-
-<script>
-  import { getAction,putAction } from '@/api/manage'
-  import Vue from 'vue'
-  import store from '@/store/'
-  import { USER_INFO } from "@/store/mutation-types"
-
-  export default {
-    name: 'DepartSelect',
-    props:{
-      title:{
-        type:String,
-        default:"部门选择",
-        required:false
-      },
-      closable:{
-        type:Boolean,
-        default:false,
-        required:false
-      },
-      username:{
-        type:String,
-        default:"",
-        required:false
-      }
-    },
-    watch:{
-      username(val){
-        if(val){
-          this.loadDepartList()
-        }
-      }
-    },
-    data(){
-      return {
-        currTitle:this.title,
-        visible:false,
-        departList:[],
-        departSelected:"",
-        validate_status:"",
-        currDepartName:"",
-      }
-    },
-    created(){
-      //this.loadDepartList()
-    },
-    methods:{
-      loadDepartList(){
-        return new Promise(resolve => {
-          let url = "/sys/user/getCurrentUserDeparts"
-          this.currDepartName=''
-          getAction(url).then(res=>{
-            if(res.success){
-              let departs = res.result.list
-              let orgCode = res.result.orgCode
-              if(departs && departs.length>0){
-                for(let i of departs){
-                  if(i.orgCode == orgCode){
-                    this.currDepartName = i.departName
-                    break
-                  }
-                }
-              }
-              this.departSelected = orgCode
-              this.departList  = departs
-              if(this.currDepartName){
-                this.currTitle ="部门切换（当前部门 : "+this.currDepartName+"）"
-              }
-
-            }
-            resolve()
-          })
-        })
-      },
-      close(){
-        this.departClear()
-      },
-      departOk(){
-        if(!this.departSelected){
-          this.validate_status='error'
-          return false
-        }
-        let obj = {
-          orgCode:this.departSelected,
-          username:this.username
-        }
-        putAction("/sys/selectDepart",obj).then(res=>{
-          if(res.success){
-            const userInfo = res.result.userInfo;
-            Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000);
-            store.commit('SET_INFO', userInfo);
-            //console.log("---切换组织机构---userInfo-------",store.getters.userInfo.orgCode);
-            this.departClear()
-          }
-        })
-      },
-      show(){
-        //如果组件传值username此处就不用loadDepartList了
-        this.loadDepartList().then(()=>{
-          this.visible=true
-          if(!this.departList || this.departList.length<=0){
-            this.$message.warning("您尚未设置部门信息!")
-            this.departClear()
-          }
-        })
-      },
-      departClear(){
-        this.departList=[]
-        this.departSelected=""
-        this.visible=false
-        this.validate_status=''
-        this.currDepartName=""
-      },
-    }
-
-  }
-</script>
-<style scoped>
-  .valid-error .ant-select-selection__placeholder{
-    color: #f5222d;
-  }
-</style>
\ No newline at end of file
diff --git a/src/components/tools/HeaderNotice.vue b/src/components/tools/HeaderNotice.vue
index 799069f..8a2faca 100644
--- a/src/components/tools/HeaderNotice.vue
+++ b/src/components/tools/HeaderNotice.vue
@@ -68,7 +68,7 @@
     </template>
     <span @click="fetchNotice" class="header-notice">
       <a-badge :count="msgTotal">
-        <a-icon style="font-size: 16px; padding: 4px" type="bell" />
+        <a-icon style="margin-right: 8px" type="bell" />通知消息
       </a-badge>
     </span>
     <show-announcement ref="ShowAnnouncement" @ok="modalFormOk"></show-announcement>
diff --git a/src/components/tools/Logo.vue b/src/components/tools/Logo.vue
index 36d85ed..ac19d58 100644
--- a/src/components/tools/Logo.vue
+++ b/src/components/tools/Logo.vue
@@ -43,7 +43,6 @@
       line-height: @height !important;
       box-shadow: none !important;
       transition: background 300ms;
-
       a {
         color: white;
         &:hover {
diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue
index d92eda9..a93a7af 100644
--- a/src/components/tools/UserMenu.vue
+++ b/src/components/tools/UserMenu.vue
@@ -1,39 +1,7 @@
 <template>
-  <div class="user-wrapper" :class="theme">
-    <!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
-    <!-- update-begin author:sunjianlei date:20191@20 for: 解决全局样式冲突的问题 -->
-    <span class="action" @click="showClick">
-      <a-icon type="search"></a-icon>
-    </span>
-    <!-- update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
-    <component :is="searchMenuComp" v-show="searchMenuVisible || isMobile()" class="borders" :visible="searchMenuVisible" title="搜索菜单" :footer="null" @cancel="searchMenuVisible=false">
-      <a-select
-        class="search-input"
-        showSearch
-        :showArrow="false"
-        placeholder="搜索菜单"
-        optionFilterProp="children"
-        :filterOption="filterOption"
-        :open="isMobile()?true:null"
-        :getPopupContainer="(node) => node.parentNode"
-        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"
-        @change="searchMethods"
-        @blur="hiddenClick"
-      >
-        <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option>
-      </a-select>
-    </component>
-    <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
-    <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
-    <!-- update_end  author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
-    <span class="action">
-      <a class="logout_title" target="_blank" href="http://doc.jeecg.com">
-        <a-icon type="question-circle-o"></a-icon>
-      </a>
-    </span>
-    <header-notice class="action"/>
+  <div class="user-wrapper">
     <a-dropdown>
-      <span class="action action-full ant-dropdown-link user-dropdown-menu">
+      <span class="action action-full ant-dropdown-link user-dropdown-menu" style='color: #fff'>
         <a-avatar class="avatar" size="small" :src="getAvatar()"/>
         <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
       </span>
@@ -44,58 +12,28 @@
             <span>个人中心</span>
           </router-link>
         </a-menu-item>
-        <a-menu-item key="1">
-          <router-link :to="{ name: 'account-settings-base' }">
-            <a-icon type="setting"/>
-            <span>账户设置</span>
-          </router-link>
+        <a-menu-item key='1'>
+          <header-notice class="action"/>
         </a-menu-item>
-        <a-menu-item key="3"  @click="systemSetting">
-           <a-icon type="tool"/>
-           <span>系统设置</span>
-        </a-menu-item>
-        <a-menu-item key="4" @click="updatePassword">
+        <a-menu-item key="2" @click="updatePassword">
           <a-icon type="setting"/>
           <span>密码修改</span>
         </a-menu-item>
-        <a-menu-item key="5" @click="updateCurrentDepart">
-          <a-icon type="cluster"/>
-          <span>切换部门</span>
-        </a-menu-item>
-        <a-menu-item key="6" @click="clearCache">
-          <a-icon type="sync"/>
-          <span>清理缓存</span>
-        </a-menu-item>
-       <!-- <a-menu-item key="2" disabled>
-          <a-icon type="setting"/>
-          <span>测试</span>
-        </a-menu-item>
-        <a-menu-divider/>
-        <a-menu-item key="3">
-          <a href="javascript:;" @click="handleLogout">
-            <a-icon type="logout"/>
-            <span>退出登录</span>
-          </a>
-        </a-menu-item>-->
       </a-menu>
     </a-dropdown>
-    <span class="action">
+    <span class="action" style='color: #fff'>
       <a class="logout_title" href="javascript:;" @click="handleLogout">
         <a-icon type="logout"/>
-        <span v-if="isDesktop()">&nbsp;退出登录</span>
+        <span v-if="isDesktop()">&nbsp;注销</span>
       </a>
     </span>
     <user-password ref="userPassword"></user-password>
-    <depart-select ref="departSelect" :closable="true" title="部门切换"></depart-select>
-    <setting-drawer ref="settingDrawer" :closable="true" title="系统设置"></setting-drawer>
   </div>
 </template>
 
 <script>
   import HeaderNotice from './HeaderNotice'
   import UserPassword from './UserPassword'
-  import SettingDrawer from "@/components/setting/SettingDrawer";
-  import DepartSelect from './DepartSelect'
   import { mapActions, mapGetters,mapState } from 'vuex'
   import { mixinDevice } from '@/utils/mixin.js'
   import { getFileAccessHttpUrl,getAction } from "@/api/manage"
@@ -116,16 +54,7 @@
     },
     components: {
       HeaderNotice,
-      UserPassword,
-      DepartSelect,
-      SettingDrawer
-    },
-    props: {
-      theme: {
-        type: String,
-        required: false,
-        default: 'dark'
-      }
+      UserPassword
     },
     /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
     created() {
diff --git a/src/defaultSettings.js b/src/defaultSettings.js
index 832264f..fa2f344 100644
--- a/src/defaultSettings.js
+++ b/src/defaultSettings.js
@@ -16,7 +16,7 @@
 export default {
   primaryColor: '#1890FF', // primary color of ant design
   navTheme: 'light', // theme for nav menu
-  layout: 'sidemenu', // nav menu position: sidemenu or topmenu
+  layout: 'topmenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu
   fixedHeader: false, // sticky header
   fixSiderbar: false, // sticky siderbar
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index a7fd032..60f194b 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -131,6 +131,19 @@ const user = {
               },
               "name": "dashboard-analysis",
               "id": "1"
+            },
+            {
+              "redirect": null,
+              "path": "",
+              "component": "",
+              "route": "1",
+              "meta": {
+                "icon": "home", // 菜单前图标
+                "componentName": "Analysis",
+                "title": "菜单2" // 菜单名称
+              },
+              "name": "dashboard-analysis",
+              "id": "2"
             }
           ]
           const authData = [];
diff --git a/src/views/user/alteration/Step1.vue b/src/views/user/alteration/Step1.vue
deleted file mode 100644
index 7cace12..0000000
--- a/src/views/user/alteration/Step1.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-  <div class="main">
-
-    <a-form style="max-width: 500px; margin: 40px auto 0;" :form="form" @keyup.enter.native="nextStep">
-      <a-form-item>
-        <a-input
-          v-decorator="['username',validatorRules.username]"
-          size="large"
-          type="text"
-          autocomplete="false"
-          placeholder="请输入用户账号或手机号">
-          <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-        </a-input>
-      </a-form-item>
-      <a-row :gutter="0">
-        <a-col :span="14">
-          <a-form-item>
-            <a-input
-              v-decorator="['inputCode',validatorRules.inputCode]"
-              size="large"
-              type="text"
-              @change="inputCodeChange"
-              placeholder="请输入验证码">
-              <a-icon slot="prefix" v-if=" inputCodeContent==verifiedCode " type="smile"
-                      :style="{ color: 'rgba(0,0,0,.25)' }"/>
-              <a-icon slot="prefix" v-else type="frown" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-            </a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="10" style="text-align: right">
-          <img v-if="requestCodeSuccess" style="margin-top: 2px;" :src="randCodeImage" @click="handleChangeCheckCode"/>
-          <img v-else style="margin-top: 2px;" src="../../../assets/checkcode.png" @click="handleChangeCheckCode"/>
-        </a-col>
-      </a-row>
-      <a-form-item :wrapperCol="{span: 19, offset: 5}">
-        <router-link style="float: left;line-height: 40px;" :to="{ name: 'login' }">使用已有账户登录</router-link>
-        <a-button type="primary" @click="nextStep">下一步</a-button>
-      </a-form-item>
-    </a-form>
-  </div>
-</template>
-
-<script>
-  import { getAction,postAction } from '@/api/manage'
-  import { checkOnlyUser } from '@/api/api'
-
-  export default {
-    name: "Step1",
-    data() {
-      return {
-        form: this.$form.createForm(this),
-        inputCodeContent: "",
-        inputCodeNull: true,
-        verifiedCode: "",
-        validatorRules: {
-          username: {rules: [{required: false}, {validator: this.validateInputUsername}]},
-          inputCode: {rules: [{required: true, message: '请输入验证码!'}]},
-        },
-        randCodeImage:'',
-        requestCodeSuccess:true,
-        currdatetime:''
-
-      }
-    },
-    created(){
-      this.handleChangeCheckCode();
-    },
-    methods: {
-      handleChangeCheckCode(){
-        this.currdatetime = new Date().getTime();
-        getAction(`/sys/randomImage/${this.currdatetime}`).then(res=>{
-          if(res.success){
-            this.randCodeImage = res.result
-            this.requestCodeSuccess=true
-          }else{
-            this.$message.error(res.message)
-            this.requestCodeSuccess=false
-          }
-        }).catch(()=>{
-          this.requestCodeSuccess=false
-        })
-      },
-      nextStep() {
-        let that = this
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let isPhone = false;
-            var params = {}
-            var reg = /^[1-9]\d*$|^0$/;
-            var username = values.username;
-            if (reg.test(username) == true) {
-              params.phone = username;
-              isPhone = true
-            } else {
-              params.username = username;
-            }
-            that.validateInputCode().then(()=>{
-              getAction("/sys/user/querySysUser", params).then((res) => {
-                if (res.success) {
-                  var userList = {
-                    username: res.result.username,
-                    phone: res.result.phone,
-                    isPhone: isPhone
-                  };
-                  setTimeout(function () {
-                    that.$emit('nextStep', userList)
-                  })
-                }
-              });
-            })
-          }
-        })
-
-      },
-      validateInputCode() {
-        return new Promise((resolve,reject)=>{
-          postAction("/sys/checkCaptcha",{
-            captcha:this.inputCodeContent,
-            checkKey:this.currdatetime
-          }).then(res=>{
-            if(res.success){
-              resolve();
-            }else{
-              this.$message.error(res.message)
-              reject();
-            }
-          });
-        })
-      },
-      inputCodeChange(e) {
-        this.inputCodeContent = e.target.value;
-        console.log(this.inputCodeContent)
-        if (!e.target.value || 0 == e.target.value) {
-          this.inputCodeNull = true
-        } else {
-          this.inputCodeContent = this.inputCodeContent.toLowerCase()
-          this.inputCodeNull = false
-        }
-      },
-      generateCode(value) {
-        this.verifiedCode = value.toLowerCase();
-        console.log(this.verifiedCode);
-      },
-      validateInputUsername(rule, value, callback) {
-        console.log(value);
-        var reg = /^[0-9]+.?[0-9]*/;
-        if (!value) {
-          callback("请输入用户名和手机号！");
-        }
-
-        //判断用户输入账号还是手机号码
-        if (reg.test(value)) {
-          var params = {
-            phone: value,
-          };
-          checkOnlyUser(params).then((res) => {
-            if (res.success) {
-              callback("用户名不存在!")
-            } else {
-              callback()
-            }
-          })
-        } else {
-          var params = {
-            username: value,
-          };
-          checkOnlyUser(params).then((res) => {
-            if (res.success) {
-              callback("用户名不存在!")
-            } else {
-              callback()
-            }
-          })
-        }
-      },
-
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/user/alteration/Step2.vue b/src/views/user/alteration/Step2.vue
deleted file mode 100644
index a8db118..0000000
--- a/src/views/user/alteration/Step2.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <div>
-    <a-form :form="form" style="max-width: 500px; margin: 40px auto 0;" @keyup.enter.native="nextStep">
-      <a-form-item
-        label="手机"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 16}"
-        style="text-align: left"
-      >
-        <a-input
-          type="text"
-          autocomplete="false"
-          v-decorator="['phone',{ rules: validatorRules.phone.rule}]"
-          placeholder="请输入手机号">
-          <a-icon slot="prefix" type="phone" :style="{ color: 'rgba(0,0,0,.25)'}"/>
-        </a-input>
-        <a-col :span="3"></a-col>
-      </a-form-item>
-      <a-form-item
-        label="验证码"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 19}"
-        v-if="show">
-        <a-row :gutter="24">
-          <a-col :span="13">
-            <a-input
-              v-decorator="['captcha',validatorRules.captcha]"
-              type="text"
-              placeholder="手机短信验证码">
-            </a-input>
-          </a-col>
-          <a-col :span="8">
-            <a-button
-              tabindex="-1"
-              size="default"
-              :disabled="state.smsSendBtn"
-              @click.stop.prevent="getCaptcha"
-              v-text="!state.smsSendBtn && '获取验证码' || (state.time+' s')"></a-button>
-          </a-col>
-        </a-row>
-      </a-form-item>
-      <a-form-item :wrapperCol="{span: 19, offset: 5}">
-        <router-link style="float: left;line-height: 40px;" :to="{ name: 'login' }">使用已有账户登录</router-link>
-        <a-button type="primary" @click="nextStep" style="margin-left: 20px">下一步</a-button>
-      </a-form-item>
-    </a-form>
-  </div>
-</template>
-
-<script>
-  import {postAction} from '@/api/manage'
-
-  export default {
-    name: "Step2",
-    props: ['userList'],
-    data() {
-      return {
-        form: this.$form.createForm(this),
-        loading: false,
-        // accountName: this.userList.username,
-        dropList: "0",
-        captcha: "",
-        show: true,
-        state: {
-          time: 60,
-          smsSendBtn: false,
-        },
-        formLogin: {
-          captcha: "",
-          mobile: "",
-        },
-        validatorRules: {
-          captcha: {rule: [{required: true, message: '请输入短信验证码!'}, {validator: this.validateCaptcha}]},
-          phone: {rule: [{required: true, message: '请输入手机号码!'}, {validator: this.validatePhone}]},
-        },
-      }
-    },
-    computed: {
-    },
-    methods: {
-      nextStep() {
-        let that = this
-        that.loading = true
-        this.form.validateFields((err, values) => {
-          console.log(values);
-          if (!err) {
-            if (that.dropList == "0") {
-              if (values.captcha == undefined) {
-                this.cmsFailed("请输入短信验证码!");
-              } else {
-                var params = {}
-                params.phone = values.phone;
-                params.smscode = values.captcha;
-                postAction("/sys/user/phoneVerification", params).then((res) => {
-                  if (res.success) {
-                    console.log(res);
-                    var userList = {
-                      username: res.result.username,
-                      phone: values.phone,
-                      smscode: res.result.smscode
-                    };
-                    setTimeout(function () {
-                      that.$emit('nextStep', userList)
-                    }, 0)
-                  } else {
-                    this.cmsFailed(res.message);
-                  }
-                })
-
-              }
-            }
-
-
-          }
-        })
-      },
-      getCaptcha(e) {
-        e.preventDefault();
-        let that = this;
-        let phone=that.form.getFieldValue("phone")
-        if(!phone){
-          this.cmsFailed("手机号不能为空!");
-          return;
-        }
-        this.state.smsSendBtn = true;
-        let interval = window.setInterval(() => {
-          if (that.state.time-- <= 0) {
-            that.state.time = 60;
-            that.state.smsSendBtn = false;
-            window.clearInterval(interval);
-          }
-        }, 1000);
-
-        const hide = this.$message.loading('验证码发送中..', 0);
-        let smsParams = {
-          mobile: phone,
-          smsmode: "2"
-        };
-        postAction("/sys/sms", smsParams).then(res => {
-          if (!res.success) {
-            setTimeout(hide, 1);
-            this.cmsFailed(res.message);
-          }
-          setTimeout(hide, 500);
-        })
-      },
-      cmsFailed(err) {
-        this.$notification['error']({
-          message: "验证错误",
-          description: err,
-          duration: 4,
-        });
-      },
-      handleChangeSelect(value) {
-        var that = this;
-        console.log(value);
-        if (value == 0) {
-          that.dropList = "0";
-          that.show = true;
-        } else {
-          that.dropList = "1";
-          that.show = false;
-        }
-      },
-      validatePhone(rule,value,callback){
-          if(value){
-            var myreg=/^[1][3,4,5,7,8][0-9]{9}$/;
-            if(!myreg.test(value)){
-              callback("请输入正确的手机号")
-            }else{
-              callback();
-            }
-          }else{
-            callback()
-          }
-      }
-    }
-
-  }
-</script>
-
-<style lang="less" scoped>
-  .stepFormText {
-    margin-bottom: 24px;
-  }
-  .ant-row{
-    margin-left: 0 !important;
-    margin-right: 0 !important;
-  }
-  .ant-col{
-    padding: 0 !important;
-  }
-
-  .ant-form-item-label,
-  .ant-form-item-control {
-    line-height: 22px;
-  }
-
-  .getCaptcha {
-    display: block;
-    width: 100%;
-    height: 40px;
-  }
-</style>
\ No newline at end of file
diff --git a/src/views/user/alteration/Step3.vue b/src/views/user/alteration/Step3.vue
deleted file mode 100644
index 57b614c..0000000
--- a/src/views/user/alteration/Step3.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-  <div>
-    <a-form :form="form" style="max-width: 500px; margin: 40px auto 0;">
-      <a-form-item
-        label="账号名"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 19}"
-      >
-        <a-input
-          type="text"
-          autocomplete="false" :value="accountName" disabled>
-        </a-input>
-      </a-form-item>
-      <a-form-item
-        label="新密码"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 19}"
-        class="stepFormText">
-        <a-input
-          v-decorator="['password',validatorRules.password]"
-          type="password"
-          autocomplete="false">
-        </a-input>
-      </a-form-item>
-      <a-form-item
-        label="确认密码"
-        :labelCol="{span: 5}"
-        :wrapperCol="{span: 19}"
-        class="stepFormText">
-        <a-input
-          v-decorator="['confirmPassword',validatorRules.confirmPassword]"
-          type="password"
-          autocomplete="false">
-        </a-input>
-      </a-form-item>
-      <a-form-item :wrapperCol="{span: 19, offset: 5}">
-        <a-button style="margin-left: 8px" @click="prevStep">上一步</a-button>
-        <a-button :loading="loading" type="primary" @click="nextStep" style="margin-left:20px">提交</a-button>
-      </a-form-item>
-    </a-form>
-  </div>
-</template>
-
-<script>
-  import { putAction,getAction } from '@/api/manage'
-  export default {
-    name: "Step3",
-//    components: {
-//      Result
-//    },
-    props: ['userList'],
-    data () {
-      return {
-        loading: false,
-        form: this.$form.createForm(this),
-        accountName: this.userList.username,
-        validatorRules: {
-          username: {rules: [{required: true, message: '用户名不能为空!'}]},
-          password: {
-            rules: [{
-              required: true,
-              pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/,
-              message: '密码由8位数字、大小写字母和特殊符号组成!!'
-            }, {validator: this.handlePasswordLevel}]
-          },
-          confirmPassword: {rules: [{required: true, message: '密码不能为空!'}, {validator: this.handlePasswordCheck}]},
-        },
-      }
-    },
-    methods: {
-      nextStep () {
-        let that = this
-        that.loading = true
-        this.form.validateFields((err, values) => {
-          if ( !err ){
-          var params={}
-          params.username=this.userList.username;
-          params.password=values.password;
-          params.smscode=this.userList.smscode;
-          params.phone= this.userList.phone;
-          getAction("/sys/user/passwordChange", params).then((res) => {
-            if(res.success){
-            var userList = {
-              username: this.userList.username
-            }
-            console.log(userList);
-            setTimeout(function () {
-              that.$emit('nextStep', userList)
-            }, 1500)
-          }else{
-            this.passwordFailed(res.message);
-            that.loading = false
-          }
-        })
-        } else{
-          that.loading = false
-        }
-      })
-
-      },
-      prevStep () {
-        this.$emit('prevStep', this.userList)
-      },
-
-      handlePasswordCheck (rule, value, callback) {
-        let password = this.form.getFieldValue('password')
-        if (value && password && value.trim() !== password.trim()) {
-          callback(new Error('两次密码不一致'))
-        }
-        callback()
-      },
-      passwordFailed(err){
-        this.$notification[ 'error' ]({
-          message: "更改密码失败",
-          description:err,
-          duration: 4,
-        });
-      },
-    }
-  }
-</script>
-<style lang="less" scoped>
-  .stepFormText {
-    margin-bottom: 24px;
-  }
-
-  .ant-form-item-label,
-  .ant-form-item-control {
-    line-height: 22px;
-  }
-
-</style>
\ No newline at end of file
diff --git a/src/views/user/alteration/Step4.vue b/src/views/user/alteration/Step4.vue
deleted file mode 100644
index 59999d7..0000000
--- a/src/views/user/alteration/Step4.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-  <div>
-      <a-form style="margin: 40px auto 0;">
-      <result title="更改密码成功" :is-success="true">
-        <div class="toLogin">
-          <h3>将在<span>{{time}}</span>秒后返回登录页面.</h3>
-        </div>
-      </result>
-
-      </a-form>
-  </div>
-</template>
-
-<script>
-  import Result from '@/views/result/Result'
-  export default {
-    name: "Step4",
-    props:['userList'],
-    components: {
-      Result
-    },
-    data () {
-      return {
-        loading: false,
-        time: 0,
-      }
-    },
-    methods: {
-      countDown(){
-        let that = this;
-        that.time--;
-      }
-    },
-    mounted(){
-      let that = this;
-      that.time = 5;
-      setInterval(that.countDown, 1000);
-    },
-    watch: {
-      time: function (newVal,oldVal) {
-        if (newVal == 0) {
-          var params = {
-            username: this.userList.username
-          };
-          this.$router.push({name: 'login', params})
-        }
-      }
-    }
-  }
-</script>
-<style scoped>
-  .toLogin{
-    text-align: center;
-  }
-</style>
\ No newline at end of file