From 9c8c7cfb894c9377bdecba898058c9ec8d8b48c1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 13 十二月 2023 09:26:25 +0800
Subject: [PATCH] 添加复位倒计时与报警时自动弹窗
---
CanadaMes-ui/src/views/home/index.vue | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 56a13e8..0782ede 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -728,6 +728,12 @@
</el-table-column>
</el-table>
</el-dialog>
+
+ <el-dialog :visible.sync="dialogFormCountDown" :title="$t('Glass information corresponding to aluminum frame')" top="5vh">
+ <div style="font-size: 500px;text-align: center;">
+ {{ this.CountDowns }}
+ </div>
+ </el-dialog>
</el-container>
</template>
<script>
@@ -760,6 +766,7 @@
dialogFormVisible5: false,
dialogFormVisible6: false,
dialogFormVisible7: false,
+ dialogFormCountDown:false,
form: {
orderId: "",
glassId: "",
@@ -820,7 +827,7 @@
OutingQueue: true,
OrderInfo: true,
CageDetails: true,
-
+ CountDowns:0
};
},
created() {
@@ -839,7 +846,7 @@
//console.log("鎮ㄧ殑娴忚鍣ㄦ敮鎸乄ebSocket");
let socketUrl = "ws://" + this.$t('ip') + ":8888" + "/springboot-vue3/api/talk/" + viewname;
if (socket != null) {
- socket.close();
+ socket.close();this.car1
socket = null;
}
// 寮�鍚竴涓獁ebsocket鏈嶅姟
@@ -853,6 +860,7 @@
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
if (obj.params != null) {
+
this.car1 = 145 + 8.15 * Math.abs(obj.params[0][0] - this.carlist[0]['start']) / Math.abs(this.carlist[0]['end'] - this.carlist[0]['start']) * 100;
this.car2 = 210 + 8.15 * Math.abs(obj.params[0][1] - this.carlist[1]['start']) / Math.abs(this.carlist[1]['end'] - this.carlist[1]['start']) * 100;
// this.car1 = 210 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;
@@ -866,8 +874,13 @@
this.tasklist1 = obj.tasklist1[0];
this.tasklist2 = obj.tasklist2[0];
this.alarm = obj.alarmmg[0];
- //閾濇id鎻愮ず
-
+ if(this.alarm.length>0){
+ this.dialogFormVisible2=true;
+ }
+ //澶嶄綅鍊掕鏃�
+ if (obj.countdown[0]== true&&this.CountDowns==0) {
+ this.CountDown();
+ }
//鏄惁鍏佽鍑虹墖
this.isAllowQueue = obj.isAllowQueue[0];
@@ -1651,7 +1664,7 @@
},
//鍒ゆ柇鐜荤拑鏄惁瓒呭嚭鑼冨洿
Sizerange(Glass, position) {
- if (this.ManuallyInfeedGlass == true) {
+ if (this.ManuallyInfeedGlass == false) {
if ((Glass.glassheight < 380 || Glass.glasswidth < 390 || Glass.glassheight > 1810 || Glass.glasswidth > 2760) || (Glass.glassheight < 390 || Glass.glasswidth < 380 || Glass.glassheight > 2760 || Glass.glasswidth > 1810)) {
this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {
confirmButtonText: this.$t('Yes'),
@@ -1676,7 +1689,8 @@
} else {
this.disabled = false;
}
- if (position == 3 && this.isConfirmState == true) {
+ console.log(position,this.isConfirm);
+ if (position == 3 && this.isConfirm == true) {
this.InsertQueueGlass(1);
}
}
@@ -1693,6 +1707,25 @@
this.$message.success(this.$t('Operation successful'));
}
});
+ },
+ CountDown(){
+ //50绉掑�掓暟璁℃椂
+ let count = 50;
+ let timer = setInterval(
+ () => {
+ if (count > 0) {
+ this.countDown = count;
+ count--;
+ this.CountDowns=count;
+ }
+ else {
+ clearInterval(timer);
+ this.countDown = 0;
+ }
+ },
+ 1000
+ );
+
}
}
}
--
Gitblit v1.8.0