From 5cdd141dc4d9b27f36e4e91a56db5a1121873c97 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Mon, 22 Apr 2024 16:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/oth/agvLog.js                         |   9 +
 src/views/asrs/dockTransfer/index.vue         |   5 +-
 src/views/asrs/dockTransfer/indexb.vue        |   5 +-
 src/views/asrs/jobMainTaskHistory/index.vue   |   8 +-
 src/views/asrs/jobMainTaskHistory/indexb.vue  |   8 +-
 .../add-or-updata.vue                         |   3 +-
 .../out-or-move.vue                           |   5 +-
 src/views/wcsAlarm/index.vue                  | 154 ++++++++++++++++++
 8 files changed, 182 insertions(+), 15 deletions(-)
 create mode 100644 src/views/wcsAlarm/index.vue

diff --git a/src/api/oth/agvLog.js b/src/api/oth/agvLog.js
index 563a772..e316430 100644
--- a/src/api/oth/agvLog.js
+++ b/src/api/oth/agvLog.js
@@ -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
+  })
+}
diff --git a/src/views/asrs/dockTransfer/index.vue b/src/views/asrs/dockTransfer/index.vue
index fe0aba8..8d95b85 100644
--- a/src/views/asrs/dockTransfer/index.vue
+++ b/src/views/asrs/dockTransfer/index.vue
@@ -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() {
diff --git a/src/views/asrs/dockTransfer/indexb.vue b/src/views/asrs/dockTransfer/indexb.vue
index 9bdd79e..4ce0722 100644
--- a/src/views/asrs/dockTransfer/indexb.vue
+++ b/src/views/asrs/dockTransfer/indexb.vue
@@ -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() {
diff --git a/src/views/asrs/jobMainTaskHistory/index.vue b/src/views/asrs/jobMainTaskHistory/index.vue
index 46784a4..9e28168 100644
--- a/src/views/asrs/jobMainTaskHistory/index.vue
+++ b/src/views/asrs/jobMainTaskHistory/index.vue
@@ -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,
 	},
 ];
diff --git a/src/views/asrs/jobMainTaskHistory/indexb.vue b/src/views/asrs/jobMainTaskHistory/indexb.vue
index 9db1865..ebeeb42 100644
--- a/src/views/asrs/jobMainTaskHistory/indexb.vue
+++ b/src/views/asrs/jobMainTaskHistory/indexb.vue
@@ -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,
 	},
 ];
diff --git a/src/views/asrs/warehouseStorehouseStorage/add-or-updata.vue b/src/views/asrs/warehouseStorehouseStorage/add-or-updata.vue
index 3d15cc0..5092b9a 100644
--- a/src/views/asrs/warehouseStorehouseStorage/add-or-updata.vue
+++ b/src/views/asrs/warehouseStorehouseStorage/add-or-updata.vue
@@ -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 },
diff --git a/src/views/asrs/warehouseStorehouseStorage/out-or-move.vue b/src/views/asrs/warehouseStorehouseStorage/out-or-move.vue
index 7db05a7..9c0235d 100644
--- a/src/views/asrs/warehouseStorehouseStorage/out-or-move.vue
+++ b/src/views/asrs/warehouseStorehouseStorage/out-or-move.vue
@@ -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],
diff --git a/src/views/wcsAlarm/index.vue b/src/views/wcsAlarm/index.vue
new file mode 100644
index 0000000..d104668
--- /dev/null
+++ b/src/views/wcsAlarm/index.vue
@@ -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>