From 68d56160c32384f8d939df0bd25bdc9c50b042b9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 30 十月 2023 11:08:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 279 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 244 insertions(+), 35 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index cae044e..7012203 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -111,6 +111,12 @@
top: 366px; */
}
+.orderbutton {
+ position: absolute;
+ left: 1070px;
+ top: 70px;
+}
+
.blocks-img3 {
height: 90px;
max-width: 100vw;
@@ -152,7 +158,7 @@
.text {
width: auto;
-
+
white-space: nowrap;
animation: textScroll 20s linear infinite;
margin: 0 auto;
@@ -188,8 +194,8 @@
</div>
</div>
<div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
- <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid"></el-input>
- <el-button type="primary" @click="showform(1)">{{ $t('Infeed barcodid') }}</el-button>
+ <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid1"></el-input>
+ <el-button type="primary" @click="SelectGlassByGlassIDs()">{{ $t('Infeed barcodid') }}</el-button>
<el-input style="width:15%;" :placeholder="$t('Enter the order number')" v-model="order"></el-input>
<el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button>
</div>
@@ -268,6 +274,8 @@
<div class="blocks-img" :style="{ left: car2 + 'px', top: '175px' }"></div>
<div class="blocks-img2"></div>
<div class="blocks-img3"></div>
+ <el-button class="orderbutton" type="primary" @click="showform2()">{{ $t('OrderInfo') }}</el-button>
+
<!-- <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:328px;">
<div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist1" :key="item['date']"
:style="{ height: 35 * item['glassWidth'] + 'px',left:4.22*index+'px' }"
@@ -296,10 +304,9 @@
</el-footer>
<el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">
<el-form :model="form" label-width="100px" style="padding-right: 30px">
-
<el-form-item :label="$t('Barcodid')">
<el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid"></el-input>
- <el-button type="primary" @click="showform(3)">query</el-button>
+ <el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>
</el-form-item>
<el-form-item :label="$t('order')">
<el-input v-model="form.orderId" readonly autocomplete="off" />
@@ -322,10 +329,79 @@
<el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"
type="primary">{{
$t('confirm') }}</el-button>
- <el-button @click="cancal()">{{ $t('cancal') }}</el-button>
+ <el-button @click="cancel()">{{ $t('cancel') }}</el-button>
</span>
</template>
</el-dialog>
+
+ <el-dialog :visible.sync="dialogFormVisible5" :title="$t('Please confirm the glass information')">
+ <el-form :model="form" label-width="100px" style="padding-right: 30px">
+ <el-form-item style="text-align: center;">
+ <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid1"></el-input>
+ <el-button type="primary" @click="SelectGlassByGlassIDs()">{{ $t('Query') }}</el-button>
+ </el-form-item>
+ <div style="display: flex;justify-content: space-around;height: 40px;">
+ <label for="">{{ $t('Scan Code Point') }}</label>
+ <label for="">{{ $t('Upper film position') }}</label>
+ <label for="">{{ $t('Glass Information') }}</label>
+ </div>
+ <div style="display: flex;justify-content: space-around;">
+ <el-form-item :label="$t('Barcodid')">
+ <el-input v-model="form2.glassId" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Barcodid')">
+ <el-input v-model="form3.glassId" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Barcodid')">
+ <el-input v-model="form4.glassId" readonly autocomplete="off" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;justify-content: space-around;">
+ <el-form-item :label="$t('order')">
+ <el-input v-model="form2.orderId" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('order')">
+ <el-input v-model="form3.orderId" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('order')">
+ <el-input v-model="form4.orderId" readonly autocomplete="off" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;justify-content: space-around;">
+ <el-form-item :label="$t('length')">
+ <el-input v-model="form2.height" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('length')">
+ <el-input v-model="form3.height" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('length')">
+ <el-input v-model="form4.height" readonly autocomplete="off" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;justify-content: space-around;">
+ <el-form-item :label="$t('width')">
+ <el-input v-model="form2.width" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('width')">
+ <el-input v-model="form3.width" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('width')">
+ <el-input v-model="form4.width" readonly autocomplete="off" />
+ </el-form-item>
+ </div>
+
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="InsertQueueGlass()" type="primary" :disabled="disabled">{{ $t('confirm')
+ }}</el-button>
+ <el-button @click="InsertQueueGlass()" type="primary" :disabled="disabled">{{ $t('confirm')
+ }}</el-button>
+ <el-button @click="cancel3()">{{ $t('cancel') }}</el-button>
+ </span>
+ </template>
+ </el-dialog>
+
<el-dialog :visible.sync="dialogFormVisible1" :title="$t('Please confirm the Ordering Information')">
<el-form :model="form1" label-width="100px" style="padding-right: 30px">
<el-form-item :label="$t('order')">
@@ -338,7 +414,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>
- <el-button @click="cancal1()">{{ $t('cancal') }}</el-button>
+ <el-button @click="cancel1()">{{ $t('cancel') }}</el-button>
</span>
</template>
</el-dialog>
@@ -353,7 +429,7 @@
<el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">
<el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">
<el-table-column :width="90" prop="cage" :label="$t('The Cage number')"></el-table-column>
- <el-table-column :width="90" prop="cell" :label="$t('The Slot Number')"></el-table-column>
+ <el-table-column :width="90" prop="cell" :label="$t('The Slot Number')"></el-table-column>
<el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>
<el-table-column :width="100" prop="glassId" :label="$t('Barcodid')"></el-table-column>
<el-table-column :width="100" prop="orderId" :label="$t('Order Number')"></el-table-column>
@@ -376,13 +452,49 @@
</el-table-column>
</el-table>
</el-dialog>
+ <el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">
+ <el-input style="width:15%;" :placeholder="$t('Enter the Order lD')" v-model="orderid"></el-input>
+ <el-button type="primary" @click="selectglassinfo()">{{ $t('Query') }}</el-button>
+ <el-table :data="GlassInfo.slice((currentPage - 1) * pagesize, currentPage * pagesize)
+ " :height="700" border style="width: 100%;overflow: auto;">
+ <el-table-column prop="glassId" :label="$t('Barcodid')"></el-table-column>
+ <el-table-column prop="orderId" :label="$t('Order Number')"></el-table-column>
+ <el-table-column prop="width" :label="$t('length')"></el-table-column>
+ <el-table-column prop="height" :label="$t('width')"></el-table-column>
+ </el-table>
+
+
+ <!-- <el-table :data="tableDatas.slice((currentPage - 1) * pagesize, currentPage * pagesize)
+ " style="width: 100%">
+ <el-table-column label="Date" prop="date"> </el-table-column>
+ <el-table-column label="Name" prop="name"> </el-table-column>
+ <el-table-column label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Edit</el-button>
+ <el-button size="mini" type="danger"
+ @click="handleDelete(scope.$index, scope.row)">Delete</el-button>
+ </template>
+ </el-table-column>
+ </el-table> -->
+
+ <!-- 琛ㄦ牸鍒嗛〉 -->
+ <!-- pager-count pager-count灞炴�у彲浠ヨ缃渶澶ч〉鐮佹寜閽暟,瓒呭嚭鎶樺彔,榛樿涓�7-->
+ <!-- 娉ㄦ剰锛氳嫢鏁版嵁鏄悗绔帴鍙ｈ繑鍥炵殑鍒欐鏃�:total="pageCount"-->
+ <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :pager-count="7" :current-page="currentPage" :page-sizes="[5, 10, 15, 20]" :page-size="pagesize"
+ layout="total, sizes, prev, pager, next, jumper" :total="GlassInfo.length > 0 ? GlassInfo.length : null"
+ background style="float: right; margin-top: 20px">
+ </el-pagination>
+
+
+ </el-dialog>
</el-container>
</template>
<script>
//:disabled="scope.row.glassId > 0 || scope.row.disabled == 1 ? true : false"
import {
- home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo,
- SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword, SelectGlassByGlassID, Disabled, Inglassid
+ home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,
+ SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId
} from "../../api/home";
@@ -403,6 +515,8 @@
dialogFormVisible1: false,
dialogFormVisible2: false,
dialogFormVisible3: false,
+ dialogFormVisible4: false,
+ dialogFormVisible5: false,
form: {
orderId: "",
glassId: "",
@@ -412,6 +526,24 @@
form1: {
order: "NG2210210",
number: 800,
+ },
+ form2: {
+ orderId: "1145",
+ glassId: "112",
+ height: "59.06",
+ width: "48.03"
+ },
+ form3: {
+ orderId: "1",
+ glassId: "2",
+ height: "3",
+ width: "4"
+ },
+ form4: {
+ orderId: "",
+ glassId: "",
+ height: "",
+ width: ""
},
alarm: [],
tableData: [],
@@ -425,6 +557,7 @@
tasklist2: [],
order: "",
glassid: "",
+ glassid1: "",
url: "../../img/bigcar01.png",
car1: 145,
car2: 210,
@@ -436,7 +569,14 @@
loadglassheight: 0,
password: 1,
text: "",
- zhuangtai: ""
+ zhuangtai: "",
+ orderid: "",
+ GlassInfo: [],
+ disabled: true,
+ disabled1: true,
+ currentPage: 1, //榛樿鍒濆椤�
+ pagesize: 15, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
+ pageCount: 0
};
},
created() {
@@ -464,7 +604,6 @@
};
// 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
socket.onmessage = function (msg) {
-
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
if (obj.params != null) {
@@ -483,11 +622,23 @@
this.alarm = obj.alarmmg[0];
this.loadglassheight = obj.loadglassheight;
this.zhuangtai = obj.zhuangtai[0];
+
+ this.glassid1 = obj.queid[0];
+ if (this.glassid1 != "") {
+ this.disabled1=false;
+ this.showform3();
+ }
+ this.form2 = obj.form2;
+ this.form2 = obj.form3;
+
//if (obj.dbconnected == "false") {
this.text = this.$t('DataBase Connection failed');
// }
SelectCageInfo(this.cage).then(res => {
this.cageinfo = res.data.cageinfo;
+ });
+ SelectGlass(this.orderid).then(res => {
+ this.GlassInfo = res.data.glass;
});
this.$forceUpdate();
@@ -504,36 +655,34 @@
}
},
load() {
+ //鍔犺浇绗煎瓙浣跨敤鎯呭喌鏁版嵁
home().then(res => {
this.tableData = res.data.list;
});
+ //鍔犺浇鐞嗙墖绗肩幓鐠冩暟鎹�
home2().then(res => {
this.cagelist1 = res.data.list1;
this.cagelist2 = res.data.list2;
this.cagelist3 = res.data.list3;
this.cagelist4 = res.data.list4;
});
+ //鍔犺浇杩涚墖浠诲姟鏁版嵁
loadtask(this.task1).then(res => {
this.tasklist1 = res.data.list;
- if (res.data.list.length > 0) {
- this.incell = this.tasklist1[0]['cell'];
- }
});
- loadtask(this.task2).then(res => {
- this.tasklist2 = res.data.list;
- if (res.data.list.length > 0) {
- this.outcell = this.tasklist2[0]['cell'];
- }
- });
+ //鍔犺浇杩涘嚭鐗囦换鍔℃暟鎹�
loadtask(this.task2).then(res => {
this.tasklist2 = res.data.list;
});
+ //鍔犺浇鎶ヨ淇℃伅
SelectAlarmmgInfo().then(res => {
this.alarm = res.data.alarmmg;
});
+ //鍔犺浇灏忚溅浣嶇疆淇℃伅
Loadcarlist().then(res => {
this.carlist = res.data.carlist;
});
+ //鍔犺浇纭瀵嗙爜
SelectPassword().then(res => {
this.password = res.data.password;
});
@@ -578,7 +727,7 @@
Addglassid(this.glassid).then(res => {
if (res.data.message2 == 200) {
this.$message.success(this.$t('Operation successful'));
- this.cancal();
+ this.cancel();
} else if (res.data.message2 == 500) {
this.$message.error(this.$t('There are currently tasks'));
}
@@ -595,6 +744,7 @@
}
}
},
+ //鏄剧ず纭鐜荤拑淇℃伅涔熸病
showform(buttons) {
if (buttons == 1) {
this.confirm1 = true;
@@ -603,17 +753,19 @@
this.confirm1 = false;
this.confirm2 = true;
}
+ //鏍规嵁杈撳叆鐨勭幓鐠僫d鑾峰彇鐜荤拑淇℃伅
SelectGlassByGlassID(this.glassid).then(res => {
if (res.data.form != null) {
this.form = res.data.form;
this.dialogFormVisible = true;
- this.$message.success('query was successful');
+ this.$message.success(this.$t('query was successful'));
} else {
this.dialogFormVisible = true;
this.$message.error(this.$t('There is no such glass'));
}
});
},
+ //鏄剧ず璁㈠崟淇℃伅椤甸潰
showform1() {
if (this.order != "") {
this.form1 =
@@ -623,10 +775,41 @@
};
this.dialogFormVisible1 = true;
}
-
-
},
- cancal() {
+ //鏄剧ず鎵爜浣嶅拰涓婄墖浣�
+ showform3(){
+ this.dialogFormVisible5 = true;
+ },
+ //鑾峰彇鎵爜浣嶅拰涓婄墖浣嶆暟鎹�
+ SelectGlassByGlassIDs() {
+ this.showform3();
+ SelectGlassByGlassID(this.glassid1).then(res => {
+ if (res.data.form != null) {
+ this.form4 = res.data.form;
+ this.$message.success(this.$t('query was successful'));
+ } else {
+ this.$message.error(this.$t('There is no such glass'));
+ }
+ if (this.form2.glassId == "") {
+ this.disabled = false;
+ } else {
+ this.disabled = true;
+ }
+ });
+ },
+ selectglassinfo() {
+ SelectGlass(this.orderid).then(res => {
+ this.GlassInfo = res.data.glass;
+ });
+ },
+ showform2() {
+ SelectGlass(this.orderid).then(res => {
+ this.GlassInfo = res.data.glass;
+ });
+ this.dialogFormVisible4 = true;
+ },
+ //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
+ cancel() {
this.dialogFormVisible = false;
this.form = {
orderId: "",
@@ -635,10 +818,16 @@
width: ""
};
},
- cancal1() {
+ //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
+ cancel1() {
this.dialogFormVisible1 = false;
this.form1 = {};
},
+ cancel3() {
+ this.dialogFormVisible5 = false;
+ this.form1 = {};
+ },
+ //缁撴潫杩�/鍑虹墖浠诲姟
endtask(type, glassid, cell) {
this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
inputType: 'password',
@@ -663,6 +852,7 @@
});
});
},
+ //鏄剧ず鐞嗙墖绗艰鎯呬俊鎭�
showcageinfo(cage) {
this.cage = cage;
SelectCageInfo(cage).then(res => {
@@ -670,6 +860,7 @@
this.dialogFormVisible3 = true;
});
},
+ //鍒犻櫎鐞嗙墖绗肩幓鐠�
deleteglass(glassid, state) {
this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
inputType: 'password',
@@ -699,6 +890,7 @@
});
});
},
+ //鎵嬪姩鍑虹墖
outglass(glassid, state) {
this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
inputType: 'password',
@@ -733,6 +925,7 @@
});
});
},
+ //鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
insertglass(cage, cell, tier) {
this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
inputType: 'password',
@@ -742,14 +935,6 @@
type: 'warning'
}).then(({ value }) => {
if (this.password == value) {
- // OutByGlassID(glassid).then(res => {
- // if (res.data.message3 == 200) {
- // this.$message.success(this.$t('Operation successful'));
- // }
- // else if (res.data.message2 == 300) {
- // this.$message.error(this.$t('There is no such grid'));
- // }
- // });
this.insertcage = cage;
this.insertcell = cell;
this.inserttier = tier;
@@ -764,6 +949,7 @@
});
});
},
+ //鎵嬪姩涓婄墖
FeedInglassid() {
Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
if (this.form.glassId != "") {
@@ -779,12 +965,35 @@
});
},
+ //鍚敤//鐞嗙墖绗肩鐢�
UpdateDisabled(cage, cell, disabled) {
Disabled(cage, cell, disabled).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
}
});
+ },
+ handleEdit(index, row) {
+ console.log(index, row);
+ },
+ //琛ㄦ牸鍒犻櫎
+ handleDelete(index, row) {
+ console.log(index, row);
+ },
+ //鏀瑰彉姣忛〉瀹圭撼鐨勬暟鎹噺
+ handleSizeChange: function (size) {
+ this.pagesize = size;
+ },
+ //鍒囨崲椤电爜
+ handleCurrentChange: function (currentPage) {
+ this.currentPage = currentPage;
+ },
+ InsertQueueGlass() {
+ InsertQueueGlassId(this.glassid1).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
}
}
}
--
Gitblit v1.8.0