From 75375a0f68c8b91799482dc1cd2ec7d7f211167f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 31 五月 2024 09:28:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index dd67748..ef9e0c6 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -1209,7 +1209,7 @@
this.CurrentFrame = obj.CurrentFrame;
if (obj.CurrentFrame.length!=0) {
if (this.CurrentFrame[0].frameheightmm > this.CurrentFrame[0].framewidthmm) {
- if (this.CurrentFrame[0].frameheightmm < 23.62205 || this.CurrentFrame[0].framewidthmm < 15.748) {
+ if (this.CurrentFrame[0].frameheightmm < 23.62205 || this.CurrentFrame[0].framewidthmm < 15.748||this.CurrentFrame[0].frameheightmm > 144.094488 || this.CurrentFrame[0].framewidthmm > 70.8661417) {
this.framecolor1 = "red";
} else {
if (this.CurrentFrame[0].flip == 2) {
@@ -1220,7 +1220,7 @@
}
} else {
- if (this.CurrentFrame[0].frameheightmm < 15.748 || this.CurrentFrame[0].framewidthmm < 23.62205) {
+ if (this.CurrentFrame[0].frameheightmm < 15.748 || this.CurrentFrame[0].framewidthmm < 23.62205||this.CurrentFrame[0].frameheightmm > 70.8661417 || this.CurrentFrame[0].framewidthmm > 144.094488) {
this.framecolor1 = "red";
} else {
if (this.CurrentFrame[0].flip == 2) {
@@ -1258,7 +1258,7 @@
if (obj.AluminumFrameInfo != null) {
this.AluminumFrameInfo = obj.AluminumFrameInfo;
if (this.AluminumFrameInfo[0].frameheightmm > this.AluminumFrameInfo[0].framelengthmm) {
- if (this.AluminumFrameInfo[0].frameheightmm < 600 || this.AluminumFrameInfo[0].framelengthmm < 400) {
+ if (this.AluminumFrameInfo[0].frameheightmm < 600 || this.AluminumFrameInfo[0].framelengthmm < 400||this.AluminumFrameInfo[0].frameheightmm > 3660|| this.AluminumFrameInfo[0].framelengthmm > 1800) {
this.framestate = true;
this.framecolor = "red";
} else {
@@ -1271,7 +1271,7 @@
}
} else {
- if (this.AluminumFrameInfo[0].frameheightmm < 400 || this.AluminumFrameInfo[0].framelengthmm < 600) {
+ if (this.AluminumFrameInfo[0].frameheightmm < 400 || this.AluminumFrameInfo[0].framelengthmm < 600||this.AluminumFrameInfo[0].frameheightmm > 1800 || this.AluminumFrameInfo[0].framelengthmm > 3660) {
this.framestate = true;
this.framecolor = "red";
} else {
--
Gitblit v1.8.0