Browse Source

公司名称改变大不开弹窗

master
mk 4 months ago
parent
commit
05a943b721
  1. 3
      src/components/screen-map-legeng/index.vue
  2. 22
      src/views/next/dialog-module/zdyf-left/yfclz.vue
  3. 2
      src/views/next/screen-content-map/cpt/point.json
  4. 12
      src/views/next/screen-content-map/cpt/zdyf-map.vue
  5. 13
      src/views/next/screen-content-right/home-right/index.vue

3
src/components/screen-map-legeng/index.vue

@ -29,7 +29,7 @@ export default {
{ {
imgSrc: require('@/assets/images/map/legeng/qq.png'), imgSrc: require('@/assets/images/map/legeng/qq.png'),
units: '家', units: '家',
num: '14', num: '16',
name: '育种企业' name: '育种企业'
}, },
{ {
@ -66,6 +66,7 @@ export default {
}, },
methods: { methods: {
setMapPoint (selectArr) { setMapPoint (selectArr) {
console.log(selectArr,'渲染的地图点位');
this.$EventBus.$emit('switcMapType1', selectArr) this.$EventBus.$emit('switcMapType1', selectArr)
}, },
selectQy (name) { selectQy (name) {

22
src/views/next/dialog-module/zdyf-left/yfclz.vue

@ -88,14 +88,10 @@ export default {
return { return {
...item1, ...item1,
growTime: this.formatDateTime(new Date(item1.growTime)), 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.currentId = res.data[0].vegetableCategory
// this.titleList = res.data.list
// if (this.titleList.length > 0) {
// this.onDatils(this.titleList[0])
// }
}) })
}, },
methods: { methods: {
@ -115,19 +111,25 @@ export default {
return year + '-' + month + '-' + day 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) { onDatils (item) {
this.currentId = item.vegetableCategory this.currentId = item.vegetableCategory
this.numList = item.detailList.map((item1) => { this.numList = item.detailList.map((item1) => {
return { return {
...item1, ...item1,
growTime: this.formatDateTime(new Date(item1.growTime)), 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
// })
} }
} }
} }

2
src/views/next/screen-content-map/cpt/point.json

@ -252,7 +252,7 @@
{ {
"type": "Feature", "type": "Feature",
"properties": { "properties": {
"name": "青岛地平线现代农业科技有限公司", "name": "青岛地平线蔬菜专业合作社",
"type": "marker", "type": "marker",
"category": "unit", "category": "unit",
"id": "1" "id": "1"

12
src/views/next/screen-content-map/cpt/zdyf-map.vue

@ -165,6 +165,7 @@ export default {
}), }),
...mapActions({}), ...mapActions({}),
openCompanyDetail (item) { openCompanyDetail (item) {
console.log(item,this.companyList,'卡死是因为pc管理端改公司名称了');
const row = this.companyList.filter((item1) => item1.name === item.name) const row = this.companyList.filter((item1) => item1.name === item.name)
this.set_qyjj(true) this.set_qyjj(true)
this.set_gsxq_id(row[0].id) this.set_gsxq_id(row[0].id)
@ -309,7 +310,8 @@ export default {
scene.addLayer(lineLayer1) scene.addLayer(lineLayer1)
}, },
initDot (data, arr) { initDot (data, arr) {
this.removeDotLayers() console.log(data,arr,'初始化');
// this.removeDotLayers()
// textOffset this.buttonIndex == 3 [10,60] [-30 60] // textOffset this.buttonIndex == 3 [10,60] [-30 60]
const images = { const images = {
育种企业: 'yuzhong', 育种企业: 'yuzhong',
@ -333,6 +335,7 @@ export default {
.size('name', (val) => { .size('name', (val) => {
return 8 return 8
}) })
console.log(dotLayer1);
scene.addLayer(dotLayer1) scene.addLayer(dotLayer1)
} }
if (arr.some((item) => item === '种植企业')) { if (arr.some((item) => item === '种植企业')) {
@ -373,6 +376,7 @@ export default {
scene.addLayer(dotLayer3) scene.addLayer(dotLayer3)
} }
dotLayer.on('click', (e) => { dotLayer.on('click', (e) => {
console.log(e,'点击地图点位触发');
this.openCompanyDetail(e.feature.properties) this.openCompanyDetail(e.feature.properties)
}) })
polygonLayer.on('click', (e) => { polygonLayer.on('click', (e) => {
@ -380,12 +384,18 @@ export default {
console.log(`${lng},${lat}`,'拾取的边界点'); console.log(`${lng},${lat}`,'拾取的边界点');
}) })
dotLayer1.on('click', (e) => { dotLayer1.on('click', (e) => {
debugger
console.log(e,'点击地图点位触发');
this.openCompanyDetail(e.feature.properties) this.openCompanyDetail(e.feature.properties)
}) })
dotLayer2.on('click', (e) => { dotLayer2.on('click', (e) => {
debugger
console.log(e,'点击地图点位触发');
this.openCompanyDetail(e.feature.properties) this.openCompanyDetail(e.feature.properties)
}) })
dotLayer3.on('click', (e) => { dotLayer3.on('click', (e) => {
debugger
console.log(e,'点击地图点位触发');
this.openCompanyDetail(e.feature.properties) this.openCompanyDetail(e.feature.properties)
}) })
} }

13
src/views/next/screen-content-right/home-right/index.vue

@ -8,7 +8,7 @@
<div class="top"> <div class="top">
<div class="item"> <div class="item">
<img src="@/assets/images/weather/kqwd.png" alt="" /> <img src="@/assets/images/weather/kqwd.png" alt="" />
<div><span>{{ weatherData.ambientTemperature }}</span> <span>空气温度</span></div> <div><span>{{ tqInfo.tempMax }}</span> <span>空气温度</span></div>
</div> </div>
<img <img
src="@/assets/images/weather/line.png" src="@/assets/images/weather/line.png"
@ -76,7 +76,7 @@
<script> <script>
import { mapActions } from 'vuex' import { mapActions } from 'vuex'
import { cultureLegacyList,getWeather } from '@/api/home' import { cultureLegacyList,getWeather,lookup,nowTianqi } from '@/api/home'
import {getVegetableOutputList} from "api/zdyf"; import {getVegetableOutputList} from "api/zdyf";
export default { export default {
data () { data () {
@ -133,11 +133,16 @@ export default {
title: '张院簸箕制作技艺' title: '张院簸箕制作技艺'
} }
] ]
] ],
tqInfo:{}
} }
}, },
created () { created () {
lookup().then((res) => {
nowTianqi(res.location[0].id).then((res1) => {
this.tqInfo = res1.daily[0];
});
});
cultureLegacyList().then((res) => { cultureLegacyList().then((res) => {
let num = 0 let num = 0
let index = 0 let index = 0

Loading…
Cancel
Save