Merge remote-tracking branch 'origin/master' into ding

# Conflicts:
#	src/components/detectionStatistics/crosscetionStatistics.vue

src/components/atmpollution/atmcompanyline.vue

@@ -189,32 +189,64 @@ onMounted(() => {
 
 /* 最基础的表格样式 */
 .table-container {
-  overflow-x: auto;
-  background-color: white;
+  width: 100%;
+  max-width: 1200px;
+  margin: 0 auto;
+  overflow-x: auto; /* 防止内容溢出 */
 }
+
 .data-table {
-  width: 100%;
-  border-collapse: collapse;
-  border: 1px solid #ccc;
+  border-collapse: collapse; /* 确保边框合并 */
+  border: 1px solid #ccc; /* 表格外边框 */
 }
-.data-table th, .data-table td {
+
+.data-table th, 
+.data-table td {
+  border: 1px solid #ccc; /* 单元格边框 */
   padding: 8px 10px;
   text-align: center;
-  border: 1px solid #ccc;
   font-size: 14px;
 }
+
 .data-table th {
   font-weight: bold;
+  background-color: #f5f5f5; /* 表头背景色 */
 }
-/* 完全移除所有行的背景色和悬停效果 */
-.data-table tr {
-  background-color: transparent;
+
+/* 添加行分隔线效果 */
+.data-table tr:not(:last-child) {
+  border-bottom: 1px solid #e0e0e0; /* 行间分隔线 */
 }
-.data-table tr:hover {
-  background-color: transparent;
+
+/* 列宽分配 */
+.data-table th:nth-child(1),
+.data-table td:nth-child(1) { width: 10%; }/**污染源序号 */
+.data-table th:nth-child(2),
+.data-table td:nth-child(2) { width: 28%; }/**公司名 */
+.data-table th:nth-child(3),
+.data-table td:nth-child(3) { width: 16%; }/**类型 */
+.data-table th:nth-child(4),
+.data-table td:nth-child(4) { width: 10%; }/**位置区县 */
+.data-table th:nth-child(5),
+.data-table td:nth-child(5) { width: 12%; }/**颗粒物排放数据 */
+.data-table th:nth-child(6),
+.data-table td:nth-child(6) { width: 11%; }/**经度 */
+.data-table th:nth-child(7),
+.data-table td:nth-child(7) { width: 11%; }/**纬度 */
+
+/* 内容换行处理 */
+.data-table td {
+  word-wrap: break-word; /* 长内容自动换行 */
+  padding: 8px 5px; /* 调整内边距 */
 }
-.empty-state {
-  padding: 20px 0;
-  color: #666;
+
+/* 移动端适配 */
+@media (max-width: 768px) {
+  .table-container {
+    padding: 10px 0;
+  }
+  .data-table {
+    font-size: 13px; /* 缩小字体 */
+  }
 }
 </style>

src/components/atmpollution/heavyMetalEnterprisechart.vue

@@ -155,11 +155,11 @@ const processData = (features) => {
     data: validRegions.map(region => {
       if (region === '全市平均') {
         return globalStats[field].count 
-          ? (globalStats[field].sum / globalStats[field].count) 
+          ? (globalStats[field].sum / globalStats[field].count).toFixed(5)
           : 0;
       }
       return regionStats[region][field].count 
-        ? (regionStats[region][field].sum / regionStats[region][field].count) 
+        ? (regionStats[region][field].sum / regionStats[region][field].count).toFixed(5) 
         : 0;
     }),
     itemStyle: { 

src/components/cdStatictics/refluxcdStatictics.vue

@@ -11,13 +11,13 @@ import { ref, onMounted, onUnmounted, nextTick } from 'vue'
 import * as echarts from 'echarts' 
 
 const indicators = [
-  { key: 'Al3_plus', name: 'Al3_plus', color: '#3498db' },
-  { key: 'CEC', name: 'CEC', color: '#2ecc71' },
-  { key: 'CL', name: 'CL', color: '#e74c3c' },
+  //{ key: 'Al3_plus', name: 'Al3_plus', color: '#3498db' },
+  //{ key: 'CEC', name: 'CEC', color: '#2ecc71' },
+//  { key: 'CL', name: 'CL', color: '#e74c3c' },
   { key: 'Delta_pH', name: 'Delta_pH', color: '#f39c12' },
-  { key: 'H_plus', name: 'H_plus', color: '#9b59b6' },
-  { key: 'N', name: 'N', color: '#1abc9c' },
-  { key: 'OM', name: 'OM', color: '#d35400' }
+  //{ key: 'H_plus', name: 'H_plus', color: '#9b59b6' },
+  //{ key: 'N', name: 'N', color: '#1abc9c' },
+  //{ key: 'OM', name: 'OM', color: '#d35400' }
 ];
 
 let chart = ref(null) // 存储 ECharts 实例

src/components/detectionStatistics/crosscetionStatistics.vue

@@ -265,20 +265,6 @@ export default {
 </script>
 
 <style>
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-  font-family: 'Segoe UI', 'Microsoft YaHei', sans-serif;
-}
-
-body {
-  background: #f8fafc;
-  color: #3498db;
-  min-height: 100vh;
-  padding: 0px;
-}
-
 /* 固定组件总高度为350px */
 .dashboard {
   width: 100%;

src/components/irrpollution/crossSetionData1.vue

@@ -109,7 +109,7 @@ const calculateRiverAvg = () => {
     const avg = riverGroups[river].total / riverGroups[river].count;
     riverAvg.push({
       river,
-      avg: parseFloat(avg) // 保留3位小数
+      avg: parseFloat(avg).toFixed(6)  //保留6位小数
     });
     totalAll += riverGroups[river].total;
     countAll += riverGroups[river].count;
@@ -118,7 +118,7 @@ const calculateRiverAvg = () => {
   // 添加总平均值
   const totalAvg = {
     river: '总河流平均',
-    avg: parseFloat((totalAll / countAll))
+    avg: parseFloat((totalAll / countAll)).toFixed(6)
   };
   riverAvg.push(totalAvg);
 

src/components/irrpollution/crossSetionData2.vue

@@ -79,7 +79,7 @@ const calculateDistrictAvg = () => {
     const avg = districtGroups[district].total / districtGroups[district].count;
     districtAvg.push({
       district,
-      avg: parseFloat(avg) // 保留3位小数
+      avg: parseFloat(avg).toFixed(6)
     });
     totalAll += districtGroups[district].total;
     countAll += districtGroups[district].count;
@@ -88,7 +88,7 @@ const calculateDistrictAvg = () => {
   // 添加总平均值（最后一项）
   districtAvg.push({
     district: '总平均',
-    avg: parseFloat((totalAll / countAll))
+    avg: parseFloat((totalAll / countAll)).toFixed(6)
   });
 
   state.districtAvgData = districtAvg;

src/components/irrpollution/irrwatermap.vue

@@ -148,11 +148,11 @@ onMounted(() => {
                         </thead>
                         <tbody>
                           <tr><td>Ph</td><td>${props.ph_value || '未知'}</td></tr>
-                          <tr><td>铬(Cr)</td><td>${props.cr_concentration || '未知'}</td></tr>
-                          <tr><td>砷(As)</td><td>${props.as_concentration || '未知'}</td></tr>
-                          <tr><td>镉(Cd)</td><td>${props.cd_concentration || '未知'}</td></tr>
-                          <tr><td>汞(Hg)</td><td>${props.hg_concentration || '未知'}</td></tr>
-                          <tr><td>铅(Pb)</td><td>${props.pb_concentration || '未知'}</td></tr>
+                          <tr><td>铬(Cr)(ug/L)</td><td>${props.cr_concentration.toFixed(6)|| '未知'}</td></tr>
+                          <tr><td>砷(As)(ug/L)</td><td>${props.as_concentration.toFixed(6) || '未知'}</td></tr>
+                          <tr><td>镉(Cd)(ug/L)</td><td>${props.cd_concentration.toFixed(6) || '未知'}</td></tr>
+                          <tr><td>汞(Hg)(ug/L)</td><td>${props.hg_concentration.toFixed(6) || '未知'}</td></tr>
+                          <tr><td>铅(Pb)(ug/L)</td><td>${props.pb_concentration.toFixed(6) || '未知'}</td></tr>
                         </tbody>
                       </table>
                     </div>

src/views/User/HmOutFlux/irrigationWater/crossSection.vue

@@ -42,12 +42,6 @@
         <div class="section-header">
           <div class="section-icon">📈</div>
           <h2 class="component-title">河流Cd浓度分析</h2>
-          <div class="analysis-legend">
-            <div class="legend-item">
-              <div class="legend-color cadmium"></div>
-              <span>镉(Cd)浓度</span>
-            </div>
-          </div>
         </div>
         <div class="dashboard-card chart-card">
           <div class="chart-header">
@@ -65,12 +59,6 @@
         <div class="section-header">
           <div class="section-icon">📉</div>
           <h2 class="component-title">区县Cd浓度分析</h2>
-          <div class="analysis-legend">
-            <div class="legend-item">
-              <div class="legend-color cadmium"></div>
-              <span>镉(Cd)浓度</span>
-            </div>
-          </div>
         </div>
         <div class="dashboard-card chart-card">
           <div class="chart-header">

src/views/User/HmOutFlux/irrigationWater/samplingMethodDevice1.vue

@@ -20,15 +20,7 @@
         
         <div class="image-gallery">
           <div class="image-card">
-            <el-image :src="image1" alt="采样容器" class="sampling-image"></el-image>
-            <div class="image-info">
-              <h3>采样容器</h3>
-              <p>500mL白色聚乙烯瓶，符合水质采样标准</p>
-            </div>
-          </div>
-          
-          <div class="image-card">
-            <el-image :src="image2" alt="采样现场" class="sampling-image"></el-image>
+            <el-image :src="image1" alt="采样现场" class="sampling-image"></el-image>
             <div class="image-info">
               <h3>采样现场</h3>
               <p>河流环境采样，多云天气条件下进行</p>
@@ -36,12 +28,20 @@
           </div>
           
           <div class="image-card">
-            <el-image :src="image3" alt="灌溉水采样设备" class="sampling-image"></el-image>
+            <el-image :src="image2" alt="灌溉水采样设备" class="sampling-image"></el-image>
             <div class="image-info">
               <h3>灌溉水采样设备</h3>
               <p>专业水质采样设备，确保样品完整性</p>
             </div>
           </div>
+    
+          <div class="image-card">
+            <el-image :src="image3" alt="采样容器" class="sampling-image"></el-image>
+            <div class="image-info">
+              <h3>采样容器</h3>
+              <p>500mL白色聚乙烯瓶，符合水质采样标准</p>
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -84,24 +84,24 @@
           <div class="field-card">
             <el-image :src="fieldImage1" alt="工作人员采样现场" class="sampling-image"></el-image>
             <div class="field-info">
-              <h3>河流采样现场</h3>
-              <p>多云天气下的河流采样工作</p>
+              <!--<h3>河流采样现场</h3>
+              <p>多云天气下的河流采样工作</p>-->
             </div>
           </div>
           
           <div class="field-card">
             <el-image :src="fieldImage2" alt="工作人员采样现场" class="sampling-image"></el-image>
             <div class="field-info">
-              <h3>水渠采样现场</h3>
-              <p>小雨天气下的水渠采样工作</p>
+              <!--<h3>水渠采样现场</h3>
+              <p>小雨天气下的水渠采样工作</p>-->
             </div>
           </div>
           
           <div class="field-card">
             <el-image :src="fieldImage3" alt="工作人员采样现场" class="sampling-image"></el-image>
             <div class="field-info">
-              <h3>瀑布区域采样</h3>
-              <p>特殊地形条件下的采样工作</p>
+              <!--<h3>瀑布区域采样</h3>
+              <p>特殊地形条件下的采样工作</p>-->
             </div>
           </div>
         </div>