From 2fa84b7e934bc90ac6957d8e38f726ee5df609f2 Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 15 Jul 2024 09:02:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/AppCarouselList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) } }) }, From 0e9f702cbf9051b5f579b696088a0f4b600ae658 Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 15 Jul 2024 09:51:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8D=E5=93=8D=E5=BA=94=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/AppStoreKeyGoods.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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], From 8a55325ee9eccf2d711c43679778dbf9a8f0724b Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 15 Jul 2024 11:06:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2tab?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=92=8C=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/AppStoresTable.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/AppStoresTable.vue b/src/views/AppStoresTable.vue index 8f0511b..ebfbb01 100644 --- a/src/views/AppStoresTable.vue +++ b/src/views/AppStoresTable.vue @@ -151,8 +151,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 From 69390ca33e65ccb2c348c687d506c23fc8225fe4 Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 15 Jul 2024 16:36:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=94=80=E5=94=AE?= =?UTF-8?q?=E6=9C=BA=E4=BC=9A,=E5=B9=B6=E5=A2=9E=E5=8A=A0=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E6=95=B0=E6=8D=AE=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/AppThreeMap.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 || [] From d13b87364fc5459914cbce7959fa950125168eaa Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 16 Jul 2024 12:16:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=92=8C=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/AppKeyGoods.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"},