大屏地图，土壤信息详情，展示字段变更

bigScreen3/src/views/dashboard/cpns/EquipmentDetail.vue

@@ -9,7 +9,7 @@
 
       
       <!-- 左侧设备信息区域 -->
-      <div class="equipment-info-section">
+      <div class="equipment-info-section" v-if="equipmentData.typeName!=='土壤检测'">
         <h3 class="section-title">• 设备基本信息</h3>
         <div class="info-content">
           <div class="info-grid">
@@ -64,9 +64,66 @@
           </div>
         </div>
       </div>
-
+      <!-- 土壤检测信息区域 -->
+        <div v-if="equipmentData.typeName === '土壤检测'" class="equipment-info-section">
+          <h3 class="section-title">• 土壤检测数据</h3>
+          <div class="info-grid">
+            <div class="info-item">
+              <span class="info-label">当前电导率：</span>
+              <span class="info-value">{{ equipmentData.soilConductivity || '' }} (us/cm)</span>
+            </div>
+            <div class="info-item">
+              <span class="info-label">当前空气温度：</span>
+              <span class="info-value">{{ equipmentData.airTemperature || '' }} (C)</span>
+            </div>
+            <div class="info-item">
+              <span class="info-label">当前空气湿度：</span>
+              <span class="info-value">{{ equipmentData.airHumidity || '' }} (%RH)</span>
+            </div>
+            <div class="info-item">
+              <span class="info-label">当前电池电压：</span>
+              <span class="info-value">{{ equipmentData.batteryVoltage || '' }} (V)</span>
+            </div>
+            <div class="info-item">
+              <span class="info-label">当前负氧离子：</span>
+              <span class="info-value">{{ equipmentData.negativeOxygen || '' }} (个/cm3)</span>
+            </div>
+            <div class="info-item">
+              <span class="info-label">当前盐分：</span>
+              <span class="info-value">{{ equipmentData.salt || '' }} (mg/L)</span>
+            </div>
+            <div class="info-item">
+              <span class="info-label">当前pm2.5：</span>
+              <span class="info-value">{{ equipmentData.pm25 || '' }} (ug/m2)</span>
+            </div>
+            <div class="info-item">
+              <span class="info-label">当前土壤ph：</span>
+              <span class="info-value">{{ equipmentData.soilPh || '' }}</span>
+            </div>
+            <div class="info-item">
+              <span class="info-label">当前电量：</span>
+              <span class="info-value">{{ equipmentData.electricity || equipmentData.dlValue || '' }} (%)</span>
+            </div>
+            <div class="info-item">
+              <span class="info-label">当前土壤温度：</span>
+              <span class="info-value">{{ equipmentData.wdValue || '' }} (°C)</span>
+            </div>
+            <div class="info-item">
+              <span class="info-label">当前土壤湿度：</span>
+              <span class="info-value">{{ equipmentData.sdValue || '' }} (%)</span>
+            </div>
+            <div class="info-item">
+              <span class="info-label">当前电压：</span>
+              <span class="info-value">{{ equipmentData.dyValue || equipmentData.batteryVoltage || '' }} (V)</span>
+            </div>
+            <div class="info-item full-width">
+              <span class="info-label">采集时间：</span>
+              <span class="info-value">{{ equipmentData.cjTime || '' }}</span>
+            </div>
+          </div>
+        </div>
       <!-- 右侧设备图片区域 -->
-      <div class="equipment-image-section">
+      <div class="equipment-image-section" v-if="equipmentData.images && equipmentData.images.length > 0">
         <h3 class="section-title">• 设备图片</h3>
         <div class="image-container">
           <div class="image-scroll-area">

bigScreen3/src/views/dashboard/cpns/SmartOperation.vue

@@ -277,8 +277,7 @@
       :style="{
         left: popupPosition.x + 'px',
         top: popupPosition.y + 'px'
-      }"
-    >
+      }">
       <div class="popup-header">
         <h3>{{ popupData.name || popupData.typeName || '详情信息' }}</h3>
         <span class="popup-close" @click="closePopup">&times;</span>