This commit is contained in:
朱文强 2024-04-22 16:57:55 +08:00
parent 43f9da790e
commit 5cdd141dc4
8 changed files with 182 additions and 15 deletions

View File

@ -52,3 +52,12 @@ export function exportAgvLogExcel(query) {
responseType: 'blob'
})
}
// 获得wcs堆垛机报警分页
export function getWCSAlarmPage(query) {
return request({
url: '/asrs/wcs-alarm/page',
method: 'get',
params: query
})
}

View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2024-02-27 14:43:14
* @LastEditors: zwq
* @LastEditTime: 2024-03-13 15:08:49
* @LastEditTime: 2024-04-22 09:10:46
* @Description:
-->
<template>
@ -87,9 +87,10 @@ const regionArr = [
{ name: '一次分拣区域', id: 2 },
{ name: '二次分切区域', id: 3 },
{ name: '二次分拣区域', id: 4 },
{ name: '包装区域', id: 5 },
{ name: '手动包装区域', id: 5 },
{ name: '涂覆区域', id: 6 },
{ name: '其他', id: 7 },
{ name: '自动包装区域', id: 8 },
];
export default {
data() {

View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2024-02-27 14:43:14
* @LastEditors: zwq
* @LastEditTime: 2024-03-13 15:09:44
* @LastEditTime: 2024-04-22 09:10:59
* @Description:
-->
<template>
@ -101,9 +101,10 @@ const regionArr = [
{ name: '一次分拣区域', id: 2 },
{ name: '二次分切区域', id: 3 },
{ name: '二次分拣区域', id: 4 },
{ name: '包装区域', id: 5 },
{ name: '手动包装区域', id: 5 },
{ name: '涂覆区域', id: 6 },
{ name: '其他', id: 7 },
{ name: '自动包装区域', id: 8 },
];
export default {
data() {

View File

@ -173,19 +173,19 @@ const mainTaskState = [
];
const stackerArr = [
{
name: '1',
name: 'DDJ1',
id: 1,
},
{
name: '2',
name: 'DDJ2',
id: 2,
},
{
name: '3',
name: 'DDJ3',
id: 3,
},
{
name: '4',
name: 'DDJ4',
id: 4,
},
];

View File

@ -173,19 +173,19 @@ const mainTaskState = [
];
const stackerArr = [
{
name: '1',
name: 'DDJ1',
id: 1,
},
{
name: '2',
name: 'DDJ2',
id: 2,
},
{
name: '3',
name: 'DDJ3',
id: 3,
},
{
name: '4',
name: 'DDJ4',
id: 4,
},
];

View File

@ -225,9 +225,10 @@ const regionArr = [
{ name: '一次分拣区域', id: 2 },
{ name: '二次分切区域', id: 3 },
{ name: '二次分拣区域', id: 4 },
{ name: '包装区域', id: 5 },
{ name: '手动包装区域', id: 5 },
{ name: '涂覆区域', id: 6 },
{ name: '其他', id: 7 },
{ name: '自动包装区域', id: 8 },
];
export default {
components: { productAttrAdd, SmallTitle },

View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2024-02-27 15:22:13
* @LastEditTime: 2024-04-22 09:09:01
* @Description:
-->
<template>
@ -113,9 +113,10 @@ const regionArr = [
{ name: '一次分拣区域', id: 2 },
{ name: '二次分切区域', id: 3 },
{ name: '二次分拣区域', id: 4 },
{ name: '包装区域', id: 5 },
{ name: '手动包装区域', id: 5 },
{ name: '涂覆区域', id: 6 },
{ name: '其他', id: 7 },
{ name: '自动包装区域', id: 8 },
];
export default {
mixins: [basicAdd],

View File

@ -0,0 +1,154 @@
<!--
* @Author: zwq
* @Date: 2024-04-22 09:48:26
* @LastEditors: zwq
* @LastEditTime: 2024-04-22 10:35:01
* @Description:
-->
<template>
<div class="app-container">
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick" />
<base-table
v-loading="dataListLoading"
:table-props="tableProps"
:page="listQuery.pageNo"
:limit="listQuery.pageSize"
:table-data="tableData">
</base-table>
<pagination
:limit.sync="listQuery.pageSize"
:page.sync="listQuery.pageNo"
:total="listQuery.total"
@pagination="getDataList" />
</div>
</template>
<script>
import basicPage from '../asrs/mixins/basic-page';
import { parseTime } from '../asrs/mixins/code-filter';
import { getWCSAlarmPage } from '@/api/oth/agvLog';
const tableProps = [
{
prop: 'ddjName',
label: '堆垛机',
},
{
prop: 'currentPosition',
label: '当前位置',
},
{
prop: 'taskNo',
label: '任务号',
},
{
prop: 'alarmInfo',
label: '报警内容',
},
{
prop: 'createTime',
label: '时间',
filter: parseTime,
},
];
const stackerArr = [
{
name: 'DDJ1',
id: 1,
},
{
name: 'DDJ2',
id: 2,
},
{
name: 'DDJ3',
id: 3,
},
{
name: 'DDJ4',
id: 4,
},
];
export default {
mixins: [basicPage],
data() {
return {
urlOptions: {
getDataListURL: getWCSAlarmPage,
},
tableProps,
tableData: [],
formConfig: [
{
type: 'select',
label: '堆垛机',
selectOptions: stackerArr,
param: 'name',
defaultSelect: '',
filterable: true,
},
{
type: 'input',
label: '任务号',
placeholder: '任务号',
param: 'code',
},
{
type: 'datePicker',
label: '日期',
dateType: 'daterange',
format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'searchTime',
},
{
type: 'button',
btnName: '搜索',
name: 'search',
color: 'primary',
},
{
type: 'button',
btnName: '重置',
name: 'reset',
},
],
};
},
components: {},
created() {
this.listQuery.warehouseId = null;
},
methods: {
buttonClick(val) {
switch (val.btnName) {
case 'search':
this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10;
this.listQuery.taskNo = val.code;
this.listQuery.ddjName = val.name;
this.listQuery.createTime = val.searchTime;
this.getDataList();
break;
case 'reset':
this.$refs.searchBarForm.resetForm();
this.listQuery = {
pageSize: 10,
pageNo: 1,
total: 1,
};
this.getDataList();
break;
default:
console.log(val);
}
},
},
};
</script>