vue2-client 1.6.21 → 1.6.22

package/src/pages/system/settings/index.vue

@@ -1,126 +1,126 @@
-<template>
-  <div class="page-header-index-wide">
-    <a-card :bordered="false" :bodyStyle="{ padding: '16px 0', height: '100%' }" :style="{ height: '100%' }">
-      <div class="account-settings-info-main" :class="{ 'mobile': isMobile }">
-        <div class="account-settings-info-left">
-          <a-menu
-            :mode="isMobile ? 'horizontal' : 'inline'"
-            :style="{ border: '0', width: isMobile ? '560px' : 'auto'}"
-            :selectedKeys="selectedKeys"
-            type="inner"
-            @click="onClick"
-          >
-            <a-menu-item key="modifyPassword">
-              修改密码
-            </a-menu-item>
-          </a-menu>
-        </div>
-        <div class="account-settings-info-right">
-          <div class="account-settings-info-title">
-            <span>{{ $route.meta.title }}</span>
-          </div>
-          <a-page-header
-            v-if="openKey === 'modifyPassword'"
-            title="修改密码">
-            <modify-password/>
-          </a-page-header>
-        </div>
-      </div>
-    </a-card>
-  </div>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import modifyPassword from '@vue2-client/pages/system/settings/modifyPassword'
-
-export default {
-  components: { modifyPassword },
-  computed: {
-    ...mapState('setting', ['isMobile']),
-  },
-  data () {
-    return {
-      // horizontal  inline
-      mode: 'inline',
-
-      openKey: 'modifyPassword',
-      selectedKeys: [],
-
-      // cropper
-      preview: {},
-      option: {
-        img: '/avatar2.jpg',
-        info: true,
-        size: 1,
-        outputType: 'jpeg',
-        canScale: false,
-        autoCrop: true,
-        // 只有自动截图开启 宽度高度才生效
-        autoCropWidth: 180,
-        autoCropHeight: 180,
-        fixedBox: true,
-        // 开启宽度和高度比例
-        fixed: true,
-        fixedNumber: [1, 1]
-      },
-
-      pageTitle: ''
-    }
-  },
-  mounted () {
-  },
-  methods: {
-    onClick (openKeys) {
-      this.openKey = openKeys.key
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .account-settings-info-main {
-    width: 100%;
-    display: flex;
-    height: 100%;
-    overflow: auto;
-
-    &.mobile {
-      display: block;
-
-      .account-settings-info-left {
-        border-right: unset;
-        border-bottom: 1px solid #e8e8e8;
-        width: 100%;
-        height: 50px;
-        overflow-x: auto;
-        overflow-y: scroll;
-      }
-      .account-settings-info-right {
-        padding: 20px 40px;
-      }
-    }
-
-    .account-settings-info-left {
-      border-right: 1px solid #e8e8e8;
-      width: 224px;
-    }
-
-    .account-settings-info-right {
-      flex: 1 1;
-      padding: 8px 40px;
-
-      .account-settings-info-title {
-        color: rgba(0,0,0,.85);
-        font-size: 20px;
-        font-weight: 500;
-        line-height: 28px;
-        margin-bottom: 12px;
-      }
-      .account-settings-info-view {
-        padding-top: 12px;
-      }
-    }
-  }
-
-</style>
+<template>
+  <div class="page-header-index-wide">
+    <a-card :bordered="false" :bodyStyle="{ padding: '16px 0', height: '100%' }" :style="{ height: '100%' }">
+      <div class="account-settings-info-main" :class="{ 'mobile': isMobile }">
+        <div class="account-settings-info-left">
+          <a-menu
+            :mode="isMobile ? 'horizontal' : 'inline'"
+            :style="{ border: '0', width: isMobile ? '560px' : 'auto'}"
+            :selectedKeys="selectedKeys"
+            type="inner"
+            @click="onClick"
+          >
+            <a-menu-item key="modifyPassword">
+              修改密码
+            </a-menu-item>
+          </a-menu>
+        </div>
+        <div class="account-settings-info-right">
+          <div class="account-settings-info-title">
+            <span>{{ $route.meta.title }}</span>
+          </div>
+          <a-page-header
+            v-if="openKey === 'modifyPassword'"
+            title="修改密码">
+            <modify-password/>
+          </a-page-header>
+        </div>
+      </div>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import modifyPassword from '@vue2-client/pages/system/settings/modifyPassword'
+
+export default {
+  components: { modifyPassword },
+  computed: {
+    ...mapState('setting', ['isMobile']),
+  },
+  data () {
+    return {
+      // horizontal  inline
+      mode: 'inline',
+
+      openKey: 'modifyPassword',
+      selectedKeys: [],
+
+      // cropper
+      preview: {},
+      option: {
+        img: '/avatar2.jpg',
+        info: true,
+        size: 1,
+        outputType: 'jpeg',
+        canScale: false,
+        autoCrop: true,
+        // 只有自动截图开启 宽度高度才生效
+        autoCropWidth: 180,
+        autoCropHeight: 180,
+        fixedBox: true,
+        // 开启宽度和高度比例
+        fixed: true,
+        fixedNumber: [1, 1]
+      },
+
+      pageTitle: ''
+    }
+  },
+  mounted () {
+  },
+  methods: {
+    onClick (openKeys) {
+      this.openKey = openKeys.key
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .account-settings-info-main {
+    width: 100%;
+    display: flex;
+    height: 100%;
+    overflow: auto;
+
+    &.mobile {
+      display: block;
+
+      .account-settings-info-left {
+        border-right: unset;
+        border-bottom: 1px solid #e8e8e8;
+        width: 100%;
+        height: 50px;
+        overflow-x: auto;
+        overflow-y: scroll;
+      }
+      .account-settings-info-right {
+        padding: 20px 40px;
+      }
+    }
+
+    .account-settings-info-left {
+      border-right: 1px solid #e8e8e8;
+      width: 224px;
+    }
+
+    .account-settings-info-right {
+      flex: 1 1;
+      padding: 8px 40px;
+
+      .account-settings-info-title {
+        color: rgba(0,0,0,.85);
+        font-size: 20px;
+        font-weight: 500;
+        line-height: 28px;
+        margin-bottom: 12px;
+      }
+      .account-settings-info-view {
+        padding-top: 12px;
+      }
+    }
+  }
+
+</style>

package/src/pages/system/settings/modifyPassword.vue

@@ -1,109 +1,109 @@
-<template>
-  <div class="account-settings-info-view">
-    <a-row :gutter="16">
-      <a-col :md="24" :lg="16">
-        <a-form-model
-          ref="form"
-          :rules="rules"
-          :model="form"
-        >
-          <a-form-model-item
-            label="原密码"
-            prop="oldPassword">
-            <a-input-password v-model="form.oldPassword" placeholder="原密码"/>
-          </a-form-model-item>
-          <a-form-model-item
-            label="新密码"
-            prop="newPassword">
-            <a-input-password v-model="form.newPassword" placeholder="新密码"/>
-          </a-form-model-item>
-          <a-form-model-item
-            label="重复一遍新密码"
-            prop="confirmNewPassword">
-            <a-input-password v-model="form.confirmNewPassword" placeholder="重复一遍新密码"/>
-          </a-form-model-item>
-          <a-button type="primary" @click="onSubmit()" :loading="loading">提交</a-button>
-        </a-form-model>
-      </a-col>
-    </a-row>
-  </div>
-</template>
-
-<script>
-import { logout, modifyPassword } from '@vue2-client/services/user'
-import { mapState } from 'vuex'
-
-export default {
-  name: 'modifyPassword',
-  computed: {
-    ...mapState('account', { currUser: 'user' })
-  },
-  data () {
-    return {
-      loading: false,
-      // 表单Model
-      form: {},
-      // 校验
-      rules: {
-        oldPassword: [
-          {
-            required: true,
-            message: '请输入原密码',
-            trigger: 'blur'
-          }
-        ],
-        newPassword: [
-          {
-            required: true,
-            message: '请输入新密码',
-            trigger: 'blur'
-          }
-        ],
-        confirmNewPassword: [
-          {
-            required: true,
-            message: '请重复输入一遍新密码',
-            trigger: 'blur'
-          }
-        ],
-      }
-    }
-  },
-  methods: {
-    onSubmit () {
-      this.$refs.form.validate(valid => {
-        // 验证未通过直接返回
-        if (!valid) {
-          return false
-        }
-        if (this.form.oldPassword === this.form.newPassword) {
-          this.$message.warn('新密码不可与原密码相同！')
-          return false
-        }
-        if (this.form.newPassword !== this.form.confirmNewPassword) {
-          this.$message.warn('两次新密码不一致！')
-          return false
-        }
-        this.loading = true
-        modifyPassword(this.currUser.ename, this.form.oldPassword, this.form.newPassword).then(data => {
-          if (data) {
-            this.$message.success('修改密码成功，请重新登录！')
-            logout().finally(res => {
-              location.href = '/login'
-            })
-          } else {
-            this.$message.error('修改密码失败，原密码错误，请重试')
-          }
-        }).catch(e => {
-          this.$message.error('修改密码失败：' + e)
-        }).finally(() => {
-          this.loading = false
-        })
-      })
-    },
-  }
-}
-</script>
-
-<style lang="less" scoped>
-</style>
+<template>
+  <div class="account-settings-info-view">
+    <a-row :gutter="16">
+      <a-col :md="24" :lg="16">
+        <a-form-model
+          ref="form"
+          :rules="rules"
+          :model="form"
+        >
+          <a-form-model-item
+            label="原密码"
+            prop="oldPassword">
+            <a-input-password v-model="form.oldPassword" placeholder="原密码"/>
+          </a-form-model-item>
+          <a-form-model-item
+            label="新密码"
+            prop="newPassword">
+            <a-input-password v-model="form.newPassword" placeholder="新密码"/>
+          </a-form-model-item>
+          <a-form-model-item
+            label="重复一遍新密码"
+            prop="confirmNewPassword">
+            <a-input-password v-model="form.confirmNewPassword" placeholder="重复一遍新密码"/>
+          </a-form-model-item>
+          <a-button type="primary" @click="onSubmit()" :loading="loading">提交</a-button>
+        </a-form-model>
+      </a-col>
+    </a-row>
+  </div>
+</template>
+
+<script>
+import { logout, modifyPassword } from '@vue2-client/services/user'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'modifyPassword',
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
+  data () {
+    return {
+      loading: false,
+      // 表单Model
+      form: {},
+      // 校验
+      rules: {
+        oldPassword: [
+          {
+            required: true,
+            message: '请输入原密码',
+            trigger: 'blur'
+          }
+        ],
+        newPassword: [
+          {
+            required: true,
+            message: '请输入新密码',
+            trigger: 'blur'
+          }
+        ],
+        confirmNewPassword: [
+          {
+            required: true,
+            message: '请重复输入一遍新密码',
+            trigger: 'blur'
+          }
+        ],
+      }
+    }
+  },
+  methods: {
+    onSubmit () {
+      this.$refs.form.validate(valid => {
+        // 验证未通过直接返回
+        if (!valid) {
+          return false
+        }
+        if (this.form.oldPassword === this.form.newPassword) {
+          this.$message.warn('新密码不可与原密码相同！')
+          return false
+        }
+        if (this.form.newPassword !== this.form.confirmNewPassword) {
+          this.$message.warn('两次新密码不一致！')
+          return false
+        }
+        this.loading = true
+        modifyPassword(this.currUser.ename, this.form.oldPassword, this.form.newPassword).then(data => {
+          if (data) {
+            this.$message.success('修改密码成功，请重新登录！')
+            logout().finally(res => {
+              location.href = '/login'
+            })
+          } else {
+            this.$message.error('修改密码失败，原密码错误，请重试')
+          }
+        }).catch(e => {
+          this.$message.error('修改密码失败：' + e)
+        }).finally(() => {
+          this.loading = false
+        })
+      })
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+</style>

package/src/router/async/config.async.js

@@ -1,28 +1,28 @@
-import routerMap from './router.map'
-import { parseRoutes } from '@vue2-client/utils/routerUtil'
-
-// 异步路由配置
-const routesConfig = [
-  'login',
-  'submitTicket',
-  'settings',
-  'root',
-  {
-    router: 'exp404',
-    path: '*',
-    name: '404'
-  },
-  {
-    router: 'exp403',
-    path: '/403',
-    name: '403'
-  }
-]
-
-const options = {
-  mode: 'history',
-  routes: parseRoutes(routesConfig, routerMap),
-  config: routesConfig
-}
-
-export default options
+import routerMap from './router.map'
+import { parseRoutes } from '@vue2-client/utils/routerUtil'
+
+// 异步路由配置
+const routesConfig = [
+  'login',
+  'submitTicket',
+  'settings',
+  'root',
+  {
+    router: 'exp404',
+    path: '*',
+    name: '404'
+  },
+  {
+    router: 'exp403',
+    path: '/403',
+    name: '403'
+  }
+]
+
+const options = {
+  mode: 'history',
+  routes: parseRoutes(routesConfig, routerMap),
+  config: routesConfig
+}
+
+export default options

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

@@ -1,68 +1,68 @@
-const { homePage } = require('../../config')
-// 视图组件
-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.dashboard = view.blank
-// 工作台
-routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
-// --------------------------------------系统配置--------------------------------------
-routerResource.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
-// 查询配置管理
-routerResource.queryParamsManage = () => import('@vue2-client/pages/system/queryParams')
-// 文件管理
-routerResource.fileManager = () => import('@vue2-client/pages/system/file')
-// 登录日志
-routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
-// 操作日志
-routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
-// 系统设置
-routerResource.settings = () => import('@vue2-client/pages/system/settings')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: () => import('@vue2-client/pages/login')
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    redirect: homePage,
-    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 { homePage } = require('../../config')
+// 视图组件
+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.dashboard = view.blank
+// 工作台
+routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
+// --------------------------------------系统配置--------------------------------------
+routerResource.system = view.blank
+// 字典管理
+routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
+// 查询配置管理
+routerResource.queryParamsManage = () => import('@vue2-client/pages/system/queryParams')
+// 文件管理
+routerResource.fileManager = () => import('@vue2-client/pages/system/file')
+// 登录日志
+routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
+// 操作日志
+routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
+// 系统设置
+routerResource.settings = () => import('@vue2-client/pages/system/settings')
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: () => import('@vue2-client/pages/login')
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    redirect: homePage,
+    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