diff --git a/src/views/energySourcesProvince/component/pathMap.vue b/src/views/energySourcesProvince/component/pathMap.vue index fac6485..b2202d1 100644 --- a/src/views/energySourcesProvince/component/pathMap.vue +++ b/src/views/energySourcesProvince/component/pathMap.vue @@ -55,13 +55,13 @@ export default { // locationAcc: { 0: '关闭', 1: '开启' }, // carList: carList,//车辆设备 markList: [ - { lng: 112.37268, lat: 25.63787, name: "福顺机械实业公司", carbon: 0, electricity: 0 }, - { lng: 112.375261, lat: 25.63742, name: "巨人机床实业公司", carbon: 0, electricity: 0 }, - { lng: 112.365047, lat: 25.630574, name: "郴州雄建实业公司", carbon: 0, electricity: 0 }, - { lng: 112.36587, lat: 25.63132, name: "众合实业公司", carbon: 0, electricity: 0 }, - { lng: 112.372727, lat: 25.635608, name: "雄达实业公司", carbon: 0, electricity: 0 }, - { lng: 112.373909, lat: 25.634179, name: "峰达实业公司", carbon: 0, electricity: 0 }, - { lng: 112.37275, lat: 25.63676, name: "伟铸机械实业公司", carbon: 0, electricity: 0 }, + { lng: 112.37268, lat: 25.63787, name: "福顺机械实业公司", namecode: '福顺', carbon: 0, electricity: 0 }, + { lng: 112.375261, lat: 25.63742, name: "巨人机床实业公司", namecode: '巨人机床', carbon: 0, electricity: 0 }, + { lng: 112.365047, lat: 25.630574, name: "郴州雄建实业公司", namecode: '郴州雄建', carbon: 0, electricity: 0 }, + { lng: 112.36587, lat: 25.63132, name: "众合实业公司", namecode: '众合', carbon: 0, electricity: 0 }, + { lng: 112.372727, lat: 25.635608, name: "雄达实业公司", namecode: '雄达', carbon: 0, electricity: 0 }, + { lng: 112.373909, lat: 25.634179, name: "锋达实业公司", namecode: '锋达', carbon: 0, electricity: 0 }, + { lng: 112.37275, lat: 25.63676, name: "伟铸机械实业公司", namecode: '伟铸', carbon: 0, electricity: 0 }, ],//标注点记录 polyline: null,//昨日轨迹 viewData: [],//点聚合坐标集合 @@ -102,10 +102,11 @@ export default { getEnterprisePower({ today: this.$moment().format('yyyy-MM-DD') }).then(res => { let data = res.data.data this.markList.forEach(e => { - data.forEach(r => { - if (e.name.includes(r.name)) { + data.some(r => { + if (r.name.includes(e.namecode)) { e.carbon = r.carbon || 0 e.electricity = r.electricity || 0 + return true } }) })