From cb8959244281f922d3a972472853d0bb1df1e5b8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 20 十二月 2023 13:35:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index ed730fa..2c0efa2 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -472,7 +472,7 @@
<el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChanges"
@current-change="handleCurrentChanges" :pager-count="7" :current-page="currentPages"
- :page-sizes="[21, 42, 84, 420]" :page-size="pagesizes" layout="total, sizes, prev, pager, next, jumper"
+ :page-sizes="[42, 84, 126, 420]" :page-size="pagesizes" layout="total, sizes, prev, pager, next, jumper"
:total="cageinfo.length > 0 ? cageinfo.length : null" background style="float: right; margin-top: 20px">
</el-pagination>
@@ -649,9 +649,13 @@
</template>
</el-table-column>
<el-table-column prop="sequence" :label="$t('Sequence')"></el-table-column>
- <el-table-column prop="position" :label="$t('Position')" style="font-size: 20px;">
+ <el-table-column :min-width="300" prop="position" :label="$t('Position')" style="font-size: 20px;">
<template slot-scope='scope'>
- {{ scope.row.position == 1 ? "鈻勨杽鈻�" : "鈻�" }}
+ <!-- {{ scope.row.position == 1 ? "<>鈻勨杽鈻�" : "鈻�" }} -->
+ <div :style="'width:'+(scope.row.position==1?'300':'100') +'px;height:'+(scope.row.position==1?'100':'300') +'px;background-Color:gray;'">
+ <!-- <div :style="'width:100px;height:300px;background-Color:red;'"></div> -->
+ </div>
+ <!-- {{ scope.row.position == 1 ? "<div></div>" : "<div></div>" }} -->
</template>
</el-table-column>
<el-table-column prop="position" :label="$t('Flip')">
@@ -733,6 +737,7 @@
<el-dialog :visible.sync="dialogFormCountDown" :title="$t('Approximately resettable time')" top="5vh">
<div :style="'font-size: ' + PromptSize + 'px;text-align: center;'">
+ <!-- {{ this.CountDowns }} -->
{{ this.CountDowns }}
</div>
</el-dialog>
@@ -816,7 +821,7 @@
pagesize: 15, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
pageCount: 0,
currentPages: 1, //榛樿鍒濆椤�
- pagesizes: 21, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
+ pagesizes: 42, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
pageCounts: 0,
OutSlice: [],
AluminumFrame: [],
@@ -829,15 +834,15 @@
OutingQueue: true,
OrderInfo: true,
CageDetails: true,
- CountDowns: "EMERGENCY STOP",
+ CountDowns: "EMERGENCY \r\n STOP",
D01RequestState: false,
EmergencyStop: false,
- PromptSize: 250
+ PromptSize: 250,
+ reset:false
};
},
created() {
this.load();
-
this.init();
}
,
@@ -885,13 +890,15 @@
}
//鏄惁鎬ュ仠
this.EmergencyStop = obj.emergencystop[0];
+ console.log(this.EmergencyStop);
//澶嶄綅鍊掕鏃�
if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {
this.CountDown();
}
+ //澶嶄綅瀹屾垚淇″彿
+ this.reset=obj.reset[0];
//鏄惁鏈夎繘鐗囪姹�
- console.log(obj.D01RequestState[0]);
this.D01RequestState = obj.D01RequestState[0];
//鏄惁鍏佽鍑虹墖
@@ -947,8 +954,6 @@
this.cageinfo = res.data.cageinfo;
});
}
-
-
this.$forceUpdate();
}.bind(this);
@@ -983,6 +988,10 @@
});
});
+ //鍔犺浇灏忚溅浣嶇疆淇℃伅
+ Loadcarlist().then(res => {
+ this.carlist = res.data.carlist;
+ });
//鍔犺浇绗煎瓙浣跨敤鎯呭喌鏁版嵁
home().then(res => {
this.tableData = res.data.list;
@@ -1011,10 +1020,7 @@
SelectAlarmmgInfo().then(res => {
this.alarm = res.data.alarmmg;
});
- //鍔犺浇灏忚溅浣嶇疆淇℃伅
- Loadcarlist().then(res => {
- this.carlist = res.data.carlist;
- });
+
//鍔犺浇纭瀵嗙爜
SelectPassword().then(res => {
this.password = res.data.password;
@@ -1067,7 +1073,7 @@
this.$message.error(this.$t('There is no such glass'));
}
else if (res.data.message2 == 400) {
- this.$message.error(this.$t('There is no such grid'));
+ this.$message.error(this.$t('There is no such slot'));
}
});
} else {
@@ -1418,6 +1424,7 @@
this.form5 = {};
this.$message.success(this.$t('Operation successful'));
} else {
+ alert(1);
this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
}
});
@@ -1628,7 +1635,7 @@
rowIndex = column;
let style = "";
if (columnIndex === 8) {
- style = "font-size:25px;text-align: center;";
+ style = "font-size:200px;text-align: center;height:200px;";
}
if (columnIndex === 9 && row.flip == 1) {
style = "background-Color:yellow;";
@@ -1731,7 +1738,7 @@
if (this.EmergencyStop == true) {
clearInterval(timer);
this.PromptSize = 250;
- this.CountDowns = "EMERGENCY STOP";
+ this.CountDowns = "EMERGENCY \n STOP";
} else {
if (count > 0) {
this.PromptSize = 500;
@@ -1740,12 +1747,11 @@
}
else {
this.PromptSize = 250;
- this.CountDowns = "Waiting for reset";
-
- // if(澶嶄綅瀹屾垚==true){
- // clearInterval(timer);
- // this.dialogFormCountDown = false;
- // }
+ this.CountDowns = "Waiting \n for \n reset";
+ if(this.reset==true){
+ clearInterval(timer);
+ this.dialogFormCountDown = false;
+ }
}
}
},
--
Gitblit v1.8.0