Browse Source

修改标题,地图显示顺序

yangtaodemon 2 months ago
parent
commit
e40d4a5e5e
2 changed files with 30 additions and 30 deletions
  1. 1 1
      src/locales/zh.json
  2. 29 29
      src/views/User/cadmiumPrediction/CropCadmiumPrediction.vue

+ 1 - 1
src/locales/zh.json

@@ -175,7 +175,7 @@
     "Title": "土壤镉有效态含量预测"
   },
   "CropCadmiumPrediction": {
-    "Title": "土壤镉作物态含量预测"
+    "Title": "水稻镉含量预测"
   },
   "cropRiskAssessment": {
     "Title": "水稻镉污染风险"

+ 29 - 29
src/views/User/cadmiumPrediction/CropCadmiumPrediction.vue

@@ -48,16 +48,6 @@
       <!-- 地图区域 - 单独一行 -->
       <div class="map-section">
         <h3>水稻Cd预测地图</h3>
-        <div v-if="loadingMap" class="loading-container">
-          <el-icon class="loading-icon"><Loading /></el-icon>
-          <span>地图加载中...</span>
-        </div>
-        <img v-if="mapImageUrl && !loadingMap" :src="mapImageUrl" alt="作物态Cd预测地图" class="map-image">
-        <div v-if="!mapImageUrl && !loadingMap" class="no-data">
-          <el-icon><Picture /></el-icon>
-          <p>暂无地图数据</p>
-        </div>
-
         <div v-if="loadingTownshipMap" class="loading-container">
           <el-icon class="loading-icon"><Loading /></el-icon>
           <span>乡镇地图加载中...</span>
@@ -95,6 +85,16 @@
           <el-icon><Location /></el-icon>
           <p>暂无乡镇边界数据</p>
         </div>
+        <div v-if="loadingMap" class="loading-container">
+          <el-icon class="loading-icon"><Loading /></el-icon>
+          <span>地图加载中...</span>
+        </div>
+        <img v-if="mapImageUrl && !loadingMap" :src="mapImageUrl" alt="作物态Cd预测地图" class="map-image">
+        <div v-if="!mapImageUrl && !loadingMap" class="no-data">
+          <el-icon><Picture /></el-icon>
+          <p>暂无地图数据</p>
+        </div>
+
       </div>
 
        <!-- 统计图表区域 -->
@@ -113,21 +113,7 @@
         </div>
         
         <div v-if="!loadingStats && statisticsData.length" class="stats-container">
-          <!-- 基础统计表格 -->
-          <h4>基础统计信息</h4>
-          <el-table 
-            :data="statisticsData" 
-            style="width: 100%; margin-bottom: 20px;"
-            border
-            stripe
-          >
-            <el-table-column prop="name" label="统计项" min-width="180" />
-            <el-table-column prop="value" label="值" min-width="150" />
-            <el-table-column prop="unit" label="单位" min-width="100" />
-            <el-table-column prop="description" label="描述" min-width="200" />
-          </el-table>
-
-          <!-- 分布统计表格 -->
+           <!-- 分布统计表格 -->
           <h4>水稻镉含量分布统计</h4>
           <el-table 
             :data="distributionData" 
@@ -145,6 +131,20 @@
               </template>
             </el-table-column>
           </el-table>
+          
+          <!-- 基础统计表格 -->
+          <h4>基础统计信息</h4>
+          <el-table 
+            :data="statisticsData" 
+            style="width: 100%; margin-bottom: 20px;"
+            border
+            stripe
+          >
+            <el-table-column prop="name" label="统计项" min-width="180" />
+            <el-table-column prop="value" label="值" min-width="150" />
+            <el-table-column prop="unit" label="单位" min-width="100" />
+            <el-table-column prop="description" label="描述" min-width="200" />
+          </el-table>
         </div>
         
         <div v-if="!loadingStats && !statisticsData.length" class="no-data">
@@ -161,7 +161,7 @@
           <el-icon class="loading-icon"><Loading /></el-icon>
           <span>直方图加载中...</span>
         </div>
-        <img v-if="histogramImageUrl && !loadingHistogram" :src="histogramImageUrl" alt="作物态Cd预测直方图" class="histogram-image">
+        <img v-if="histogramImageUrl && !loadingHistogram" :src="histogramImageUrl" alt="水稻Cd预测直方图" class="histogram-image">
         <div v-if="!histogramImageUrl && !loadingHistogram" class="no-data">
           <el-icon><Histogram /></el-icon>
           <p>暂无直方图数据</p>
@@ -923,7 +923,7 @@ showTooltip(layer, townName, latlng) {
       
       const link = document.createElement('a');
       link.href = URL.createObjectURL(this.mapBlob);
-      link.download = `${this.countyName}_作物态Cd预测地图.jpg`;
+      link.download = `${this.countyName}_水稻Cd预测地图.jpg`;
       link.click();
       URL.revokeObjectURL(link.href);
     },
@@ -937,7 +937,7 @@ showTooltip(layer, townName, latlng) {
       
       const link = document.createElement('a');
       link.href = URL.createObjectURL(this.histogramBlob);
-      link.download = `${this.countyName}_作物态Cd预测直方图.jpg`;
+      link.download = `${this.countyName}_水稻Cd预测直方图.jpg`;
       link.click();
       URL.revokeObjectURL(link.href);
     },
@@ -983,7 +983,7 @@ showTooltip(layer, townName, latlng) {
 
 .township-map-wrapper {
   position: relative;
-  width: 100%;
+  width: 90%;
   max-width: 1000px;
   margin: 15px auto;
   border: 1px solid #e0e0e0;