diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 2e575c51e..4050e7e22 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,9 +3,9 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 - // BASE_API = 'http://192.168.3.6:9000'; // 旭强 + BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.4:9000' // 琰培 } else { BASE_API = process.env.VUE_APP_BASE_API; diff --git a/src/views/dashboard/echarts/permission.vue b/src/views/dashboard/echarts/permission.vue index ad1e0f60f..7b4446bc2 100644 --- a/src/views/dashboard/echarts/permission.vue +++ b/src/views/dashboard/echarts/permission.vue @@ -132,7 +132,7 @@ export default { initChart() { listUserPermision({pageSize: 9000, pageNum: 1}).then(resp => { this.permissionList = resp.data.list.filter(elem => { return parseInt(elem.status) > 0; }); - this.mapNameList = [...new Set(this.permissionList.map(elem => { return elem.mapName; }))]; + this.mapNameList = [...new Set(this.permissionList.filter(elem => { return elem.mapName; }).map(elem => { return elem.mapName; }))]; this.$nextTick(() => { this.mapName = this.mapNameList[0] || ''; }); }); this.chart = echarts.init(document.getElementById(this.id));