diff --git a/console-web/src/main.js b/console-web/src/main.js index c83bb305..e05af936 100644 --- a/console-web/src/main.js +++ b/console-web/src/main.js @@ -11,9 +11,11 @@ import httpRequest from '@/utils/httpRequest' // api: https://github.com/axios/a import { isAuth } from '@/utils' import cloneDeep from 'lodash/cloneDeep' import './utils/directives.js' +import dict from './utils/dict' Vue.use(VueCookie) Vue.config.productionTip = false +Vue.prototype.dict = dict // 非生产环境, 适配mockjs模拟数据 // api: https://github.com/nuysoft/Mock if (process.env.NODE_ENV !== 'production') { diff --git a/console-web/src/views/main-sidebar.vue b/console-web/src/views/main-sidebar.vue index 8d492e39..5cd71190 100644 --- a/console-web/src/views/main-sidebar.vue +++ b/console-web/src/views/main-sidebar.vue @@ -62,7 +62,7 @@ }, menuActiveName: { get () { return this.$store.state.common.menuActiveName }, - set (val) { this.$store.commit('common/', val) } + set (val) { this.$store.commit('common/updateMenuActiveName', val) } }, mainTabs: { get () { return this.$store.state.common.mainTabs }, diff --git a/console-web/src/views/modules/pub/user-add-or-update.vue b/console-web/src/views/modules/pub/user-add-or-update.vue index 9d28fdc1..899a1a01 100644 --- a/console-web/src/views/modules/pub/user-add-or-update.vue +++ b/console-web/src/views/modules/pub/user-add-or-update.vue @@ -53,7 +53,7 @@ - + @@ -133,22 +133,6 @@ status: '0' }, orgNoList: [], - operTypeList: [{ - value: '1', - label: '管理人员' - }, { - value: '2', - label: '业务操作人员' - }, { - value: '3', - label: '客户经理' - }, { - value: '4', - label: '技术操作员' - }, { - value: '9', - label: '其他' - }], dataRule: { operNo: [ { required: true, message: '登录账号不能为空', trigger: 'blur' } diff --git a/console-web/src/views/modules/pub/user.vue b/console-web/src/views/modules/pub/user.vue index f651add0..71b050f1 100644 --- a/console-web/src/views/modules/pub/user.vue +++ b/console-web/src/views/modules/pub/user.vue @@ -37,7 +37,7 @@ @@ -136,19 +136,6 @@ }, methods: { // 数据转义 - operTypStateFormat (row, column) { - if (row.oper_typ === '1') { - return '管理人员' - } else if (row.oper_typ === '2') { - return '业务操作人员' - } else if (row.oper_typ === '3') { - return '客户经理' - } else if (row.oper_typ === '4') { - return '技术操作员' - } else { - return '其他' - } - }, // 获取数据列表 getDataList () { this.dataListLoading = true