diff --git a/hw-ui/src/views/board/fifthFloor/index.vue b/hw-ui/src/views/board/fifthFloor/index.vue
index c91dac3..688d839 100644
--- a/hw-ui/src/views/board/fifthFloor/index.vue
+++ b/hw-ui/src/views/board/fifthFloor/index.vue
@@ -488,6 +488,9 @@
+
+
+
@@ -542,6 +545,8 @@ import {
getNewestOutstockCabinet,updateBarcodePlan, completeCollectMaterials, completeReturnMaterials,continueRawInstock
} from "@/api/board";
import applyRawOutstock from '@//views/board/common/applyRawOutstock.vue';
+import WorkshopNotice from "@/components/workshopNotice/index.vue";
+import {noticeData} from "@/utils/notice"
const setState = (e) => {
if (e === '1') {
@@ -560,7 +565,8 @@ export default {
components: {
'apply-raw-outstock': applyRawOutstock,
Chart,
- PrintPage
+ PrintPage,
+ WorkshopNotice
},
dicts: ['wms_raw_return_task_type', 'mes_safe_flag'],
provide(){
@@ -568,6 +574,7 @@ export default {
closeDialog : this.closeDialog
}
},
+ mixins: [noticeData],
data() {
return {
fileList: [],
diff --git a/hw-ui/src/views/board/fourthFloor/assemble.vue b/hw-ui/src/views/board/fourthFloor/assemble.vue
index bffa995..d1da527 100644
--- a/hw-ui/src/views/board/fourthFloor/assemble.vue
+++ b/hw-ui/src/views/board/fourthFloor/assemble.vue
@@ -329,6 +329,10 @@
+
+
+
+
@@ -350,6 +354,8 @@ import {
import {monitorSerialData} from "@/utils/serial";
import applyRawOutstock from '@//views/board/common/applyRawOutstock.vue';
import {getNowDateTime} from "@/utils/ruoyi";
+import WorkshopNotice from "@/components/workshopNotice/index.vue";
+import {noticeData} from "@/utils/notice"
const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
export default {
@@ -360,11 +366,12 @@ export default {
closeDialog : this.closeDialog
}
},
- mixins: [monitorSerialData],
+ mixins: [monitorSerialData, noticeData],
components: {
'apply-raw-outstock': applyRawOutstock,
Chart,
- PrintPage
+ PrintPage,
+ WorkshopNotice
},
data() {
return {
diff --git a/hw-ui/src/views/board/fourthFloor/laserLight.vue b/hw-ui/src/views/board/fourthFloor/laserLight.vue
index 6525703..ef0637e 100644
--- a/hw-ui/src/views/board/fourthFloor/laserLight.vue
+++ b/hw-ui/src/views/board/fourthFloor/laserLight.vue
@@ -233,6 +233,11 @@
确 定
+
+
+
+
+
@@ -254,6 +259,8 @@ import {
import {monitorSerialData} from "@/utils/serial"
import {addWmslocation, updateWmslocation} from "@/api/wms/wmslocation";
+import WorkshopNotice from "@/components/workshopNotice/index.vue";
+import {noticeData} from "@/utils/notice"
const setState = (e) => {
if (e === '1') {
@@ -269,9 +276,10 @@ const setState = (e) => {
const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
export default {
name: 'Board1',
- mixins: [monitorSerialData],
+ mixins: [monitorSerialData, noticeData],
components: {
- Chart
+ Chart,
+ WorkshopNotice
},
data() {
return {
diff --git a/hw-ui/src/views/board/fourthFloor/weld.vue b/hw-ui/src/views/board/fourthFloor/weld.vue
index 674d447..e42721b 100644
--- a/hw-ui/src/views/board/fourthFloor/weld.vue
+++ b/hw-ui/src/views/board/fourthFloor/weld.vue
@@ -220,6 +220,11 @@
style="display: block; max-width: 100%; margin: 0 auto"
/>
+
+
+
+
+
@@ -232,6 +237,9 @@ import {
getProductPlans,
startNextProductPlanDetail
} from '@/api/board'
+import WorkshopNotice from "@/components/workshopNotice/index.vue";
+import {noticeData} from "@/utils/notice"
+import {monitorSerialData} from "@/utils/serial";
const setState = (e) => {
if (e === '1') {
@@ -248,8 +256,10 @@ const vw = (document.documentElement.clientWidth || document.body.clientWidth) /
export default {
name: 'Board1',
components: {
- Chart
+ Chart,
+ WorkshopNotice
},
+ mixins: [noticeData],
data() {
return {
fileList: [],