From 6bf8a537012962b8eb7daef698da1cc46b8310f6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 九月 2023 09:52:49 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 66 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 7900d17..6695ee4 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -59,36 +59,36 @@
}
.gezi {
- height: 25px;
- width: 3.25px;
+ height: 35px;
+ width: 4.22px;
}
.gezi:nth-child(22),
.gezi:nth-child(43),
.gezi:nth-child(64),
.gezi:nth-child(85) {
- margin-left: 7.7px;
+ margin-left: 10px;
}
.blocks {
- min-height: 49vh;
+ min-height: 55vh;
max-width: 100vw;
background-image: url('../../img/xmjc.png');
margin: 0 auto;
background-repeat: no-repeat;
/* background-size: 100% 100%; */
- background-size: 1280px 377px;
+ background-size: 1660px 560px;
background-attachment: local;
- width: 1280px;
+ width: 1660px;
}
.blocks-img {
height: 100px;
max-width: 100vw;
background-repeat: no-repeat;
- background-size: 32px 66px;
+ background-size: 46px 94px;
background-attachment: local;
width: 32px;
@@ -142,7 +142,7 @@
<el-container>
<!-- <el-header style="padding: 10px;"></el-header> -->
<el-main>
- <div class="box">
+ <div class="box" @click="dialogFormVisible2 = true">
<div class="text">
Alarm:
<label v-for="item in this.alarm" :key="item['id']">
@@ -162,7 +162,7 @@
<el-table-column prop="glassId" label="Coming out glass ID"></el-table-column>
<el-table-column :width="250" prop="cell" label="The Grille number being used"></el-table-column>
<el-table-column prop="orderId" label="Order Nmuber"></el-table-column>
- <el-table-column prop="lengthwidth" label="Length and width"></el-table-column>
+ <el-table-column prop="lengthWidth" label="Length and width"></el-table-column>
<el-table-column prop="coating" label="coating"></el-table-column>
<el-table-column label="Operate">
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="endtask(0)">end
@@ -173,7 +173,7 @@
<el-table-column prop="glassId" label="Incoming glass ID"></el-table-column>
<el-table-column :width="250" prop="cell" label="The Grille number being used"></el-table-column>
<el-table-column prop="orderId" label="Order Nmuber"></el-table-column>
- <el-table-column prop="lengthwidth" label="Length and width"></el-table-column>
+ <el-table-column prop="lengthWidth" label="Length and width"></el-table-column>
<el-table-column prop="coating" label="coating"></el-table-column>
<el-table-column label="Operate">
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="endtask(1)">end
@@ -196,22 +196,22 @@
</el-main>
<el-footer>
<div class="blocks" style="position: relative;">
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:76px;left:253px;">
+ <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:328px;">
<div :class="getStatusClass(item.state)" v-for="item in cagelist1" :key="item['date']"></div>
</div>
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:76px;left:682.5px;">
+ <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:885px;">
<div :class="getStatusClass(item.state)" v-for="item in cagelist2" :key="item['date']"></div>
</div>
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:102px;left:253px;">
+ <div style="display:flex;position: absolute;float:left;z-index: 999;top:154px;left:328px;">
<div :class="getStatusClass(item.state)" v-for="item in cagelist3" :key="item['date']"></div>
</div>
- <div style="display:flex;position: absolute;float:left;z-index: 999;top:102px;left:682.5px;">
+ <div style="display:flex;position: absolute;float:left;z-index: 999;top:154px;left:885px;">
<div :class="getStatusClass(item.state)" v-for="item in cagelist4" :key="item['date']"></div>
</div>
- <div class="blocks-img" :style="{ left: car1 + 'px', top: '10px' }">
+ <div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }">
</div>
- <div class="blocks-img" :style="{ left: car2 + 'px', top: '129px' }">
+ <div class="blocks-img" :style="{ left: car2 + 'px', top: '194px' }">
</div>
</div>
@@ -254,6 +254,15 @@
</span>
</template>
</el-dialog>
+ <el-dialog :visible.sync="dialogFormVisible2" title="Ordering Information">
+ <el-table :data="this.alarm" border style="width: 100%;">
+ <el-table-column prop="id" label="id"></el-table-column>
+ <el-table-column prop="content" label="content"></el-table-column>
+ <el-table-column prop="timeons" label="timeon"></el-table-column>
+
+ <el-table-column prop="endTime" label="endTime"></el-table-column>
+ </el-table>
+ </el-dialog>
</el-container>
</template>
@@ -261,13 +270,16 @@
import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo } from "../../api/home";
+import LanguageMixin from '../../lang/LanguageMixin'
let socket;
export default {
name: "Home",
data() {
return {
+ mixins: [LanguageMixin],
dialogFormVisible: false,
dialogFormVisible1: false,
+ dialogFormVisible2: false,
form: {
orderno: "NG2210210",
length: 800,
@@ -291,8 +303,8 @@
order: "",
glassid: "",
url: "../../img/bigcar01.png",
- car1: 116,
- car2: 187,
+ car1: 150,
+ car2: 242,
incell: "",
outcell: ""
};
@@ -309,7 +321,6 @@
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
//console.log("鎮ㄧ殑娴忚鍣ㄦ敮鎸乄ebSocket");
-
let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
if (socket != null) {
socket.close();
@@ -326,10 +337,9 @@
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
- //this.$set(this.record.params, 0, obj.params[0]);
- this.car1 = 116 + 18.88 * obj.params[0][0];
- this.car2 = 187 + 18.8 * obj.params[0][1];
+ this.car1 = 150 + 24.6 * obj.params[0][0];
+ this.car2 = 242 + 24.6 * obj.params[0][1];
this.tableData = obj.tableData[0];
this.cagelist1 = obj.cagelist1[0];
this.cagelist2 = obj.cagelist2[0];
@@ -401,7 +411,7 @@
//鏍规嵁鏍煎瓙鐘舵�佷慨鏀归鑹�
getStatusClass(state) {
if (state == 0) {
- return "green gezi";
+ return "gezi";
} else if (state == 1) {
return "blue gezi";
} else if (state == 2) {
@@ -487,6 +497,16 @@
}
+ },
+ formatDate(timestamp) {
+ const date = new Date(timestamp);
+ const year = date.getFullYear();
+ const month = date.getMonth() + 1;
+ const day = date.getDate();
+ const hours = date.getHours();
+ const minutes = date.getMinutes();
+ const seconds = date.getSeconds();
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
}
--
Gitblit v1.8.0