From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue | 129 ++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 63 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue b/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
index a0464cc..24dca31 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
@@ -1,54 +1,57 @@
<script setup>
-import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
+import {onBeforeUnmount, onMounted, onUnmounted, ref} from "vue";
import {useRouter} from "vue-router"
+import {host, WebSocketHost} from '@/utils/constants'
+import request from "@/utils/request"
+import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
+// import { ref } from 'vue'
+import {ElMessage, ElMessageBox} from 'element-plus'
+// import LanguageMixin from './lang/LanguageMixin'
+import {useI18n} from 'vue-i18n'
+
const router = useRouter()
const adda = ref(false)
-import { WebSocketHost } from '@/utils/constants'
-
-import request from "@/utils/request"
-import { ref, onMounted , onBeforeUnmount} from "vue";
-import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
-// import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-// import LanguageMixin from './lang/LanguageMixin'
+const {t} = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
const tableData = ref([])
const slot = ref('')
-const requestData = {
+const requestData = {
line: 2002
-};
-request.post("/cacheGlass/taskCache/selectEdgTask",{
- ...requestData,
+};
+// request.post("/cacheGlass/taskCache/selectEdgTask",{
+// ...requestData,
-}).then((res) => {
- if (res.code == 200) {
+// }).then((res) => {
+// if (res.code == 200) {
- console.log(res.data);
- tableData.value = res.data
- console.log(res.data[0].slot);
- } else {
- ElMessage.warning(res.msg)
+// console.log(res.data);
+// tableData.value = res.data
+// console.log(res.data[0].slot);
+// } else {
+// ElMessage.warning(res.msg)
- }
- });
+// }
+// });
// 鐮存崯
const open = async(row) => {
- try {
+ try {
const confirmResult = await ElMessageBox.confirm(
- '鏄惁鐮存崯璇ユ潯淇℃伅?',
- '鎻愮ず',
+ t('workOrder.messagedamaged'),
+ t('workOrder.prompt'),
{
- confirmButtonText: '鏄�',
- cancelButtonText: '鍙栨秷',
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
type: 'warning',
- }
- );
+ }
+ );
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
- glassId: row.GlassId,
- controlsId: 300
+ glassId: row.glass_id,
+ controlsId: 8,
+ line: 2002,
+ machine: '鍐峰姞宸�',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -65,21 +68,23 @@
};
// 鎷胯蛋
const opena = async(row) => {
- try {
+ try {
const confirmResult = await ElMessageBox.confirm(
- '鏄惁鎷胯蛋璇ユ潯淇℃伅?',
- '鎻愮ず',
+ t('workOrder.takemessage'),
+ t('workOrder.prompt'),
{
- confirmButtonText: '鏄�',
- cancelButtonText: '鍙栨秷',
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
type: 'warning',
- }
- );
+ }
+ );
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
- glassId: row.GlassId,
- controlsId: 301
+ glassId: row.glass_id,
+ controlsId: 9,
+ line: 2002,
+ machine: '鍐峰姞宸�',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -94,21 +99,21 @@
console.error('鍙戠敓閿欒:', error);
}
};
-
-
-const socketUrl = `ws://${WebSocketHost}:88/api/cacheGlass/api/talk/cacheGlass`;
+let socket = null;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
tableData.value = data.EdgTasks2[0]
};
-// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
onMounted(() => {
- // fetchFlowCardId();
- // fetchTableData(); // 鑾峰彇鏁版嵁
- initializeWebSocket(socketUrl, handleMessage);
+ socket = initializeWebSocket(socketUrl, handleMessage);
});
-
+ onUnmounted(() => {
+ if (socket) {
+ closeWebSocket(socket);
+ }
+ });
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
@@ -116,23 +121,21 @@
</script>
<template>
- <div>
+ <div style="height: 500px;">
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table height="240" ref="table"
- @selection-change="handleSelectionChange"
- :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="GlassId" align="center" label="鐜荤拑id" min-width="180" />
- <el-table-column prop="Height" align="center" label="楂�" min-width="80" />
- <el-table-column prop="Width" align="center" label="瀹�" min-width="120" />
- <el-table-column prop="Thickness" align="center" label="鍘氬害" min-width="120" />
- <el-table-column prop="FilmsId" align="center" label="鑶滅郴" min-width="120" />
- <el-table-column prop="SerialNumber" align="center" label="鍑虹墖椤哄簭" min-width="120" />
- <el-table-column prop="FlowCardId" align="center" label="娴佺▼鍗″彿" min-width="120" />
- <el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
+ <el-table height="240" ref="table"
+ @selection-change="handleSelectionChange"
+ :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glass_id" align="center" :label="$t('workOrder.glassID')" min-width="180"/>
+ <el-table-column prop="width" align="center" :label="$t('workOrder.width')" min-width="120"/>
+ <el-table-column prop="height" align="center" :label="$t('workOrder.height')" min-width="80"/>
+ <el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120"/>
+ <el-table-column prop="glass_type" align="center" :label="$t('workOrder.glasstype')" min-width="120"/>
+ <el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="open(scope.row)">鐮存崯</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">鎷胯蛋</el-button>
+ <el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button>
+ <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('workOrder.takeout') }}</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.8.0