改动了工作pc默认颜色

epmet-oper-web/src/js/store/index.js

@@ -19,6 +19,7 @@ export default new Vuex.Store({
     // 侧边栏, 菜单
     sidebarMenuList: [],
     sidebarMenuActiveName: '',
+    LevelOneMenuActiveName: '',
     // 内容, 是否需要刷新
     contentIsNeedRefresh: false,
     // 内容, 标签页(默认添加首页)

epmet-oper-web/src/views/main-navbar.vue

@@ -1,31 +1,56 @@
 <template>
   <div>
-    <nav v-if="showHeader"
+    <nav
-         class="aui-navbar"
+      v-if="showHeader"
-         :class="`aui-navbar--${$store.state.navbarLayoutType}`">
+      class="aui-navbar"
+      :class="`aui-navbar--${$store.state.navbarLayoutType}`"
+    >
       <div class="aui-navbar__header">
-        <h1 class="aui-navbar__brand"
+        <h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
-            @click="$router.push({ name: 'home' })">
+          <a class="aui-navbar__brand-lg" href="javascript:;">{{
-          <a class="aui-navbar__brand-lg"
+            userType === 'work' ? customerName : $t('brand.lg')
-             href="javascript:;">{{  userType==='work'?customerName :$t('brand.lg') }}</a>
+          }}</a>
-          <a class="aui-navbar__brand-mini"
+          <a class="aui-navbar__brand-mini" href="javascript:;">{{
-             href="javascript:;">{{ $t('brand.mini') }}</a>
+            $t('brand.mini')
+          }}</a>
         </h1>
       </div>
       <div class="aui-navbar__body">
-        <el-menu class="aui-navbar__menu mr-auto"
+        <el-menu class="aui-navbar__menu mr-auto" mode="horizontal">
-                 mode="horizontal">
+          <el-menu-item
-          <el-menu-item index="1"
+            index="1"
-                        @click="$store.state.sidebarFold = !$store.state.sidebarFold">
+            @click="$store.state.sidebarFold = !$store.state.sidebarFold"
-            <svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch"
+          >
-                 aria-hidden="true">
+            <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>
 
+        <el-menu
+          v-if="userType == 'work'"
+          :default-active="$store.state.LevelOneMenuActiveName"
+          :collapse="$store.state.sidebarFold"
+          :unique-opened="true"
+          :collapseTransition="false"
+          mode="horizontal"
+          class="aui-navbar__menu mr-auto"
+        >
+          <el-menu-item
+            v-for="menu in $store.state.sidebarMenuList"
+            :key="menu.id"
+            :menu="menu"
+            :index="menu.id"
+            @click="gotoRouteHandle(menu.id)"
+          >
+            <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">
@@ -53,42 +78,40 @@
               <use xlink:href="#icon-fullscreen"></use>
             </svg>
           </el-menu-item> -->
-          <el-menu-item index="2"
+          <el-menu-item index="2" @click="refresh()">
-                        @click="refresh()">
+            <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
-            <svg class="icon-svg aui-navbar__icon-menu"
-                 aria-hidden="true">
               <use xlink:href="#icon-sync"></use>
             </svg>
-
           </el-menu-item>
-          <el-menu-item index="4"
+          <el-menu-item index="4" class="aui-navbar__avatar">
-                        class="aui-navbar__avatar">
+            <el-dropdown placement="bottom" :show-timeout="0">
-            <el-dropdown placement="bottom"
-                         :show-timeout="0">
               <span class="el-dropdown-link">
-                <img v-if="$store.state.user.gender ==='2'"
+                <img
-                     src="~@/assets/img/staff-default-avatar-girl.png">
+                  v-if="$store.state.user.gender === '2'"
-                <img v-else
+                  src="~@/assets/img/staff-default-avatar-girl.png"
-                     src="~@/assets/img/staff-default-avatar-boy.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 @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="logoutHandle()">{{
+                  $t('logout')
+                }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </el-menu-item>
         </el-menu>
       </div>
       <!-- 弹窗, 修改密码 -->
-      <update-password v-if="updatePassowrdVisible"
+      <update-password
-                       ref="updatePassowrd"></update-password>
+        v-if="updatePassowrdVisible"
+        ref="updatePassowrd"
+      ></update-password>
     </nav>
-    <nav v-else
+    <nav v-else class="aui-navbar main-line"></nav>
-         class="aui-navbar main-line"></nav>
   </div>
-
 </template>
 
 <script>
@@ -99,39 +122,49 @@ 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: {
     UpdatePassword
   },
-  created () {
+  created() {
-    let platformToken = localStorage.getItem('showHeader') || '';
+    let platformToken = localStorage.getItem('showHeader') || ''
-    if (typeof platformToken !== 'undefined' && platformToken !== 'undefined' && platformToken !== '') {
+    if (
+      typeof platformToken !== 'undefined' &&
+      platformToken !== 'undefined' &&
+      platformToken !== ''
+    ) {
       this.showHeader = false
     }
+    console.log('=============================', this.userType)
   },
   computed: {
-    userType () {
+    userType() {
       return localStorage.getItem('userType')
-    },
+    }
-
-
   },
   methods: {
-    changeCustomerName (customerName) {
+    // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
-
+    gotoRouteHandle(menuId) {
+      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
+    },
+    changeCustomerName(customerName) {
       this.customerName = localStorage.getItem('customerName')
     },
     // 全屏
-    fullscreenHandle () {
+    fullscreenHandle() {
       if (!screenfull.enabled) {
         return this.$message({
           message: this.$t('fullscreen.prompt'),
@@ -142,42 +175,51 @@ export default {
       screenfull.toggle()
     },
     // 修改密码
-    updatePasswordHandle () {
+    updatePasswordHandle() {
       this.updatePassowrdVisible = true
       this.$nextTick(() => {
         this.$refs.updatePassowrd.init()
       })
     },
     // 退出
-    logoutHandle () {
+    logoutHandle() {
-      this.$confirm(this.$t('prompt.info', { 'handle': this.$t('logout') }), this.$t('prompt.title'), {
+      this.$confirm(
-        confirmButtonText: this.$t('confirm'),
+        this.$t('prompt.info', { handle: this.$t('logout') }),
-        cancelButtonText: this.$t('cancel'),
+        this.$t('prompt.title'),
-        type: 'warning'
+        {
-      }).then(() => {
+          confirmButtonText: this.$t('confirm'),
-        //关闭所有标签页
+          cancelButtonText: this.$t('cancel'),
-        // tabs, 关闭全部
+          type: 'warning'
-        this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name === 'home')
+        }
-
+      )
-
+        .then(() => {
-        this.$http.post('/auth/login/logout').then(({ data: res }) => {
+          //关闭所有标签页
-          if (res.code !== 0) {
+          // tabs, 关闭全部
-            //别处登陆时 退出不提示 直接跳登陆页即可
+          this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-            if (res.code !== 10007){
+            (item) => item.name === 'home'
-              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') {
+              clearLoginInfo()
-            this.$router.push({ name: 'loginWork' })
-          } else {
-            this.$router.push({ name: 'login' })
-          }
 
-        }).catch(() => { })
+              if (localStorage.getItem('userType') === 'work') {
-      }).catch(() => { })
+                this.$router.push({ name: 'loginWork' })
+              } else {
+                this.$router.push({ name: 'login' })
+              }
+            })
+            .catch(() => {})
+        })
+        .catch(() => {})
     }
   }
 }
@@ -188,4 +230,3 @@ export default {
   background: #eeeeee;
 }
 </style>
-

epmet-oper-web/src/views/main-sidebar.vue

@@ -1,14 +1,39 @@
 <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 :default-active="$store.state.sidebarMenuActiveName"
+      <el-menu
-               :collapse="$store.state.sidebarFold"
+        v-if="userType !== 'work'"
-               :unique-opened="true"
+        :default-active="$store.state.sidebarMenuActiveName"
-               :collapseTransition="false"
+        :collapse="$store.state.sidebarFold"
-               class="aui-sidebar__menu">
+        :unique-opened="true"
-        <sub-menu v-for="menu in $store.state.sidebarMenuList"
+        :collapseTransition="false"
-                  :key="menu.id"
+        class="aui-sidebar__menu"
-                  :menu="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
+      >
+        <template v-for="item in $store.state.sidebarMenuList">
+          <sub-menu
+            v-if="$store.state.LevelOneMenuActiveName == item.id"
+            v-for="menu in item.children"
+            :key="menu.id"
+            :menu="menu"
+          />
+        </template>
       </el-menu>
     </div>
   </aside>
@@ -16,16 +41,22 @@
 
 <script>
 import SubMenu from './main-sidebar-sub-menu'
+
 export default {
-  data () {
+  data() {
-    return {
+    return {}
-    }
   },
   components: {
     SubMenu
   },
-  created () {
+  computed: {
+    userType() {
+      return localStorage.getItem('userType')
+    }
+  },
+  created() {
     this.$store.state.sidebarMenuList = window.SITE_CONFIG['menuList']
+    console.log(this.$store.state.sidebarMenuList)
   }
 }
 </script>

epmet-oper-web/src/views/main-theme-tools.vue

@@ -1,21 +1,34 @@
 <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>
@@ -24,23 +37,34 @@
 
 <script>
 export default {
-  data () {
+  data() {
     return {
       isOpen: false,
       themeList: require('@/element-ui/config.js'),
-      themeColor: 'turquoise'
+      themeColor: ''
     }
   },
+  created() {
+    let color = window.localStorage.getItem('themeColor') || 'blue'
+    this.themeColorChangeHandle(color)
+    this.themeColor = color
+  },
   methods: {
-    themeColorChangeHandle (val) {
+    themeColorChangeHandle(val) {
+      window.localStorage.setItem('themeColor', 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++) {

epmet-oper-web/src/views/main.vue

@@ -1,13 +1,17 @@
 <template>
-  <div v-loading.fullscreen.lock="loading"
+  <div
-       :element-loading-text="$t('loading')"
+    v-loading.fullscreen.lock="loading"
-       :class="['aui-wrapper', { 'aui-sidebar--fold': $store.state.sidebarFold }]">
+    :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"
+        <main-content
-                      @changeCustomerName="changeCustomerName" />
+          v-if="!$store.state.contentIsNeedRefresh"
+          @changeCustomerName="changeCustomerName"
+        />
       </div>
       <main-theme-tools />
     </template>
@@ -22,10 +26,10 @@ import MainThemeTools from './main-theme-tools'
 import debounce from 'lodash/debounce'
 import { mapGetters } from 'vuex'
 export default {
-  provide () {
+  provide() {
     return {
       // 刷新
-      refresh () {
+      refresh() {
         this.$store.state.contentIsNeedRefresh = true
         this.$nextTick(() => {
           this.$store.state.contentIsNeedRefresh = false
@@ -33,7 +37,7 @@ export default {
       }
     }
   },
-  data () {
+  data() {
     return {
       loading: true
     }
@@ -47,84 +51,103 @@ export default {
   watch: {
     $route: 'routeHandle'
   },
-  created () {
+  created() {
     this.windowResizeHandle()
     this.routeHandle(this.$route)
     if (localStorage.getItem('userType') === 'work') {
-      Promise.all([
+      Promise.all([this.getWorkUserInfo()]).then(() => {
-        this.getWorkUserInfo(),
-
-      ]).then(() => {
         this.loading = false
       })
     } else {
-      Promise.all([
+      Promise.all([this.getUserInfo()]).then(() => {
-        this.getUserInfo(),
-
-
-      ]).then(() => {
         this.loading = false
       })
     }
-
-  },
-  computed: {
   },
+  computed: {},
   methods: {
-    changeCustomerName (customerName) {
+    changeCustomerName(customerName) {
       this.$refs['ref_navbar'].changeCustomerName(customerName)
-
     },
     // 窗口改变大小
-    windowResizeHandle () {
+    windowResizeHandle() {
-      this.$store.state.sidebarFold = document.documentElement['clientWidth'] <= 992 || false
+      this.$store.state.sidebarFold =
-      window.addEventListener('resize', debounce(() => {
+        document.documentElement['clientWidth'] <= 992 || false
-        this.$store.state.sidebarFold = document.documentElement['clientWidth'] <= 992 || false
+      window.addEventListener(
-      }, 150))
+        '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,
+          name: route.name,
-          'params': { ...route.params },
+          params: { ...route.params },
-          'query': { ...route.query }
+          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)
+    },
+    syncLevelOneMenuActive(menuId) {
+      const fn = (item) => {
+        console.log('++++++++++++++', 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 : ''
     },
     // 获取当前管理员信息
-    getUserInfo () {
+    getUserInfo() {
       const url = '/epmetuser/operuser/queryOperUserDto'
 
-      return this.$http.get(url).then(({ data: res }) => {
+      return this.$http
-        if (res.code !== 0) {
+        .get(url)
-          return this.$message.error(res.msg)
+        .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.id = res.data.id
-        this.$store.state.user.realName = res.data.realName
+          this.$store.state.user.realName = res.data.realName
-        this.$store.state.user.superAdmin = res.data.superAdmin
+          this.$store.state.user.superAdmin = res.data.superAdmin
-        this.$store.state.user.gender = data.gender
+          this.$store.state.user.gender = data.gender
-        localStorage.setItem('customerId', '')
+          localStorage.setItem('customerId', '')
-      }).catch(() => { })
+        })
+        .catch(() => {})
     },
     // 获取当前管理员信息
-    getWorkUserInfo () {
+    getWorkUserInfo() {
       const url = '/epmetuser/customerstaff/staffbasicinfo'
-      let params = {
+      let params = {}
-      }
+      window.app.ajax.post(
-      window.app.ajax.post(url, params,
+        url,
+        params,
         (data, rspMsg) => {
-
           this.$store.state.user.id = data.id
           this.$store.state.user.realName = data.realName
           this.$store.state.user.superAdmin = data.superAdmin
@@ -133,18 +156,16 @@ export default {
           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(() => { })
     }
   }

epmet-oper-web/src/views/modules/shequ/index.vue

@@ -0,0 +1,33 @@
+<template>
+  <div>
+    <div class="m-info">
+      <h2>社区查询</h2>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      // i18nMessages: messages,
+      updatePassowrdVisible: false,
+      customerName: localStorage.getItem('customerName'),
+      userType: localStorage.getItem('userType')
+    }
+  },
+  components: {},
+  mounted() {
+    //关闭所有标签页
+    // tabs, 关闭全部
+    this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+      (item) => item.name === 'home'
+    )
+  },
+  methods: {
+    changeCustomerName(customerName) {
+      this.$emit('changeCustomerName', customerName)
+    }
+  }
+}
+</script>