vue2-client 1.2.38 → 1.2.42

package/src/pages/login/Login.vue

@@ -1,198 +1,201 @@
-<template>
-  <common-layout>
-    <div class="top">
-      <div class="header">
-        <img alt="logo" class="logo" src="@/assets/img/logo.png" />
-        <span class="title">{{ systemName }}</span>
-      </div>
-      <div class="desc">为PC端中、后台系统业务开发提供支持</div>
-    </div>
-    <div class="login">
-      <a-form @submit="onSubmit" :form="form">
-        <a-tabs size="large" :tabBarStyle="{textAlign: 'center'}" style="padding: 0 2px;">
-          <a-tab-pane tab="账户密码登录" key="1">
-            <a-alert
-              type="error"
-              :closable="true"
-              v-show="error"
-              :message="error"
-              showIcon
-              style="margin-bottom: 24px;" />
-            <a-form-item>
-              <a-input
-                autocomplete="autocomplete"
-                size="large"
-                placeholder="admin"
-                v-decorator="['name', {rules: [{ required: true, message: '请输入账户名', whitespace: true}]}]"
-              >
-                <a-icon slot="prefix" type="user" />
-              </a-input>
-            </a-form-item>
-            <a-form-item>
-              <a-input
-                size="large"
-                placeholder="888888"
-                autocomplete="autocomplete"
-                type="password"
-                v-decorator="['password', {rules: [{ required: true, message: '请输入密码', whitespace: true}]}]"
-              >
-                <a-icon slot="prefix" type="lock" />
-              </a-input>
-            </a-form-item>
-          </a-tab-pane>
-        </a-tabs>
-        <div>
-          <a-checkbox :checked="true" >自动登录</a-checkbox>
-        </div>
-        <a-form-item>
-          <a-button :loading="logging" style="width: 100%;margin-top: 24px" size="large" htmlType="submit" type="primary">登录</a-button>
-        </a-form-item>
-      </a-form>
-    </div>
-  </common-layout>
-</template>
-
-<script>
-import CommonLayout from '@vue2-client/layouts/CommonLayout'
-import { getRoutesConfig, login } from '@vue2-client/services/user'
-import { setAuthorization } from '@vue2-client/utils/request'
-import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
-import { mapMutations } from 'vuex'
-import JSEncrypt from 'jsencrypt'
-import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
-import Vue from 'vue'
-import { positions } from '@vue2-client/mock/common'
-import { timeFix } from '@vue2-client/utils/util'
-const { homePage, ticketPage } = require('@vue2-client/config')
-// import { router } from '@vue2-client/mock/user/routes'
-
-export default {
-  name: 'Login',
-  components: { CommonLayout },
-  data () {
-    return {
-      logging: false,
-      error: '',
-      form: this.$form.createForm(this)
-    }
-  },
-  computed: {
-    systemName () {
-      return this.$store.state.setting.systemName
-    }
-  },
-  methods: {
-    ...mapMutations('account', ['setUser', 'setPermissions', 'setRoles']),
-    onSubmit (e) {
-      e.preventDefault()
-      this.form.validateFields((err) => {
-        if (!err) {
-          this.logging = true
-          const name = this.form.getFieldValue('name')
-          const password = this.form.getFieldValue('password')
-          login(name, password).then(this.afterLogin)
-        }
-      })
-    },
-    afterLogin (res) {
-      const name = this.form.getFieldValue('name')
-      const password = this.form.getFieldValue('password')
-      this.logging = false
-      const loginRes = res.states
-      if (loginRes === '登录成功') {
-        const encrypt = new JSEncrypt()
-        encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
-        const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
-        localStorage.setItem(ACCESS_TOKEN, data)
-        // 获取路由配置
-        getRoutesConfig(data).then(result => {
-          Vue.$login.login(result).then(() => {
-            const user = Object.assign({
-              username: result.ename,
-              name: result.name,
-              avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
-              address: '西安市',
-              position: positions[0]
-            }, result)
-            this.setUser(user)
-            this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
-            this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
-            let timestamp = new Date().getTime()// 当前的时间戳
-            timestamp = timestamp + 60 * 60 * 1000
-            // 格式化时间获取年月日, 登陆过期时间
-            const dateAfter = new Date(timestamp)
-            setAuthorization({ token: data, expireAt: dateAfter })
-            loadRoutes(funcToRouter(user.functions))
-            if (result.deps === '用户工单登记') {
-              this.$router.push(ticketPage).catch(() => {})
-            } else {
-              this.$router.push(homePage).catch(() => {})
-            }
-            this.$message.success(timeFix().CN + '，欢迎回来', 3)
-          })
-        })
-      } else {
-        this.error = loginRes
-      }
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .common-layout{
-    .top {
-      text-align: center;
-      .header {
-        height: 44px;
-        line-height: 44px;
-        a {
-          text-decoration: none;
-        }
-        .logo {
-          height: 44px;
-          vertical-align: top;
-          margin-right: 16px;
-        }
-        .title {
-          font-size: 33px;
-          color: @title-color;
-          font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
-          font-weight: 600;
-          position: relative;
-          top: 2px;
-        }
-      }
-      .desc {
-        font-size: 14px;
-        color: @text-color-second;
-        margin-top: 12px;
-        margin-bottom: 40px;
-      }
-    }
-    .login{
-      width: 368px;
-      margin: 0 auto;
-      @media screen and (max-width: 576px) {
-        width: 95%;
-      }
-      @media screen and (max-width: 320px) {
-        .captcha-button{
-          font-size: 14px;
-        }
-      }
-      .icon {
-        font-size: 24px;
-        color: @text-color-second;
-        margin-left: 16px;
-        vertical-align: middle;
-        cursor: pointer;
-        transition: color 0.3s;
-
-        &:hover {
-          color: @primary-color;
-        }
-      }
-    }
-  }
-</style>
+<template>
+  <common-layout>
+    <div class="top">
+      <div class="header">
+        <img alt="logo" class="logo" src="@/assets/img/logo.png" />
+        <span class="title">{{ systemName }}</span>
+      </div>
+      <div class="desc">{{ systemDesc }}</div>
+    </div>
+    <div class="login">
+      <a-form @submit="onSubmit" :form="form">
+        <a-tabs size="large" :tabBarStyle="{textAlign: 'center'}" style="padding: 0 2px;">
+          <a-tab-pane tab="账户密码登录" key="1">
+            <a-alert
+              type="error"
+              :closable="true"
+              v-show="error"
+              :message="error"
+              showIcon
+              style="margin-bottom: 24px;" />
+            <a-form-item>
+              <a-input
+                autocomplete="autocomplete"
+                size="large"
+                placeholder="admin"
+                v-decorator="['name', {rules: [{ required: true, message: '请输入账户名', whitespace: true}]}]"
+              >
+                <a-icon slot="prefix" type="user" />
+              </a-input>
+            </a-form-item>
+            <a-form-item>
+              <a-input
+                size="large"
+                placeholder="888888"
+                autocomplete="autocomplete"
+                type="password"
+                v-decorator="['password', {rules: [{ required: true, message: '请输入密码', whitespace: true}]}]"
+              >
+                <a-icon slot="prefix" type="lock" />
+              </a-input>
+            </a-form-item>
+          </a-tab-pane>
+        </a-tabs>
+        <div>
+          <a-checkbox :checked="true" >自动登录</a-checkbox>
+        </div>
+        <a-form-item>
+          <a-button :loading="logging" style="width: 100%;margin-top: 24px" size="large" htmlType="submit" type="primary">登录</a-button>
+        </a-form-item>
+      </a-form>
+    </div>
+  </common-layout>
+</template>
+
+<script>
+import CommonLayout from '@vue2-client/layouts/CommonLayout'
+import { getRoutesConfig, login } from '@vue2-client/services/user'
+import { setAuthorization } from '@vue2-client/utils/request'
+import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
+import { mapMutations } from 'vuex'
+import JSEncrypt from 'jsencrypt'
+import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
+import Vue from 'vue'
+import { positions } from '@vue2-client/mock/common'
+import { timeFix } from '@vue2-client/utils/util'
+const { homePage, ticketPage } = require('@vue2-client/config')
+// import { router } from '@vue2-client/mock/user/routes'
+
+export default {
+  name: 'Login',
+  components: { CommonLayout },
+  data () {
+    return {
+      logging: false,
+      error: '',
+      form: this.$form.createForm(this)
+    }
+  },
+  computed: {
+    systemName () {
+      return this.$store.state.setting.systemName
+    },
+    systemDesc () {
+      return this.$store.state.setting.systemDesc
+    }
+  },
+  methods: {
+    ...mapMutations('account', ['setUser', 'setPermissions', 'setRoles']),
+    onSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err) => {
+        if (!err) {
+          this.logging = true
+          const name = this.form.getFieldValue('name')
+          const password = this.form.getFieldValue('password')
+          login(name, password).then(this.afterLogin)
+        }
+      })
+    },
+    afterLogin (res) {
+      const name = this.form.getFieldValue('name')
+      const password = this.form.getFieldValue('password')
+      this.logging = false
+      const loginRes = res.states
+      if (loginRes === '登录成功') {
+        const encrypt = new JSEncrypt()
+        encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
+        const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
+        localStorage.setItem(ACCESS_TOKEN, data)
+        // 获取路由配置
+        getRoutesConfig(data).then(result => {
+          Vue.$login.login(result).then(() => {
+            const user = Object.assign({
+              username: result.ename,
+              name: result.name,
+              avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
+              address: '西安市',
+              position: positions[0]
+            }, result)
+            this.setUser(user)
+            this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
+            this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
+            let timestamp = new Date().getTime()// 当前的时间戳
+            timestamp = timestamp + 60 * 60 * 1000
+            // 格式化时间获取年月日, 登陆过期时间
+            const dateAfter = new Date(timestamp)
+            setAuthorization({ token: data, expireAt: dateAfter })
+            loadRoutes(funcToRouter(user.functions))
+            if (result.deps === '用户工单登记') {
+              this.$router.push(ticketPage).catch(() => {})
+            } else {
+              this.$router.push(homePage).catch(() => {})
+            }
+            this.$message.success(timeFix().CN + '，欢迎回来', 3)
+          })
+        })
+      } else {
+        this.error = loginRes
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .common-layout{
+    .top {
+      text-align: center;
+      .header {
+        height: 44px;
+        line-height: 44px;
+        a {
+          text-decoration: none;
+        }
+        .logo {
+          height: 44px;
+          vertical-align: top;
+          margin-right: 16px;
+        }
+        .title {
+          font-size: 33px;
+          color: @title-color;
+          font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+          font-weight: 600;
+          position: relative;
+          top: 2px;
+        }
+      }
+      .desc {
+        font-size: 14px;
+        color: @text-color-second;
+        margin-top: 12px;
+        margin-bottom: 40px;
+      }
+    }
+    .login{
+      width: 368px;
+      margin: 0 auto;
+      @media screen and (max-width: 576px) {
+        width: 95%;
+      }
+      @media screen and (max-width: 320px) {
+        .captcha-button{
+          font-size: 14px;
+        }
+      }
+      .icon {
+        font-size: 24px;
+        color: @text-color-second;
+        margin-left: 16px;
+        vertical-align: middle;
+        cursor: pointer;
+        transition: color 0.3s;
+
+        &:hover {
+          color: @primary-color;
+        }
+      }
+    }
+  }
+</style>

package/src/router/async/router.map.js

@@ -1,59 +1,58 @@
-// 视图组件
-const view = {
-  tabs: () => import('@vue2-client/layouts/tabs'),
-  blank: () => import('@vue2-client/layouts/BlankView'),
-  page: () => import('@vue2-client/layouts/PageView'),
-  singlePage: () => import('@vue2-client/layouts/SinglePageView')
-}
-// 动态路由对象定义
-const routerResource = {}
-// --------------------------------------基本视图组件--------------------------------------
-// 空白视图
-routerResource.blank = view.blank
-// 单页面视图
-routerResource.singlePage = view.singlePage
-// --------------------------------------系统配置--------------------------------------
-routerResource.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
-// 查询配置管理
-routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
-// --------------------------------------报表组件--------------------------------------
-routerResource.reportTable = () => import(/* webpackChunkName: "ReportTableHome" */ '@vue2-client/pages/report/ReportTableHome')
-// --------------------------------------资源管理--------------------------------------
-routerResource.resourceManageMain = () => import(/* webpackChunkName: "resourceManageMain" */ '@vue2-client/pages/resourceManage/resourceManageMain')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: () => import('@vue2-client/pages/login')
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    redirect: '/login',
-    component: view.tabs
-  },
-  exp403: {
-    authority: '*',
-    name: 'exp403',
-    path: '403',
-    component: () => import('@vue2-client/pages/exception/403')
-  },
-  exp404: {
-    name: 'exp404',
-    path: '404',
-    component: () => import('@vue2-client/pages/exception/404')
-  },
-  exp500: {
-    name: 'exp500',
-    path: '500',
-    component: () => import('@vue2-client/pages/exception/500')
-  }
-}
-Object.assign(routerMap, routerResource)
-export default routerMap
+// 视图组件
+const view = {
+  tabs: () => import('@vue2-client/layouts/tabs'),
+  blank: () => import('@vue2-client/layouts/BlankView'),
+  page: () => import('@vue2-client/layouts/PageView')
+}
+// 动态路由对象定义
+const routerResource = {}
+// --------------------------------------基本视图组件--------------------------------------
+// 空白视图
+routerResource.blank = view.blank
+// 单页面视图
+routerResource.singlePage = view.blank
+// --------------------------------------系统配置--------------------------------------
+routerResource.system = view.blank
+// 字典管理
+routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
+// 查询配置管理
+routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
+// --------------------------------------报表组件--------------------------------------
+routerResource.reportTable = () => import(/* webpackChunkName: "ReportTableHome" */ '@vue2-client/pages/report/ReportTableHome')
+// --------------------------------------资源管理--------------------------------------
+routerResource.resourceManageMain = () => import(/* webpackChunkName: "resourceManageMain" */ '@vue2-client/pages/resourceManage/resourceManageMain')
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: () => import('@vue2-client/pages/login')
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    redirect: '/login',
+    component: view.tabs
+  },
+  exp403: {
+    authority: '*',
+    name: 'exp403',
+    path: '403',
+    component: () => import('@vue2-client/pages/exception/403')
+  },
+  exp404: {
+    name: 'exp404',
+    path: '404',
+    component: () => import('@vue2-client/pages/exception/404')
+  },
+  exp500: {
+    name: 'exp500',
+    path: '500',
+    component: () => import('@vue2-client/pages/exception/500')
+  }
+}
+Object.assign(routerMap, routerResource)
+export default routerMap

