From 0b8f1db9b9db6ec216091e953303a752c91aa307 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 17 十月 2024 08:56:49 +0800
Subject: [PATCH] 被覆盖代码找回
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 2e08076..85ba8a9 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -84,7 +84,7 @@
glassId: row.glassId,
state: 8,
line: row.line,
- workingProcedure: '鍐峰姞宸�',
+ workingProcedure: '纾ㄨ竟',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -117,7 +117,7 @@
glassId: row.glassId,
state: 9,
line: row.line,
- workingProcedure: '鍐峰姞宸�',
+ workingProcedure: '纾ㄨ竟',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -133,7 +133,7 @@
}
};
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/edgTasks`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
@@ -155,20 +155,20 @@
<template>
<div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
- <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('璇烽�夋嫨绾胯矾')" clearable style="margin-left: 20px;margin-bottom: 10px;">
- <el-option label="纾ㄨ竟涓�绾�" value="2001"></el-option>
- <el-option label="纾ㄨ竟浜岀嚎" value="2002"></el-option>
+ <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('workOrder.cway')" clearable style="margin-left: 20px;margin-bottom: 10px;">
+ <el-option :label="$t('workOrder.edgingone')" value="2001"></el-option>
+ <el-option :label="$t('workOrder.edgingtwo')" value="2002"></el-option>
</el-select>
- <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('璇烽�夋嫨鐘舵��')" clearable style="margin-left: 20px;margin-bottom: 10px;" >
- <el-option label="鏈（杈�" value="0"></el-option>
- <el-option label="纾ㄨ竟涓�" value="1"></el-option>
- <el-option label="宸茬（杈�" value="2"></el-option>
+ <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('workOrder.cstate')" clearable style="margin-left: 20px;margin-bottom: 10px;" >
+ <el-option :label="$t('workOrder.nedging')" value="0"></el-option>
+ <el-option :label="$t('workOrder.edging')" value="1"></el-option>
+ <el-option :label="$t('workOrder.finedging')" value="2"></el-option>
</el-select>
- <span class="demonstration" style="margin-left: 20px;margin-bottom: 10px;">鏃堕棿娈�</span>
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" style="margin-left: 20px;margin-bottom: 10px;" value-format = "YYYY-MM-DD hh:mm:ss"
+ <span class="demonstration" style="margin-left: 20px;margin-bottom: 10px;">{{ $t('workOrder.time') }}</span>
+ <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')" style="margin-left: 20px;margin-bottom: 10px;" value-format = "YYYY-MM-DD hh:mm:ss"
- end-placeholder="缁撴潫鏃ユ湡">
+ :end-placeholder="$t('reportmanage.endtime')">
</el-date-picker>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="setEdgGlassInfoRequest()">{{
$t('reportmanage.inquire')
--
Gitblit v1.8.0