From 4a76ae2122f8512dbf97fd427af7cc18644a53d7 Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Thu, 14 May 2020 23:10:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 5 ++ src/pages/CustomerDetail.vue | 21 +++----- src/pages/Home.vue | 64 ++++++++++++++++--------- src/pages/shop/IncreaseStoreManager.vue | 7 +-- src/services/CommonHttp.js | 4 +- src/services/datacenter/DataCenter.js | 4 +- vue.config.js | 4 +- 7 files changed, 65 insertions(+), 44 deletions(-) diff --git a/src/main.js b/src/main.js index 588d60a..f638fca 100644 --- a/src/main.js +++ b/src/main.js @@ -14,6 +14,11 @@ Vue.prototype.$qs = QS; Vue.prototype.$moment = moment; Vue.config.productionTip = false Vue.prototype.$moment = moment; + +import echarts from 'echarts'; +import 'echarts/map/js/china' + +Vue.prototype.$echarts = echarts; // 需要汉化 moment.locale('zh-cn'); diff --git a/src/pages/CustomerDetail.vue b/src/pages/CustomerDetail.vue index a97e0a9..dd634ed 100644 --- a/src/pages/CustomerDetail.vue +++ b/src/pages/CustomerDetail.vue @@ -34,7 +34,7 @@ -
- + + + 首页 + + :key="cItem.id"> {{cItem.name}} @@ -61,6 +64,7 @@ data() { return { roleCode: JSON.parse(sessionStorage.getItem("loginInfo")).roleCode, + mainUrl: "/customer/view", isCollapsed: false, mHeight: 600, selectedItemName: "", @@ -111,25 +115,34 @@ }, methods: { - // 菜单选中事件 onSelectLister(val) { + let i; + this.onePermissionList.forEach(function (data) { + data.subMenuList.forEach(function (dta) { + if(dta.id === val){ + i = dta; + } + }) + }); + if(i){ + sessionStorage.setItem("threeLevel",JSON.stringify(i.subMenuList)); + } + //首页 + if(val === 0){ + this.selectedMenu = "首页"; + this.selectedSubMenu = ""; + this.breadcrumbUrl = this.mainUrl; + } + for (let i = 0; i < this.onePermissionList.length; i++) { let item = this.onePermissionList[i]; for (let k = 0; k < item.subMenuList.length; k++) { let cItem = item.subMenuList[k]; if (cItem.id === val) { - - if(cItem.name === '大屏'){ - this.$router.push("") - } - - this.selectedMenu = item.name; this.selectedSubMenu = cItem.name; this.selectedItemName = cItem.id; this.breadcrumbUrl = cItem.resource; - // 3级菜单 - sessionStorage.setItem("threeLevel",JSON.stringify(cItem.subMenuList)); } } } @@ -245,18 +258,25 @@ //导航栏初始化 menuInit: function () { let that = this; + if(this.roleCode === 'GLY-ADMIN' || this.roleCode === 'DG-YUNYING' || this.roleCode === 'GL-YUNYING'){ + //默认首页 + that.selectedItemName = 0; + this.$router.push({path: that.mainUrl}); + this.selectedMenu = "首页"; + this.breadcrumbUrl = this.mainUrl; + }else{ + that.selectedItemName = that.onePermissionList[0].subMenuList[0].id; + that.openName = [that.onePermissionList[0].id]; - that.selectedItemName = that.onePermissionList[0].subMenuList[0].id; - that.openName = [that.onePermissionList[0].id]; - - this.selectedMenu = this.onePermissionList[0].name; - this.selectedSubMenu = this.onePermissionList[0].subMenuList[0].name; - sessionStorage.setItem("threeLevel",JSON.stringify(this.onePermissionList[0].subMenuList[0].subMenuList)); - this.$nextTick(() => { - this.$refs.menu.updateOpened(); - // this.$refs.menu.updateActiveName(); - }); - this.$router.push({path: that.onePermissionList[0].subMenuList[0].resource}); + this.selectedMenu = this.onePermissionList[0].name; + this.selectedSubMenu = this.onePermissionList[0].subMenuList[0].name; + sessionStorage.setItem("threeLevel",JSON.stringify(this.onePermissionList[0].subMenuList[0].subMenuList)); + // this.$nextTick(() => { + // this.$refs.menu.updateOpened(); + // this.$refs.menu.updateActiveName(); + // }); + this.$router.push({path: that.onePermissionList[0].subMenuList[0].resource}); + } }, //账户管理页面回调方法 diff --git a/src/pages/shop/IncreaseStoreManager.vue b/src/pages/shop/IncreaseStoreManager.vue index 86183ad..c1d84f3 100644 --- a/src/pages/shop/IncreaseStoreManager.vue +++ b/src/pages/shop/IncreaseStoreManager.vue @@ -6,15 +6,15 @@ 大区 零售公司 店铺 @@ -375,6 +375,7 @@ that.data1 = datas.list; } }, function (error) { + debugger that.loading = false; }); }, diff --git a/src/services/CommonHttp.js b/src/services/CommonHttp.js index 140721e..4320828 100755 --- a/src/services/CommonHttp.js +++ b/src/services/CommonHttp.js @@ -7,8 +7,8 @@ import commonUtils from '../utils/Common' // http://mf.kiisoo.com:58080/ // axios.defaults.baseURL = 'http://mf.kiisoo.com:58080/gds/api'; -axios.defaults.baseURL = 'https://wxtk.bsdits.com/kiisoo-ic/'; -// axios.defaults.baseURL = '/kiisoo-ic'; +// axios.defaults.baseURL = 'https://wxtk.bsdits.com/kiisoo-ic/'; +axios.defaults.baseURL = '/kiisoo-ic'; //响应时间 axios.defaults.timeout = 120000; diff --git a/src/services/datacenter/DataCenter.js b/src/services/datacenter/DataCenter.js index 2da8556..abb19fd 100644 --- a/src/services/datacenter/DataCenter.js +++ b/src/services/datacenter/DataCenter.js @@ -7,8 +7,8 @@ import http from '../CommonHttp' /** * 查询客户数据明细 */ -export function dataDetail(params, call) { - return http.post('/customer/info',params).then(call) +export function dataDetail(params, call, errorCallBack) { + return http.post('/customer/info',params).then(call).catch(errorCallBack) } /** diff --git a/vue.config.js b/vue.config.js index d397ebc..a552216 100644 --- a/vue.config.js +++ b/vue.config.js @@ -28,7 +28,9 @@ module.exports = { hotOnly: false, disableHostCheck: true, /* 使用代理 后台接口路径 */ - proxy: 'http://192.168.1.163:8048/' + // proxy: 'http://192.168.1.123:8312/' + // proxy: 'http://192.168.31.177:8312/' + proxy: 'http://localhost:8312/' // proxy: 'http://jdxdev.vipgz4.idcfengye.com/' }, chainWebpack: config => {