package/src/theme/default/style.less

@@ -1,33 +1,47 @@
-.week-mode{
-  overflow: hidden;
-  filter: invert(80%);
-}
-.beauty-scroll{
-  scrollbar-color: @primary-color @primary-2;
-  scrollbar-width: thin;
-  -ms-overflow-style:none;
-  position: relative;
-  &::-webkit-scrollbar{
-    width: 3px;
-    height: 1px;
-  }
-  &::-webkit-scrollbar-thumb {
-    border-radius: 3px;
-    background: @primary-color;
-  }
-  &::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
-    border-radius: 3px;
-    background: @primary-3;
-  }
-}
-.split-right{
-  &:not(:last-child) {
-    border-right: 1px solid rgba(98, 98, 98, 0.2);
-  }
-}
-.disabled{
-  cursor: not-allowed;
-  color: @disabled-color;
-  pointer-events: none;
-}
+.week-mode{
+  overflow: hidden;
+  filter: invert(80%);
+}
+.beauty-scroll{
+  scrollbar-color: @primary-color @primary-2;
+  scrollbar-width: thin;
+  -ms-overflow-style:none;
+  position: relative;
+  &::-webkit-scrollbar{
+    width: 3px;
+    height: 1px;
+  }
+  &::-webkit-scrollbar-thumb {
+    border-radius: 3px;
+    background: @primary-color;
+  }
+  &::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
+    border-radius: 3px;
+    background: @primary-3;
+  }
+}
+.split-right{
+  &:not(:last-child) {
+    border-right: 1px solid rgba(98, 98, 98, 0.2);
+  }
+}
+.disabled{
+  cursor: not-allowed;
+  color: @disabled-color;
+  pointer-events: none;
+}
+
+::-webkit-scrollbar{
+  width: 5px;
+  height: 5px;
+}
+::-webkit-scrollbar-thumb {
+  border-radius: 3px;
+  background: @primary-3;
+}
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
+  border-radius: 3px;
+  background: @primary-1;
+}

