From 8640a7f8edd67e2caad7ac00eb3847f00c3eb4ae Mon Sep 17 00:00:00 2001
From: xhf <1424913779@qq.com>
Date: Thu, 27 Feb 2025 09:10:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B4=E4=BD=93=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E5=92=8C=E5=BC=82=E5=B8=B8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/board/allBoard/index.vue | 38 +++++++++++++++++++++++-------
 src/views/carError/index.vue       |  2 +-
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/views/board/allBoard/index.vue b/src/views/board/allBoard/index.vue
index 4ccaecd4..0a121d19 100644
--- a/src/views/board/allBoard/index.vue
+++ b/src/views/board/allBoard/index.vue
@@ -5,29 +5,29 @@
       <el-col :span="12">
         <div class="grid-content ep-bg-purple">
           <el-card style="max-width: 100%">
-            <el-row :gutter="5">
+            <el-row :gutter="5" v-if="data.taskStatusVO">
               <el-col :span="4">
                 <div class="top-item">
                   <div class="top-item-title"> 任务总数 </div>
-                  <div class="top-item-num"> {{ data.tasksNumber || 0 }} </div>
+                  <div class="top-item-num"> {{ data.taskStatusVO.tasksNumber || 0 }} </div>
                 </div>
               </el-col>
               <el-col :span="4">
                 <div class="top-item">
                   <div class="top-item-title"> 执行中 </div>
-                  <div class="top-item-num"> {{ data.underwayNum || 0 }} </div>
+                  <div class="top-item-num"> {{ data.taskStatusVO.underwayNum || 0 }} </div>
                 </div>
               </el-col>
               <el-col :span="4">
                 <div class="top-item">
                   <div class="top-item-title"> 待执行 </div>
-                  <div class="top-item-num"> {{ data.pendingExecutionNum || 0 }} </div>
+                  <div class="top-item-num"> {{ data.taskStatusVO.pendingExecutionNum || 0 }} </div>
                 </div>
               </el-col>
               <el-col :span="4">
                 <div class="top-item">
                   <div class="top-item-title"> 已完成 </div>
-                  <div class="top-item-num"> {{ data.completedNum || 0 }} </div>
+                  <div class="top-item-num"> {{ data.taskStatusVO.completedNum || 0 }} </div>
                 </div>
               </el-col>
               <el-col :span="4">
@@ -41,7 +41,7 @@
               <el-col :span="4">
                 <div class="top-item" style="border: none; color: #c60606">
                   <div class="top-item-title"> 异常 </div>
-                  <div class="top-item-num"> {{ data.abnormalNum || 0 }} </div>
+                  <div class="top-item-num"> {{ data.taskStatusVO.abnormalNum || 0 }} </div>
                 </div>
               </el-col>
             </el-row>
@@ -51,7 +51,7 @@
       <el-col :span="12">
         <div class="grid-content ep-bg-purple">
           <el-card style="max-width: 100%">
-            <el-row :gutter="5">
+            <el-row :gutter="5" v-if="data.statistics">
               <el-col :span="4">
                 <div class="top-item">
                   <div class="top-item-title"> 车辆总数 </div>
@@ -315,7 +315,29 @@ const router = useRouter() // 路由对象
 const indexPageRef = ref(null)
 const typeList = ref([])
 defineOptions({ name: 'BoardAllBoard' })
-const data = ref(null)
+const data = ref({
+  taskStatusVO: { //顶部左边统计
+    pendingExecutionNum: 0,
+    underwayNum: 0,
+    completedNum: 0,
+    cancelledNum: 0,
+    abnormalNum: 0,
+    tasksNumber: 0,
+  },
+  statistics: { //顶部右边 统计
+    total: 0,
+    inTask: 0,
+    doLock: 0,
+    charge: 0,
+    offline: 0,
+    fault: 0
+  },
+  underway: [], //执行中
+  pendingExecution: [], //待执行
+  robotWarnMsgDOS: [], //异常信息
+  deviceStatusInfoVOS: [], //设备信息
+  robotElectricityLevelVOS: [], //车辆信息
+})
 //获取数据
 const getAllData = async () => {
   let datas = await ChartsApi.bulletinBoardGet()
diff --git a/src/views/carError/index.vue b/src/views/carError/index.vue
index 4a20017e..93e38b86 100644
--- a/src/views/carError/index.vue
+++ b/src/views/carError/index.vue
@@ -17,7 +17,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="ID号" prop="robotNo">
+      <el-form-item label="AGV编号" prop="robotNo">
         <el-input
           v-model="queryParams.robotNo"
           placeholder="请输入AGV编号"