From 52cb6b74d5e793dc38fc3ca0b16834c59fecf8ca Mon Sep 17 00:00:00 2001
From: LYFxiaoan <lyfxinchen@163.com>
Date: Wed, 23 Jul 2025 10:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81=E9=A2=84=E6=B5=8B=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=A8=A1=E5=9E=8B=E6=94=B9=E5=88=97=E8=A1=A8=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prediction/ProductPredictionView.vue      | 100 ++++++++++--------
 prediction_history.db                         | Bin 233472 -> 266240 bytes
 server/api.py                                 |   8 +-
 3 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/UI/src/views/prediction/ProductPredictionView.vue b/UI/src/views/prediction/ProductPredictionView.vue
index 279d38f..ad19c34 100644
--- a/UI/src/views/prediction/ProductPredictionView.vue
+++ b/UI/src/views/prediction/ProductPredictionView.vue
@@ -44,25 +44,7 @@
           </el-row>
 
           <el-row :gutter="20" v-if="form.model_type">
-            <el-col :span="5">
-              <el-form-item label="模型版本">
-                <el-select
-                  v-model="form.version"
-                  placeholder="选择版本"
-                  style="width: 100%"
-                  :disabled="!availableVersions.length"
-                  :loading="versionsLoading"
-                >
-                  <el-option
-                    v-for="version in availableVersions"
-                    :key="version"
-                    :label="version"
-                    :value="version"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
+            <el-col :span="6">
               <el-form-item label="预测天数">
                 <el-input-number
                   v-model="form.future_days"
@@ -72,7 +54,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="6">
               <el-form-item label="历史天数">
                 <el-input-number
                   v-model="form.history_lookback_days"
@@ -82,7 +64,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="6">
               <el-form-item label="起始日期">
                 <el-date-picker
                   v-model="form.start_date"
@@ -95,7 +77,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="6">
               <el-form-item label="预测分析">
                 <el-switch
                   v-model="form.analyze_result"
@@ -108,17 +90,45 @@
         </el-form>
       </div>
 
