add:添加开发日志0309

wms/nladmin-ui/src/views/wms/biBoard/screen/index.vue

@@ -68,7 +68,7 @@
                     {{ getAgvStatusText(agv.status) }}
                   </div>
                   <div class="agv-task">当前任务：{{ agv.taskCode || '无' }}</div>
-                  <div class="agv-battery">电量：{{ agv.battery || 0 }}%</div>
+                  <div class="agv-battery">电量：{{ agv.power || 0 }}%</div>
                 </div>
               </div>
             </div>
@@ -95,7 +95,9 @@
             <el-radio-button label="week">本周</el-radio-button>
           </el-radio-group>
         </div>
-        <div class="detail-list scroll-list">
+        <div class="detail-list scroll-list" style="
+        width: 370px;
+        height: 250px;">
           <div v-for="(item, index) in displayIosReportData" :key="index" class="detail-item">
             <div class="detail-time">{{ item.confirmTime }}</div>
             <div class="detail-type" :class="item.iosType === '领料' ? 'type-out' : 'type-in'">
@@ -113,7 +115,9 @@
         </div>
 
         <div class="panel-title">当日领退明细</div>
-        <div class="detail-list scroll-list">
+        <div class="detail-list scroll-list" style="
+        width: 370px;
+        height: 250px;">
           <div v-for="(item, index) in displayTodayDetailList" :key="index" class="detail-item">
             <div class="detail-time">{{ item.confirmTime }}</div>
             <div class="detail-type" :class="item.iosType === '领料' ? 'type-out' : 'type-in'">
@@ -266,7 +270,7 @@ export default {
           url: '/api/screen/agvStatus',
           method: 'get'
         })
-        this.agvList = res.agvList || []
+        this.agvList = res || []
       } catch (error) {
         console.error('加载AGV状态失败', error)
       }
@@ -362,13 +366,15 @@ export default {
 
     getAgvStatusClass(status) {
       if (!status) return 'status-idle'
-      if (status.status === '正常') return 'status-normal'
-      if (status.status === '故障') return 'status-error'
+      if (status.status === '1') return 'status-normal'
+      if (status.status === '2') return 'status-error'
       return 'status-idle'
     },
 
     getAgvStatusText(status) {
-      return status ? status.status || '空闲' : '空闲'
+      if (status === '1') return '运行中'
+      if (status === '2') return '故障'
+      return '空闲'
     },
 
     initStructChart() {
@@ -386,6 +392,10 @@ export default {
           top: 'center',
           textStyle: {
             color: '#fff'
+          },
+          formatter: function(name) {
+            const item = option.series[0].data.find(d => d.name === name)
+            return name + ': ' + (item ? item.value : 0)
           }
         },
         series: [
@@ -399,7 +409,8 @@ export default {
               { value: data.noGoods || 0, name: '无货', itemStyle: { color: '#fac858' }}
             ],
             label: {
-              color: '#fff'
+              color: '#fff',
+              formatter: '{b}: {c}\n({d}%)'
             }
           }
         ]
@@ -413,16 +424,24 @@ export default {
 
       const times = this.tempData.map(item => item.time)
       const temps = this.tempData.map(item => item.temperature)
+      const humidities = this.tempData.map(item => item.humidity)
 
       const option = {
         tooltip: {
           trigger: 'axis'
         },
+        legend: {
+          data: ['温度', '湿度'],
+          textStyle: {
+            color: '#fff'
+          },
+          top: 0
+        },
         grid: {
           left: '3%',
           right: '4%',
           bottom: '3%',
-          top: '10%',
+          top: '15%',
           containLabel: true
         },
         xAxis: {
@@ -439,6 +458,7 @@ export default {
         },
         series: [
           {
+            name: '温度',
             data: temps,
             type: 'line',
             smooth: true,
@@ -449,6 +469,19 @@ export default {
                 { offset: 1, color: 'rgba(238, 102, 102, 0.1)' }
               ])
             }
+          },
+          {
+            name: '湿度',
+            data: humidities,
+            type: 'line',
+            smooth: true,
+            itemStyle: { color: '#5470c6' },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(84, 112, 198, 0.5)' },
+                { offset: 1, color: 'rgba(84, 112, 198, 0.1)' }
+              ])
+            }
           }
         ]
       }
@@ -687,7 +720,7 @@ export default {
 }
 
 .chart-container {
-  margin-bottom: 30px;
+  margin-bottom: 20px;
 }
 
 .warehouse-3d {
@@ -833,8 +866,8 @@ export default {
   .detail-item {
     display: flex;
     align-items: center;
-    padding: 10px;
-    margin-bottom: 10px;
+    padding: 6px;
+    margin-bottom: 6px;
     background: rgba(0, 50, 100, 0.4);
     border: 1px solid rgba(30, 144, 255, 0.2);
     border-radius: 4px;

wms/nladmin-ui/src/views/wms/biBoard/temp/index.vue

@@ -40,6 +40,7 @@
         <el-table-column prop="recordDatee" label="日期" />
         <el-table-column prop="recordTimee" label="记录时间" />
         <el-table-column prop="temp" label="温度℃" />
+        <el-table-column prop="humidity" label="湿度%" />
         <el-table-column prop="recorder" label="记录人" />
       </el-table>
       <!--分页组件-->