-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
@@ -156,15 +174,31 @@ export default {
#techy-body-part {
flex: 1 1;
- padding: calc(100vw / 1920 * 24);
+ display: flex;
+ /* gap: 16px; */
+ gap: calc(100vmin / 1920 * 36);
+ flex-direction: column;
+}
+
+.upper-part {
+ flex: 1 1;
+ padding: calc(100vmin / 1920 * 36);
+ padding-bottom: 0;
display: flex;
justify-content: space-between;
}
+.bottom-part {
+ padding: 0 calc(100vmin / 1920 * 36) calc(100vmin / 1920 * 36);
+ display: flex;
+ /* gap: 16px; */
+ gap: calc(100vmin / 1920 * 36);
+}
+
.techy-body-part__left,
.techy-body-part__right {
height: 100%;
- width: 30%;
+ width: 25%;
min-width: 480px;
overflow: hidden;
/* background: rgba(20, 69, 100, 0.425);
@@ -172,17 +206,17 @@ export default {
display: flex;
flex-direction: column;
- gap: calc(100vw / 1920 * 16);
+ gap: calc(100vmin / 1920 * 36);
}
-.techy-body-part__left {
+/* .techy-body-part__left {
width: 35%;
-}
+} */
.techy-body-part__right-col-2 {
flex: 1;
display: flex;
- gap: calc(100vw / 1920 * 16);
+ gap: calc(100vmin / 1920 * 36);
}
.techy-body-part__middle {
diff --git a/src/views/ChoicePart/index.vue b/src/views/ChoicePart/index.vue
index 3e12979..ef8c96f 100644
--- a/src/views/ChoicePart/index.vue
+++ b/src/views/ChoicePart/index.vue
@@ -144,8 +144,8 @@ export default {
min-width: 100%;
min-height: 100vh;
// background: linear-gradient(-45deg, rgb(25, 25, 200), rgb(0, 100, 200));
- background: url('../../assets/img/choicepart/choicepart-back.png') repeat;
- background-size: cover;
+ background: url('../../assets/img/choicepart/choicepart-back.jpg') repeat;
+ background-size: 100% 100%;
overflow-x: scroll;
.choicepart-box {
width: 1440px;
@@ -161,7 +161,7 @@ export default {
background: url('../../assets/img/choicepart/choice-item-back.png') no-repeat;
background-size: 100% 100%;
// border: 1px dashed #fff;
- box-shadow: 0 2px 10px rgba(0, 0, 0, 0.5);
+ // box-shadow: 0 2px 10px rgba(0, 0, 0, 0.5);
top: 0;
border-radius: 5px;
overflow: hidden;
@@ -174,7 +174,7 @@ export default {
.choicepart-item-border {
height: 100%;
border-radius: 5px;
- padding: 0 5px;
+ // padding: 0 5px;
line-height: 32px;
font-size: 28px;
font-weight: lighter;
diff --git a/src/views/EquipmentManager/HomePage.vue b/src/views/EquipmentManager/HomePage.vue
index f8d7206..e3a81d4 100644
--- a/src/views/EquipmentManager/HomePage.vue
+++ b/src/views/EquipmentManager/HomePage.vue
@@ -408,14 +408,14 @@ export default {
border: none;
outline: none;
border-radius: 2px 4px 4px 2px;
- background: #31878c88;
+ background: #31878c45;
/* opacity: 0.29; */
color: white;
position: absolute;
padding: 0.5vh;
width: 5vw;
- font-size: 1vh;
- line-height: 1.2vh;
+ font-size: 12px;
+ line-height: 18px;
top: calc(1vh + 8px);
left: calc(5vw + 32px);
}
diff --git a/src/views/EquipmentManager/components/EquipmentAnalysisBox.vue b/src/views/EquipmentManager/components/EquipmentAnalysisBox.vue
index 9f23003..cb64904 100644
--- a/src/views/EquipmentManager/components/EquipmentAnalysisBox.vue
+++ b/src/views/EquipmentManager/components/EquipmentAnalysisBox.vue
@@ -56,7 +56,7 @@ const ProgreeBar = {
width: '100%',
borderRadius: '8px',
position: 'relative',
- background: '#1E2D45',
+ background: '#1E2D4590',
// background: 'red',
overflow: 'hidden'
}
diff --git a/src/views/EquipmentManager/components/TechyBox.vue b/src/views/EquipmentManager/components/TechyBox.vue
index fe75fde..e8e0a62 100644
--- a/src/views/EquipmentManager/components/TechyBox.vue
+++ b/src/views/EquipmentManager/components/TechyBox.vue
@@ -11,7 +11,7 @@ export default {}
diff --git a/src/views/QualityManager/components/TechyAnalysisBar.vue b/src/views/QualityManager/components/TechyAnalysisBar.vue
index 8d5c696..7096507 100644
--- a/src/views/QualityManager/components/TechyAnalysisBar.vue
+++ b/src/views/QualityManager/components/TechyAnalysisBar.vue
@@ -22,7 +22,7 @@ export default {
filters: {
amountFilter: val => {
const sVal = val.toString()
- return sVal.length > 7 ? sVal.slice(6) + '...' : sVal
+ return sVal.length > 7 ? sVal.slice(0, 6) + '...' : sVal
}
},
props: {
@@ -79,6 +79,8 @@ export default {
overflow: hidden;
min-width: 32px;
position: relative;
+ display: flex;
+ justify-content: center;
}
.placeholder-block-wrapper > div {
@@ -176,14 +178,19 @@ export default {
overflow: hidden;
color: white;
display: inline-block;
- padding: 0 8px;
+ padding: 3px 8px;
+ font-size: 14px;
+ line-height: 12px;
}
.quality-analysis-bar__amount {
- color: white;
+ color: rgba(255, 255, 255, 0.725);
display: inline-block;
/* min-width: 35%; */
width: 35%;
text-align: left;
+ padding: 3px 0;
+ font-size: 14px;
+ line-height: 12px;
}
diff --git a/src/views/QualityManager/components/TechyBox.vue b/src/views/QualityManager/components/TechyBox.vue
index fe75fde..58db68d 100644
--- a/src/views/QualityManager/components/TechyBox.vue
+++ b/src/views/QualityManager/components/TechyBox.vue
@@ -16,5 +16,6 @@ export default {}
height: 100%;
width: 100%;
border-radius: .25rem;
+ position: relative;
}
diff --git a/src/views/QualityManager/components/TechyHeader.vue b/src/views/QualityManager/components/TechyHeader.vue
index 5587394..5d2c835 100644
--- a/src/views/QualityManager/components/TechyHeader.vue
+++ b/src/views/QualityManager/components/TechyHeader.vue
@@ -4,18 +4,42 @@
{{ headTitle }}
-
-
+
+