From 81a8d29b5425560c2f1fb8dd359d2ee093dfdb49 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 17 Feb 2022 13:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-oper-web/src/views/main-navbar.vue      | 215 ++++------
 epmet-oper-web/src/views/main-sidebar.vue     |  54 +--
 epmet-oper-web/src/views/main-theme-tools.vue |  42 +-
 epmet-oper-web/src/views/main.vue             | 158 +++-----
 epmet-oper-web/src/views/pages/loginWork.vue  | 375 +++++++++++-------
 5 files changed, 394 insertions(+), 450 deletions(-)

diff --git a/epmet-oper-web/src/views/main-navbar.vue b/epmet-oper-web/src/views/main-navbar.vue
index 18a3d95..1f6024e 100644
--- a/epmet-oper-web/src/views/main-navbar.vue
+++ b/epmet-oper-web/src/views/main-navbar.vue
@@ -1,64 +1,31 @@
 <template>
   <div>
-    <nav
-      v-if="showHeader"
-      class="aui-navbar"
-      :class="`aui-navbar--${$store.state.navbarLayoutType}`"
-    >
+    <nav v-if="showHeader"
+         class="aui-navbar"
+         :class="`aui-navbar--${$store.state.navbarLayoutType}`">
       <div class="aui-navbar__header">
-        <h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
-          <a class="aui-navbar__brand-lg" href="javascript:;">{{
-            userType === 'work' ? customerName : $t('brand.lg')
-          }}</a>
-          <a class="aui-navbar__brand-mini" href="javascript:;">{{
-            $t('brand.mini')
-          }}</a>
+        <h1 class="aui-navbar__brand"
+            @click="$router.push({ name: 'home' })">
+          <a class="aui-navbar__brand-lg"
+             href="javascript:;">{{  userType==='work'?customerName :$t('brand.lg') }}</a>
+          <a class="aui-navbar__brand-mini"
+             href="javascript:;">{{ $t('brand.mini') }}</a>
         </h1>
       </div>
       <div class="aui-navbar__body">
-        <el-menu class="aui-navbar__menu mr-auto" mode="horizontal">
-          <el-menu-item
-            index="1"
-            @click="$store.state.sidebarFold = !$store.state.sidebarFold"
-          >
-            <svg
-              class="
-                icon-svg
-                aui-navbar__icon-menu aui-navbar__icon-menu--switch
-              "
-              aria-hidden="true"
-            >
+        <el-menu class="aui-navbar__menu mr-auto"
+                 mode="horizontal">
+          <el-menu-item index="1"
+                        @click="$store.state.sidebarFold = !$store.state.sidebarFold">
+            <svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch"
+                 aria-hidden="true">
               <use xlink:href="#icon-outdent"></use>
             </svg>
           </el-menu-item>
 
-          <el-menu-item index="2" @click="refresh()">
-            <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
-              <use xlink:href="#icon-sync"></use>
-            </svg>
-          </el-menu-item>
-        </el-menu>
-
-        <el-menu
-          v-if="userType == 'work'"
-          :default-active="$store.state.LevelOneMenuActiveName"
-          :unique-opened="true"
-          :collapseTransition="false"
-          mode="horizontal"
-          class="aui-navbar__menu mr-auto z-div"
-        >
-          <el-menu-item
-            v-for="(menu, idx) in $store.state.sidebarMenuList"
-            :key="menu.id"
-            :menu="menu"
-            :index="menu.id"
-            @click="gotoRouteHandle(menu.id, idx)"
-          >
-            <span>{{ menu.name }}</span>
-          </el-menu-item>
         </el-menu>
-
-        <el-menu class="aui-navbar__menu" mode="horizontal">
+        <el-menu class="aui-navbar__menu"
+                 mode="horizontal">
           <!-- <el-menu-item index="1">
             <el-dropdown placement="bottom"
                          :show-timeout="0">
@@ -86,95 +53,85 @@
               <use xlink:href="#icon-fullscreen"></use>
             </svg>
           </el-menu-item> -->
+          <el-menu-item index="2"
+                        @click="refresh()">
+            <svg class="icon-svg aui-navbar__icon-menu"
+                 aria-hidden="true">
+              <use xlink:href="#icon-sync"></use>
+            </svg>
 
-          <el-menu-item index="4" class="aui-navbar__avatar">
-            <el-dropdown placement="bottom" :show-timeout="0">
+          </el-menu-item>
+          <el-menu-item index="4"
+                        class="aui-navbar__avatar">
+            <el-dropdown placement="bottom"
+                         :show-timeout="0">
               <span class="el-dropdown-link">
