@@ -332,6 +332,9 @@ export default {
.visual-container {
width: 100%;
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
background: url('./assets/bg.png') no-repeat;
background-size: cover;
overflow: hidden;
@@ -339,7 +342,8 @@ export default {
}
.techy-body {
- height: calc(100vh - 64px);
+ flex: 1 0;
+ height: 65vh;
width: 100%;
padding: calc(24px * var(--beilv));
display: flex;
diff --git a/src/views/EquipmentManager/components/TechyContainer.vue b/src/views/EquipmentManager/components/TechyContainer.vue
index 94ce31e..bdcab67 100644
--- a/src/views/EquipmentManager/components/TechyContainer.vue
+++ b/src/views/EquipmentManager/components/TechyContainer.vue
@@ -12,7 +12,7 @@
-
+
{{ title }}
@@ -21,6 +21,8 @@
diff --git a/src/views/EquipmentManager/components/TechyHeader.vue b/src/views/EquipmentManager/components/TechyHeader.vue
index dbed9e4..bc9f7af 100644
--- a/src/views/EquipmentManager/components/TechyHeader.vue
+++ b/src/views/EquipmentManager/components/TechyHeader.vue
@@ -95,8 +95,7 @@ export default {
position: relative;
color: white;
/* font-size: 24px; */
- font-size: 2vh;
- padding: calc(100vw / 1920 * 32) 0;
+ padding: calc(24px * var(--beilv)) 0;
line-height: 1;
background: url(./header-new.png) no-repeat;
/** 背景图片好像左右不对称 : */
@@ -104,22 +103,22 @@ export default {
/* background-size: cover; */
background-size: 100% 100%;
/* background-position: bottom left calc(100vw / 1920 * 40); */
- background-position: bottom left calc(100vw / 1920 * 40);
- height: calc(100vmin / 1920 * 128);
+ background-position: bottom left calc(32px * var(--beilv));
+ height: calc(96px * var(--beilv));
}
.logo-img {
- width: calc(100vmin / 1920 * 48);
+ width: calc(28px * var(--beilv));
}
.techy-header__title {
display: line-block;
- margin-left: calc(100vmin / 1920 * 12);
+ margin-left: calc(12px * var(--beilv));
/* font-size: 29px; */
- font-size: calc(100vmin / 1920 * 48);
- line-height: 41px;
- letter-spacing: 4px;
- text-shadow: 0px 0px 11px rgba(221, 237, 255, 0.34);
+ font-size: calc(29px * var(--beilv));
+ line-height: calc(41px * var(--beilv));
+ letter-spacing: calc(2.23px * var(--beilv));
+ text-shadow: 0px 0px calc(11px * var(--beilv)) rgba(221, 237, 255, 0.34);
}
.date,
@@ -146,20 +145,17 @@ export default {
}
.fullscreen-btn {
- /* height: 32px; */
cursor: pointer;
position: absolute;
- /* right: 24px; */
/** techy-body 的内部 padding 值 */
- right: calc(100vmin / 1920 * 32);
- /* top: 42px; */
- top: calc(100vmin / 1920 * 64);
+ right: calc(24px * var(--beilv));
+ top: calc(44px * var(--beilv));
bottom: 0;
}
.fullscreen-btn > span {
display: inline-block;
- width: calc(100vmin / 1920 * 52);
- height: calc(100vmin / 1920 * 52);
+ width: calc(32px * var(--beilv));
+ height: calc(32px * var(--beilv));
}
diff --git a/src/views/EquipmentManager/components/icons.js b/src/views/EquipmentManager/components/icons.js
new file mode 100644
index 0000000..487aa46
--- /dev/null
+++ b/src/views/EquipmentManager/components/icons.js
@@ -0,0 +1,125 @@
+// 扳手
+export const IconBanshou = `
`
+
+// 趋势+放大镜
+export const IconTrend = `
`
+
+// 菜单+齿轮
+export const IconMenuChilun = `
`
+
+// 闪电安全帽
+export const IconSafetyHat = `
`
diff --git a/src/views/QualityManager/components/TechyContainer.vue b/src/views/QualityManager/components/TechyContainer.vue
index dc29f96..bdcab67 100644
--- a/src/views/QualityManager/components/TechyContainer.vue
+++ b/src/views/QualityManager/components/TechyContainer.vue
@@ -12,7 +12,7 @@
-
+
{{ title }}
@@ -21,6 +21,8 @@
diff --git a/src/views/QualityManager/components/TechyHeader.vue b/src/views/QualityManager/components/TechyHeader.vue
index 5d2c835..0987a1f 100644
--- a/src/views/QualityManager/components/TechyHeader.vue
+++ b/src/views/QualityManager/components/TechyHeader.vue
@@ -1,17 +1,36 @@
diff --git a/src/views/QualityManager/components/icons.js b/src/views/QualityManager/components/icons.js
new file mode 100644
index 0000000..487aa46
--- /dev/null
+++ b/src/views/QualityManager/components/icons.js
@@ -0,0 +1,125 @@
+// 扳手
+export const IconBanshou = `
`
+
+// 趋势+放大镜
+export const IconTrend = `
`
+
+// 菜单+齿轮
+export const IconMenuChilun = `
`
+
+// 闪电安全帽
+export const IconSafetyHat = `
`