package/src/utils/routerUtil.js

@@ -63,11 +63,8 @@ function parseRoutes (routesConfig, routerMap) {
         router = routerMap['singlePage']
         item.path = item.name
       }
-      // 当没在动态路由对象中找到时, 给404页面
-      if (!router) {
-        router = routerMap['exp404']
-        item.path = item.name
-      }
+      // 当没在动态路由对象中找到时, 不添加到路由
+      if (!router) return
       routeCfg = item
     }
     if (!router) {
@@ -112,6 +109,8 @@ function parseRoutes (routesConfig, routerMap) {
     if (routeCfg.children && routeCfg.children.length > 0) {
       route.children = parseRoutes(routeCfg.children, routerMap)
     }
+    // 当没有子并且自己时blank(空界面)时, 不添加到路由
+    if (route.component.name === 'blank' && route.children && route.children.length <= 0) return
     routes.push(route)
   })
   return routes

package/vue.config.js

@@ -35,8 +35,8 @@ const isProd = process.env.NODE_ENV === 'production'
 // }
 
 const server = 'http://121.36.106.17:8400'
-const local = 'http://localhost:8445/webmeter'
-// const local = 'http://123.60.214.109:8405/webmeter'
+// const local = 'http://localhost:8445/webmeter'
+const local = 'http://123.60.214.109:8405/webmeter'
 
 module.exports = {
   devServer: {

package/src/config/config.js

@@ -1,15 +0,0 @@
-// 自定义配置，参考 ./default/setting.config.js，需要自定义的属性在这里配置即可
-module.exports = {
-  theme: {
-    color: '#1890ff',
-    mode: 'dark'
-  },
-  fixedHeader: true,
-  fixedTabs: true,
-  multiPage: true,
-  asyncRoutes: true,
-  animate: {
-    name: 'lightSpeed',
-    direction: 'left'
-  }
-}