diff --git a/src/views/agriculture/mapManager/MapArea.vue b/src/views/agriculture/mapManager/MapArea.vue index 40ccf9f..13a4dde 100644 --- a/src/views/agriculture/mapManager/MapArea.vue +++ b/src/views/agriculture/mapManager/MapArea.vue @@ -43,12 +43,12 @@
- {{ item.productName }} + {{ item.productName }}
- +
@@ -95,9 +95,7 @@
设备
  • - {{ - item.productName.length > 7 ? `${item.productName.substring(0, 7)}...` : item.productName - }} + {{ item.productName.length > 7 ? `${item.productName.substring(0, 7)}...` : item.productName }}
    @@ -164,7 +162,6 @@ export default { }, data() { return { - baseUrl: process.env.VUE_APP_BASE_API, drawer: false, //抽屉控制 drawer2: false, //抽屉控制 drawer3: false, @@ -396,7 +393,7 @@ export default { this.marker = []; var markerContent = document.createElement('div'); var markerImg = document.createElement('img'); - markerImg.src = this.baseUrl + this.deviceImgUrl; + markerImg.src = this.deviceImgUrl; markerImg.setAttribute('width', '20px'); markerImg.setAttribute('height', '20px'); markerContent.appendChild(markerImg); @@ -537,13 +534,14 @@ export default { } }); }); + console.log('mark', this.deviceProduct); this.deviceProduct.forEach((item) => { if (item.children.length > 0) { let devicePointList = []; item.children.forEach((device) => { let marker = new this.AMap.Marker({ icon: new this.AMap.Icon({ - image: this.baseUrl + device.imgUrl, + image: device.imgUrl, imageSize: new this.AMap.Size(26, 26), }), position: [device.longitude, device.latitude], @@ -889,18 +887,10 @@ export default { opacity: 1; -webkit-transform: scaleX(1); transform: scaleX(1); - -webkit-transition: - opacity 0.3s cubic-bezier(0.23, 1, 0.32, 1), - -webkit-transform 0.3s cubic-bezier(0.23, 1, 0.32, 1); - transition: - opacity 0.3s cubic-bezier(0.23, 1, 0.32, 1), - -webkit-transform 0.3s cubic-bezier(0.23, 1, 0.32, 1); - transition: - transform 0.3s cubic-bezier(0.23, 1, 0.32, 1), - opacity 0.3s cubic-bezier(0.23, 1, 0.32, 1); - transition: - transform 0.3s cubic-bezier(0.23, 1, 0.32, 1), - opacity 0.3s cubic-bezier(0.23, 1, 0.32, 1), + -webkit-transition: opacity 0.3s cubic-bezier(0.23, 1, 0.32, 1), -webkit-transform 0.3s cubic-bezier(0.23, 1, 0.32, 1); + transition: opacity 0.3s cubic-bezier(0.23, 1, 0.32, 1), -webkit-transform 0.3s cubic-bezier(0.23, 1, 0.32, 1); + transition: transform 0.3s cubic-bezier(0.23, 1, 0.32, 1), opacity 0.3s cubic-bezier(0.23, 1, 0.32, 1); + transition: transform 0.3s cubic-bezier(0.23, 1, 0.32, 1), opacity 0.3s cubic-bezier(0.23, 1, 0.32, 1), -webkit-transform 0.3s cubic-bezier(0.23, 1, 0.32, 1); -webkit-transform-origin: center right; transform-origin: center right; diff --git a/src/views/agriculture/mapManager/index.vue b/src/views/agriculture/mapManager/index.vue index 0df2586..a6d1661 100644 --- a/src/views/agriculture/mapManager/index.vue +++ b/src/views/agriculture/mapManager/index.vue @@ -29,7 +29,7 @@ @click="moveTo(item, 2)" >
    - {{ + {{ item.deviceName.length > 10 ? `${item.deviceName.substring(0, 10)}...` : item.deviceName }}
    @@ -72,7 +72,6 @@ export default { }, data() { return { - baseUrl: process.env.VUE_APP_BASE_API, activeIndex1: null, activeName: 'area', total: 0,