From 6b8b4e4dc8a12695d51ce40f04297f2fcb2bf657 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:24:31 +0800
Subject: [PATCH] 更新
---
Albania_Mes-ui/src/views/home/index.vue | 131 ++++++++++++++++++++++++++++++++-----------
1 files changed, 98 insertions(+), 33 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 2babbed..e0f07bd 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -306,6 +306,19 @@
.cells {
height: 100%;
}
+.measure_Content{
+ margin-bottom: 20px;
+ font-size: 30px;
+}
+.measuretitle{
+
+}
+.measureValue{
+
+}
+.measureUnit{
+ margin-left: 10px;
+}
</style>
<template>
<el-container>
@@ -448,16 +461,28 @@
</el-main>
<el-dialog :visible.sync="Importorder" :title="$t('Import order')" top="5vh">
<!--鏂囦欢瀵煎叆鏁版嵁椤甸潰-->
- <div id="fileinput" class="container">
+ <div id="" class="container">
<div class="header">
<div class="btn">
- <button @click="AllAdd">淇濆瓨</button>
- </div>
- <div class="inp">
+ <el-button type="primary" @click="importData()">淇濆瓨</el-button>
+
<input type="file" id="uploadExcel" multiple @change="Change" />
</div>
</div>
- <table id="table">
+ <el-table :data="this.dataList" border style="width: 100%;">
+ <el-table-column prop="Customer" :label="$t('Customer')"></el-table-column>
+ <el-table-column prop="order" :label="$t('Order')"></el-table-column>
+ <el-table-column prop="base" :label="$t('Width')"></el-table-column>
+ <el-table-column prop="height" :label="$t('Height')"></el-table-column>
+ <el-table-column prop="thickness" :label="$t('Thickness')"></el-table-column>
+ <el-table-column prop="films" :label="$t('Films')"></el-table-column>
+ <el-table-column prop="quantity" :label="$t('No')"></el-table-column>
+ <el-table-column prop="tier" :label="$t('Tier')"></el-table-column>
+ <el-table-column prop="matching" :label="$t('Matching')"></el-table-column>
+ <el-table-column prop="glasstype" :label="$t('Glasstype')"></el-table-column>
+ <el-table-column prop="productname" :label="$t('Productname')"></el-table-column>
+ </el-table>
+ <!-- <table id="table">
<thead>
<tr>
<th>Customer</th>
@@ -475,17 +500,6 @@
</thead>
<tbody style="text-align: center">
<tr v-for="item in dataList" :key="item.id">
- <!-- <td>{{ item[0] }}</td>
- <td>{{ item[1] }}</td>
- <td>{{ item[2] }}</td>
- <td>{{ item[3] }}</td>
- <td>{{ item[4] }}</td>
- <td>{{ item[5] }}</td>
- <td>{{ item[6] }}</td>
- <td>{{ item[7] }}</td>
- <td>{{ item[8] }}</td>
- <td>{{ item[9] }}</td>
- <td>{{ item[10] }}</td> -->
<td>{{ item.Customer }}</td>
<td>{{ item.order }}</td>
<td>{{ item.base }}</td>
@@ -499,30 +513,64 @@
<td>{{ item.productname }}</td>
</tr>
</tbody>
- </table>
+ </table> -->
</div>
</el-dialog>
<el-dialog :visible.sync="Measure" :title="$t('Measure')" top="5vh"><!--娴嬮噺椤甸潰-->
<!--娴嬮噺椤甸潰涓讳綋-->
- <div>
+ <div style="height: 780px;">
<!--鍔熻兘-->
<div>
<el-button type="primary" @click="ManualMatching()" :disabled="SoftEmergencyStopState"
style="z-index: 999;">浜哄伐鍖归厤</el-button>
<el-button type="primary" @click="ManualTake()" :disabled="SoftEmergencyStopState"
- style="z-index: 999;">浜哄伐鍖归厤</el-button>
+ style="z-index: 999;">浜哄伐鎷胯蛋</el-button>
+ <el-button type="primary" @click="AnewMeasure()" :disabled="SoftEmergencyStopState"
+ style="z-index: 999;">閲嶆柊娴嬮噺</el-button>
</div>
+ <br>
<!--鏄剧ず-->
- <div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;margin: auto auto;">
+ <div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;float: left;">
<!--鐜荤拑鍥� #81b337-->
- <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin: auto;position:absolute;width:'
- + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
- + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
- + (this.LastQueue.glassheight / 25 * 7) + 'px;background-color: #93d2f3;text-align: center;'">
- {{ this.LastQueue.glasswidth }}*{{ this.LastQueue.glassheight }}
+ <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:'+((720-(this.LastQueue.glassheight / 25 * 7))/2)+'px auto;width:'
+ + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
+ + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
+ + (this.LastQueue.glassheight / 25 * 7) + 'px; background-color: '
+ + (this.LastQueue.state>0?'#4CCCE4':(this.LastQueue.state==0?'#E4CA4C':'#E4CA4C'))+';text-align: center;'">
+ {{ (this.LastQueue.glasswidth+this.LastQueue.glassheight)!=0?(this.LastQueue.glasswidth+"*"+this.LastQueue.glassheight):"" }}
</div>
+ </div>
+ <!--鏄剧ず-->
+ <div style="width:20px;height: 720px;float: left;"></div>
+ <div style="width:500px;height: 620px;border: 2px solid #d1d1d1;float: left;padding: 50px 50px;">
+ <!--鐜荤拑鍥� #81b337-->
+ <div class="measure_Content">
+ <span class="measuretitle" style="font-size: 30px;">闀匡細</span>
+ <span class="measureValue">{{ this.LastQueue.glasswidth }}</span>
+ <span class="measureUnit"> mm</span>
+ </div>
+ <div class="measure_Content">
+ <span class="measuretitle">瀹斤細</span>
+ <span class="measureValue">{{ this.LastQueue.glassheight }}</span>
+ <span class="measureUnit">mm</span>
+ </div>
+ <div class="measure_Content">
+ <span class="measuretitle">娴嬮噺闀匡細</span>
+ <span class="measureValue">{{ this.LastQueue.glasswidthmm }}</span>
+ <span class="measureUnit">mm</span>
+ </div>
+ <div class="measure_Content">
+ <span class="measuretitle">娴嬮噺瀹斤細</span>
+ <span class="measureValue">{{ this.LastQueue.glassheightmm }}</span>
+ <span class="measureUnit">mm</span>
+ </div>
+ <div class="measure_Content">
+ <span class="measuretitle">鍖归厤缁撴灉锛�</span>
+ <span class="measureValue">{{ this.LastQueue.state>0?"鍖归厤鎴愬姛":(this.LastQueue.state==0?"鍖归厤澶辫触":"澶氭暟鎹尮閰�") }}</span>
+ </div>
+
</div>
</div>
</el-dialog>
@@ -655,7 +703,7 @@
Disabled, SelectPermissionByUserName, currentUsername, CompleteQueue,
isAllowReorderings,
- UpdateStroageCageByCell, FinishTask, SelectGlassInfo, StorageCageAddGlass, ClaimTasks, ModeChange, UpdateQueue
+ UpdateStroageCageByCell, FinishTask, SelectGlassInfo, StorageCageAddGlass, ClaimTasks, ModeChange, UpdateQueue,importData,ManualTake,AnewMeasure
} from "../../api/home";
@@ -1050,7 +1098,21 @@
},
//浜哄伐鎷胯蛋
ManualTake() {
-
+ let s="123";
+ ManualTake(s).then(res => {
+ if (res.data.message == 200) {
+ console.log(res.data.message);
+ }
+ })
+ },
+ //閲嶆柊娴嬮噺
+ AnewMeasure() {
+ let s="123";
+ AnewMeasure(s).then(res => {
+ if (res.data.message == 200) {
+ console.log(res.data.message);
+ }
+ })
},
Change(event) {
// 鑾峰彇鍒版枃浠跺す
@@ -1081,12 +1143,15 @@
Add() {
},
- Hide() {
-
- },
- AllAdd() {
- //娣诲姞鏁版嵁杩涘悗鍙�
- console.log(this.dataList);
+ importData() {
+ //let tbdata=JSON.stringify(this.dataList);
+ let tbdata=this.dataList;
+ console.log(tbdata);
+ importData(tbdata).then(res => {
+ if (res.data.message == 200) {
+ //this.$message.success(this.$t('Operation successful'));
+ }
+ });
},
del() {
--
Gitblit v1.8.0