-                <img
-                  v-if="$store.state.user.gender === '2'"
-                  src="~@/assets/img/staff-default-avatar-girl.png"
-                />
-                <img v-else src="~@/assets/img/staff-default-avatar-boy.png" />
+                <img v-if="$store.state.user.gender ==='2'"
+                     src="~@/assets/img/staff-default-avatar-girl.png">
+                <img v-else
+                     src="~@/assets/img/staff-default-avatar-boy.png">
                 <span>{{ $store.state.user.realName }}</span>
                 <i class="el-icon-arrow-down"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  v-if="userType == 'work'"
-                  @click.native="updatePasswordHandle()"
-                  >{{ $t('updatePassword.title') }}</el-dropdown-item
-                >
-                <el-dropdown-item @click.native="logoutHandle()">{{
-                  $t('logout')
-                }}</el-dropdown-item>
+                <!-- <el-dropdown-item @click.native="updatePasswordHandle()">{{ $t('updatePassword.title') }}</el-dropdown-item> -->
+                <el-dropdown-item @click.native="logoutHandle()">{{ $t('logout') }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </el-menu-item>
         </el-menu>
       </div>
       <!-- 弹窗, 修改密码 -->
-      <update-password-work
-        v-if="updatePassowrdVisible"
-        ref="updatePassowrd"
-      ></update-password-work>
+      <update-password v-if="updatePassowrdVisible"
+                       ref="updatePassowrd"></update-password>
     </nav>
-    <nav v-else class="aui-navbar main-line"></nav>
+    <nav v-else
+         class="aui-navbar main-line"></nav>
   </div>
+
 </template>
 
 <script>
 import { messages } from '@/i18n'
 import { mapGetters } from 'vuex'
 import screenfull from 'screenfull'
-import UpdatePasswordWork from './main-navbar-update-password-work'
+import UpdatePassword from './main-navbar-update-password'
 import { clearLoginInfo } from '@/utils'
 export default {
   inject: ['refresh'],
-  data() {
+  data () {
     return {
       showHeader: true,
       i18nMessages: messages,
       updatePassowrdVisible: false,
       customerName: localStorage.getItem('customerName')
+
+
     }
   },
   components: {
-    UpdatePasswordWork
+    UpdatePassword
   },
-  created() {
-    let platformToken = localStorage.getItem('showHeader') || ''
-    if (
-      typeof platformToken !== 'undefined' &&
-      platformToken !== 'undefined' &&
-      platformToken !== ''
-    ) {
+  created () {
+    let platformToken = localStorage.getItem('showHeader') || '';
+    if (typeof platformToken !== 'undefined' && platformToken !== 'undefined' && platformToken !== '') {
       this.showHeader = false
     }
-    console.log('=============================', this.userType)
   },
   computed: {
-    userType() {
+    userType () {
       return localStorage.getItem('userType')
-    }
+    },
+
+
   },
   methods: {
-    // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
-    gotoRouteHandle(menuId, idx) {
-      var route = window.SITE_CONFIG['dynamicMenuRoutes'].filter(
-        (item) => item.meta.menuId === menuId
-      )[0]
-      if (route) {
-        this.$router.push({ name: route.name })
-      }
-      this.$store.state.LevelOneMenuActiveName = menuId
-      this.$store.state.sidebarActiveSubMenuList =
-        this.$store.state.sidebarMenuList[idx].children || []
-    },
-    changeCustomerName(customerName) {
+    changeCustomerName (customerName) {
+
       this.customerName = localStorage.getItem('customerName')
     },
     // 全屏
-    fullscreenHandle() {
+    fullscreenHandle () {
       if (!screenfull.enabled) {
         return this.$message({
           message: this.$t('fullscreen.prompt'),
@@ -185,51 +142,42 @@ export default {
       screenfull.toggle()
     },
     // 修改密码
-    updatePasswordHandle() {
+    updatePasswordHandle () {
       this.updatePassowrdVisible = true
       this.$nextTick(() => {
         this.$refs.updatePassowrd.init()
       })
     },
     // 退出
-    logoutHandle() {
-      this.$confirm(
-        this.$t('prompt.info', { handle: this.$t('logout') }),
-        this.$t('prompt.title'),
-        {
-          confirmButtonText: this.$t('confirm'),
-          cancelButtonText: this.$t('cancel'),
-          type: 'warning'
-        }
-      )
-        .then(() => {
-          //关闭所有标签页
-          // tabs, 关闭全部
-          this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-            (item) => item.name === 'home'
-          )
+    logoutHandle () {
+      this.$confirm(this.$t('prompt.info', { 'handle': this.$t('logout') }), this.$t('prompt.title'), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+        //关闭所有标签页
+        // tabs, 关闭全部
+        this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name === 'home')
 
-          this.$http
-            .post('/auth/login/logout')
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                //别处登陆时 退出不提示 直接跳登陆页即可
-                if (res.code !== 10007) {
-                  this.$message.error(res.msg)
-                }
-              }
 
-              clearLoginInfo()
+        this.$http.post('/auth/login/logout').then(({ data: res }) => {
+          if (res.code !== 0) {
+            //别处登陆时 退出不提示 直接跳登陆页即可
+            if (res.code !== 10007){
+              this.$message.error(res.msg)
+            }
+          }
 
-              if (localStorage.getItem('userType') === 'work') {
-                this.$router.push({ name: 'loginWork' })
-              } else {
-                this.$router.push({ name: 'login' })
-              }
-            })
-            .catch(() => {})
-        })
-        .catch(() => {})
+          clearLoginInfo()
+
+          if (localStorage.getItem('userType') === 'work') {
+            this.$router.push({ name: 'loginWork' })
+          } else {
+            this.$router.push({ name: 'login' })
+          }
+
+        }).catch(() => { })
+      }).catch(() => { })
     }
   }
 }
@@ -240,3 +188,4 @@ export default {
   background: #eeeeee;
 }
 </style>
+
diff --git a/epmet-oper-web/src/views/main-sidebar.vue b/epmet-oper-web/src/views/main-sidebar.vue
index fdd5bd8..bdf212a 100644
--- a/epmet-oper-web/src/views/main-sidebar.vue
+++ b/epmet-oper-web/src/views/main-sidebar.vue
@@ -1,36 +1,14 @@
 <template>
-  <aside
-    :class="['aui-sidebar', `aui-sidebar--${$store.state.sidebarLayoutSkin}`]"
-  >
+  <aside :class="['aui-sidebar', `aui-sidebar--${$store.state.sidebarLayoutSkin}`]">
     <div class="aui-sidebar__inner">
-      <el-menu
-        v-if="userType !== 'work'"
-        :default-active="$store.state.sidebarMenuActiveName"
-        :collapse="$store.state.sidebarFold"
-        :unique-opened="true"
-        :collapseTransition="false"
-        class="aui-sidebar__menu"
-      >
-        <sub-menu
-          v-for="menu in $store.state.sidebarMenuList"
-          :key="menu.id"
-          :menu="menu"
-        />
-      </el-menu>
-
-      <el-menu
-        :default-active="$store.state.sidebarMenuActiveName"
-        :collapse="$store.state.sidebarFold"
-        :unique-opened="true"
-        :collapseTransition="false"
-        class="aui-sidebar__menu"
-        v-else
-      >
-        <sub-menu
-          v-for="menu in $store.state.sidebarActiveSubMenuList"
-          :key="menu.id"
-          :menu="menu"
-        />
+      <el-menu :default-active="$store.state.sidebarMenuActiveName"
+               :collapse="$store.state.sidebarFold"
+               :unique-opened="true"
+               :collapseTransition="false"
+               class="aui-sidebar__menu">
+        <sub-menu v-for="menu in $store.state.sidebarMenuList"
+                  :key="menu.id"
+                  :menu="menu" />
       </el-menu>
     </div>
   </aside>
@@ -38,22 +16,16 @@
 
 <script>
 import SubMenu from './main-sidebar-sub-menu'
-
 export default {
-  data() {
-    return {}
+  data () {
+    return {
+    }
   },
   components: {
     SubMenu
   },
-  computed: {
-    userType() {
-      return localStorage.getItem('userType')
-    }
-  },
-  created() {
+  created () {
     this.$store.state.sidebarMenuList = window.SITE_CONFIG['menuList']
-    console.log(this.$store.state.sidebarMenuList)
   }
 }
 </script>
diff --git a/epmet-oper-web/src/views/main-theme-tools.vue b/epmet-oper-web/src/views/main-theme-tools.vue
index b4c662e..867e987 100644
--- a/epmet-oper-web/src/views/main-theme-tools.vue
+++ b/epmet-oper-web/src/views/main-theme-tools.vue
@@ -1,34 +1,21 @@
 <template>
   <div class="aui-theme-tools" :class="{ 'aui-theme-tools--open': isOpen }">
     <div class="aui-theme-tools__toggle" @click="isOpen = !isOpen">
-      <svg class="icon-svg" aria-hidden="true">
-        <use xlink:href="#icon-setting"></use>
-      </svg>
+      <svg class="icon-svg" aria-hidden="true"><use xlink:href="#icon-setting"></use></svg>
     </div>
     <div class="aui-theme-tools__content">
       <div class="aui-theme-tools__item">
         <h3>Navbar</h3>
-        <el-checkbox
-          v-model="$store.state.navbarLayoutType"
-          true-label="colorful"
-          >colorful 鲜艳</el-checkbox
-        >
+        <el-checkbox v-model="$store.state.navbarLayoutType" true-label="colorful">colorful 鲜艳</el-checkbox>
       </div>
       <div class="aui-theme-tools__item">
         <h3>Sidebar</h3>
-        <el-checkbox v-model="$store.state.sidebarLayoutSkin" true-label="dark"
-          >dark 黑色</el-checkbox
-        >
+        <el-checkbox v-model="$store.state.sidebarLayoutSkin" true-label="dark">dark 黑色</el-checkbox>
       </div>
       <div class="aui-theme-tools__item">
         <h3>Theme</h3>
         <el-radio-group v-model="themeColor" @change="themeColorChangeHandle">
-          <el-radio
-            v-for="item in themeList"
-            :key="item.name"
-            :label="item.name"
-            >{{ `${item.name} ${item.desc}` }}</el-radio
-          >
+          <el-radio v-for="item in themeList" :key="item.name" :label="item.name">{{ `${item.name} ${item.desc}` }}</el-radio>
         </el-radio-group>
       </div>
     </div>
@@ -37,34 +24,23 @@
 
 <script>
 export default {
-  data() {
+  data () {
     return {
       isOpen: false,
       themeList: require('@/element-ui/config.js'),
-      themeColor: ''
+      themeColor: 'turquoise'
     }
   },
-  created() {
-    let color = window.localStorage.getItem('themeColor') || 'blue'
-    this.themeColorChangeHandle(color)
-    this.themeColor = color
-  },
   methods: {
-    themeColorChangeHandle(val) {
-      window.localStorage.setItem('themeColor', val)
-
+    themeColorChangeHandle (val) {
       var styleList = [
         {
           id: 'J_elementTheme',
-          url: `${
-            process.env.BASE_URL
-          }element-theme/${val}/index.css?t=${new Date().getTime()}`
+          url: `${process.env.BASE_URL}element-theme/${val}/index.css?t=${new Date().getTime()}`
         },
         {
           id: 'J_auiTheme',
-          url: `${
-            process.env.BASE_URL
-          }element-theme/${val}/aui.css?t=${new Date().getTime()}`
+          url: `${process.env.BASE_URL}element-theme/${val}/aui.css?t=${new Date().getTime()}`
         }
       ]
       for (var i = 0; i < styleList.length; i++) {
diff --git a/epmet-oper-web/src/views/main.vue b/epmet-oper-web/src/views/main.vue
index d48a8a9..6b7942c 100644
--- a/epmet-oper-web/src/views/main.vue
+++ b/epmet-oper-web/src/views/main.vue
@@ -1,25 +1,13 @@
 <template>
-  <div
-    v-loading.fullscreen.lock="loading"
-    :element-loading-text="$t('loading')"
-    :class="[
-      'aui-wrapper',
-      { 'aui-sidebar--fold': $store.state.sidebarFold },
-      {
-        'aui-sidebar--noside':
-          userType == 'work' &&
-          $store.state.sidebarActiveSubMenuList.length == 0
-      }
-    ]"
-  >
+  <div v-loading.fullscreen.lock="loading"
+       :element-loading-text="$t('loading')"
+       :class="['aui-wrapper', { 'aui-sidebar--fold': $store.state.sidebarFold }]">
     <template v-if="!loading">
       <main-navbar ref="ref_navbar" />
       <main-sidebar />
       <div class="aui-content__wrapper">
-        <main-content
-          v-if="!$store.state.contentIsNeedRefresh"
-          @changeCustomerName="changeCustomerName"
-        />
+        <main-content v-if="!$store.state.contentIsNeedRefresh"
+                      @changeCustomerName="changeCustomerName" />
       </div>
       <main-theme-tools />
     </template>
@@ -33,13 +21,11 @@ import MainContent from './main-content'
 import MainThemeTools from './main-theme-tools'
 import debounce from 'lodash/debounce'
 import { mapGetters } from 'vuex'
-import nextTick from 'dai-js/tools/nextTick'
-
 export default {
-  provide() {
+  provide () {
     return {
       // 刷新
-      refresh() {
+      refresh () {
         this.$store.state.contentIsNeedRefresh = true
         this.$nextTick(() => {
           this.$store.state.contentIsNeedRefresh = false
@@ -47,10 +33,9 @@ export default {
       }
     }
   },
-  data() {
+  data () {
     return {
-      loading: true,
-      userType: localStorage.getItem('userType')
+      loading: true
     }
   },
   components: {
@@ -59,132 +44,107 @@ export default {
     MainContent,
     MainThemeTools
   },
-
   watch: {
     $route: 'routeHandle'
   },
-  async created() {
+  created () {
     this.windowResizeHandle()
     this.routeHandle(this.$route)
     if (localStorage.getItem('userType') === 'work') {
-      Promise.all([this.getWorkUserInfo()]).then(() => {
+      Promise.all([
+        this.getWorkUserInfo(),
+
+      ]).then(() => {
         this.loading = false
       })
     } else {
-      Promise.all([this.getUserInfo()]).then(() => {
+      Promise.all([
+        this.getUserInfo(),
+
+
+      ]).then(() => {
         this.loading = false
       })
     }
+
+  },
+  computed: {
   },
-  computed: {},
   methods: {
-    changeCustomerName(customerName) {
+    changeCustomerName (customerName) {
       this.$refs['ref_navbar'].changeCustomerName(customerName)
+
     },
     // 窗口改变大小
-    windowResizeHandle() {
-      this.$store.state.sidebarFold =
-        document.documentElement['clientWidth'] <= 992 || false
-      window.addEventListener(
-        'resize',
-        debounce(() => {
-          this.$store.state.sidebarFold =
-            document.documentElement['clientWidth'] <= 992 || false
-        }, 150)
-      )
+    windowResizeHandle () {
+      this.$store.state.sidebarFold = document.documentElement['clientWidth'] <= 992 || false
+      window.addEventListener('resize', debounce(() => {
+        this.$store.state.sidebarFold = document.documentElement['clientWidth'] <= 992 || false
+      }, 150))
     },
     // 路由, 监听
-    routeHandle(route) {
+    routeHandle (route) {
       if (!route.meta.isTab) {
         return false
       }
-      var tab = this.$store.state.contentTabs.filter(
-        (item) => item.name === route.name
-      )[0]
+      var tab = this.$store.state.contentTabs.filter(item => item.name === route.name)[0]
       if (!tab) {
         tab = {
           ...window.SITE_CONFIG['contentTabDefault'],
           ...route.meta,
-          name: route.name,
-          params: { ...route.params },
-          query: { ...route.query }
+          'name': route.name,
+          'params': { ...route.params },
+          'query': { ...route.query }
         }
-        this.$store.state.contentTabs =
-          this.$store.state.contentTabs.concat(tab)
+        this.$store.state.contentTabs = this.$store.state.contentTabs.concat(tab)
       }
-
       this.$store.state.sidebarMenuActiveName = tab.menuId
       this.$store.state.contentTabsActiveName = tab.name
-      this.syncLevelOneMenuActive(tab.menuId)
-    },
-    async syncLevelOneMenuActive(menuId) {
-      await nextTick()
-      console.log(
-        '*******************************',
-        menuId,
-        this.$store.state.sidebarMenuList
-      )
-      const fn = (item) => {
-        if (item.id == menuId) {
-          return true
-        } else if (item.children.length > 0) {
-          return item.children.findIndex(fn) !== -1
-        } else {
-          return false
-        }
-      }
-      let idx = this.$store.state.sidebarMenuList.findIndex(fn)
-      this.$store.state.LevelOneMenuActiveName =
-        idx !== -1 ? this.$store.state.sidebarMenuList[idx].id : ''
-      this.$store.state.sidebarActiveSubMenuList =
-        idx !== -1 ? this.$store.state.sidebarMenuList[idx].children : []
     },
     // 获取当前管理员信息
-    getUserInfo() {
+    getUserInfo () {
       const url = '/epmetuser/operuser/queryOperUserDto'
 
-      return this.$http
-        .get(url)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
+      return this.$http.get(url).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
 
-          this.$store.state.user.id = res.data.id
-          this.$store.state.user.realName = res.data.realName
-          this.$store.state.user.superAdmin = res.data.superAdmin
-          this.$store.state.user.gender = data.gender
-          localStorage.setItem('customerId', '')
-        })
-        .catch(() => {})
+        this.$store.state.user.id = res.data.id
+        this.$store.state.user.realName = res.data.realName
+        this.$store.state.user.superAdmin = res.data.superAdmin
+        this.$store.state.user.gender = data.gender
+        localStorage.setItem('customerId', '')
+      }).catch(() => { })
     },
     // 获取当前管理员信息
-    getWorkUserInfo() {
+    getWorkUserInfo () {
       const url = '/epmetuser/customerstaff/staffbasicinfo'
-      let params = {}
-      window.app.ajax.post(
-        url,
-        params,
+      let params = {
+      }
+      window.app.ajax.post(url, params,
         (data, rspMsg) => {
-          this.$store.state.user = { ...data }
-          // this.$store.state.user.id = data.id
-          // this.$store.state.user.realName = data.realName
-          // this.$store.state.user.superAdmin = data.superAdmin
-          // this.$store.state.user.gender = data.gender
+
+          this.$store.state.user.id = data.id
+          this.$store.state.user.realName = data.realName
+          this.$store.state.user.superAdmin = data.superAdmin
+          this.$store.state.user.gender = data.gender
           localStorage.setItem('roleList', data.roleList)
           localStorage.setItem('customerId', data.customerId)
           // this.$store.state.user.roleList = data.roleList
           // this.$store.state.user.customerId = data.customerId
+
         },
         (rspMsg, data) => {
+
           this.$message.error(rspMsg)
-        }
-      )
+        })
       // return this.$http.get(url).then(({ data: res }) => {
       //   if (res.code !== 0) {
       //     return this.$message.error(res.msg)
       //   }
 
+
       // }).catch(() => { })
     }
   }
diff --git a/epmet-oper-web/src/views/pages/loginWork.vue b/epmet-oper-web/src/views/pages/loginWork.vue
index 2297c81..3a0bffb 100644
--- a/epmet-oper-web/src/views/pages/loginWork.vue
+++ b/epmet-oper-web/src/views/pages/loginWork.vue
@@ -1,93 +1,141 @@
 <template>
-  <div class="g-app">
-    <div class="g-bd" v-if="isShowLogin || true">
-      <div class="m-fm">
-        <div class="wrap">
-          <h2 class="title">{{ $t('brand.work') }}</h2>
-          <div class="fm">
-            <el-form
-              :model="dataForm"
-              :rules="dataRule"
-              ref="dataForm"
-              @keyup.enter.native="dataFormSubmitHandle()"
-              status-icon
-            >
-              <div class="fm-item">
-                <div class="ico">
-                  <img src="@/assets/img/login/zhanghao.png" alt="" />
-                </div>
-                <div class="input">
-                  <input
-                    type="text"
-                    v-model="dataForm.phone"
-                    placeholder="账号"
-                  />
-                </div>
-              </div>
-              <div class="fm-item">
-                <div class="ico">
-                  <img src="@/assets/img/login/mima.png" alt="" />
-                </div>
-                <div class="input">
-                  <input
-                    type="password"
-                    v-model="dataForm.password"
-                    :placeholder="$t('login.password')"
-                  />
-                </div>
-              </div>
-              <div class="fm-captcha">
-                <div class="fm-item">
-                  <div class="input">
-                    <input
-                      type="text"
-                      v-model="dataForm.captcha"
-                      placeholder="验证码"
-                    />
-                  </div>
-                </div>
-                <div class="captcha">
-                  <img :src="captchaPath" @click="getCaptcha()" />
-                </div>
-              </div>
+  <div v-if="isShowLogin"
+       class="aui-wrapper aui-page__login">
 
-              <div class="fm-btn" @click="dataFormSubmitHandle()">
-                {{ $t('login.title') }}
-              </div>
-              <div class="hint">请使用小程序端的账号密码登录</div>
-            </el-form>
-          </div>
+    <div class="aui-content__wrapper">
+      <main class="aui-content">
+        <div class="login-header">
+          <h2 class="login-brand">{{ $t('brand.work') }}</h2>
         </div>
-      </div>
+        <div class="login-body">
+          <h3 class="login-title">{{ $t('login.title') }}</h3>
+          <el-form :model="dataForm"
+                   :rules="dataRule"
+                   ref="dataForm"
+                   @keyup.enter.native="dataFormSubmitHandle()"
+                   status-icon>
+            <!-- <el-form-item>
+              <el-select v-model="$i18n.locale"
+                         class="w-percent-100">
+                <el-option v-for="(val, key) in i18nMessages"
+                           :key="key"
+                           :label="val._lang"
+                           :value="key"></el-option>
+              </el-select>
+            </el-form-item> -->
+            <el-form-item prop="phone">
+              <el-input v-model="dataForm.phone"
+                        placeholder="手机号">
+                <span slot="prefix"
+                      class="el-input__icon">
+                  <svg class="icon-svg"
+                       aria-hidden="true">
+                    <use xlink:href="#icon-user"></use>
+                  </svg>
+                </span>
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="password">
+              <el-input v-model="dataForm.password"
+                        type="password"
+                        :placeholder="$t('login.password')">
+                <span slot="prefix"
+                      class="el-input__icon">
+                  <svg class="icon-svg"
+                       aria-hidden="true">
+                    <use xlink:href="#icon-lock"></use>
+                  </svg>
+                </span>
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="captcha">
+              <el-row :gutter="20">
+                <el-col :span="14">
+                  <el-input v-model="dataForm.captcha"
+                            :placeholder="$t('login.captcha')">
+                    <span slot="prefix"
+                          class="el-input__icon">
+                      <svg class="icon-svg"
+                           aria-hidden="true">
+                        <use xlink:href="#icon-safetycertificate"></use>
+                      </svg>
+                    </span>
+                  </el-input>
+                </el-col>
+                <el-col :span="10"
+                        class="login-captcha">
+                  <img :src="captchaPath"
+                       @click="getCaptcha()">
+                </el-col>
+              </el-row>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary"
+                         @click="dataFormSubmitHandle()"
+                         class="w-percent-100">{{ $t('login.title') }}</el-button>
+            </el-form-item>
+
+          </el-form>
+          <div class="div_tip">
+            <p class="p_tip">
+              {{ '请使用小程序端的账号密码登录'}}
+            </p>
 
-      <div class="m-footer">
+          </div>
+        </div>
         <div class="login-footer">
           <p>
-            <a href="" target="_blank">{{ $t('login.copyright') }}</a>
+            <a href="https://demo.cloud.renren.io/renren-cloud"
+               target="_blank">{{ $t('login.demo') }}</a>
           </p>
+          <!-- 2020 © renren.io -->
+          <p><a href="https://www.renren.io/"
+               target="_blank">{{ $t('login.copyright') }}</a></p>
         </div>
-      </div>
+      </main>
     </div>
-
-    <c-dialog
-      :showFooter="false"
-      :title="'选择客户'"
-      :isNest="false"
-      :visible="diaVisible"
-      :dialogHeight="0.8"
-      :width="30"
-      :top="'120px'"
-      @cancel="diaCancel"
-    >
+    <c-dialog :showFooter='false'
+              :title="'选择客户'"
+              :isNest="false"
+              :visible="diaVisible"
+              :dialogHeight="0.8"
+              :width="30"
+              :top="'120px'"
+              @cancel="diaCancel">
       <!-- <div class="div_total"> -->
-      <div v-for="(item, index) in tableData" :key="index" class="div_row">
-        <span @click="selectCustomer(item)" class="span_name">{{
-          item.customerName
-        }}</span>
+      <div v-for="(item,index) in tableData"
+           :key=index
+           class="div_row">
+        <span @click="selectCustomer(item)"
+              class="span_name">{{item.customerName}}</span>
       </div>
+
+      <!-- </div> -->
+      <!-- <el-table v-loading="tableLoading"
+                :data="tableData"
+                border
+                style="width: 100%;">
+
+        <el-table-column prop="customerName"
+                         label="客户名称"
+                         header-align="left"
+                         align="left"
+                         width="300"></el-table-column>
+        <el-table-column label="操作"
+                         fixed="right"
+                         header-align="right"
+                         align="right">
+          <template slot-scope="scope">
+            <el-button size="small"
+                       @click="selectCustomer(scope.row)">选择</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table> -->
     </c-dialog>
   </div>
 </template>
+
 <script>
 import Cookies from 'js-cookie'
 import CDialog from '@c/CDialog'
@@ -95,11 +143,11 @@ import debounce from 'lodash/debounce'
 import { messages } from '@/i18n'
 import { getUUID } from '@/utils'
 import { Loading } from 'element-ui' // 引入Loading服务
-import JSEncrypt from 'jsencrypt' //引入加密
+import JSEncrypt from 'jsencrypt'//引入加密
 
 let loading // 加载动画
 export default {
-  data() {
+  data () {
     return {
       pubKey: null, // 获取到公钥
       isShowLogin: true,
@@ -125,9 +173,11 @@ export default {
     CDialog
   },
   computed: {
-    dataRule() {
+    dataRule () {
       return {
-        phone: [{ required: true, message: '手机号不能为空', trigger: 'blur' }],
+        phone: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' }
+        ],
         password: [
           { required: true, message: '密码不能为空', trigger: 'blur' }
         ],
@@ -137,10 +187,10 @@ export default {
       }
     }
   },
-  created() {
+  created () {
     //平阴联动平台 登陆
     if (this.$route.query.platformToken) {
-      this.isShowLogin = false
+      this.isShowLogin = false;
       this.getAutoLogin(this.$route.query.platformToken)
     } else {
       this.getCaptcha()
@@ -148,31 +198,29 @@ export default {
       this.getPubKey()
     }
   },
-  mounted() {
-    localStorage.removeItem('showHeader')
+  mounted () {
+    localStorage.removeItem('showHeader');
   },
 
   methods: {
     // 获取公钥
-    getPubKey() {
-      this.$http
-        .post('/auth/govweb/getKey')
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
+    getPubKey () {
+      this.$http.post('/auth/govweb/getKey').then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
 
-          this.pubKey = res.data // 获取到公钥;
-        })
-        .catch(() => {})
+        this.pubKey = res.data; // 获取到公钥;
+      }).catch(() => {
+      })
     },
     // 获取验证码
-    getCaptcha() {
+    getCaptcha () {
       this.dataForm.uuid = getUUID()
       this.captchaPath = `${window.SITE_CONFIG['apiURL']}/auth/login/captcha?uuid=${this.dataForm.uuid}`
     },
     // 表单提交
-    dataFormSubmitHandle() {
+    dataFormSubmitHandle () {
       this.$refs['dataForm'].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj)
@@ -184,11 +232,10 @@ export default {
           phone: this.dataForm.phone
         }
         window.app.ajax.post(
-          url,
-          params,
+          url, params,
           (data, rspMsg) => {
-            if (data.length === 0) {
-              //没有客户，提示无法登录
+
+            if (data.length === 0) {//没有客户，提示无法登录
               this.$message.error('账号不存在')
               this.endLoading()
             } else if (data.length === 1) {
@@ -204,66 +251,65 @@ export default {
           (rspMsg, data) => {
             this.endLoading()
             this.$message.error(rspMsg)
-          }
-        )
+          })
+
+
       })
     },
     // 平阴联动 自动登录接口
-    getAutoLogin(platformToken) {
-      this.dataForm.thirdToken = platformToken
-      this.dataForm.platform = 'pyld'
-      this.$http
-        .post(`/auth/sso/oper/third/login`, this.dataForm)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            if (res.code == 8302) {
-              return this.$message.error(res.msg)
-            }
+    getAutoLogin (platformToken) {
+      this.dataForm.thirdToken = platformToken;
+      this.dataForm.platform = "pyld";
+      this.$http.post(`/auth/sso/oper/third/login`, this.dataForm).then(({ data: res }) => {
+        if (res.code !== 0) {
+          if (res.code == 8302) {
             return this.$message.error(res.msg)
           }
-          localStorage.setItem('customerId', res.data.customerId)
-          localStorage.setItem('userType', 'work')
-          localStorage.setItem('showHeader', '0')
-          Cookies.set('token', res.data.token)
-          this.$router.replace({ name: 'home' })
-        })
-        .catch(() => {})
+          return this.$message.error(res.msg)
+        }
+        localStorage.setItem('customerId', res.data.customerId)
+        localStorage.setItem('userType', 'work')
+        localStorage.setItem('showHeader', '0')
+        Cookies.set('token', res.data.token)
+        this.$router.replace({ name: 'home' })
+      }).catch(() => {
+      })
       // epmet-ext9.elinkservice.cn/platform-admin
     },
     //选择客户
-    selectCustomer(row) {
+    selectCustomer (row) {
       localStorage.setItem('customerId', row.customerId)
       localStorage.setItem('customerName', row.customerName)
       this.startLoading()
       // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/auth/govweb/login'
       const url = '/auth/govweb/login'
       this.dataForm.customerId = row.customerId
-      let param = {}
-      Object.assign(param, this.dataForm)
-      param.password = this.encryptedData(this.pubKey, this.dataForm.password)
-      this.$http
-        .post(url, param)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            this.getCaptcha()
-            return this.$message.error(res.msg)
-          }
-          this.diaVisible = false
+      let param = {};
+      Object.assign(param, this.dataForm);
+      param.password = this.encryptedData(this.pubKey, this.dataForm.password);
+      this.$http.post(url, param).then(({ data: res }) => {
+        if (res.code !== 0) {
+          this.getCaptcha()
+          return this.$message.error(res.msg)
+        }
+        this.diaVisible = false
 
-          localStorage.setItem('userType', 'work')
+        localStorage.setItem('userType', 'work')
 
-          Cookies.set('token', res.data.token)
-          this.$router.replace({ name: 'indexWork' }).catch(() => {})
-        })
-        .catch(() => {})
+        Cookies.set('token', res.data.token)
+        this.$router.replace({ name: 'home' }).catch(() => { })
+      }).catch(() => {
+      })
       this.endLoading()
+
     },
     // 取消
-    diaCancel() {
+    diaCancel () {
+
       this.diaVisible = false
     },
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: '正在加载……', // 加载中需要显示的文字
@@ -271,23 +317,64 @@ export default {
       })
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close()
       }
     },
     // 加密
-    encryptedData(key, data) {
+    encryptedData (key, data) {
+
       // 新建JSEncrypt对象
-      let encryptor = new JSEncrypt()
+      let encryptor = new JSEncrypt();
       // 设置公钥
-      encryptor.setPublicKey(key)
+      encryptor.setPublicKey(key);
       // 加密数据
-      return encryptor.encrypt(data)
+      return encryptor.encrypt(data);
     }
   }
+
 }
 </script>
+<style scoped>
+.div_tip {
+  float: left;
+}
+.p_tip {
+  color: rgb(255, 80, 80);
+}
+.div_total {
+  height: 80%;
+  width: 100%;
+  text-align: center;
+}
+.el-dialog__body {
+  width: 500px;
+  padding: 0px 0px 0px 20px;
+}
+.div_row {
+  height: 50px;
+  text-align: center;
+  line-height: 50px;
 
-<style lang="scss" src="@/assets/scss/pages/loginWork.scss"></style>
+  /* width: 100px; */
+  /* background-color: rgb(241, 241, 241); */
+}
+.div_row:hover {
+  color: rgb(2, 119, 173);
+  font-weight: bold;
+  text-decoration: underline;
+}
+.i_icon {
+  width: 15px;
+  height: 15px;
+  margin-right: 10px;
+  float: left;
+}
+.span_name {
+  font-size: 18px;
+  cursor: pointer;
+  /* color: rgb(37, 156, 235); */
+}
+</style>