From a487e1560cddf1d8b3e7372d9791b9589e9af96c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 11 十二月 2023 13:31:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 14fbabe..00ecd88 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -663,7 +663,7 @@
<el-table-column prop="barcode" :label="$t('Complete')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="!isAllowQueue"
- @click="CompleteQueue(scope.row.id,scope.row.barcode)">{{ $t('Complete') }}</el-button>
+ @click="CompleteQueue(scope.row.id,scope.row.barcode,scope.row.glassId)">{{ $t('Complete') }}</el-button>
</template>
</el-table-column>
<el-table-column :width="280" :label="$t('Operate')">
@@ -825,11 +825,6 @@
created() {
this.load();
this.init();
- setInterval(() => {
- if(socket.readyState != 1){
- this.init();
- }
- }, 20000);
}
,
methods: {
@@ -851,13 +846,6 @@
//鎵撳紑浜嬩欢
socket.onopen = function () {
console.log("websocket宸叉墦寮�");
- // setInterval(()=>{
- // if(socket){
- // if(socket.readyState==socket.OPEN){
- // socket.send('');
- // }
- // }
- // },5000);
};
// 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
socket.onmessage = function (msg) {
@@ -1690,8 +1678,8 @@
this.form5 = {};
},
//鎵嬪姩瀹屾垚鍑虹墖浠诲姟
- CompleteQueue(id,frameid) {
- CompleteQueue(id,frameid).then(res => {
+ CompleteQueue(id,frameid,glassid) {
+ CompleteQueue(id,frameid,glassid).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
}
--
Gitblit v1.8.0