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/UnLoadGlass/loadmachinerack.vue | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index b0b40f3..01107af 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -446,13 +446,13 @@
<template>
<div>
<el-button style="margin-top: 10px;margin-left: 10px;margin-bottom: 10px;" id="searchButton" type="primary"
- @click="dialogFormVisibleaDownGlass = true">钀芥灦璇︽儏
+ @click="dialogFormVisibleaDownGlass = true">{{ $t('reportWork.details') }}
</el-button>
<el-button style="margin-top: 10px;margin-left: 10px;margin-bottom: 10px;" id="searchButton" type="primary"
- @click="dialogFormVisibleaDownGlasss = true">浜哄伐涓嬬墖
+ @click="dialogFormVisibleaDownGlasss = true">{{ $t('reportWork.filming') }}
</el-button>
<el-switch style="margin-top: 10px;margin-left: 15px;margin-bottom: 10px;" v-model="autoPrint" class="mb-2"
- :inactive-text="$t('鑷姩鎵撳嵃')" @change="handleChange" />
+ :inactive-text="$t('basicData.printing')" @change="handleChange" />
<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;">
@@ -465,8 +465,8 @@
<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="layer" align="center" :label="$t('reportWork.cenumber')" min-width="120" />
+ <el-table-column prop="otherNumber" align="center" :label="$t('reportWork.artificialorder')" 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">
@@ -483,17 +483,17 @@
</el-button>
<el-button size="mini" type="text" plain @click="handleBindRack2(scope.row)">{{ $t('reportWork.clear')
}}</el-button>
- <el-button @click="open(scope.row)" :disabled="scope.row.flowCardId == null">鎵撳嵃娴佺▼鍗�</el-button>
- <el-button @click="open1(scope.row)" :disabled="scope.row.flowCardId == null">鎵撳嵃鏍囩</el-button>
+ <el-button @click="open(scope.row)" :disabled="scope.row.flowCardId == null">{{ $t('reportWork.processcard') }}</el-button>
+ <el-button @click="open1(scope.row)" :disabled="scope.row.flowCardId == null">{{ $t('reportWork.printlabels') }}</el-button>
</template>
</el-table-column>
</el-table>
</div>
- <el-dialog v-model="dialogFormVisibleaDownGlass" top="2vh" width="97%" :title="$t('钀芥灦淇℃伅')">
- <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('璇烽�夋嫨宸ヤ綅')" clearable>
- <el-option label="鍏ㄩ儴" value="0"></el-option>
+ <el-dialog v-model="dialogFormVisibleaDownGlass" top="2vh" width="97%" :title="$t('reportWork.information')">
+ <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('reportWork.cstation')" clearable>
+ <el-option :label="$t('reportWork.all')" value="0"></el-option>
<el-option label="1" value="1"></el-option>
<el-option label="2" value="2"></el-option>
<el-option label="3" value="3"></el-option>
@@ -508,9 +508,9 @@
<el-option v-for="item in selectOptionsa" :key="item" :label="item" :value="item" />
</el-select>
- <span class="demonstration">鏃堕棿娈�</span>
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
- value-format="YYYY-MM-DD hh:mm:ss" end-placeholder="缁撴潫鏃ユ湡">
+ <span class="demonstration">{{ $t('reportWork.timeperiod') }}</span>
+ <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
+ value-format="YYYY-MM-DD hh:mm:ss" :end-placeholder="$t('reportmanage.endtime')">
</el-date-picker>
<el-button type="primary" style="margin-left: 10px;" @click="selectDownGlassData()">{{
@@ -519,19 +519,19 @@
</el-button>
<el-table height="200px" ref="table" @selection-change="handleSelectionChange" :data="downGlass"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
- <el-table-column prop="workStationId" align="center" :label="$t('宸ヤ綅鍙�')" min-width="80" />
- <el-table-column prop="engineerId" align="center" :label="$t('宸ョ▼鍙�')" min-width="80" />
- <el-table-column prop="flowCardId" align="center" :label="$t('娴佺▼鍗″彿')" min-width="80" />
- <el-table-column prop="layer" align="center" :label="$t('灞�')" min-width="120" />
- <el-table-column prop="sequence" align="center" :label="$t('椤哄簭')" min-width="150" />
- <el-table-column prop="width" align="center" :label="$t('瀹�')" min-width="120" />
- <el-table-column prop="height" align="center" :label="$t('楂�')" min-width="120" />
- <el-table-column prop="Filmsid" align="center" :label="$t('鑶滅郴')" min-width="120" />
- <el-table-column prop="thickness" align="center" label="鍘氬害" min-width="120" />
- <el-table-column prop="glassId" align="center" :label="$t('鐜荤拑id')" min-width="120" />
+ <el-table-column prop="workStationId" align="center" :label="$t('reportWork.stationnumber')" min-width="80" />
+ <el-table-column prop="engineerId" align="center" :label="$t('basicData.projectnumber')" min-width="80" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('workOrder.cardnumber')" min-width="80" />
+ <el-table-column prop="layer" align="center" :label="$t('searchOrder.ceng')" min-width="120" />
+ <el-table-column prop="sequence" align="center" :label="$t('reportWork.order')" min-width="150" />
+ <el-table-column prop="width" align="center" :label="$t('basicData.width')" min-width="120" />
+ <el-table-column prop="height" align="center" :label="$t('basicData.height')" min-width="120" />
+ <el-table-column prop="Filmsid" align="center" :label="$t('basicData.coatingtypes')" min-width="120" />
+ <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="120" />
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="120" />
</el-table>
</el-dialog>
- <el-dialog v-model="dialogFormVisibleaDownGlasss" top="2vh" width="97%" :title="$t('浜哄伐涓嬬墖淇℃伅')">
+ <el-dialog v-model="dialogFormVisibleaDownGlasss" top="2vh" width="97%" :title="$t('searchOrder.filminformation')">
<div style="display:flex;justify-content: space-around;">
<el-card
style="display: flex; justify-content: center; align-items: center; width:800px; height: 800px;position: relative;">
@@ -540,8 +540,8 @@
</div>
<div style="font-size: 50px; text-align: center;position: absolute;top:0px;left:170px;">
- <div>浜哄伐涓嬬墖褰撳墠鐜荤拑淇℃伅</div>
- <div><el-button type="primary" @click="open1(takeGlass)" >鎵撳嵃鏍囩</el-button></div>
+ <div>{{ $t('reportWork.glassmation') }}</div>
+ <div><el-button type="primary" @click="open1(takeGlass)" >{{ $t('reportWork.printlabels') }}</el-button></div>
<div>{{ takeGlass.flowCardId }}</div>
<div>{{ takeGlass.layer }}</div>
<div>{{ takeGlass.glassId }}</div>
@@ -556,8 +556,8 @@
</div>
<div style="font-size: 50px; text-align: center;position: absolute;top:0px;left:200px;">
- <div>鎵爜鏋綋鍓嶇幓鐠冧俊鎭�</div>
- <div><el-button type="primary" @click="open1(scanGlass)" >鎵撳嵃鏍囩</el-button></div>
+ <div>{{ $t('reportWork.barcodescanner') }}</div>
+ <div><el-button type="primary" @click="open1(scanGlass)" >{{ $t('reportWork.printlabels') }}</el-button></div>
<div>{{ scanGlass.flowCardId }}</div>
<div>{{ scanGlass.layer }}</div>
<div>{{ scanGlass.glassId }}</div>
--
Gitblit v1.8.0