From 6bd50183e0f287030ae0063f034e31dad888f4cc Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 七月 2024 13:26:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 354 ++++++++++++++++++++++-------------------------------------
1 files changed, 132 insertions(+), 222 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index d4a17c1..e99f53e 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -1,109 +1,54 @@
<script setup>
import {Search} from "@element-plus/icons-vue";
-import {reactive, onMounted} from "vue";
+import {reactive, onMounted, onBeforeUnmount} from "vue";
import {useRouter} from "vue-router"
const router = useRouter()
-
+import { useI18n } from 'vue-i18n'
+ const { t } = useI18n()
+ let language = ref(localStorage.getItem('lang') || 'zh')
import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import Landingindication from "./Landingindication.vue";
import Landingindicationtwo from "./Landingindicationtwo.vue";
import request from "@/utils/request";
-
+import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
+import { WebSocketHost ,host} from '@/utils/constants'
const dialogFormVisiblea = ref(false)
-
-
-
const dialogFormVisiblea2 = ref(false)
-
-
-
-
-
-let socket;
-
-
-const initWebSocket = (token) =>{ //鍒濆鍖杦e
-
-let viewname = "unloadglass";
-
-if (typeof WebSocket === "undefined") {
- console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
-} else {
- let socketUrl = "ws://" + "localhost"+":88" + "/api/talk/" + viewname;
- if (socket != null) {
- socket.close();
- socket = null;
- }
-
- // 寮�鍚竴涓獁ebsocket鏈嶅姟
- socket = new WebSocket(socketUrl);
-
- // 鎵撳紑浜嬩欢
- socket.onopen = function () {
- console.log("websocket宸叉墦寮�");
- };
-
-
-
-socket.onmessage = (msg) => {
-if (!msg.data) {
-return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
-}
-
- let obj = JSON.parse(msg.data);
-
-
- console.log('鏀跺埌娑堟伅锛�', obj.data);
-
- }
-
- }
- }
-
-
-
-
// 鏁版嵁
const loading = ref(false);
-
-
// 寮规鏄剧ず鎺у埗
-
const dialogFormVisible = ref(false);
-
// 琛ㄥ崟鏁版嵁
const workstationId = ref('');
+const selectedProjectNoa = ref(null); // 褰撳墠閫変腑鐨勮鑹�
const flowCardId = ref('');
-const flowCardOptions = ref([]);
+const flowCardOptions = ref('[]');
const tableData = reactive([]);
-
// 鏂规硶
const handleSelectionChange = () => {
// 澶勭悊琛ㄦ牸琛岄�夋嫨浜嬩欢
};
-
const handleBindRack = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
-
+ console.log(row.flowCardId);
+ flowCardId.value = row.flowCardId;
// 鍙戣捣鎺ュ彛璇锋眰鑾峰彇娴佺▼鍗″彿
fetchFlowCardId();
-
-
dialogFormVisiblea.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
-
-
-
//鑾峰彇娴佺▼鍗″彿
const fetchFlowCardId = async () => {
try {
const response = await request.get('unLoadGlass/downWorkStation/getflowCardId');
console.log(response)
if (response.code === 200) {
- flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flow_card_Id }));
- console.log(flowCardOptions.value)
- } else {
+
+ flowCardOptions.value = response.data.filter(item => item !== null)
+.map(item => ({ flowcard_id: item.flow_card_id }));
+ console.log(flowCardOptions.value);
+}
+ else {
ElMessage.error(response.msg);
}
} catch (error) {
@@ -113,11 +58,13 @@
//纭
const handleConfirm = async () => {
try {
+ const firstPart = flowCardId.value.split('|')[0].trim(); //
+const twoPart = flowCardId.value.split('|')[1].trim(); //
const response = await request.post('unLoadGlass/downWorkStation/updateFlowCardId', {
workstationId: workstationId.value,
- flowCardId: flowCardId.value
+ flowCardId: firstPart,
+ layer:twoPart
});
-
console.log(response)
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
@@ -135,25 +82,14 @@
console.error(error);
}
};
-
-
const updatePageData = () => {
// 鍋囪浣犵殑椤甸潰涓婃湁涓�涓悕涓� tableData 鐨� Vue 缁勪欢
// 浣犲彲浠ョ洿鎺ユ洿鏂� tableData 鐨勬暟鎹�
fetchTableData()
-
// 浣跨敤 $forceUpdate() 寮哄埗鏇存柊缁勪欢
-
};
-
-
-
const handleBindRack2 = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
-
-
-
-
dialogFormVisiblea2.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
//娓呴櫎鍐呭
@@ -183,11 +119,6 @@
dialogFormVisiblea2.value = false;
}
};
-
-
-
-
-
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
const fetchTableData = async () => {
try {
@@ -208,130 +139,132 @@
ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
}
};
+const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass`;
+// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
+const handleMessage = (data) => {
+ // 鏇存柊 tableData 鐨勬暟鎹�
+ tableData.splice(0, tableData.length, ...data.params[0]);
+// console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
+};
+// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
+onMounted(() => {
+ fetchFlowCardId();
+ fetchTableData(); // 鑾峰彇鏁版嵁
+ initializeWebSocket(socketUrl, handleMessage);
+});
+onBeforeUnmount(() => {
+ console.log("鍏抽棴浜�")
+ closeWebSocket();
+});
-
-
-// initWebSocket();
-onMounted(fetchTableData);
-// setInterval(fetchTableData, 2000)
-
-const open = () => {
- ElMessageBox.confirm(
- '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
- '鎻愮ず',
- {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
+const getTagType =(status) => {
+ return status === 1 ? 'success' : 'danger';
+ // 鏍规嵁鐘舵�佸�煎喅瀹氭爣绛剧被鍨嬶紝杩欓噷鍋囪鐘舵�佷负1鏃朵负鎴愬姛锛堢豢鑹诧級锛屽惁鍒欎负澶辫触锛堢孩鑹诧級
}
- )
- .then(() => {
- ElMessage({
- type: 'success',
- message: '鍒犻櫎鎴愬姛锛�',
- })
- })
- .catch(() => {
- ElMessage({
- type: 'info',
- message: '鍒犻櫎澶辫触',
- })
- })
-}
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
+
+ const toggleStatus = (row) => {
+ // 鍒囨崲鏂欐灦鐘舵�佺殑閫昏緫
+ row.enableState = 1 - row.enableState; // Toggle between 0 and 1
+ // 姝ゅ鍙互娣诲姞淇濆瓨鐘舵�佺殑閫昏緫锛屾瘮濡傝皟鐢� API 鏇存柊鏁版嵁
+ updateRowStatus(row);
+ };
+
+ const updateRowStatus = async (row) => {
+ try {
+ // 鍋囪浣犵殑鍚庣 API 鎺ユ敹 PUT 璇锋眰锛屽苟涓旈渶瑕佷紶閫� row.id 鍜� row.enableState 鍙傛暟
+
+
+ const response = await request.post('unLoadGlass/downWorkStation/updateDownWorkstation', {
+ enableState: row.enableState,
+ id: row.id
+
+
+ });
+ console.log('Updated row status:', response.data);
+ // 鍙互鏍规嵁鍚庣杩斿洖鐨勬暟鎹繘琛岃繘涓�姝ュ鐞嗭紝姣斿鏇存柊鏈湴鐘舵�佺瓑
+ } catch (error) {
+ console.error('Error updating row status:', error);
+ // 澶勭悊閿欒鎯呭喌锛屾瘮濡傛彁绀虹敤鎴锋洿鏂板け璐�
}
-}
-
-const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
- showFooter: true,//鏄剧ず鑴�
- printConfig: {},
- importConfig: {},
- exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
- columnConfig: {
- resizable: true,
- useKey: true
- },
- filterConfig: { //绛涢�夐厤缃」
- remote: true
- },
- customConfig: {
- storage: true
- },
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
- },
- data: [
- {
- 'id': '1',
- 'long': '5',
- 'wide': '1005',
- 'thick': '183.6',
- }
- ],
-})
+};
+
+
+// beforeUnmount(() => {
+// closeWebSocket();
+// });
+// setInterval(fetchTableData, 2000)
</script>
-
<template>
<div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 5px;" v-loading="loading">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 200px;">
- <el-table height="100%" ref="table"
+ <el-card style="flex: 1;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 4px;margin-top: 1px;" v-loading="loading">
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
+ <el-table height="200px" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="workstationId" align="center" label="涓嬬墖浣�" min-width="80" />
- <el-table-column prop="workstationId" align="center" label="鏋跺彿" min-width="120" />
- <el-table-column prop="flowCardId" align="center" label="娴佺▼鍗″彿" min-width="120" />
- <el-table-column prop="totalquantity" align="center" label="鎬绘暟閲�" min-width="120" />
- <el-table-column prop="racksnumber" align="center" label="宸茶惤鏋舵暟閲�" min-width="120" />
- <el-table-column prop="work_state" align="center" label="鐘舵��" min-width="120" />
- <el-table-column prop="deviceId" align="center" label="璁惧鍙�" min-width="120" />
- <el-table-column prop="enableState" align="center" label="鍚敤鐘舵��" min-width="120" />
- <el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
+ <el-table-column prop="workstationId" align="center" :label="$t('reportWork.lowerbit')" min-width="80" />
+ <el-table-column prop="workstationId" align="center" :label="$t('reportWork.shelfnumber')" min-width="120" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('reportWork.cardnumber')" min-width="150" />
+ <el-table-column prop="totalQuantity" align="center" :label="$t('reportWork.totalquantity')" min-width="120" />
+ <el-table-column prop="racksNumber" align="center" :label="$t('reportWork.beendropped')" min-width="120" />
+ <el-table-column prop="layer" align="center" label="灞傛暟" min-width="120" />
+ <el-table-column prop="otherNumber" align="center" label="浜哄伐涓嬬墖鏁�" min-width="120" />
+ <!-- <el-table-column prop="work_state" align="center" :label="$t('reportWork.state')" min-width="120" /> -->
+ <el-table-column prop="deviceId" align="center" :label="$t('reportWork.devicenumber')" min-width="120" />
+ <el-table-column
+ align="center"
+ :label="$t('reportWork.startstatus')"
+ min-width="80"
+ prop="enableState"
+ >
+ <template #default="scope">
+
+ <el-tag :type="getTagType(scope.row.enableState)" @click="toggleStatus(scope.row)">
+ {{ scope.row.enableState === 1 ? $t('reportWork.enable') : $t('reportWork.unenable') }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" :label="$t('reportWork.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain v-show="scope.row.enableState !== '宸插惎鐢�' " @click="handleBindRack(scope.row)">缁戝畾鏋跺瓙</el-button>
- <el-button size="mini" type="text" plain @click="handleBindRack2(scope.row)">娓呯┖</el-button>
+ <el-button size="mini" type="text" plain v-show="scope.row.enableState !== '宸插惎鐢�' " @click="handleBindRack(scope.row)">{{ $t('reportWork.bindingshelves') }}</el-button>
+ <el-button size="mini" type="text" plain @click="handleBindRack2(scope.row)">{{ $t('reportWork.clear') }}</el-button>
</template>
</el-table-column>
</el-table>
</div>
</el-card>
+ <!-- workstationId: '1',
+ workstationId: '1005',
+ flowCardId: '183.6',
+ totalquantity: '1991',
+ racksnumber:"1",
+ work_state: '寰呰瘑鍒�', -->
+ <div style="display: flex;" class="awatch">
+ <div id="main-body">
+ <Landingindication></Landingindication>
+ </div>
+ <div id="main-bodya">
+ <Landingindicationtwo></Landingindicationtwo>
+ </div>
+ </div>
+ </el-card>
+ </div>
-
- <el-dialog v-model="dialogFormVisiblea" top="21vh" width="30%" title="缁戝畾鏋跺瓙" >
+ <el-dialog v-model="dialogFormVisiblea" top="21vh" width="40%" :title="$t('reportWork.bindingshelves')">
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
- <el-form label-width="100px" label-position="right">
- <el-form-item label="鏋跺彿锛�" :required="true" style="width: 18vw">
+ <el-form size="mini" label-width="100px">
+ <el-form label-width="210px" label-position="right">
+ <el-form-item :label="$t('reportWork.shelfnumbera')" :required="true" style="width: 25vw">
<el-input v-model="workstationId" autocomplete="off"/>
</el-form-item>
- <el-form-item label="娴佺▼鍗″彿锛�" :required="true" style="width: 18vw;">
- <el-select v-model="flowCardId" placeholder="璇烽�夋嫨娴佺▼鍗″彿">
+ <el-form-item :label="$t('reportWork.cardnumbera')" :required="true" style="width: 25vw;">
+ <el-select v-model="flowCardId" :placeholder="$t('reportWork.incardnumber')">
<el-option v-for="item in flowCardOptions" :key="item.flowcard_id" :label="item.flowcard_id" :value="item.flowcard_id" />
</el-select>
</el-form-item>
@@ -341,47 +274,24 @@
<template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="handleConfirm">
- 纭
+ {{ $t('reportWork.sure') }}
</el-button>
- <el-button @click="dialogFormVisiblea = false">鍙栨秷</el-button>
+ <el-button @click="dialogFormVisiblea = false">{{ $t('reportWork.cancel') }}</el-button>
</div>
</template>
</el-dialog>
-
-
-
-
- <el-dialog v-model="dialogFormVisiblea2" top="21vh" width="30%" title="娓呴櫎鏋跺瓙鐜荤拑" >
-
+ <el-dialog v-model="dialogFormVisiblea2" top="21vh" width="30%" :title="$t('reportWork.clearglass')">
<template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="handleclear">
- 纭
+ {{ $t('reportWork.sure') }}
</el-button>
- <el-button @click="dialogFormVisiblea2 = false">鍙栨秷</el-button>
+ <el-button @click="dialogFormVisiblea2 = false">{{ $t('reportWork.cancel') }}</el-button>
</div>
</template>
</el-dialog>
-
-
- <!-- workstationId: '1',
- workstationId: '1005',
- flowCardId: '183.6',
- totalquantity: '1991',
- racksnumber:"1",
- work_state: '寰呰瘑鍒�', -->
- </div>
- <div style="display: flex;">
- <div id="main-body">
- <Landingindication></Landingindication>
- </div>
- <div id="main-bodya">
- <Landingindicationtwo></Landingindicationtwo>
- </div></div>
</template>
-
<style scoped>
-
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
@@ -397,15 +307,15 @@
background-color: #337ecc;
margin-left: 28%;
}
-#awatch{
- height: 450px;
+.awatch{
+ max-width: 100%;
}
#main-body{
- margin-top: -20px;
- margin-left: 200px;
+ margin-top: -40px;
+ margin-left: 150px;
}
#main-bodya{
- margin-top: -10px;
+ margin-top: -40px;
margin-left: 100px;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0