diff --git a/src/views/gdMap/livestockData.js b/src/views/gdMap/livestockData.js index 772701a..99bea77 100644 --- a/src/views/gdMap/livestockData.js +++ b/src/views/gdMap/livestockData.js @@ -1,6 +1,6 @@ // Data mapped from cxph-jgpt real system screens and static data files. export const YAK_STOCK_TOTAL = 458230; -export const YAK_DRONE_RECOGNITION_TOTAL = 450230; +export const YAK_DRONE_RECOGNITION_TOTAL = 450817; export const YAK_EXPERT_CORRECTION = YAK_STOCK_TOTAL - YAK_DRONE_RECOGNITION_TOTAL; function scaleCountRowsToTotal(rows, total, key = "count") { diff --git a/src/views/yakManagement/data.js b/src/views/yakManagement/data.js index d421dfe..1a41619 100644 --- a/src/views/yakManagement/data.js +++ b/src/views/yakManagement/data.js @@ -1,6 +1,8 @@ import { townRecognitionRows, tradeImpactRows as baseTradeImpactRows, + YAK_DRONE_RECOGNITION_TOTAL, + YAK_EXPERT_CORRECTION, YAK_STOCK_TOTAL, yakForecastRows, } from "@/views/gdMap/livestockData" @@ -10,8 +12,8 @@ export { yakForecastRows, } -export const recognitionTotal = YAK_STOCK_TOTAL -export const expertCorrection = 0 +export const recognitionTotal = YAK_DRONE_RECOGNITION_TOTAL +export const expertCorrection = YAK_EXPERT_CORRECTION export const tradeDeduction = 0 export const estimatedStock = YAK_STOCK_TOTAL @@ -132,7 +134,7 @@ export function getForecastStructureRows(period) { } export function getTownForecastRows(period) { - const scale = period.stock / recognitionTotal + const scale = period.stock / estimatedStock const rows = townRows.map((item, index) => ({ ...item, forecast: Math.round(item.count * scale + (index % 3 - 1) * period.months * 18),