diff --git a/src/components/screen-map-legeng/index.vue b/src/components/screen-map-legeng/index.vue index 2b739e0..105a300 100644 --- a/src/components/screen-map-legeng/index.vue +++ b/src/components/screen-map-legeng/index.vue @@ -29,7 +29,7 @@ export default { { imgSrc: require('@/assets/images/map/legeng/qq.png'), units: '家', - num: '14', + num: '16', name: '育种企业' }, { @@ -66,6 +66,7 @@ export default { }, methods: { setMapPoint (selectArr) { + console.log(selectArr,'渲染的地图点位'); this.$EventBus.$emit('switcMapType1', selectArr) }, selectQy (name) { diff --git a/src/views/next/dialog-module/zdyf-left/yfclz.vue b/src/views/next/dialog-module/zdyf-left/yfclz.vue index 58ac945..f5e9b66 100644 --- a/src/views/next/dialog-module/zdyf-left/yfclz.vue +++ b/src/views/next/dialog-module/zdyf-left/yfclz.vue @@ -88,14 +88,10 @@ export default { return { ...item1, growTime: this.formatDateTime(new Date(item1.growTime)), - marketTime: this.formatDateTime(new Date(item1.marketTime)) + marketTime: this.formatMarketTime(new Date(item1.marketTime)) } }) this.currentId = res.data[0].vegetableCategory - // this.titleList = res.data.list - // if (this.titleList.length > 0) { - // this.onDatils(this.titleList[0]) - // } }) }, methods: { @@ -115,19 +111,25 @@ export default { return year + '-' + month + '-' + day }, + formatMarketTime (date) { + function padZero (num) { + return num < 10 ? '0' + num : num + } + var year = 2025 // 只将年份固定为2025 + var month = padZero(date.getMonth() + 1) + var day = padZero(date.getDate()) + + return year + '-' + month + '-' + day + }, onDatils (item) { this.currentId = item.vegetableCategory this.numList = item.detailList.map((item1) => { return { ...item1, growTime: this.formatDateTime(new Date(item1.growTime)), - marketTime: this.formatDateTime(new Date(item1.marketTime)) + marketTime: this.formatMarketTime(new Date(item1.marketTime)) } }) - // partyPlace(item.id).then((res) => { - // // console.log('res::', res); - // this.info = res.data - // }) } } } diff --git a/src/views/next/dialog-module/zdyf-right/kyll/keyEnterprises.vue b/src/views/next/dialog-module/zdyf-right/kyll/keyEnterprises.vue index a94dd0c..efa793a 100644 --- a/src/views/next/dialog-module/zdyf-right/kyll/keyEnterprises.vue +++ b/src/views/next/dialog-module/zdyf-right/kyll/keyEnterprises.vue @@ -115,8 +115,8 @@ export default { set_gsxq_id: 'SET_GSXQ_ID' }), openCompanyDetail (item) { - this.set_qyjj(true) - this.set_gsxq_id(item.id) + this.set_qyjj(true) + this.set_gsxq_id(item.id) }, onDatils (item) { this.currentId = item.value diff --git a/src/views/next/screen-content-map/cpt/point.json b/src/views/next/screen-content-map/cpt/point.json index 461da51..236d3ea 100644 --- a/src/views/next/screen-content-map/cpt/point.json +++ b/src/views/next/screen-content-map/cpt/point.json @@ -252,7 +252,7 @@ { "type": "Feature", "properties": { - "name": "青岛地平线现代农业科技有限公司", + "name": "青岛地平线蔬菜专业合作社", "type": "marker", "category": "unit", "id": "1" diff --git a/src/views/next/screen-content-map/cpt/zdyf-map.vue b/src/views/next/screen-content-map/cpt/zdyf-map.vue index 3cf1606..30e467e 100644 --- a/src/views/next/screen-content-map/cpt/zdyf-map.vue +++ b/src/views/next/screen-content-map/cpt/zdyf-map.vue @@ -165,6 +165,7 @@ export default { }), ...mapActions({}), openCompanyDetail (item) { + console.log(item,this.companyList,'卡死是因为pc管理端改公司名称了'); const row = this.companyList.filter((item1) => item1.name === item.name) this.set_qyjj(true) this.set_gsxq_id(row[0].id) @@ -309,7 +310,8 @@ export default { scene.addLayer(lineLayer1) }, initDot (data, arr) { - this.removeDotLayers() + console.log(data,arr,'初始化'); + // this.removeDotLayers() // textOffset改为动态的 this.buttonIndex == 3 [10,60] 否则就是 [-30 60] const images = { 育种企业: 'yuzhong', @@ -333,6 +335,7 @@ export default { .size('name', (val) => { return 8 }) + console.log(dotLayer1); scene.addLayer(dotLayer1) } if (arr.some((item) => item === '种植企业')) { @@ -373,6 +376,7 @@ export default { scene.addLayer(dotLayer3) } dotLayer.on('click', (e) => { + console.log(e,'点击地图点位触发'); this.openCompanyDetail(e.feature.properties) }) polygonLayer.on('click', (e) => { @@ -380,12 +384,18 @@ export default { console.log(`${lng},${lat}`,'拾取的边界点'); }) dotLayer1.on('click', (e) => { + debugger + console.log(e,'点击地图点位触发'); this.openCompanyDetail(e.feature.properties) }) dotLayer2.on('click', (e) => { + debugger + console.log(e,'点击地图点位触发'); this.openCompanyDetail(e.feature.properties) }) dotLayer3.on('click', (e) => { + debugger + console.log(e,'点击地图点位触发'); this.openCompanyDetail(e.feature.properties) }) } diff --git a/src/views/next/screen-content-right/home-right/index.vue b/src/views/next/screen-content-right/home-right/index.vue index 492349b..9270a10 100644 --- a/src/views/next/screen-content-right/home-right/index.vue +++ b/src/views/next/screen-content-right/home-right/index.vue @@ -8,7 +8,7 @@