ak/zn-admin-vue3-wcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf

Browse Source
This commit is contained in:
yyy 2025-02-27 11:35:02 +08:00
commit e2acd514b9
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/views/board/allBoard/index.vue
View File

@ -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()

2
src/views/carError/index.vue
View File

@ -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编号"