-      <div class="prediction-actions">
-        <el-button
-          type="primary"
-          size="large"
-          @click="startPrediction"
-          :loading="predicting"
-          :disabled="!canPredict"
-        >
-          <el-icon><TrendCharts /></el-icon>
-          开始预测
-        </el-button>
+      <div v-if="availableVersions.length > 0" class="versions-list-section">
+        <h4>📦 可用模型版本</h4>
+        <el-table :data="availableVersions" style="width: 100%" v-loading="versionsLoading">
+          <el-table-column prop="product_name" label="药品名称" width="220"></el-table-column>
+          <el-table-column prop="version" label="版本号" width="180"></el-table-column>
+          <el-table-column prop="created_at" label="创建时间" width="200">
+             <template #default="{ row }">
+              {{ new Date(row.created_at).toLocaleString() }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="metrics.mae" label="MAE">
+            <template #default="{ row }">
+              {{ row.metrics && row.metrics.mae ? row.metrics.mae.toFixed(4) : 'N/A' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="metrics.rmse" label="RMSE">
+             <template #default="{ row }">
+              {{ row.metrics && row.metrics.rmse ? row.metrics.rmse.toFixed(4) : 'N/A' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="metrics.mape" label="MAPE (%)">
+             <template #default="{ row }">
+              {{ row.metrics && row.metrics.mape ? (row.metrics.mape * 100).toFixed(2) : 'N/A' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="150">
+            <template #default="{ row }">
+              <el-button
+                type="primary"
+                size="small"
+                @click="startPrediction(row.version)"
+                :loading="predicting && form.version === row.version"
+              >
+                <el-icon><TrendCharts /></el-icon>
+                开始预测
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
       </div>
     </el-card>
 
@@ -162,9 +172,7 @@ const form = reactive({
   analyze_result: true
 })
 
-const canPredict = computed(() => {
-  return form.product_id && form.model_type && form.version
-})
+
 
 const fetchModelTypes = async () => {
   try {
@@ -188,9 +196,7 @@ const fetchAvailableVersions = async () => {
     const response = await axios.get(url)
     if (response.data.status === 'success') {
       availableVersions.value = response.data.data.versions || []
-      if (response.data.data.latest_version) {
-        form.version = response.data.data.latest_version
-      }
+      // No longer setting a default version, the user will choose from the list.
     }
   } catch (error) {
     availableVersions.value = []
@@ -203,26 +209,29 @@ const handleProductChange = () => {
   form.model_type = ''
   form.version = ''
   availableVersions.value = []
+  predictionResult.value = null;
 }
 
 const handleModelTypeChange = () => {
   form.version = ''
+  availableVersions.value = []
+  predictionResult.value = null;
   fetchAvailableVersions()
 }
 
-const startPrediction = async () => {
+const startPrediction = async (version) => {
+  form.version = version; // Keep track of which version is running
   try {
     predicting.value = true
     const payload = {
       product_id: form.product_id,
       model_type: form.model_type,
-      version: form.version,
+      version: version,
       future_days: form.future_days,
       history_lookback_days: form.history_lookback_days,
       start_date: form.start_date,
       include_visualization: form.analyze_result,
     }
-    // Corrected API endpoint from /api/predict to /api/prediction
     const response = await axios.post('/api/prediction', payload)
     if (response.data.status === 'success') {
       // The backend response may have history_data and prediction_data at the top level
@@ -382,13 +391,14 @@ watch([() => form.product_id, () => form.model_type], () => {
 .model-selection-section h4 {
   margin-bottom: 16px;
 }
-.prediction-actions {
-  display: flex;
-  justify-content: center;
+.versions-list-section {
   margin-top: 20px;
   padding-top: 20px;
   border-top: 1px solid #ebeef5;
 }
+.versions-list-section h4 {
+  margin-bottom: 16px;
+}
 .prediction-chart {
   margin-top: 20px;
 }
diff --git a/prediction_history.db b/prediction_history.db
index 6544b32acf4fae70517e61cc3b1f8c10c8f2c224..1f58e6f181720c8a0ed302850b3742fbee0d310c 100644
GIT binary patch
delta 8821
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

delta 282
zcmV+#0p<RHpb&td4v-rKMgRZ+Igubg0Y<T4qz?!$4;26a0023Y3=m$k5io=Wv+k8A
z36m8c?|(rBm;eY-4>S$K1``K_2q+5*3b+Re295}N57-Xk4!H}353dLR4+{sa3F{5)
z1?mek40{H*4~7kK2_6We3KR*M4M+(`1(*o+4Vnx93)crS2i68W2U`za3@Hw03Ox>x
z49yCU3tSB!3gHRD2+R&X4iyZf1;Gqb2H*_#3kR+SWeR2qaI=9B4g~}#162W+aD@XT
zv%n=k8UaDFKm;HbK??c+56BLl4p|OH4FnAF4BiWJ3ty8QU_z5<U?L0;eh-ljH49D)
gJqs+e5ioEHlhJJ$gA!|p5^Dj65^Dmt5^DqQBqxzglmGw#

diff --git a/server/api.py b/server/api.py
index 58f7808..7ce4ff8 100644
--- a/server/api.py
+++ b/server/api.py
@@ -3536,15 +3536,17 @@ def get_model_versions_api(product_id, model_type):
         result = model_manager.list_models(product_id=product_id, model_type=model_type)
         models = result.get('models', [])
         
-        versions = sorted(list(set(m['version'] for m in models)), key=lambda v: (v != 'best', v))
-        latest_version = versions[0] if versions else None
+        # Sort models: 'best' version first, then by creation date descending
+        models.sort(key=lambda x: (x.get('version') != 'best', x.get('created_at', '')), reverse=True)
+        
+        latest_version = models[0]['version'] if models else None
 
         return jsonify({
             "status": "success",
             "data": {
                 "product_id": product_id,
                 "model_type": model_type,
-                "versions": versions,
+                "versions": models,  # Return the full list of model details
                 "latest_version": latest_version
             }
         })