diff --git a/src/views/AppCarouselList.vue b/src/views/AppCarouselList.vue index f28fde2..a577866 100644 --- a/src/views/AppCarouselList.vue +++ b/src/views/AppCarouselList.vue @@ -108,7 +108,7 @@ export default { }).then(res => { if (res?.data) { this.storeKeyGoods = res.data - this.$storeBoard.storeKeyGoods = res.data + this.$set(this.$storeBoard, 'storeKeyGoods', res.data) } }) }, diff --git a/src/views/AppKeyGoods.vue b/src/views/AppKeyGoods.vue index 3d5e0cb..f27384b 100644 --- a/src/views/AppKeyGoods.vue +++ b/src/views/AppKeyGoods.vue @@ -6,8 +6,8 @@ export default { return { tableData: [], columns: [ - {label: "重点单品", prop: "goodsCategoryName"}, - {label: "销售额", prop: "saleNum", width: 70}, + {label: "重点单品", prop: "goodsName"}, + {label: "销售数量", prop: "saleNum", width: 70}, {label: "库存数量", prop: "stockNum", width: 70}, {label: "销售目标", prop: "targetSaleNum", width: 70}, {label: "销售达成", prop: "saleAchieveRate"}, diff --git a/src/views/AppStoreKeyGoods.vue b/src/views/AppStoreKeyGoods.vue index e058f82..e84070a 100644 --- a/src/views/AppStoreKeyGoods.vue +++ b/src/views/AppStoreKeyGoods.vue @@ -4,6 +4,7 @@ export default { label: "表格", data() { return { + tableData: [], columns: [ {label: "重点单品", prop: "goodsName"}, {label: "当日目标", prop: "targetNum", width: 70}, @@ -15,7 +16,6 @@ export default { } }, computed: { - tableData: v => v.$storeBoard.storeKeyGoods || [], tableConfig: v => { return { headerBGC: 'rgba(13, 48, 99, 0.6)', rowNum: 9, @@ -28,6 +28,13 @@ export default { } }, }, + watch: { + $storeBoard: { + deep: true, immediate: true, handler(v) { + this.tableData = v.storeKeyGoods || [] + } + } + }, methods: { openNearbyStores({rowIndex}) { const {thirdGoodsCode} = this.tableData[rowIndex], diff --git a/src/views/AppStoresTable.vue b/src/views/AppStoresTable.vue index 639aee9..e4fec75 100644 --- a/src/views/AppStoresTable.vue +++ b/src/views/AppStoresTable.vue @@ -149,8 +149,8 @@ export default { }) }, gotoDetail(store) { - $glob.group = "a90522ef-869b-40ea-8542-d1fc9674a1e8" - this.$storeBoard.query.storeCode = store.storeCode + this.$storeBoard.search.storeCode = store.storeCode + this.$marketBoard.screenId = 'a90522ef-869b-40ea-8542-d1fc9674a1e8' }, getTableData(item = {}, tag) { const v = this diff --git a/src/views/AppThreeMap.vue b/src/views/AppThreeMap.vue index 1f702c7..3621d20 100644 --- a/src/views/AppThreeMap.vue +++ b/src/views/AppThreeMap.vue @@ -357,7 +357,7 @@ export default { showHoverPanel({data: marker, position} = {}) { this.hoverPanelElement.style.opacity = '1' - this.hoverPanelElement.innerHTML = [marker.storeName, `现烤库存金额:${marker.bakeStockAmt}`, `现烤销售机会:${marker.bakeStockAmt}`].join('
') + this.hoverPanelElement.innerHTML = [marker.storeName, `现烤库存金额:${marker.bakeStockAmt}`, `现烤销售机会:${marker.preSaleNum}`].join('
') this.hoverPanel.scale.set(...Array(3).fill(0.04)) this.hoverPanel.rotation.z = Math.PI / 2 this.hoverPanel.rotation.y = Math.PI / 6 @@ -369,10 +369,10 @@ export default { }, getData() { const {$http, $waitFor} = window - const {groupCodeList, currentDate} = this.search + const {groupCodeList, currentDate, hourNum} = this.search return $waitFor($http).then(() => Promise.all([ $http.post("/data-boot/la/screen/marketBoard/storeReport", { - groupCodeList, currentDate + groupCodeList, currentDate, hourNum }).then(res => { if (res?.data) { return this.layers = res.data || []