From f5db210d1fb45285f8b2c1d41a665ea6fd155033 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 25 Aug 2020 09:17:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/src/i18n/zh-CN.js | 2 ++ .../customer/miniProAgent/version/OperHistory.vue | 10 +++++----- .../customer/miniProAgent/version/VersionItem.vue | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-oper-web/src/i18n/zh-CN.js b/epmet-oper-web/src/i18n/zh-CN.js index 0796dd7..4fe1937 100644 --- a/epmet-oper-web/src/i18n/zh-CN.js +++ b/epmet-oper-web/src/i18n/zh-CN.js @@ -5,6 +5,8 @@ t.loading = '加载中...' t.brand = {} t.brand.lg = '党群e事通运营平台' t.brand.mini = '党群' +t.brand.work = '党群e事通工作端平台' +t.brand.workMini = '党群工作端' t.add = '新增' t.delete = '删除' diff --git a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/OperHistory.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/OperHistory.vue index 55aa094..a425f11 100644 --- a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/OperHistory.vue +++ b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/OperHistory.vue @@ -80,7 +80,7 @@ export default { // tab页相关 activeName: 'oper', params: {}, - codeId: '', + customerId: '',//客户id // 模板列表 tableUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/history', // tableUrl: '/third/code/history', @@ -123,10 +123,10 @@ export default { this.loadSubmitFailHistory() } }, - initData (params, codeId) { - this.params = params - this.codeId = codeId - this.tableParams.codeId = codeId + initData (params) { + // { this.customerId, this.clientType } = params + this.customerId = params.customerId + this.tableParams.customerId = params.customerId this.diaVisible = true diff --git a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue index 9f5ef63..df56743 100644 --- a/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue +++ b/epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue @@ -401,7 +401,7 @@ export default { // 打开操作历史 operHistoryShow () { - this.$refs['ref_oper_history'].initData(this.params, this.audit.codeId) + this.$refs['ref_oper_history'].initData(this.params) }, // 打开上传代码窗口 commitCodeShow () { From 8094ae07e7981738732459750c3aaccf1852b82f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 25 Aug 2020 09:17:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/src/App.vue | 13 ++- epmet-oper-web/src/js/store/modules/app.js | 34 +++++--- epmet-oper-web/src/js/store/type.js | 3 +- epmet-oper-web/src/router/index.js | 52 ++++++++---- epmet-oper-web/src/views/main-navbar.vue | 83 ++++++++++++++------ epmet-oper-web/src/views/pages/login.vue | 3 + epmet-oper-web/src/views/pages/loginWork.vue | 13 ++- 7 files changed, 146 insertions(+), 55 deletions(-) diff --git a/epmet-oper-web/src/App.vue b/epmet-oper-web/src/App.vue index b5306cf..24312fd 100644 --- a/epmet-oper-web/src/App.vue +++ b/epmet-oper-web/src/App.vue @@ -9,6 +9,7 @@ import { mapActions } from 'vuex' import Cookies from 'js-cookie' import { messages } from '@/i18n' import Vue from 'vue' +import { mapGetters } from 'vuex' export default { watch: { '$i18n.locale': 'i18nHandle' @@ -39,10 +40,18 @@ export default { }) }) }, - ...mapActions(['setClientHeight', 'setSize', 'setResolution', 'setEnv']) + ...mapActions(['setClientHeight', 'setSize', 'setResolution', 'setEnv', 'setUserType']) + }, + computed: { + ...mapGetters(['userType']) }, mounted () { const that = this + + if (!that.userType || that.userType === '') { + that.setUserType('oper') + } + console.log(that.userType) let envShow = process.env.VUE_APP_NODE_ENV let env = 'dev' if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境 @@ -76,7 +85,7 @@ export default { if (!that.timer) { that.timer = true // 这里的定时器是为了避免window.onresize时过于频繁的刷新vuex - setTimeout(function () { + setTimeout(function() { that.setClientHeight(document.documentElement.clientHeight) // debugger if (document.documentElement.clientHeight < 800) { diff --git a/epmet-oper-web/src/js/store/modules/app.js b/epmet-oper-web/src/js/store/modules/app.js index 4e16e70..12ba82c 100644 --- a/epmet-oper-web/src/js/store/modules/app.js +++ b/epmet-oper-web/src/js/store/modules/app.js @@ -5,40 +5,48 @@ export default { clientHeight: document.documentElement.clientHeight, size: 'medium', resolution: 'medium', - env: 'dev' + env: 'dev', + userType: 'oper' }, getters: { - clientHeight: state => state.clientHeight, - size: state => state.size, - resolution: state => state.resolution, - env: state => state.env + clientHeight: (state) => state.clientHeight, + size: (state) => state.size, + resolution: (state) => state.resolution, + env: (state) => state.env, + userType: (state) => state.userType }, mutations: { - [type.client_height] (state, payload) { + [type.client_height](state, payload) { state.clientHeight = payload }, - [type.size] (state, payload) { + [type.size](state, payload) { state.size = payload }, - [type.resolution] (state, payload) { + [type.resolution](state, payload) { state.resolution = payload }, - [type.env] (state, payload) { + [type.env](state, payload) { state.env = payload + }, + [type.user_type](state, payload) { + state.userType = payload } }, actions: { - setClientHeight ({ commit }, payload) { + setClientHeight({ commit }, payload) { commit(type.client_height, payload) }, - setSize ({ commit }, payload) { + setSize({ commit }, payload) { commit(type.size, payload) }, - setResolution ({ commit }, payload) { + setResolution({ commit }, payload) { commit(type.resolution, payload) }, - setEnv ({ commit }, payload) { + setEnv({ commit }, payload) { commit(type.env, payload) + }, + setUserType({ commit }, payload) { + commit(type.user_type, payload) } } } diff --git a/epmet-oper-web/src/js/store/type.js b/epmet-oper-web/src/js/store/type.js index 735ae7d..6ef4526 100644 --- a/epmet-oper-web/src/js/store/type.js +++ b/epmet-oper-web/src/js/store/type.js @@ -2,5 +2,6 @@ export default { client_height: 'CLIENT_HEIGHT', size: 'SIZE', resolution: 'RESOLUTION', - env: 'ENV' + env: 'ENV', + user_type: 'USER_TYPE' } diff --git a/epmet-oper-web/src/router/index.js b/epmet-oper-web/src/router/index.js index 417612b..4ed998f 100644 --- a/epmet-oper-web/src/router/index.js +++ b/epmet-oper-web/src/router/index.js @@ -2,6 +2,7 @@ import Vue from 'vue' import Router from 'vue-router' import http from '@/utils/request' import { isURL } from '@/utils/validate' +import store from '@/js/store' Vue.use(Router) @@ -98,6 +99,7 @@ router.beforeEach((to, from, next) => { ) { return next() } + // 获取字典列表, 添加并全局变量保存 http .get('/sys/dict/type/all') @@ -109,21 +111,41 @@ router.beforeEach((to, from, next) => { }) .catch(() => {}) // 获取菜单列表, 添加并全局变量保存 - http - .get('/oper/access/menu/nav') - .then(({ data: res }) => { - if (res.code !== 0) { - // Vue.prototype.$message.error(res.msg) - return next({ name: 'login' }) - } - window.SITE_CONFIG['menuList'] = res.data - fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList']) - // next({ ...to, replace: true }) - next({ ...to, replace: true }) - }) - .catch(() => { - next({ name: 'login' }) - }) + const userType = store.state.app.userType + debugger + if (userType === 'work') { + http + .get('/oper/access/menu/nav') + .then(({ data: res }) => { + if (res.code !== 0) { + // Vue.prototype.$message.error(res.msg) + return next({ name: 'loginWork' }) + } + window.SITE_CONFIG['menuList'] = res.data + fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList']) + // next({ ...to, replace: true }) + next({ ...to, replace: true }) + }) + .catch(() => { + next({ name: 'loginWork' }) + }) + } else { + http + .get('/oper/access/menu/nav') + .then(({ data: res }) => { + if (res.code !== 0) { + // Vue.prototype.$message.error(res.msg) + return next({ name: 'login' }) + } + window.SITE_CONFIG['menuList'] = res.data + fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList']) + // next({ ...to, replace: true }) + next({ ...to, replace: true }) + }) + .catch(() => { + next({ name: 'login' }) + }) + } }) /** diff --git a/epmet-oper-web/src/views/main-navbar.vue b/epmet-oper-web/src/views/main-navbar.vue index 63eef22..7b021d4 100644 --- a/epmet-oper-web/src/views/main-navbar.vue +++ b/epmet-oper-web/src/views/main-navbar.vue @@ -1,39 +1,66 @@ diff --git a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue index 725d0d0..1f30650 100644 --- a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue +++ b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue @@ -24,7 +24,7 @@ @click="startSetWxIndex(scope.row.customerId, scope.row.customerName, 0)">居民端 政府端 + @click="startSetWxIndex(scope.row.customerId, scope.row.customerName, 1)">工作端 @@ -40,7 +40,7 @@ @click="save">保存 发布 - ({{ wxIndex.customerName }} - {{ wxIndex.clientType===1 ? '政府端' : '居民端' }}) + ({{ wxIndex.customerName }} - {{ wxIndex.clientType===1 ? '工作端' : '居民端' }})