From 356edc5f8597f69bcd92b4cf46f5c32914e54db8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 21 四月 2025 16:53:58 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/hollow/hollowaluminumthree.vue | 12 ++++++------
UI-Project/src/views/hollow/hollowaluminumtwo.vue | 12 ++++++------
UI-Project/src/views/Caching/cachingunhistory.vue | 12 ++++++------
UI-Project/src/views/hollow/hollowaluminum.vue | 12 ++++++------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingunhistory.vue b/UI-Project/src/views/Caching/cachingunhistory.vue
index feabe45..bebbc58 100644
--- a/UI-Project/src/views/Caching/cachingunhistory.vue
+++ b/UI-Project/src/views/Caching/cachingunhistory.vue
@@ -168,8 +168,8 @@
endTime: getglobalDate
})
if (response.code == 200) {
- countOutTwo.value = response.data.countOutTwo
- totalAreaOutTwo.value = response.data.totalAreaOutTwo
+ countOutOne.value = response.data.countOutOne
+ totalAreaOutOne.value = response.data.totalAreaOutOne
} else {
ElMessage.error(response.message);
}
@@ -223,8 +223,8 @@
endDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[1])) || '',
})
if (response.code == 200) {
- countOutTwo.value = response.data.countOutTwo
- totalAreaOutTwo.value = response.data.totalAreaOutTwo
+ countOutOne.value = response.data.countOutOne
+ totalAreaOutOne.value = response.data.totalAreaOutOne
} else {
ElMessage.error(response.message);
}
@@ -278,8 +278,8 @@
endDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[1])) || '',
})
if (response.code == 200) {
- countOutTwo.value = response.data.countOutTwo
- totalAreaOutTwo.value = response.data.totalAreaOutTwo
+ countOutOne.value = response.data.countOutOne
+ totalAreaOutOne.value = response.data.totalAreaOutOne
} else {
ElMessage.error(response.message);
}
diff --git a/UI-Project/src/views/hollow/hollowaluminum.vue b/UI-Project/src/views/hollow/hollowaluminum.vue
index 7bc8734..bb3a06c 100644
--- a/UI-Project/src/views/hollow/hollowaluminum.vue
+++ b/UI-Project/src/views/hollow/hollowaluminum.vue
@@ -119,11 +119,11 @@
const getColorByState = (state) => {
switch (state) {
case -2: return "gray";
- case -1: return "gray";
- case 0: return "gray";
- case 1: return "green";
+ case -1: return "#99BBFF";
+ case 0: return "#7AC5CD";
+ case 1: return "#95d475";
case 8: return "#911005";
- default: return "black";
+ default: return "#CDAF95";
}
};
</script>
@@ -141,7 +141,7 @@
height: `${item.height*0.3}px`,
backgroundColor: getColorByState(item.state),
}">
- <div style="color: aquamarine;">
+ <div style="color: #090909;">
<p>{{ item.flowCardId }}</p>
<p>{{ $t('basicData.widtha') }}{{ item.width }}</p>
<p>{{ $t('basicData.heighta') }}{{ item.height }}</p>
@@ -195,7 +195,7 @@
text-align: center;
}
.el-carousel__item:nth-child(2n) {
- background-color: #99a9bf;
+ background-color: #d3dce6;
}
.el-carousel__item:nth-child(2n + 1) {
background-color: #d3dce6;
diff --git a/UI-Project/src/views/hollow/hollowaluminumthree.vue b/UI-Project/src/views/hollow/hollowaluminumthree.vue
index 5689ac4..ca38b90 100644
--- a/UI-Project/src/views/hollow/hollowaluminumthree.vue
+++ b/UI-Project/src/views/hollow/hollowaluminumthree.vue
@@ -119,11 +119,11 @@
const getColorByState = (state) => {
switch (state) {
case -2: return "gray";
- case -1: return "gray";
- case 0: return "gray";
- case 1: return "green";
+ case -1: return "#99BBFF";
+ case 0: return "#7AC5CD";
+ case 1: return "#95d475";
case 8: return "#911005";
- default: return "black";
+ default: return "#CDAF95";
}
};
</script>
@@ -141,7 +141,7 @@
height: `${item.height*0.3}px`,
backgroundColor: getColorByState(item.state),
}">
- <div style="color: aquamarine;">
+ <div style="color: #090909;">
<p>{{ item.flowCardId }}</p>
<p>{{ $t('basicData.widtha') }}{{ item.width }}</p>
<p>{{ $t('basicData.heighta') }}{{ item.height }}</p>
@@ -195,7 +195,7 @@
text-align: center;
}
.el-carousel__item:nth-child(2n) {
- background-color: #99a9bf;
+ background-color: #d3dce6;
}
.el-carousel__item:nth-child(2n + 1) {
background-color: #d3dce6;
diff --git a/UI-Project/src/views/hollow/hollowaluminumtwo.vue b/UI-Project/src/views/hollow/hollowaluminumtwo.vue
index 930ea5f..85c4489 100644
--- a/UI-Project/src/views/hollow/hollowaluminumtwo.vue
+++ b/UI-Project/src/views/hollow/hollowaluminumtwo.vue
@@ -119,11 +119,11 @@
const getColorByState = (state) => {
switch (state) {
case -2: return "gray";
- case -1: return "gray";
- case 0: return "gray";
- case 1: return "green";
+ case -1: return "#99BBFF";
+ case 0: return "#7AC5CD";
+ case 1: return "#95d475";
case 8: return "#911005";
- default: return "black";
+ default: return "#CDAF95";
}
};
</script>
@@ -141,7 +141,7 @@
height: `${item.height*0.3}px`,
backgroundColor: getColorByState(item.state),
}">
- <div style="color: aquamarine;">
+ <div style="color: #090909;">
<p>{{ item.flowCardId }}</p>
<p>{{ $t('basicData.widtha') }}{{ item.width }}</p>
<p>{{ $t('basicData.heighta') }}{{ item.height }}</p>
@@ -195,7 +195,7 @@
text-align: center;
}
.el-carousel__item:nth-child(2n) {
- background-color: #99a9bf;
+ background-color: #d3dce6;
}
.el-carousel__item:nth-child(2n + 1) {
background-color: #d3dce6;
--
Gitblit v1.8.0